stack_master 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44ae5dfa519051496de9c2707df2441f8a0a9115
-  data.tar.gz: 8f2065b8c59a2a2399f0398a0dc6a8541d864287
+  metadata.gz: d5d29ac1458d3d02d58c32fb317667305d2a6ca0
+  data.tar.gz: 093812e92afeca3f64aa0db34999222c85161c7b
 SHA512:
-  metadata.gz: 50f3472de66c642581c80398f5430c9fcb596f5b973582834a65bfbca589265be7e2951a584e2459f42f2aa9fcdf1fd2c9fd9bfd07dca1397e8007d67641c6f4
-  data.tar.gz: 2a2e5221add3e4aa4c3910de36f73d26eb551d63b3272526e5329124d386feccc8566bcbe593a4e49833e8996c7835ab1d577b4e72d70326176fbc5242f45c1e
+  metadata.gz: a2695db0d497f24a78f583b14377ff3f88869d055262696eca00c61d2ed111faa83801aaf1c5d9499e412c6c51c1c18ae2621188dd88180c361b27a07176f78c
+  data.tar.gz: 53940ce6b011d5adbf44bf4c7f3ab0b9467101989eea7d23412198eac63caeb474ca1e95bc606b577588f70d114637f8d08749897494749b02a9468ecc159c28

data/lib/stack_master/aws_driver/cloud_formation.rb

@@ -23,6 +23,7 @@ module StackMaster
                           :describe_stack_resources,
                           :get_template,
                           :get_stack_policy,
+                          :set_stack_policy,
                           :describe_stack_events,
                           :update_stack,
                           :create_stack,

data/lib/stack_master/cli.rb

@@ -41,7 +41,7 @@ module StackMaster
         c.summary = 'Creates or updates a stack'
         c.description = "Creates or updates a stack. Shows a diff of the proposed stack's template and parameters. Tails stack events until CloudFormation has completed."
         c.example 'update a stack named myapp-vpc in us-east-1', 'stack_master apply us-east-1 myapp-vpc'
-        c.option '--on-failure ACTION', String, 'Action to take on CREATE_FAILURE. Valid Values: [ DO_NOTHING | ROLLBACK | DELETE ]. Default: ROLLBACK'
+        c.option '--on-failure ACTION', String, "Action to take on CREATE_FAILURE. Valid Values: [ DO_NOTHING | ROLLBACK | DELETE ]. Default: ROLLBACK\nNote: You cannot use this option with Serverless Application Model (SAM) templates."
         c.action do |args, options|
           options.defaults config: default_config_file
           execute_stacks_command(StackMaster::Commands::Apply, args, options)

data/lib/stack_master/commands/apply.rb

@@ -12,7 +12,7 @@ module StackMaster
         @stack_definition = stack_definition
         @from_time = Time.now
         @options = options
-        @options.on_failure ||= "ROLLBACK"
+        @options.on_failure ||= nil
       end
 
       def perform
@@ -21,6 +21,7 @@ module StackMaster
         ensure_valid_template_body_size!
         create_or_update_stack
         tail_stack_events
+        set_stack_policy
       end
 
       private
@@ -62,12 +63,32 @@ module StackMaster
       end
 
       def create_stack
+        upload_files
+        if use_change_set?
+          create_stack_by_change_set
+        else
+          create_stack_directly
+        end
+      end
+
+      def use_change_set?
+        @options.on_failure.nil?
+      end
+
+      def create_stack_by_change_set
+        @change_set = ChangeSet.create(stack_options.merge(change_set_type: 'CREATE'))
+        halt!(@change_set.status_reason) if @change_set.failed?
+        @change_set.display(StackMaster.stdout)
         unless ask?('Create stack (y/n)? ')
-          failed!("Stack creation aborted")
+          cf.delete_stack(stack_name: stack_name)
+          halt!('Stack creation aborted')
         end
-        upload_files
-        on_failure = @config.stack_defaults['on_failure'] || @options.on_failure
-        cf.create_stack(stack_options.merge({tags: proposed_stack.aws_tags, on_failure: on_failure}))
+        execute_change_set
+      end
+
+      def create_stack_directly
+        failed!('Stack creation aborted') unless ask?('Create stack (y/n)? ')
+        cf.create_stack(stack_options.merge(on_failure: @options.on_failure))
       end
 
       def ask_to_cancel_stack_update
@@ -121,10 +142,10 @@ module StackMaster
         {
           stack_name: stack_name,
           parameters: proposed_stack.aws_parameters,
+          tags: proposed_stack.aws_tags,
           capabilities: ['CAPABILITY_IAM', 'CAPABILITY_NAMED_IAM'],
           role_arn: proposed_stack.role_arn,
           notification_arns: proposed_stack.notification_arns,
-          stack_policy_body: proposed_stack.stack_policy_body,
           template_method => template_value
         }
       end
@@ -166,6 +187,19 @@ module StackMaster
         end
       end
 
+      def set_stack_policy
+        current_policy = stack && stack.stack_policy_body
+        proposed_policy = proposed_stack.stack_policy_body
+        # No need to reset a stack policy if it's nil or not changed
+        return if proposed_policy.nil? || proposed_policy == current_policy
+        StackMaster.stdout.print 'Setting a stack policy...'
+        cf.set_stack_policy(
+          stack_name: stack_name,
+          stack_policy_body: proposed_policy
+        )
+        StackMaster.stdout.puts 'done.'
+      end
+
       extend Forwardable
       def_delegators :@stack_definition, :stack_name, :region
     end

data/lib/stack_master/stack.rb

@@ -41,7 +41,7 @@ module StackMaster
         params_hash[param_struct.parameter_key] = param_struct.parameter_value
         params_hash
       end
-      template_body ||= cf.get_template(stack_name: stack_name).template_body
+      template_body ||= cf.get_template(stack_name: stack_name, template_stage: 'Original').template_body
       template_format = TemplateUtils.identify_template_format(template_body)
       stack_policy_body ||= cf.get_stack_policy(stack_name: stack_name).stack_policy_body
       outputs = cf_stack.outputs

data/lib/stack_master/test_driver/cloud_formation.rb

@@ -87,6 +87,8 @@ module StackMaster
         options.merge!(change_set_id: id)
         @change_sets[id] = options
         @change_sets[options.fetch(:change_set_name)] = options
+        stack_name = options.fetch(:stack_name)
+        add_stack(stack_name: stack_name, stack_status: 'REVIEW_IN_PROGRESS') unless @stacks[stack_name]
         OpenStruct.new(id: id)
       end
 
@@ -106,7 +108,7 @@ module StackMaster
       def execute_change_set(options)
         change_set_id = options.fetch(:change_set_name)
         change_set = @change_sets.fetch(change_set_id)
-        update_stack(change_set)
+        @stacks[change_set.fetch(:stack_name)].attributes = change_set
       end
 
       def delete_change_set(options)
@@ -142,17 +144,15 @@ module StackMaster
         OpenStruct.new(stack_policy_body: @stack_policies[options.fetch(:stack_name)])
       end
 
+      def set_stack_policy(options)
+        @stack_policies[options.fetch(:stack_name)] = options[:stack_policy_body]
+      end
+
       def describe_stack_events(options)
         events = @stack_events[options.fetch(:stack_name)] || []
         OpenStruct.new(stack_events: events, next_token: nil)
       end
 
-      def update_stack(options)
-        stack_name = options.fetch(:stack_name)
-        @stacks[stack_name].attributes = options
-        @stack_policies[stack_name] = options[:stack_policy_body]
-      end
-
       def create_stack(options)
         stack_name = options.fetch(:stack_name)
         add_stack(options)

data/lib/stack_master/version.rb

@@ -1,3 +1,3 @@
 module StackMaster
-  VERSION = "0.15.0"
+  VERSION = "0.16.0"
 end

data/spec/stack_master/commands/apply_spec.rb

@@ -12,6 +12,7 @@ RSpec.describe StackMaster::Commands::Apply do
   let(:parameters) { { 'param_1' => 'hello' } }
   let(:proposed_stack) { StackMaster::Stack.new(template_body: template_body, template_format: template_format, tags: { 'environment' => 'production' } , parameters: parameters, role_arn: role_arn, notification_arns: [notification_arn], stack_policy_body: stack_policy_body ) }
   let(:stack_policy_body) { '{}' }
+  let(:change_set) { double(display: true, failed?: false, id: '1') }
 
   before do
     allow(StackMaster::Stack).to receive(:find).with(region, stack_name).and_return(stack)
@@ -23,6 +24,10 @@ RSpec.describe StackMaster::Commands::Apply do
     allow(StackMaster::StackDiffer).to receive(:new).with(proposed_stack, stack).and_return double.as_null_object
     allow(StackMaster::StackEvents::Streamer).to receive(:stream)
     allow(StackMaster).to receive(:interactive?).and_return(false)
+    allow(cf).to receive(:create_change_set).and_return(OpenStruct.new(id: '1'))
+    allow(StackMaster::ChangeSet).to receive(:create).and_return(change_set)
+    allow(cf).to receive(:execute_change_set).and_return(OpenStruct.new(id: '1'))
+    allow(cf).to receive(:set_stack_policy)
   end
 
   def apply
@@ -31,13 +36,6 @@ RSpec.describe StackMaster::Commands::Apply do
 
   context 'the stack exist' do
     let(:stack) { StackMaster::Stack.new(stack_id: '1') }
-    let(:change_set) { double(display: true, failed?: false, id: 'id-1') }
-
-    before do
-      allow(cf).to receive(:create_change_set).and_return(OpenStruct.new(id: '1'))
-      allow(StackMaster::ChangeSet).to receive(:create).and_return(change_set)
-      allow(cf).to receive(:execute_change_set).and_return(OpenStruct.new(id: '1'))
-    end
 
     it 'creates a change set' do
       apply
@@ -47,10 +45,12 @@ RSpec.describe StackMaster::Commands::Apply do
         parameters: [
           { parameter_key: 'param_1', parameter_value: 'hello' }
         ],
+        tags: [
+          { key: 'environment', value: 'production' }
+        ],
         capabilities: ['CAPABILITY_IAM', 'CAPABILITY_NAMED_IAM'],
         role_arn: role_arn,
-        notification_arns: [notification_arn],
-        stack_policy_body: stack_policy_body
+        notification_arns: [notification_arn]
       )
     end
 
@@ -61,6 +61,23 @@ RSpec.describe StackMaster::Commands::Apply do
       end
     end
 
+    it 'attaches a stack policy to the stack' do
+      apply
+      expect(cf).to have_received(:set_stack_policy).with(
+        stack_name: stack_name,
+        stack_policy_body: stack_policy_body
+      )
+    end
+
+    context 'stack policy is not changed' do
+      let(:stack) { StackMaster::Stack.new(stack_id: '1', stack_policy_body: stack_policy_body) }
+
+      it 'does not set a stack policy' do
+        apply
+        expect(cf).to_not have_received(:set_stack_policy)
+      end
+    end
+
     context 'when using s3' do
       before do
         stack_definition.s3 = {
@@ -122,24 +139,52 @@ RSpec.describe StackMaster::Commands::Apply do
   context 'the stack does not exist' do
     let(:stack) { nil }
 
-    it 'calls the create stack API method' do
+    it 'creates a change set for a new stack' do
       apply
-      expect(cf).to have_received(:create_stack).with(
+      expect(StackMaster::ChangeSet).to have_received(:create).with(
         stack_name: stack_name,
         template_body: proposed_stack.template_body,
         parameters: [
           { parameter_key: 'param_1', parameter_value: 'hello' }
         ],
         tags: [
-          {
-            key: 'environment',
-            value: 'production'
-          }],
+          { key: 'environment', value: 'production' }
+        ],
         capabilities: ['CAPABILITY_IAM', 'CAPABILITY_NAMED_IAM'],
         role_arn: role_arn,
         notification_arns: [notification_arn],
-        stack_policy_body: stack_policy_body,
-        on_failure: 'ROLLBACK'
+        change_set_type: 'CREATE'
+      )
+    end
+
+    context 'on_failure option is set' do
+      it 'calls the create stack API method' do
+        options = Commander::Command::Options.new
+        options.on_failure = 'ROLLBACK'
+        StackMaster::Commands::Apply.perform(config, stack_definition, options)
+        apply
+        expect(cf).to have_received(:create_stack).with(
+          stack_name: stack_name,
+          template_body: proposed_stack.template_body,
+          parameters: [
+            { parameter_key: 'param_1', parameter_value: 'hello' }
+          ],
+          tags: [
+            { key: 'environment', value: 'production' }
+          ],
+          capabilities: ['CAPABILITY_IAM', 'CAPABILITY_NAMED_IAM'],
+          role_arn: role_arn,
+          notification_arns: [notification_arn],
+          on_failure: 'ROLLBACK'
+        )
+      end
+    end
+
+    it 'attaches a stack policy to the created stack' do
+      apply
+      expect(cf).to have_received(:set_stack_policy).with(
+        stack_name: stack_name,
+        stack_policy_body: stack_policy_body
       )
     end
 
@@ -161,21 +206,21 @@ RSpec.describe StackMaster::Commands::Apply do
       end
     end
 
-    it 'on_failure can be set to a custom value' do
-      config.stack_defaults['on_failure'] = 'DELETE'
-      apply
-      expect(cf).to have_received(:create_stack).with(
-        hash_including(on_failure: 'DELETE')
-      )
-    end
+    context 'user decides to not create a stack' do
+      before do
+        allow(StackMaster).to receive(:non_interactive_answer).and_return('n')
+        allow(cf).to receive(:delete_stack)
+        allow(StackMaster::ChangeSet).to receive(:execute)
+        apply
+      end
 
-    it 'on_failure can be passed in options' do
-      options = Commander::Command::Options.new
-      options.on_failure = 'DELETE'
-      StackMaster::Commands::Apply.perform(config, stack_definition, options)
-      expect(cf).to have_received(:create_stack).with(
-        hash_including(on_failure: 'DELETE')
-      )
+      it 'deletes the stack' do
+        expect(cf).to have_received(:delete_stack).with(stack_name: stack_name)
+      end
+
+      it "doesn't execute the change set" do
+        expect(StackMaster::ChangeSet).to_not have_received(:execute).with(change_set.id)
+      end
     end
   end
 

data/spec/stack_master/test_driver/cloud_formation_spec.rb

@@ -8,7 +8,6 @@ RSpec.describe StackMaster::TestDriver::CloudFormation do
       test_cf_driver.create_stack(stack_id: "1", stack_name: 'stack-1')
       test_cf_driver.create_stack(stack_id: "2", stack_name: 'stack-2')
       expect(test_cf_driver.describe_stacks.stacks.map(&:stack_id)).to eq(["1", "2"])
-
     end
 
     it 'adds and gets stack events' do
@@ -22,6 +21,12 @@ RSpec.describe StackMaster::TestDriver::CloudFormation do
       test_cf_driver.set_template('stack-1', 'blah')
       expect(test_cf_driver.get_template(stack_name: 'stack-1').template_body).to eq 'blah'
     end
+
+    it 'sets and gets stack policies' do
+      stack_policy_body = '{}'
+      test_cf_driver.set_stack_policy(stack_name: 'stack-1', stack_policy_body: stack_policy_body)
+      expect(test_cf_driver.get_stack_policy(stack_name: 'stack-1').stack_policy_body).to eq(stack_policy_body)
+    end
   end
 
   context 'change sets' do
@@ -39,6 +44,14 @@ RSpec.describe StackMaster::TestDriver::CloudFormation do
       expect(change_set.change_set_id).to eq change_set_id
       expect(change_set.change_set_name).to eq 'change-set-1'
     end
+
+    it 'creates stacks using change sets and describes stacks' do
+      change_set1 = test_cf_driver.create_change_set(change_set_name: 'change-set-1', stack_name: 'stack-1', change_set_type: 'CREATE')
+      change_set2 = test_cf_driver.create_change_set(change_set_name: 'change-set-2', stack_name: 'stack-2', change_set_type: 'CREATE')
+      test_cf_driver.execute_change_set(change_set_name: change_set1.id)
+      test_cf_driver.execute_change_set(change_set_name: change_set2.id)
+      expect(test_cf_driver.describe_stacks.stacks.map(&:stack_name)).to eq(['stack-1', 'stack-2'])
+    end
   end
 
   it 'deletes change sets' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stack_master
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Steve Hodgkiss
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-27 00:00:00.000000000 Z
+date: 2017-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -450,7 +450,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: StackMaster is a sure-footed way of creating, updating and keeping track