eb_deployer 0.5.2 → 0.6.0.beta1

data/CHANGELOG.md

@@ -1,8 +1,7 @@
-0.5.2
-=====
+0.6.0.beta1
+===========
 
-* Fix issue: worker tier aws-sqsd using 1.0 version
-* Update multi_components example
+* aws-sdk 2.0
 
 0.5.0
 =====

data/eb_deployer.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |gem|
   gem.homepage      = "https://github.com/ThoughtWorksStudios/eb_deployer"
   gem.license       = 'MIT'
 
-  gem.add_runtime_dependency 'aws-sdk-v1', '~> 1', '>= 1.61.0'
+  gem.add_runtime_dependency 'aws-sdk', '~> 2',  '>= 2.0.0'
 
   gem.files         = `git ls-files`.split($\).reject {|f| f =~ /^samples\// }
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/eb_deployer/aws_driver/beanstalk.rb

@@ -4,7 +4,7 @@ module EbDeployer
       include Utils
       attr_reader :client
 
-      def initialize(client=AWS::ElasticBeanstalk.new.client)
+      def initialize(client=Aws::ElasticBeanstalk::Client.new)
         @client = client
       end
 
@@ -121,8 +121,8 @@ module EbDeployer
       private
 
       TIERS = [
-               {:name=>"Worker", :type=>"SQS/HTTP"},
-               {:name=>"WebServer", :type=>"Standard"}
+               {:name=>"Worker", :type=>"SQS/HTTP", :version=>"1.0"},
+               {:name=>"WebServer", :type=>"Standard", :version=>"1.0"}
               ]
 
       def get_environment_attribute(app_name, env_name, attribute)

data/lib/eb_deployer/aws_driver/cloud_formation_driver.rb

@@ -2,18 +2,27 @@ module EbDeployer
   module AWSDriver
     class CloudFormationDriver
 
+      def initialize
+        @client = Aws::CloudFormation::Client.new
+      end
+
       def stack_exists?(name)
-        stack(name).exists?
+        describe_stack(name)
+        true
+      rescue Aws::CloudFormation::Errors::ValidationError
+        false
       end
 
       def create_stack(name, template, opts)
-        cloud_formation.stacks.create(name, template, opts)
+        @client.create_stack(opts.merge(:stack_name => name,
+                                        :template_body => template))
       end
 
       def update_stack(name, template, opts)
         begin
-          stack(name).update(opts.merge(:template => template))
-        rescue AWS::CloudFormation::Errors::ValidationError => e
+          @client.update_stack(opts.merge(:stack_name => name,
+                                          :template_body => template))
+        rescue Aws::CloudFormation::Errors::ValidationError => e
           if e.message =~ /No updates are to be performed/
             log(e.message)
           else
@@ -23,22 +32,18 @@ module EbDeployer
       end
 
       def stack_status(name)
-        stack(name).status.downcase.to_sym
+        describe_stack(name)[:stack_status].downcase.to_sym
       end
 
       def query_output(name, key)
-        output = stack(name).outputs.find { |o| o.key == key }
-        output && output.value
+        output = describe_stack(name)[:outputs].find { |o| o[:output_key] == key }
+        output && output[:output_value]
       end
 
       private
 
-      def cloud_formation
-        AWS::CloudFormation.new
-      end
-
-      def stack(name)
-        cloud_formation.stacks[name]
+      def describe_stack(name)
+        @client.describe_stacks(:stack_name => name)[:stacks].first
       end
 
       def log(msg)

data/lib/eb_deployer/aws_driver/s3_driver.rb

@@ -2,11 +2,11 @@ module EbDeployer
   module AWSDriver
     class S3Driver
       def create_bucket(bucket_name)
-        buckets.create(bucket_name)
+        s3.create_bucket(:bucket => bucket_name)
       end
 
       def bucket_exists?(bucket_name)
-        buckets[bucket_name].exists?
+        s3.bucket(bucket_name).exists?
       end
 
       def object_length(bucket_name, obj_name)
@@ -15,16 +15,16 @@ module EbDeployer
 
       def upload_file(bucket_name, obj_name, file)
         o = obj(bucket_name, obj_name)
-        File.open(file, 'rb') { |f| o.write(f) }
+        o.upload_file(file)
       end
 
       private
       def s3
-        AWS::S3.new
+        Aws::S3::Resource.new(client: Aws::S3::Client.new)
       end
 
       def obj(bucket_name, obj_name)
-        buckets[bucket_name].objects[obj_name]
+        s3.bucket(bucket_name).object(obj_name)
       end
 
       def buckets

data/lib/eb_deployer/cloud_formation_provisioner.rb

@@ -29,7 +29,7 @@ module EbDeployer
 
     def output(key)
       @cf_driver.query_output(@stack_name, key)
-    rescue AWS::CloudFormation::Errors::ValidationError => e
+    rescue Aws::CloudFormation::Errors::ValidationError
       raise ResourceNotInReadyState.new("Resource stack not in ready state yet, perhaps you should provision it first?")
     end
 

data/lib/eb_deployer/event_poller.rb

@@ -44,6 +44,7 @@ module EbDeployer
 
     def digest(event)
       return nil unless event
+      event = event.to_h if event.respond_to?(:to_h)
       JSON.dump(event)
     end
 

data/lib/eb_deployer/version.rb

@@ -1,3 +1,3 @@
 module EbDeployer
-  VERSION = "0.5.2"
+  VERSION = "0.6.0.beta1"
 end

data/lib/eb_deployer.rb

@@ -3,7 +3,7 @@ require 'set'
 require 'time'
 require 'json'
 require 'timeout'
-require 'aws-sdk-v1'
+require 'aws-sdk'
 require 'optparse'
 require 'erb'
 require 'fileutils'
@@ -171,11 +171,11 @@ module EbDeployer
   #   version_prefix is given, only removes version starting with the prefix.
   def self.deploy(opts)
     if region = opts[:region]
-      AWS.config(:region => region)
+      Aws.config.update(:region => region)
     end
 
     bs = opts[:bs_driver] || AWSDriver::Beanstalk.new
-    bs = ThrottlingHandling.new(bs, AWS::ElasticBeanstalk::Errors::Throttling)
+    bs = ThrottlingHandling.new(bs, Aws::ElasticBeanstalk::Errors::Throttling)
     s3 = opts[:s3_driver] || AWSDriver::S3Driver.new
     cf = opts[:cf_driver] || AWSDriver::CloudFormationDriver.new
 

data/lib/generators/eb_deployer/install/install_generator.rb

@@ -1,6 +1,6 @@
 require 'rails/generators'
 require 'eb_deployer/default_config'
-require 'aws/elastic_beanstalk'
+require 'aws-sdk'
 require 'securerandom'
 
 module EbDeployer
@@ -59,7 +59,7 @@ YAML
       end
 
       def solution_stack_name
-        AWS::ElasticBeanstalk.new.client.list_available_solution_stacks[:solution_stacks].find do |s|
+        AWS::ElasticBeanstalk.Client.new.list_available_solution_stacks[:solution_stacks].find do |s|
           s =~ /Amazon Linux/ && s =~ /running Ruby 2.1 \(Passenger Standalone\)/
         end
       rescue

data/test/aws_driver_stubs.rb

@@ -290,7 +290,7 @@ class CFStub
   end
 
   def query_output(name, key)
-    raise AWS::CloudFormation::Errors::ValidationError.new unless stack_exists?(name)
+    raise Aws::CloudFormation::Errors::ValidationError.new(nil, nil) unless stack_exists?(name)
     "value of #{key}"
   end
 

data/test/inplace_update_deploy_test.rb

@@ -80,15 +80,15 @@ class InplaceUpdateDeployTest < DeployTest
   end
 
   def test_deploy_should_raise_error_when_constantly_hitting_throttling_error
-    throttling_error = AWS::ElasticBeanstalk::Errors::Throttling.new("bang!")
+    throttling_error = Aws::ElasticBeanstalk::Errors::Throttling.new(nil, "bang!")
     @eb.set_error(:fetch_events, throttling_error)
-    assert_raises(AWS::ElasticBeanstalk::Errors::Throttling) do
+    assert_raises(Aws::ElasticBeanstalk::Errors::Throttling) do
       deploy(:application => 'simple', :environment => "production")
     end
   end
 
   def test_deploy_should_retry_on_temporary_throttling_error_from_fetch_events
-    throttling_error = AWS::ElasticBeanstalk::Errors::Throttling.new("bang!")
+    throttling_error = Aws::ElasticBeanstalk::Errors::Throttling.new(nil, "bang!")
     error_seq = [throttling_error] * 5
     @eb.set_error_generator(:fetch_events) do
       error_seq.pop
@@ -98,7 +98,7 @@ class InplaceUpdateDeployTest < DeployTest
   end
 
   def test_deploy_should_retry_on_temporary_throttling_error_from_create_env
-    throttling_error = AWS::ElasticBeanstalk::Errors::Throttling.new("bang!")
+    throttling_error = Aws::ElasticBeanstalk::Errors::Throttling.new(nil, "bang!")
     error_seq = [throttling_error] * 5
     @eb.set_error_generator(:create_environment) do
       error_seq.pop

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: eb_deployer
 version: !ruby/object:Gem::Version
-  version: 0.5.2
-  prerelease: 
+  version: 0.6.0.beta1
+  prerelease: 6
 platform: ruby
 authors:
 - wpc
@@ -13,16 +13,16 @@ cert_chain: []
 date: 2015-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: aws-sdk-v1
+  name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.61.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,10 +30,10 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.61.0
+        version: 2.0.0
 description: For automating Blue-Green deployment flows on Elastic Beanstalk.
 email:
 - alex.hal9000@gmail.com
@@ -120,9 +120,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23