autostacker24 1.0.56 → 1.0.57

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a292522f66a4a0c65a49548c90d5de96d25e6eb
-  data.tar.gz: 3c28395eb048674ab82d701a93ba7672f065c120
+  metadata.gz: 6b9061f0245437aac8fb55ed942950963c637d01
+  data.tar.gz: 2dd618bddd219ffd00c0f66e807816ce9ed6afc8
 SHA512:
-  metadata.gz: e17384a0e173a5c35842e2c61175920e0a076bab2bc6ae51bd1b6754693683b52d6d784714e474b5a5100042d22fba632ddc30169910f288f63b31d6db2591a7
-  data.tar.gz: 5d5624920bc31371884d7d78de9946185dd9d0b80a4ebb2e484204ad68e98b94514bfc46a137a3a9fc74c25b67fcf9326431c403fa6a0b6dd4d164c541b2487b
+  metadata.gz: 37a4b4685dd4736ca2ce1ec30e784f4b827996714381e33294d64ff70b44f318ebf0228fb0ff301b031c0f2cb83d328354182195a32e0a9658338c838f7636c0
+  data.tar.gz: dd10f37cddeebb519fb9c1ca8110e7eb5f020367661775173a38e74550e91149710f1307f2132617c16b145ff1b8958866a7cf7a0fc236019c9f180993fc363d

data/lib/autostacker24/stacker.rb

@@ -22,30 +22,30 @@ module Stacker
     end
   end
 
-  def create_or_update_stack(stack_name, template, parameters, parent_stack_name = nil)
+  def create_or_update_stack(stack_name, template, parameters, parent_stack_name = nil, tags = nil)
     if find_stack(stack_name).nil?
-      create_stack(stack_name, template, parameters, parent_stack_name)
+      create_stack(stack_name, template, parameters, parent_stack_name, tags)
     else
-      update_stack(stack_name, template, parameters, parent_stack_name)
+      update_stack(stack_name, template, parameters, parent_stack_name, tags)
     end
   end
 
-  def create_stack(stack_name, template, parameters, parent_stack_name = nil)
+  def create_stack(stack_name, template, parameters, parent_stack_name = nil, tags = nil)
     merge_and_validate(template, parameters, parent_stack_name)
     cloud_formation.create_stack(stack_name:    stack_name,
-                                 template_body: template_body(template),
+                                 template_body: template_body(template, tags),
                                  on_failure:    'DELETE',
                                  parameters:    transform_input(parameters),
                                  capabilities:  ['CAPABILITY_IAM'])
     wait_for_stack(stack_name, :create)
   end
 
-  def update_stack(stack_name, template, parameters, parent_stack_name = nil)
+  def update_stack(stack_name, template, parameters, parent_stack_name = nil, tags = nil)
     seen_events = get_stack_events(stack_name).map {|e| e[:event_id]}
     begin
       merge_and_validate(template, parameters, parent_stack_name)
       cloud_formation.update_stack(stack_name:    stack_name,
-                                   template_body: template_body(template),
+                                   template_body: template_body(template, tags),
                                    parameters:    transform_input(parameters),
                                    capabilities:  ['CAPABILITY_IAM'])
     rescue Aws::CloudFormation::Errors::ValidationError => error
@@ -74,8 +74,8 @@ module Stacker
   end
   private :merge_and_validate
 
-  def validate_template(template)
-    cloud_formation.validate_template(template_body: template_body(template))
+  def validate_template(template, tags = nil)
+    cloud_formation.validate_template(template_body: template_body(template, tags))
   end
 
   def delete_stack(stack_name)
@@ -111,6 +111,10 @@ module Stacker
     raise "waiting for #{operation} stack #{stack_name} timed out after #{timeout_in_minutes} minutes"
   end
 
+  def get_template(stack_name)
+    cloud_formation.get_template(stack_name: stack_name).template_body
+  end
+
   def find_stack(stack_name)
     cloud_formation.describe_stacks(stack_name: stack_name).stacks.first
   rescue Aws::CloudFormation::Errors::ValidationError => error
@@ -169,9 +173,9 @@ module Stacker
     @lazy_cloud_formation
   end
 
-  def template_body(template)
+  def template_body(template, tags = nil)
     template = File.read(template) if File.exists?(template)
-    AutoStacker24::Preprocessor.preprocess(template)
+    AutoStacker24::Preprocessor.preprocess(template, tags)
   end
 
   extend self

data/lib/autostacker24/template_preprocessor.rb

@@ -5,14 +5,80 @@ module AutoStacker24
 
   module Preprocessor
 
-    def self.preprocess(template)
+    def self.preprocess(template, tags = nil)
       if template =~ /^\s*\/{2}\s*/i
         template = template.gsub(/(\s*\/\/.*$)|(".*")/) {|m| m[0] == '"' ? m : ''} # replace comments
-        template = preprocess_json(JSON(template)).to_json
+        template = preprocess_json(JSON(template))
+        template = preprocess_tags(template, tags).to_json
       end
       template
     end
 
+    def self.preprocess_tags(template, tags = nil)
+
+      supportedTypes = [
+        'AWS::AutoScaling::AutoScalingGroup',
+        'AWS::CloudTrail::Trail',
+        'AWS::EC2::CustomerGateway',
+        'AWS::EC2::DHCPOptions',
+        'AWS::EC2::Instance',
+        'AWS::EC2::InternetGateway',
+        'AWS::EC2::NetworkAcl',
+        'AWS::EC2::NetworkInterface',
+        'AWS::EC2::RouteTable',
+        'AWS::EC2::SecurityGroup',
+        'AWS::EC2::Subnet',
+        'AWS::EC2::Volume',
+        'AWS::EC2::VPC',
+        'AWS::EC2::VPCPeeringConnection',
+        'AWS::EC2::VPNConnection',
+        'AWS::EC2::VPNGateway',
+        'AWS::ElasticBeanstalk::Environment',
+        'AWS::ElasticLoadBalancing::LoadBalancer',
+        'AWS::RDS::DBCluster',
+        'AWS::RDS::DBClusterParameterGroup',
+        'AWS::RDS::DBInstance',
+        'AWS::RDS::DBParameterGroup',
+        'AWS::RDS::DBSecurityGroup',
+        'AWS::RDS::DBSubnetGroup',
+        'AWS::RDS::OptionGroup',
+        'AWS::S3::Bucket'
+      ]
+
+      unless tags.nil?
+
+        tags_for_asg = adjust_tags_for_asg(tags)
+
+        template["Resources"].each {|(key, value)|
+
+          tags_to_apply = tags
+          if value["Type"] == 'AWS::AutoScaling::AutoScalingGroup'
+            tags_to_apply = tags_for_asg
+          end
+
+          if supportedTypes.include? value["Type"]
+            if value["Properties"]["Tags"].nil?
+              value["Properties"]["Tags"] = tags_to_apply
+            else
+              value["Properties"]["Tags"] = (tags_to_apply + value["Properties"]["Tags"]).uniq { |s| s.first }
+            end
+          end
+        }
+      end
+
+      template
+    end
+
+    def self.adjust_tags_for_asg(tags)
+      asg_tags = tags.inject([]) { |t,element| t << element.dup }
+
+      asg_tags.each {|(tag)|
+        tag["PropagateAtLaunch"] = "true"
+      }
+
+      asg_tags
+    end
+
     def self.preprocess_json(json)
       if json.is_a?(Hash)
         json.inject({}){|m, (k, v)| m.merge(k => preprocess_json(v))}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autostacker24
 version: !ruby/object:Gem::Version
-  version: 1.0.56
+  version: 1.0.57
 platform: ruby
 authors:
 - Johannes Mueller
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-06 00:00:00.000000000 Z
+date: 2016-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core