autostacker24 2.8.6 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa087f5e9153cfd6ac641141ab3fe8c8f588a940
-  data.tar.gz: '09b70ecbc66adcca9d1a87d492502e1d243005fc'
+  metadata.gz: e42c631cc72e25a94c0e4f4034ae225581cc74c8
+  data.tar.gz: c71503d01fea53ff9e55c44d6171748d0237cd68
 SHA512:
-  metadata.gz: c679a47bab18e4c028efebe1310e60316a3c811359b685785389618b5d164f92d4900d00e6a19423c9b5c93d626267eea5d68ee78e94c8164131be03342d610b
-  data.tar.gz: a05856f68836e67aa2ca609c2c8902dafd9d4e5233ef9f4b3cdb55d5021f1ae83eb549c7adf900e6c1fc3359725f00bea9742c3ae9c8f54ec0c10883f267fe54
+  metadata.gz: 97a1d37ea4ed1de206901bf35f49868295b29540f93ffe999b86f8f9b50dd518483b880677bfc8953cf5f310fbb012931f87825aa2b027459902b542e9e618a8
+  data.tar.gz: 51d5ccdd0fa687f30043b033d1a589d876d0e87f85cf47a2f42f16398187ec868f0b0f246259923166f51d4c31eb4a46754d3fe852914a269026199b2d28f93d

data/bin/autostacker24

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-
 require 'optparse'
 require 'autostacker24'
 require 'yaml'
@@ -22,12 +21,12 @@ def json?(data)
 end
 
 def load_file(path)
-  error('params file not found') unless File.exists?(path)
+  error("file #{path} not found") unless File.exists?(path)
   data = File.read(path)
   json?(data) ? JSON.parse(data) : YAML.load(data)
 end
 
-def validate_param(param)
+def validate_key_value(param)
   kv = param.split('=', 2)
   error("parameter #{param} is missing mandatory value") unless kv.size == 2
   kv
@@ -36,6 +35,8 @@ end
 args = OpenStruct.new
 args.region = ENV['AWS_REGION']
 args.params = {}
+args.tags = {}
+
 parser = OptionParser.new do |opts|
   opts.banner = 'Usage: autostacker24 command [options]'
   opts.separator ''
@@ -55,8 +56,10 @@ parser = OptionParser.new do |opts|
   opts.on('--role-arn ROLE-ARN', 'Arn of execution role')               {|v| args.role_arn = v}
   opts.on('--region REGION',     'AWS region')                          {|v| args.region = v}
   opts.on('--profile PROFILE',   'AWS profile (use aws configure)')     {|v| args.profile = v}
-  opts.on('--param KEY=VALUE',   'Stack Parameter')                     {|v| args.params.store(*validate_param(v)) }
+  opts.on('--param KEY=VALUE',   'Stack Parameter')                     {|v| args.params.store(*validate_key_value(v)) }
   opts.on('--params FILE',       'Stack Parameter from yaml/json file') {|v| args.params.merge!(load_file(v)) }
+  opts.on('--tag KEY=VALUE',     'Stack Tag')                           {|v| args.tags.store(*validate_key_value(v)) }
+  opts.on('--tags FILE',         'Stack Tags from yaml/json file')      {|v| args.tags.merge!(load_file(v)) }
   opts.on('--help',              'Show this help')                      {|_| puts opts; exit!;}
   opts.on('--version',           'Show version')                        {|_| puts `gem list autostacker24`; exit!;}
   opts.separator ''
@@ -83,7 +86,7 @@ case args.command
   when /create|update|create_or_update/
     check_template(args)
     check_stack(args)
-    Stacker.create_or_update_stack(args.stack, args.template, args.params, args.parent, role_arn: args.role_arn)
+    Stacker.create_or_update_stack(args.stack, args.template, args.params, args.parent, args.tags, role_arn: args.role_arn)
   when /list/
     Stacker.list_stacks()
   when /delete/
@@ -107,4 +110,3 @@ case args.command
   else
     error("unknown command '#{args.command}'")
 end
-

data/lib/autostacker24/stacker.rb

@@ -49,10 +49,10 @@ module Stacker
     cloud_formation.create_stack(stack_name:    stack_name,
                                  template_body: template_body(template),
                                  on_failure:    'DELETE',
-                                 parameters:    transform_input(parameters),
+                                 parameters:    transform_params(parameters),
                                  capabilities:  ['CAPABILITY_IAM', 'CAPABILITY_NAMED_IAM'],
                                  role_arn:      role_arn,
-                                 tags:          tags)
+                                 tags:          transform_tags(tags))
     wait_for_stack(stack_name, :create, Set.new, timeout_in_minutes)
   end
 
@@ -62,10 +62,10 @@ module Stacker
       merge_and_validate(template, parameters, parent_stack_name)
       cloud_formation.update_stack(stack_name:    stack_name,
                                    template_body: template_body(template),
-                                   parameters:    transform_input(parameters),
+                                   parameters:    transform_params(parameters),
                                    capabilities:  ['CAPABILITY_IAM', 'CAPABILITY_NAMED_IAM'],
                                    role_arn:      role_arn,
-                                   tags:          tags)
+                                   tags:          transform_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
       puts "stack #{stack_name} is already up to date"
@@ -166,7 +166,7 @@ module Stacker
 
   def estimate_template_cost(template, parameters, parent_stack_name = nil)
     merge_and_validate(template, parameters, parent_stack_name)
-    cloud_formation.estimate_template_cost(:template_body => template_body(template), :parameters => transform_input(parameters))
+    cloud_formation.estimate_template_cost(:template_body => template_body(template), :parameters => transform_params(parameters))
   end
 
   def get_stack_outputs(stack_name)
@@ -183,11 +183,16 @@ module Stacker
     output.inject({}) { |m, o| m.merge(o.output_key.to_sym => o.output_value) }
   end
 
-  def transform_input(input)
+  def transform_params(input)
     input.each{|k,v| raise "#{k} must not be nil" if v.nil? }
     input.inject([]) { |m, kv| m << {parameter_key: kv[0].to_s, parameter_value: kv[1].to_s} }
   end
 
+  def transform_tags(input)
+    input.each{|k,v| raise "#{k} must not be nil" if v.nil? }
+    input.inject([]) { |m, kv| m << {key: kv[0].to_s, value: kv[1].to_s} }
+  end
+
   def get_stack_resources(stack_name)
     resources = cloud_formation.describe_stack_resources(stack_name: stack_name).data.stack_resources
     resources.inject({}){|map, resource| map.merge(resource.logical_resource_id.to_sym => resource)}.freeze

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autostacker24
 version: !ruby/object:Gem::Version
-  version: 2.8.6
+  version: 2.9.0
 platform: ruby
 authors:
 - Johannes Mueller
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-07 00:00:00.000000000 Z
+date: 2018-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-cloudformation