updated rest http/https config names and rest app config path

HappyHippyHippo · Oct 24, 2024 · f4327f3 · f4327f3
1 parent a698e11
commit f4327f3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/rest.go b/rest.go
@@ -270,7 +270,7 @@ func (sc *restServerCreator) Accept(config *Bag) bool {
 	if e := config.Populate("", &sc.config); e != nil {
 		return false
 	}
-	return strings.ToLower(sc.config.Type) == "default" &&
+	return strings.ToLower(sc.config.Type) == "http" &&
 		sc.config.WatchdogID != "" &&
 		sc.config.Port != 0
 }
@@ -346,7 +346,7 @@ func (sc *restServerTLSCreator) Accept(config *Bag) bool {
 	if e := config.Populate("", &sc.config); e != nil {
 		return false
 	}
-	return strings.ToLower(sc.config.Type) == "tls" &&
+	return strings.ToLower(sc.config.Type) == "https" &&
 		sc.config.WatchdogID != "" &&
 		sc.config.Port != 0 &&
 		sc.config.TLS.Cert != "" &&

diff --git a/rest_index.go b/rest_index.go
@@ -7,6 +7,10 @@ import (
 	"go.uber.org/dig"
 )
 
+var (
+	RestIndexConfigPath = "flam.app"
+)
+
 type restIndexGetResponse struct {
 	App     string `json:"app"`
 	Version string `json:"version"`
@@ -18,9 +22,10 @@ type restIndexService struct {
 }
 
 func newRestIndexService(config Config) *restIndexService {
+	cfg := config.Bag(RestIndexConfigPath, &Bag{})
 	return &restIndexService{
-		app:     config.String("app.name", ""),
-		version: config.String("app.version", ""),
+		app:     cfg.String("name", ""),
+		version: cfg.String("version", ""),
 	}
 }