eb_deployer 0.2.7 → 0.2.8

data/lib/eb_deployer/cloud_formation_provisioner.rb

@@ -14,14 +14,15 @@ module EbDeployer
     def provision(resources)
       resources = symbolize_keys(resources)
       template = File.read(resources[:template])
-      outputs = resources[:outputs] || {}
-      transforms = resources[:transforms] || {}
       capabilities = resources[:capabilities] || []
       params = resources[:inputs] || resources[:parameters] || {}
-
       stack_exists? ? update_stack(template, params, capabilities) : create_stack(template, params, capabilities)
       wait_for_stack_op_terminate
+    end
 
+    def transform_outputs(resources)
+      outputs = resources[:outputs] || {}
+      transforms = resources[:transforms] || {}
       transform_output_to_settings(convert_to_transforms(outputs).merge(transforms))
     end
 

data/lib/eb_deployer/version.rb

@@ -1,3 +1,3 @@
 module EbDeployer
-  VERSION = "0.2.7"
+  VERSION = "0.2.8"
 end

data/lib/eb_deployer.rb

@@ -184,8 +184,9 @@ module EbDeployer
                                          :smoke_test => smoke_test,
                                          :phoenix_mode => phoenix_mode)
 
-    if !skip_resource && resources = opts[:resources]
-      env_settings += cf.provision(resources)
+    if resources = opts[:resources]
+      cf.provision(resources) unless skip_resource
+      env_settings += cf.transform_outputs(resources)
     end
 
     application.create_version(version_label, opts[:package])

data/test/cloud_formation_provisioner_test.rb

@@ -9,20 +9,23 @@ class CloudFormationProvisionerTest < Minitest::Test
 
 
   def test_convert_inputs_as_params_to_cf
-    @provisioner.provision(:template => @template,
-                           :inputs => { 'Foo' => 'Bar' })
+    resources = { :template => @template, :inputs => { 'Foo' => 'Bar' } }
+    @provisioner.provision(resources)
 
     assert_equal({ 'Foo' => 'Bar' }, @cf.stack_config("myresources")[:parameters])
   end
 
   def test_transform_to_eb_settings
-    settings = @provisioner.provision(:template => @template,
-                                      :outputs => {
-                                        'S' => {
-                                          'namespace' => "foo",
-                                          "option_name" => "bar"
-                                        }
-                                      })
+    resources = { :template => @template,
+      :outputs => {
+        'S' => {
+          'namespace' => "foo",
+          "option_name" => "bar"
+        }
+      }}
+
+    @provisioner.provision(resources)
+    settings = @provisioner.transform_outputs(resources)
     assert_equal [{'namespace' => 'foo', 'option_name' => 'bar', 'value' => 'value of S'}], settings
   end
 end

data/test/deploy_test.rb

@@ -219,6 +219,27 @@ class DeployTest < Minitest::Test
     assert_equal(2, @cf_driver.stack_config('simple-production')[:parameters]['a'])
   end
 
+  def test_should_still_query_output_to_set_eb_options_even_skip_resources_update_is_specified
+    cf_template = temp_file(JSON.dump({'Resources' => {'R1' => {}},
+                                      'Outputs' => {'O1' => {}, 'O2' => {}}}))
+    deploy(:application => 'simple', :environment => "production",
+           :resources => {
+             :template => cf_template
+           })
+
+    deploy(:application => 'simple', :environment => "production",
+           :skip_resource_stack_update => true,
+           :resources => {
+             :template => cf_template,
+             :transforms => {
+               'O2' => lambda { |v| {:namespace => 'aws.foo', :option_name => 'o2', :value => "transformed " + v} }
+             }
+           })
+
+    assert @eb_driver.environment_settings('simple', eb_envname('simple', 'production')).
+      include?({:namespace => 'aws.foo', :option_name => 'o2', :value => 'transformed value of O2'})
+  end
+
 
   def test_set_s3_bucket_name_on_deployment
     deploy(:application => 'simple',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eb_deployer
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
   prerelease: 
 platform: ruby
 authors: