chef-provisioning-aws 0.4.0 → 0.5.0

data/spec/integration/aws_security_group_spec.rb

@@ -0,0 +1,55 @@
+require 'spec_helper'
+require 'chef/provisioning/aws_driver/credentials'
+
+describe 'Aws Security Group' do
+  extend AWSSupport
+
+  when_the_chef_12_server "exists", organization: 'foo', server_scope: :context do
+    with_aws "without a VPC" do
+
+      it "aws_security_group 'test_sg' with no attributes works" do
+        expect_recipe {
+          aws_security_group 'test_sg' do
+          end
+        }.to create_an_aws_security_group('test_sg',
+          description:                'test_sg',
+          vpc_id:                     default_vpc.id,
+          ip_permissions_list:        [],
+          ip_permissions_list_egress: [{:groups=>[], :ip_ranges=>[{:cidr_ip=>"0.0.0.0/0"}], :ip_protocol=>"-1"}]
+        ).and be_idempotent
+      end
+
+    end
+
+    with_aws "in a VPC" do
+      aws_vpc 'test_vpc' do
+        cidr_block '10.0.0.0/24'
+      end
+
+      it "aws_security_group 'test_sg' with no attributes works" do
+        expect_recipe {
+          aws_security_group 'test_sg' do
+            vpc 'test_vpc'
+          end
+        }.to create_an_aws_security_group('test_sg',
+          vpc_id:                     test_vpc.aws_object.id,
+          ip_permissions_list:        [],
+          ip_permissions_list_egress: [{:groups=>[], :ip_ranges=>[{:cidr_ip=>"0.0.0.0/0"}], :ip_protocol=>"-1"}]
+        ).and be_idempotent
+      end
+
+      it "aws_security_group 'test_sg' with inbound rules works" do
+        expect_recipe {
+          aws_security_group 'test_sg' do
+            vpc 'test_vpc'
+            inbound_rules '0.0.0.0/0' => 22
+          end
+        }.to create_an_aws_security_group('test_sg',
+          vpc_id: test_vpc.aws_object.id,
+          ip_permissions_list: [{:groups=>[], :ip_ranges=>[{:cidr_ip=>"0.0.0.0/0"}], :ip_protocol=>"tcp", :from_port=>22, :to_port=>22}],
+          ip_permissions_list_egress: [{:groups=>[], :ip_ranges=>[{:cidr_ip=>"0.0.0.0/0"}], :ip_protocol=>"-1"}]
+        ).and be_idempotent
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -5,11 +5,17 @@ require 'chef/provisioning/aws_driver'
 require 'chef/platform'
 require 'chef/run_context'
 require 'chef/event_dispatch/dispatcher'
+require 'support/aws_support'
 
 RSpec.configure do |rspec|
   rspec.run_all_when_everything_filtered = true
   rspec.filter_run :focus
-  rspec.order = 'random'
+#  rspec.order = 'random'
   rspec.expect_with(:rspec) { |c| c.syntax = :expect }
-  rspec.before { allow($stdout).to receive(:write) }
+#  rspec.before { allow($stdout).to receive(:write) }
 end
+
+#Chef::Log.level = :debug
+
+#AWS.stub!
+require 'cheffish/rspec/matchers'

data/spec/support/aws_support.rb

@@ -0,0 +1,211 @@
+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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning-aws
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - John Ewart
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-04 00:00:00.000000000 Z
+date: 2015-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: retryable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -106,11 +120,12 @@ files:
 - README.md
 - Rakefile
 - lib/chef/provider/aws_auto_scaling_group.rb
+- 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_key_pair.rb
-- lib/chef/provider/aws_launch_config.rb
-- lib/chef/provider/aws_provider.rb
+- lib/chef/provider/aws_launch_configuration.rb
+- lib/chef/provider/aws_route_table.rb
 - lib/chef/provider/aws_s3_bucket.rb
 - lib/chef/provider/aws_security_group.rb
 - lib/chef/provider/aws_sns_topic.rb
@@ -118,29 +133,37 @@ files:
 - lib/chef/provider/aws_subnet.rb
 - lib/chef/provider/aws_vpc.rb
 - lib/chef/provisioning/aws_driver.rb
-- lib/chef/provisioning/aws_driver/aws_profile.rb
+- lib/chef/provisioning/aws_driver/aws_provider.rb
+- lib/chef/provisioning/aws_driver/aws_resource.rb
+- lib/chef/provisioning/aws_driver/aws_resource_with_entry.rb
 - lib/chef/provisioning/aws_driver/credentials.rb
 - lib/chef/provisioning/aws_driver/driver.rb
 - lib/chef/provisioning/aws_driver/resources.rb
+- lib/chef/provisioning/aws_driver/super_lwrp.rb
 - lib/chef/provisioning/aws_driver/version.rb
 - lib/chef/provisioning/driver_init/aws.rb
 - lib/chef/resource/aws_auto_scaling_group.rb
+- lib/chef/resource/aws_dhcp_options.rb
 - lib/chef/resource/aws_ebs_volume.rb
 - lib/chef/resource/aws_eip_address.rb
+- lib/chef/resource/aws_image.rb
+- lib/chef/resource/aws_instance.rb
+- lib/chef/resource/aws_internet_gateway.rb
 - lib/chef/resource/aws_key_pair.rb
-- lib/chef/resource/aws_launch_config.rb
-- lib/chef/resource/aws_resource.rb
+- lib/chef/resource/aws_launch_configuration.rb
+- lib/chef/resource/aws_load_balancer.rb
+- lib/chef/resource/aws_network_interface.rb
+- lib/chef/resource/aws_route_table.rb
 - lib/chef/resource/aws_s3_bucket.rb
 - lib/chef/resource/aws_security_group.rb
 - lib/chef/resource/aws_sns_topic.rb
 - lib/chef/resource/aws_sqs_queue.rb
 - lib/chef/resource/aws_subnet.rb
 - lib/chef/resource/aws_vpc.rb
-- spec/chef_zero_rspec_helper.rb
+- spec/integration/aws_security_group_spec.rb
 - spec/spec_helper.rb
+- spec/support/aws_support.rb
 - spec/unit/aws_driver/credentials_spec.rb
-- spec/unit/provider/aws_subnet_spec.rb
-- spec/unit/resource/aws_subnet_spec.rb
 homepage: https://github.com/opscode/chef-provisioning-aws
 licenses: []
 metadata: {}

data/lib/chef/provider/aws_launch_config.rb

@@ -1,43 +0,0 @@
-require 'chef/provider/aws_provider'
-
-class Chef::Provider::AwsLaunchConfig < Chef::Provider::AwsProvider
-  action :create do
-    if existing_launch_config.nil?
-      converge_by "Creating new Launch Config #{id} in #{new_driver.aws_config.region}" do
-        @existing_launch_config = new_driver.auto_scaling.launch_configurations.create(
-          new_resource.name,
-          new_resource.image,
-          new_resource.instance_type
-        )
-
-        new_resource.save
-      end
-    end
-  end
-
-  action :delete do
-    if existing_launch_config
-      converge_by "Deleting Launch Config #{id} in #{new_driver.aws_config.region}" do
-        begin
-          existing_launch_config.delete
-        rescue AWS::AutoScaling::Errors::ResourceInUse
-          sleep 5
-          retry
-        end
-      end
-    end
-
-    new_resource.delete
-  end
-
-  def existing_launch_config
-    @existing_launch_config ||= begin
-                                  elc = new_driver.auto_scaling.launch_configurations[new_resource.name]
-                                  elc.exists? ? elc : nil
-                                end
-  end
-
-  def id
-    new_resource.name
-  end
-end

data/lib/chef/provider/aws_provider.rb

@@ -1,22 +0,0 @@
-require 'chef/provider/lwrp_base'
-
-class Chef::Provider::AwsProvider < Chef::Provider::LWRPBase
-  use_inline_resources
-
-  # All these need to implement whyrun
-  def whyrun_supported?
-    true
-  end
-
-  def fqn
-    if id
-      id
-    else
-      "#{new_resource.name}_#{new_driver.aws_config.region}"
-    end
-  end
-
-  def new_driver
-    run_context.chef_provisioning.driver_for(new_resource.driver)
-  end
-end