chef-provisioning-aws 1.9.0 → 1.10.0

data/spec/integration/aws_nat_gateway_spec.rb

@@ -0,0 +1,52 @@
+require 'spec_helper'
+require 'chef/resource/aws_nat_gateway'
+
+describe Chef::Resource::AwsNatGateway do
+  extend AWSSupport
+
+  when_the_chef_12_server 'exists', organization: 'foo', server_scope: :context do
+    with_aws 'with a VPC' do
+      purge_all
+      setup_public_vpc
+
+      aws_network_interface 'test_network_interface' do
+        subnet 'test_public_subnet'
+      end
+
+      aws_eip_address 'test_eip'
+
+      describe 'action :create' do #, :super_slow do
+        it 'creates an aws_nat_gateway in the specified subnet' do
+          expect_recipe {
+            aws_nat_gateway 'test_nat_gateway' do
+              subnet 'test_public_subnet'
+              eip_address 'test_eip'
+            end
+          }.to create_an_aws_nat_gateway('test_nat_gateway',
+            subnet_id: test_public_subnet.aws_object.id
+          ).and be_idempotent
+        end
+      end
+
+      describe 'action :delete' do
+        context 'when there is a nat_gateway' do
+          aws_nat_gateway 'test_nat_gateway' do
+            subnet 'test_public_subnet'
+            eip_address 'test_eip'
+          end
+
+          it 'deletes the nat gateway and does not delete the eip address' do
+            r = recipe {
+              aws_nat_gateway 'test_nat_gateway' do
+                action :destroy
+              end
+            }
+            expect(r).to destroy_an_aws_nat_gateway('test_nat_gateway'
+            ).and match_an_aws_eip_address('test_eip'
+            ).and be_idempotent
+          end
+        end
+      end
+    end
+  end
+end

data/spec/integration/aws_rds_instance_spec.rb

@@ -36,17 +36,17 @@ describe Chef::Resource::AwsRdsInstance do
       end
 
       aws_rds_parameter_group "test-db-parameter-group" do
-        db_parameter_group_family "postgres9.4"
+        db_parameter_group_family "postgres9.5"
         description "testing provisioning"
         parameters [{:parameter_name => "max_connections", :parameter_value => "250", :apply_method => "pending-reboot"}]
       end
 
-      it "aws_rds_instance 'test-rds-instance' creates an rds instance that can parse the aws_rds_subnet_group and aws_rds_parameter_group" do
+      it "aws_rds_instance 'test-rds-instance' creates an rds instance that can parse the aws_rds_subnet_group and aws_rds_parameter_group", :focus do
         expect_recipe {
           aws_rds_instance "test-rds-instance" do
             engine "postgres"
             publicly_accessible false
-            db_instance_class "db.t1.micro"
+            db_instance_class "db.t2.micro"
             master_username "thechief"
             master_user_password "securesecure" # 2x security
             multi_az false
@@ -57,7 +57,7 @@ describe Chef::Resource::AwsRdsInstance do
         }.to create_an_aws_rds_instance('test-rds-instance',
                                         engine: 'postgres',
                                         multi_az: false,
-                                        db_instance_class: "db.t1.micro",
+                                        db_instance_class: "db.t2.micro",
                                         master_username: "thechief",
                                        ).and be_idempotent
         r = driver.rds_resource.db_instance("test-rds-instance")
@@ -71,7 +71,7 @@ describe Chef::Resource::AwsRdsInstance do
           aws_rds_instance "test-rds-instance2" do
             engine "postgres"
             publicly_accessible false
-            db_instance_class "db.t1.micro"
+            db_instance_class "db.t2.micro"
             master_username "thechief"
             master_user_password "securesecure"
             multi_az false
@@ -81,7 +81,7 @@ describe Chef::Resource::AwsRdsInstance do
         }.to create_an_aws_rds_instance('test-rds-instance2',
                                         engine: 'postgres',
                                         multi_az: false,
-                                        db_instance_class: "db.t1.micro",
+                                        db_instance_class: "db.t2.micro",
                                         master_username: "thechief",
                                         backup_retention_period: 2)
 
@@ -94,7 +94,7 @@ describe Chef::Resource::AwsRdsInstance do
           aws_rds_instance "test-rds-instance-tagging-#{tagging_id}" do
             aws_tags key1: "value"
             allocated_storage 5
-            db_instance_class "db.t1.micro"
+            db_instance_class "db.t2.micro"
             engine "postgres"
             master_username "thechief"
             master_user_password "securesecure"
@@ -114,7 +114,7 @@ describe Chef::Resource::AwsRdsInstance do
         aws_rds_instance "test-rds-instance-tagging-#{tagging_id}" do
           aws_tags key1: "value"
           allocated_storage 5
-          db_instance_class "db.t1.micro"
+          db_instance_class "db.t2.micro"
           engine "postgres"
           master_username "thechief"
           master_user_password "securesecure"
@@ -125,7 +125,7 @@ describe Chef::Resource::AwsRdsInstance do
             aws_rds_instance "test-rds-instance-tagging-#{tagging_id}" do
               aws_tags key1: "value2", key2: nil
               allocated_storage 5
-              db_instance_class "db.t1.micro"
+              db_instance_class "db.t2.micro"
               engine "postgres"
               master_username "thechief"
               master_user_password "securesecure"
@@ -143,7 +143,7 @@ describe Chef::Resource::AwsRdsInstance do
             aws_rds_instance "test-rds-instance-tagging-#{tagging_id}" do
               aws_tags({})
               allocated_storage 5
-              db_instance_class "db.t1.micro"
+              db_instance_class "db.t2.micro"
               engine "postgres"
               master_username "thechief"
               master_user_password "securesecure"

data/spec/integration/aws_route_table_spec.rb

@@ -86,6 +86,28 @@ describe Chef::Resource::AwsRouteTable do
         end
       end
 
+      context "with nat gateway" do
+        aws_eip_address 'test_eip'
+        aws_nat_gateway 'test_nat_gateway' do
+          subnet 'test_public_subnet'
+          eip_address 'test_eip'
+        end
+
+        it "can route to a nat gateway" do
+          expect_recipe {
+            aws_route_table 'test_route_table' do
+              vpc 'test_vpc'
+              routes '0.0.0.0/0' => test_nat_gateway
+            end
+          }.to create_an_aws_route_table('test_route_table',
+            routes: Set[
+                { destination_cidr_block: '10.0.0.0/16', gateway_id: 'local', state: 'active' },
+                { destination_cidr_block: '0.0.0.0/0', nat_gateway_id: test_nat_gateway.aws_object.nat_gateway_id, state: 'active' },
+              ]
+          ).and be_idempotent
+        end
+      end
+
       context "with machines", :super_slow do
         machine 'test_machine' do
           machine_options bootstrap_options: {

data/spec/integration/aws_vpc_spec.rb

@@ -6,8 +6,7 @@ describe Chef::Resource::AwsVpc do
   when_the_chef_12_server "exists", organization: 'foo', server_scope: :context do
     with_aws "When AWS has a DHCP options" do
       # Empty DHCP options for the purposes of associating
-      aws_dhcp_options 'test_dhcp_options' do
-      end
+      aws_dhcp_options 'test_dhcp_options'
 
       context "Creating an aws_vpc" do
         it "aws_vpc 'vpc' with cidr_block '10.0.0.0/24' creates a VPC" do
@@ -190,7 +189,36 @@ describe Chef::Resource::AwsVpc do
             end
           }.to match_an_aws_vpc_peering_connection('test_peering_connection',
               :'status.code' => 'deleted'
-          )
+          ).and be_idempotent
+        end
+      end
+
+      context "and When :purge action is called for a VPC, and it contains NAT gateways" do
+        aws_vpc 'test_vpc' do
+          cidr_block '10.0.0.0/24'
+          internet_gateway true
+        end
+
+        aws_subnet 'test_subnet' do
+          vpc 'test_vpc'
+        end
+
+        aws_eip_address 'test_eip'
+
+        aws_nat_gateway 'test_nat_gateway' do
+          subnet 'test_subnet'
+          eip_address 'test_eip'
+        end
+
+        it 'they should be deleted' do
+          r = recipe {
+            aws_vpc 'test_vpc' do
+              action :purge
+            end
+          }
+          expect(r).to match_an_aws_nat_gateway('test_nat_gateway',
+            :state => 'deleted'
+          ).and be_idempotent
         end
       end
     end

data/spec/spec_helper.rb

@@ -1,5 +1,7 @@
-require 'simplecov'
-SimpleCov.start
+begin
+  require 'simplecov'
+  SimpleCov.start
+rescue LoadError; end
 
 # Bring in the RSpec monkeypatch before we do *anything*, so that builtin matchers
 # will get the module.  Not strictly necessary, but cleaner that way.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning-aws
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.10.0
 platform: ruby
 authors:
 - John Ewart
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-14 00:00:00.000000000 Z
+date: 2016-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-provisioning
@@ -228,6 +228,7 @@ files:
 - lib/chef/provider/aws_cache_replication_group.rb
 - lib/chef/provider/aws_cache_subnet_group.rb
 - lib/chef/provider/aws_cloudsearch_domain.rb
+- lib/chef/provider/aws_cloudwatch_alarm.rb
 - lib/chef/provider/aws_dhcp_options.rb
 - lib/chef/provider/aws_ebs_volume.rb
 - lib/chef/provider/aws_eip_address.rb
@@ -240,6 +241,7 @@ files:
 - 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_nat_gateway.rb
 - lib/chef/provider/aws_network_acl.rb
 - lib/chef/provider/aws_network_interface.rb
 - lib/chef/provider/aws_rds_instance.rb
@@ -267,6 +269,7 @@ files:
 - lib/chef/provisioning/aws_driver/exceptions.rb
 - lib/chef/provisioning/aws_driver/resources.rb
 - lib/chef/provisioning/aws_driver/super_lwrp.rb
+- lib/chef/provisioning/aws_driver/tagging_strategy/auto_scaling.rb
 - lib/chef/provisioning/aws_driver/tagging_strategy/ec2.rb
 - lib/chef/provisioning/aws_driver/tagging_strategy/elasticsearch.rb
 - lib/chef/provisioning/aws_driver/tagging_strategy/elb.rb
@@ -279,6 +282,7 @@ files:
 - lib/chef/resource/aws_cache_replication_group.rb
 - lib/chef/resource/aws_cache_subnet_group.rb
 - lib/chef/resource/aws_cloudsearch_domain.rb
+- lib/chef/resource/aws_cloudwatch_alarm.rb
 - lib/chef/resource/aws_dhcp_options.rb
 - lib/chef/resource/aws_ebs_volume.rb
 - lib/chef/resource/aws_eip_address.rb
@@ -291,6 +295,7 @@ files:
 - lib/chef/resource/aws_key_pair.rb
 - lib/chef/resource/aws_launch_configuration.rb
 - lib/chef/resource/aws_load_balancer.rb
+- lib/chef/resource/aws_nat_gateway.rb
 - lib/chef/resource/aws_network_acl.rb
 - lib/chef/resource/aws_network_interface.rb
 - lib/chef/resource/aws_rds_instance.rb
@@ -321,8 +326,10 @@ files:
 - spec/aws_support/matchers/have_aws_object_tags.rb
 - spec/aws_support/matchers/match_an_aws_object.rb
 - spec/aws_support/matchers/update_an_aws_object.rb
+- spec/integration/aws_auto_scaling_group_spec.rb
 - spec/integration/aws_cache_subnet_group_spec.rb
 - spec/integration/aws_cloudsearch_domain_spec.rb
+- spec/integration/aws_cloudwatch_alarm_spec.rb
 - spec/integration/aws_dhcp_options_spec.rb
 - spec/integration/aws_ebs_volume_spec.rb
 - spec/integration/aws_eip_address_spec.rb
@@ -331,6 +338,7 @@ files:
 - spec/integration/aws_iam_role_spec.rb
 - spec/integration/aws_internet_gateway_spec.rb
 - spec/integration/aws_key_pair_spec.rb
+- spec/integration/aws_nat_gateway_spec.rb
 - spec/integration/aws_network_acl_spec.rb
 - spec/integration/aws_network_interface_spec.rb
 - spec/integration/aws_rds_instance_spec.rb
@@ -371,7 +379,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Provisioner for creating aws containers in Chef Provisioning.