stackup 1.5.0 → 1.7.1

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"
 
@@ -15,7 +17,7 @@ module Stackup
 
     def s3?
       uri.scheme == "https" &&
-        uri.host =~ /(^|\.)s3(-\w+-\w+-\d)?\.amazonaws\.com$/
+        uri.host =~ /(^|\.)s3((\.|-)\w+-\w+-\d)?\.amazonaws\.com$/
     end
 
     def body

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.5.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

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+require "stackup/main_command"
+
+describe Stackup::MainCommand do
+
+  let(:mock_change_set) { double }
+
+  before(:example) do
+    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)
+  end
+
+  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"
+      }
+      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"
+                               ])
+    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
+      }
+      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"
+                               ])
+    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
+      }
+      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"
+                               ])
+    end
+  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"
@@ -124,6 +126,16 @@ describe Stackup::Source do
 
     end
 
+    context "with dot separated bucket and region" do
+
+      let(:s3_url) { "https://bucket.s3.us-east-1.amazonaws.com/cfn/template.yml" }
+
+      it "is S3" do
+        expect(subject).to be_s3
+      end
+
+    end
+
   end
 
 end

data/spec/stackup/stack_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 require "stackup/stack"
@@ -342,6 +344,23 @@ describe Stackup::Stack do
           .with(hash_including(expected_args))
       end
 
+      it "passes options through to :create_change_set" do
+        options = {
+          :template_body => template,
+          :role_arn => "service role arn"
+        }
+        expected_args = {
+          :stack_name => stack_name,
+          :change_set_name => change_set_name,
+          :change_set_type => "CREATE",
+          :template_body => template,
+          :role_arn => "service role arn"
+        }
+        stack.change_set(change_set_name).create(options)
+        expect(cf_client).to have_received(:create_change_set)
+          .with(hash_including(expected_args))
+      end
+
       context "with :template as data" do
 
         let(:options) do
@@ -412,6 +431,38 @@ describe Stackup::Stack do
 
       end
 
+      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."
+                                   }])
+          expect { create_change_set }.to raise_error(Stackup::StackUpdateError)
+        end
+      end
+
+      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."
+                                   }])
+          options[:allow_empty_change_set] = true
+          expect { create_change_set }.not_to raise_error
+        end
+      end
+
+      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"
+                                   }])
+          options[:allow_empty_change_set] = true
+          expect { create_change_set }.to raise_error(Stackup::StackUpdateError)
+        end
+      end
+
     end
 
     describe "#change_set#execute" do

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.5.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Mike Williams
 - Arvind Kunday
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-20 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
@@ -99,6 +99,7 @@ files:
 - lib/stackup/differ.rb
 - lib/stackup/error_handling.rb
 - lib/stackup/errors.rb
+- lib/stackup/main_command.rb
 - lib/stackup/parameters.rb
 - lib/stackup/rake_tasks.rb
 - lib/stackup/service.rb
@@ -109,6 +110,7 @@ files:
 - lib/stackup/version.rb
 - lib/stackup/yaml.rb
 - spec/spec_helper.rb
+- spec/stackup/main_command_spec.rb
 - spec/stackup/parameters_spec.rb
 - spec/stackup/rake_tasks_spec.rb
 - spec/stackup/source_spec.rb
@@ -120,27 +122,28 @@ 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:
 - spec/spec_helper.rb
+- spec/stackup/main_command_spec.rb
 - spec/stackup/parameters_spec.rb
 - spec/stackup/rake_tasks_spec.rb
 - spec/stackup/source_spec.rb