fix(amazon): Fix application name matching in load balancer cache keys (

#5041) This stops the previous behavior where it would match any segment, e.g.: account, region, vpc, type
spinnaker · Oct 23, 2020 · 7266739 · 7266739
1 parent 53fcd4c
commit 7266739
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/...ovy/com/netflix/spinnaker/clouddriver/aws/provider/view/AmazonLoadBalancerProvider.groovy b/...ovy/com/netflix/spinnaker/clouddriver/aws/provider/view/AmazonLoadBalancerProvider.groovy
@@ -66,7 +66,8 @@ class AmazonLoadBalancerProvider implements LoadBalancerProvider<AmazonLoadBalan
   }
 
   private static boolean applicationMatcher(String key, String applicationName) {
-    return key ==~ 'aws:.*:' + applicationName + '-.*' || key ==~ 'aws:.*:' + applicationName || key ==~ 'aws:.*:' + applicationName + ':.*'
+    // aws:loadBalancers:account:region:loadbalancer-name:vpc:type
+    return key ==~ 'aws:[^:]*:[^:]*:[^:]*:' + applicationName + '(-[^:]*):'
   }
 
   @Override