chef-provisioning-aws 1.0.4 → 1.1.0

data/spec/spec_helper.rb

@@ -1,3 +1,7 @@
+# Bring in the RSpec monkeypatch before we do *anything*, so that builtin matchers
+# will get the module.  Not strictly necessary, but cleaner that way.
+require 'aws_support/deep_matcher/rspec_monkeypatches'
+
 require 'chef/mixin/shell_out'
 require 'chef/dsl/recipe'
 require 'chef/provisioning'
@@ -5,17 +9,19 @@ require 'chef/provisioning/aws_driver'
 require 'chef/platform'
 require 'chef/run_context'
 require 'chef/event_dispatch/dispatcher'
-require 'support/aws_support'
+require 'aws_support'
+require 'rspec'
 
 RSpec.configure do |rspec|
   rspec.run_all_when_everything_filtered = true
   rspec.filter_run :focus
+  rspec.filter_run_excluding :super_slow => true
 #  rspec.order = 'random'
   rspec.expect_with(:rspec) { |c| c.syntax = :expect }
 #  rspec.before { allow($stdout).to receive(:write) }
 end
 
 #Chef::Log.level = :debug
+Chef::Config[:log_level] = :warn
 
-#AWS.stub!
 require 'cheffish/rspec/matchers'

data/spec/unit/aws_driver/credentials_spec.rb

@@ -72,6 +72,28 @@ describe Chef::Provisioning::AWSDriver::Credentials do
       @ini
     end
 
+    let(:enterprise_config_ini_file) do
+      @ini ||= begin
+        ini = Tempfile.new('enterprise_config_ini')
+        ini.write(
+          ['[profile enterprise]',
+           'region = us-west-2',
+           'aws_access_key_id = AKIAENTERPRISEKEY',
+           'aws_secret_access_key = enterprisesecretaccesskey',
+           'aws_session_token = MIIEpAIBAAKCAQEAth95Ci0sdvK222gG2wZEeBXZXeTIynOqJT1fcRnZ/dqVsoUm',
+           'proxy_uri = https://user:password@my.proxy:443/path?query',
+           '[profile work_iam]',
+           'region = us-east-1',
+           'aws_access_key_id = AKIAWORKIAMKEY',
+           'aws_secret_access_key = workiamsecretaccesskey'
+          ].join("\n")
+        )
+        ini.rewind
+        ini
+      end
+      @ini
+    end
+
     context 'unified config ini file' do
       %w(work_iam personal).each do |profile|
         it "loads the '#{profile}' profile from a unified config file" do
@@ -93,6 +115,37 @@ describe Chef::Provisioning::AWSDriver::Credentials do
       end
     end
 
+    context 'enterprise config ini file' do
+      let(:credentials) { described_class.new }
+      %w(work_iam enterprise).each do |profile|
+        it "loads the '#{profile}' profile from a enterprise config file" do
+          ENV['AWS_DEFAULT_PROFILE'] = profile
+          ENV['AWS_CREDENTIAL_FILE'] = nil
+          ENV['AWS_CONFIG_FILE'] = enterprise_config_ini_file.path
+          allow(File)
+            .to receive(:file?)
+            .with(File.expand_path('~/.aws/credentials'))
+            .and_return(false)
+          allow(File)
+            .to receive(:file?)
+            .with(File.expand_path(enterprise_config_ini_file.path))
+            .and_return(true)
+
+          if profile.eql?('enterprise')
+            expect(credentials[profile][:proxy_uri])
+              .to eq('https://user:password@my.proxy:443/path?query')
+            expect(credentials[profile][:aws_session_token])
+              .to eq('MIIEpAIBAAKCAQEAth95Ci0sdvK222gG2wZEeBXZXeTIynOqJT1fcRnZ/dqVsoUm')
+          else
+            expect(credentials[profile][:proxy_uri])
+              .to eq(nil)
+            expect(credentials[profile][:aws_session_token])
+              .to eq(nil)
+          end
+        end
+      end
+    end
+
     context 'separate config and credential ini files' do
       %w(work_iam personal).each do |profile|
         it "loads the '#{profile}' profile from a separate config files" do
@@ -105,5 +158,6 @@ describe Chef::Provisioning::AWSDriver::Credentials do
         end
       end
     end
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning-aws
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - John Ewart
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-07 00:00:00.000000000 Z
+date: 2015-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.59.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.59.0
 - !ruby/object:Gem::Dependency
   name: retryable
   requirement: !ruby/object:Gem::Requirement
@@ -137,8 +137,12 @@ files:
 - lib/chef/provider/aws_dhcp_options.rb
 - lib/chef/provider/aws_ebs_volume.rb
 - lib/chef/provider/aws_eip_address.rb
+- lib/chef/provider/aws_image.rb
+- lib/chef/provider/aws_instance.rb
 - lib/chef/provider/aws_key_pair.rb
 - lib/chef/provider/aws_launch_configuration.rb
+- lib/chef/provider/aws_load_balancer.rb
+- lib/chef/provider/aws_network_interface.rb
 - lib/chef/provider/aws_route_table.rb
 - lib/chef/provider/aws_s3_bucket.rb
 - lib/chef/provider/aws_security_group.rb
@@ -174,9 +178,27 @@ files:
 - lib/chef/resource/aws_sqs_queue.rb
 - lib/chef/resource/aws_subnet.rb
 - lib/chef/resource/aws_vpc.rb
+- spec/aws_support.rb
+- spec/aws_support/aws_resource_run_wrapper.rb
+- spec/aws_support/deep_matcher.rb
+- spec/aws_support/deep_matcher/fuzzy_match_objects.rb
+- spec/aws_support/deep_matcher/match_values_failure_messages.rb
+- spec/aws_support/deep_matcher/matchable_array.rb
+- spec/aws_support/deep_matcher/matchable_object.rb
+- 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/update_an_aws_object.rb
+- spec/integration/aws_ebs_volume_spec.rb
+- spec/integration/aws_key_pair_spec.rb
+- spec/integration/aws_route_table_spec.rb
 - spec/integration/aws_security_group_spec.rb
+- spec/integration/aws_subnet_spec.rb
+- spec/integration/aws_vpc_spec.rb
+- spec/integration/machine_batch_spec.rb
+- spec/integration/machine_image_spec.rb
+- spec/integration/machine_spec.rb
 - spec/spec_helper.rb
-- spec/support/aws_support.rb
 - spec/unit/aws_driver/credentials_spec.rb
 homepage: https://github.com/opscode/chef-provisioning-aws
 licenses: []

data/spec/support/aws_support.rb

@@ -1,211 +0,0 @@
-require 'cheffish/rspec/chef_run_support'
-require 'cheffish/rspec/recipe_run_wrapper'
-require 'chef/provisioning/aws_driver'
-
-module AWSSupport
-  def self.extended(other)
-    other.extend Cheffish::RSpec::ChefRunSupport
-  end
-
-  def with_aws(description, *tags, &block)
-    if ENV['AWS_TEST_DRIVER']
-      aws_driver = Chef::Provisioning.driver_for_url(ENV['AWS_TEST_DRIVER'])
-    else
-      tags << { skip: "AWS_TEST_DRIVER not set ... cannot run AWS test.  Set AWS_TEST_DRIVER=aws or aws:profile:region to run tests that hit AWS" }
-    end
-
-    context description, *tags do
-      extend WithAWSClassMethods
-      include WithAWSInstanceMethods
-
-      @@driver = aws_driver
-      def self.driver
-        @@driver
-      end
-
-      module_eval(&block)
-    end
-  end
-
-  module WithAWSClassMethods
-    def chef_config
-      { driver: driver }
-    end
-
-    instance_eval do
-      #
-      # Create a context-level method for each AWS resource:
-      #
-      # with_aws do
-      #   context 'mycontext' do
-      #     aws_vpc 'myvpc' do
-      #       ...
-      #     end
-      #   end
-      # end
-      #
-      # Creates the AWS thing when the first example in the context runs.
-      # Destroys it after the last example in the context runs.  Objects created
-      # in the order declared, and destroyed in reverse order.
-      #
-      Chef::Provisioning::AWSDriver::Resources.constants.each do |resource_class|
-        resource_class = Chef::Provisioning::AWSDriver::Resources.const_get(resource_class)
-        # def aws_vpc(name, &block)
-        define_method(resource_class.resource_name) do |name, &block|
-          # def myvpc
-          #   @@myvpc
-          # end
-          instance_eval do
-            define_method(name) { class_variable_get(:"@@#{name}") }
-          end
-          module_eval do
-            define_method(name) { self.class.class_variable_get(:"@@#{name}") }
-          end
-
-          resource = nil
-
-          before :context do
-            resource = AWSResourceRunWrapper.new(self, resource_class.resource_name, name, &block)
-            # @myvpc = resource
-            begin
-              self.class.class_variable_set(:"@@#{name}", resource.resource)
-            rescue NameError
-            end
-            resource.converge
-          end
-
-          after :context do
-            resource.destroy if resource
-          end
-        end
-      end
-    end
-  end
-
-  module WithAWSInstanceMethods
-    def self.included(context)
-      context.module_eval do
-        # Destroy any objects we know got created during the test
-        after :example do
-          created_during_test.reverse_each do |resource_name, name|
-            (recipe do
-              public_send(resource_name, name) do
-                action :destroy
-              end
-            end).converge
-          end
-        end
-      end
-    end
-
-    def chef_config
-      { driver: driver }
-    end
-
-    def created_during_test
-      @created_during_test ||= []
-    end
-
-    def default_vpc
-      @default_vpc ||= driver.ec2.vpcs.filter('isDefault', 'true').first
-    end
-
-    def driver
-      self.class.driver
-    end
-  end
-
-  class AWSResourceRunWrapper < Cheffish::RSpec::RecipeRunWrapper
-    def initialize(rspec_context, resource_type, name, &properties)
-      super(rspec_context.chef_config) do
-        public_send(resource_type, name, &properties)
-      end
-      @rspec_context = rspec_context
-      @resource_type = resource_type
-      @name = name
-      @properties = properties
-    end
-
-    attr_reader :rspec_context
-    attr_reader :resource_type
-    attr_reader :name
-
-    def resource
-      resources.first
-    end
-
-    def to_s
-      "#{resource_type}[#{name}]"
-    end
-
-    def destroy
-      resource_type = self.resource_type
-      name = self.name
-      rspec_context.run_recipe do
-        public_send(resource_type, name) do
-          action :destroy
-        end
-      end
-    end
-
-    def aws_object
-      resource.aws_object
-    end
-  end
-end
-
-
-#
-# Matchers for:
-#
-# - create_an_aws_security_group
-# - create_an_aws_vpc
-# etc.
-#
-# Checks if the object got created, then deletes the object at the end of the test.
-#
-Chef::Provisioning::AWSDriver::Resources.constants.each do |resource_class|
-  resource_class = Chef::Provisioning::AWSDriver::Resources.const_get(resource_class)
-
-  RSpec::Matchers.define :"create_an_#{resource_class.resource_name}" do |name, expected_properties|
-    match do |recipe|
-      @recipe = recipe
-
-      # Converge
-      recipe.converge
-      expect(recipe).to be_updated
-
-      resource = resource_class.new(name, nil)
-      resource.driver driver
-      resource.managed_entry_store Chef::Provisioning.chef_managed_entry_store
-      aws_object = resource.aws_object
-
-      # Check existence and properties
-      if aws_object.nil?
-        raise "#{resource.to_s} succeeded but was not created!"
-      end
-
-      created_during_test << [ resource_class.resource_name, name ]
-
-      # Check to see if properties have the expected values
-      @differences = {}
-      expected_properties.each do |name, value|
-        aws_value = aws_object.public_send(name)
-        if !(aws_value === expected_properties[name])
-          @differences[name] = aws_value
-        end
-      end
-
-      @differences.empty?
-    end
-
-    failure_message {
-      message = "#{@recipe} created an AWS object with unexpected values:\n"
-      @differences.each do |name, value|
-        message << "- expected #{name} to match #{expected_properties[name].inspect}, but the actual value was #{value.inspect}\n"
-      end
-      message << @recipe.output_for_failure_message
-      message
-    }
-  end
-end