stack_master 0.0.4 → 0.1.0

data/lib/stack_master/commands/terminal_helper.rb

@@ -0,0 +1,15 @@
+module StackMaster
+  module Commands
+    module TerminalHelper
+      def window_size
+        size = ENV.fetch("COLUMNS") { `tput cols`.chomp }
+
+        if size.nil? || size == ""
+          80
+        else
+          size.to_i
+        end
+      end
+    end
+  end
+end

data/lib/stack_master/commands/validate.rb

@@ -10,7 +10,7 @@ module StackMaster
       end
 
       def perform
-        Validator.perform(@stack_definition)
+        failed unless Validator.valid?(@stack_definition)
       end
     end
   end

data/lib/stack_master/config.rb

@@ -44,13 +44,17 @@ module StackMaster
       load_config
     end
 
-    def find_stack(region, stack_name)
-      @stacks.find do |s|
-        (s.region == region || s.region == region.gsub('_', '-')) &&
-          (s.stack_name == stack_name || s.stack_name == stack_name.gsub('_', '-'))
+    def filter(region = nil, stack_name = nil)
+      @stacks.select do |s|
+        (region.blank? || s.region == region || s.region == region.gsub('_', '-')) &&
+          (stack_name.blank? || s.stack_name == stack_name || s.stack_name == stack_name.gsub('_', '-'))
       end
     end
 
+    def find_stack(region, stack_name)
+      filter(region, stack_name).first
+    end
+
     def unalias_region(region)
       @region_aliases.fetch(region) { region }
     end
@@ -74,7 +78,7 @@ module StackMaster
         region = Utils.underscore_to_hyphen(region)
         stacks_for_region.each do |stack_name, attributes|
           stack_name = Utils.underscore_to_hyphen(stack_name)
-          stack_attributes = build_stack_defaults(region).deeper_merge(attributes).merge(
+          stack_attributes = build_stack_defaults(region).deeper_merge!(attributes).merge(
             'region' => region,
             'stack_name' => stack_name,
             'base_dir' => @base_dir,

data/lib/stack_master/parameter_resolver.rb

@@ -17,7 +17,7 @@ module StackMaster
     def resolve
       @parameters.reduce({}) do |parameters, (key, value)|
         begin
-          parameters[key] = resolve_parameter_value(value)
+          parameters[key] = resolve_parameter_value(key, value)
         rescue InvalidParameter
           raise InvalidParameter, "Unable to resolve parameter #{key.inspect} value causing error: #{$!.message}"
         end
@@ -41,10 +41,10 @@ module StackMaster
       require_parameter_resolver(class_name.underscore)
     end
 
-    def resolve_parameter_value(parameter_value)
-      return parameter_value if String === parameter_value || parameter_value.nil?
-      raise InvalidParameter, parameter_value unless Hash === parameter_value
-      raise InvalidParameter, parameter_value unless parameter_value.keys.size == 1
+    def resolve_parameter_value(key, parameter_value)
+      return parameter_value.to_s if Numeric === parameter_value
+      return parameter_value unless Hash === parameter_value
+      validate_parameter_value!(key, parameter_value)
 
       resolver_name = parameter_value.keys.first.to_s
       load_parameter_resolver(resolver_name)
@@ -75,5 +75,11 @@ module StackMaster
         end
       end
     end
+
+    def validate_parameter_value!(key, parameter_value)
+      if parameter_value.keys.size != 1
+        raise InvalidParameter, "#{key} hash contained more than one key: #{parameter_value.inspect}"
+      end
+    end
   end
 end

data/lib/stack_master/parameter_resolvers/latest_ami_by_tags.rb

@@ -1,6 +1,8 @@
 module StackMaster
   module ParameterResolvers
-    class LatestAmiByTags
+    class LatestAmiByTags < Resolver
+      array_resolver class_name: 'LatestAmisByTags'
+
       def initialize(config, stack_definition)
         @config = config
         @stack_definition = stack_definition

data/lib/stack_master/parameter_resolvers/secret.rb

@@ -1,8 +1,10 @@
 module StackMaster
   module ParameterResolvers
-    class Secret
+    class Secret < Resolver
       SecretNotFound = Class.new(StandardError)
 
+      array_resolver
+
       def initialize(config, stack_definition)
         @config = config
         @stack_definition = stack_definition

data/lib/stack_master/parameter_resolvers/security_group.rb

@@ -1,6 +1,8 @@
 module StackMaster
   module ParameterResolvers
-    class SecurityGroup
+    class SecurityGroup < Resolver
+      array_resolver
+
       def initialize(config, stack_definition)
         @config = config
         @stack_definition = stack_definition
@@ -10,7 +12,7 @@ module StackMaster
         security_group_finder.find(value)
       end
 
-      private
+    private
 
       def security_group_finder
         StackMaster::SecurityGroupFinder.new(@stack_definition.region)

data/lib/stack_master/parameter_resolvers/sns_topic_name.rb

@@ -1,8 +1,10 @@
 module StackMaster
   module ParameterResolvers
-    class SnsTopicName
+    class SnsTopicName < Resolver
       TopicNotFound = Class.new(StandardError)
 
+      array_resolver
+
       def initialize(config, stack_definition)
         @config = config
         @stack_definition = stack_definition

data/lib/stack_master/parameter_resolvers/stack_output.rb

@@ -1,9 +1,11 @@
 module StackMaster
   module ParameterResolvers
-    class StackOutput
+    class StackOutput < Resolver
       StackNotFound = Class.new(StandardError)
       StackOutputNotFound = Class.new(StandardError)
 
+      array_resolver
+
       def initialize(config, stack_definition)
         @config = config
         @stack_definition = stack_definition

data/lib/stack_master/prompter.rb

@@ -2,10 +2,17 @@ module StackMaster
   module Prompter
     def ask?(question)
       StackMaster.stdout.print question
-      answer = if ENV['STUB_AWS']
-        ENV['ANSWER']
+      answer = if StackMaster.interactive?
+        if StackMaster.stdin.tty? && StackMaster.stdout.tty?
+          StackMaster.stdin.getch.chomp
+        else
+          StackMaster.stdout.puts
+          StackMaster.stdout.puts "STDOUT or STDIN was not a TTY. Defaulting to no. To force yes use -y"
+          'n'
+        end
       else
-        STDIN.getch.chomp
+        print StackMaster.non_interactive_answer
+        StackMaster.non_interactive_answer
       end
       StackMaster.stdout.puts
       answer == 'y'

data/lib/stack_master/resolver_array.rb

@@ -0,0 +1,35 @@
+module StackMaster
+  module ParameterResolvers
+    class ResolverArray
+      def initialize(config, stack_definition)
+        @config = config
+        @stack_definition = stack_definition
+      end
+
+      def resolve(values)
+        value_list = Array(values).map do |value|
+          resolver_class.new(@config, @stack_definition).resolve(value)
+        end
+      end
+
+      def resolver_class
+        fail "Method resolver_class not implemented on #{self.class}"
+      end
+    end
+
+    class Resolver
+      def self.array_resolver(options = {})
+        resolver_class ||= Object.const_get(self.name)
+        array_resolver_class_name = options[:class_name] || resolver_class.to_s.demodulize.pluralize
+
+        klass = Class.new(ResolverArray) do
+          define_method('resolver_class') do
+            resolver_class
+          end
+        end
+        StackMaster::ParameterResolvers.const_set("#{array_resolver_class_name}", klass)
+      end
+    end
+  end
+end
+

data/lib/stack_master/testing.rb

@@ -5,3 +5,4 @@ Aws.config[:stub_responses] = true
 require 'stack_master/test_driver/cloud_formation'
 
 StackMaster.cloud_formation_driver = StackMaster::TestDriver::CloudFormation.new
+StackMaster.non_interactive!

data/lib/stack_master/validator.rb

@@ -1,18 +1,22 @@
 module StackMaster
   class Validator
-    include Command
+    def self.valid?(stack_definition)
+      new(stack_definition).perform
+    end
 
     def initialize(stack_definition)
       @stack_definition = stack_definition
     end
 
     def perform
+      StackMaster.stdout.print "#{@stack_definition.stack_name}: "
       template_body = TemplateCompiler.compile(@stack_definition.template_file_path)
       cf.validate_template(template_body: template_body)
-      StackMaster.stdout.puts "Valid"
+      StackMaster.stdout.puts "valid"
+      true
     rescue Aws::CloudFormation::Errors::ValidationError => e
-      $stderr.puts "Validation Failed"
-      $stderr.puts e.message
+      StackMaster.stdout.puts "invalid. #{e.message}"
+      false
     end
 
     private

data/lib/stack_master/version.rb

@@ -1,3 +1,3 @@
 module StackMaster
-  VERSION = "0.0.4"
+  VERSION = "0.1.0"
 end

data/spec/fixtures/stack_master.yml

@@ -15,6 +15,7 @@ region_defaults:
   staging:
     tags:
       environment: staging
+      test_override: 1
     notification_arns:
       - test_arn_3
     secret_file: staging.yml.gpg
@@ -32,4 +33,6 @@ stacks:
       notification_arns:
         - test_arn_4
     myapp_web:
-      template: myapp_web
+      template: myapp_web
+      tags:
+        test_override: 2

data/spec/stack_master/command_spec.rb

@@ -0,0 +1,28 @@
+RSpec.describe StackMaster::Command do
+  let(:command_class) {
+    Class.new do
+      include StackMaster::Command
+
+      def initialize(callable = nil)
+        @callable = callable
+      end
+
+      def perform
+        instance_eval(&@callable) if @callable
+        false
+      end
+    end
+  }
+
+  context 'when failed is not called' do
+    it 'is successful' do
+      expect(command_class.perform.success?).to eq true
+    end
+  end
+
+  context 'when failed is called' do
+    it 'is not successful' do
+      expect(command_class.perform(proc { failed }).success?).to eq false
+    end
+  end
+end

data/spec/stack_master/commands/apply_spec.rb

@@ -16,9 +16,8 @@ RSpec.describe StackMaster::Commands::Apply do
     allow(cf).to receive(:update_stack)
     allow(cf).to receive(:create_stack)
     allow(StackMaster::StackDiffer).to receive(:new).with(proposed_stack, stack).and_return double.as_null_object
-    allow(STDOUT).to receive(:print)
-    allow(STDIN).to receive(:getch).and_return('y')
     allow(StackMaster::StackEvents::Streamer).to receive(:stream)
+    allow(StackMaster).to receive(:interactive?).and_return(false)
   end
 
   def apply
@@ -48,6 +47,16 @@ RSpec.describe StackMaster::Commands::Apply do
         expect(StackMaster::StackEvents::Streamer).to have_received(:stream).with(stack_name, region, io: STDOUT, from: Time.now)
       end
     end
+
+    context 'when a CF error occurs' do
+      before do
+        allow(cf).to receive(:update_stack).with(anything).and_raise(Aws::CloudFormation::Errors::ServiceError.new('a', 'the message'))
+      end
+
+      it 'outputs the message' do
+        expect { apply }.to output(/the message/).to_stdout
+      end
+    end
   end
 
   context 'the stack does not exist' do
@@ -77,6 +86,7 @@ RSpec.describe StackMaster::Commands::Apply do
       let(:template_body) do
         "{\"a\":\"#{big_string}\"}"
       end
+
       it 'exits with a message' do
         expect { apply }.to output(/The \(space compressed\) stack is larger than the limit set by AWS/).to_stdout
       end

data/spec/stack_master/commands/status_spec.rb

@@ -8,11 +8,14 @@ RSpec.describe StackMaster::Commands::Status do
 
   before do
     allow(Aws::CloudFormation::Client).to receive(:new).with(region: 'us-east-1').and_return cf
-    allow(StackMaster::Stack).to receive(:find).and_return stack1, stack2
-    allow(StackMaster::Stack).to receive(:generate).and_return proposed_stack1, proposed_stack2
   end
 
   context "#perform" do
+    before do
+      allow(StackMaster::Stack).to receive(:find).and_return stack1, stack2
+      allow(StackMaster::Stack).to receive(:generate).and_return proposed_stack1, proposed_stack2
+    end
+
     context "some parameters are different" do
       let(:stack1) { double(:stack1, template_hash: {}, parameters_with_defaults: {a: 1}, stack_status: 'UPDATE_COMPLETE') }
       let(:stack2) { double(:stack2, template_hash: {}, parameters_with_defaults: {a: 2}, stack_status: 'CREATE_COMPLETE') }
@@ -35,4 +38,24 @@ RSpec.describe StackMaster::Commands::Status do
       end
     end
   end
+
+  context "handles AWS throttling" do
+    let(:throttle_exception)  { Aws::CloudFormation::Errors::Throttling.new(double(), "Rate exceeded.") }
+    let(:stack1) { double(:stack1, template_hash: {}, parameters_with_defaults: {a: 1}, stack_status: 'UPDATE_COMPLETE') }
+    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 "doubles the sleep time across calls" do
+      call_count = 0
+      expect(cf).to receive(:describe_stacks).at_least(1).times do 
+        call_count += 1
+        call_count <= 3 ? raise(throttle_exception) : double(stacks: double(first: nil))
+      end
+      expect(StackMaster.cloud_formation_driver).to receive(:sleep).with(1).ordered
+      expect(StackMaster.cloud_formation_driver).to receive(:sleep).with(2).ordered
+      expect(StackMaster.cloud_formation_driver).to receive(:sleep).with(4).ordered
+      expect { status.perform }.to_not raise_exception
+    end
+  end
 end

data/spec/stack_master/commands/validate_spec.rb

@@ -18,7 +18,7 @@ RSpec.describe StackMaster::Commands::Validate do
   describe "#perform" do
     context "can find stack" do
       it "calls the validator to validate the stack definition" do
-        expect(StackMaster::Validator).to receive(:perform).with(stack_definition)
+        expect(StackMaster::Validator).to receive(:valid?).with(stack_definition)
         validate.perform
       end
     end

data/spec/stack_master/config_spec.rb

@@ -31,14 +31,33 @@ RSpec.describe StackMaster::Config do
     end
   end
 
-  it 'returns an object that can find stack definitions' do
-    stack = loaded_config.find_stack('us-east-1', 'myapp-vpc')
-    expect(stack).to eq(myapp_vpc_definition)
+  describe '#find_stack' do
+    it 'returns an object that can find stack definitions' do
+      stack = loaded_config.find_stack('us-east-1', 'myapp-vpc')
+      expect(stack).to eq(myapp_vpc_definition)
+    end
+
+    it 'can find things with underscores instead of hyphens' do
+      stack = loaded_config.find_stack('us_east_1', 'myapp_vpc')
+      expect(stack).to eq(myapp_vpc_definition)
+    end
   end
 
-  it 'can find things with underscores instead of hyphens' do
-    stack = loaded_config.find_stack('us_east_1', 'myapp_vpc')
-    expect(stack).to eq(myapp_vpc_definition)
+  describe '#filter' do
+    it 'returns a list of stack definitions' do
+      stack = loaded_config.filter('us-east-1', 'myapp-vpc')
+      expect(stack).to eq([myapp_vpc_definition])
+    end
+
+    it 'can filter by region only' do
+      stacks = loaded_config.filter('us-east-1')
+      expect(stacks.size).to eq 2
+    end
+
+    it 'can return all stack definitions with no filters' do
+      stacks = loaded_config.filter
+      expect(stacks.size).to eq 4
+    end
   end
 
   it 'exposes the base_dir' do
@@ -60,7 +79,7 @@ RSpec.describe StackMaster::Config do
         'stack_policy_file' => 'my_policy.json'
       },
       'ap-southeast-2' => {
-        'tags' => {'environment' => 'staging'},
+        'tags' => {'environment' => 'staging', 'test_override' => 1 },
         'notification_arns' => ['test_arn_3'],
         'secret_file' => 'staging.yml.gpg'
       }
@@ -80,7 +99,8 @@ RSpec.describe StackMaster::Config do
       region: 'ap-southeast-2',
       tags: {
         'application' => 'my-awesome-blog',
-        'environment' => 'staging'
+        'environment' => 'staging',
+        'test_override' => 1
       },
       notification_arns: ['test_arn_3', 'test_arn_4'],
       template: 'myapp_vpc.rb',
@@ -88,6 +108,20 @@ RSpec.describe StackMaster::Config do
       secret_file: 'staging.yml.gpg',
       additional_parameter_lookup_dirs: ['staging']
     ))
+    expect(loaded_config.find_stack('ap-southeast-2', 'myapp-web')).to eq(StackMaster::StackDefinition.new(
+      stack_name: 'myapp-web',
+      region: 'ap-southeast-2',
+      tags: {
+        'application' => 'my-awesome-blog',
+        'environment' => 'staging',
+        'test_override' => 2
+      },
+      notification_arns: ['test_arn_3'],
+      template: 'myapp_web',
+      base_dir: base_dir,
+      secret_file: 'staging.yml.gpg',
+      additional_parameter_lookup_dirs: ['staging']
+    ))
   end
 
   it 'allows region aliases in region defaults' do