cf_deployer 1.6.0 → 2.0.0

data/lib/cf_deployer/stack.rb

@@ -21,7 +21,9 @@ module CfDeployer
       capabilities = @context[:capabilities] || []
       notify = @context[:notify] || []
       tags = @context[:tags] || {}
-      params = to_str(@context[:inputs].select{|key, value| @context[:defined_parameters].keys.include?(key)})
+      params = @context[:inputs].select{|key, value| @context[:defined_parameters].keys.include?(key)}
+        .map { |key, value| { parameter_key: key.to_s, parameter_value: value.to_s } }
+
       CfDeployer::Driver::DryRun.guard "Skipping deploy" do
         if exists?
           override_policy_json = nil
@@ -56,7 +58,7 @@ module CfDeployer
     def find_output key
       begin
         @cf_driver.query_output(key)
-      rescue AWS::CloudFormation::Errors::ValidationError => e
+      rescue Aws::CloudFormation::Errors::ValidationError => e
         raise ResourceNotInReadyState.new("Resource stack not in ready state yet, perhaps you should provision it first?")
       end
     end
@@ -88,20 +90,18 @@ module CfDeployer
     end
 
     def resource_statuses
-      AWS.memoize do
-        resources = @cf_driver.resource_statuses.merge( { :asg_instances => {}, :instances => {} } )
-        if resources['AWS::AutoScaling::AutoScalingGroup']
-          resources['AWS::AutoScaling::AutoScalingGroup'].keys.each do |asg_name|
-            resources[:asg_instances][asg_name] = CfDeployer::Driver::AutoScalingGroup.new(asg_name).instance_statuses
-          end
+      resources = @cf_driver.resource_statuses.merge( { :asg_instances => {}, :instances => {} } )
+      if resources['AWS::AutoScaling::AutoScalingGroup']
+        resources['AWS::AutoScaling::AutoScalingGroup'].keys.each do |asg_name|
+          resources[:asg_instances][asg_name] = CfDeployer::Driver::AutoScalingGroup.new(asg_name).instance_statuses
         end
-        if resources['AWS::EC2::Instance']
-          resources['AWS::EC2::Instance'].keys.each do |instance_id|
-            resources[:instances][instance_id] = CfDeployer::Driver::Instance.new(instance_id).status
-          end
+      end
+      if resources['AWS::EC2::Instance']
+        resources['AWS::EC2::Instance'].keys.each do |instance_id|
+          resources[:instances][instance_id] = CfDeployer::Driver::Instance.new(instance_id).status
         end
-        resources
       end
+      resources
     end
 
     def name
@@ -114,10 +114,6 @@ module CfDeployer
 
     private
 
-    def to_str(hash)
-      hash.each { |k,v| hash[k] = v.to_s }
-    end
-
     def update_stack(template, params, capabilities, tags, override_policy_json)
       Log.info "Updating stack #{@stack_name}..."
       args = {
@@ -136,7 +132,7 @@ module CfDeployer
       args = {
         :disable_rollback => true,
         :capabilities => capabilities,
-        :notify => notify,
+        :notification_arns => notify,
         :tags => reformat_tags(tags),
         :parameters => params
       }
@@ -148,7 +144,7 @@ module CfDeployer
     end
 
     def stack_status
-      @cf_driver.stack_status
+      @cf_driver.stack_status || :does_not_exist
     end
 
     def wait_for_stack_op_terminate
@@ -164,22 +160,14 @@ module CfDeployer
     def wait_for_stack_to_delete
       Timeout::timeout(900){
         while exists?
-          begin
-            Log.info "current status: #{stack_status}"
-            sleep 15
-          rescue AWS::CloudFormation::Errors::ValidationError => e
-            if e.message =~ /does not exist/
-              break # This is what we wanted anyways
-            else
-              raise e
-            end
-          end
+          Log.info "current status: #{stack_status}"
+          sleep 15
         end
       }
     end
 
     def reformat_tags tags_hash
-      tags_hash.keys.map { |key| { 'Key' => key.to_s, 'Value' => tags_hash[key].to_s } }
+      tags_hash.keys.map { |key| { :key => key.to_s, :value => tags_hash[key].to_s } }
     end
   end
 end

data/lib/cf_deployer/status_presenter.rb

@@ -155,7 +155,7 @@ module CfDeployer
         col1[i] ||= ''
         col2[i] ||= ''
 
-        line = ''
+        line = +''
         line << col1[i].ljust(UNPADDED_TABLE_CELL_WIDTH + PAD.size + invisible_length(col1[i]))
         line << '|'
         line << col2[i]

data/lib/cf_deployer/version.rb

@@ -1,3 +1,3 @@
 module CfDeployer
-  VERSION = "1.6.0"
+  VERSION = "2.0.0"
 end

data/lib/cf_deployer.rb

@@ -2,11 +2,17 @@ require 'digest'
 require 'set'
 require 'time'
 require 'json'
+require 'yaml'
 require 'timeout'
-require 'aws-sdk'
+require 'aws-sdk-autoscaling'
+require 'aws-sdk-ec2'
+require 'aws-sdk-core'
+require 'aws-sdk-cloudformation'
+require 'aws-sdk-elasticloadbalancing'
+require 'aws-sdk-route53'
 require 'erb'
 require 'fileutils'
-require 'log4r'
+require 'logger'
 require 'pp'
 require 'forwardable'
 
@@ -38,7 +44,7 @@ require_relative 'cf_deployer/defaults'
 
 module CfDeployer
 
-  AWS.config(:max_retries => 20)
+  Aws.config.update(retry_limit: 20)
 
   def self.config opts
     config = self.parseconfig opts, false
@@ -50,19 +56,16 @@ module CfDeployer
 
   def self.deploy opts
     config = self.parseconfig opts
-    # AWS.config(:logger => Logger.new($stdout))
     Application.new(config).deploy
   end
 
   def self.runhook opts
     config = self.parseconfig opts
-    # AWS.config(:logger => Logger.new($stdout))
     Application.new(config).run_hook opts[:component].first, opts[:hook_name]
   end
 
   def self.destroy opts
     config = self.parseconfig opts, false
-    # AWS.config(:logger => Logger.new($stdout))
     Application.new(config).destroy
   end
 
@@ -97,7 +100,7 @@ module CfDeployer
   private
 
   def self.parseconfig options, validate_inputs = true
-    AWS.config(:region => options[:region]) if options[:region]
+    Aws.config.update({region: options[:region]}) if options[:region]
     options[:cli_overrides] = {:settings => options.delete(:settings), :inputs => options.delete(:inputs)}
     config = ConfigLoader.new.load options
     ConfigValidation.new.validate config, validate_inputs

data/spec/aws_call_count_spec_helper.rb

@@ -11,8 +11,20 @@ def override_aws_environment options = {}
   options[:AWS_REGION] ||= 'us-east-1'
   options[:AWS_ACCESS_KEY_ID] ||= 'someId'
   options[:AWS_SECRET_ACCESS_KEY] ||= 'secretKey'
-
-  override_environment_variables(options) { yield }
+  options[:AWS_EC2_METADATA_DISABLED] ||= 'true'
+  options[:AWS_SDK_CONFIG_OPT_OUT] ||= '1'
+
+  override_environment_variables(options) do
+    previous_aws_config = Aws.config.dup
+    Aws.config.update(
+      region: options[:AWS_REGION],
+      credentials: Aws::Credentials.new(options[:AWS_ACCESS_KEY_ID], options[:AWS_SECRET_ACCESS_KEY])
+    )
+    yield
+  ensure
+    Aws.config.clear
+    Aws.config.update(previous_aws_config)
+  end
 end
 
 def override_environment_variables options = {}

data/spec/fakes/instance.rb

@@ -1,10 +1,10 @@
 module Fakes
   class Instance
 
-    SIMPLE_ATTRIBS = [ :id, :status, :public_ip_address, :private_ip_address, :image_id ]
+    SIMPLE_ATTRIBS = [ :id, :public_ip_address, :private_ip_address, :image_id ]
 
     attr_reader *SIMPLE_ATTRIBS
-    attr_reader :key_pair
+    attr_reader :state, :key_name
 
     def initialize(options)
       defaults = {
@@ -20,7 +20,8 @@ module Fakes
         instance_variable_set "@#{attrib}", (options[attrib] || defaults[attrib])
       end
 
-      @key_pair = ::AWS::EC2::KeyPair.new (options[:key_pair] || defaults[:key_pair] )
+      @state = Aws::EC2::Types::InstanceState.new(name: (options[:status] || defaults[:status]).to_s)
+      @key_name = options[:key_pair] || defaults[:key_pair]
     end
 
     def inspect
@@ -29,4 +30,4 @@ module Fakes
     alias_method :to_s, :inspect
 
   end
-end
+end

data/spec/fakes/route53_client.rb

@@ -2,19 +2,16 @@ module Fakes
   class AWSRoute53
     attr_reader :fail_counter, :hosted_zones, :client
     def initialize(opts = {})
-      @client = AWSRoute53Client.new(opts)
       @hosted_zones = opts[:hosted_zones]
-      @fail_counter = 0
-    end
-  end
 
-  class AWSRoute53Client
-    attr_reader :fail_counter
-    def initialize(opts = {})
       @times_to_fail = opts[:times_to_fail]
       @fail_counter = 0
     end
 
+    def list_hosted_zones_by_name(*args)
+      Struct.new(:hosted_zones).new(hosted_zones)
+    end
+
     def change_resource_record_sets(*args)
       @fail_counter = @fail_counter + 1
       raise 'Error' if @fail_counter <= @times_to_fail

data/spec/spec_helper.rb

@@ -1,14 +1,14 @@
 require_relative '../lib/cf_deployer'
 Dir.glob("#{File.dirname File.absolute_path(__FILE__)}/fakes/*.rb") { |file| require file }
 
-CfDeployer::Log.log.outputters = nil
+CfDeployer::Log.log = Logger.new(File::NULL)
 
 RSPEC_LOG = Logger.new(STDOUT)
 RSPEC_LOG.level = Logger::WARN
 
 if ENV['DEBUG']
   RSPEC_LOG.level = Logger::DEBUG
-  AWS.config :logger => RSPEC_LOG
+  # AWS.config :logger => RSPEC_LOG
 end
 
 def puts *args
@@ -20,3 +20,12 @@ def ignore_errors
 rescue => e
   RSPEC_LOG.debug "Intentionally ignoring error: #{e.message}"
 end
+
+RSpec.configure do |config|
+  # These two settings work together to allow you to limit a spec run
+  # to individual examples or groups you care about by tagging them with
+  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
+  # get run.
+  config.filter_run :focus
+  config.run_all_when_everything_filtered = true
+end

data/spec/unit/application_spec.rb

@@ -28,11 +28,11 @@ describe "application" do
   end
 
   it "application should get all components" do
-    @app.components.length.should eq(4)
-    @base.should_not be_nil
-    @db.should_not be_nil
-    @queue.should_not be_nil
-    @web.should_not be_nil
+    expect(@app.components.length).to eq(4)
+    expect(@base).not_to be_nil
+    expect(@db).not_to be_nil
+    expect(@queue).not_to be_nil
+    expect(@web).not_to be_nil
   end
 
   context "order components by dependencies" do
@@ -154,7 +154,7 @@ describe "application" do
     context "deploy all components" do
       it "should deploy all components if no component specified" do
         @app.deploy
-        @log.should eq("base db queue web ")
+        expect(@log).to eq("base db queue web ")
       end
     end
 
@@ -162,7 +162,7 @@ describe "application" do
       it "should deploy specified components" do
         @context[:targets] = ['web', 'db']
         @app.deploy
-        @log.should eq("db web ")
+        expect(@log).to eq("db web ")
       end
     end
   end
@@ -179,13 +179,13 @@ describe "application" do
 
     it 'should get json templates for all components' do
       @app.json
-      @log.should eq("base db queue web ")
+      expect(@log).to eq("base db queue web ")
     end
 
     it 'should get json templates for components specified' do
       @context[:targets] = ['web', 'db']
       @app.json
-      @log.should eq('db web ')
+      expect(@log).to eq('db web ')
     end
   end
 end

data/spec/unit/component_spec.rb

@@ -98,7 +98,7 @@ describe "component" do
 
   it "should ask strategy if component exists" do
      expect(@strategy).to receive(:exists?){ true }
-     @web.exists?.should eq(true)
+     expect(@web.exists?).to eq(true)
   end
 
   it "should find direct dependencies" do
@@ -106,7 +106,7 @@ describe "component" do
     base = CfDeployer::Component.new('myApp', 'uat', 'base', {})
     web.dependencies << base
 
-    web.depends_on?(base).should eq(true)
+    expect(web.depends_on?(base)).to eq(true)
   end
 
   it "should find transitive dependencies" do
@@ -117,7 +117,7 @@ describe "component" do
     haproxy.dependencies << base
     web.dependencies << haproxy
 
-    web.depends_on?(base).should eq(true)
+    expect(web.depends_on?(base)).to eq(true)
   end
 
   it "should find cyclic dependency" do