chef-provisioning-aws 3.0.4 → 3.0.6

data/spec/integration/aws_server_certificate_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Chef::Resource::AwsServerCertificate do
   extend AWSSupport
@@ -7,7 +7,7 @@ describe Chef::Resource::AwsServerCertificate do
   # Follow those instructions except the chain should be `ca-int.crt` only
   # instead of concatenated intermediate and root
 
-  when_the_chef_12_server "exists", organization: 'foo', server_scope: :context do
+  when_the_chef_12_server "exists", organization: "foo", server_scope: :context do
     with_aws "without a VPC" do
       cert_string = <<-CERT
 -----BEGIN CERTIFICATE-----
@@ -26,8 +26,8 @@ IUpfB2NibP9G5LhtxFY1fa+MLp9mJ+yI3hg0x+6xBPTiPDGVpFdJ+LH/mKWxsaWT
 /KKNXu+NC9z/lrNVU6J/XUCk54YdmjMvadHs1aJp6NWH7LI9df27AlBGLnRc/w04
 agCh4aCsjczD2YeBVl6idws/InYbSwhz7x9zXz2qB3BbI3psgBfJQQcJukulVGza
 RkD993U+CJpJMDbpIGRe9lXe33R3tGbbvfa4FaXZlZgoKCrE21SCb2hxlNG2+w==
------END CERTIFICATE-----           
-CERT
+-----END CERTIFICATE-----
+      CERT
 
       private_key_string = <<-KEY
 -----BEGIN RSA PRIVATE KEY-----
@@ -56,8 +56,8 @@ k7JouTKFS7IMwTW3AFpyHz+KG4QcBoQj94ofZvapIOv8E5+8MkSVyuONRbHuoOeE
 DNbJssECgYBIAFB3J66cZH3zBfyanHwYMPlTupxUBTsN19UCAK7MZqA5kbqG7b7Q
 cKPrgR7gibLvaxj22lvD8uEICMGy6g8s3+PyDwcw5PNrKOdIkRrYQxTFtfs1JRCa
 6kM8q32f1I3qd31zbpoDBHq+Se2RSaLbmoIAFqDSCWyeUHydALo2kw==
------END RSA PRIVATE KEY-----      
-KEY
+-----END RSA PRIVATE KEY-----
+      KEY
 
       certificate_chain_string = <<-CHAIN
 -----BEGIN CERTIFICATE-----
@@ -76,32 +76,30 @@ gtw2MXUV3eA9ByAD4XKIWSvaROdHj+5wiCKWKMGvrSEPay5xEJm54VcALXHGk+Vf
 jFNHTa/YFrlDXXupmI8HCYKwXrcooNcLuIkEmZIPX99s1vjFVT8oRdYLwFGt7AVC
 ufkpMTlf/J9WjsabI5O+fzJYgdVm7QUq8Dg3tiM0RcZtO2cWus4DZl/KQkZx84f1
 WGXzC2zbuS6DI9QPgkLeQ11O2kaeMqkNy6Tzr88XfA==
------END CERTIFICATE-----      
-CHAIN
+-----END CERTIFICATE-----
+      CHAIN
 
       it "creates a cert" do
-        expect_recipe {
+        expect_recipe do
           aws_server_certificate "test-cert" do
             certificate_body cert_string
             private_key private_key_string
             certificate_chain certificate_chain_string
           end
-        }.to create_an_aws_server_certificate("test-cert",
-                                              :certificate_body => cert_string.strip,
-                                              :certificate_chain => certificate_chain_string.strip
-                                             ).and be_idempotent
+        end.to create_an_aws_server_certificate("test-cert",
+                                                certificate_body: cert_string.strip,
+                                                certificate_chain: certificate_chain_string.strip).and be_idempotent
       end
 
       it "creates a cert without a certificate_chain" do
-        expect_recipe {
+        expect_recipe do
           aws_server_certificate "test-cert" do
             certificate_body cert_string
             private_key private_key_string
           end
-        }.to create_an_aws_server_certificate("test-cert",
-                                              :certificate_body => cert_string.strip,
-                                              :certificate_chain => nil
-                                             ).and be_idempotent
+        end.to create_an_aws_server_certificate("test-cert",
+                                                certificate_body: cert_string.strip,
+                                                certificate_chain: nil).and be_idempotent
       end
     end
   end

data/spec/integration/aws_subnet_spec.rb

@@ -1,106 +1,92 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Chef::Resource::AwsSubnet do
   extend AWSSupport
 
-  when_the_chef_12_server "exists", organization: 'foo', server_scope: :context do
+  when_the_chef_12_server "exists", organization: "foo", server_scope: :context do
     with_aws "with a VPC with an internet gateway, route table and network acl" do
       aws_vpc "test_vpc" do
-        cidr_block '10.0.0.0/24'
+        cidr_block "10.0.0.0/24"
         internet_gateway true
       end
 
-      aws_route_table 'test_route_table' do
-        vpc 'test_vpc'
+      aws_route_table "test_route_table" do
+        vpc "test_vpc"
       end
 
-      aws_network_acl 'test_network_acl' do
-        vpc 'test_vpc'
+      aws_network_acl "test_network_acl" do
+        vpc "test_vpc"
       end
 
       it "aws_subnet 'test_subnet' with no parameters except VPC creates a subnet" do
-        expect_recipe {
-          aws_subnet 'test_subnet' do
-            vpc 'test_vpc'
+        expect_recipe do
+          aws_subnet "test_subnet" do
+            vpc "test_vpc"
           end
-        }.to create_an_aws_subnet('test_subnet',
-          vpc_id: test_vpc.aws_object.id,
-          cidr_block: test_vpc.aws_object.cidr_block
-        ).and be_idempotent
+        end.to create_an_aws_subnet("test_subnet",
+                                    vpc_id: test_vpc.aws_object.id,
+                                    cidr_block: test_vpc.aws_object.cidr_block).and be_idempotent
       end
 
       it "aws_subnet 'test_subnet' with all parameters creates a subnet" do
         az = driver.ec2_client.describe_availability_zones.availability_zones.first.zone_name
         na = test_network_acl.aws_object.id
         rt = test_route_table.aws_object.id
-        expect_recipe {
-          aws_subnet 'test_subnet' do
-            vpc 'test_vpc'
-            cidr_block '10.0.0.0/24'
+        expect_recipe do
+          aws_subnet "test_subnet" do
+            vpc "test_vpc"
+            cidr_block "10.0.0.0/24"
             availability_zone az
             map_public_ip_on_launch true
-            route_table 'test_route_table'
-            network_acl 'test_network_acl'
+            route_table "test_route_table"
+            network_acl "test_network_acl"
           end
-        }.to create_an_aws_subnet('test_subnet',
-          vpc_id: test_vpc.aws_object.id,
-          cidr_block: '10.0.0.0/24',
-          availability_zone: az
-        ).and match_an_aws_subnet('test_subnet',
-          subnet_id: driver.ec2_client.describe_route_tables(filters: [{name: "route-table-id", values: [rt]}]).route_tables[0].associations[0].subnet_id
-        ).and match_an_aws_subnet('test_subnet',
-          subnet_id: driver.ec2_client.describe_network_acls(filters: [{name: "network-acl-id", values: [na]}]).network_acls[0].associations[0].subnet_id
-        ).and be_idempotent
+        end.to create_an_aws_subnet("test_subnet",
+                                    vpc_id: test_vpc.aws_object.id,
+                                    cidr_block: "10.0.0.0/24",
+                                    availability_zone: az).and match_an_aws_subnet("test_subnet",
+                                                                                   subnet_id: driver.ec2_client.describe_route_tables(filters: [{ name: "route-table-id", values: [rt] }]).route_tables[0].associations[0].subnet_id).and match_an_aws_subnet("test_subnet",
+                                                                                                                                                                                                                                                              subnet_id: driver.ec2_client.describe_network_acls(filters: [{ name: "network-acl-id", values: [na] }]).network_acls[0].associations[0].subnet_id).and be_idempotent
       end
 
       it "creates aws_subnet tags" do
-        expect_recipe {
-          aws_subnet 'test_subnet' do
-            vpc 'test_vpc'
+        expect_recipe do
+          aws_subnet "test_subnet" do
+            vpc "test_vpc"
             aws_tags key1: "value"
           end
-        }.to create_an_aws_subnet('test_subnet')
-        .and have_aws_subnet_tags('test_subnet',
-          {
-            'Name' => 'test_subnet',
-            'key1' => 'value'
-          }
-        ).and be_idempotent
+        end.to create_an_aws_subnet("test_subnet")
+          .and have_aws_subnet_tags("test_subnet",
+                                    "Name" => "test_subnet",
+                                    "key1" => "value").and be_idempotent
       end
 
       context "with existing tags" do
-        aws_subnet 'test_subnet' do
-          vpc 'test_vpc'
+        aws_subnet "test_subnet" do
+          vpc "test_vpc"
           aws_tags key1: "value"
         end
 
         it "updates aws_subnet tags" do
-          expect_recipe {
-            aws_subnet 'test_subnet' do
+          expect_recipe do
+            aws_subnet "test_subnet" do
               aws_tags key1: "value2", key2: nil
             end
-          }.to have_aws_subnet_tags('test_subnet',
-            {
-              'Name' => 'test_subnet',
-              'key1' => 'value2',
-              'key2' => ''
-            }
-          ).and be_idempotent
+          end.to have_aws_subnet_tags("test_subnet",
+                                      "Name" => "test_subnet",
+                                      "key1" => "value2",
+                                      "key2" => "").and be_idempotent
         end
 
         it "removes all aws_subnet tags except Name" do
-          expect_recipe {
-            aws_subnet 'test_subnet' do
+          expect_recipe do
+            aws_subnet "test_subnet" do
               aws_tags({})
             end
-          }.to have_aws_subnet_tags('test_subnet',
-            {
-              'Name' => 'test_subnet'
-            }
-          ).and be_idempotent
+          end.to have_aws_subnet_tags("test_subnet",
+                                      "Name" => "test_subnet").and be_idempotent
         end
       end
-
     end
   end
 end

data/spec/integration/aws_vpc_peering_connection_spec.rb

@@ -1,99 +1,92 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Chef::Resource::AwsVpcPeeringConnection do
   extend AWSSupport
 
-  when_the_chef_12_server "exists", organization: 'foo', server_scope: :context do
+  when_the_chef_12_server "exists", organization: "foo", server_scope: :context do
     with_aws "with 2 VPCs" do
-
       aws_vpc "test_vpc" do
-        cidr_block '10.0.0.0/24'
+        cidr_block "10.0.0.0/24"
         internet_gateway false
       end
 
       aws_vpc "test_vpc_2" do
-        cidr_block '11.0.0.0/24'
+        cidr_block "11.0.0.0/24"
         internet_gateway false
       end
 
       it "aws_peering_connection 'test_vpc' with no attributes fails to create a VPC peering connection (must specify vpc and peer_vpc)" do
-        expect_converge {
-          aws_vpc_peering_connection 'test_peering_connection' do
+        expect_converge do
+          aws_vpc_peering_connection "test_peering_connection" do
           end
-        }.to raise_error(RuntimeError, /VCP peering connection create action for 'test_peering_connection' requires the 'vpc' attribute./)
+        end.to raise_error(RuntimeError, /VCP peering connection create action for 'test_peering_connection' requires the 'vpc' attribute./)
 
-        expect_converge {
-          aws_vpc_peering_connection 'test_peering_connection' do
-            vpc 'test_vpc'
+        expect_converge do
+          aws_vpc_peering_connection "test_peering_connection" do
+            vpc "test_vpc"
           end
-        }.to raise_error(RuntimeError, /VCP peering connection create action for 'test_peering_connection' requires the 'peer_vpc' attribute./)
+        end.to raise_error(RuntimeError, /VCP peering connection create action for 'test_peering_connection' requires the 'peer_vpc' attribute./)
       end
 
       it "aws_peering_connection 'test_peering_connection' with minimal parameters creates a active connection" do
-        expect_recipe {
-          aws_vpc_peering_connection 'test_peering_connection' do
-            vpc 'test_vpc'
-            peer_vpc 'test_vpc_2'
+        expect_recipe do
+          aws_vpc_peering_connection "test_peering_connection" do
+            vpc "test_vpc"
+            peer_vpc "test_vpc_2"
           end
-        }.to create_an_aws_vpc_peering_connection('test_peering_connection',
-          :'requester_vpc_info.vpc_id' => test_vpc.aws_object.id,
-          :'accepter_vpc_info.vpc_id' => test_vpc_2.aws_object.id,
-          :'status.code' => 'active'
-        ).and be_idempotent
+        end.to create_an_aws_vpc_peering_connection("test_peering_connection",
+                                                    'requester_vpc_info.vpc_id': test_vpc.aws_object.id,
+                                                    'accepter_vpc_info.vpc_id': test_vpc_2.aws_object.id,
+                                                    'status.code': "active").and be_idempotent
       end
 
       it "aws_peering_connection 'test_peering_connection' with peer_owner_id set to be the actual account id, creates an active peering" do
-        expect_recipe {
-          aws_vpc_peering_connection 'test_peering_connection' do
-            vpc 'test_vpc'
-            peer_vpc 'test_vpc_2'
+        expect_recipe do
+          aws_vpc_peering_connection "test_peering_connection" do
+            vpc "test_vpc"
+            peer_vpc "test_vpc_2"
             peer_owner_id driver.account_id
           end
-        }.to create_an_aws_vpc_peering_connection('test_peering_connection',
-            :'requester_vpc_info.vpc_id' => test_vpc.aws_object.id,
-            :'accepter_vpc_info.vpc_id' => test_vpc_2.aws_object.id,
-            :'status.code' => 'active'
-         ).and be_idempotent
+        end.to create_an_aws_vpc_peering_connection("test_peering_connection",
+                                                    'requester_vpc_info.vpc_id': test_vpc.aws_object.id,
+                                                    'accepter_vpc_info.vpc_id': test_vpc_2.aws_object.id,
+                                                    'status.code': "active").and be_idempotent
       end
 
       it "aws_peering_connection 'test_peering_connection' with a false peer_owner_id, creates a failed peering connection" do
-        expect_recipe {
-          aws_vpc_peering_connection 'test_peering_connection' do
-            vpc 'test_vpc'
-            peer_vpc 'test_vpc_2'
-            peer_owner_id '000000000000'
+        expect_recipe do
+          aws_vpc_peering_connection "test_peering_connection" do
+            vpc "test_vpc"
+            peer_vpc "test_vpc_2"
+            peer_owner_id "000000000000"
           end
-        }.to create_an_aws_vpc_peering_connection('test_peering_connection',
-            :'requester_vpc_info.vpc_id' => test_vpc.aws_object.id,
-            :'accepter_vpc_info.vpc_id' => test_vpc_2.aws_object.id,
-            :'status.code' => 'failed'
-        ).and be_idempotent
+        end.to create_an_aws_vpc_peering_connection("test_peering_connection",
+                                                    'requester_vpc_info.vpc_id': test_vpc.aws_object.id,
+                                                    'accepter_vpc_info.vpc_id': test_vpc_2.aws_object.id,
+                                                    'status.code': "failed").and be_idempotent
       end
 
       it "aws_peering_connection 'test_peering_connection' with accept action, accepts a pending peering connection" do
         pcx = nil
         ec2_resource = driver.ec2_resource
-        expect_recipe {
+        expect_recipe do
           ruby_block "fetch VPC objects" do
             block do
               test_vpc = Chef::Resource::AwsVpc.get_aws_object("test_vpc", run_context: run_context)
               test_vpc_2 = Chef::Resource::AwsVpc.get_aws_object("test_vpc_2", run_context: run_context)
-              pcx = ec2_resource.vpc(test_vpc.id).request_vpc_peering_connection({ :peer_vpc_id => test_vpc_2.id })
+              pcx = ec2_resource.vpc(test_vpc.id).request_vpc_peering_connection(peer_vpc_id: test_vpc_2.id)
             end
           end
-        }.to match_an_aws_vpc_peering_connection(pcx.id,
-           :'status.code' => 'pending-acceptance'
-        )
+        end.to match_an_aws_vpc_peering_connection(pcx.id,
+                                                   'status.code': "pending-acceptance")
 
-        expect_recipe {
+        expect_recipe do
           aws_vpc_peering_connection pcx.id do
             action :accept
           end
-        }.to match_an_aws_vpc_peering_connection(pcx.id,
-          :'status.code' => 'active'
-        )
+        end.to match_an_aws_vpc_peering_connection(pcx.id,
+                                                   'status.code': "active")
       end
     end
   end
 end
-

data/spec/integration/aws_vpc_spec.rb

@@ -1,101 +1,96 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Chef::Resource::AwsVpc do
   extend AWSSupport
 
-  when_the_chef_12_server "exists", organization: 'foo', server_scope: :context 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'
+      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
-          expect_recipe {
-            aws_vpc 'test_vpc' do
-              cidr_block '10.0.0.0/24'
+          expect_recipe do
+            aws_vpc "test_vpc" do
+              cidr_block "10.0.0.0/24"
             end
-          }.to create_an_aws_vpc('test_vpc',
-            cidr_block: '10.0.0.0/24',
-            instance_tenancy: "default",
-            state: "available",
-            internet_gateways_entries: nil
-          ).and be_idempotent
+          end.to create_an_aws_vpc("test_vpc",
+                                   cidr_block: "10.0.0.0/24",
+                                   instance_tenancy: "default",
+                                   state: "available",
+                                   internet_gateways_entries: nil).and be_idempotent
         end
 
         it "aws_vpc 'vpc' with cidr_block '10.0.0.0/24' creates a VPC with tags" do
-          expect_recipe {
-            aws_vpc 'test_vpc_2' do
-              cidr_block '10.0.0.0/24'
-              aws_tags :foo => :bar
+          expect_recipe do
+            aws_vpc "test_vpc_2" do
+              cidr_block "10.0.0.0/24"
+              aws_tags foo: :bar
             end
-          }.to create_an_aws_vpc('test_vpc_2',
-            cidr_block: '10.0.0.0/24',
-            instance_tenancy: "default",
-            state: "available",
-            internet_gateways_entries: nil
-          ).and have_aws_vpc_tags('test_vpc_2',
-                                  {"foo" => "bar"}
-          ).and be_idempotent
+          end.to create_an_aws_vpc("test_vpc_2",
+                                   cidr_block: "10.0.0.0/24",
+                                   instance_tenancy: "default",
+                                   state: "available",
+                                   internet_gateways_entries: nil).and have_aws_vpc_tags("test_vpc_2",
+                                                                                         "foo" => "bar").and be_idempotent
         end
 
         it "aws_vpc 'vpc' with all attributes creates a VPC" do
-          expect_recipe {
-            aws_vpc 'test_vpc' do
-              cidr_block '10.0.0.0/24'
+          expect_recipe do
+            aws_vpc "test_vpc" do
+              cidr_block "10.0.0.0/24"
               internet_gateway true
               instance_tenancy :dedicated
-              main_routes '0.0.0.0/0' => :internet_gateway
-              dhcp_options 'test_dhcp_options'
+              main_routes "0.0.0.0/0" => :internet_gateway
+              dhcp_options "test_dhcp_options"
               enable_dns_support true
               enable_dns_hostnames true
             end
-          }.to create_an_aws_vpc('test_vpc',
-            cidr_block:       '10.0.0.0/24',
-            instance_tenancy: "dedicated",
-            dhcp_options_id:  test_dhcp_options.aws_object.id,
-            state:            "available",
-            routetables_entries_routes: [
-              {
-                destination_cidr_block: '10.0.0.0/24',
-                gateway_id: 'local',
-                origin: 'CreateRouteTable',
-                state: 'active'
-              },
-              {
-                destination_cidr_block: '0.0.0.0/0',
-                gateway_id: (/igw-\w+/),
-                origin: 'CreateRoute',
-                state: 'active'
-              }
-            ],
-            internet_gateways_entries: an_instance_of(::Aws::EC2::InternetGateway)
-          ).and be_idempotent
+          end.to create_an_aws_vpc("test_vpc",
+                                   cidr_block:       "10.0.0.0/24",
+                                   instance_tenancy: "dedicated",
+                                   dhcp_options_id:  test_dhcp_options.aws_object.id,
+                                   state:            "available",
+                                   routetables_entries_routes: [
+                                     {
+                                       destination_cidr_block: "10.0.0.0/24",
+                                       gateway_id: "local",
+                                       origin: "CreateRouteTable",
+                                       state: "active"
+                                     },
+                                     {
+                                       destination_cidr_block: "0.0.0.0/0",
+                                       gateway_id: /igw-\w+/,
+                                       origin: "CreateRoute",
+                                       state: "active"
+                                     }
+                                   ],
+                                   internet_gateways_entries: an_instance_of(::Aws::EC2::InternetGateway)).and be_idempotent
         end
       end
 
       context "and an existing VPC with values filled in" do
-        aws_vpc 'test_vpc' do
-          cidr_block '10.0.0.0/24'
+        aws_vpc "test_vpc" do
+          cidr_block "10.0.0.0/24"
           internet_gateway true
           instance_tenancy :dedicated
-          main_routes '0.0.0.0/0' => :internet_gateway
-          dhcp_options 'test_dhcp_options'
+          main_routes "0.0.0.0/0" => :internet_gateway
+          dhcp_options "test_dhcp_options"
           enable_dns_support true
           enable_dns_hostnames true
         end
 
         context "and a route table inside that VPC" do
-          aws_route_table 'test_route_table' do
-            vpc 'test_vpc'
+          aws_route_table "test_route_table" do
+            vpc "test_vpc"
           end
           it "aws_vpc can update the main_route_table to it" do
-            expect_recipe {
-              aws_vpc 'test_vpc' do
-                main_route_table 'test_route_table'
+            expect_recipe do
+              aws_vpc "test_vpc" do
+                main_route_table "test_route_table"
               end
-            }.to update_an_aws_vpc('test_vpc',
-              vpc_id: test_route_table.aws_object.vpc_id
-            ).and be_idempotent
+            end.to update_an_aws_vpc("test_vpc",
+                                     vpc_id: test_route_table.aws_object.vpc_id).and be_idempotent
           end
 
           # Clean up the main route table association so we can cleanly delete
@@ -113,74 +108,65 @@ describe Chef::Resource::AwsVpc do
             end
             @old_main = test_vpc.aws_object.route_tables.entries[1].id if @old_main.nil?
             if new_main != @old_main
-                test_vpc.aws_object.client.replace_route_table_association(association_id: new_main_route_table.id,route_table_id: @old_main)
+              test_vpc.aws_object.client.replace_route_table_association(association_id: new_main_route_table.id, route_table_id: @old_main)
             end
           end
         end
       end
 
       it "creates aws_vpc tags" do
-        expect_recipe {
-          aws_vpc 'test_vpc' do
-            cidr_block '10.0.0.0/24'
+        expect_recipe do
+          aws_vpc "test_vpc" do
+            cidr_block "10.0.0.0/24"
             aws_tags key1: "value"
           end
-        }.to create_an_aws_vpc('test_vpc')
-        .and have_aws_vpc_tags('test_vpc',
-          {
-            'Name' => 'test_vpc',
-            'key1' => 'value'
-          }
-        ).and be_idempotent
+        end.to create_an_aws_vpc("test_vpc")
+          .and have_aws_vpc_tags("test_vpc",
+                                 "Name" => "test_vpc",
+                                 "key1" => "value").and be_idempotent
       end
 
       context "with existing tags" do
-        aws_vpc 'test_vpc' do
-          cidr_block '10.0.0.0/24'
+        aws_vpc "test_vpc" do
+          cidr_block "10.0.0.0/24"
           aws_tags key1: "value"
         end
 
         it "updates aws_vpc tags" do
-          expect_recipe {
-            aws_vpc 'test_vpc' do
+          expect_recipe do
+            aws_vpc "test_vpc" do
               aws_tags key1: "value2", key2: nil
             end
-          }.to have_aws_vpc_tags('test_vpc',
-            {
-              'Name' => 'test_vpc',
-              'key1' => 'value2',
-              'key2' => ''
-            }
-          ).and be_idempotent
+          end.to have_aws_vpc_tags("test_vpc",
+                                   "Name" => "test_vpc",
+                                   "key1" => "value2",
+                                   "key2" => "").and be_idempotent
         end
 
         it "removes all aws_vpc tags except Name" do
-          expect_recipe {
-            aws_vpc 'test_vpc' do
+          expect_recipe do
+            aws_vpc "test_vpc" do
               aws_tags({})
             end
-          }.to have_aws_vpc_tags('test_vpc',
-            {
-              'Name' => 'test_vpc'
-            }
-          ).and be_idempotent
+          end.to have_aws_vpc_tags("test_vpc",
+                                   "Name" => "test_vpc").and be_idempotent
         end
       end
 
       it "aws_vpc 'vpc' with no attributes fails to create a VPC (must specify cidr_block)" do
-        expect_converge {
-          aws_vpc 'test_vpc' do
+        expect_converge do
+          aws_vpc "test_vpc" do
           end
-        }.to raise_error(::ArgumentError, /missing required parameter params\[:cidr_block\]/)
+        end.to raise_error(::ArgumentError, /missing required parameter params\[:cidr_block\]/)
       end
 
       context "When having two VPC's and a peering connection between them" do
         aws_vpc "test_vpc_1" do
-          cidr_block '20.0.0.0/24'
+          cidr_block "20.0.0.0/24"
         end
 
         aws_vpc "test_vpc_2" do
-          cidr_block '21.0.0.0/24'
+          cidr_block "21.0.0.0/24"
         end
 
         aws_vpc_peering_connection "test_peering_connection" do
@@ -189,42 +175,40 @@ describe Chef::Resource::AwsVpc do
         end
 
         it "deletes the peer connection when one of the vpc's is deleted." do
-          expect_recipe {
+          expect_recipe do
             aws_vpc "test_vpc_1" do
               action :purge
             end
-          }.to match_an_aws_vpc_peering_connection('test_peering_connection',
-              :'status.code' => 'deleted'
-          ).and be_idempotent
+          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'
+        aws_vpc "test_vpc" do
+          cidr_block "10.0.0.0/24"
           internet_gateway true
         end
 
-        aws_subnet 'test_subnet' do
-          vpc 'test_vpc'
+        aws_subnet "test_subnet" do
+          vpc "test_vpc"
         end
 
-        aws_eip_address 'test_eip'
+        aws_eip_address "test_eip"
 
-        aws_nat_gateway 'test_nat_gateway' do
-          subnet 'test_subnet'
-          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
+        it "they should be deleted" do
+          r = recipe do
+            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
+          expect(r).to match_an_aws_nat_gateway("test_nat_gateway",
+                                                state: "deleted").and be_idempotent
         end
       end
     end