eb_deployer 0.0.6 → 0.0.7

data/lib/eb_deployer/cloud_formation_driver.rb

@@ -0,0 +1,47 @@
+module EbDeployer
+  class CloudFormationDriver
+
+    def stack_exists?(name)
+      stack(name).exists?
+    end
+
+    def create_stack(name, template, opts)
+      cloud_formation.stacks.create(name, tempalte, opts)
+    end
+
+    def update_stack(name, tempalte, opts)
+      begin
+        stack(name).update(opts.merge(:tempalte => template))
+      rescue AWS::CloudFormation::Errors::ValidationError => e
+        if e.message =~ /No updates are to be performed/
+          log(e.message)
+        else
+          raise
+        end
+      end
+    end
+
+    def stack_status(name)
+      stack(name).status.downcase.to_sym
+    end
+
+    def query_output(name, key)
+      stack(name).outputs.find { |o| o.key == key }.try(:value)
+    end
+
+    private
+
+    def cloud_formation
+      AWS::CloudFormation.new
+    end
+
+    def stack(name)
+      cloud_formation.stacks[name]
+    end
+
+    def log(msg)
+      puts "[#{Time.now.utc}][cloud_formation] #{msg}"
+    end
+  end
+
+end

data/lib/eb_deployer/cloud_formation_provisioner.rb

@@ -1,10 +1,14 @@
 module EbDeployer
+  class ResourceNotInReadyState < StandardError
+  end
+
   class CloudFormationProvisioner
     SUCCESS_STATS = [:create_complete, :update_complete, :update_rollback_complete]
     FAILED_STATS = [:create_failed, :update_failed]
 
-    def initialize(stack_name)
+    def initialize(stack_name, cf_driver)
       @stack_name = stack_name
+      @cf_driver = cf_driver
     end
 
     def provision(resources)
@@ -12,35 +16,36 @@ module EbDeployer
       template = File.read(resources[:template])
       transforms = resources[:transforms]
 
-      stack.exists? ? update_stack(template, params) : create_stack(template, params)
+      stack_exists? ? update_stack(template, params) : create_stack(template, params)
       wait_for_stack_op_terminate
       transform_output_to_settings(transforms)
     end
 
     def output(key)
-      stack.outputs.find { |o| o.key == key }.try(:value)
+      @cf_driver.query_output(@stack_name, key)
+    rescue AWS::CloudFormation::Errors::ValidationError => e
+      raise ResourceNotInReadyState.new("Resource stack not in ready state yet, perhaps you should provision it first?")
     end
 
-
     private
 
     def update_stack(template, params)
-      begin
-        stack.update(:template => template, :parameters => params)
-      rescue AWS::CloudFormation::Errors::ValidationError => e
-        if e.message =~ /No updates are to be performed/
-          log(e.message)
-        else
-          raise
-        end
-      end
+      @cf_driver.update_stack(@stack_name, template,
+                              :parameters => params)
+    end
+
+    def stack_exists?
+      @cf_driver.stack_exists?(@stack_name)
     end
 
     def create_stack(template, params)
-      cloud_formation.stacks.create(@stack_name, template, {
-                                      :disable_rollback => true,
-                                      :parameters => params
-                                    })
+      @cf_driver.create_stack(@stack_name, template,
+                              :disable_rollback => true,
+                              :parameters => params)
+    end
+
+    def stack_status
+      @cf_driver.stack_status(@stack_name)
     end
 
     def transform_output_to_settings(transforms)
@@ -52,12 +57,13 @@ module EbDeployer
     end
 
     def wait_for_stack_op_terminate
-      begin
+      stats = stack_status
+      while !SUCCESS_STATS.include?(stats)
         sleep 15
         stats = stack_status
         raise "Resource stack update failed!" if FAILED_STATS.include?(stats)
         log "current status: #{stack_status}"
-      end while !SUCCESS_STATS.include?(stats)
+      end
     end
 
 
@@ -68,17 +74,5 @@ module EbDeployer
     def log(msg)
       puts "[#{Time.now.utc}][resources-stack] #{msg}"
     end
-
-    def stack_status
-      stack.status.downcase.to_sym
-    end
-
-    def stack
-      cloud_formation.stacks[@stack_name]
-    end
-
-    def cloud_formation
-      AWS::CloudFormation.new
-    end
   end
 end

data/lib/eb_deployer/version.rb

@@ -1,3 +1,3 @@
 module EbDeployer
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/eb_deployer.rb

@@ -6,6 +6,7 @@ require "eb_deployer/environment"
 require "eb_deployer/event_poller"
 require "eb_deployer/package"
 require 'eb_deployer/s3_driver'
+require 'eb_deployer/cloud_formation_driver'
 require 'digest'
 require 'set'
 require 'time'
@@ -21,8 +22,9 @@ module EbDeployer
     end
     app = opts[:application]
     env_name = opts[:environment]
-    cf = CloudFormationProvisioner.new("#{app}-#{env_name}")
-    cf.output(key)
+    cf = opts[:cf_driver] || CloudFormationDriver.new
+    provisioner = CloudFormationProvisioner.new("#{app}-#{env_name}", cf)
+    provisioner.output(key)
   end
 
   def self.deploy(opts)
@@ -33,6 +35,7 @@ module EbDeployer
 
     bs = opts[:bs_driver] || Beanstalk.new
     s3 = opts[:s3_driver] || S3Driver.new
+    cf = opts[:cf_driver] || CloudFormationDriver.new
     stack_name = opts[:solution_stack_name] || "64bit Amazon Linux running Tomcat 7"
     app = opts[:application]
     env_name = opts[:environment]
@@ -44,7 +47,7 @@ module EbDeployer
     smoke_test = opts[:smoke_test] || Proc.new {}
 
     package = Package.new(opts[:package], app + "-packages", s3)
-    cf = CloudFormationProvisioner.new("#{app}-#{env_name}")
+    cf = CloudFormationProvisioner.new("#{app}-#{env_name}", cf)
     strategy = DeploymentStrategy.create(strategy_name, app, env_name, bs,
                                          :solution_stack => stack_name,
                                          :cname_prefix => cname_prefix,

data/test/aws_driver_stubs.rb

@@ -64,6 +64,10 @@ class EBStub
     @envs[env_key(app_name, env_name)][:version]
   end
 
+  def environment_settings(app_name, env_name)
+    @envs[env_key(app_name, env_name)][:settings]
+  end
+
   private
   def env_key(app, name)
     [app, name].join("-")
@@ -92,3 +96,30 @@ class S3Stub
     @buckets[bucket_name][obj_name] = file
   end
 end
+
+class CFStub
+  def initialize
+    @stacks = {}
+  end
+
+  def create_stack(name, template, opts)
+    @stacks[name] = {:template => template, :opts => opts }
+  end
+
+  def update_stack(name, template, opts)
+    @stacks[name] = @stacks[name].merge(:template => template, opts => opts)
+  end
+
+  def stack_status(name)
+    @stacks[name] && :update_complete
+  end
+
+  def stack_exists?(name)
+    @stacks.has_key?(name)
+  end
+
+  def query_output(name, key)
+    raise AWS::CloudFormation::Errors::ValidationError.new unless stack_exists?(name)
+    "value of #{key}"
+  end
+end

data/test/deploy_test.rb

@@ -1,3 +1,4 @@
+require 'tempfile'
 require 'eb_deployer'
 require 'aws_driver_stubs'
 require 'minitest/autorun'
@@ -6,18 +7,11 @@ class DeployTest < Minitest::Test
   def setup
     @eb_driver = EBStub.new
     @s3_driver = S3Stub.new
+    @cf_driver = CFStub.new
     @sample_package = '/tmp/app-package.war'
     File.open(@sample_package, 'w') { |f| f << 's' * 100 }
   end
 
-  def deploy(opts)
-    EbDeployer.deploy({:package => @sample_package,
-                        :bs_driver => @eb_driver,
-                        :s3_driver => @s3_driver,
-                        :version_label => 1}.merge(opts))
-  end
-
-
   def test_first_deployment_create_environment
     assert !@eb_driver.environment_exists?('simple', eb_envname('simple', 'production'))
     deploy(:application => 'simple', :environment => "production")
@@ -152,9 +146,91 @@ class DeployTest < Minitest::Test
                   'simple-production-inactive.elasticbeanstalk.com'], smoked_host
   end
 
+  def test_deploy_with_resources_declared_will_create_a_cf_stack_for_env
+    cf_template = temp_file(JSON.dump({'Resources' => {'R1' => {}}}))
+    deploy(:application => 'simple', :environment => "production",
+           :resources => {
+             :template => cf_template
+           })
+    assert @cf_driver.stack_exists?('simple-production')
+  end
+
+  def test_transforms_resource_provsion_output_to_elastic_beanstalk_settings
+    cf_template = temp_file(JSON.dump({'Resources' => {'R1' => {}}}))
+    deploy(:application => 'simple', :environment => "production",
+           :resources => {
+             :template => cf_template
+           })
+    assert @cf_driver.stack_exists?('simple-production')
+  end
+
+  def test_transforms_resource_provsion_output_to_elastic_beanstalk_settings
+    cf_template = temp_file(JSON.dump({
+                                        'Resources' => {'R1' => {}},
+                                        'Outputs' => {'O1' => {}, 'O2' => {}}
+                                      }))
+    deploy(:application => 'simple', :environment => "production",
+           :resources => {
+             :template => cf_template,
+             :transforms => {
+               'O1' => lambda { |v| {:namespace => 'aws.foo', :option_name => 'o1', :value => v} }
+             }
+           })
+    assert @eb_driver.environment_settings('simple', eb_envname('simple', 'production')).
+      include?({:namespace => 'aws.foo', :option_name => 'o1', :value => 'value of O1'})
+  end
+
+  def test_can_query_resource_stack_output_after_deploy
+    cf_template = temp_file(JSON.dump({
+                                        'Resources' => {'R1' => {}},
+                                        'Outputs' => {'O1' => {}, 'O2' => {}}
+                                      }))
+    deploy(:application => 'simple',
+           :environment => "production",
+           :resources => { :template => cf_template })
+    assert_equal 'value of O1', query_resource_output('O1',
+                                                      :application => 'simple',
+                                                      :environment => "production")
+    assert_equal 'value of O2', query_resource_output('O2',
+                                                      :application => 'simple',
+                                                      :environment => "production")
+
+  end
+
+  def test_should_raise_error_if_query_resources_that_have_not_been_provisioned_yet
+    assert_raises(EbDeployer::ResourceNotInReadyState) do
+      query_resource_output('O1',
+                            :application => 'simple',
+                            :environment => "production")
+    end
+  end
+
   private
 
+  def temp_file(content)
+    f = Tempfile.new("foo")
+    f.write(content)
+    f
+  end
+
   def eb_envname(app_name, env_name)
     EbDeployer::Environment.unique_ebenv_name(app_name, env_name)
   end
+
+  def query_resource_output(key, opts)
+    EbDeployer.query_resource_output(key, {:bs_driver => @eb_driver,
+                                       :s3_driver => @s3_driver,
+                                       :cf_driver => @cf_driver}.merge(opts))
+  end
+
+  def deploy(opts)
+    EbDeployer.deploy({:package => @sample_package,
+                        :bs_driver => @eb_driver,
+                        :s3_driver => @s3_driver,
+                        :cf_driver => @cf_driver,
+                        :version_label => 1}.merge(opts))
+  end
+
+
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eb_deployer
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -60,6 +60,7 @@ files:
 - eb_deployer.gemspec
 - lib/eb_deployer.rb
 - lib/eb_deployer/beanstalk.rb
+- lib/eb_deployer/cloud_formation_driver.rb
 - lib/eb_deployer/cloud_formation_provisioner.rb
 - lib/eb_deployer/deployment_strategy.rb
 - lib/eb_deployer/environment.rb