stackup 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60e50e255335b7924e71a6fed889c946c3b182c2b95277056f88e2e420915f79
-  data.tar.gz: 816b9a71283680668fe9d3cf35c54a3a1a2516a68f0251a1771e4bba17e2cce2
+  metadata.gz: f74cb61004ec9220d92f5f1d1ff292607b216233bc5aed7668d31027e4e2d2b3
+  data.tar.gz: 18cce0dfddda4b0870affec164d0d0c9cdb30e2e25f1ea675e3b64bd3385323e
 SHA512:
-  metadata.gz: be56a2ae96045ace217de36cd7f82592eb2588178b314f8d68d51e6b6d16a1e66c60557e78fa5f524cb710aa42f0d64372629fe4d6b9aad65c3ddec11fe051f4
-  data.tar.gz: 79974fadb7ac89a76a92fa424c4cc2ef63deeec8cfd55b6eda352e965ecd84e832322eddafaaf9eb57fd3640c3744646a484954664f15cfa9bbfeda4b0eb03c8
+  metadata.gz: 38a0621de917ddd7bc2163756c854ad89bae2f79e5b8f1d784e04042b55f4a5a9ea5a84bed89f305c4604efc7c9ccb01ec46c32ec3635e3d03f3148b5b3db0ed
+  data.tar.gz: ac2b19120472ed87471053394d1383d860939a562aebdf5e17fa2a3fc1290b48397c1dae1d9b6c752d6a0a4fd041716b9c753be42f135661303863e2e471397d

data/CHANGES.md

@@ -1,5 +1,10 @@
 # CHANGES
 
+## 1.7.1 (2021-08-31)
+
+* Dependency upgrades. Uplift of release process.
+* M1/arm64 support for docker image releases.
+
 ## 1.7.0 (2020-11-25)
 
 * Feature: --no-fail-on-empty-change-set

data/README.md

@@ -1,7 +1,7 @@
 # stackup
 
 [![Gem Version](https://badge.fury.io/rb/stackup.png)](http://badge.fury.io/rb/stackup)
-[![Build Status](https://travis-ci.org/realestate-com-au/stackup.svg?branch=master)](https://travis-ci.org/realestate-com-au/stackup)
+[![Build Status](https://travis-ci.com/realestate-com-au/stackup.svg?branch=main)](https://travis-ci.com/realestate-com-au/stackup)
 
 Stackup provides a CLI and a simplified Ruby API for dealing with
 AWS CloudFormation stacks.
@@ -191,7 +191,7 @@ Where a template URL references an object in S3, `stackup` leverages [CloudForma
 Non-S3 URLs are also supported, though in that case `stackup` must fetch the content itself:
 
     $ stackup mystack up \
-      -t https://raw.githubusercontent.com/realestate-com-au/stackup/master/examples/template.yml
+      -t https://raw.githubusercontent.com/realestate-com-au/stackup/main/examples/template.yml
 
 ### Stack deletion
 
@@ -309,19 +309,18 @@ This policy grants the principal all actions required by `stackup up` for any cl
 ### Running tests
 
 `auto/test` will run the tests in a Docker container.
+`auto/lint` will run the linter in a Docker container.
 
 ### Releasing
 
-Releasing is done manually, not by CI. The release process will push tags to GitHub, push the gem to rubygems and push the docker image to DockerHub.
+Releasing is done mostly by CI. The automated process will push tags to GitHub, push the docker images to DockerHub. It won't yet push the gem to `rubygems.org`, but we're working ok it..
 
 Prerequisites:
 
-* You must be logged into docker hub via `docker login`. Your user must have permission to push to `realestate/stackup`
-* You must have a rubygems account with permission to push to the `stackup` gem. (`auto/release` will ask for your username and password)
-* You must have cloned this repo via HTTPS and have a github account with permission to push. (`auto/release` will ask for your username and a GitHub personal access token)
+* You must have a rubygems account with permission to push to the `stackup` gem. (`auto/release-gem` will ask for your username and password)
+* You have bumped the version number in `lib/stackup/version.rb`.
+* You have checked the `CHANGES.md` file to make sure it is reasonable and has the changes for this new version.
 
-To release:
-
-```
-auto/release
-```
+To release the rubygem.
+1. `auto/release-gem`
+2. On REA's internal CI tool of choice, find the build for `stackup-ci` and trigger a new build from `HEAD`. This will always grab the latest code from here and release the rest of the parts.

data/bin/stackup

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 $LOAD_PATH << File.expand_path("../lib", __dir__)
 

data/lib/stackup/change_set.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "stackup/error_handling"
 
 module Stackup
@@ -51,20 +53,9 @@ module Stackup
     # @raise [Stackup::NoSuchStack] if the stack doesn't exist
     #
     def create(options = {})
-      options = options.dup
-      options[:stack_name] = stack.name
-      options[:change_set_name] = name
-      options[:change_set_type] = stack.exists? ? "UPDATE" : "CREATE"
-      force = options.delete(:force)
+      options = validate_options(options)
+      delete if options.delete(:force)
       allow_empty_change_set = options.delete(:allow_empty_change_set)
-      options[:template_body] = MultiJson.dump(options.delete(:template)) if options[:template]
-      # optionally override template_body with the original template to preserve formatting (& comments in YAML)
-      template_orig = options.delete(:template_orig)
-      options[:template_body] = template_orig if options.delete(:preserve)
-      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
         cf_client.create_change_set(options)
         loop do
@@ -74,12 +65,12 @@ module Stackup
           when /COMPLETE/
             return current.status
           when "FAILED"
-            if allow_empty_change_set and current.status_reason == "The submitted information didn't contain changes. Submit different information to create a change set."
+            if allow_empty_change_set && (current.status_reason == "The submitted information didn't contain changes. Submit different information to create a change set.")
               return current.status_reason
-            else
-              logger.error(current.status_reason)
-              raise StackUpdateError, "change-set creation failed" if status == "FAILED"
             end
+
+            logger.error(current.status_reason)
+            raise StackUpdateError, "change-set creation failed" if status == "FAILED"
           end
           sleep(wait_poll_interval)
         end
@@ -150,6 +141,21 @@ module Stackup
       stack.send(:wait_poll_interval)
     end
 
+    def validate_options(original)
+      options = original.dup
+      options[:stack_name] = stack.name
+      options[:change_set_name] = name
+      options[:change_set_type] = stack.exists? ? "UPDATE" : "CREATE"
+      options[:template_body] = MultiJson.dump(options.delete(:template)) if options[:template]
+      # optionally override template_body with the original template to preserve formatting (& comments in YAML)
+      template_orig = options.delete(:template_orig)
+      options[:template_body] = template_orig if options.delete(:preserve)
+      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"]
+      options
+    end
+
   end
 
 end

data/lib/stackup/differ.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "diffy"
 require "stackup/utils"
 require "yaml"

data/lib/stackup/error_handling.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "stackup/errors"
 
 module Stackup

data/lib/stackup/errors.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Stackup
 
   # Base Stackup Exception class

data/lib/stackup/main_command.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "clamp"
 require "console_logger"
 require "multi_json"
@@ -203,9 +205,7 @@ module Stackup
              :multivalued => true, :default => ["CAPABILITY_NAMED_IAM"]
 
       def execute
-        unless template_source || use_previous_template?
-          signal_usage_error "Specify either --template or --use-previous-template"
-        end
+        signal_usage_error "Specify either --template or --use-previous-template" unless template_source || use_previous_template?
         options = {}
         if template_source
           if template_source.s3?
@@ -248,8 +248,6 @@ module Stackup
         end
       end
 
-      private
-
       def pad(s, width)
         (s || "").ljust(width)
       end
@@ -299,9 +297,7 @@ module Stackup
                :multivalued => true, :default => ["CAPABILITY_NAMED_IAM"]
 
         def execute
-          unless template_source || use_previous_template?
-            signal_usage_error "Specify either --template or --use-previous-template"
-          end
+          signal_usage_error "Specify either --template or --use-previous-template" unless template_source || use_previous_template?
           options = {}
           if template_source
             if template_source.s3?
@@ -363,8 +359,6 @@ module Stackup
 
       end
 
-      private
-
       def change_set
         stack.change_set(change_set_name)
       end
@@ -406,8 +400,6 @@ module Stackup
         puts differ.diff(current, planned, context_lines)
       end
 
-      private
-
       def differ
         Stackup::Differ.new(diff_format, &method(:format_data))
       end
@@ -468,8 +460,6 @@ module Stackup
         end
       end
 
-      private
-
       def display_event(e)
         if data?
           display_data(event_data(e))

data/lib/stackup/parameters.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Stackup
 
   # Parameters to a CloudFormation template.
@@ -17,12 +19,12 @@ module Stackup
       def hashify(parameters)
         {}.tap do |result|
           parameters.each do |p|
-            begin
-              p_struct = ParameterStruct.new(p)
-              result[p_struct.key] = p_struct.value
-            rescue ArgumentError
-              raise ArgumentError, "invalid parameter record: #{p.inspect}"
-            end
+
+            p_struct = ParameterStruct.new(p)
+            result[p_struct.key] = p_struct.value
+          rescue ArgumentError
+            raise ArgumentError, "invalid parameter record: #{p.inspect}"
+
           end
         end
       end

data/lib/stackup/rake_tasks.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rake/tasklib"
 require "tempfile"
 require "yaml"
@@ -39,8 +41,7 @@ module Stackup
     def define
       namespace(name) do
 
-        data_options = []
-        data_options << DataOption.for("--template", template)
+        data_options = [DataOption.for("--template", template)]
         data_options << DataOption.for("--parameters", parameters) if parameters
         data_options << DataOption.for("--tags", tags) if tags
 

data/lib/stackup/service.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "aws-sdk-cloudformation"
 require "stackup/stack"
 

data/lib/stackup/source.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "open-uri"
 require "stackup/stack"
 

data/lib/stackup/stack_watcher.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "aws-sdk-cloudformation"
 
 module Stackup
@@ -14,10 +16,9 @@ module Stackup
 
     attr_accessor :stack
 
-    # rubocop:disable Lint/HandleExceptions
-
     # Yield all events since the last call
     #
+    # rubocop:disable Lint/SuppressedException
     def each_new_event
       new_events = []
       stack.events.each do |event|
@@ -40,8 +41,7 @@ module Stackup
       nil
     rescue Aws::CloudFormation::Errors::ValidationError
     end
-
-    # rubocop:enable Lint/HandleExceptions
+    # rubocop:enable Lint/SuppressedException
 
     private
 

data/lib/stackup/utils.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Stackup
 
   # Generates diffs of data.

data/lib/stackup/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Stackup
 
-  VERSION = "1.7.0".freeze
+  VERSION = "1.7.1"
 
 end

data/lib/stackup/yaml.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "yaml"
 
 module Stackup

data/lib/stackup.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "forwardable"
 require "stackup/service"
 require "stackup/stack"

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "byebug"
 require "console_logger"
 

data/spec/stackup/main_command_spec.rb

@@ -1,12 +1,14 @@
+# frozen_string_literal: true
+
 require "stackup/main_command"
 
 describe Stackup::MainCommand do
 
-  let(:mock_change_set) { double() }
+  let(:mock_change_set) { double }
 
   before(:example) do
-    mock_stackup = double()
-    mock_stack = double()
+    mock_stackup = double
+    mock_stack = double
     allow_any_instance_of(Stackup::MainCommand).to receive(:Stackup).and_return(mock_stackup)
     allow(mock_stackup).to receive(:stack).and_return(mock_stack)
     allow(mock_stack).to receive(:change_set).and_return(mock_change_set)
@@ -15,41 +17,44 @@ describe Stackup::MainCommand do
   context "change-set create --service-role-arn" do
     it "invokes stack.change_set.create with role arn passed through" do
       expected_args = {
-        role_arn: "arn:aws:iam::000000000000:role/example"
+        :role_arn => "arn:aws:iam::000000000000:role/example"
       }
       expect(mock_change_set).to receive(:create).with(hash_including(expected_args))
 
       Stackup::MainCommand.run("stackup", [
-        "STACK-NAME", "change-set", "create",
-        "--template", "examples/template.yml",
-        "--service-role-arn", "arn:aws:iam::000000000000:role/example"])
+                                 "STACK-NAME", "change-set", "create",
+                                 "--template", "examples/template.yml",
+                                 "--service-role-arn", "arn:aws:iam::000000000000:role/example"
+                               ])
     end
   end
 
   context "change-set create" do
     it "invokes stack.change_set.create with allow_empty_change_set nil" do
       expected_args = {
-        allow_empty_change_set: nil
+        :allow_empty_change_set => nil
       }
       expect(mock_change_set).to receive(:create).with(hash_including(expected_args))
 
       Stackup::MainCommand.run("stackup", [
-        "STACK-NAME", "change-set", "create",
-        "--template", "examples/template.yml"])
+                                 "STACK-NAME", "change-set", "create",
+                                 "--template", "examples/template.yml"
+                               ])
     end
   end
 
   context "change-set create --no-fail-on-empty-change-set" do
     it "invokes stack.change_set.create with allow_empty_change_set true" do
       expected_args = {
-        allow_empty_change_set: true
+        :allow_empty_change_set => true
       }
       expect(mock_change_set).to receive(:create).with(hash_including(expected_args))
 
       Stackup::MainCommand.run("stackup", [
-        "STACK-NAME", "change-set", "create",
-        "--template", "examples/template.yml",
-        "--no-fail-on-empty-change-set"])
+                                 "STACK-NAME", "change-set", "create",
+                                 "--template", "examples/template.yml",
+                                 "--no-fail-on-empty-change-set"
+                               ])
     end
   end
 

data/spec/stackup/parameters_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 require "stackup/parameters"

data/spec/stackup/rake_tasks_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 require "stackup/rake_tasks"
 

data/spec/stackup/source_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 require "multi_json"

data/spec/stackup/stack_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 require "stackup/stack"
@@ -432,9 +434,9 @@ describe Stackup::Stack do
       context "when allow_empty_change_set is nil and there are no changes" do
         it "raises an exception" do
           cf_client.stub_responses(:describe_change_set, [{
-            status: "FAILED",
-            status_reason: "The submitted information didn't contain changes. Submit different information to create a change set."
-          }])
+                                     :status => "FAILED",
+                                     :status_reason => "The submitted information didn't contain changes. Submit different information to create a change set."
+                                   }])
           expect { create_change_set }.to raise_error(Stackup::StackUpdateError)
         end
       end
@@ -442,9 +444,9 @@ describe Stackup::Stack do
       context "when allow_empty_change_set is true and there are no changes" do
         it "does not raise an exception" do
           cf_client.stub_responses(:describe_change_set, [{
-            status: "FAILED",
-            status_reason: "The submitted information didn't contain changes. Submit different information to create a change set."
-          }])
+                                     :status => "FAILED",
+                                     :status_reason => "The submitted information didn't contain changes. Submit different information to create a change set."
+                                   }])
           options[:allow_empty_change_set] = true
           expect { create_change_set }.not_to raise_error
         end
@@ -453,9 +455,9 @@ describe Stackup::Stack do
       context "when allow_empty_change_set is true and there is some other failure" do
         it "raises an exception" do
           cf_client.stub_responses(:describe_change_set, [{
-            status: "FAILED",
-            status_reason: "some other failure message"
-          }])
+                                     :status => "FAILED",
+                                     :status_reason => "some other failure message"
+                                   }])
           options[:allow_empty_change_set] = true
           expect { create_change_set }.to raise_error(Stackup::StackUpdateError)
         end

data/spec/stackup/stack_watcher_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 require "aws-sdk-cloudformation"

data/spec/stackup/utils_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 require "stackup/utils"

data/spec/stackup/yaml_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 require "stackup/yaml"

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: stackup
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Mike Williams
 - Arvind Kunday
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-25 00:00:00.000000000 Z
+date: 2021-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-cloudformation
@@ -81,7 +81,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - mike.williams@rea-group.com
 - arvind.kunday@rea-group.com
@@ -122,23 +122,23 @@ homepage: https://github.com/realestate-com-au/stackup
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.0.3.1
+signing_key:
 specification_version: 4
 summary: Manage CloudFormation stacks
 test_files: