From 422be22d3a6563eeab280afc0c4b9176fe6d9705 Mon Sep 17 00:00:00 2001 From: Chris Berry Date: Fri, 28 Jun 2019 12:40:10 -0500 Subject: [PATCH] fix(titus): allow security group in cluster config by name (#7160) --- .../configure/serverGroupConfiguration.service.ts | 10 +++++++++- 1 file changed, 9 insertions(+), 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 index 19b64cd0e4d..b50fa389c6b 100644 --- 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); }); });