stackup 1.4.5 → 1.7.0

data/lib/stackup/source.rb

@@ -15,7 +15,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.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "aws-sdk-cloudformation"
 require "logger"
 require "multi_json"
@@ -16,10 +18,10 @@ module Stackup
     DEFAULT_WAIT_POLL_INTERVAL = 5 # seconds
 
     def initialize(name, client = {}, options = {})
-      client = Aws::CloudFormation::Client.new(client) if client.is_a?(Hash)
-      @name = name
+      client     = Aws::CloudFormation::Client.new(client) if client.is_a?(Hash)
+      @name      = name
       @cf_client = client
-      @wait = true
+      @wait      = true
       options.each do |key, value|
         public_send("#{key}=", value)
       end
@@ -117,6 +119,9 @@ module Stackup
       if (template_data = options.delete(:template))
         options[:template_body] = MultiJson.dump(template_data)
       end
+      # 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)
       if (parameters = options[:parameters])
         options[:parameters] = Parameters.new(parameters).to_a
       end
@@ -282,7 +287,7 @@ module Stackup
     end
 
     def create(options)
-      options = options.dup
+      options              = options.dup
       options[:stack_name] = name
       options.delete(:stack_policy_during_update_body)
       options.delete(:stack_policy_during_update_url)
@@ -312,7 +317,7 @@ module Stackup
     def event_handler
       @event_handler ||= lambda do |e|
         fields = [e.logical_resource_id, e.resource_status, e.resource_status_reason]
-        time = e.timestamp.localtime.strftime("%H:%M:%S")
+        time   = e.timestamp.localtime.strftime("%H:%M:%S")
         logger.info("[#{time}] #{fields.compact.join(' - ')}")
       end
     end
@@ -369,7 +374,13 @@ module Stackup
           { :key => key, :value => value.to_s }
         end
       else
-        tags
+        tags.map do |tag|
+          if tag.key?("Key")
+            { :key => tag["Key"], :value => tag["Value"].to_s }
+          else
+            { :key => tag[:key], :value => tag[:value].to_s }
+          end
+        end
       end
     end
 
@@ -384,8 +395,8 @@ module Stackup
       handling_cf_errors do
         {}.tap do |result|
           cf_stack.public_send(collection_name).each do |item|
-            key = item.public_send(key_name)
-            value = item.public_send(value_name)
+            key         = item.public_send(key_name)
+            value       = item.public_send(value_name)
             result[key] = value
           end
         end

data/lib/stackup/version.rb

@@ -1,5 +1,5 @@
 module Stackup
 
-  VERSION = "1.4.5".freeze
+  VERSION = "1.7.0".freeze
 
 end

data/spec/stackup/main_command_spec.rb

@@ -0,0 +1,56 @@
+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/rake_tasks_spec.rb

@@ -1,8 +1,8 @@
-require 'spec_helper'
-require 'stackup/rake_tasks'
+require "spec_helper"
+require "stackup/rake_tasks"
 
 RSpec.describe Stackup::RakeTasks do
-  it 'can be required' do
+  it "can be required" do
     expect(described_class).to be_truthy
   end
 end

data/spec/stackup/source_spec.rb

@@ -124,6 +124,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

@@ -260,6 +260,26 @@ describe Stackup::Stack do
 
       end
 
+      context "with :tags in SDK form as they arrive from file" do
+
+        before do
+          options[:tags] = [
+            { "Key" => "foo", "Value" => "bar" }
+          ]
+        end
+
+        it "converts them to an Array, that uses symbols as keys" do
+          expected_tags = [
+            { :key => "foo", :value => "bar" }
+          ]
+          create_or_update
+          expect(cf_client).to have_received(:create_stack) do |options|
+            expect(options[:tags]).to eq(expected_tags)
+          end
+        end
+
+      end
+
       context "with :tags in SDK form" do
 
         before do
@@ -322,6 +342,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
@@ -392,6 +429,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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stackup
 version: !ruby/object:Gem::Version
-  version: 1.4.5
+  version: 1.7.0
 platform: ruby
 authors:
 - Mike Williams
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-03 00:00:00.000000000 Z
+date: 2020-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-cloudformation
@@ -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
@@ -141,6 +143,7 @@ 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