chef-provisioning-aws 3.0.4 → 3.0.6

data/spec/integration/aws_dhcp_options_spec.rb

@@ -1,73 +1,62 @@
 describe "AwsDhcpOptions" 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
-
       it "creates an aws_dhcp_options resource with maximum attributes" do
-        expect_recipe {
-          aws_dhcp_options 'test-dhcp-options' do
-            domain_name          'example.com'
-            domain_name_servers  %w(8.8.8.8 8.8.4.4)
-            ntp_servers          %w(8.8.8.8 8.8.4.4)
-            netbios_name_servers %w(8.8.8.8 8.8.4.4)
+        expect_recipe do
+          aws_dhcp_options "test-dhcp-options" do
+            domain_name          "example.com"
+            domain_name_servers  %w{8.8.8.8 8.8.4.4}
+            ntp_servers          %w{8.8.8.8 8.8.4.4}
+            netbios_name_servers %w{8.8.8.8 8.8.4.4}
             netbios_node_type    2
           end
-        }.to create_an_aws_dhcp_options('test-dhcp-options', dhcp_configurations: [
-          {key: "domain-name", values: [{value: "example.com"}]},
-          {key: "domain-name-servers", values: [{value: "8.8.8.8"}, {value: "8.8.4.4"}]},
-          {key: "ntp-servers", values: [{value: "8.8.8.8"}, {value: "8.8.4.4"}]}, 
-          {key: "netbios-node-type", values: [{value: "2"}]}, 
-          {key: "netbios-name-servers", values: [{value: "8.8.8.8"}, {value: "8.8.4.4"}]}
-        ]).and be_idempotent
+        end.to create_an_aws_dhcp_options("test-dhcp-options", dhcp_configurations: [
+                                            { key: "domain-name", values: [{ value: "example.com" }] },
+                                            { key: "domain-name-servers", values: [{ value: "8.8.8.8" }, { value: "8.8.4.4" }] },
+                                            { key: "ntp-servers", values: [{ value: "8.8.8.8" }, { value: "8.8.4.4" }] },
+                                            { key: "netbios-node-type", values: [{ value: "2" }] },
+                                            { key: "netbios-name-servers", values: [{ value: "8.8.8.8" }, { value: "8.8.4.4" }] }
+                                          ]).and be_idempotent
       end
 
       it "creates aws_dhcp_options tags" do
-        expect_recipe {
-          aws_dhcp_options 'test-dhcp-options' do
+        expect_recipe do
+          aws_dhcp_options "test-dhcp-options" do
             aws_tags key1: "value"
           end
-        }.to create_an_aws_dhcp_options('test-dhcp-options')
-        .and have_aws_dhcp_options_tags('test-dhcp-options',
-          {
-            'Name' => 'test-dhcp-options',
-            'key1' => 'value'
-          }
-        ).and be_idempotent
+        end.to create_an_aws_dhcp_options("test-dhcp-options")
+          .and have_aws_dhcp_options_tags("test-dhcp-options",
+                                          "Name" => "test-dhcp-options",
+                                          "key1" => "value").and be_idempotent
       end
 
       context "with existing tags" do
-        aws_dhcp_options 'test-dhcp-options' do
+        aws_dhcp_options "test-dhcp-options" do
           aws_tags key1: "value"
         end
 
         it "updates aws_dhcp_options tags" do
-          expect_recipe {
-            aws_dhcp_options 'test-dhcp-options' do
+          expect_recipe do
+            aws_dhcp_options "test-dhcp-options" do
               aws_tags key1: "value2", key2: nil
             end
-          }.to have_aws_dhcp_options_tags('test-dhcp-options',
-            {
-              'Name' => 'test-dhcp-options',
-              'key1' => 'value2',
-              'key2' => ''
-            }
-          ).and be_idempotent
+          end.to have_aws_dhcp_options_tags("test-dhcp-options",
+                                            "Name" => "test-dhcp-options",
+                                            "key1" => "value2",
+                                            "key2" => "").and be_idempotent
         end
 
         it "removes all aws_dhcp_options tags except Name" do
-          expect_recipe {
-            aws_dhcp_options 'test-dhcp-options' do
-              aws_tags Hash.new
+          expect_recipe do
+            aws_dhcp_options "test-dhcp-options" do
+              aws_tags({})
             end
-          }.to have_aws_dhcp_options_tags('test-dhcp-options',
-            {
-              'Name' => 'test-dhcp-options'
-            }
-          ).and be_idempotent
+          end.to have_aws_dhcp_options_tags("test-dhcp-options",
+                                            "Name" => "test-dhcp-options").and be_idempotent
         end
       end
-
     end
   end
 end

data/spec/integration/aws_ebs_volume_spec.rb

@@ -1,146 +1,125 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Chef::Resource::AwsEbsVolume 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
-
       it "aws_ebs_volume 'test_volume' creates an ebs volume" do
-        expect_recipe {
+        expect_recipe do
           aws_ebs_volume "test_volume"
-        }.to create_an_aws_ebs_volume('test_volume',
-          size: 8
-        ).and be_idempotent
+        end.to create_an_aws_ebs_volume("test_volume",
+                                        size: 8).and be_idempotent
       end
 
-      describe 'action :delete' do
-        with_converge {
+      describe "action :delete" do
+        with_converge do
           aws_ebs_volume "test_volume" do
-            availability_zone 'a'
+            availability_zone "a"
             size 8
           end
-        }
+        end
         it "deletes the ebs volume" do
-          # TODO all the `with_*` and `expect_*` methods from Cheffish
+          # TODO: all the `with_*` and `expect_*` methods from Cheffish
           # automatically converge the block - we don't want to do that,
           # we want to let the `destroy_an*` matcher do that
-          r = recipe {
+          r = recipe do
             aws_ebs_volume "test_volume" do
               action :destroy
             end
-          }
-          expect(r).to destroy_an_aws_ebs_volume('test_volume'
-          ).and be_idempotent
+          end
+          expect(r).to destroy_an_aws_ebs_volume("test_volume").and be_idempotent
         end
       end
 
       it "aws_ebs_volume 'test_volume_az' creates an ebs volume when provided proper full AZ" do
-        expect_recipe {
+        expect_recipe do
           aws_ebs_volume "test_volume_az" do
             availability_zone "#{driver.region}a"
           end
-        }.to create_an_aws_ebs_volume('test_volume_az')
-         .and be_idempotent
+        end.to create_an_aws_ebs_volume("test_volume_az")
+          .and be_idempotent
       end
 
       # These tests are testing the tagging functionality - they use some example resources rather
       # because these are integration tests so we cannot make a mock resource.
       it "aws_ebs_volume 'test_volume' created with default Name tag" do
-        expect_recipe {
+        expect_recipe do
           aws_ebs_volume "test_volume"
-        }.to create_an_aws_ebs_volume('test_volume'
-        ).and have_aws_ebs_volume_tags('test_volume',
-                       { 'Name' => 'test_volume' }
-        ).and be_idempotent
+        end.to create_an_aws_ebs_volume("test_volume").and have_aws_ebs_volume_tags("test_volume",
+                                                                                    "Name" => "test_volume").and be_idempotent
       end
 
       it "allows users to specify a unique Name tag" do
-        expect_recipe {
+        expect_recipe do
           aws_ebs_volume "test_volume_2" do
-            aws_tags :Name => 'test_volume_new'
+            aws_tags Name: "test_volume_new"
           end
-        }.to create_an_aws_ebs_volume('test_volume_2'
-        ).and have_aws_ebs_volume_tags('test_volume_2',
-                                      { 'Name' => 'test_volume_new' }
-        ).and be_idempotent
+        end.to create_an_aws_ebs_volume("test_volume_2").and have_aws_ebs_volume_tags("test_volume_2",
+                                                                                      "Name" => "test_volume_new").and be_idempotent
       end
 
       it "allows tags to be specified as strings or symbols" do
-        expect_recipe {
+        expect_recipe do
           aws_ebs_volume "test_volume" do
-            aws_tags({
+            aws_tags(
               :key1 => :symbol,
-              'key2' => :symbol,
-              :key3 => 'string',
-              'key4' => 'string'
-            })
+              "key2" => :symbol,
+              :key3 => "string",
+              "key4" => "string"
+            )
           end
-        }.to create_an_aws_ebs_volume('test_volume'
-        ).and have_aws_ebs_volume_tags('test_volume',
-                       {
-                         'key1' => 'symbol',
-                         'key2' => 'symbol',
-                         'key3' => 'string',
-                         'key4' => 'string'
-                       }
-        ).and be_idempotent
+        end.to create_an_aws_ebs_volume("test_volume").and have_aws_ebs_volume_tags("test_volume",
+                                                                                    "key1" => "symbol",
+                                                                                    "key2" => "symbol",
+                                                                                    "key3" => "string",
+                                                                                    "key4" => "string").and be_idempotent
       end
 
       context "when there are existing tags" do
         before(:each) do
-          converge {
+          converge do
             aws_ebs_volume "test_volume_a" do
-              aws_tags :byebye => 'true'
+              aws_tags byebye: "true"
             end
-          }
+          end
         end
 
         after(:each) do
-          converge {
+          converge do
             aws_ebs_volume "test_volume_a" do
               action :purge
             end
-          }
+          end
         end
 
         it "updates the tags" do
-          expect_recipe {
+          expect_recipe do
             aws_ebs_volume "test_volume_a" do
-              aws_tags 'Name' => 'test_volume_b', :project => 'X'
+              aws_tags "Name" => "test_volume_b", :project => "X"
             end
-          }.to have_aws_ebs_volume_tags('test_volume_a',
-                                        {
-                                          'Name' => 'test_volume_b',
-                                          'project' => 'X'
-                                        }
-          ).and be_idempotent
+          end.to have_aws_ebs_volume_tags("test_volume_a",
+                                          "Name" => "test_volume_b",
+                                          "project" => "X").and be_idempotent
         end
 
         it "deletes the tags" do
-          expect_recipe {
+          expect_recipe do
             aws_ebs_volume "test_volume_a" do
               aws_tags({})
             end
-          }.to have_aws_ebs_volume_tags('test_volume_a',
-                                        {
-                                          'Name' => 'test_volume_a',
-                                        }
-          ).and be_idempotent
+          end.to have_aws_ebs_volume_tags("test_volume_a",
+                                          "Name" => "test_volume_a").and be_idempotent
         end
 
         it "aws_ebs_volume 'test_volume' tags are not changed when not updated" do
-          expect_recipe {
-            #aws_ebs_volume "test_volume_a"
-          }.to have_aws_ebs_volume_tags('test_volume_a',
-                                        {
-                                          'Name' => 'test_volume_a',
-                                          'byebye' => 'true'
-                                        }
-          )
+          expect_recipe do
+            # aws_ebs_volume "test_volume_a"
+          end.to have_aws_ebs_volume_tags("test_volume_a",
+                                          "Name" => "test_volume_a",
+                                          "byebye" => "true")
         end
       end
-
     end
   end
 end

data/spec/integration/aws_eip_address_spec.rb

@@ -1,61 +1,56 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Chef::Resource::AwsEipAddress 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
-
       it "aws_eip_address 'test_eip' creates an elastic ip" do
-        expect_recipe {
+        expect_recipe do
           aws_eip_address "test_eip"
-        }.to create_an_aws_eip_address('test_eip',
-        ).and be_idempotent
+        end.to create_an_aws_eip_address("test_eip").and be_idempotent
       end
 
       it "raises an error trying to reference an eip that does not exist" do
-        r = recipe {
+        r = recipe do
           aws_eip_address "0.0.0.0"
-        }
-        expect {r.converge}.to raise_error(/Chef::Resource::AwsEipAddress\[0.0.0.0\] does not exist!/)
+        end
+        expect { r.converge }.to raise_error(/Chef::Resource::AwsEipAddress\[0.0.0.0\] does not exist!/)
       end
 
       context "with an existing aws_eip_address" do
         aws_eip_address "test_eip"
 
         it "can reference the ip address by id in the name field" do
-          expect_recipe {
+          expect_recipe do
             aws_eip_address test_eip.aws_object.public_ip
-          }.to match_an_aws_eip_address(test_eip.aws_object.public_ip,
-            public_ip: test_eip.aws_object.public_ip
-          ).and be_idempotent
+          end.to match_an_aws_eip_address(test_eip.aws_object.public_ip,
+                                          public_ip: test_eip.aws_object.public_ip).and be_idempotent
         end
 
         it "can reference the ip address in the public_ip field" do
-          expect_recipe {
+          expect_recipe do
             aws_eip_address "random_identifier" do
               public_ip test_eip.aws_object.public_ip
             end
-          }.to match_an_aws_eip_address("random_identifier",
-            public_ip: test_eip.aws_object.public_ip
-          ).and be_idempotent
+          end.to match_an_aws_eip_address("random_identifier",
+                                          public_ip: test_eip.aws_object.public_ip).and be_idempotent
         end
       end
 
-      describe 'action :delete' do
+      describe "action :delete" do
         aws_eip_address "test_eip"
 
         it "deletes the elastic ip" do
-          # TODO all the `with_*` and `expect_*` methods from Cheffish
+          # TODO: all the `with_*` and `expect_*` methods from Cheffish
           # automatically converge the block - we don't want to do that,
           # we want to let the `destroy_an*` matcher do that
-          r = recipe {
+          r = recipe do
             aws_eip_address "test_eip" do
               action :destroy
             end
-          }
-          expect(r).to destroy_an_aws_eip_address('test_eip'
-          ).and be_idempotent
+          end
+          expect(r).to destroy_an_aws_eip_address("test_eip").and be_idempotent
         end
       end
 
@@ -63,25 +58,23 @@ describe Chef::Resource::AwsEipAddress do
         purge_all
         setup_public_vpc
 
-        machine 'test_machine' do
+        machine "test_machine" do
           machine_options bootstrap_options: {
-            subnet_id: 'test_public_subnet',
-            key_name: 'test_key_pair'
+            subnet_id: "test_public_subnet",
+            key_name: "test_key_pair"
           }
           action :ready # The box has to be online for AWS to accept it as routable
         end
 
         it "associates an EIP with a machine" do
-          expect_recipe {
+          expect_recipe do
             aws_eip_address "test_eip" do
               associate_to_vpc true
               machine "test_machine"
             end
-          }.to create_an_aws_eip_address('test_eip',
-            instance_id: test_machine.aws_object.id
-          ).and be_idempotent
+          end.to create_an_aws_eip_address("test_eip",
+                                           instance_id: test_machine.aws_object.id).and be_idempotent
         end
-
       end
     end
   end

data/spec/integration/aws_elasticsearch_domain_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 def policy(user)
   <<EOF
@@ -41,44 +41,43 @@ describe Chef::Resource::AwsElasticsearchDomain do
   extend AWSSupport
 
   let(:all_options_result) do
-    {created: true,
-     elasticsearch_cluster_config: {
-       instance_type: "m4.large.elasticsearch",
-       instance_count: 2,
-       dedicated_master_enabled: true,
-       dedicated_master_type: "m4.large.elasticsearch",
-       zone_awareness_enabled: true
-     },
-     ebs_options: {
-       ebs_enabled: true,
-       volume_size: 35,
-       volume_type: "io1",
-       iops: 1000
-     },
-     snapshot_options: {
-       automated_snapshot_start_hour: 2
-     }
-    }
+    { created: true,
+      elasticsearch_cluster_config: {
+        instance_type: "m4.large.elasticsearch",
+        instance_count: 2,
+        dedicated_master_enabled: true,
+        dedicated_master_type: "m4.large.elasticsearch",
+        zone_awareness_enabled: true
+      },
+      ebs_options: {
+        ebs_enabled: true,
+        volume_size: 35,
+        volume_type: "io1",
+        iops: 1000
+      },
+      snapshot_options: {
+        automated_snapshot_start_hour: 2
+      } }
   end
 
   when_the_chef_12_server "exists", organization: "foo", server_scope: :context do
     with_aws "when connected to AWS" do
-      time = DateTime.now.strftime('%Q')
+      time = DateTime.now.strftime("%Q")
 
       it "returns nil when aws_object is called for something that does not exist" do
         r = nil
-        converge {
+        converge do
           r = aws_elasticsearch_domain "wont-exist" do
             action :nothing
           end
-        }
+        end
         expect(r.aws_object).to eq(nil)
       end
 
       it "aws_elasticsearch_domain 'test-#{time}' creates a elasticsearch domain" do
-        expect_recipe {
+        expect_recipe do
           all_options_domain("test-#{time}")
-        }.to create_an_aws_elasticsearch_domain("test-#{time}", all_options_result).and be_idempotent
+        end.to create_an_aws_elasticsearch_domain("test-#{time}", all_options_result).and be_idempotent
       end
 
       context "with an existing elasticsearch domain" do
@@ -88,32 +87,31 @@ describe Chef::Resource::AwsElasticsearchDomain do
         end
 
         it "can update all options" do
-          expect_recipe {
+          expect_recipe do
             all_options_domain("test-#{time}-2")
-          }.to update_an_aws_elasticsearch_domain("test-#{time}-2", all_options_result)
+          end.to update_an_aws_elasticsearch_domain("test-#{time}-2", all_options_result)
         end
 
         it "updates the aws_tags" do
-          expect_recipe {
+          expect_recipe do
             all_options_domain("test-#{time}-2")
-          }.to have_aws_elasticsearch_domain_tags("test-#{time}-2", {'key1' => 'value'})
+          end.to have_aws_elasticsearch_domain_tags("test-#{time}-2", "key1" => "value")
         end
 
         it "removes all aws_elasticsearch_domain tags" do
-          expect_recipe {
+          expect_recipe do
             aws_elasticsearch_domain "test-#{time}-2" do
               aws_tags({})
             end
-          }.to have_aws_elasticsearch_domain_tags("test-#{time}-2", {}).and be_idempotent
+          end.to have_aws_elasticsearch_domain_tags("test-#{time}-2", {}).and be_idempotent
         end
 
-
         it "destroys an elasticsearch domain" do
-          r = recipe {
+          r = recipe do
             aws_elasticsearch_domain "test-#{time}-2" do
               action :destroy
             end
-          }
+          end
           expect(r).to destroy_an_aws_elasticsearch_domain("test-#{time}-2")
         end
       end