chef-provisioning-aws 3.0.4 → 3.0.6

data/spec/aws_support/deep_matcher/fuzzy_match_objects.rb

@@ -9,10 +9,9 @@ module AWSSupport
     # end
     #
     module FuzzyMatchObjects
-
-      require 'rspec/support/fuzzy_matcher'
-      require 'aws_support/deep_matcher/matchable_object'
-      require 'aws_support/deep_matcher/matchable_array'
+      require "rspec/support/fuzzy_matcher"
+      require "aws_support/deep_matcher/matchable_object"
+      require "aws_support/deep_matcher/matchable_array"
 
       def values_match?(expected, actual)
         if Hash === expected
@@ -28,12 +27,10 @@ module AWSSupport
         expected_hash.all? do |expected_key, expected_value|
           # 'a.b.c'  => 1 -> { 'a' => { 'b' => { 'c' => 1 } } }
           # :"a.b.c" => 1 -> { :a  => { :b  => { :c  => 1 } } }
-          names = expected_key.to_s.split('.')
+          names = expected_key.to_s.split(".")
           if names.size > 1
             expected_key = expected_key.is_a?(Symbol) ? names.shift.to_sym : names.shift
-            while !names.empty?
-              expected_value = { names.pop => expected_value }
-            end
+            expected_value = { names.pop => expected_value } until names.empty?
           end
 
           # Grab the actual value from the object
@@ -47,7 +44,7 @@ module AWSSupport
             end
           end
 
-          return false if !values_match?(expected, actual)
+          return false unless values_match?(expected, actual)
         end
 
         true

data/spec/aws_support/deep_matcher/match_values_failure_messages.rb

@@ -1,22 +1,21 @@
 module AWSSupport
   module DeepMatcher
     module MatchValuesFailureMessages
-
-      require 'set'
-      require 'rspec/matchers'
-      require 'rspec/matchers/composable'
-      require 'aws_support/deep_matcher'
-      require 'aws_support/deep_matcher/matchable_object'
-      require 'aws_support/deep_matcher/matchable_array'
+      require "set"
+      require "rspec/matchers"
+      require "rspec/matchers/composable"
+      require "aws_support/deep_matcher"
+      require "aws_support/deep_matcher/matchable_object"
+      require "aws_support/deep_matcher/matchable_array"
 
       protected
 
-      def match_values_failure_messages(expected, actual, identifier=nil)
+      def match_values_failure_messages(expected, actual, identifier = nil)
         if DeepMatcher === expected
           return expected.match_failure_messages(actual, identifier)
         elsif RSpec::Matchers::Composable === expected
           if !expected.matches?(actual)
-            return [ expected.failure_message ]
+            return [expected.failure_message]
           else
             return []
           end
@@ -33,31 +32,29 @@ module AWSSupport
         if values_match?(expected, actual)
           []
         elsif expected.respond_to?(:failure_message)
-          [ "#{identifier ? "#{identifier}: " : ""}#{expected.failure_message}" ]
+          ["#{identifier ? "#{identifier}: " : ''}#{expected.failure_message}"]
         else
-          [ "#{identifier ? "#{identifier}: " : ""}expected #{description_of(expected)}, but actual value was #{actual.inspect}" ]
+          ["#{identifier ? "#{identifier}: " : ''}expected #{description_of(expected)}, but actual value was #{actual.inspect}"]
         end
       end
 
       def match_sets_failure_messages(expected_set, actual_setlike, identifier)
         result = []
-        if ! actual_setlike.respond_to?(:to_set)
-          result << "expected #{identifier || "setlike"} to be castable to a Set, but it isn't!"
+        if !actual_setlike.respond_to?(:to_set)
+          result << "expected #{identifier || 'setlike'} to be castable to a Set, but it isn't!"
         else
           actual_set = actual_setlike.to_set
           expected_set.each do |expected|
-            unless actual_set.any? { |actual|
+            next if actual_set.any? do |actual|
               match_values_failure_messages(expected, actual, identifier).flatten.empty?
-            }
-              result << "- #{description_of(expected)}"
             end
+            result << "- #{description_of(expected)}"
           end
           actual_set.each do |actual|
-            unless expected_set.any? { |expected|
+            next if expected_set.any? do |expected|
               match_values_failure_messages(expected, actual, identifier).flatten.empty?
-            }
-              result << "+ #{description_of(actual)}"
             end
+            result << "+ #{description_of(actual)}"
           end
         end
         result
@@ -68,7 +65,7 @@ module AWSSupport
         expected_hash.all? do |expected_key, expected_value|
           missing_value = false
           actual_value = actual_hash.fetch(expected_key) do
-            result << "expected #{identifier || "hash"}.fetch(#{expected_key.inspect}) to #{description_of(expected_value)}, but it was missing entirely from the hash"
+            result << "expected #{identifier || 'hash'}.fetch(#{expected_key.inspect}) to #{description_of(expected_value)}, but it was missing entirely from the hash"
             missing_value = true
           end
           unless missing_value
@@ -84,32 +81,30 @@ module AWSSupport
       # which.
       #
       def match_arrays_failure_messages(expected_list, actual_list, identifier)
-        result = [ "#{identifier || "value"} is different from expected!  Differences:" ]
+        result = ["#{identifier || 'value'} is different from expected!  Differences:"]
 
         different = false
 
         expected_list = expected_list.map { |v| ExpectedValue.new(v) }
-        unless actual_list.class <= Array
-          actual_list = actual_list.to_a
-        end
+        actual_list = actual_list.to_a unless actual_list.class <= Array
         Diff::LCS.sdiff(expected_list, actual_list) do |change|
           case change.action
-          when '='
-            messages = [ change.new_element.inspect ]
-          when '+'
-            messages = [ change.new_element.inspect ]
+          when "="
+            messages = [change.new_element.inspect]
+          when "+"
+            messages = [change.new_element.inspect]
             different = true
-          when '-'
-            messages = [ change.old_element.value.inspect ]
+          when "-"
+            messages = [change.old_element.value.inspect]
             different = true
-          when '!'
+          when "!"
             messages = change.old_element.failure_messages(change.new_element)
             different = true
           else
             raise "Unknown operator returned from sdiff: #{op}"
           end
           op = change.action
-          op = ' ' if op == '='
+          op = " " if op == "="
 
           result += messages.flat_map { |m| m.split("\n") }.map { |m| "#{op} #{m}" } if messages
         end
@@ -120,12 +115,10 @@ module AWSSupport
         result = []
         expected_hash.all? do |expected_key, expected_value|
           # 'a.b.c' => 1 -> { a: { b: { c: 1 }}}
-          names = expected_key.to_s.split('.')
+          names = expected_key.to_s.split(".")
           if names.size > 1
             expected_key = names.shift
-            while !names.empty?
-              expected_value = { names.pop => expected_value }
-            end
+            expected_value = { names.pop => expected_value } until names.empty?
           end
 
           # Grab the actual value from the object
@@ -144,7 +137,7 @@ module AWSSupport
             end
           rescue NoMethodError
             if !actual_value.respond_to?(expected_key)
-              result << "#{identifier || "object"}.send(#{expected_key.inspect}) is missing, expected value #{description_of(expected_value)}"
+              result << "#{identifier || 'object'}.send(#{expected_key.inspect}) is missing, expected value #{description_of(expected_value)}"
               next
             else
               raise

data/spec/aws_support/deep_matcher/matchable_array.rb

@@ -4,7 +4,6 @@ module AWSSupport
     # If a module implements this, it signifies that
     #
     module MatchableArray
-
       #
       # TODO allow the user to return a new object that actually implements the
       # enumerable, in case the class in question is non-standard.

data/spec/aws_support/deep_matcher/matchable_object.rb

@@ -11,13 +11,12 @@ module AWSSupport
     # Which will compare my_object.a to 1 and my_object.b to 2.
     #
     module MatchableObject
-
       def self.matchable_classes
         @matchable_classes ||= []
       end
 
       def self.===(other)
-        return true if matchable_classes.any? { |c| c === other}
+        return true if matchable_classes.any? { |c| c === other }
         super
       end
     end

data/spec/aws_support/deep_matcher/rspec_monkeypatches.rb

@@ -15,10 +15,10 @@ module RSpec
   end
 end
 
-require 'aws_support/deep_matcher/match_values_failure_messages'
-require 'rspec/matchers/composable'
-require 'rspec/support/fuzzy_matcher'
-require 'aws_support/deep_matcher/fuzzy_match_objects'
+require "aws_support/deep_matcher/match_values_failure_messages"
+require "rspec/matchers/composable"
+require "rspec/support/fuzzy_matcher"
+require "aws_support/deep_matcher/fuzzy_match_objects"
 
 module RSpec::Support::FuzzyMatcher
   prepend AWSSupport::DeepMatcher::FuzzyMatchObjects

data/spec/aws_support/delayed_stream.rb

@@ -1,9 +1,9 @@
-require 'timeout'
+require "timeout"
 
 module AWSSupport
   class DelayedStream
     def initialize(delay_before_streaming, *streams)
-      @streams = streams.flatten.select { |s| !s.nil? }
+      @streams = streams.flatten.reject(&:nil?)
       if delay_before_streaming > 0
         @buffer = StringIO.new
         @thread = Thread.new do

data/spec/aws_support/matchers/create_an_aws_object.rb

@@ -1,6 +1,6 @@
-require 'rspec/matchers'
-require 'chef/provisioning'
-require 'aws_support/deep_matcher'
+require "rspec/matchers"
+require "chef/provisioning"
+require "aws_support/deep_matcher"
 
 module AWSSupport
   module Matchers
@@ -32,13 +32,13 @@ module AWSSupport
 
         # We want to record that it was created BEFORE the converge, so that
         # even if it fails, we destroy it.
-        example.created_during_test << [ resource_name, name ]
+        example.created_during_test << [resource_name, name]
 
         # Converge
         begin
           recipe.converge unless recipe.converged?
-        rescue
-          differences += [ "error trying to create #{resource_name}[#{name}]!\n#{($!.backtrace.map { |line| "- #{line}\n" } + [ recipe.output_for_failure_message ]).join("")}" ]
+        rescue StandardError
+          differences += ["error trying to create #{resource_name}[#{name}]!\n#{($ERROR_INFO.backtrace.map { |line| "- #{line}\n" } + [recipe.output_for_failure_message]).join('')}"]
         end
 
         # Check whether the recipe caused an update or not

data/spec/aws_support/matchers/destroy_an_aws_object.rb

@@ -1,6 +1,6 @@
-require 'rspec/matchers'
-require 'chef/provisioning'
-require 'aws_support/deep_matcher'
+require "rspec/matchers"
+require "chef/provisioning"
+require "aws_support/deep_matcher"
 
 module AWSSupport
   module Matchers
@@ -31,7 +31,7 @@ module AWSSupport
       def match_failure_messages(recipe)
         differences = []
 
-        if !had_initial_value
+        unless had_initial_value
           differences << "expected recipe to delete #{resource_name}[#{name}], but the AWS object did not exist before recipe ran!"
           return differences
         end
@@ -39,8 +39,8 @@ module AWSSupport
         # Converge
         begin
           recipe.converge unless recipe.converged?
-        rescue
-          differences += [ "error trying to delete #{resource_name}[#{name}]!\n#{($!.backtrace.map { |line| "- #{line}\n" } + [ recipe.output_for_failure_message ]).join("")}" ]
+        rescue StandardError
+          differences += ["error trying to delete #{resource_name}[#{name}]!\n#{($ERROR_INFO.backtrace.map { |line| "- #{line}\n" } + [recipe.output_for_failure_message]).join('')}"]
         end
 
         # Check whether the recipe caused an update or not

data/spec/aws_support/matchers/have_aws_object_tags.rb

@@ -1,6 +1,6 @@
-require 'rspec/matchers'
-require 'chef/provisioning'
-require 'aws_support/deep_matcher'
+require "rspec/matchers"
+require "chef/provisioning"
+require "aws_support/deep_matcher"
 
 module AWSSupport
   module Matchers
@@ -34,7 +34,7 @@ module AWSSupport
 
         # Check existence
         if @aws_object.nil?
-          differences << "#{resource.to_s} did not exist!"
+          differences << "#{resource} did not exist!"
         else
           differences += match_hashes_failure_messages(expected_tags, aws_object_tags(resource), resource.to_s)
         end
@@ -51,7 +51,6 @@ module AWSSupport
         provider = resource.provider_for_action(:create)
         provider.aws_tagger.current_tags
       end
-
     end
   end
 end

data/spec/aws_support/matchers/match_an_aws_object.rb

@@ -1,10 +1,9 @@
-require 'rspec/matchers'
-require 'chef/provisioning'
-require 'aws_support/deep_matcher'
+require "rspec/matchers"
+require "chef/provisioning"
+require "aws_support/deep_matcher"
 
 module AWSSupport
   module Matchers
-
     # This matcher doesn't try to validate that an example was created/updated/destroyed
     # it just checks that the object exists and posses the attributes you specify
     # It also doesn't clean up any aws objects so only use if the resource is defined outside
@@ -38,8 +37,8 @@ module AWSSupport
         # Converge
         begin
           recipe.converge unless recipe.converged?
-        rescue
-          differences += [ "error trying to converge #{resource_name}[#{name}]!\n#{($!.backtrace.map { |line| "- #{line}\n" } + [ recipe.output_for_failure_message ]).join("")}" ]
+        rescue StandardError
+          differences += ["error trying to converge #{resource_name}[#{name}]!\n#{($ERROR_INFO.backtrace.map { |line| "- #{line}\n" } + [recipe.output_for_failure_message]).join('')}"]
         end
 
         # Check for object existence and properties

data/spec/aws_support/matchers/update_an_aws_object.rb

@@ -1,14 +1,13 @@
-require 'rspec/matchers'
-require 'aws_support/deep_matcher'
+require "rspec/matchers"
+require "aws_support/deep_matcher"
 
 module AWSSupport
   module Matchers
     class UpdateAnAWSObject
-
       include RSpec::Matchers::Composable
       include AWSSupport::DeepMatcher
 
-      require 'chef/provisioning'
+      require "chef/provisioning"
 
       # @param custom_matcher [Block] A block with 1 argument that will be provided the aws_obect
       def initialize(example, resource_class, name, expected_updates, custom_matcher)
@@ -39,7 +38,7 @@ module AWSSupport
       def match_failure_messages(recipe)
         differences = []
 
-        if !had_initial_value
+        unless had_initial_value
           differences << "expected recipe to update #{resource_name}[#{name}], but the AWS object did not exist before recipe ran!"
           return differences
         end
@@ -47,8 +46,8 @@ module AWSSupport
         # Converge
         begin
           recipe.converge unless recipe.converged?
-        rescue
-          differences += [ "error trying to update #{resource_name}[#{name}]!\n#{($!.backtrace.map { |line| "- #{line}\n" } + [ recipe.output_for_failure_message ]).join("")}" ]
+        rescue StandardError
+          differences += ["error trying to update #{resource_name}[#{name}]!\n#{($ERROR_INFO.backtrace.map { |line| "- #{line}\n" } + [recipe.output_for_failure_message]).join('')}"]
         end
 
         # Check if the recipe actually caused an update

data/spec/integration/aws_auto_scaling_group_spec.rb

@@ -1,66 +1,68 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Chef::Resource::AwsAutoScalingGroup do
   extend AWSSupport
 
-  when_the_chef_12_server 'exists', organization: 'foo', server_scope: :context do
-    with_aws 'When connected to AWS' do
+  when_the_chef_12_server "exists", organization: "foo", server_scope: :context do
+    with_aws "When connected to AWS" do
       # Select an amazon linux ami based upon region
       ami = {
-        'eu-west-1' => 'ami-3850624c',
-        'eu-central-1' => 'ami-993383ea',
-        'us-east-1' => 'ami-e024bf89',
-        'us-west-1' => 'ami-951945d0',
-        'us-west-2' => 'ami-16fd7026',
-        'ap-northeast-1' => 'ami-dcfa4edd',
-        'ap-northeast-2' => 'ami-7308c51d',
-        'ap-southeast-1' => 'ami-74dda626',
-        'ap-southeast-2' => 'ami-b5990e8f',
-        'sa-east-1' => 'ami-3e3be423'
+        "eu-west-1" => "ami-3850624c",
+        "eu-central-1" => "ami-993383ea",
+        "us-east-1" => "ami-e024bf89",
+        "us-west-1" => "ami-951945d0",
+        "us-west-2" => "ami-16fd7026",
+        "ap-northeast-1" => "ami-dcfa4edd",
+        "ap-northeast-2" => "ami-7308c51d",
+        "ap-southeast-1" => "ami-74dda626",
+        "ap-southeast-2" => "ami-b5990e8f",
+        "sa-east-1" => "ami-3e3be423"
       }[driver.region]
 
-      aws_launch_configuration 'test_config' do
+      aws_launch_configuration "test_config" do
         image ami
-        instance_type 't1.micro'
+        instance_type "t1.micro"
       end
 
-      aws_sns_topic 'test_topic'
+      aws_sns_topic "test_topic"
 
       it "aws_auto_scaling_group 'test_group' creates an auto scaling group" do
-        expect_recipe {
-          aws_auto_scaling_group 'test_group' do
-            launch_configuration 'test_config'
+        expect_recipe do
+          aws_auto_scaling_group "test_group" do
+            launch_configuration "test_config"
             availability_zones ["#{driver.region}a"]
             min_size 1
             max_size 2
           end
-        }.to create_an_aws_auto_scaling_group(
-          'test_group').and be_idempotent
+        end.to create_an_aws_auto_scaling_group(
+          "test_group"
+        ).and be_idempotent
       end
 
       it "aws_auto_scaling_group 'test_group_with_policy' creates an auto scaling group" do
-        expect_recipe {
-          aws_auto_scaling_group 'test_group_with_policy' do
-            launch_configuration 'test_config'
+        expect_recipe do
+          aws_auto_scaling_group "test_group_with_policy" do
+            launch_configuration "test_config"
             availability_zones ["#{driver.region}a"]
             min_size 1
             max_size 2
             notification_configurations [{
-              topic: driver.build_arn(service: 'sns', resource: 'test_topic'),
+              topic: driver.build_arn(service: "sns", resource: "test_topic"),
               types: [
-                'autoscaling:EC2_INSTANCE_LAUNCH',
-                'autoscaling:EC2_INSTANCE_TERMINATE'
+                "autoscaling:EC2_INSTANCE_LAUNCH",
+                "autoscaling:EC2_INSTANCE_TERMINATE"
               ]
             }]
             scaling_policies(
               test_policy: {
-                adjustment_type: 'ChangeInCapacity',
+                adjustment_type: "ChangeInCapacity",
                 scaling_adjustment: 1
               }
             )
           end
-        }.to create_an_aws_auto_scaling_group(
-          'test_group_with_policy').and be_idempotent
+        end.to create_an_aws_auto_scaling_group(
+          "test_group_with_policy"
+        ).and be_idempotent
       end
 
       # test_public_subnet
@@ -68,42 +70,37 @@ describe Chef::Resource::AwsAutoScalingGroup do
         purge_all
         setup_public_vpc
         it "creates an aws_auto_scaling_group" do
-          expect_recipe {
-            aws_auto_scaling_group 'test_group' do
-              launch_configuration 'test_config'
+          expect_recipe do
+            aws_auto_scaling_group "test_group" do
+              launch_configuration "test_config"
               # availability_zones ["#{driver.region}a"]
               min_size 1
               max_size 2
-              options({
-                subnets: 'test_public_subnet'
-              })
+              options(
+                subnets: "test_public_subnet"
+              )
             end
-          }.to create_an_aws_auto_scaling_group('test_group',
-            vpc_zone_identifier: test_public_subnet.aws_object.id
-          ).and be_idempotent
+          end.to create_an_aws_auto_scaling_group("test_group",
+                                                  vpc_zone_identifier: test_public_subnet.aws_object.id).and be_idempotent
         end
       end
 
       it "creates aws_auto_scaling_group tags" do
-        expect_recipe {
-          aws_auto_scaling_group 'test_group_with_policy' do
-            launch_configuration 'test_config'
+        expect_recipe do
+          aws_auto_scaling_group "test_group_with_policy" do
+            launch_configuration "test_config"
             availability_zones ["#{driver.region}a"]
             min_size 1
             max_size 2
             aws_tags key1: "value"
           end
-        }.to create_an_aws_auto_scaling_group('test_group_with_policy'
-        ).and have_aws_auto_scaling_group_tags('test_group_with_policy',
-          {
-            'key1' => 'value'
-          }
-        ).and be_idempotent
+        end.to create_an_aws_auto_scaling_group("test_group_with_policy").and have_aws_auto_scaling_group_tags("test_group_with_policy",
+                                                                                                               "key1" => "value").and be_idempotent
       end
 
       context "with existing tags" do
-        aws_auto_scaling_group 'test_group_with_policy' do
-          launch_configuration 'test_config'
+        aws_auto_scaling_group "test_group_with_policy" do
+          launch_configuration "test_config"
           availability_zones ["#{driver.region}a"]
           min_size 1
           max_size 2
@@ -111,29 +108,24 @@ describe Chef::Resource::AwsAutoScalingGroup do
         end
 
         it "updates aws_auto_scaling_group tags" do
-          expect_recipe {
-            aws_auto_scaling_group 'test_group_with_policy' do
+          expect_recipe do
+            aws_auto_scaling_group "test_group_with_policy" do
               aws_tags key1: "value2", key2: nil
             end
-          }.to have_aws_auto_scaling_group_tags('test_group_with_policy',
-            {
-              'key1' => 'value2',
-              'key2' => ''
-            }
-          ).and be_idempotent
+          end.to have_aws_auto_scaling_group_tags("test_group_with_policy",
+                                                  "key1" => "value2",
+                                                  "key2" => "").and be_idempotent
         end
 
         it "removes all aws_network_acl tags" do
-          expect_recipe {
-            aws_auto_scaling_group 'test_group_with_policy' do
+          expect_recipe do
+            aws_auto_scaling_group "test_group_with_policy" do
               aws_tags({})
             end
-          }.to have_aws_auto_scaling_group_tags('test_group_with_policy',
-            {}
-          ).and be_idempotent
+          end.to have_aws_auto_scaling_group_tags("test_group_with_policy",
+                                                  {}).and be_idempotent
         end
       end
-
     end
   end
 end