fix(titus): allow security group in cluster config by name (#7160)

spinnaker · Jun 28, 2019 · 422be22 · 422be22
1 parent 2fd1aa9
commit 422be22
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/app/scripts/modules/titus/src/serverGroup/configure/serverGroupConfiguration.service.ts b/app/scripts/modules/titus/src/serverGroup/configure/serverGroupConfiguration.service.ts
@@ -173,8 +173,16 @@ export class TitusServerGroupConfigurationService {
         backingData.filtered = {};
         backingData.filtered.regions = backingData.credentialsKeyedByAccount[cmd.credentials].regions;
         cmd.backingData = backingData;
+        backingData.filtered.securityGroups = this.getRegionalSecurityGroups(cmd);
+        let securityGroupRefresher = $q.when();
+        if (cmd.securityGroups && cmd.securityGroups.length) {
+          const regionalSecurityGroupIds = backingData.filtered.securityGroups.map((g: ISecurityGroup) => g.id);
+          if (intersection(cmd.securityGroups, regionalSecurityGroupIds).length < cmd.securityGroups.length) {
+            securityGroupRefresher = this.refreshSecurityGroups(cmd, false);
+          }
+        }
 
-        return $q.all([this.refreshLoadBalancers(cmd), this.refreshSecurityGroups(cmd, false)]).then(() => {
+        return $q.all([this.refreshLoadBalancers(cmd), securityGroupRefresher]).then(() => {
           this.attachEventHandlers(cmd);
         });
       });