Merge branch 'master' into update_release_1_0_with_master

Author: phobologic

CHANGELOG.md

@@ -10,6 +10,18 @@ Parameters logic in favor of Blueprint Variables and Lookups.
 - Support `allowed_values` within variable definitions [GH-245]
 - Fix filehandler lookups with pseudo parameters [GH-247]
 - keypair hook update to match route53 update [GH-248]
+- Allow = in lookup contents [GH-251]
+- change capabilities to CAPABILITY\_NAMED\_IAM [GH-262]
+
+## 0.8.4 (2016-11-01)
+
+- Fix an issue w/ boto3 version string not working with older setuptools
+
+## 0.8.3 (2016-10-31)
+
+- pass context to hooks as a kwarg [GH-234]
+- Fix file handler lookups w/ pseudo parameters [GH-239]
+- Allow use of later boto3 [GH-253]
 
 ## 0.8.1 (2016-09-22)
 

Dockerfile

@@ -5,6 +5,8 @@ COPY scripts/docker-stacker /bin/docker-stacker
 RUN mkdir -p /stacks && pip install --upgrade pip setuptools
 WORKDIR /stacks
 COPY . /tmp/stacker
+RUN pip install --upgrade pip
+RUN pip install --upgrade setuptools
 RUN cd /tmp/stacker && python setup.py install && rm -rf /tmp/stacker
 
 ENTRYPOINT ["docker-stacker"]

setup.py

@@ -8,7 +8,7 @@
 
 install_requires = [
     "troposphere~=1.8.1",
-    "boto3>=1.3.1<1.5.0",
+    "boto3>=1.3.1,<1.5.0",
     "botocore~=1.4.38",
     "PyYAML~=3.11",
     "awacs~=0.6.0",

stacker/lookups/__init__.py

@@ -13,7 +13,7 @@
                                        # "output" type
 ?\s*                                   # any number of spaces separating the
                                        # type from the input
-(?P<input>[@\+\/,\._\-a-zA-Z0-9\:\s]+) # the input value to the lookup
+(?P<input>[@\+\/,\._\-a-zA-Z0-9\:\s=]+) # the input value to the lookup
 )\}                                    # closing brace of the lookup
 """, re.VERBOSE)
 

stacker/providers/aws/default.py

@@ -214,7 +214,7 @@ def create_stack(self, fqn, template_url, parameters, tags, **kwargs):
                         TemplateURL=template_url,
                         Parameters=parameters,
                         Tags=tags,
-                        Capabilities=["CAPABILITY_IAM"]),
+                        Capabilities=["CAPABILITY_NAMED_IAM"]),
         )
         return True
 
@@ -227,7 +227,7 @@ def update_stack(self, fqn, template_url, parameters, tags, **kwargs):
                             TemplateURL=template_url,
                             Parameters=parameters,
                             Tags=tags,
-                            Capabilities=["CAPABILITY_IAM"]),
+                            Capabilities=["CAPABILITY_NAMED_IAM"]),
             )
         except botocore.exceptions.ClientError as e:
             if "No updates are to be performed." in e.message:

stacker/providers/aws/interactive.py

@@ -134,7 +134,7 @@ def update_stack(self, fqn, template_url, parameters, tags, **kwargs):
                 'TemplateURL': template_url,
                 'Parameters': parameters,
                 'Tags': tags,
-                'Capabilities': ["CAPABILITY_IAM"],
+                'Capabilities': ["CAPABILITY_NAMED_IAM"],
                 'ChangeSetName': get_change_set_name(),
             },
         )

stacker/tests/test_lookups.py

@@ -59,6 +59,13 @@ def test_kms_lookup(self):
         self.assertEqual(lookup.type, "kms")
         self.assertEqual(lookup.input, "CiADsGxJp1mCR21fjsVjVxr7RwuO2FE3ZJqC4iG0Lm+HkRKwAQEBAgB4A7BsSadZgkdtX47FY1ca+0cLjthRN2SaguIhtC5vh5EAAACHMIGEBgkqhkiG9w0BBwagdzB1AgEAMHAGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQM3IKyEoNEQVxN3BaaAgEQgEOpqa0rcl3WpHOmblAqL1rOPRyokO3YXcJAAB37h/WKLpZZRAWV2h9C67xjlsj3ebg+QIU91T/")  # NOQA
 
+    def test_kms_lookup_with_equals(self):
+        lookups = extract_lookups("${kms us-east-1@AQECAHjLp186mZ+mgXTQSytth/ibiIdwBm8CZAzZNSaSkSRqswAAAG4wbAYJKoZIhvcNAQcGoF8wXQIBADBYBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDLNmhGU6fe4vp175MAIBEIAr+8tUpi7SDzOZm+FFyYvWXhs4hEEyaazIn2dP8a+yHzZYDSVYGRpfUz34bQ==}")  # NOQA
+        self.assertEqual(len(lookups), 1)
+        lookup = list(lookups)[0]
+        self.assertEqual(lookup.type, "kms")
+        self.assertEqual(lookup.input, "us-east-1@AQECAHjLp186mZ+mgXTQSytth/ibiIdwBm8CZAzZNSaSkSRqswAAAG4wbAYJKoZIhvcNAQcGoF8wXQIBADBYBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDLNmhGU6fe4vp175MAIBEIAr+8tUpi7SDzOZm+FFyYvWXhs4hEEyaazIn2dP8a+yHzZYDSVYGRpfUz34bQ==")  # NOQA
+
     def test_kms_lookup_with_region(self):
         lookups = extract_lookups("${kms us-west-2@CiADsGxJp1mCR21fjsVjVxr7RwuO2FE3ZJqC4iG0Lm+HkRKwAQEBAgB4A7BsSadZgkdtX47FY1ca+0cLjthRN2SaguIhtC5vh5EAAACHMIGEBgkqhkiG9w0BBwagdzB1AgEAMHAGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQM3IKyEoNEQVxN3BaaAgEQgEOpqa0rcl3WpHOmblAqL1rOPRyokO3YXcJAAB37h/WKLpZZRAWV2h9C67xjlsj3ebg+QIU91T/}")  # NOQA
         self.assertEqual(len(lookups), 1)