inital s3 bucket creation tagging from context

Author: Garison Draper

stacker/actions/base.py

@@ -86,7 +86,8 @@ def bucket_region(self):
 
     def ensure_cfn_bucket(self):
         """The CloudFormation bucket where templates will be stored."""
-        ensure_s3_bucket(self.s3_conn, self.bucket_name, self.bucket_region)
+        ensure_s3_bucket(self.s3_conn, self.bucket_name, self.bucket_region,
+                         self.context)
 
     def stack_template_url(self, blueprint):
         return stack_template_url(

stacker/hooks/aws_lambda.py

@@ -490,7 +490,7 @@ def create_template(self):
     session = get_session(bucket_region)
     s3_client = session.client('s3')
 
-    ensure_s3_bucket(s3_client, bucket_name, bucket_region)
+    ensure_s3_bucket(s3_client, bucket_name, bucket_region, context)
 
     prefix = kwargs.get('prefix', '')
 

stacker/util.py

@@ -13,7 +13,7 @@
 import yaml
 from collections import OrderedDict
 from git import Repo
-
+import stacker.actions.build
 import botocore.exceptions
 
 logger = logging.getLogger(__name__)
@@ -465,7 +465,7 @@ def s3_bucket_location_constraint(region):
     return region
 
 
-def ensure_s3_bucket(s3_client, bucket_name, bucket_region):
+def ensure_s3_bucket(s3_client, bucket_name, bucket_region, context):
     """Ensure an s3 bucket exists, if it does not then create it.
 
     Args:
@@ -474,6 +474,9 @@ def ensure_s3_bucket(s3_client, bucket_name, bucket_region):
         bucket_name (str): The bucket being checked/created.
         bucket_region (str, optional): The region to create the bucket in. If
             not provided, will be determined by s3_client's region.
+        context (:class:`stacker.context.Context`): context instance, used to
+            get tags from the stacker run
+
     """
     try:
         s3_client.head_bucket(Bucket=bucket_name)
@@ -488,7 +491,10 @@ def ensure_s3_bucket(s3_client, bucket_name, bucket_region):
                 create_args["CreateBucketConfiguration"] = {
                     "LocationConstraint": location_constraint
                 }
+            tagset = stacker.actions.build.build_stack_tags(context)
             s3_client.create_bucket(**create_args)
+            s3_client.put_bucket_tagging(Bucket=bucket_name,
+                                         Tagging={'TagSet': tagset})
         elif e.response['Error']['Message'] == "Forbidden":
             logger.exception("Access denied for bucket %s.  Did " +
                              "you remember to use a globally unique name?",