stack_master 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0290ee1dd10780abd86abcd6818ff3e4ad913380
-  data.tar.gz: 57dd36502a7e98b1940336f9f3a8aa3364a2a6bd
+  metadata.gz: 106f5899a9d5076230bdf26135167adf3d658182
+  data.tar.gz: 8fd1dea5cd5026d8c316b641928ba14457c5fa8c
 SHA512:
-  metadata.gz: c2e1bec9d3deefa251ba550f75fb7c43013efedafd0c5e37ccccc3eb65c2d26e367b6386ad370d3b4bea584c5fef1ac04306e15ea901c4595883c0502b10b943
-  data.tar.gz: c4f02a55dbd4ed0b82747ff3172ba023f99aff8445dcfd085eb91d6498ce9b491e6b41ef6cc05266a4d0ecc5ac7e07e8b757453d13199243997bc94de556242f
+  metadata.gz: 6db154802da177625841f36cbc9924140990a92133c57cbd080643849b2d58cc1b2a6e7ed0bdc80c4fca5d2df2e0391a5d1e077a361914cfb6cc533f18e9e20d
+  data.tar.gz: 6d657581c952323eb3fe878094fd3f86847f01525f65bddd21cdb5be473a47d9770e095b5cbd51d8abfe9ff373e8f3649f27917cbac8ef6803defbb7819c4265

data/README.md

@@ -255,6 +255,7 @@ stack_master apply [region-or-alias] [stack-name] # Create or update a stack
 stack_master apply [region-or-alias] [stack-name] [region-or-alias] [stack-name] # Create or update multiple stacks
 stack_master apply [region-or-alias] # Create or update stacks in the given region
 stack_master apply # Create or update all stacks
+stack_master --changed apply # Create or update all stacks that have changed
 stack_master --yes apply [region-or-alias] [stack-name] # Create or update a stack non-interactively (forcing yes)
 stack_master diff [region-or-alias] [stack-name] # Display a stack tempalte and parameter diff
 stack_master delete [region-or-alias] [stack-name] # Delete a stack

data/features/apply.feature

@@ -123,6 +123,20 @@ Feature: Apply command
     And the output should match /2020-10-29 00:00:00 \+[0-9]{4} myapp-web AWS::CloudFormation::Stack CREATE_COMPLETE/
     Then the exit status should be 0
 
+  Scenario: Create stack with --changed
+    Given I stub the following stack events:
+      | stack_id | event_id | stack_name | logical_resource_id | resource_status | resource_type              | timestamp           |
+      | 1        | 1        | myapp-vpc  | TestSg              | CREATE_COMPLETE | AWS::EC2::SecurityGroup    | 2020-10-29 00:00:00 |
+      | 1        | 1        | myapp-vpc  | myapp-vpc           | CREATE_COMPLETE | AWS::CloudFormation::Stack | 2020-10-29 00:00:00 |
+      | 1        | 1        | myapp-web  | TestSg              | CREATE_COMPLETE | AWS::EC2::SecurityGroup    | 2020-10-29 00:00:00 |
+      | 1        | 1        | myapp-web  | myapp-web           | CREATE_COMPLETE | AWS::CloudFormation::Stack | 2020-10-29 00:00:00 |
+    When I run `stack_master --changed apply us-east-1 --trace`
+    And the output should contain all of these lines:
+      | Stack diff:                                                                    |
+      | +    "Vpc": {                                                                  |
+      | Parameters diff:                                                               |
+      | KeyName: my-key                                                                |
+
   Scenario: Run apply with 2 specific stacks and create 2 stacks
     Given I stub the following stack events:
       | stack_id | event_id | stack_name | logical_resource_id | resource_status | resource_type              | timestamp           |
@@ -191,6 +205,99 @@ Feature: Apply command
       | Parameters diff: No changes                                                    |
     Then the exit status should be 0
 
+  Scenario: Update an existing stack that has changed with --changed
+    Given I stub the following stack events:
+      | stack_id | event_id | stack_name | logical_resource_id | resource_status | resource_type              | timestamp           |
+      | 1        | 1        | myapp-vpc  | TestSg              | CREATE_COMPLETE | AWS::EC2::SecurityGroup    | 2020-10-29 00:00:00 |
+      | 1        | 1        | myapp-vpc  | myapp-vpc           | CREATE_COMPLETE | AWS::CloudFormation::Stack | 2020-10-29 00:00:00 |
+    And I stub the following stacks:
+      | stack_id | stack_name | parameters       | region    |
+      | 1        | myapp-vpc  | KeyName=my-key   | us-east-1 |
+    And I stub a template for the stack "myapp-vpc":
+      """
+      {
+        "Description": "Test template",
+        "AWSTemplateFormatVersion": "2010-09-09",
+        "Parameters": {
+          "KeyName": {
+            "Description": "Key Name",
+            "Type": "String"
+          }
+        },
+        "Resources": {
+          "TestSg": {
+            "Type": "AWS::EC2::SecurityGroup",
+            "Properties": {
+              "GroupDescription": "Test SG",
+              "VpcId": {
+                "Ref": "VpcId"
+              }
+            }
+          },
+          "TestSg2": {
+            "Type": "AWS::EC2::SecurityGroup",
+            "Properties": {
+              "GroupDescription": "Test SG 2",
+              "VpcId": {
+                "Ref": "VpcId"
+              }
+            }
+          }
+        }
+      }
+      """
+    When I run `stack_master --changed apply us-east-1 myapp-vpc --trace`
+    And the output should contain all of these lines:
+      | Stack diff:                                                                    |
+      | -    "TestSg2": {                                                              |
+      | Parameters diff: No changes                                                    |
+    Then the exit status should be 0
+
+  Scenario: Update an existing stack that hasn't changed with --changed
+    Given I stub the following stack events:
+      | stack_id | event_id | stack_name | logical_resource_id | resource_status | resource_type              | timestamp           |
+      | 1        | 1        | myapp-vpc  | TestSg              | CREATE_COMPLETE | AWS::EC2::SecurityGroup    | 2020-10-29 00:00:00 |
+      | 1        | 1        | myapp-vpc  | myapp-vpc           | CREATE_COMPLETE | AWS::CloudFormation::Stack | 2020-10-29 00:00:00 |
+    And I stub the following stacks:
+      | stack_id | stack_name | parameters       | region    |
+      | 1        | myapp-vpc  | KeyName=my-key   | us-east-1 |
+    And I stub a template for the stack "myapp-vpc":
+      """
+      {
+        "Description": "Test template",
+        "AWSTemplateFormatVersion": "2010-09-09",
+        "Parameters": {
+          "KeyName": {
+            "Description": "Key name",
+            "Type": "String"
+          }
+        },
+        "Resources": {
+          "Vpc": {
+            "Type": "AWS::EC2::VPC",
+            "Properties": {
+              "CidrBlock": "10.200.0.0/16"
+            }
+          }
+        },
+        "Outputs": {
+          "VpcId": {
+            "Description": "A VPC ID",
+            "Value": {
+              "Ref": "Vpc"
+            }
+          }
+        }
+      }
+      """
+    When I run `stack_master --changed apply us-east-1 myapp-vpc --trace`
+    And the output should not contain all of these lines:
+      | Stack diff:                                                                    |
+      | -    "TestSg2": {                                                              |
+      | Parameters diff: No changes                                                    |
+    Then the exit status should be 0
+
+
   Scenario: Create a stack using a stack output resolver
     Given a file named "parameters/myapp_web.yml" with:
       """

data/lib/stack_master.rb

@@ -22,6 +22,7 @@ require "stack_master/stack_events/fetcher"
 require "stack_master/stack_events/presenter"
 require "stack_master/stack_events/streamer"
 require "stack_master/stack_states"
+require "stack_master/stack_status"
 require "stack_master/sns_topic_finder"
 require "stack_master/security_group_finder"
 require "stack_master/parameter_loader"

data/lib/stack_master/cli.rb

@@ -18,10 +18,11 @@ module StackMaster
 
     def execute!
       program :name, 'StackMaster'
-      program :version, '0.0.1'
+      program :version, StackMaster::VERSION
       program :description, 'AWS Stack Management'
 
       global_option '-c', '--config FILE', String, 'Config file to use'
+      global_option '--changed', 'filter stack selection to only ones that have changed'
       global_option '-y', '--yes', 'Run in non-interactive mode answering yes to any prompts' do
         StackMaster.non_interactive!
         StackMaster.non_interactive_answer = 'y'
@@ -183,10 +184,14 @@ module StackMaster
         stack_name = Utils.underscore_to_hyphen(stack_name)
         stack_definitions = config.filter(region, stack_name)
         if stack_definitions.empty?
-          say "Could not find stack definition #{stack_name} in region #{region}"
+          StackMaster.stdout.puts "Could not find stack definition #{stack_name} in region #{region}"
         end
+        stack_definitions = stack_definitions.select do |stack_definition|
+          StackStatus.new(config, stack_definition).changed?
+        end if options.changed
         stack_definitions.each do |stack_definition|
           StackMaster.cloud_formation_driver.set_region(stack_definition.region)
+          StackMaster.stdout.puts "Executing #{command.command_name} on #{stack_definition.stack_name} in #{stack_definition.region}"
           command_results.push command.perform(config, stack_definition, options).success?
         end
       end

data/lib/stack_master/command.rb

@@ -8,6 +8,10 @@ module StackMaster
       def perform(*args)
         new(*args).tap { |command| command.perform }
       end
+
+      def command_name
+        name.split('::').last.underscore
+      end
     end
 
     def failed

data/lib/stack_master/commands/status.rb

@@ -12,9 +12,14 @@ module StackMaster
       def perform
         progress if @show_progress
         status = @config.stacks.map do |stack_definition|
-          status = get_status(stack_definition)
+          stack_status = StackStatus.new(@config, stack_definition)
           progress.increment if @show_progress
-          status
+          {
+            region: stack_definition.region,
+            stack_name: stack_definition.stack_name,
+            stack_status: stack_status.status,
+            different: stack_status.changed_message,
+          }
         end
         tp.set :max_width, self.window_size
         tp.set :io, StackMaster.stdout
@@ -33,32 +38,6 @@ module StackMaster
       def sort_params(hash)
         hash.sort.to_h
       end
-
-      def get_status(stack_definition)
-        region = stack_definition.region
-        stack_name = stack_definition.stack_name
-        begin
-          driver = StackMaster.cloud_formation_driver
-          driver.set_region(region)
-          stack = Stack.find(region, stack_name)
-          if stack
-            proposed_stack = Stack.generate(stack_definition, @config)
-            differ = StackMaster::StackDiffer.new(proposed_stack, stack)
-            different = differ.body_different? || differ.params_different?
-            stack_status = stack.stack_status
-            noecho = !differ.noecho_keys.empty?
-          else
-            different = true
-            stack_status = nil
-          end
-        rescue Aws::CloudFormation::Errors::ValidationError
-          stack_status = "missing"
-          different = true
-        end
-
-        { region: region, stack_name: stack_name, stack_status: stack_status, different: different ? "Yes" : (noecho ? "No *" : "No") }
-      end
-
     end
   end
 end

data/lib/stack_master/stack_differ.rb

@@ -10,11 +10,19 @@ module StackMaster
     end
 
     def current_template
-      JSON.pretty_generate(@current_stack.template_hash)
+      if @current_stack
+        JSON.pretty_generate(@current_stack.template_hash)
+      else
+        ''
+      end
     end
 
     def current_parameters
-      YAML.dump(sort_params(@current_stack.parameters_with_defaults))
+      if @current_stack
+        YAML.dump(sort_params(@current_stack.parameters_with_defaults))
+      else
+        ''
+      end
     end
 
     def proposed_parameters
@@ -29,25 +37,28 @@ module StackMaster
     end
 
     def body_different?
-      Diffy::Diff.new(current_template, proposed_template, {}).to_s != ''
+      body_diff != ''
+    end
+
+    def body_diff
+      @body_diff ||= Diffy::Diff.new(current_template, proposed_template, context: 7, include_diff_info: true).to_s
     end
 
     def params_different?
-      Diffy::Diff.new(current_parameters, proposed_parameters, {}).to_s != ''
+      params_diff != ''
+    end
+
+    def params_diff
+      @param_diff ||= Diffy::Diff.new(current_parameters, proposed_parameters, {}).to_s
     end
 
     def output_diff
-      if @current_stack
-        text_diff('Stack', current_template, proposed_template, context: 7, include_diff_info: true)
-        text_diff('Parameters', current_parameters, proposed_parameters)
-        unless noecho_keys.empty?
-          StackMaster.stdout.puts " * can not tell if NoEcho parameters are different."
-        end
-      else
-        text_diff('Stack', '', proposed_template)
-        text_diff('Parameters', '', proposed_parameters)
-        StackMaster.stdout.puts "No stack found"
+      display_diff('Stack', body_diff)
+      display_diff('Parameters', params_diff)
+      unless noecho_keys.empty?
+        StackMaster.stdout.puts " * can not tell if NoEcho parameters are different."
       end
+      StackMaster.stdout.puts "No stack found" if @current_stack.nil?
     end
 
     def noecho_keys
@@ -62,8 +73,7 @@ module StackMaster
 
     private
 
-    def text_diff(thing, current, proposed, diff_opts = {})
-      diff = Diffy::Diff.new(current, proposed, diff_opts).to_s
+    def display_diff(thing, diff)
       StackMaster.stdout.print "#{thing} diff: "
       if diff == ''
         StackMaster.stdout.puts "No changes"

data/lib/stack_master/stack_status.rb

@@ -0,0 +1,61 @@
+module StackMaster
+  class StackStatus
+    def initialize(config, stack_definition)
+      @config = config
+      @stack_definition = stack_definition
+    end
+
+    def changed_message
+      if changed?
+        'Yes'
+      elsif no_echo_params?
+        'No *'
+      else
+        'No'
+      end
+    end
+
+    def changed?
+      stack.nil? || body_changed? || parameters_changed?
+    end
+
+    def status
+      stack ? stack.stack_status : nil
+    end
+
+    def body_changed?
+      stack.nil? || differ.body_different?
+    end
+
+    def parameters_changed?
+      stack.nil? || differ.params_different?
+    end
+
+    def no_echo_params?
+      !differ.noecho_keys.empty?
+    end
+
+    private
+
+    def stack
+      return @stack if defined?(@stack)
+      StackMaster.cloud_formation_driver.set_region(stack_definition.region)
+      @stack = find_stack
+    end
+
+    def find_stack
+      Stack.find(stack_definition.region, stack_definition.stack_name)
+    rescue Aws::CloudFormation::Errors::ValidationError
+    end
+
+    def differ
+      @differ ||= StackMaster::StackDiffer.new(proposed_stack, stack)
+    end
+
+    def proposed_stack
+      @proposed_stack ||= Stack.generate(stack_definition, @config)
+    end
+
+    attr_reader :stack_definition
+  end
+end

data/lib/stack_master/version.rb

@@ -1,3 +1,3 @@
 module StackMaster
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/spec/stack_master/commands/status_spec.rb

@@ -21,6 +21,7 @@ RSpec.describe StackMaster::Commands::Status do
       let(:stack2) { double(:stack2, template_hash: {}, parameters_with_defaults: {a: 2}, stack_status: 'CREATE_COMPLETE') }
       let(:proposed_stack1) { double(:proposed_stack1, template_body: "{}", parameters_with_defaults: {a: 1}) }
       let(:proposed_stack2) { double(:proposed_stack2, template_body: "{}", parameters_with_defaults: {a: 1}) }
+
       it "returns the status of call stacks" do
         out = "REGION    | STACK_NAME | STACK_STATUS    | DIFFERENT\n----------|------------|-----------------|----------\nus-east-1 | stack1     | UPDATE_COMPLETE | No       \nus-east-1 | stack2     | CREATE_COMPLETE | Yes      \n * No echo parameters can't be diffed\n"
         expect { status.perform }.to output(out).to_stdout
@@ -32,6 +33,7 @@ RSpec.describe StackMaster::Commands::Status do
       let(:stack2) { double(:stack2, template_hash: {}, parameters_with_defaults: {a: 1}, stack_status: 'CREATE_COMPLETE') }
       let(:proposed_stack1) { double(:proposed_stack1, template_body: "{}", parameters_with_defaults: {a: 1}) }
       let(:proposed_stack2) { double(:proposed_stack2, template_body: "{}", parameters_with_defaults: {a: 1}) }
+
       it "returns the status of call stacks" do
         out = "REGION    | STACK_NAME | STACK_STATUS    | DIFFERENT\n----------|------------|-----------------|----------\nus-east-1 | stack1     | UPDATE_COMPLETE | Yes      \nus-east-1 | stack2     | CREATE_COMPLETE | No       \n * No echo parameters can't be diffed\n"
         expect { status.perform }.to output(out).to_stdout

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stack_master
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Steve Hodgkiss
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-17 00:00:00.000000000 Z
+date: 2016-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -335,6 +335,7 @@ files:
 - lib/stack_master/stack_events/presenter.rb
 - lib/stack_master/stack_events/streamer.rb
 - lib/stack_master/stack_states.rb
+- lib/stack_master/stack_status.rb
 - lib/stack_master/template_compiler.rb
 - lib/stack_master/test_driver/cloud_formation.rb
 - lib/stack_master/testing.rb