chef-provisioning-aws 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66de7d20ac16f1c99866f9d4195f38586bfb667d
-  data.tar.gz: 5cbae8b8fcc08af3538333bbf6bc29c96beb0f22
+  metadata.gz: 9a8ee86c530dd398dad4b925b119b8d88db9f55a
+  data.tar.gz: 367430b7e0cdee74064297461617a9545c9c1aa1
 SHA512:
-  metadata.gz: 36907c00f23caf788569f528f6b12ad64afb4c316f02794dd05927c06e234b7271257d7d83c85f517c7bb370928507fe2616bb9379e5b161e48cdce50dc3fed6
-  data.tar.gz: 616a2bcd0b104326714aa001462f042eedec30d06825b5e9556b6e326a03037833ddd4d79879183bd4b20a7335272140f253be91b380817acf4a2b13c4c298ae
+  metadata.gz: 76da770b34ea861319e125e2125aee36d61b2ce47ed333a26aceae6939576c5f498d054b9f84eff7f1ad46b7d7ca61e6f5cbb5c236742dd761697b8b25eb50f1
+  data.tar.gz: b0c8b49ae247b81214853e172b417c77ed40928da2903f6a4b79085bac2fb4cd91f108a827a9059d60259daa712b2084be4414dcd5202f1d37f1ce4649e98339

data/lib/chef/provider/aws_instance.rb

@@ -1,6 +1,10 @@
 require 'chef/provisioning/aws_driver/aws_provider'
 
 class Chef::Provider::AwsInstance < Chef::Provisioning::AWSDriver::AWSProvider
+  def create_aws_object(instance); end
+
+  def update_aws_object(instance); end
+
   def destroy_aws_object(instance)
     converge_by "delete instance #{new_resource} in VPC #{instance.vpc.id} in #{region}" do
       instance.delete

data/lib/chef/provisioning/aws_driver/driver.rb

@@ -90,10 +90,10 @@ module AWSDriver
           actual_elb = elb.load_balancers.create(lb_spec.name, lb_options)
 
           lb_spec.reference = {
-            'driver_url' => driver_url,
             'driver_version' => Chef::Provisioning::AWSDriver::VERSION,
             'allocated_at' => Time.now.utc.to_s,
           }
+          lb_spec.driver_url = driver_url
         end
       else
         # Header gets printed the first time we make an update
@@ -335,11 +335,11 @@ module AWSDriver
           image = ec2.images.create(image_options.to_hash)
           image.add_tag('From-Instance', :value => image_options[:instance_id]) if image_options[:instance_id]
           image_spec.reference = {
-            'driver_url' => driver_url,
             'driver_version' => Chef::Provisioning::AWSDriver::VERSION,
             'image_id' => image.id,
             'allocated_at' => Time.now.to_i
           }
+          image_spec.driver_url = driver_url
         end
       end
     end
@@ -414,14 +414,15 @@ EOD
           sleep 5 while instance.status == :pending
           # TODO add other tags identifying user / node url (same as fog)
           instance.tags['Name'] = machine_spec.name
+          instance.source_dest_check = machine_options[:source_dest_check] if machine_options.has_key?(:source_dest_check)
           machine_spec.reference = {
-              'driver_url' => driver_url,
               'driver_version' => Chef::Provisioning::AWSDriver::VERSION,
               'allocated_at' => Time.now.utc.to_s,
               'host_node' => action_handler.host_node,
               'image_id' => bootstrap_options[:image_id],
               'instance_id' => instance.id
           }
+          machine_spec.driver_url = driver_url
           machine_spec.reference['key_name'] = bootstrap_options[:key_name] if bootstrap_options[:key_name]
           %w(is_windows ssh_username sudo use_private_ip_for_ssh ssh_gateway).each do |key|
             machine_spec.reference[key] = machine_options[key.to_sym] if machine_options[key.to_sym]
@@ -602,8 +603,8 @@ EOD
 
     def instance_for(machine_spec)
       if machine_spec.reference
-        if machine_spec.reference['driver_url'] != driver_url
-          raise "Switching a machine's driver from #{machine_spec.reference['driver_url']} to #{driver_url} is not currently supported!  Use machine :destroy and then re-create the machine on the new driver."
+        if machine_spec.driver_url != driver_url
+          raise "Switching a machine's driver from #{machine_spec.driver_url} to #{driver_url} is not currently supported!  Use machine :destroy and then re-create the machine on the new driver."
         end
         Chef::Resource::AwsInstance.get_aws_object(machine_spec.reference['instance_id'], driver: self, managed_entry_store: machine_spec.managed_entry_store, required: false)
       end
@@ -941,14 +942,15 @@ EOD
             machine_spec = machine_specs.pop
             machine_options = specs_and_options[machine_spec]
             machine_spec.reference = {
-              'driver_url' => driver_url,
               'driver_version' => Chef::Provisioning::AWSDriver::VERSION,
               'allocated_at' => Time.now.utc.to_s,
               'host_node' => action_handler.host_node,
               'image_id' => bootstrap_options[:image_id],
               'instance_id' => instance.id
             }
+            machine_spec.driver_url = driver_url
             instance.tags['Name'] = machine_spec.name
+            instance.source_dest_check = machine_options[:source_dest_check] if machine_options.has_key?(:source_dest_check)
             machine_spec.reference['key_name'] = bootstrap_options[:key_name] if bootstrap_options[:key_name]
             %w(is_windows ssh_username sudo use_private_ip_for_ssh ssh_gateway).each do |key|
               machine_spec.reference[key] = machine_options[key.to_sym] if machine_options[key.to_sym]

data/lib/chef/provisioning/aws_driver/version.rb

@@ -1,7 +1,7 @@
 class Chef
 module Provisioning
 module AWSDriver
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end
 end
 end

data/spec/aws_support.rb

@@ -12,6 +12,7 @@ module AWSSupport
   require 'chef/provisioning/aws_driver'
   require 'aws_support/matchers/create_an_aws_object'
   require 'aws_support/matchers/update_an_aws_object'
+  require 'aws_support/matchers/destroy_an_aws_object'
   require 'aws_support/delayed_stream'
   require 'chef/provisioning/aws_driver/resources'
   require 'aws_support/aws_resource_run_wrapper'
@@ -188,6 +189,10 @@ module AWSSupport
       define_method("create_an_#{resource_name}") do |name, expected_values={}|
         AWSSupport::Matchers::CreateAnAWSObject.new(self, resource_class, name, expected_values)
       end
+      define_method("destroy_an_#{resource_name}") do |name, expected_values={}|
+        AWSSupport::Matchers::DestroyAnAWSObject.new(self, resource_class, name)
+      end
+
     end
 
     def chef_config

data/spec/aws_support/matchers/destroy_an_aws_object.rb

@@ -0,0 +1,62 @@
+require 'rspec/matchers'
+require 'chef/provisioning'
+require 'aws_support/deep_matcher'
+
+module AWSSupport
+  module Matchers
+    class DestroyAnAWSObject
+      include RSpec::Matchers::Composable
+      include AWSSupport::DeepMatcher
+
+      def initialize(example, resource_class, name)
+        @example = example
+        @resource_class = resource_class
+        @name = name
+
+        # Grab the "before" value
+        resource = resource_class.new(name, nil)
+        resource.driver example.driver
+        resource.managed_entry_store Chef::Provisioning.chef_managed_entry_store
+        @had_initial_value = !resource.aws_object.nil?
+      end
+
+      attr_reader :example
+      attr_reader :resource_class
+      attr_reader :name
+      def resource_name
+        @resource_class.resource_name
+      end
+      attr_reader :had_initial_value
+
+      def match_failure_messages(recipe)
+        differences = []
+
+        if !had_initial_value
+          differences << "expected recipe to delete #{resource_name}[#{name}], but the AWS object did not exist before recipe ran!"
+          return differences
+        end
+
+        # Converge
+        begin
+          recipe.converge
+        rescue
+          differences += [ "error trying to delete #{resource_name}[#{name}]!\n#{($!.backtrace.map { |line| "- #{line}\n" } + [ recipe.output_for_failure_message ]).join("")}" ]
+        end
+
+        # Check whether the recipe caused an update or not
+        differences += match_values_failure_messages(example.be_updated, recipe, "recipe")
+
+        # Check for object existence and properties
+        resource = resource_class.new(name, nil)
+        resource.driver example.driver
+        resource.managed_entry_store Chef::Provisioning.chef_managed_entry_store
+        aws_object = resource.aws_object
+
+        # Check existence
+        differences << "#{resource_name}[#{name}] was not deleted!" unless aws_object.nil?
+
+        differences
+      end
+    end
+  end
+end

data/spec/integration/aws_ebs_volume_spec.rb

@@ -17,6 +17,23 @@ describe Chef::Resource::AwsEbsVolume do
         ).and be_idempotent
       end
 
+      describe 'action :delete' do
+        with_converge {
+          aws_ebs_volume "test_volume" do
+            availability_zone 'a'
+            size 8
+          end
+        }
+        it "deletes the ebs volume" do
+          expect_recipe {
+            aws_ebs_volume "test_volume" do
+              action :destroy
+            end
+          }.to destroy_an_aws_ebs_volume('test_volume')
+           .and be_idempotent
+        end
+      end
+
       it "aws_ebs_volume 'test_volume_az' creates an ebs volume when provided proper full AZ" do
         expect_recipe {
           aws_ebs_volume "test_volume_az" do
@@ -26,6 +43,7 @@ describe Chef::Resource::AwsEbsVolume do
         }.to create_an_aws_ebs_volume('test_volume_az')
          .and be_idempotent
       end
+
     end
   end
 end

data/spec/integration/machine_batch_spec.rb

@@ -20,14 +20,17 @@ describe Chef::Resource::MachineBatch do
                 machine_options bootstrap_options: {
                   subnet_id: 'test_public_subnet',
                   key_name: 'test_key_pair'
-                }
+                }, source_dest_check: false
                 action :allocate
               end
             end
           end
-        }.to create_an_aws_instance('test_machine1'
-        ).and create_an_aws_instance('test_machine2'
-        ).and create_an_aws_instance('test_machine3'
+        }.to create_an_aws_instance('test_machine1',
+          source_dest_check: false
+        ).and create_an_aws_instance('test_machine2',
+          source_dest_check: false
+        ).and create_an_aws_instance('test_machine3',
+          source_dest_check: false
         ).and be_idempotent
       end
     end

data/spec/integration/machine_spec.rb

@@ -12,6 +12,7 @@ describe Chef::Resource::Machine do
 
       purge_all
       setup_public_vpc
+
       it "machine with few options allocates a machine", :super_slow do
         expect_recipe {
           machine 'test_machine' do
@@ -37,6 +38,20 @@ describe Chef::Resource::Machine do
         }.to create_an_aws_instance('test_machine'
         ).and be_idempotent
       end
+
+      it "machine with source_dest_check false creates a machine with no source dest check", :super_slow do
+        expect_recipe {
+          machine 'test_machine' do
+            machine_options bootstrap_options: {
+              subnet_id: 'test_public_subnet',
+              key_name: 'test_key_pair'
+            }, source_dest_check: false
+            action :allocate
+          end
+        }.to create_an_aws_instance('test_machine',
+          source_dest_check: false
+        ).and be_idempotent
+      end
     end
 
     with_aws "Without a VPC" do
@@ -59,6 +74,19 @@ describe Chef::Resource::Machine do
         ).and create_an_aws_key_pair('test_key_pair'
         ).and be_idempotent
       end
+
+      # Tests https://github.com/chef/chef-provisioning-aws/issues/189
+      it "correctly finds the driver_url when switching between machine and aws_instance", :super_slow do
+        expect { recipe {
+          machine 'test-machine-driver' do
+            action :allocate
+          end
+          aws_instance 'test-machine-driver'
+          machine 'test-machine-driver' do
+            action :destroy
+          end
+        }.converge }.to_not raise_error
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning-aws
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - John Ewart
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-16 00:00:00.000000000 Z
+date: 2015-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -188,6 +188,7 @@ files:
 - spec/aws_support/deep_matcher/rspec_monkeypatches.rb
 - spec/aws_support/delayed_stream.rb
 - spec/aws_support/matchers/create_an_aws_object.rb
+- spec/aws_support/matchers/destroy_an_aws_object.rb
 - spec/aws_support/matchers/update_an_aws_object.rb
 - spec/integration/aws_ebs_volume_spec.rb
 - spec/integration/aws_key_pair_spec.rb