blackroad-os/backroad
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(docker): create custom template [EE-4114] (#7812)

Browse Source 
* EE-4114 fix(docker): create custom template

* Update customtemplate_create.go

remove white space
This commit is contained in:
Rex Wang
2022-10-20 16:42:49 +08:00
committed by GitHub
parent 0219d41ba7
commit 3f51d077ac
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
api/http/handler/customtemplates/customtemplate_create.go
View File

@@ -380,12 +380,14 @@ func (payload *customTemplateFromFileUploadPayload) Validate(r *http.Request) er
payload.FileContent = composeFileContent
varsString, _ := request.RetrieveMultiPartFormValue(r, "Variables", true)
err = json.Unmarshal([]byte(varsString), &payload.Variables)
if err != nil {
return errors.New("Invalid variables. Ensure that the variables are valid JSON")
if varsString != "" {
err = json.Unmarshal([]byte(varsString), &payload.Variables)
if err != nil {
return errors.New("Invalid variables. Ensure that the variables are valid JSON")
}
return validateVariablesDefinitions(payload.Variables)
}
return validateVariablesDefinitions(payload.Variables)
return nil
}
func (handler *Handler) createCustomTemplateFromFileUpload(r *http.Request) (*portainer.CustomTemplate, error) {