fix(amazon): Fix SpEL support for load balancers (#7151)

spinnaker · Jun 26, 2019 · 8ee7e11 · 8ee7e11
1 parent d6ad8c2
commit 8ee7e11
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/app/scripts/modules/amazon/src/serverGroup/configure/serverGroupConfiguration.service.ts b/app/scripts/modules/amazon/src/serverGroup/configure/serverGroupConfiguration.service.ts
@@ -474,10 +474,10 @@ export class AwsServerGroupConfigurationService {
     const vpcLoadBalancers = this.getVpcLoadBalancerNames(command);
     const allTargetGroups = this.getTargetGroupNames(command);
 
-    if (currentLoadBalancers && command.loadBalancers && !currentLoadBalancers.includes('${')) {
+    if (currentLoadBalancers && command.loadBalancers) {
       const allValidLoadBalancers = command.vpcId ? newLoadBalancers : newLoadBalancers.concat(vpcLoadBalancers);
       const { valid, invalid, spel } = this.getValidMatches(allValidLoadBalancers, currentLoadBalancers);
-      command.loadBalancers = intersection(newLoadBalancers, valid);
+      command.loadBalancers = intersection(newLoadBalancers.concat(spel), valid);
       if (!command.vpcId) {
         command.vpcLoadBalancers = intersection(vpcLoadBalancers, valid);
       } else {