stack_master 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be7dbbbfb5ac18598037c53174655253fef33f73
-  data.tar.gz: e1b2cb9dd3846993f497dc51a606053fc7670907
+  metadata.gz: e2c8551f813ec21a55926c685bf281cf9aae2f33
+  data.tar.gz: eabcb88f9bc07a017659ebac349e5a476aca605c
 SHA512:
-  metadata.gz: 5fea5f38e52302091b2ab880cb59ca68ad9e60547a8f09b7eceb52611aa23475b4c3131fa62b9074580264315f7a75c0796c9fe9bebb1fd535c63c11ebe7d130
-  data.tar.gz: 4442a6772b1a8efd992660b9ba720f73208935a1bb0f5760a5e4b2b8ea5d4a1c3675964f4f4c3288d968bf45d3c752c4b05fba49f8487894f995e8cfc4537dbb
+  metadata.gz: 2b3242170d4615b24c88b85f1bf948bd69c00eacb83bafb6120dd37b247928648e4f9f0890e0ba3516b4e5e10eaa7bfacb5d1806bc7c3771a53bd5d02a7cd187
+  data.tar.gz: 0466d851277d7ec84ff4d1d1ed619f078a08bd0da8de70aad2c5e020537faa99a2a7ab6fa6c5c7229504a9455b5d2db87b140e7438707bfda86d4f21ebda73dd

data/README.md

@@ -160,6 +160,15 @@ notification_topic:
   sns_topic: PagerDuty
 ```
 
+### Latest AMI by Tag
+
+Looks up the latest AMI ID by a given set of tags.
+
+```yaml
+web_ami:
+  latest_ami_by_tags: role=web,application=myapp
+```
+
 ## Commands
 
 ```bash
@@ -172,7 +181,7 @@ stack_master delete [region-or-alias] [stack-name] # Delete a stack
 stack_master events [region-or-alias] [stack-name] # Display events for a stack
 stack_master outputs [region-or-alias] [stack-name] # Display outputs for a stack
 stack_master resources [region-or-alias] [stack-name] # Display outputs for a stack
-stack_master status # Displays the status of each stacks
+stack_master status # Displays the status of each stack
 ```
 
 ## Applying updates

data/features/apply.feature

@@ -80,7 +80,7 @@ Feature: Apply command
       | +    "Vpc": {                                                                  |
       | Parameters diff:                                                               |
       | KeyName: my-key                                                                |
-      | 2020-10-29 00:00:00 +1100 myapp-vpc AWS::CloudFormation::Stack CREATE_COMPLETE |
+    And the output should match /2020-10-29 00:00:00 \+[0-9]{4} myapp-vpc AWS::CloudFormation::Stack CREATE_COMPLETE/
     Then the exit status should be 0
 
   Scenario: Run apply and don't create the stack
@@ -94,8 +94,7 @@ Feature: Apply command
       | Parameters diff: |
       | KeyName: my-key  |
       | aborted          |
-    And the output should not contain all of these lines:
-      | 2020-10-29 00:00:00 +1100 myapp-vpc AWS::CloudFormation::Stack CREATE_COMPLETE |
+    And the output should not match /2020-10-29 00:00:00 \+[0-9]{4} myapp-vpc AWS::CloudFormation::Stack CREATE_COMPLETE/ 
     Then the exit status should be 0
 
   Scenario: Run apply on an existing stack
@@ -171,7 +170,7 @@ Feature: Apply command
       | +    "TestSg": {                                                               |
       | Parameters diff:                                                               |
       | VpcId: vpc-xxxxxx                                                              |
-      | 2020-10-29 00:00:00 +1100 myapp-web AWS::CloudFormation::Stack CREATE_COMPLETE |
+    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 a stack with a notification ARN and a stack update policy

data/features/delete.feature

@@ -16,8 +16,7 @@ Feature: Delete command
       | stack_id | event_id | stack_name | logical_resource_id | resource_status | resource_type              | timestamp           |
       |        1 |        1 | myapp-vpc  | myapp-vpc           | DELETE_COMPLETE | AWS::CloudFormation::Stack | 2020-10-29 00:00:00 |
     When I run `stack_master delete us-east-1 myapp-vpc --trace` interactively
-    And the output should contain all of these lines:
-    | 2020-10-29 00:00:00 +1100 myapp-vpc AWS::CloudFormation::Stack DELETE_COMPLETE |
+    And the output should match /2020-10-29 00:00:00 \+[0-9]{4} myapp-vpc AWS::CloudFormation::Stack DELETE_COMPLETE/
     Then the exit status should be 0
 
   Scenario: Run a delete command on a stack that does not exists

data/features/events.feature

@@ -34,5 +34,4 @@ Feature: Events command
       | 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 |
     When I run `stack_master events us-east-1 myapp-vpc --trace`
-    And the output should contain all of these lines:
-      | 2020-10-29 00:00:00 +1100 myapp-vpc AWS::CloudFormation::Stack CREATE_COMPLETE |
+    And the output should match /2020-10-29 00:00:00 \+[0-9]{4} myapp-vpc AWS::CloudFormation::Stack CREATE_COMPLETE/

data/features/region_aliases.feature

@@ -62,5 +62,5 @@ Feature: Region aliases
       | +    "Vpc": {                                                                  |
       | Parameters diff:                                                               |
       | KeyName: my-key                                                                |
-      | 2020-10-29 00:00:00 +1100 myapp-vpc AWS::CloudFormation::Stack CREATE_COMPLETE |
+    And the output should match /2020-10-29 00:00:00 \+[0-9]{4} myapp-vpc AWS::CloudFormation::Stack CREATE_COMPLETE/
     Then the exit status should be 0

data/lib/stack_master.rb

@@ -9,6 +9,7 @@ require 'active_support/core_ext/string'
 require "erb"
 require 'sparkle_formation'
 require 'dotgpg'
+require 'ruby-progressbar'
 
 require "stack_master/ctrl_c"
 require "stack_master/command"
@@ -29,6 +30,7 @@ require "stack_master/parameter_resolvers/stack_output"
 require "stack_master/parameter_resolvers/secret"
 require "stack_master/parameter_resolvers/sns_topic_name"
 require "stack_master/parameter_resolvers/security_group"
+require "stack_master/parameter_resolvers/latest_ami_by_tags"
 require "stack_master/utils"
 require "stack_master/config"
 require "stack_master/stack_definition"

data/lib/stack_master/cli.rb

@@ -127,8 +127,15 @@ module StackMaster
             say "Invalid arguments. stack_master delete [region] [stack_name]"
             return
           end
-          StackMaster.cloud_formation_driver.set_region(args[0])
-          StackMaster::Commands::Delete.perform(*args)
+	  # Because delete can work without a stack_master.yml
+	  if options.config and File.file?(options.config)
+            config = load_config(options.config)
+            region = Utils.underscore_to_hyphen(config.unalias_region(args[0]))
+	  else
+	    region = args[0]
+	  end
+          StackMaster.cloud_formation_driver.set_region(region)
+          StackMaster::Commands::Delete.perform(region, args[1])
         end
       end
 

data/lib/stack_master/commands/status.rb

@@ -3,17 +3,31 @@ module StackMaster
     class Status
       include Command
 
-      def initialize(config)
+      def initialize(config, show_progress = true)
         @config = config
+        @show_progress = show_progress
       end
 
       def perform
+        progress if @show_progress
+        status = @config.stacks.map do |stack_definition|
+          status = get_status(stack_definition)
+          progress.increment if @show_progress
+          status
+        end
         tp.set :io, StackMaster.stdout
-        tp @config.stacks.map { |stack_definition| get_status(stack_definition) }
+        tp status
+        StackMaster.stdout.puts " * No echo parameters can't be diffed"
       end
 
       private
 
+      def progress
+        @progress ||= ProgressBar.create(title: "Fetching stack information",
+                                         total: @config.stacks.size,
+                                         output: StackMaster.stdout)
+      end
+
       def sort_params(hash)
         hash.sort.to_h
       end
@@ -30,6 +44,7 @@ module StackMaster
             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
@@ -39,7 +54,7 @@ module StackMaster
           different = true
         end
 
-        { region: region, stack_name: stack_name, stack_status: stack_status, different: different ? "Yes" : "No" }
+        { region: region, stack_name: stack_name, stack_status: stack_status, different: different ? "Yes" : (noecho ? "No *" : "No") }
       end
 
     end

data/lib/stack_master/parameter_resolvers/latest_ami_by_tags.rb

@@ -0,0 +1,36 @@
+module StackMaster
+  module ParameterResolvers
+    class LatestAmiByTags
+      def initialize(config, stack_definition)
+        @config = config
+        @stack_definition = stack_definition
+      end
+
+      def resolve(value)
+        filters = build_filters(value)
+        find_latest_ami(filters).try(:image_id)
+      end
+
+      private
+
+      def ec2
+        @ec2 ||= Aws::EC2::Client.new(region: @stack_definition.region)
+      end
+
+      def build_filters(value)
+        value.split(',').map do |tag_with_value|
+          tag, value = tag_with_value.strip.split('=')
+          { name: "tag:#{tag}", values: [value] }
+        end
+      end
+
+      def find_latest_ami(filters)
+        images = ec2.describe_images(filters: filters).images
+        sorted_images = images.sort do |a, b|
+          Time.parse(a.creation_date) <=> Time.parse(b.creation_date)
+        end
+        sorted_images.last
+      end
+    end
+  end
+end

data/lib/stack_master/security_group_finder.rb

@@ -8,7 +8,6 @@ module StackMaster
     end
 
     def find(reference)
-      STDERR.puts "Resolving security group reference '#{reference}'"
       raise ArgumentError, 'Security group references must be non-empty strings' unless reference.is_a?(String) && !reference.empty?
 
       groups = @resource.security_groups({

data/lib/stack_master/sns_topic_finder.rb

@@ -7,7 +7,6 @@ module StackMaster
     end
 
     def find(reference)
-      $stderr.puts "Resolving SNS topic reference '#{reference}'"
       raise ArgumentError, 'SNS topic references must be non-empty strings' unless reference.is_a?(String) && !reference.empty?
 
       topic = @resource.topics.detect { |t| topic_name_from_arn(t.arn) == reference }

data/lib/stack_master/stack_differ.rb

@@ -18,7 +18,14 @@ module StackMaster
     end
 
     def proposed_parameters
-      YAML.dump(sort_params(@proposed_stack.parameters_with_defaults))
+      # **** out any secret parameters in the current stack.
+      params = @proposed_stack.parameters_with_defaults
+      if @current_stack
+        noecho_keys.each do |key|
+          params[key] = "****"
+        end
+      end
+      YAML.dump(sort_params(params))
     end
 
     def body_different?
@@ -33,6 +40,9 @@ module StackMaster
       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)
@@ -40,6 +50,16 @@ module StackMaster
       end
     end
 
+    def noecho_keys
+      if @current_stack
+        @current_stack.parameters_with_defaults.select do |key, value|
+          value == "****"
+        end.keys
+      else
+        []
+      end
+    end
+
     private
 
     def text_diff(thing, current, proposed, diff_opts = {})

data/lib/stack_master/version.rb

@@ -1,3 +1,3 @@
 module StackMaster
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/stack_master/commands/status_spec.rb

@@ -1,5 +1,5 @@
 RSpec.describe StackMaster::Commands::Status do
-  subject(:status) { described_class.new(config) }
+  subject(:status) { described_class.new(config, false) }
   let(:config) { instance_double(StackMaster::Config, stacks: stacks) }
   let(:stacks) { [stack_definition_1, stack_definition_2] }
   let(:stack_definition_1) { double(:stack_definition_1, region: 'us-east-1', stack_name: 'stack1') }
@@ -19,7 +19,7 @@ RSpec.describe StackMaster::Commands::Status do
       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"
+        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
       end
     end
@@ -30,7 +30,7 @@ RSpec.describe StackMaster::Commands::Status do
       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"
+        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
       end
     end

data/spec/stack_master/parameter_resolvers/latest_ami_by_tag_spec.rb

@@ -0,0 +1,33 @@
+RSpec.describe StackMaster::ParameterResolvers::LatestAmiByTags do
+  let(:config) { double(base_dir: '/base') }
+  let(:stack_definition) { double(stack_name: 'mystack', region: 'us-east-1') }
+  subject(:resolver) { described_class.new(config, stack_definition) }
+  let(:ec2) { Aws::EC2::Client.new }
+
+  before do
+    allow(Aws::EC2::Client).to receive(:new).and_return(ec2)
+  end
+
+  context 'when matches are found' do
+    before do
+      ec2.stub_responses(:describe_images, images: [
+        { image_id: '1', creation_date: '2015-01-02 00:00:00', tags: [{ key: 'my-tag', value: 'my-value' }] },
+        { image_id: '2', creation_date: '2015-01-03 00:00:00', tags: [{ key: 'my-tag', value: 'my-value' }] }
+      ])
+    end
+
+    it 'returns the latest one' do
+      expect(resolver.resolve('my-tag=my-value')).to eq '2'
+    end
+  end
+
+  context 'when no matches are found' do
+    before do
+      ec2.stub_responses(:describe_images, images: [])
+    end
+
+    it 'returns nil' do
+      expect(resolver.resolve('my-tag=my-value')).to be_nil
+    end
+  end
+end

data/spec/stack_master/stack_differ_spec.rb

@@ -1,17 +1,27 @@
 RSpec.describe StackMaster::StackDiffer do
   subject(:differ) { described_class.new(proposed_stack, stack) }
+  let(:current_params) { Hash.new }
+  let(:proposed_params) { { 'param1' => 'hello'} }
   let(:stack) { StackMaster::Stack.new(stack_name: stack_name,
                                        region: region,
                                        stack_id: 123,
                                        template_body: '{}',
-                                       parameters: {}) }
+                                       parameters: current_params) }
   let(:proposed_stack) { StackMaster::Stack.new(stack_name: stack_name,
                                                 region: region,
-                                                parameters: { 'param1' => 'hello'},
+                                                parameters: proposed_params,
                                                 template_body: "{\"a\": 1}") }
   let(:stack_name) { 'myapp-vpc' }
   let(:region) { 'us-east-1' }
 
+  describe "#proposed_parameters" do
+    let(:current_params) { { 'param1' => 'hello',
+                             'param2' => '****'} }
+    it "stars out noecho params" do
+      expect(differ.proposed_parameters).to eq "---\nparam1: hello\nparam2: \"****\"\n"
+    end
+  end
+
   describe "#output_diff" do
     context "entirely new stack" do
       let(:stack) { nil }

data/spec/stack_master/stack_events/presenter_spec.rb

@@ -12,7 +12,7 @@ RSpec.describe StackMaster::StackEvents::Presenter do
     subject(:print_event) { described_class.print_event($stdout, event) }
 
     it "nicely presents event data" do
-      expect { print_event }.to output("\e[0;33;49m2001-01-01 02:02:02 +1100 MyAwesomeQueue AWS::SQS::Queue CREATE_IN_PROGRESS Resource creation Initiated\e[0m\n").to_stdout
+      expect { print_event }.to output("\e[0;33;49m2001-01-01 02:02:02 #{Time.now.strftime('%z')} MyAwesomeQueue AWS::SQS::Queue CREATE_IN_PROGRESS Resource creation Initiated\e[0m\n").to_stdout
     end
   end
 end

data/stack_master.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "cucumber"
   spec.add_development_dependency "aruba"
   spec.add_development_dependency "timecop"
+  spec.add_dependency "ruby-progressbar"
   spec.add_dependency "commander"
   spec.add_dependency "virtus"
   spec.add_dependency "aws-sdk"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stack_master
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Steve Hodgkiss
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-04 00:00:00.000000000 Z
+date: 2015-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -109,6 +109,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-progressbar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: commander
   requirement: !ruby/object:Gem::Requirement
@@ -302,6 +316,7 @@ files:
 - lib/stack_master/ctrl_c.rb
 - lib/stack_master/parameter_loader.rb
 - lib/stack_master/parameter_resolver.rb
+- lib/stack_master/parameter_resolvers/latest_ami_by_tags.rb
 - lib/stack_master/parameter_resolvers/secret.rb
 - lib/stack_master/parameter_resolvers/security_group.rb
 - lib/stack_master/parameter_resolvers/sns_topic_name.rb
@@ -338,6 +353,7 @@ files:
 - spec/stack_master/config_spec.rb
 - spec/stack_master/parameter_loader_spec.rb
 - spec/stack_master/parameter_resolver_spec.rb
+- spec/stack_master/parameter_resolvers/latest_ami_by_tag_spec.rb
 - spec/stack_master/parameter_resolvers/secret_spec.rb
 - spec/stack_master/parameter_resolvers/security_group_spec.rb
 - spec/stack_master/parameter_resolvers/sns_topic_name_spec.rb
@@ -409,6 +425,7 @@ test_files:
 - spec/stack_master/config_spec.rb
 - spec/stack_master/parameter_loader_spec.rb
 - spec/stack_master/parameter_resolver_spec.rb
+- spec/stack_master/parameter_resolvers/latest_ami_by_tag_spec.rb
 - spec/stack_master/parameter_resolvers/secret_spec.rb
 - spec/stack_master/parameter_resolvers/security_group_spec.rb
 - spec/stack_master/parameter_resolvers/sns_topic_name_spec.rb