chef-provisioning-aws 3.0.4 → 3.0.6

data/spec/integration/aws_key_pair_spec.rb

@@ -1,21 +1,21 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Chef::Resource::AwsKeyPair 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
       before :each do
-        driver.ec2.delete_key_pair({key_name: 'test_key_pair'})
+        driver.ec2.delete_key_pair(key_name: "test_key_pair")
       end
 
       it "aws_key_pair 'test_key_pair' creates a key pair" do
-        expect(recipe {
-          aws_key_pair 'test_key_pair' do
+        expect(recipe do
+          aws_key_pair "test_key_pair" do
             private_key_options format: :pem, type: :rsa, regenerate_if_different: true
             allow_overwrite true
           end
-        }).to create_an_aws_key_pair('test_key_pair').and be_idempotent
+        end).to create_an_aws_key_pair("test_key_pair").and be_idempotent
       end
     end
   end

data/spec/integration/aws_launch_configuration_spec.rb

@@ -1,11 +1,11 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Chef::Resource::AwsLaunchConfiguration 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
-      let(:image_filters) {
+      let(:image_filters) do
         {
           filters: [
             {
@@ -26,44 +26,43 @@ describe Chef::Resource::AwsLaunchConfiguration do
             }
           ]
         }
-      }
+      end
 
       it "creates a minimum aws_launch_configuration" do
-        expect_recipe {
+        expect_recipe do
           ami = driver.ec2_client.describe_images(image_filters).images[0].image_id
           aws_launch_configuration "my-launch-configuration" do
             image ami
-            instance_type 't2.micro'
+            instance_type "t2.micro"
           end
-        }.to create_an_aws_launch_configuration("my-launch-configuration").and be_idempotent
+        end.to create_an_aws_launch_configuration("my-launch-configuration").and be_idempotent
       end
 
       it "accepts base64 encoded user data" do
-        expect_recipe {
+        expect_recipe do
           ami = driver.ec2_client.describe_images(image_filters).images[0].image_id
           aws_launch_configuration "my-launch-configuration" do
             image ami
-            instance_type 't2.micro'
-            options({
+            instance_type "t2.micro"
+            options(
               user_data: Base64.encode64("echo 1")
-            })
+            )
           end
-        }.to create_an_aws_launch_configuration("my-launch-configuration").and be_idempotent
+        end.to create_an_aws_launch_configuration("my-launch-configuration").and be_idempotent
       end
 
       it "accepts regular user data" do
-        expect_recipe {
+        expect_recipe do
           ami = driver.ec2_client.describe_images(image_filters).images[0].image_id
           aws_launch_configuration "my-launch-configuration" do
             image ami
-            instance_type 't2.micro'
-            options({
+            instance_type "t2.micro"
+            options(
               user_data: "echo 1"
-            })
+            )
           end
-        }.to create_an_aws_launch_configuration("my-launch-configuration").and be_idempotent
+        end.to create_an_aws_launch_configuration("my-launch-configuration").and be_idempotent
       end
-
     end
   end
 end

data/spec/integration/aws_nat_gateway_spec.rb

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

data/spec/integration/aws_network_acl_spec.rb

@@ -1,166 +1,152 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Chef::Resource::AwsNetworkAcl 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" do
       aws_vpc "test_vpc" do
-        cidr_block '10.0.0.0/24'
+        cidr_block "10.0.0.0/24"
         internet_gateway true
       end
 
       it "aws_network_acl 'test_network_acl' with no parameters except VPC creates a network acl" do
-        expect_recipe {
-          aws_network_acl 'test_network_acl' do
-            vpc 'test_vpc'
+        expect_recipe do
+          aws_network_acl "test_network_acl" do
+            vpc "test_vpc"
           end
-        }.to create_an_aws_network_acl('test_network_acl',
-          vpc_id: test_vpc.aws_object.id,
-        ).and be_idempotent
+        end.to create_an_aws_network_acl("test_network_acl",
+                                         vpc_id: test_vpc.aws_object.id).and be_idempotent
       end
 
       it "aws_network_acl 'test_network_acl' with all parameters creates a network acl" do
-        expect_recipe {
-          aws_network_acl 'test_network_acl' do
-            vpc 'test_vpc'
+        expect_recipe do
+          aws_network_acl "test_network_acl" do
+            vpc "test_vpc"
             inbound_rules(
               [
-                { rule_number: 100, rule_action: :deny, protocol: "-1", cidr_block: '10.0.0.0/24' },
-                { rule_number: 200, rule_action: :allow, protocol: "-1", cidr_block: '0.0.0.0/0' },
+                { rule_number: 100, rule_action: :deny, protocol: "-1", cidr_block: "10.0.0.0/24" },
+                { rule_number: 200, rule_action: :allow, protocol: "-1", cidr_block: "0.0.0.0/0" },
                 { rule_number: 300,
                   rule_action: :allow,
                   protocol: "6",
                   port_range:
                     {
-                      :from => 22,
-                      :to => 23
+                      from: 22,
+                      to: 23
                     },
-                  cidr_block: '172.31.0.0/22' }
+                  cidr_block: "172.31.0.0/22" }
               ]
             )
             outbound_rules(
               [
-                { rule_number: 500, rule_action: :allow, protocol: "-1", cidr_block: '0.0.0.0/0' }
+                { rule_number: 500, rule_action: :allow, protocol: "-1", cidr_block: "0.0.0.0/0" }
               ]
             )
           end
-        }.to create_an_aws_network_acl('test_network_acl',
-          vpc_id: test_vpc.aws_object.id,
-          entries:
-            [
-              { :rule_number=>500, :protocol=>"-1", :rule_action=>"allow", :egress=>true, :cidr_block=>"0.0.0.0/0" },
-              { :rule_number=>32767, :protocol=>"-1", :rule_action=>"deny", :egress=>true, :cidr_block=>"0.0.0.0/0" },
-              { :rule_number=>100, :protocol=>"-1", :rule_action=>"deny", :egress=>false, :cidr_block=>"10.0.0.0/24" },
-              { :rule_number=>200, :protocol=>"-1", :rule_action=>"allow", :egress=>false, :cidr_block=>"0.0.0.0/0" },
-              { :rule_number=>300, :protocol=>"6", :rule_action=>"allow", :egress=>false, :cidr_block=>"172.31.0.0/22", :port_range=>{ :from=>22, :to=>23 } },
-              { :rule_number=>32767, :protocol=>"-1", :rule_action=>"deny", :egress=>false, :cidr_block=>"0.0.0.0/0" }
-            ]
-        ).and be_idempotent
+        end.to create_an_aws_network_acl("test_network_acl",
+                                         vpc_id: test_vpc.aws_object.id,
+                                         entries:
+                                           [
+                                             { rule_number: 500, protocol: "-1", rule_action: "allow", egress: true, cidr_block: "0.0.0.0/0" },
+                                             { rule_number: 32_767, protocol: "-1", rule_action: "deny", egress: true, cidr_block: "0.0.0.0/0" },
+                                             { rule_number: 100, protocol: "-1", rule_action: "deny", egress: false, cidr_block: "10.0.0.0/24" },
+                                             { rule_number: 200, protocol: "-1", rule_action: "allow", egress: false, cidr_block: "0.0.0.0/0" },
+                                             { rule_number: 300, protocol: "6", rule_action: "allow", egress: false, cidr_block: "172.31.0.0/22", port_range: { from: 22, to: 23 } },
+                                             { rule_number: 32_767, protocol: "-1", rule_action: "deny", egress: false, cidr_block: "0.0.0.0/0" }
+                                           ]).and be_idempotent
       end
 
-      context 'when rules are empty' do
-        aws_network_acl 'test_network_acl' do
-          vpc 'test_vpc'
-          inbound_rules(rule_number: 100, rule_action: :deny, protocol: "-1", cidr_block: '10.0.0.0/24')
-          outbound_rules(rule_number: 500, rule_action: :allow, protocol: "-1", cidr_block: '0.0.0.0/0')
+      context "when rules are empty" do
+        aws_network_acl "test_network_acl" do
+          vpc "test_vpc"
+          inbound_rules(rule_number: 100, rule_action: :deny, protocol: "-1", cidr_block: "10.0.0.0/24")
+          outbound_rules(rule_number: 500, rule_action: :allow, protocol: "-1", cidr_block: "0.0.0.0/0")
         end
 
         it "aws_network_acl 'test_network_acl' removes current rules" do
-          expect_recipe {
-            aws_network_acl 'test_network_acl' do
-              vpc 'test_vpc'
+          expect_recipe do
+            aws_network_acl "test_network_acl" do
+              vpc "test_vpc"
               inbound_rules []
               outbound_rules []
             end
-          }.to create_an_aws_network_acl('test_network_acl',
-            vpc_id: test_vpc.aws_object.id,
-            entries:
-              [
-                { :rule_number=>32767, :protocol=>"-1", :rule_action=>"deny", :egress=>true, :cidr_block=>"0.0.0.0/0" },
-                { :rule_number=>32767, :protocol=>"-1", :rule_action=>"deny", :egress=>false, :cidr_block=>"0.0.0.0/0" }
-              ]
-          ).and be_idempotent
+          end.to create_an_aws_network_acl("test_network_acl",
+                                           vpc_id: test_vpc.aws_object.id,
+                                           entries:
+                                             [
+                                               { rule_number: 32_767, protocol: "-1", rule_action: "deny", egress: true, cidr_block: "0.0.0.0/0" },
+                                               { rule_number: 32_767, protocol: "-1", rule_action: "deny", egress: false, cidr_block: "0.0.0.0/0" }
+                                             ]).and be_idempotent
         end
       end
 
-      context 'when rules are nil' do
-        aws_network_acl 'test_network_acl' do
-          vpc 'test_vpc'
-          inbound_rules(rule_number: 100, rule_action: :deny, protocol: "-1", cidr_block: '10.0.0.0/24')
-          outbound_rules(rule_number: 500, rule_action: :allow, protocol: "-1", cidr_block: '0.0.0.0/0')
+      context "when rules are nil" do
+        aws_network_acl "test_network_acl" do
+          vpc "test_vpc"
+          inbound_rules(rule_number: 100, rule_action: :deny, protocol: "-1", cidr_block: "10.0.0.0/24")
+          outbound_rules(rule_number: 500, rule_action: :allow, protocol: "-1", cidr_block: "0.0.0.0/0")
         end
 
         it "aws_network_acl 'test_network_acl' with a nil rules array leaves current rules alone" do
-          expect_recipe {
-            aws_network_acl 'test_network_acl' do
-              vpc 'test_vpc'
+          expect_recipe do
+            aws_network_acl "test_network_acl" do
+              vpc "test_vpc"
               inbound_rules nil
               outbound_rules nil
             end
-          }.to match_an_aws_network_acl('test_network_acl',
-            vpc_id: test_vpc.aws_object.id,
-            entries:
-              [
-                { :rule_number=>500, :protocol=>"-1", :rule_action=>"allow", :egress=>true, :cidr_block=>"0.0.0.0/0" },
-                { :rule_number=>32767, :protocol=>"-1", :rule_action=>"deny", :egress=>true, :cidr_block=>"0.0.0.0/0" },
-                { :rule_number=>100, :protocol=>"-1", :rule_action=>"deny", :egress=>false, :cidr_block=>"10.0.0.0/24" },
-                { :rule_number=>32767, :protocol=>"-1", :rule_action=>"deny", :egress=>false, :cidr_block=>"0.0.0.0/0" }
-              ]
-          ).and be_idempotent
+          end.to match_an_aws_network_acl("test_network_acl",
+                                          vpc_id: test_vpc.aws_object.id,
+                                          entries:
+                                            [
+                                              { rule_number: 500, protocol: "-1", rule_action: "allow", egress: true, cidr_block: "0.0.0.0/0" },
+                                              { rule_number: 32_767, protocol: "-1", rule_action: "deny", egress: true, cidr_block: "0.0.0.0/0" },
+                                              { rule_number: 100, protocol: "-1", rule_action: "deny", egress: false, cidr_block: "10.0.0.0/24" },
+                                              { rule_number: 32_767, protocol: "-1", rule_action: "deny", egress: false, cidr_block: "0.0.0.0/0" }
+                                            ]).and be_idempotent
         end
       end
 
       it "creates aws_network_acl tags" do
-        expect_recipe {
-          aws_network_acl 'test_network_acl' do
-            vpc 'test_vpc'
+        expect_recipe do
+          aws_network_acl "test_network_acl" do
+            vpc "test_vpc"
             aws_tags key1: "value"
           end
-        }.to create_an_aws_network_acl('test_network_acl')
-        .and have_aws_network_acl_tags('test_network_acl',
-          {
-            'Name' => 'test_network_acl',
-            'key1' => 'value'
-          }
-        ).and be_idempotent
+        end.to create_an_aws_network_acl("test_network_acl")
+          .and have_aws_network_acl_tags("test_network_acl",
+                                         "Name" => "test_network_acl",
+                                         "key1" => "value").and be_idempotent
       end
 
       context "with existing tags" do
-        aws_network_acl 'test_network_acl' do
-          vpc 'test_vpc'
+        aws_network_acl "test_network_acl" do
+          vpc "test_vpc"
           aws_tags key1: "value"
         end
 
         it "updates aws_network_acl tags" do
-          expect_recipe {
-            aws_network_acl 'test_network_acl' do
-              vpc 'test_vpc'
+          expect_recipe do
+            aws_network_acl "test_network_acl" do
+              vpc "test_vpc"
               aws_tags key1: "value2", key2: nil
             end
-          }.to have_aws_network_acl_tags('test_network_acl',
-            {
-              'Name' => 'test_network_acl',
-              'key1' => 'value2',
-              'key2' => ''
-            }
-          ).and be_idempotent
+          end.to have_aws_network_acl_tags("test_network_acl",
+                                           "Name" => "test_network_acl",
+                                           "key1" => "value2",
+                                           "key2" => "").and be_idempotent
         end
 
         it "removes all aws_network_acl tags except Name" do
-          expect_recipe {
-            aws_network_acl 'test_network_acl' do
-              vpc 'test_vpc'
+          expect_recipe do
+            aws_network_acl "test_network_acl" do
+              vpc "test_vpc"
               aws_tags({})
             end
-          }.to have_aws_network_acl_tags('test_network_acl',
-            {
-              'Name' => 'test_network_acl'
-            }
-          ).and be_idempotent
+          end.to have_aws_network_acl_tags("test_network_acl",
+                                           "Name" => "test_network_acl").and be_idempotent
         end
       end
-
     end
   end
 end

data/spec/integration/aws_network_interface_spec.rb

@@ -1,94 +1,79 @@
 describe "AwsNetworkInterface" 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 "setting up public VPC" do
-
         purge_all
         setup_public_vpc
 
         context "with machines", :super_slow do
-
           machine "test_machine" do
             machine_options bootstrap_options: {
-              subnet_id: 'test_public_subnet',
-              security_group_ids: ['test_security_group']
+              subnet_id: "test_public_subnet",
+              security_group_ids: ["test_security_group"]
             }
             action :ready
           end
 
           it "creates an aws_network_interface resource with maximum attributes" do
-            expect_recipe {
+            expect_recipe do
               sub_id = test_public_subnet.aws_object.id
               sg_id = test_security_group.aws_object.id
               machine_id = test_machine.aws_object.id
-              aws_network_interface 'test_network_interface' do
+              aws_network_interface "test_network_interface" do
                 subnet sub_id
-                private_ip_address '10.0.0.25'
+                private_ip_address "10.0.0.25"
                 description "test_network_interface"
                 security_groups [sg_id]
                 machine machine_id
                 device_index 1
               end
-            }.to create_an_aws_network_interface('test_network_interface'
-            ).and be_idempotent
+            end.to create_an_aws_network_interface("test_network_interface").and be_idempotent
           end
         end
 
         it "creates aws_network_interface tags" do
-          expect_recipe {
-            aws_network_interface 'test_network_interface' do
-              subnet 'test_public_subnet'
+          expect_recipe do
+            aws_network_interface "test_network_interface" do
+              subnet "test_public_subnet"
               aws_tags key1: "value"
             end
-          }.to create_an_aws_network_interface('test_network_interface')
-          .and have_aws_network_interface_tags('test_network_interface',
-            {
-              'Name' => 'test_network_interface',
-              'key1' => 'value'
-            }
-          ).and be_idempotent
+          end.to create_an_aws_network_interface("test_network_interface")
+            .and have_aws_network_interface_tags("test_network_interface",
+                                                 "Name" => "test_network_interface",
+                                                 "key1" => "value").and be_idempotent
         end
 
         context "with existing tags" do
-          aws_network_interface 'test_network_interface' do
-            subnet 'test_public_subnet'
+          aws_network_interface "test_network_interface" do
+            subnet "test_public_subnet"
             aws_tags key1: "value"
           end
 
           it "updates aws_network_interface tags" do
-            expect_recipe {
-              aws_network_interface 'test_network_interface' do
-                subnet 'test_public_subnet'
+            expect_recipe do
+              aws_network_interface "test_network_interface" do
+                subnet "test_public_subnet"
                 aws_tags key1: "value2", key2: nil
               end
-            }.to have_aws_network_interface_tags('test_network_interface',
-              {
-                'Name' => 'test_network_interface',
-                'key1' => 'value2',
-                'key2' => ''
-              }
-            ).and be_idempotent
+            end.to have_aws_network_interface_tags("test_network_interface",
+                                                   "Name" => "test_network_interface",
+                                                   "key1" => "value2",
+                                                   "key2" => "").and be_idempotent
           end
 
           it "removes all aws_network_interface tags except Name" do
-            expect_recipe {
-              aws_network_interface 'test_network_interface' do
-                subnet 'test_public_subnet'
+            expect_recipe do
+              aws_network_interface "test_network_interface" do
+                subnet "test_public_subnet"
                 aws_tags({})
               end
-            }.to have_aws_network_interface_tags('test_network_interface',
-              {
-                'Name' => 'test_network_interface'
-              }
-            ).and be_idempotent
+            end.to have_aws_network_interface_tags("test_network_interface",
+                                                   "Name" => "test_network_interface").and be_idempotent
           end
         end
-
       end
-
     end
   end
 end