chef-provisioning-aws 1.4.1 → 1.5.0

data/spec/integration/machine_image_spec.rb

@@ -7,6 +7,8 @@ describe Chef::Resource::MachineImage do
     with_aws "with a VPC and a public subnet" do
       before :all do
         chef_config[:log_level] = :warn
+        Chef::Config.chef_provisioning[:machine_max_wait_time] = 240
+        Chef::Config.chef_provisioning[:image_max_wait_time] = 600
       end
 
       purge_all
@@ -25,28 +27,41 @@ describe Chef::Resource::MachineImage do
           name: 'test_machine_image'
         ).and be_idempotent
       end
-    end
-
-    with_aws "Without a VPC" do
-      before :all do
-        chef_config[:log_level] = :warn
-      end
-
-      aws_key_pair 'test_key_pair' do
-        allow_overwrite true
-      end
 
-      it "machine_image with no options can create an image in the VPC", :super_slow do
-        expect_recipe {
+      describe 'action :destroy', :super_slow do
+        # with_converge does a before(:each)
+        with_converge {
           machine_image 'test_machine_image' do
             machine_options bootstrap_options: {
+              subnet_id: 'test_public_subnet',
               key_name: 'test_key_pair',
               instance_type: 'm3.medium'
             }
           end
-        }.to create_an_aws_image('test_machine_image',
-          name: 'test_machine_image'
-        ).and be_idempotent
+        }
+
+        it "destroys the image" do
+          r = recipe {
+            machine_image "test_machine_image" do
+              action :destroy
+            end
+          }
+          expect(r).to destroy_an_aws_image('test_machine_image'
+          ).and be_idempotent
+        end
+
+        it "destroys the image if instance is gone long time ago" do
+          image = driver.ec2_resource.images({filters: [ { name: "name", values: ["test_machine_image"] }]}).first
+          image.create_tags(tags: [{key: "from-instance", value: "i-12345678"}])
+
+          r = recipe {
+            machine_image "test_machine_image" do
+              action :destroy
+            end
+          }
+          expect(r).to destroy_an_aws_image('test_machine_image'
+          ).and be_idempotent
+        end
       end
 
       it "creates aws_image tags", :super_slow do
@@ -58,8 +73,8 @@ describe Chef::Resource::MachineImage do
             }
             aws_tags key1: "value"
           end
-        }.to create_an_aws_image('test_machine_image')
-        .and have_aws_image_tags('test_machine_image',
+        }.to create_an_aws_image('test_machine_image'
+        ).and have_aws_image_tags('test_machine_image',
           {
             'key1' => 'value'
           }

data/spec/integration/machine_spec.rb

@@ -223,37 +223,18 @@ describe Chef::Resource::Machine do
             subnet_id: test_public_subnet.aws_object.id
           ).and be_idempotent
         end
-	  end
+	    end
 
       context "with a custom iam role" do
-        # TODO when we have IAM support, use the resources
-        before(:context) do
-          assume_role_policy_document = '{"Version":"2008-10-17","Statement":[{"Effect":"Allow","Principal":{"Service":["ec2.amazonaws.com"]},"Action":["sts:AssumeRole"]}]}'
-          driver.iam_client.create_role({
-            role_name: "machine_test_custom_role",
-            assume_role_policy_document: assume_role_policy_document
-          }).role
-          driver.iam_client.create_instance_profile({
-            instance_profile_name: "machine_test_custom_role"
-          })
-          driver.iam_client.add_role_to_instance_profile({
-            instance_profile_name: "machine_test_custom_role",
-            role_name: "machine_test_custom_role"
-          })
-          sleep 5 # grrrrrr, the resource should take care of the polling for us
+        assume_role_policy_document = '{"Version":"2008-10-17","Statement":[{"Effect":"Allow","Principal":{"Service":["ec2.amazonaws.com"]},"Action":["sts:AssumeRole"]}]}'
+        aws_iam_role "machine_test_custom_role" do
+          path "/"
+          assume_role_policy_document assume_role_policy_document
         end
 
-        after(:context) do
-          driver.iam_client.remove_role_from_instance_profile({
-            instance_profile_name: "machine_test_custom_role",
-            role_name: "machine_test_custom_role"
-          })
-          driver.iam_client.delete_instance_profile({
-            instance_profile_name: "machine_test_custom_role"
-          })
-          driver.iam_client.delete_role({
-            role_name: "machine_test_custom_role"
-          })
+        aws_iam_instance_profile "machine_test_instance_profile" do
+          path "/"
+          role "machine_test_custom_role"
         end
 
         it "converts iam_instance_profile from a string to a hash", :super_slow do
@@ -262,12 +243,12 @@ describe Chef::Resource::Machine do
               machine_options bootstrap_options: {
                 subnet_id: 'test_public_subnet',
                 key_name: 'test_key_pair',
-                iam_instance_profile: "machine_test_custom_role"
+                iam_instance_profile: "machine_test_instance_profile"
               }
               action :allocate
             end
           }.to create_an_aws_instance('test_machine',
-            iam_instance_profile: {arn: /machine_test_custom_role/}
+            iam_instance_profile: {arn: /machine_test_instance_profile/}
           ).and be_idempotent
         end
       end
@@ -368,6 +349,7 @@ describe Chef::Resource::Machine do
                 key_name: key_pair_name,
                 key_path: private_key_path
               }
+              action :allocate
             end
           }.to create_an_aws_instance('test_machine'
           ).and be_idempotent

data/spec/unit/chef/provisioning/aws_driver/driver_spec.rb

@@ -20,7 +20,6 @@ describe Chef::Provisioning::AWSDriver::Driver do
       })
     end
     expect(Chef::Provisioning::AWSDriver::Credentials2).to receive(:new).and_return(credentials2)
-    expect(::Aws).to receive(:config).and_return({})
   end
 
   describe "#determine_remote_host" do

data/spec/unit/chef/provisioning/aws_driver/route53_spec.rb

@@ -0,0 +1,105 @@
+require 'chef/provisioning/aws_driver/driver'
+
+describe Aws::Route53::Types::ResourceRecordSet do
+  it "returns the correct RecordSet unique key" 
+  it "returns the correct AWS change struct"
+end
+
+describe Chef::Resource::AwsRoute53RecordSet do
+
+  let(:resource_name) { "test_resource" }
+  let(:zone_name) { "blerf.net" }
+  let(:resource) {
+    r = Chef::Resource::AwsRoute53RecordSet.new(resource_name)
+    r.aws_route53_zone_name(zone_name)
+    r
+  }
+
+  it "returns the correct RecordSet unique key" do
+    expect(resource.aws_key).to eq("#{resource_name}.#{zone_name}")
+    resource.rr_name("new-name")
+    expect(resource.aws_key).to eq("new-name.#{zone_name}")
+  end
+
+  it "returns the correct AWS change struct" do
+    resource.rr_name("foo")
+    resource.ttl(900)
+    resource.type("A")
+    resource.resource_records(["141.222.1.1", "8.8.8.8"])
+
+    expect(resource.to_aws_struct).to eq({ :name=>"foo.blerf.net",
+                                           :type=>"A",
+                                           :ttl=>900, 
+                                           :resource_records=>[{:value=>"141.222.1.1"}, {:value=>"8.8.8.8"}]
+                                           })
+  end
+
+  context "#validate_rr_type" do
+    it "validates MX values" do
+      correct = 2.times.map { [rand(10000), rand(36**40).to_s(36)].join(" ") }
+      expect(resource.validate_rr_type!("MX", correct)).to be_truthy
+
+      incorrect = ["string content doesn't matter without a number"]
+      expect { resource.validate_rr_type!("MX", incorrect) }.to raise_error(Chef::Exceptions::ValidationFailed,
+                                                                            /MX.*priority and mail server/)
+    end
+
+    it "validates SRV values" do
+      correct = 2.times.map { [rand(10000), rand(10000), rand(10000), rand(36**40).to_s(36)].join(" ") }
+      expect(resource.validate_rr_type!("MX", correct)).to be_truthy
+
+      incorrect = ["string content doesn't matter without a number"]
+      expect { resource.validate_rr_type!("SRV", incorrect) }.to raise_error(Chef::Exceptions::ValidationFailed,
+                                                                             /SRV.*priority, weight, port, and hostname/)
+    end
+
+    it "validates CNAME values" do
+      correct = ["foo"]
+      expect(resource.validate_rr_type!("CNAME", correct)).to be_truthy
+
+      incorrect = ["foo1", "foo2"]
+      expect { resource.validate_rr_type!("CNAME", incorrect) }.to raise_error(Chef::Exceptions::ValidationFailed,
+                                                                               /CNAME records may only have a single value/)
+    end
+
+    it "validates A values" do
+      correct = ["141.222.1.1", "8.8.8.8"]
+      expect(resource.validate_rr_type!("A", correct)).to be_truthy
+
+      incorrect = ["141.222.1.500", "8.8.8.8x"]
+      expect { resource.validate_rr_type!("A", incorrect) }.to raise_error(Chef::Exceptions::ValidationFailed,
+                                                                           /A records are of the form/)
+    end
+
+    it "quietly accepts the remaining RR types" do
+      %w(TXT PTR AAAA SPF).each do |type|
+        expect(resource.validate_rr_type!(type, "We're not validating anything on type '#{type}'.")).to be_truthy
+      end
+
+      ["SOA", "NS", nil].each do |invalid_type|
+        expect { resource.validate_rr_type!("not a valid RR type", invalid_type) }.to raise_error(ArgumentError)
+      end
+    end
+  end
+
+  context "#fqdn" do
+    it "generates correct FQDNs" do
+      zone_name = "23skidoo.com"
+      hostname = "fnord"
+
+      resource.aws_route53_zone_name(zone_name)
+      expect(resource.fqdn).to eq("#{resource_name}.#{zone_name}")
+
+      fq_resource = Chef::Resource::AwsRoute53RecordSet.new("#{hostname}.#{zone_name}")
+      fq_resource.aws_route53_zone_name(zone_name)
+      expect(fq_resource.fqdn).to eq("#{hostname}.#{zone_name}")
+
+      fq_resource = Chef::Resource::AwsRoute53RecordSet.new("#{hostname}.#{zone_name}.")
+      fq_resource.aws_route53_zone_name(zone_name)
+      expect(fq_resource.fqdn).to eq("#{hostname}.#{zone_name}.")
+    end
+  end
+end
+
+describe Chef::Provider::AwsRoute53HostedZone do
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning-aws
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - John Ewart
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-22 00:00:00.000000000 Z
+date: 2015-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-provisioning
@@ -98,16 +98,16 @@ dependencies:
   name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 11.16.4
+        version: '12.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 11.16.4
+        version: '12.4'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +150,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-stack_explorer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Provisioner for creating aws containers in Chef Provisioning.
 email: jewart@getchef.com
 executables: []
@@ -158,6 +186,7 @@ extra_rdoc_files:
 - README.md
 - LICENSE
 files:
+- Gemfile
 - LICENSE
 - README.md
 - Rakefile
@@ -169,8 +198,11 @@ 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_iam_instance_profile.rb
+- lib/chef/provider/aws_iam_role.rb
 - lib/chef/provider/aws_image.rb
 - lib/chef/provider/aws_instance.rb
+- lib/chef/provider/aws_internet_gateway.rb
 - lib/chef/provider/aws_key_pair.rb
 - lib/chef/provider/aws_launch_configuration.rb
 - lib/chef/provider/aws_load_balancer.rb
@@ -214,6 +246,8 @@ files:
 - 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_iam_instance_profile.rb
+- lib/chef/resource/aws_iam_role.rb
 - lib/chef/resource/aws_image.rb
 - lib/chef/resource/aws_instance.rb
 - lib/chef/resource/aws_internet_gateway.rb
@@ -224,6 +258,8 @@ files:
 - lib/chef/resource/aws_network_interface.rb
 - lib/chef/resource/aws_rds_instance.rb
 - lib/chef/resource/aws_rds_subnet_group.rb
+- lib/chef/resource/aws_route53_hosted_zone.rb
+- lib/chef/resource/aws_route53_record_set.rb
 - lib/chef/resource/aws_route_table.rb
 - lib/chef/resource/aws_s3_bucket.rb
 - lib/chef/resource/aws_security_group.rb
@@ -251,11 +287,16 @@ files:
 - spec/integration/aws_cloudsearch_domain_spec.rb
 - spec/integration/aws_dhcp_options_spec.rb
 - spec/integration/aws_ebs_volume_spec.rb
+- spec/integration/aws_eip_address_spec.rb
+- spec/integration/aws_iam_instance_profile_spec.rb
+- spec/integration/aws_iam_role_spec.rb
+- spec/integration/aws_internet_gateway_spec.rb
 - spec/integration/aws_key_pair_spec.rb
 - spec/integration/aws_network_acl_spec.rb
 - spec/integration/aws_network_interface_spec.rb
 - spec/integration/aws_rds_instance_spec.rb
 - spec/integration/aws_rds_subnet_group_spec.rb
+- spec/integration/aws_route53_hosted_zone_spec.rb
 - spec/integration/aws_route_table_spec.rb
 - spec/integration/aws_s3_bucket_spec.rb
 - spec/integration/aws_security_group_spec.rb
@@ -270,6 +311,7 @@ files:
 - spec/spec_helper.rb
 - spec/unit/chef/provisioning/aws_driver/credentials_spec.rb
 - spec/unit/chef/provisioning/aws_driver/driver_spec.rb
+- spec/unit/chef/provisioning/aws_driver/route53_spec.rb
 homepage: https://github.com/opscode/chef-provisioning-aws
 licenses: []
 metadata: {}