Find ELB to change by Name when changing traffic

zalando-stups · Aug 25, 2016 · ad14b92 · ad14b92
1 parent e40ceba
commit ad14b92
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -2,5 +2,6 @@
 exclude_lines =
     pragma: no cover
     def __repr__
+    def __str__
 omit =
     senza/__main__.py
diff --git a/senza/traffic.py b/senza/traffic.py
@@ -8,7 +8,7 @@
 from clickclick import Action, action, ok, print_table, warning
 
 from .aws import StackReference, get_stacks, get_tag
-from .manaus.cloudformation import CloudFormationStack
+from .manaus.cloudformation import CloudFormationStack, ResourceType
 from .manaus.exceptions import StackNotFound, StackNotUpdated
 from .manaus.route53 import (RecordType, Route53, Route53HostedZone,
                              convert_domain_records_to_alias)
@@ -150,7 +150,15 @@ def set_new_weights(dns_names: list, identifier, lb_dns_name: str,
                                                "because traffic for it is 0".format(stack_name))
                 changed = True
                 continue
-            load_balancer = stack.template['Resources']['AppLoadBalancerMainDomain']
+
+            for key, resource in stack.template['Resources'].items():
+                if (resource['Type'] == ResourceType.route53_record_set and
+                        resource['Properties']['Name'] == dns_name):
+                    load_balancer = stack.template['Resources'][key]
+                    break
+
+            # TODO error handling
+
             load_balancer['Properties']['Weight'] = percentage
             try:
                 stack.update()

diff --git a/tests/test_cli.py b/tests/test_cli.py
@@ -1272,7 +1272,13 @@ def get_stack(name, region):
         assert region == 'aa-fakeregion-1'
         if name not in m_stacks:
             stack = m_stacks[name]
-            resources = {'AppLoadBalancerMainDomain': {'Properties': {'Weight': 20}}}
+            resources = {
+                'AppLoadBalancerMainDomain': {
+                    'Type': 'AWS::Route53::RecordSet',
+                    'Properties': {'Weight': 20,
+                                   'Name': 'myapp.zo.ne.'}
+                }
+            }
             stack.template = {'Resources': resources}
         return m_stacks[name]
     m_cfs.get_by_stack_name = get_stack