Browse Source

POR-1887 filter empty secrets (#3778)

ianedwards 2 years ago
parent
commit
688638ed70

+ 6 - 2
api/server/handlers/porter_app/update_app_environment_group.go

@@ -286,10 +286,14 @@ func (c *UpdateAppEnvironmentHandler) ServeHTTP(w http.ResponseWriter, r *http.R
 	}
 
 	for key, value := range request.Variables {
-		variables[key] = value
+		if len(key) > 0 && len(value) > 0 {
+			variables[key] = value
+		}
 	}
 	for key, value := range request.Secrets {
-		secrets[key] = value
+		if len(key) > 0 && len(value) > 0 {
+			secrets[key] = value
+		}
 	}
 
 	envGroup := environment_groups.EnvironmentGroup{

+ 5 - 2
dashboard/src/lib/hooks/useAppValidation.ts

@@ -75,13 +75,16 @@ export const useAppValidation = ({
 
       const { env } = data.app;
       const variables = env
-        .filter((e) => !e.hidden && !e.deleted)
+        .filter(
+          (e) =>
+            !e.hidden && !e.deleted && e.value.length > 0 && e.key.length > 0
+        )
         .reduce((acc: Record<string, string>, item) => {
           acc[item.key] = item.value;
           return acc;
         }, {});
       const secrets = env
-        .filter((e) => !e.deleted)
+        .filter((e) => !e.deleted && e.value.length > 0 && e.key.length > 0)
         .reduce((acc: Record<string, string>, item) => {
           if (item.hidden) {
             acc[item.key] = item.value;