chef-provisioning-aws 3.0.4 → 3.0.6

data/spec/integration/aws_cache_cluster_spec.rb

@@ -1,71 +1,70 @@
-require 'spec_helper'
-
-describe Chef::Resource::AwsCacheCluster, :super_slow do
-  extend AWSSupport
-
-  when_the_chef_12_server "exists", organization: 'foo', server_scope: :context do
-    with_aws "with a VPC, subnet, subnet_group and security_group" do
-      after(:context) do
-        # Cache Cluster takes around 7 minutes to get deleted
-        # and all the dependent resources can be deleted after that only.
-        # Hence waiting for 8 minutes.
-        sleep(480)
-        converge {
-          aws_cache_subnet_group 'test-subnet-group' do
-            action :destroy
-          end
-
-          aws_vpc "test_vpc" do
-            action :purge
-          end
-        }
-      end
-
-      it "aws_cache_cluster 'TestRedisCluster' creates a cache cluster" do
-        converge {
-          aws_vpc "test_vpc" do
-            cidr_block '10.0.0.0/24'
-            internet_gateway true
-          end
-
-          aws_subnet "test_subnet" do
-            vpc 'test_vpc'
-            cidr_block "10.0.0.0/24"
-          end
-
-          aws_cache_subnet_group 'test-subnet-group' do
-            description 'Test Subnet Group'
-            subnets [ 'test_subnet' ]
-          end
-
-          aws_security_group 'test_sg' do
-            vpc 'test_vpc'
-          end
-        }
-
-        expect_recipe {
-          aws_cache_cluster 'TestRedisCluster' do
-            az_mode 'single-az'
-            engine 'redis'
-            engine_version '3.2.6'
-            node_type 'cache.t2.micro'
-            number_nodes 1
-            security_groups 'test_sg'
-            subnet_group_name 'test-subnet-group'
-          end
-        }.to create_an_aws_cache_cluster('TestRedisCluster',
-          cache_cluster_id: "testrediscluster",
-          cache_node_type: "cache.t2.micro",
-          engine: "redis",
-          engine_version: "3.2.6",
-          num_cache_nodes: 1,
-          pending_modified_values: {},
-          cache_security_groups: [],
-          cache_parameter_group:
-            {cache_parameter_group_name: "default.redis3.2", parameter_apply_status: "in-sync", cache_node_ids_to_reboot: []},
-          cache_subnet_group_name: "test-subnet-group"
-          ).and be_idempotent
-      end
-    end
-  end
-end
+require "spec_helper"
+
+describe Chef::Resource::AwsCacheCluster, :super_slow do
+  extend AWSSupport
+
+  when_the_chef_12_server "exists", organization: "foo", server_scope: :context do
+    with_aws "with a VPC, subnet, subnet_group and security_group" do
+      after(:context) do
+        # Cache Cluster takes around 7 minutes to get deleted
+        # and all the dependent resources can be deleted after that only.
+        # Hence waiting for 8 minutes.
+        sleep(480)
+        converge do
+          aws_cache_subnet_group "test-subnet-group" do
+            action :destroy
+          end
+
+          aws_vpc "test_vpc" do
+            action :purge
+          end
+        end
+      end
+
+      it "aws_cache_cluster 'TestRedisCluster' creates a cache cluster" do
+        converge do
+          aws_vpc "test_vpc" do
+            cidr_block "10.0.0.0/24"
+            internet_gateway true
+          end
+
+          aws_subnet "test_subnet" do
+            vpc "test_vpc"
+            cidr_block "10.0.0.0/24"
+          end
+
+          aws_cache_subnet_group "test-subnet-group" do
+            description "Test Subnet Group"
+            subnets ["test_subnet"]
+          end
+
+          aws_security_group "test_sg" do
+            vpc "test_vpc"
+          end
+        end
+
+        expect_recipe do
+          aws_cache_cluster "TestRedisCluster" do
+            az_mode "single-az"
+            engine "redis"
+            engine_version "3.2.6"
+            node_type "cache.t2.micro"
+            number_nodes 1
+            security_groups "test_sg"
+            subnet_group_name "test-subnet-group"
+          end
+        end.to create_an_aws_cache_cluster("TestRedisCluster",
+                                           cache_cluster_id: "testrediscluster",
+                                           cache_node_type: "cache.t2.micro",
+                                           engine: "redis",
+                                           engine_version: "3.2.6",
+                                           num_cache_nodes: 1,
+                                           pending_modified_values: {},
+                                           cache_security_groups: [],
+                                           cache_parameter_group:
+                                             { cache_parameter_group_name: "default.redis3.2", parameter_apply_status: "in-sync", cache_node_ids_to_reboot: [] },
+                                           cache_subnet_group_name: "test-subnet-group").and be_idempotent
+      end
+    end
+  end
+end

data/spec/integration/aws_cache_subnet_group_spec.rb

@@ -1,32 +1,31 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Chef::Resource::AwsCacheSubnetGroup 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
       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/24"
       end
 
       it "aws_cache_subnet_group 'test-subnet-group' creates a cache subnet group" do
-        expect_recipe {
-          aws_cache_subnet_group 'test-subnet-group' do
-            description 'Test Subnet Group'
-            subnets [ 'test_subnet' ]
+        expect_recipe do
+          aws_cache_subnet_group "test-subnet-group" do
+            description "Test Subnet Group"
+            subnets ["test_subnet"]
           end
-        }.to create_an_aws_cache_subnet_group('test-subnet-group',
-          vpc_id: test_vpc.aws_object.id,
-          subnets: [
-            { subnet_identifier: test_subnet.aws_object.id }
-          ]
-        ).and be_idempotent
+        end.to create_an_aws_cache_subnet_group("test-subnet-group",
+                                                vpc_id: test_vpc.aws_object.id,
+                                                subnets: [
+                                                  { subnet_identifier: test_subnet.aws_object.id }
+                                                ]).and be_idempotent
       end
     end
   end

data/spec/integration/aws_cloudsearch_domain_spec.rb

@@ -1,31 +1,29 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Chef::Resource::AwsCloudsearchDomain do
   extend AWSSupport
   when_the_chef_12_server "exists", organization: "foo", server_scope: :context do
     with_aws "when connected to AWS" do
-
       # Cloudsearch can take forevvvver to delete so we need to randomize our names
-      time = DateTime.now.strftime('%Q')
+      time = DateTime.now.strftime("%Q")
 
       it "aws_cloudsearch_domain 'test-#{time}' creates a cloudsearch domain" do
-        expect_recipe {
+        expect_recipe do
           aws_cloudsearch_domain "test-#{time}" do
             multi_az false
           end
-        }.to create_an_aws_cloudsearch_domain("test-#{time}", {}).and be_idempotent
+        end.to create_an_aws_cloudsearch_domain("test-#{time}", {}).and be_idempotent
       end
 
       it "returns nil when aws_object is called for something that does not exist" do
         r = nil
-        converge {
+        converge do
           r = aws_cloudsearch_domain "wont-exist" do
             action :nothing
           end
-        }
+        end
         expect(r.aws_object).to eq(nil)
       end
-
     end
   end
 end

data/spec/integration/aws_cloudwatch_alarm_spec.rb

@@ -1,286 +1,278 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Chef::Resource::AwsCloudwatchAlarm do
   extend AWSSupport
 
-  when_the_chef_12_server 'exists', organization: 'foo', server_scope: :context do
-    with_aws 'When connected to AWS' do
-
-      aws_sns_topic 'mytesttopic1'
-      aws_sns_topic 'mytesttopic2'
+  when_the_chef_12_server "exists", organization: "foo", server_scope: :context do
+    with_aws "When connected to AWS" do
+      aws_sns_topic "mytesttopic1"
+      aws_sns_topic "mytesttopic2"
 
       it "creates an aws_cloudwatch_alarm with minimum properties" do
-        expect_recipe {
-          aws_cloudwatch_alarm 'my-test-alert' do
-            namespace 'AWS/EC2'
-            metric_name 'CPUUtilization'
-            comparison_operator 'GreaterThanThreshold'
+        expect_recipe do
+          aws_cloudwatch_alarm "my-test-alert" do
+            namespace "AWS/EC2"
+            metric_name "CPUUtilization"
+            comparison_operator "GreaterThanThreshold"
             evaluation_periods 1
             period 60
-            statistic 'Average'
+            statistic "Average"
             threshold 80
           end
-        }.to create_an_aws_cloudwatch_alarm('my-test-alert',
-          namespace: 'AWS/EC2',
-          metric_name: 'CPUUtilization',
-          comparison_operator: 'GreaterThanThreshold',
-          evaluation_periods: 1,
-          period: 60,
-          statistic: 'Average',
-          threshold: 80,
-          actions_enabled: true # this is true by default
-        ).and be_idempotent
+        end.to create_an_aws_cloudwatch_alarm("my-test-alert",
+                                              namespace: "AWS/EC2",
+                                              metric_name: "CPUUtilization",
+                                              comparison_operator: "GreaterThanThreshold",
+                                              evaluation_periods: 1,
+                                              period: 60,
+                                              statistic: "Average",
+                                              threshold: 80,
+                                              actions_enabled: true # this is true by default
+                                             ).and be_idempotent
       end
 
       it "creates an aws_cloudwatch_alarm with maximum properties" do
-        expect_recipe {
-          aws_cloudwatch_alarm 'my-test-alert' do
-            namespace 'AWS/EC2'
-            metric_name 'CPUUtilization'
-            comparison_operator 'GreaterThanThreshold'
+        expect_recipe do
+          aws_cloudwatch_alarm "my-test-alert" do
+            namespace "AWS/EC2"
+            metric_name "CPUUtilization"
+            comparison_operator "GreaterThanThreshold"
             evaluation_periods 1
             period 60
-            statistic 'Average'
+            statistic "Average"
             threshold 80
             dimensions([
-              {
-                name: "foo1",
-                value: "bar1"
-              },
-              {
-                name: "foo2",
-                value: "bar2"
-              }
-            ])
-            insufficient_data_actions ['mytesttopic1']
-            ok_actions ['mytesttopic1']
-            alarm_actions ['mytesttopic1']
+                         {
+                           name: "foo1",
+                           value: "bar1"
+                         },
+                         {
+                           name: "foo2",
+                           value: "bar2"
+                         }
+                       ])
+            insufficient_data_actions ["mytesttopic1"]
+            ok_actions ["mytesttopic1"]
+            alarm_actions ["mytesttopic1"]
             actions_enabled false
             alarm_description "description"
             unit "Percent"
           end
-        }.to create_an_aws_cloudwatch_alarm('my-test-alert',
-          namespace: 'AWS/EC2',
-          metric_name: 'CPUUtilization',
-          comparison_operator: 'GreaterThanThreshold',
-          evaluation_periods: 1,
-          period: 60,
-          statistic: 'Average',
-          threshold: 80,
-          dimensions: [
-            {
-              name: "foo1",
-              value: "bar1"
-            },
-            {
-              name: "foo2",
-              value: "bar2"
-            }
-          ],
-          insufficient_data_actions: [mytesttopic1.aws_object.attributes["TopicArn"]],
-          ok_actions: [mytesttopic1.aws_object.attributes["TopicArn"]],
-          alarm_actions: [mytesttopic1.aws_object.attributes["TopicArn"]],
-          actions_enabled: false,
-          alarm_description: "description",
-          unit: "Percent",
-        ).and be_idempotent
+        end.to create_an_aws_cloudwatch_alarm("my-test-alert",
+                                              namespace: "AWS/EC2",
+                                              metric_name: "CPUUtilization",
+                                              comparison_operator: "GreaterThanThreshold",
+                                              evaluation_periods: 1,
+                                              period: 60,
+                                              statistic: "Average",
+                                              threshold: 80,
+                                              dimensions: [
+                                                {
+                                                  name: "foo1",
+                                                  value: "bar1"
+                                                },
+                                                {
+                                                  name: "foo2",
+                                                  value: "bar2"
+                                                }
+                                              ],
+                                              insufficient_data_actions: [mytesttopic1.aws_object.attributes["TopicArn"]],
+                                              ok_actions: [mytesttopic1.aws_object.attributes["TopicArn"]],
+                                              alarm_actions: [mytesttopic1.aws_object.attributes["TopicArn"]],
+                                              actions_enabled: false,
+                                              alarm_description: "description",
+                                              unit: "Percent").and be_idempotent
       end
 
       context "with an existing minimum cloudwatch alarm" do
-        aws_cloudwatch_alarm 'my-test-alert' do
-          namespace 'AWS/EC2'
-          metric_name 'CPUUtilization'
-          comparison_operator 'GreaterThanThreshold'
+        aws_cloudwatch_alarm "my-test-alert" do
+          namespace "AWS/EC2"
+          metric_name "CPUUtilization"
+          comparison_operator "GreaterThanThreshold"
           evaluation_periods 1
           period 60
-          statistic 'Average'
+          statistic "Average"
           threshold 80
         end
 
         it "updates an aws_cloudwatch_alarm with maximum properties" do
-          expect_recipe {
-            aws_cloudwatch_alarm 'my-test-alert' do
-              namespace 'AWS/EC2'
-              metric_name 'CPUUtilization'
-              comparison_operator 'GreaterThanThreshold'
+          expect_recipe do
+            aws_cloudwatch_alarm "my-test-alert" do
+              namespace "AWS/EC2"
+              metric_name "CPUUtilization"
+              comparison_operator "GreaterThanThreshold"
               evaluation_periods 1
               period 60
-              statistic 'Average'
+              statistic "Average"
               threshold 80
               dimensions([
-                {
-                  name: "foo1",
-                  value: "bar1"
-                },
-                {
-                  name: "foo2",
-                  value: "bar2"
-                }
-              ])
-              insufficient_data_actions ['mytesttopic1']
-              ok_actions ['mytesttopic1']
-              alarm_actions ['mytesttopic1']
+                           {
+                             name: "foo1",
+                             value: "bar1"
+                           },
+                           {
+                             name: "foo2",
+                             value: "bar2"
+                           }
+                         ])
+              insufficient_data_actions ["mytesttopic1"]
+              ok_actions ["mytesttopic1"]
+              alarm_actions ["mytesttopic1"]
               actions_enabled false
               alarm_description "description"
               unit "Percent"
             end
-          }.to update_an_aws_cloudwatch_alarm('my-test-alert',
-            namespace: 'AWS/EC2',
-            metric_name: 'CPUUtilization',
-            comparison_operator: 'GreaterThanThreshold',
-            evaluation_periods: 1,
-            period: 60,
-            statistic: 'Average',
-            threshold: 80,
-            dimensions: [
-              {
-                name: "foo1",
-                value: "bar1"
-              },
-              {
-                name: "foo2",
-                value: "bar2"
-              }
-            ],
-            insufficient_data_actions: [mytesttopic1.aws_object.attributes["TopicArn"]],
-            ok_actions: [mytesttopic1.aws_object.attributes["TopicArn"]],
-            alarm_actions: [mytesttopic1.aws_object.attributes["TopicArn"]],
-            actions_enabled: false,
-            alarm_description: "description",
-            unit: "Percent",
-          ).and be_idempotent
+          end.to update_an_aws_cloudwatch_alarm("my-test-alert",
+                                                namespace: "AWS/EC2",
+                                                metric_name: "CPUUtilization",
+                                                comparison_operator: "GreaterThanThreshold",
+                                                evaluation_periods: 1,
+                                                period: 60,
+                                                statistic: "Average",
+                                                threshold: 80,
+                                                dimensions: [
+                                                  {
+                                                    name: "foo1",
+                                                    value: "bar1"
+                                                  },
+                                                  {
+                                                    name: "foo2",
+                                                    value: "bar2"
+                                                  }
+                                                ],
+                                                insufficient_data_actions: [mytesttopic1.aws_object.attributes["TopicArn"]],
+                                                ok_actions: [mytesttopic1.aws_object.attributes["TopicArn"]],
+                                                alarm_actions: [mytesttopic1.aws_object.attributes["TopicArn"]],
+                                                actions_enabled: false,
+                                                alarm_description: "description",
+                                                unit: "Percent").and be_idempotent
         end
-
       end
 
       context "with an existing maximum cloudwatch alarm" do
-        aws_cloudwatch_alarm 'my-test-alert' do
-          namespace 'AWS/EC2'
-          metric_name 'CPUUtilization'
-          comparison_operator 'GreaterThanThreshold'
+        aws_cloudwatch_alarm "my-test-alert" do
+          namespace "AWS/EC2"
+          metric_name "CPUUtilization"
+          comparison_operator "GreaterThanThreshold"
           evaluation_periods 1
           period 60
-          statistic 'Average'
+          statistic "Average"
           threshold 80
           dimensions([
-            {
-              name: "foo1",
-              value: "bar1"
-            },
-            {
-              name: "foo2",
-              value: "bar2"
-            }
-          ])
-          insufficient_data_actions ['mytesttopic1']
-          ok_actions ['mytesttopic1']
-          alarm_actions ['mytesttopic1']
+                       {
+                         name: "foo1",
+                         value: "bar1"
+                       },
+                       {
+                         name: "foo2",
+                         value: "bar2"
+                       }
+                     ])
+          insufficient_data_actions ["mytesttopic1"]
+          ok_actions ["mytesttopic1"]
+          alarm_actions ["mytesttopic1"]
           actions_enabled false
           alarm_description "description"
           unit "Percent"
         end
 
         it "updates all updateable attributes" do
-          expect_recipe {
-            aws_cloudwatch_alarm 'my-test-alert' do
-              namespace 'AWS/S3'
-              metric_name 'foo'
-              comparison_operator 'LessThanThreshold'
+          expect_recipe do
+            aws_cloudwatch_alarm "my-test-alert" do
+              namespace "AWS/S3"
+              metric_name "foo"
+              comparison_operator "LessThanThreshold"
               evaluation_periods 2
               period 120
-              statistic 'Maximum'
+              statistic "Maximum"
               threshold 70
               dimensions([
-                {
-                  name: "foo3",
-                  value: "bar3"
-                }
-              ])
-              insufficient_data_actions ['mytesttopic2']
-              ok_actions ['mytesttopic1', 'mytesttopic2']
-              alarm_actions ['mytesttopic2']
+                           {
+                             name: "foo3",
+                             value: "bar3"
+                           }
+                         ])
+              insufficient_data_actions ["mytesttopic2"]
+              ok_actions %w{mytesttopic1 mytesttopic2}
+              alarm_actions ["mytesttopic2"]
               actions_enabled true
               alarm_description "description2"
               unit "Bits"
             end
-          }.to update_an_aws_cloudwatch_alarm('my-test-alert',
-            namespace: 'AWS/S3',
-            metric_name: 'foo',
-            comparison_operator: 'LessThanThreshold',
-            evaluation_periods: 2,
-            period: 120,
-            statistic: 'Maximum',
-            threshold: 70,
-            dimensions: [
-              {
-                name: "foo3",
-                value: "bar3"
-              }
-            ],
-            insufficient_data_actions: [mytesttopic2.aws_object.attributes["TopicArn"]],
-            ok_actions: Set[mytesttopic1.aws_object.attributes["TopicArn"], mytesttopic2.aws_object.attributes["TopicArn"]],
-            alarm_actions: [mytesttopic2.aws_object.attributes["TopicArn"]],
-            actions_enabled: true,
-            alarm_description: "description2",
-            unit: "Bits",
-          ).and be_idempotent
+          end.to update_an_aws_cloudwatch_alarm("my-test-alert",
+                                                namespace: "AWS/S3",
+                                                metric_name: "foo",
+                                                comparison_operator: "LessThanThreshold",
+                                                evaluation_periods: 2,
+                                                period: 120,
+                                                statistic: "Maximum",
+                                                threshold: 70,
+                                                dimensions: [
+                                                  {
+                                                    name: "foo3",
+                                                    value: "bar3"
+                                                  }
+                                                ],
+                                                insufficient_data_actions: [mytesttopic2.aws_object.attributes["TopicArn"]],
+                                                ok_actions: Set[mytesttopic1.aws_object.attributes["TopicArn"], mytesttopic2.aws_object.attributes["TopicArn"]],
+                                                alarm_actions: [mytesttopic2.aws_object.attributes["TopicArn"]],
+                                                actions_enabled: true,
+                                                alarm_description: "description2",
+                                                unit: "Bits").and be_idempotent
         end
 
         it "updates only the specified properties" do
-          expect_recipe {
-            aws_cloudwatch_alarm 'my-test-alert' do
+          expect_recipe do
+            aws_cloudwatch_alarm "my-test-alert" do
               unit "Gigabytes"
             end
-          }.to update_an_aws_cloudwatch_alarm('my-test-alert',
-          namespace: 'AWS/S3',
-          metric_name: 'foo',
-          comparison_operator: 'LessThanThreshold',
-          evaluation_periods: 2,
-          period: 120,
-          statistic: 'Maximum',
-          threshold: 70,
-          dimensions: [
-            {
-              name: "foo3",
-              value: "bar3"
-            }
-          ],
-          insufficient_data_actions: [mytesttopic2.aws_object.attributes["TopicArn"]],
-          ok_actions: Set[mytesttopic1.aws_object.attributes["TopicArn"], mytesttopic2.aws_object.attributes["TopicArn"]],
-          alarm_actions: [mytesttopic2.aws_object.attributes["TopicArn"]],
-          actions_enabled: true,
-          alarm_description: "description2",
-          unit: "Gigabytes",
-          ).and be_idempotent
+          end.to update_an_aws_cloudwatch_alarm("my-test-alert",
+                                                namespace: "AWS/S3",
+                                                metric_name: "foo",
+                                                comparison_operator: "LessThanThreshold",
+                                                evaluation_periods: 2,
+                                                period: 120,
+                                                statistic: "Maximum",
+                                                threshold: 70,
+                                                dimensions: [
+                                                  {
+                                                    name: "foo3",
+                                                    value: "bar3"
+                                                  }
+                                                ],
+                                                insufficient_data_actions: [mytesttopic2.aws_object.attributes["TopicArn"]],
+                                                ok_actions: Set[mytesttopic1.aws_object.attributes["TopicArn"], mytesttopic2.aws_object.attributes["TopicArn"]],
+                                                alarm_actions: [mytesttopic2.aws_object.attributes["TopicArn"]],
+                                                actions_enabled: true,
+                                                alarm_description: "description2",
+                                                unit: "Gigabytes").and be_idempotent
         end
 
         it "clears out all clearable arrays" do
-          expect_recipe {
-            aws_cloudwatch_alarm 'my-test-alert' do
+          expect_recipe do
+            aws_cloudwatch_alarm "my-test-alert" do
               dimensions []
               insufficient_data_actions []
               ok_actions []
               alarm_actions []
             end
-          }.to create_an_aws_cloudwatch_alarm('my-test-alert',
-            namespace: 'AWS/S3',
-            metric_name: 'foo',
-            comparison_operator: 'LessThanThreshold',
-            evaluation_periods: 2,
-            period: 120,
-            statistic: 'Maximum',
-            threshold: 70,
-            dimensions: [],
-            insufficient_data_actions: [],
-            ok_actions: [],
-            alarm_actions: [],
-            actions_enabled: true,
-            alarm_description: "description2",
-            unit: "Gigabytes",
-          ).and be_idempotent
+          end.to create_an_aws_cloudwatch_alarm("my-test-alert",
+                                                namespace: "AWS/S3",
+                                                metric_name: "foo",
+                                                comparison_operator: "LessThanThreshold",
+                                                evaluation_periods: 2,
+                                                period: 120,
+                                                statistic: "Maximum",
+                                                threshold: 70,
+                                                dimensions: [],
+                                                insufficient_data_actions: [],
+                                                ok_actions: [],
+                                                alarm_actions: [],
+                                                actions_enabled: true,
+                                                alarm_description: "description2",
+                                                unit: "Gigabytes").and be_idempotent
         end
       end
-
     end
   end
 end