fix(apps): init apps in config

semaphoreui · Jul 10, 2024 · 37230c2 · 37230c2
1 parent 08a0949
commit 37230c2
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 16 deletions.
diff --git a/api/apps.go b/api/apps.go
@@ -80,19 +80,6 @@ func appMiddleware(next http.Handler) http.Handler {
 }
 
 func getApps(w http.ResponseWriter, r *http.Request) {
-	defaultApps := map[string]util.App{
-		string(db.TemplateAnsible):    {},
-		string(db.TemplateTerraform):  {},
-		string(db.TemplateTofu):       {},
-		string(db.TemplateBash):       {},
-		string(db.TemplatePowerShell): {},
-		string(db.TemplatePython):     {},
-	}
-
-	for k, a := range util.Config.Apps {
-		defaultApps[k] = a
-	}
-
 	type app struct {
 		ID        string `json:"id"`
 		Title     string `json:"title"`
@@ -104,7 +91,7 @@ func getApps(w http.ResponseWriter, r *http.Request) {
 
 	apps := make([]app, 0)
 
-	for k, a := range defaultApps {
+	for k, a := range util.Config.Apps {
 
 		apps = append(apps, app{
 			ID:        k,

diff --git a/cli/cmd/root.go b/cli/cmd/root.go
@@ -114,7 +114,7 @@ func createStore(token string) db.Store {
 		panic(err)
 	}
 
-	util.CheckDefaultApps()
+	util.LookupDefaultApps()
 
 	return store
 }
diff --git a/util/config.go b/util/config.go
@@ -250,6 +250,17 @@ func LoadRunnerSettings(path string) (config RunnerConfig, err error) {
 // ConfigInit reads in cli flags, and switches actions appropriately on them
 func ConfigInit(configPath string) {
 	fmt.Println("Loading config")
+
+	Config = &ConfigType{}
+	Config.Apps = map[string]App{
+		"ansible":    {},
+		"terraform":  {},
+		"tofu":       {},
+		"bash":       {},
+		"powershell": {},
+		"python":     {},
+	}
+
 	loadConfigFile(configPath)
 	loadConfigEnvironment()
 	loadConfigDefaults()
@@ -800,7 +811,7 @@ func (conf *ConfigType) GenerateSecrets() {
 	conf.AccessKeyEncryption = base64.StdEncoding.EncodeToString(accessKeyEncryption)
 }
 
-func CheckDefaultApps() {
+func LookupDefaultApps() {
 	appCommands := map[string]string{
 		"":          "ansible-playbook",
 		"terraform": "terraform",