autostacker24 1.0.63 → 1.0.64

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15128ed7ab637072d024098eb2b976a2f105996a
-  data.tar.gz: 4aedcd68a7571dd079809300eba6e0aa33cfeaac
+  metadata.gz: 7e43bad33022b4b88bde94e2146b4b8693e2485d
+  data.tar.gz: c6f9b80bc2be1784270ae765f49f37c1b99c58e7
 SHA512:
-  metadata.gz: efc855cdb351a38c96203f434da319576690814a01f2a9dcebae6fa1170ae62d0d4d1877e66558544304abbe4a7a6a6f7491b8dc8013ec16c375152d6ef047e0
-  data.tar.gz: ca4776c6616436bcb2f013f56c76f4d29d62c8e16ad92013248ce41b9ccf9047f77217374f6d61fa4e2e7934b11b08bd3efb6d8f6ace55384dda1271b0b36939
+  metadata.gz: 204b3139bf2bad11c5b70367a28849443bc914ce461026287c4f1bc533e94865ff8bf7db1a3a7fb44284e4a4162dbfdf264a97abde9fc7ed2ad16da60dadd753
+  data.tar.gz: 1ce541e41f33c5fc822a58a2a52ac265113cd36099220ce8fe7f6860b64562850a4e18d2a9c48cf319304c4aae3c2de27dbbffdff4335f402c82258750474e13

data/lib/autostacker24/stacker.rb

@@ -33,10 +33,11 @@ module Stacker
   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, tags),
+                                 template_body: template_body(template),
                                  on_failure:    'DELETE',
                                  parameters:    transform_input(parameters),
-                                 capabilities:  ['CAPABILITY_IAM'])
+                                 capabilities:  ['CAPABILITY_IAM'],
+                                 tags:          tags)
     wait_for_stack(stack_name, :create)
   end
 
@@ -45,9 +46,10 @@ module Stacker
     begin
       merge_and_validate(template, parameters, parent_stack_name)
       cloud_formation.update_stack(stack_name:    stack_name,
-                                   template_body: template_body(template, tags),
+                                   template_body: template_body(template),
                                    parameters:    transform_input(parameters),
-                                   capabilities:  ['CAPABILITY_IAM'])
+                                   capabilities:  ['CAPABILITY_IAM'],
+                                   tags:          tags)
     rescue Aws::CloudFormation::Errors::ValidationError => error
       raise error unless error.message =~ /No updates are to be performed/i # may be flaky, do more research in API
       find_stack(stack_name)
@@ -74,8 +76,8 @@ module Stacker
   end
   private :merge_and_validate
 
-  def validate_template(template, tags = nil)
-    cloud_formation.validate_template(template_body: template_body(template, tags))
+  def validate_template(template)
+    cloud_formation.validate_template(template_body: template_body(template))
   end
 
   def delete_stack(stack_name)
@@ -173,9 +175,9 @@ module Stacker
     @lazy_cloud_formation
   end
 
-  def template_body(template, tags = nil)
+  def template_body(template)
     template = File.read(template) if File.exists?(template)
-    AutoStacker24::Preprocessor.preprocess(template, tags)
+    AutoStacker24::Preprocessor.preprocess(template)
   end
 
   extend self

data/lib/autostacker24/template_preprocessor.rb

@@ -6,16 +6,13 @@ module AutoStacker24
 
   module Preprocessor
 
-    def self.preprocess(template, tags = nil)
+    def self.preprocess(template)
       if template =~ /^\s*\/{2}\s*/i
-        processed = preprocess_json(parse_json(template))
-        template = preprocess_tags(processed, tags).to_json
+        template = preprocess_json(parse_json(template)).to_json
       end
       template
     end
 
-    SUPPORTED_TYPES = Set[%w(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)]
-
     def self.parse_json(template)
       template = template.gsub(/(\s*\/\/.*$)|(".*")/) {|m| m[0] == '"' ? m : ''} # replace comments
       JSON(template)
@@ -25,36 +22,6 @@ module AutoStacker24
       raise e
     end
 
-    def self.preprocess_tags(template, tags = nil)
-
-      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 SUPPORTED_TYPES.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)
-      tags.map {|element| element.merge('PropagateAtLaunch' => 'true') }
-    end
-
     def self.preprocess_json(json)
       if json.is_a?(Hash)
         json.inject({}) do |m, (k, v)|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autostacker24
 version: !ruby/object:Gem::Version
-  version: 1.0.63
+  version: 1.0.64
 platform: ruby
 authors:
 - Johannes Mueller
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-15 00:00:00.000000000 Z
+date: 2016-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core