autostacker24 1.0.66 → 1.0.67

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d6747b5745a81e573c4b64039bf0c291605510f
-  data.tar.gz: c9359f7c97474cb3956f3f1c819b74523b29856e
+  metadata.gz: 011e9bdc25672f70fe6bf1a96cce80ca7f6e0ff0
+  data.tar.gz: d57dfb2d268cac5631ce12bf80b919a06edf692d
 SHA512:
-  metadata.gz: 6bb8f3554b3376e5ba41e4eb37a354ad896541dd4d914db347d0239e2e08896fe3270d7177f1879aa7c4224695628afd82bf52885a136cae1451b92d277ae1b1
-  data.tar.gz: 474d7bf2809aa6bf37174607afaa6deb1c8c3d31673928e559ce54c57fdac4d42ce03cab1cee112d700b8e727948974355b101330fb9211a818538c488a63443
+  metadata.gz: 65d6effa19097bfa665fdc6e582d4f4d75c8cf0d899bec0a7bad6fa4f07e5cb37335146803ae2f895e90a33b0b20326ba11db327dbbcc8cc08a2ca515e724131
+  data.tar.gz: 7ef99ef3dce94265d32addd34bb6d621c1f2f633450a327a6fd97df3e9e9cc266520bc67ed2b6667333e3e40edb0b302fca446b831fdacaeeecc6b97c4fdf725

data/bin/autostacker24

@@ -3,23 +3,71 @@
 require 'optparse'
 require 'autostacker24'
 
-def parse_options(argv)
-  params = {}
-  parser = OptionParser.new
-  parser.on("--template VALUE", "template location") do |value|
-    params[:template] = value 
-  end
-  parser.parse(argv)
-  return params
+def error(msg)
+  puts "\nError: #{msg}\n\n#{USAGE}"
+  exit 1
 end
 
-command = ARGV[0]
-params = parse_options(ARGV)
+def check_template(args)
+  error('--template missing or file not found') unless args.template && File.exists?(args.template)
+end
+
+def check_stack(args)
+  error('--stack name missing') unless args.stack
+end
+
+args = OpenStruct.new
+args.region = ENV['AWS_REGION']
+args.params = {}
+parser = OptionParser.new do |opts|
+  opts.banner = 'Usage: autostacker24 command [options]'
+  opts.separator ''
+  opts.separator 'Commands:'
+  opts.separator "\tcreate\t\t create or update a stack"
+  opts.separator "\tdelete\t\t delete a stack"
+  opts.separator "\tpreprocess\t pretty print template after preprocessing"
+  opts.separator "\tvalidate\t validate the template"
+  opts.separator ''
+  opts.separator 'Options:'
+  opts.on('--template TEMPLATE', 'Path to template')                {|v| args.template = v}
+  opts.on('--stack STACK',       'Name of stack')                   {|v| args.stack = v}
+  opts.on('--parent PARENT',     'Name of parent stack')            {|v| args.parent = 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(*v.split('=')) }
+  opts.on('--help',              'Show this help')                  {|_| puts opts; exit!;}
+  opts.on('--version',           'Show version')                    {|_| puts `gem list autostacker24`; exit!;}
+end
+USAGE = parser.to_s
 
-if command == "validate"
-  Stacker.validate_template(params[:template])
-elsif command == "preprocess"
-  puts Stacker.template_body(params[:template])
-else
-  raise ArgumentError, "unknown command"
+begin
+  parser.parse!(ARGV)
+rescue OptionParser::ParseError => x
+  error(x)
 end
+
+error("one command expected, found #{ARGV.size}") if ARGV.size != 1
+args.command = ARGV[0]
+args.params = args.params.inject({}){|m, kv| m.merge(Hash[kv[0].to_sym, kv[1]])}
+
+Stacker.region = args.region
+Stacker.credentials = Aws::SharedCredentials(profile_name: args.profile) if args.profile
+
+case args.command
+  when /validate/
+    check_template(args)
+    Stacker.validate_template(args.template)
+  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)
+  when /delete/
+    check_stack(args)
+    Stacker.delete_stack(args.stack)
+  when /preprocess|show/
+    check_template(args)
+    puts JSON.pretty_generate(JSON.parse(Stacker.template_body(args.template)))
+  else
+    error("unknown command '#{args.command}'")
+end
+

data/lib/autostacker24/stacker.rb

@@ -52,6 +52,7 @@ module Stacker
                                    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"
       find_stack(stack_name)
     else
       wait_for_stack(stack_name, :update, seen_events)
@@ -162,7 +163,7 @@ module Stacker
   end
 
   def get_stack_events(stack_name_or_id)
-    events = cloud_formation.describe_stack_events(stack_name: stack_name_or_id).data.stack_events
+    cloud_formation.describe_stack_events(stack_name: stack_name_or_id).data.stack_events
   end
 
   def cloud_formation # lazy CloudFormation client

data/lib/autostacker24/template_preprocessor.rb

@@ -1,16 +1,20 @@
 
 require 'json'
 require 'set'
+require 'yaml'
 
 module AutoStacker24
 
   module Preprocessor
 
     def self.preprocess(template)
-      if template =~ /^\s*\/{2}\s*/i
-        template = preprocess_json(parse_json(template)).to_json
+      if template =~ /\A\s*\{/
+        template
+      elsif template =~ /\A\s*\/{2}/
+        preprocess_json(parse_json(template)).to_json
+      else
+        preprocess_json(parse_yaml(template)).to_json
       end
-      template
     end
 
     def self.parse_json(template)
@@ -21,6 +25,10 @@ module AutoStacker24
       raise e
     end
 
+    def self.parse_yaml(template)
+      YAML.load(template)
+    end
+
     def self.preprocess_json(json)
       if json.is_a?(Hash)
         json.inject({}) do |m, (k, v)|
@@ -40,9 +48,9 @@ module AutoStacker24
     end
 
     def self.preprocess_user_data(s)
-      m = /^@file:\/\/(.*)/.match(s)
+      m = /\A@file:\/\/(.*)/.match(s)
       s = File.read(m[1]) if m
-      {'Fn::Base64' => s}
+      {'Fn::Base64' => preprocess_string(s)}
     end
 
     def self.preprocess_string(s)
@@ -50,7 +58,7 @@ module AutoStacker24
         case token
           when '@@' then '@'
           when '@[' then '['
-          when /^@/ then parse_ref(token)
+          when /\A@/ then parse_ref(token)
           else token
         end
       end
@@ -73,7 +81,7 @@ module AutoStacker24
     end
 
     def self.parse_ref(token)
-      m = /^@([^\[]*)(\[([^,]*)(\s*,\s*(.*))?\])?$/.match(token)
+      m = /\A@([^\[]*)(\[([^,]*)(\s*,\s*(.*))?\])?$/.match(token)
       m1 = m[1]
       m2 = m[3]
       m3 = m[5]

metadata

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