Explorar el Código

change logic for repo url

Alexander Belanger hace 3 años
padre
commit
386ef48c91
Se han modificado 1 ficheros con 8 adiciones y 7 borrados
  1. 8 7
      api/server/handlers/stack/create.go

+ 8 - 7
api/server/handlers/stack/create.go

@@ -41,6 +41,13 @@ func (p *StackCreateHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	// populate fields with defaults
+	for i, reqResource := range req.AppResources {
+		if reqResource.TemplateRepoURL == "" {
+			req.AppResources[i].TemplateRepoURL = p.Config().ServerConf.DefaultApplicationHelmRepoURL
+		}
+	}
+
 	uid, err := encryption.GenerateRandomBytes(16)
 
 	if err != nil {
@@ -189,17 +196,11 @@ func getResourceModels(appResources []*types.CreateStackAppResourceRequest, sour
 			return nil, fmt.Errorf("source config %s does not exist in source config list", appResource.SourceConfigName)
 		}
 
-		templateRepoURL := appResource.TemplateRepoURL
-
-		if templateRepoURL == "" {
-			templateRepoURL = defaultRepoURL
-		}
-
 		res = append(res, models.StackResource{
 			Name:                 appResource.Name,
 			UID:                  uid,
 			StackSourceConfigUID: linkedSourceConfigUID,
-			TemplateRepoURL:      templateRepoURL,
+			TemplateRepoURL:      appResource.TemplateRepoURL,
 			TemplateName:         appResource.TemplateName,
 			TemplateVersion:      appResource.TemplateVersion,
 			HelmRevisionID:       1,