stackup 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 9b2b7a0536a72a652bc20f3e2afaa65db33bb97c03fbc761bae6bebd9c6cd664
-  data.tar.gz: c6dfbccf6f5428b37af5ba7b93ddd95f5e22f20ee65f3f92f26c1919384763f8
+SHA1:
+  metadata.gz: 79c44228b207109b4fc970baa4078e7021e2c963
+  data.tar.gz: 2bdb3b3da63d828f7a8fb902422c7eb7c879787f
 SHA512:
-  metadata.gz: 46c0107e466288546bc932eda695cf337b16b3e60755090eb16c6fc66654560fdc3126d0cd87d9ab57a8f24b3fe45161bd5874b182dfce5c1e9b2eafe20934d7
-  data.tar.gz: d461a8ebdc5ad7cf4771e9e86eff852a0af2b513e29bbc46bdf0df10b9536b57711aaf95057062ac1079049a8c74fabb8fd7ea8121a216048128d500cf6335b6
+  metadata.gz: 4fc4c397ddb16a2f72236b83917cfee8d52632fb297461135c20cd9e0609ba2aa88966ad420e346c0de66f2d9477151d2d5459dfbceac4f51c57437d32d35b98
+  data.tar.gz: 6466ea4ce128111442b8861af45878638b20ab5c01ca884b235da9a71dc933b1e5ca492685068894c6da4942fd451a3cf1540a7f1176df3d64f4ba2ea2ad60b1

data/CHANGES.md

@@ -1,3 +1,7 @@
+## 1.3.1 (2018-06-05)
+
+* Dependency upgrades. Notably ruby 2.5 in the docker release, and aws-sdk v3
+
 ## 1.3.0 (2018-05-22)
 
 * Fix #53: Add support for CloudFormation Service Role

data/README.md

@@ -22,6 +22,7 @@ AWS CloudFormation stacks.
 - [Programmatic usage](#programmatic-usage)
 - [Rake integration](#rake-integration)
 - [Docker image](#docker-image)
+- [Releasing](#releasing)
 
 <!-- /TOC -->
 
@@ -68,6 +69,9 @@ This will:
   * update (or create) the named CloudFormation stack, using the specified template
   * monitor events until the stack update is complete
 
+Requests will retry 3 times by default. After this limit is exceeded, `ERROR: Rate exceeded` failures will be logged.
+You can increase the limit using the `--retry-limit` option, or by setting the `$AWS_RETRY_LIMIT` environment variable.
+
 For more details on usage, see
 
     $ stackup STACK up --help
@@ -125,7 +129,7 @@ You can also use the `--with-role` option to temporarily assume a different IAM
     $ stackup myapp-test up -t template.json \
       --with-role arn:aws:iam::862905684840:role/deployment
 
-You can use the `--sercvice-role-arn` option to pass a specific IAM service role for CloudFormation to use for stack
+You can use the `--service-role-arn` option to pass a specific IAM service role for CloudFormation to use for stack
 operations:
 
     $ stackup myapp-test up -t template.json \
@@ -254,3 +258,19 @@ This policy grants the principal all actions required by `stackup up` for any cl
     ]
 }
 ```
+
+## Releasing
+
+The release process will push tags to GitHub, push the gem to rubygems and push the docker image to DockerHub.
+
+Prerequisites:
+
+* logged into dockerhub via `docker login`. Your user must have permission to push to `realestate/stackup`
+* logged into rubygems via `gem push`. Your user must have permission to push to the `stackup` gem.
+
+To release:
+
+```
+bundle install
+auto/release
+```

data/bin/stackup

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$LOAD_PATH << File.expand_path("../../lib", __FILE__)
+$LOAD_PATH << File.expand_path("../lib", __dir__)
 
 require "clamp"
 require "console_logger"
@@ -25,25 +25,23 @@ Clamp do
   option ["-Y", "--yaml"], :flag, "output data in YAML format"
 
   option ["--region"], "REGION", "set region" do |arg|
-    unless arg =~ /^[a-z]{2}-[a-z]+-\d$/
-      fail ArgumentError, "#{arg.inspect} doesn't look like a region"
-    end
+    raise ArgumentError, "#{arg.inspect} doesn't look like a region" unless arg =~ /^[a-z]{2}-[a-z]+-\d$/
     arg
   end
 
   option ["--with-role"], "ROLE_ARN", "assume this role",
-    :attribute_name => :role_arn
+         :attribute_name => :role_arn
 
   option ["--retry-limit"], "N", "maximum number of retries for API calls",
-    :environment_variable => "AWS_API_RETRY_LIMIT" do |arg|
+         :environment_variable => "AWS_API_RETRY_LIMIT" do |arg|
     Integer(arg)
   end
 
   option ["--[no-]wait"], :flag, "wait for stack updates to complete",
-    :default => true
+         :default => true
 
   option ["--wait-poll-interval"], "N", "polling interval while waiting for updates",
-    :default => 5, &method(:Integer)
+         :default => 5, &method(:Integer)
 
   option "--debug", :flag, "enable debugging"
 
@@ -85,9 +83,7 @@ Clamp do
   end
 
   def role_arn=(arg)
-    unless arg =~ %r{^arn:aws:iam::\d+:role/}
-      fail ArgumentError, "#{arg.inspect} doesn't look like a role ARN"
-    end
+    raise ArgumentError, "#{arg.inspect} doesn't look like a role ARN" unless arg =~ %r{^arn:aws:iam::\d+:role/}
     @role_arn = arg
   end
 
@@ -157,9 +153,9 @@ Clamp do
     end
 
     def parameters_from_files
-      parameter_sources.map { |src|
+      parameter_sources.map do |src|
         Stackup::Parameters.new(src.data).to_hash
-      }.inject({}, :merge)
+      end.inject({}, :merge)
     end
 
     def parameter_overrides
@@ -193,9 +189,7 @@ Clamp do
            &Stackup::Source.method(:new)
 
     option "--service-role-arn", "SERVICE_ROLE_ARN", "cloudformation service role ARN" do |arg|
-      unless arg =~ %r{^arn:aws:iam::\d+:role/}
-        fail ArgumentError, "#{arg.inspect} doesn't look like a role ARN"
-      end
+      raise ArgumentError, "#{arg.inspect} doesn't look like a role ARN" unless arg =~ %r{^arn:aws:iam::\d+:role/}
       arg
     end
 

data/lib/stackup.rb

@@ -20,8 +20,10 @@ module Stackup
 
 end
 
-# rubocop:disable Style/MethodName
+# rubocop:disable Naming/MethodName
 
 def Stackup(*args)
   Stackup.service(*args)
 end
+
+# rubocop:enable Naming/MethodName

data/lib/stackup/change_set.rb

@@ -56,15 +56,9 @@ module Stackup
       options[:change_set_name] = name
       options[:change_set_type] = stack.exists? ? "UPDATE" : "CREATE"
       force = options.delete(:force)
-      if (template_data = options.delete(:template))
-        options[:template_body] = MultiJson.dump(template_data)
-      end
-      if (parameters = options[:parameters])
-        options[:parameters] = Parameters.new(parameters).to_a
-      end
-      if (tags = options[:tags])
-        options[:tags] = normalize_tags(tags)
-      end
+      options[:template_body] = MultiJson.dump(options.delete(:template)) if options[:template]
+      options[:parameters] = Parameters.new(options[:parameters]).to_a if options[:parameters]
+      options[:tags] = normalize_tags(options[:tags]) if options[:tags]
       options[:capabilities] ||= ["CAPABILITY_NAMED_IAM"]
       delete if force
       handling_cf_errors do
@@ -77,7 +71,7 @@ module Stackup
             return current.status
           when "FAILED"
             logger.error(current.status_reason)
-            fail StackUpdateError, "change-set creation failed" if status == "FAILED"
+            raise StackUpdateError, "change-set creation failed" if status == "FAILED"
           end
           sleep(wait_poll_interval)
         end

data/lib/stackup/error_handling.rb

@@ -13,7 +13,7 @@ module Stackup
     #
     def handling_cf_errors
       yield
-    rescue Aws::CloudFormation::Errors::ChangeSetNotFound => e
+    rescue Aws::CloudFormation::Errors::ChangeSetNotFound => _e
       raise NoSuchChangeSet, "no such change-set"
     rescue Aws::CloudFormation::Errors::ValidationError => e
       case e.message

data/lib/stackup/parameters.rb

@@ -55,15 +55,10 @@ module Stackup
 
     def initialize(attributes)
       attributes.each do |name, value|
-        if name.respond_to?(:gsub)
-          name = name.gsub(/([a-z])([A-Z])/, '\1_\2').downcase
-        end
+        name = name.gsub(/([a-z])([A-Z])/, '\1_\2').downcase if name.respond_to?(:gsub)
         writer = "#{name}="
-        if respond_to?(writer)
-          public_send(writer, value)
-        else
-          raise ArgumentError, "invalid attribute: #{name.inspect}"
-        end
+        raise(ArgumentError, "invalid attribute: #{name.inspect}") unless respond_to?(writer)
+        public_send(writer, value)
       end
     end
 
@@ -71,7 +66,7 @@ module Stackup
     attr_accessor :parameter_value
     attr_accessor :use_previous_value
 
-    alias_method :key, :parameter_key
+    alias key parameter_key
 
     def value
       if use_previous_value

data/lib/stackup/rake_tasks.rb

@@ -14,20 +14,20 @@ module Stackup
     attr_accessor :parameters
     attr_accessor :tags
 
-    alias_method :namespace=, :name=
+    alias namespace= name=
 
     def initialize(name, template = nil)
       @name = name
       @stack = name
       @template = template
       yield self if block_given?
-      fail ArgumentError, "no name provided" unless @name
-      fail ArgumentError, "no template provided" unless @template
+      raise ArgumentError, "no name provided" unless @name
+      raise ArgumentError, "no template provided" unless @template
       define
     end
 
     # path to the "stackup" executable
-    STACKUP_CLI = File.expand_path("../../../bin/stackup", __FILE__)
+    STACKUP_CLI = File.expand_path("../../bin/stackup", __dir__)
 
     def stackup(*rest)
       sh STACKUP_CLI, "-Y", stack, *rest

data/lib/stackup/source.rb

@@ -16,7 +16,7 @@ module Stackup
 
     def s3?
       uri.scheme == "https" &&
-      uri.host =~ %r{(^|\.)s3(-\w+-\w+-\d)?\.amazonaws\.com$}
+        uri.host =~ /(^|\.)s3(-\w+-\w+-\d)?\.amazonaws\.com$/
     end
 
     def body

data/lib/stackup/stack.rb

@@ -40,7 +40,7 @@ module Stackup
     #
     def on_event(event_handler = nil, &block)
       event_handler ||= block
-      fail ArgumentError, "no event_handler provided" if event_handler.nil?
+      raise ArgumentError, "no event_handler provided" if event_handler.nil?
       @event_handler = event_handler
     end
 
@@ -135,9 +135,9 @@ module Stackup
       create(options)
     end
 
-    alias_method :up, :create_or_update
+    alias up create_or_update
 
-    ALMOST_DEAD_STATUSES = %w(CREATE_FAILED ROLLBACK_COMPLETE)
+    ALMOST_DEAD_STATUSES = %w[CREATE_FAILED ROLLBACK_COMPLETE].freeze
 
     # Delete the stack.
     #
@@ -159,7 +159,7 @@ module Stackup
       @stack_id = nil
     end
 
-    alias_method :down, :delete
+    alias down delete
 
     # Cancel update in-progress.
     #
@@ -321,7 +321,7 @@ module Stackup
     def modify_stack(target_status, failure_message, &block)
       if wait?
         status = modify_stack_synchronously(&block)
-        fail StackUpdateError, failure_message unless target_status === status
+        raise StackUpdateError, failure_message unless target_status === status
         status
       else
         modify_stack_asynchronously(&block)
@@ -355,7 +355,7 @@ module Stackup
       handling_cf_errors do
         yield
       end
-      self.status
+      status
     end
 
     def normalize_tags(tags)

data/lib/stackup/stack_watcher.rb

@@ -14,10 +14,11 @@ module Stackup
 
     attr_accessor :stack
 
+    # rubocop:disable Lint/HandleExceptions
+
     # Yield all events since the last call
     #
     def each_new_event
-      # rubocop:disable Lint/HandleExceptions
       new_events = []
       stack.events.each do |event|
         break if event.id == @last_processed_event_id
@@ -27,19 +28,20 @@ module Stackup
         yield event
         @last_processed_event_id = event.id
       end
-    rescue Aws::CloudFormation::Errors::ValidationError
+    rescue Aws::CloudFormation::Errors::ValidationError => _e
     end
 
     # Consume all new events
     #
     def zero
-      # rubocop:disable Lint/HandleExceptions
       last_event = stack.events.first
       @last_processed_event_id = last_event.id unless last_event.nil?
       nil
     rescue Aws::CloudFormation::Errors::ValidationError
     end
 
+    # rubocop:enable Lint/HandleExceptions
+
     private
 
     attr_accessor :processed_event_ids

data/lib/stackup/utils.rb

@@ -7,10 +7,10 @@ module Stackup
     def normalize_data(data)
       case data
       when Hash
-        pairs = data.sort.map { |k,v| [k, normalize_data(v)] }
+        pairs = data.sort.map { |k, v| [k, normalize_data(v)] }
         Hash[pairs]
       when Array
-        pairs = data.map { |x| normalize_data(x) }
+        data.map { |x| normalize_data(x) }
       else
         data
       end

data/lib/stackup/version.rb

@@ -1,5 +1,5 @@
 module Stackup
 
-  VERSION = "1.3.0"
+  VERSION = "1.3.1".freeze
 
 end

data/lib/stackup/yaml.rb

@@ -32,7 +32,7 @@ module Stackup
       # Supports CloudFormation extensions as per `load`.
       #
       def load_file(filename)
-        File.open(filename, 'r:bom|utf-8') do |f|
+        File.open(filename, "r:bom|utf-8") do |f|
           load(f, filename)
         end
       end
@@ -44,7 +44,9 @@ module Stackup
     class CloudFormationToRuby < Psych::Visitors::ToRuby
 
       class << self
-        alias_method :create, :new unless method_defined?(:create)
+
+        alias create new unless method_defined?(:create)
+
       end
 
       def accept(target)
@@ -56,7 +58,7 @@ module Stackup
         when "!GetAZs"
           { "Fn::GetAZs" => (super || "") }
         when /^!(\w+)$/
-          { "Fn::#{$1}" => super }
+          { "Fn::#{Regexp.last_match(1)}" => super }
         else
           super
         end

data/spec/stackup/parameters_spec.rb

@@ -143,7 +143,7 @@ describe Stackup::Parameters do
       end
 
     end
-    
+
     context "with empty parameter file" do
 
       let(:input_records) { false }

data/spec/stackup/source_spec.rb

@@ -6,7 +6,7 @@ require "stackup/yaml"
 
 describe Stackup::Source do
 
-  let(:example_dir) { File.expand_path("../../../examples", __FILE__) }
+  let(:example_dir) { File.expand_path("../../examples", __dir__) }
 
   context "from a JSON file" do
 
@@ -69,7 +69,7 @@ describe Stackup::Source do
     describe "#body" do
 
       it "raises a ReadError" do
-        expect { subject.body }.to raise_error(Stackup::Source::ReadError, %q(no such file: "notreallythere.json"))
+        expect { subject.body }.to raise_error(Stackup::Source::ReadError, 'no such file: "notreallythere.json"')
       end
 
     end

data/spec/stackup/stack_spec.rb

@@ -530,11 +530,11 @@ describe Stackup::Stack do
 
       it "calls :list_change_sets" do
         cf_client.stub_responses(:list_change_sets, :summaries => [
-          { :change_set_name => "take1" },
-          { :change_set_name => "take2" },
-        ])
+                                   { :change_set_name => "take1" },
+                                   { :change_set_name => "take2" }
+                                 ])
         summaries = stack.change_set_summaries
-        expect(summaries.map(&:change_set_name)).to eql(%w(take1 take2))
+        expect(summaries.map(&:change_set_name)).to eql(%w[take1 take2])
         expect(cf_client).to have_received(:list_change_sets)
           .with(:stack_name => stack_name)
       end
@@ -634,7 +634,7 @@ describe Stackup::Stack do
 
     end
 
-    %w(CREATE_FAILED ROLLBACK_COMPLETE).each do |initial_status|
+    %w[CREATE_FAILED ROLLBACK_COMPLETE].each do |initial_status|
       context "when status is #{initial_status}" do
 
         let(:stack_status) { initial_status }

data/spec/stackup/stack_watcher_spec.rb

@@ -46,7 +46,7 @@ describe Stackup::StackWatcher do
 
     before do
       allow(stack).to receive(:events) do
-        fail Aws::CloudFormation::Errors::ValidationError.new("test", "no such stack")
+        raise Aws::CloudFormation::Errors::ValidationError.new("test", "no such stack")
       end
     end
 

data/spec/stackup/yaml_spec.rb

@@ -183,7 +183,7 @@ describe Stackup::YAML do
         expect(data).to eql(
           "Stuff" => [
             {
-              "Fn::FindInMap" => ["RegionMap", {"Ref"=>"AWS::Region"}, "AMI"]
+              "Fn::FindInMap" => ["RegionMap", { "Ref" => "AWS::Region" }, "AMI"]
             },
             {
               "Fn::If" => ["CreateProdResources", "c1.xlarge", "m1.small"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stackup
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Mike Williams
@@ -9,36 +9,50 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-22 00:00:00.000000000 Z
+date: 2018-06-05 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-resources
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: clamp
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: console_logger
   requirement: !ruby/object:Gem::Requirement
@@ -59,14 +73,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -134,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: Manage CloudFormation stacks