Stream Deploy: fix ignore properties on deploy

Backport #1204
spring-cloud · Jun 20, 2019 · 0fb056a · 0fb056a
1 parent d9e2c49
commit 0fb056a
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/ui/src/app/streams/stream-deploy/stream-deploy.component.ts b/ui/src/app/streams/stream-deploy/stream-deploy.component.ts
@@ -140,16 +140,15 @@ export class StreamDeployComponent implements OnInit, OnDestroy {
                   value = this.streamDeployService.cleanValueProperties(value);
                   let keyShort = key;
                   if (key.startsWith(`${appType}.`)) {
+                    ignoreProperties.push(`app.${app}.${keyShort}=${value}`);
                     keyShort = key.substring(`${appType}.`.length, key.length);
                   }
                   properties.push(`app.${app}.${keyShort}=${value}`);
-                  ignoreProperties.push(`app.${app}.${keyShort}=${value}`);
                 });
               }
             });
             this.properties = properties;
-            this.ignoreProperties = ignoreProperties;
-            this.ignoreProperties = Object.assign([], this.properties);
+            this.ignoreProperties = [ ...properties, ...ignoreProperties];
             config.streamDefinition = deploymentInfo;
             return config;
           }))
@@ -235,7 +234,7 @@ export class StreamDeployComponent implements OnInit, OnDestroy {
           this.loggerService.error('Split line property', val);
         } else {
           // Workaround sensitive property: ignored property
-          if (arr[1] === `'******'`) {
+          if (arr[1] === `'******'` || arr[1] === `******`) {
             this.loggerService.log(`Sensitive property ${arr[0]} is ignored`);
           } else {
             propertiesMap[arr[0]] = cleanValue(arr[1]);