|
|
@@ -122,6 +122,7 @@ func (c *UpdateAppHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
|
|
var overrides *porterv1.PorterApp
|
|
|
appProto := &porterv1.PorterApp{}
|
|
|
|
|
|
+ var previewEnvVariables map[string]string
|
|
|
envVariables := request.Variables
|
|
|
|
|
|
// get app definition from either base64 yaml or base64 porter app proto
|
|
|
@@ -182,7 +183,7 @@ func (c *UpdateAppHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
|
|
if appFromYaml.PreviewApp != nil {
|
|
|
overrides = appFromYaml.PreviewApp.AppProto
|
|
|
addonOverrides = appFromYaml.PreviewApp.Addons
|
|
|
- envVariables = mergeEnvVariables(envVariables, appFromYaml.PreviewApp.EnvVariables)
|
|
|
+ previewEnvVariables = appFromYaml.PreviewApp.EnvVariables
|
|
|
}
|
|
|
|
|
|
addons = appFromYaml.Addons
|
|
|
@@ -252,6 +253,9 @@ func (c *UpdateAppHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
|
|
Normal: envVariables,
|
|
|
Secret: request.Secrets,
|
|
|
},
|
|
|
+ AppEnvOverrides: &porterv1.EnvGroupVariables{
|
|
|
+ Normal: previewEnvVariables,
|
|
|
+ },
|
|
|
Deletions: &porterv1.Deletions{
|
|
|
ServiceNames: request.Deletions.ServiceNames,
|
|
|
PredeployNames: request.Deletions.Predeploy,
|
ianedwards