Merge pull request #335 from zalando-stups/fix-334

Fixing #334 - Cert field not handled?

Author: hjacobs

senza/components/elastic_load_balancer.py

@@ -72,6 +72,8 @@ def get_ssl_cert(subdomain, main_zone, configuration, account_info: AccountArgum
             else:
                 fatal_error('Could not find any SSL certificate')
 
+    return ssl_cert
+
 
 def get_listeners(subdomain, main_zone, configuration,
                   account_info: AccountArguments):

tests/test_components.py

@@ -139,6 +139,41 @@ def test_component_load_balancer_idletimeout(monkeypatch):
     assert 'HTTPPort' not in result["Resources"]["test_lb"]["Properties"]
 
 
+def test_component_load_balancer_cert_arn(monkeypatch):
+    configuration = {
+        "Name": "test_lb",
+        "SecurityGroups": "",
+        "HTTPPort": "9999",
+        "SSLCertificateId": "foo2"
+    }
+
+    info = {'StackName': 'foobar', 'StackVersion': '0.1'}
+    definition = {"Resources": {}}
+
+    args = MagicMock()
+    args.region = "foo"
+
+    mock_string_result = MagicMock()
+    mock_string_result.return_value = "foo"
+    monkeypatch.setattr('senza.components.elastic_load_balancer.resolve_security_groups', mock_string_result)
+
+    m_acm = MagicMock()
+    m_acm_certificate = MagicMock()
+    m_acm_certificate.arn = "foo"
+
+    m_acm.get_certificates.return_value = iter([m_acm_certificate])
+
+    m_acm_certificate.is_arn_certificate.return_value = True
+    m_acm_certificate.get_by_arn.return_value = True
+
+    monkeypatch.setattr('senza.components.elastic_load_balancer.ACM', m_acm)
+    monkeypatch.setattr('senza.components.elastic_load_balancer.ACMCertificate', m_acm_certificate)
+
+    # issue 105: support additional ELB properties
+    result = component_elastic_load_balancer(definition, configuration, args, info, False, MagicMock())
+    assert "foo2" == result["Resources"]["test_lb"]["Properties"]["Listeners"][0]["SSLCertificateId"]
+
+
 def test_component_load_balancer_http_only(monkeypatch):
     configuration = {
         "Name": "test_lb",