chef-provisioning-aws 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ac3b4009283033918629bde10eae733c25b8a73
-  data.tar.gz: 486f831a4168454ad62c9b5ebccd48e7f57249d5
+  metadata.gz: 6fa67263316335a4b0a9df876a8156ee8623bd18
+  data.tar.gz: 5c09a23f932d5f566d64ba9db95254551549742a
 SHA512:
-  metadata.gz: 83fc3ef810c239b52c0c00246f08ba97fa5f4b4af3ab116324a7cdf52929815e9006ecc89e92837f1311510b0b9960ca43c41a50385e856bcc12a022a602efa6
-  data.tar.gz: 2dd1b0c595deccae3767740d0abe2d6058c2322ef214a16640dc4386c8586b09efcd39ad667ec29f21aadedbb835aba29b37556b67fb84e0d5bbf661946d5afd
+  metadata.gz: fdbebb79eaad90ed4eb4d850e45351936336f3ad885ec50e83a79fb966f7737b9bea623c40e42eaf461dfce690084cd221077f19abe3faeeade8ac228df984f6
+  data.tar.gz: 10d6a33fc7a463ffd31b0f0efb70cd32433a6814e32fe7a7187757fac2bf530fcd612e7c90866f4a77e8c7f8840a3bc717e0e40bdbd1a45e7e780d05ced668c1

data/Rakefile

@@ -39,7 +39,7 @@ end
 
 desc "travis specific task - runs CI integration tests (regular and super_slow in parallel) and sets up travis specific ENV variables"
 task :travis, [:sub_task] do |t, args|
-  pattern = "load_balancer_spec.rb,machine_image_spec.rb" # This is a comma seperated list
+  pattern = "load_balancer_spec.rb,machine_image_spec.rb,aws_iam_instance_profile_spec.rb" # This is a comma seperated list
   pattern = pattern.split(",").map {|p| "spec/integration/**/*#{p}"}.join(",")
   Rake::Task[args[:sub_task]].invoke(pattern)
 end

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

@@ -752,15 +752,12 @@ EOD
       if bootstrap_options[:subnet]
         bootstrap_options[:subnet_id] = bootstrap_options.delete(:subnet)
       end
-
-      bootstrap_options = AWSResource.lookup_options(bootstrap_options, managed_entry_store: machine_spec.managed_entry_store, driver: self)
-
-      # We do this after the lookup_options because we need the aws_iam_instance_profile resource to
-      # only be passed a String during resource lookup, not `{name: ...}`
       if bootstrap_options[:iam_instance_profile] && bootstrap_options[:iam_instance_profile].is_a?(String)
         bootstrap_options[:iam_instance_profile] = {name: bootstrap_options[:iam_instance_profile]}
       end
 
+      bootstrap_options = AWSResource.lookup_options(bootstrap_options, managed_entry_store: machine_spec.managed_entry_store, driver: self)
+
       # In the migration from V1 to V2 we still support associate_public_ip_address at the top level
       # we do this after the lookup because we have to copy any present subnets, etc. into the
       # network interfaces block

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

@@ -1,7 +1,7 @@
 class Chef
 module Provisioning
 module AWSDriver
-  VERSION = '1.5.0'
+  VERSION = '1.5.1'
 end
 end
 end

data/lib/chef/resource/aws_iam_instance_profile.rb

@@ -11,7 +11,9 @@ require 'chef/provisioning/aws_driver/aws_resource'
 # - http://docs.aws.amazon.com/sdkforruby/api/Aws/IAM/InstanceProfile.html
 #
 class Chef::Resource::AwsIamInstanceProfile < Chef::Provisioning::AWSDriver::AWSResource
-  aws_sdk_type ::Aws::IAM::InstanceProfile
+  # We don't want any lookup_options to try and build a resource from a :iam_instance_profile string,
+  # its either a name or an ARN
+  aws_sdk_type ::Aws::IAM::InstanceProfile, :option_names => []
 
   #
   # The name of the instance profile to create.

data/spec/integration/machine_spec.rb

@@ -251,6 +251,21 @@ describe Chef::Resource::Machine do
             iam_instance_profile: {arn: /machine_test_instance_profile/}
           ).and be_idempotent
         end
+
+        it "looks up the iam_instance_profile from the arn", :super_slow do
+          expect_recipe {
+            machine 'test_machine' do
+              machine_options bootstrap_options: {
+                subnet_id: 'test_public_subnet',
+                key_name: 'test_key_pair',
+                iam_instance_profile: {arn: machine_test_instance_profile.aws_object.arn}
+              }
+              action :allocate
+            end
+          }.to create_an_aws_instance('test_machine',
+            iam_instance_profile: {arn: /machine_test_instance_profile/}
+          ).and be_idempotent
+        end
       end
 
       it "machine with from_image option is created from correct image", :super_slow do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning-aws
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - John Ewart
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-08 00:00:00.000000000 Z
+date: 2015-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-provisioning