chef-provisioning-aws 3.0.4 → 3.0.6

data/spec/integration/aws_rds_instance_spec.rb

@@ -1,11 +1,10 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Chef::Resource::AwsRdsInstance 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 connection to AWS, a VPC, two subnets, a db subnet group, and a db parameter group" do
-
       azs = []
       driver.ec2.describe_availability_zones.availability_zones.each do |az|
         azs << az
@@ -13,18 +12,18 @@ describe Chef::Resource::AwsRdsInstance do
       az_1 = azs[0].zone_name
       az_2 = azs[1].zone_name
       aws_vpc "test_vpc" do
-        cidr_block '10.0.5.0/24'
+        cidr_block "10.0.5.0/24"
         internet_gateway true
       end
 
       aws_subnet "test_subnet" do
-        vpc 'test_vpc'
+        vpc "test_vpc"
         cidr_block "10.0.5.0/26"
         availability_zone az_1
       end
 
       aws_subnet "test_subnet_2" do
-        vpc 'test_vpc'
+        vpc "test_vpc"
         cidr_block "10.0.5.64/26"
         availability_zone az_2
       end
@@ -37,11 +36,11 @@ describe Chef::Resource::AwsRdsInstance do
       aws_rds_parameter_group "test-db-parameter-group" do
         db_parameter_group_family "postgres9.6"
         description "testing provisioning"
-        parameters [{:parameter_name => "max_connections", :parameter_value => "250", :apply_method => "pending-reboot"}]
+        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
-        expect_recipe {
+        expect_recipe do
           aws_rds_instance "test-rds-instance" do
             engine "postgres"
             publicly_accessible false
@@ -53,12 +52,11 @@ describe Chef::Resource::AwsRdsInstance do
             db_subnet_group_name "test-db-subnet-group"
             db_parameter_group_name "test-db-parameter-group"
           end
-        }.to create_an_aws_rds_instance('test-rds-instance',
-                                        engine: 'postgres',
-                                        multi_az: false,
-                                        db_instance_class: "db.t2.micro",
-                                        master_username: "thechief",
-                                       ).and be_idempotent
+        end.to create_an_aws_rds_instance("test-rds-instance",
+                                          engine: "postgres",
+                                          multi_az: false,
+                                          db_instance_class: "db.t2.micro",
+                                          master_username: "thechief").and be_idempotent
         r = driver.rds_resource.db_instance("test-rds-instance")
         expect(r.db_subnet_group.db_subnet_group_name).to eq("test-db-subnet-group")
         expect(r.db_parameter_groups.first.db_parameter_group_name).to eq("test-db-parameter-group")
@@ -66,7 +64,7 @@ describe Chef::Resource::AwsRdsInstance do
       end
 
       it "aws_rds_instance prefers explicit options" do
-        expect_recipe {
+        expect_recipe do
           aws_rds_instance "test-rds-instance2" do
             engine "postgres"
             publicly_accessible false
@@ -77,19 +75,18 @@ describe Chef::Resource::AwsRdsInstance do
             allocated_storage 5
             additional_options(multi_az: true, backup_retention_period: 2)
           end
-        }.to create_an_aws_rds_instance('test-rds-instance2',
-                                        engine: 'postgres',
-                                        multi_az: false,
-                                        db_instance_class: "db.t2.micro",
-                                        master_username: "thechief",
-                                        backup_retention_period: 2)
-
+        end.to create_an_aws_rds_instance("test-rds-instance2",
+                                          engine: "postgres",
+                                          multi_az: false,
+                                          db_instance_class: "db.t2.micro",
+                                          master_username: "thechief",
+                                          backup_retention_period: 2)
       end
 
       tagging_id = Random.rand(1000)
 
       it "creates aws_rds_instance tags" do
-        expect_recipe {
+        expect_recipe do
           aws_rds_instance "test-rds-instance-tagging-#{tagging_id}" do
             aws_tags key1: "value"
             allocated_storage 5
@@ -98,12 +95,9 @@ describe Chef::Resource::AwsRdsInstance do
             master_username "thechief"
             master_user_password "securesecure"
           end
-        }.to create_an_aws_rds_instance("test-rds-instance-tagging-#{tagging_id}")
-        .and have_aws_rds_instance_tags("test-rds-instance-tagging-#{tagging_id}",
-          {
-            'key1' => 'value'
-          }
-        ).and be_idempotent
+        end.to create_an_aws_rds_instance("test-rds-instance-tagging-#{tagging_id}")
+          .and have_aws_rds_instance_tags("test-rds-instance-tagging-#{tagging_id}",
+                                          "key1" => "value").and be_idempotent
       end
 
       # if we use let, the tagging_id method is not available in the context block
@@ -120,7 +114,7 @@ describe Chef::Resource::AwsRdsInstance do
         end
 
         it "updates aws_rds_instance tags" do
-          expect_recipe {
+          expect_recipe do
             aws_rds_instance "test-rds-instance-tagging-#{tagging_id}" do
               aws_tags key1: "value1", key2: "value2"
               allocated_storage 5
@@ -129,16 +123,13 @@ describe Chef::Resource::AwsRdsInstance do
               master_username "thechief"
               master_user_password "securesecure"
             end
-          }.to have_aws_rds_instance_tags("test-rds-instance-tagging-#{tagging_id}",
-            {
-              'key1' => 'value1',
-              'key2' => 'value2'
-            }
-          ).and be_idempotent
+          end.to have_aws_rds_instance_tags("test-rds-instance-tagging-#{tagging_id}",
+                                            "key1" => "value1",
+                                            "key2" => "value2").and be_idempotent
         end
 
         it "removes all aws_rds_instance tags" do
-          expect_recipe {
+          expect_recipe do
             aws_rds_instance "test-rds-instance-tagging-#{tagging_id}" do
               aws_tags({})
               allocated_storage 5
@@ -147,11 +138,9 @@ describe Chef::Resource::AwsRdsInstance do
               master_username "thechief"
               master_user_password "securesecure"
             end
-          }.to have_aws_rds_instance_tags("test-rds-instance-tagging-#{tagging_id}", {}
-          ).and be_idempotent
+          end.to have_aws_rds_instance_tags("test-rds-instance-tagging-#{tagging_id}", {}).and be_idempotent
         end
       end
-
     end
   end
 end

data/spec/integration/aws_rds_parameter_group_spec.rb

@@ -1,51 +1,45 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Chef::Resource::AwsRdsParameterGroup 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 "no required pre-existing objects" do
       it "creates an empty parameter group" do
-        expect_recipe {
+        expect_recipe do
           aws_rds_parameter_group "test-db-parameter-group" do
             db_parameter_group_family "postgres9.4"
             description "testing provisioning"
           end
-        }.to create_an_aws_rds_parameter_group("test-db-parameter-group",
-                                               :db_parameter_group_family => "postgres9.4",
-                                               :description => "testing provisioning"
-                                              )
+        end.to create_an_aws_rds_parameter_group("test-db-parameter-group",
+                                                 db_parameter_group_family: "postgres9.4",
+                                                 description: "testing provisioning")
       end
 
       it "creates a parameter group with tags" do
-        expect_recipe {
+        expect_recipe do
           aws_rds_parameter_group "test-db-parameter-group-with-tags" do
             db_parameter_group_family "postgres9.4"
             description "testing provisioning"
-            aws_tags key1: 'value'
+            aws_tags key1: "value"
           end
-        }.to create_an_aws_rds_parameter_group("test-db-parameter-group-with-tags")
-              .and have_aws_rds_parameter_group_tags("test-db-parameter-group-with-tags",
-                                                     {
-                                                       'key1' => 'value'
-                                                     }
-                                                    )
+        end.to create_an_aws_rds_parameter_group("test-db-parameter-group-with-tags")
+          .and have_aws_rds_parameter_group_tags("test-db-parameter-group-with-tags",
+                                                 "key1" => "value")
       end
 
       it "creates an new parameter group with parameters" do
         results = nil
-        expect_recipe {
+        expect_recipe do
           results = aws_rds_parameter_group "test-db-parameter-group-with-parameters" do
             db_parameter_group_family "postgres9.4"
             description "testing provisioning"
-            parameters [{:parameter_name => "max_connections", :parameter_value => "250", :apply_method => "pending-reboot"}]
+            parameters [{ parameter_name: "max_connections", parameter_value: "250", apply_method: "pending-reboot" }]
           end
-        }.to create_an_aws_rds_parameter_group("test-db-parameter-group-with-parameters",
-                                               :db_parameter_group_family => "postgres9.4",
-                                               :description => "testing provisioning",
-                                              )
+        end.to create_an_aws_rds_parameter_group("test-db-parameter-group-with-parameters",
+                                                 db_parameter_group_family: "postgres9.4",
+                                                 description: "testing provisioning")
 
-        expect(results.parameters).to eq([{:parameter_name => "max_connections", :parameter_value => "250", :apply_method => "pending-reboot"}])
+        expect(results.parameters).to eq([{ parameter_name: "max_connections", parameter_value: "250", apply_method: "pending-reboot" }])
         results.parameters.each do |parameter|
           expect(parameter[:parameter_value]).to eq("250") if parameter[:parameter_name] == "max_connections"
         end
@@ -54,37 +48,40 @@ describe Chef::Resource::AwsRdsParameterGroup do
       context "when the object is updated" do
         let(:final_max_connection_value)   { "300" }
         let(:final_application_name_value) { "second_name" }
-        let(:initial_parameters) { [
-                                     {:parameter_name => "application_name", :parameter_value => "first_name", :apply_method => "pending-reboot"}
-                                   ] }
-        let(:updated_parameters) { [
-                                     {:parameter_name => "application_name", :parameter_value => final_application_name_value, :apply_method => "pending-reboot"},
-                                     {:parameter_name => "max_connections", :parameter_value => final_max_connection_value, :apply_method => "pending-reboot"}
-                                   ] }
+        let(:initial_parameters) do
+          [
+            { parameter_name: "application_name", parameter_value: "first_name", apply_method: "pending-reboot" }
+          ]
+        end
+        let(:updated_parameters) do
+          [
+            { parameter_name: "application_name", parameter_value: final_application_name_value, apply_method: "pending-reboot" },
+            { parameter_name: "max_connections", parameter_value: final_max_connection_value, apply_method: "pending-reboot" }
+          ]
+        end
         it "updates properly" do
           results = nil
-          expect_recipe {
+          expect_recipe do
             results = aws_rds_parameter_group "test-db-parameter-group-updated" do
               db_parameter_group_family "postgres9.4"
               description "testing provisioning"
               parameters initial_parameters
             end
-          }
+          end
           expect(results.parameters).to eq(initial_parameters)
 
           results_2 = nil
-          expect_recipe {
+          expect_recipe do
             results_2 = aws_rds_parameter_group "test-db-parameter-group-updated" do
               db_parameter_group_family "postgres9.4"
               description "testing provisioning"
               parameters updated_parameters
             end
-          }
+          end
           expect(results_2.parameters).to eq(updated_parameters)
           results_2.parameters.each do |parameter|
             expect(parameter[:parameter_value]).to eq(final_max_connection_value) if parameter[:parameter_name] == "max_connections"
             expect(parameter[:parameter_value]).to eq(final_application_name_value) if parameter[:parameter_name] == "application_name"
-
           end
         end
       end

data/spec/integration/aws_rds_subnet_group_spec.rb

@@ -1,14 +1,13 @@
-require 'spec_helper'
-require 'aws-sdk'
-require 'set'
+require "spec_helper"
+require "aws-sdk"
+require "set"
 
 describe Chef::Resource::AwsRdsSubnetGroup 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 and subnet" do
-
-      #region = ENV['AWS_TEST_DRIVER'][5..-1]
+      # region = ENV['AWS_TEST_DRIVER'][5..-1]
 
       azs = []
       driver.ec2.describe_availability_zones.availability_zones.each do |az|
@@ -18,88 +17,79 @@ describe Chef::Resource::AwsRdsSubnetGroup do
       az_2 = azs[1].zone_name
 
       aws_vpc "test_vpc" do
-        cidr_block '10.0.0.0/24'
+        cidr_block "10.0.0.0/24"
         internet_gateway true
       end
 
       aws_subnet "test_subnet" do
-        vpc 'test_vpc'
+        vpc "test_vpc"
         cidr_block "10.0.0.0/26"
         availability_zone az_1
       end
 
       aws_subnet "test_subnet_2" do
-        vpc 'test_vpc'
+        vpc "test_vpc"
         cidr_block "10.0.0.64/26"
         availability_zone az_2
       end
 
       it "creates a database subnet group containing multiple subnets" do
-        expect_recipe {
+        expect_recipe do
           aws_rds_subnet_group "test-db-subnet-group" do
             description "some_description"
             subnets ["test_subnet", test_subnet_2.aws_object.id]
           end
-        }.to create_an_aws_rds_subnet_group("test-db-subnet-group",
-                                              :db_subnet_group_description => "some_description",
-                                              :subnets => Set.new([ {:subnet_status => "Active",
-                                                                     :subnet_identifier => test_subnet_2.aws_object.id,
-                                                                     :subnet_availability_zone => {:name => az_2}},
-                                                                    {:subnet_status => "Active",
-                                                                     :subnet_identifier => test_subnet.aws_object.id,
-                                                                     :subnet_availability_zone => {:name => az_1}}])
-                                           ).and be_idempotent
+        end.to create_an_aws_rds_subnet_group("test-db-subnet-group",
+                                              db_subnet_group_description: "some_description",
+                                              subnets: Set.new([{ subnet_status: "Active",
+                                                                  subnet_identifier: test_subnet_2.aws_object.id,
+                                                                  subnet_availability_zone: { name: az_2 } },
+                                                                { subnet_status: "Active",
+                                                                  subnet_identifier: test_subnet.aws_object.id,
+                                                                  subnet_availability_zone: { name: az_1 } }])).and be_idempotent
       end
 
       it "creates aws_rds_subnet_group tags" do
-        expect_recipe {
+        expect_recipe do
           aws_rds_subnet_group "test-db-subnet-group" do
             description "some_description"
             subnets ["test_subnet", test_subnet_2.aws_object.id]
-            aws_tags key1: 'value'
+            aws_tags key1: "value"
           end
-        }.to create_an_aws_rds_subnet_group("test-db-subnet-group")
-        .and have_aws_rds_subnet_group_tags("test-db-subnet-group",
-          {
-            'key1' => 'value'
-          }
-        ).and be_idempotent
+        end.to create_an_aws_rds_subnet_group("test-db-subnet-group")
+          .and have_aws_rds_subnet_group_tags("test-db-subnet-group",
+                                              "key1" => "value").and be_idempotent
       end
 
       context "with existing tags" do
         aws_rds_subnet_group "test-db-subnet-group" do
           description "some_description"
           subnets ["test_subnet", test_subnet_2.aws_object.id]
-          aws_tags key1: 'value'
+          aws_tags key1: "value"
         end
 
         it "updates aws_rds_subnet_group tags" do
-          expect_recipe {
+          expect_recipe do
             aws_rds_subnet_group "test-db-subnet-group" do
               description "some_description"
               subnets ["test_subnet", test_subnet_2.aws_object.id]
-              aws_tags key1: "value2", key2: ''
+              aws_tags key1: "value2", key2: ""
             end
-          }.to have_aws_rds_subnet_group_tags("test-db-subnet-group",
-            {
-              'key1' => 'value2',
-              'key2' => ''
-            }
-          ).and be_idempotent
+          end.to have_aws_rds_subnet_group_tags("test-db-subnet-group",
+                                                "key1" => "value2",
+                                                "key2" => "").and be_idempotent
         end
 
         it "removes all aws_rds_subnet_group tags" do
-          expect_recipe {
+          expect_recipe do
             aws_rds_subnet_group "test-db-subnet-group" do
               description "some_description"
               subnets ["test_subnet", test_subnet_2.aws_object.id]
               aws_tags({})
             end
-          }.to have_aws_rds_subnet_group_tags("test-db-subnet-group", {}
-          ).and be_idempotent
+          end.to have_aws_rds_subnet_group_tags("test-db-subnet-group", {}).and be_idempotent
         end
       end
-
     end
   end
 end

data/spec/integration/aws_route53_hosted_zone_spec.rb

@@ -1,96 +1,94 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Chef::Resource::AwsRoute53HostedZone 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 connected to AWS" do
-
       context "aws_route53_hosted_zone" do
-
         # for the occasional spec where the test zone won't be automatically deleted, the spec can set
         # @zone_to_delete to communicate the zone name to the 'after' block. (this can't be done just with
         # let-vars because attribute values in dependent RecordSet resources have to be hard-coded.)
         let(:zone_to_delete) { @zone_to_delete }
 
-        after(:example) {
+        after(:example) do
           if zone_to_delete
-            converge {
+            converge do
               aws_route53_hosted_zone zone_to_delete do
                 action :destroy
               end
-            }
+            end
           end
-        }
+        end
 
         let(:zone_name) { "aws-spec-#{Time.now.to_i}.com" }
 
         context ":create" do
           it "creates a hosted zone without attributes" do
-            expect(recipe {
+            expect(recipe do
               aws_route53_hosted_zone zone_name
-            }).to create_an_aws_route53_hosted_zone(zone_name).and be_idempotent
+            end).to create_an_aws_route53_hosted_zone(zone_name).and be_idempotent
           end
 
           it "creates a hosted zone with attributes" do
             test_comment = "Test comment for spec."
 
-            expect_recipe {
+            expect_recipe do
               aws_route53_hosted_zone zone_name do
                 comment test_comment
               end
-            }.to create_an_aws_route53_hosted_zone(zone_name,
-                                                   config: { comment: test_comment }).and be_idempotent
+            end.to create_an_aws_route53_hosted_zone(zone_name,
+                                                     config: { comment: test_comment }).and be_idempotent
           end
 
           # we don't want to go overboard testing all our validations, but this is the one that can cause the
           # most difficult user confusion, and AWS won't catch it.
           it "crashes if the zone name has a trailing dot" do
-            expect_converge {
+            expect_converge do
               aws_route53_hosted_zone "#{zone_name}."
-            }.to raise_error(Chef::Exceptions::ValidationFailed, /domain name cannot end with a dot/)
+            end.to raise_error(Chef::Exceptions::ValidationFailed, /domain name cannot end with a dot/)
           end
 
           it "updates the zone comment" do
             expected_comment = "Updated comment."
 
-            expect_recipe {
+            expect_recipe do
               aws_route53_hosted_zone zone_name do
                 comment "Initial comment."
               end
               aws_route53_hosted_zone zone_name do
                 comment expected_comment
               end
-            }.to create_an_aws_route53_hosted_zone(zone_name,
-                                                   config: { comment: expected_comment }).and be_idempotent
+            end.to create_an_aws_route53_hosted_zone(zone_name,
+                                                     config: { comment: expected_comment }).and be_idempotent
           end
 
           it "updates the zone comment when none is given" do
-            expect_recipe {
+            expect_recipe do
               aws_route53_hosted_zone zone_name do
                 comment "Initial comment."
               end
               aws_route53_hosted_zone zone_name do
               end
-            }.to create_an_aws_route53_hosted_zone(zone_name,
-                                                   config: { comment: nil }).and be_idempotent
+            end.to create_an_aws_route53_hosted_zone(zone_name,
+                                                     config: { comment: nil }).and be_idempotent
           end
         end
 
         context "RecordSets" do
-          let(:sdk_cname_rr) {
+          let(:sdk_cname_rr) do
             {
-              name: "some-host.feegle.com.",  # AWS adds the trailing dot.
+              name: "some-host.feegle.com.", # AWS adds the trailing dot.
               type: "CNAME",
               ttl: 3600,
-              resource_records: [{ value: "some-other-host" }],
+              resource_records: [{ value: "some-other-host" }]
             }
-          }
+          end
 
           it "crashes on duplicate RecordSets" do
-            expect_converge {
+            expect_converge do
               aws_route53_hosted_zone "chasm.com" do
-                record_sets {
+                record_sets do
                   aws_route53_record_set "wooster1" do
                     rr_name "wooster.chasm.com"
                     type "CNAME"
@@ -103,163 +101,163 @@ describe Chef::Resource::AwsRoute53HostedZone do
                     ttl 3600
                     resource_records ["141.222.1.1"]
                   end
-                }
+                end
               end
-            }.to raise_error(Chef::Exceptions::ValidationFailed, /Duplicate RecordSet found in resource/)
+            end.to raise_error(Chef::Exceptions::ValidationFailed, /Duplicate RecordSet found in resource/)
           end
 
           # normally wouldn't bother with this, but it's best to be safe with the inlined resources.
           it "crashes on a RecordSet with an invalid action" do
-            expect_converge {
+            expect_converge do
               aws_route53_hosted_zone zone_name do
-                record_sets {
+                record_sets do
                   aws_route53_record_set "wooster1" do
                     action :invoke
                     rr_name "wooster.example.com"
                     type "CNAME"
                     ttl 300
                   end
-                }
+                end
               end
-            }.to raise_error(Chef::Exceptions::ValidationFailed, /Option action must be equal to one of/)
+            end.to raise_error(Chef::Exceptions::ValidationFailed, /Option action must be equal to one of/)
           end
 
           it "creates a hosted zone with a RecordSet" do
-            expect_recipe {
+            expect_recipe do
               aws_route53_hosted_zone "feegle.com" do
-                record_sets {
+                record_sets do
                   aws_route53_record_set "some-hostname CNAME" do
                     rr_name "some-host.feegle.com"
                     type "CNAME"
                     ttl 3600
                     resource_records ["some-other-host"]
                   end
-                }
+                end
               end
-            }.to create_an_aws_route53_hosted_zone("feegle.com",
-                                                   resource_record_sets: [{}, {}, sdk_cname_rr]).and be_idempotent
+            end.to create_an_aws_route53_hosted_zone("feegle.com",
+                                                     resource_record_sets: [{}, {}, sdk_cname_rr]).and be_idempotent
             # the empty {} acts as a wildcard, and all zones have SOA and NS records we want to skip.
           end
 
           it "creates a hosted zone with a RecordSet with an RR name with a trailing dot" do
-            expect_recipe {
+            expect_recipe do
               aws_route53_hosted_zone "feegle.com" do
-                record_sets {
+                record_sets do
                   aws_route53_record_set "some-host.feegle.com." do
                     type "CNAME"
                     ttl 3600
                     resource_records ["some-other-host"]
                   end
-                }
+                end
               end
-            }.to create_an_aws_route53_hosted_zone("feegle.com",
-                                                   resource_record_sets: [{}, {}, sdk_cname_rr]).and be_idempotent
+            end.to create_an_aws_route53_hosted_zone("feegle.com",
+                                                     resource_record_sets: [{}, {}, sdk_cname_rr]).and be_idempotent
           end
 
           # AWS's error for this is "FATAL problem: DomainLabelEmpty encountered", so we help the user out.
           it "crashes with a RecordSet with a mismatched zone name with a trailing dot" do
-            expect_converge {
+            expect_converge do
               aws_route53_hosted_zone "feegle.com" do
-                record_sets {
+                record_sets do
                   aws_route53_record_set "some-host.wrong-zone.com." do
                     type "CNAME"
                     ttl 3600
                     resource_records ["some-other-host"]
                   end
-                }
+                end
               end
-            }.to raise_error(Chef::Exceptions::ValidationFailed, /RecordSet name.*does not match parent/)
+            end.to raise_error(Chef::Exceptions::ValidationFailed, /RecordSet name.*does not match parent/)
           end
 
           it "creates and updates a RecordSet" do
-            expected_rr = sdk_cname_rr.merge({ ttl: 1800 })
+            expected_rr = sdk_cname_rr.merge(ttl: 1800)
 
-            expect_recipe {
+            expect_recipe do
               aws_route53_hosted_zone "feegle.com" do
-                record_sets {
+                record_sets do
                   aws_route53_record_set "some-hostname CNAME" do
                     rr_name "some-host"
                     type "CNAME"
                     ttl 3600
                     resource_records ["some-other-host"]
                   end
-                }
+                end
               end
 
               aws_route53_hosted_zone "feegle.com" do
-                record_sets {
+                record_sets do
                   aws_route53_record_set "some-hostname CNAME" do
                     rr_name "some-host"
                     type "CNAME"
                     ttl 1800
                     resource_records ["some-other-host"]
                   end
-                }
+                end
               end
-            }.to create_an_aws_route53_hosted_zone("feegle.com",
-                                                   resource_record_sets: [{}, {}, expected_rr]).and be_idempotent
+            end.to create_an_aws_route53_hosted_zone("feegle.com",
+                                                     resource_record_sets: [{}, {}, expected_rr]).and be_idempotent
           end
 
           it "creates and deletes a RecordSet" do
-            expect_recipe {
+            expect_recipe do
               aws_route53_hosted_zone "feegle.com" do
-                record_sets {
+                record_sets do
                   aws_route53_record_set "some-api-host" do
                     type "CNAME"
                     ttl 3600
                     resource_records ["some-other-host"]
                   end
-                }
+                end
               end
 
               aws_route53_hosted_zone "feegle.com" do
-                record_sets {
+                record_sets do
                   aws_route53_record_set "some-api-host" do
                     action :destroy
                     type "CNAME"
                     ttl 3600
                     resource_records ["some-other-host"]
                   end
-                }
+                end
               end
-            }.to create_an_aws_route53_hosted_zone("feegle.com",
-                                                   resource_record_sets: [{}, {}]).and be_idempotent
+            end.to create_an_aws_route53_hosted_zone("feegle.com",
+                                                     resource_record_sets: [{}, {}]).and be_idempotent
           end
 
           it "automatically uses the parent zone name in the RecordSet name" do
-            expect_recipe {
+            expect_recipe do
               aws_route53_hosted_zone "feegle.com" do
-                record_sets {
+                record_sets do
                   aws_route53_record_set "some-host" do
                     type "CNAME"
                     ttl 3600
                     resource_records ["some-other-host"]
                   end
-                }
+                end
               end
-            }.to create_an_aws_route53_hosted_zone("feegle.com",
-                                                   resource_record_sets: [{}, {}, sdk_cname_rr]).and be_idempotent
+            end.to create_an_aws_route53_hosted_zone("feegle.com",
+                                                     resource_record_sets: [{}, {}, sdk_cname_rr]).and be_idempotent
           end
 
           it "raises the AWS exception when trying to delete a record using mismatched values" do
             @zone_to_delete = zone_name = "raise-aws-exception.com"
 
-            expect_converge {
+            expect_converge do
               aws_route53_hosted_zone zone_name do
-                record_sets {
+                record_sets do
                   aws_route53_record_set "some-hostname CNAME" do
                     rr_name "some-api-host.raise-aws-exception.com"
                     type "CNAME"
                     ttl 3600
                     resource_records ["some-other-host"]
                   end
-                }
+                end
               end
-            }.not_to raise_error
+            end.not_to raise_error
 
-            expect_converge {
+            expect_converge do
               aws_route53_hosted_zone zone_name do
-                record_sets {
+                record_sets do
                   aws_route53_record_set "some-hostname CNAME" do
                     action :destroy
                     rr_name "some-api-host.raise-aws-exception.com"
@@ -267,24 +265,24 @@ describe Chef::Resource::AwsRoute53HostedZone do
                     ttl 100
                     resource_records ["some-other-host"]
                   end
-                }
+                end
               end
-            }.to raise_error(::Aws::Route53::Errors::InvalidChangeBatch, /Tried to delete.*the values provided do not match the current values/)
+            end.to raise_error(::Aws::Route53::Errors::InvalidChangeBatch, /Tried to delete.*the values provided do not match the current values/)
           end
 
           it "uses the resource name as the :rr_name" do
-            expect_recipe {
+            expect_recipe do
               aws_route53_hosted_zone "feegle.com" do
-                record_sets {
+                record_sets do
                   aws_route53_record_set "some-host" do
                     type "CNAME"
                     ttl 3600
                     resource_records ["some-other-host"]
                   end
-                }
+                end
               end
-            }.to create_an_aws_route53_hosted_zone("feegle.com",
-                                                   resource_record_sets: [{}, {}, sdk_cname_rr]).and be_idempotent
+            end.to create_an_aws_route53_hosted_zone("feegle.com",
+                                                     resource_record_sets: [{}, {}, sdk_cname_rr]).and be_idempotent
           end
 
           context "inheriting default property values" do
@@ -293,12 +291,12 @@ describe Chef::Resource::AwsRoute53HostedZone do
                 name: "another-host.feegle.com.",
                 type: "A",
                 ttl: 3600,
-                resource_records: [{value: "8.8.8.8"}]
+                resource_records: [{ value: "8.8.8.8" }]
               }
-              expect_recipe {
+              expect_recipe do
                 aws_route53_hosted_zone "feegle.com" do
                   defaults ttl: 3600, type: "CNAME"
-                  record_sets {
+                  record_sets do
                     aws_route53_record_set "some-host" do
                       resource_records ["some-other-host"]
                     end
@@ -306,18 +304,18 @@ describe Chef::Resource::AwsRoute53HostedZone do
                       type "A"
                       resource_records ["8.8.8.8"]
                     end
-                  }
+                  end
                 end
-              }.to create_an_aws_route53_hosted_zone("feegle.com",
-                                                     resource_record_sets: [{}, {},
-                                                      expected_a, sdk_cname_rr]).and be_idempotent
+              end.to create_an_aws_route53_hosted_zone("feegle.com",
+                                                       resource_record_sets: [{}, {},
+                                                                              expected_a, sdk_cname_rr]).and be_idempotent
             end
 
             it "only provides defaults for certain properties" do
-              expect_converge {
+              expect_converge do
                 aws_route53_hosted_zone "feegle.com" do
                   defaults invalid_default: 42
-                  record_sets {
+                  record_sets do
                     aws_route53_record_set "some-host" do
                       resource_records ["some-other-host"]
                     end
@@ -325,250 +323,252 @@ describe Chef::Resource::AwsRoute53HostedZone do
                       type "A"
                       resource_records ["8.8.8.8"]
                     end
-                  }
+                  end
                 end
-              }.to raise_error(Chef::Exceptions::ValidationFailed, /'defaults' keys may be any of/)
+              end.to raise_error(Chef::Exceptions::ValidationFailed, /'defaults' keys may be any of/)
             end
 
             it "checks for requiredness" do
-              expect_converge {
+              expect_converge do
                 aws_route53_hosted_zone "feegle.com" do
                   defaults ttl: 3600
-                  record_sets {
+                  record_sets do
                     aws_route53_record_set "some-host" do
                       resource_records ["some-other-host"]
                     end
-                  }
+                  end
                 end
-              }.to raise_error(Chef::Exceptions::ValidationFailed, /required/i)
+              end.to raise_error(Chef::Exceptions::ValidationFailed, /required/i)
             end
           end
 
           context "individual RR types" do
-            let(:expected) {{
-              cname: {
-                name: "cname-host.feegle.com.",
-                type: "CNAME",
-                ttl: 1800,
-                resource_records: [{ value: "8.8.8.8" }],
-              },
-              a: {
-                name: "a-host.feegle.com.",
-                type: "A",
-                ttl: 1800,
-                resource_records: [{ value: "141.222.1.1"}, { value: "8.8.8.8" }],
-              },
-              aaaa: {
-                name: "aaaa-host.feegle.com.",
-                type: "AAAA",
-                ttl: 1800,
-                resource_records: [{ value: "2607:f8b0:4010:801::1001"},
-                                   { value: "2607:f8b9:4010:801::1001" }],
-              },
-              mx: {
-                name: "mx-host.feegle.com.",
-                type: "MX",
-                ttl: 1800,
-                # AWS does *not* append a dot to these.
-                resource_records: [{ value: "10 mail1.example.com"}, { value: "15 mail2.example.com."}],
-              },
-              txt: {
-                name: "txt-host.feegle.com.",
-                type: "TXT",
-                resource_records: [{ value: '"Very Important Data"' },
-                                   { value: '"Even More Important Data"' }],
-              },
-              srv: {
-                name: "srv-host.feegle.com.",
-                type: "SRV",
-                resource_records: [{ value: "10 50 8889 chef-server.example.com" },
-                                   { value: "20 70 80 narf.net" }],
-              },
-              soa: {
-                name: "feegle.com.",
-                type: "SOA",
-                resource_records: [{ value: "ns-1641.awsdns-13.co.uk. awsdns-hostmaster.amazon.com. 2 7200 900 1209600 86400"}],
-              },
-              ns: {
-                name: "feegle.com.",
-                type: "NS",
-                resource_records: [{ value: "ns1.amazon.com." },
-                                   { value: "ns2.amazon.org." }],
-              },
-            }}
+            let(:expected) do
+              {
+                cname: {
+                  name: "cname-host.feegle.com.",
+                  type: "CNAME",
+                  ttl: 1800,
+                  resource_records: [{ value: "8.8.8.8" }]
+                },
+                a: {
+                  name: "a-host.feegle.com.",
+                  type: "A",
+                  ttl: 1800,
+                  resource_records: [{ value: "141.222.1.1" }, { value: "8.8.8.8" }]
+                },
+                aaaa: {
+                  name: "aaaa-host.feegle.com.",
+                  type: "AAAA",
+                  ttl: 1800,
+                  resource_records: [{ value: "2607:f8b0:4010:801::1001" },
+                                     { value: "2607:f8b9:4010:801::1001" }]
+                },
+                mx: {
+                  name: "mx-host.feegle.com.",
+                  type: "MX",
+                  ttl: 1800,
+                  # AWS does *not* append a dot to these.
+                  resource_records: [{ value: "10 mail1.example.com" }, { value: "15 mail2.example.com." }]
+                },
+                txt: {
+                  name: "txt-host.feegle.com.",
+                  type: "TXT",
+                  resource_records: [{ value: '"Very Important Data"' },
+                                     { value: '"Even More Important Data"' }]
+                },
+                srv: {
+                  name: "srv-host.feegle.com.",
+                  type: "SRV",
+                  resource_records: [{ value: "10 50 8889 chef-server.example.com" },
+                                     { value: "20 70 80 narf.net" }]
+                },
+                soa: {
+                  name: "feegle.com.",
+                  type: "SOA",
+                  resource_records: [{ value: "ns-1641.awsdns-13.co.uk. awsdns-hostmaster.amazon.com. 2 7200 900 1209600 86400" }]
+                },
+                ns: {
+                  name: "feegle.com.",
+                  type: "NS",
+                  resource_records: [{ value: "ns1.amazon.com." },
+                                     { value: "ns2.amazon.org." }]
+                }
+              }
+            end
 
             it "handles CNAME records" do
-              expect_recipe {
+              expect_recipe do
                 aws_route53_hosted_zone "feegle.com" do
-                  record_sets {
+                  record_sets do
                     aws_route53_record_set "CNAME-host" do
                       type "CNAME"
                       ttl 1800
                       resource_records ["8.8.8.8"]
                     end
-                  }
+                  end
                 end
-              }.to create_an_aws_route53_hosted_zone("feegle.com",
-                                                     resource_record_sets: [ {}, {}, expected[:cname] ]).and be_idempotent
+              end.to create_an_aws_route53_hosted_zone("feegle.com",
+                                                       resource_record_sets: [{}, {}, expected[:cname]]).and be_idempotent
 
-              expect_converge {
+              expect_converge do
                 aws_route53_hosted_zone "feegle.com" do
-                  record_sets {
+                  record_sets do
                     aws_route53_record_set "CNAME-host" do
                       type "CNAME"
                       ttl 1800
                       resource_records ["141.222.1.1", "8.8.8.8"]
                     end
-                  }
+                  end
                 end
-              }.to raise_error(Chef::Exceptions::ValidationFailed, /CNAME records.*have a single value/)
+              end.to raise_error(Chef::Exceptions::ValidationFailed, /CNAME records.*have a single value/)
             end
 
             it "handles A records" do
-              expect_recipe {
+              expect_recipe do
                 aws_route53_hosted_zone "feegle.com" do
-                  record_sets {
+                  record_sets do
                     aws_route53_record_set "A-host" do
                       type "A"
                       ttl 1800
                       resource_records ["141.222.1.1", "8.8.8.8"]
                     end
-                  }
+                  end
                 end
-              }.to create_an_aws_route53_hosted_zone("feegle.com",
-                                                     resource_record_sets: [ {}, {}, expected[:a] ]).and be_idempotent
+              end.to create_an_aws_route53_hosted_zone("feegle.com",
+                                                       resource_record_sets: [{}, {}, expected[:a]]).and be_idempotent
 
-              expect_converge {
+              expect_converge do
                 aws_route53_hosted_zone "feegle.com" do
-                  record_sets {
+                  record_sets do
                     aws_route53_record_set "A-host" do
                       type "A"
                       ttl 1800
                       resource_records ["hostnames-dont-go-here.com", "8.8.8.8"]
                     end
-                  }
+                  end
                 end
-              }.to raise_error(Chef::Exceptions::ValidationFailed, /A records are of the form/)
+              end.to raise_error(Chef::Exceptions::ValidationFailed, /A records are of the form/)
             end
 
             # we don't validate IPv6 addresses, because they are complex.
             it "handles AAAA records" do
-              expect_recipe {
+              expect_recipe do
                 aws_route53_hosted_zone "feegle.com" do
-                  record_sets {
+                  record_sets do
                     aws_route53_record_set "AAAA-host" do
                       type "AAAA"
                       ttl 1800
                       resource_records ["2607:f8b0:4010:801::1001", "2607:f8b9:4010:801::1001"]
                     end
-                  }
+                  end
                 end
-              }.to create_an_aws_route53_hosted_zone("feegle.com",
-                                                     resource_record_sets: [ {}, {}, expected[:aaaa] ]).and be_idempotent
+              end.to create_an_aws_route53_hosted_zone("feegle.com",
+                                                       resource_record_sets: [{}, {}, expected[:aaaa]]).and be_idempotent
             end
 
             it "handles MX records" do
-              expect_recipe {
+              expect_recipe do
                 aws_route53_hosted_zone "feegle.com" do
-                  record_sets {
+                  record_sets do
                     aws_route53_record_set "MX-host" do
                       type "MX"
                       ttl 1800
                       resource_records ["10 mail1.example.com", "15 mail2.example.com."]
                     end
-                  }
+                  end
                 end
-              }.to create_an_aws_route53_hosted_zone("feegle.com",
-                                                     resource_record_sets: [ {}, {}, expected[:mx] ]).and be_idempotent
-              expect_converge {
+              end.to create_an_aws_route53_hosted_zone("feegle.com",
+                                                       resource_record_sets: [{}, {}, expected[:mx]]).and be_idempotent
+              expect_converge do
                 aws_route53_hosted_zone "feegle.com" do
-                  record_sets {
+                  record_sets do
                     aws_route53_record_set "MX-host" do
                       type "MX"
                       ttl 1800
                       resource_records ["10mail1.example.com", "mail2.example.com."]
                     end
-                  }
+                  end
                 end
-              }.to raise_error(Chef::Exceptions::ValidationFailed, /MX records must have a priority and mail server/)
+              end.to raise_error(Chef::Exceptions::ValidationFailed, /MX records must have a priority and mail server/)
             end
 
             it "handles SOA records" do
-              expect_recipe {
+              expect_recipe do
                 aws_route53_hosted_zone "feegle.com" do
-                  record_sets {
+                  record_sets do
                     aws_route53_record_set "SOA-host" do
                       rr_name "feegle.com."
                       type "SOA"
                       ttl 300
                       resource_records ["ns-1641.awsdns-13.co.uk. awsdns-hostmaster.amazon.com. 2 7200 900 1209600 86400"]
                     end
-                  }
+                  end
                 end
-              }.to create_an_aws_route53_hosted_zone("feegle.com",
-                                                     resource_record_sets: [ {}, expected[:soa] ]).and be_idempotent
+              end.to create_an_aws_route53_hosted_zone("feegle.com",
+                                                       resource_record_sets: [{}, expected[:soa]]).and be_idempotent
             end
 
             it "handles NS records" do
-              expect_recipe {
+              expect_recipe do
                 aws_route53_hosted_zone "feegle.com" do
-                  record_sets {
+                  record_sets do
                     aws_route53_record_set "NS-host" do
                       rr_name "feegle.com."
                       type "NS"
                       ttl 300
-                      resource_records %w[ns1.amazon.com. ns2.amazon.org.]
+                      resource_records %w{ns1.amazon.com. ns2.amazon.org.}
                     end
-                  }
+                  end
                 end
-              }.to create_an_aws_route53_hosted_zone("feegle.com",
-                                                     resource_record_sets: [ expected[:ns], {} ]).and be_idempotent
+              end.to create_an_aws_route53_hosted_zone("feegle.com",
+                                                       resource_record_sets: [expected[:ns], {}]).and be_idempotent
             end
 
             # we don't validate TXT values:
             # http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/ResourceRecordTypes.html#TXTFormat
             it "handles TXT records" do
-              expect_recipe {
+              expect_recipe do
                 aws_route53_hosted_zone "feegle.com" do
-                  record_sets {
+                  record_sets do
                     aws_route53_record_set "TXT-host" do
                       type "TXT"
                       ttl 300
-                      resource_records %w["Very\ Important\ Data" "Even\ More\ Important\ Data"]
+                      resource_records %w{Very\ Important\ Data Even\ More\ Important\ Data}
                     end
-                  }
+                  end
                 end
-              }.to create_an_aws_route53_hosted_zone("feegle.com",
-                                                     resource_record_sets: [ {}, {}, expected[:txt] ]).and be_idempotent
+              end.to create_an_aws_route53_hosted_zone("feegle.com",
+                                                       resource_record_sets: [{}, {}, expected[:txt]]).and be_idempotent
             end
 
             it "handles SRV records" do
-              expect_recipe {
+              expect_recipe do
                 aws_route53_hosted_zone "feegle.com" do
-                  record_sets {
+                  record_sets do
                     aws_route53_record_set "SRV-host" do
                       type "SRV"
                       ttl 300
                       resource_records ["10 50 8889 chef-server.example.com", "20 70 80 narf.net"]
                     end
-                  }
+                  end
                 end
-              }.to create_an_aws_route53_hosted_zone("feegle.com",
-                                                     resource_record_sets: [ {}, {}, expected[:srv] ]).and be_idempotent
+              end.to create_an_aws_route53_hosted_zone("feegle.com",
+                                                       resource_record_sets: [{}, {}, expected[:srv]]).and be_idempotent
 
-              expect_converge {
+              expect_converge do
                 aws_route53_hosted_zone "feegle.com" do
-                  record_sets {
+                  record_sets do
                     aws_route53_record_set "SRV-host" do
                       type "SRV"
                       ttl 300
                       resource_records ["1050 8889 chef-server.example.com", "narf.net"]
                     end
-                  }
+                  end
                 end
-              }.to raise_error(Chef::Exceptions::ValidationFailed, /SRV.*priority, weight, port, and hostname/)
+              end.to raise_error(Chef::Exceptions::ValidationFailed, /SRV.*priority, weight, port, and hostname/)
             end
-          end  # end RR types
+          end # end RR types
         end
       end
     end