chef-provisioning-aws 3.0.4 → 3.0.6

data/lib/chef/resource/aws_server_certificate.rb

@@ -1,4 +1,4 @@
-require 'chef/provisioning/aws_driver/aws_resource'
+require "chef/provisioning/aws_driver/aws_resource"
 
 class Chef::Resource::AwsServerCertificate < Chef::Provisioning::AWSDriver::AWSResource
   aws_sdk_type ::Aws::IAM::ServerCertificate
@@ -10,12 +10,10 @@ class Chef::Resource::AwsServerCertificate < Chef::Provisioning::AWSDriver::AWSR
   attribute :private_key, kind_of: String
 
   def aws_object
-    begin
-      cert = ::Aws::IAM::ServerCertificate.new(name,{client: driver.iam} )
-      cert.data
-      cert
-    rescue ::Aws::IAM::Errors::NoSuchEntity
-      nil
-    end
+    cert = ::Aws::IAM::ServerCertificate.new(name, client: driver.iam)
+    cert.data
+    cert
+  rescue ::Aws::IAM::Errors::NoSuchEntity
+    nil
   end
 end

data/lib/chef/resource/aws_sns_topic.rb

@@ -1,10 +1,10 @@
-require 'chef/provisioning/aws_driver/aws_resource'
+require "chef/provisioning/aws_driver/aws_resource"
 
 class Chef::Resource::AwsSnsTopic < Chef::Provisioning::AWSDriver::AWSResource
   aws_sdk_type ::Aws::SNS::Topic
 
   attribute :name, kind_of: String, name_attribute: true
-  attribute :arn,  kind_of: String, default: lazy { driver.build_arn(service: 'sns', resource: name) }
+  attribute :arn,  kind_of: String, default: lazy { driver.build_arn(service: "sns", resource: name) }
 
   def aws_object
     begin

data/lib/chef/resource/aws_sqs_queue.rb

@@ -1,4 +1,4 @@
-require 'chef/provisioning/aws_driver/aws_resource'
+require "chef/provisioning/aws_driver/aws_resource"
 
 class Chef::Resource::AwsSqsQueue < Chef::Provisioning::AWSDriver::AWSResource
   aws_sdk_type ::Aws::SQS::Queue
@@ -7,17 +7,15 @@ class Chef::Resource::AwsSqsQueue < Chef::Provisioning::AWSDriver::AWSResource
   attribute :options, kind_of: Hash
 
   def aws_object
-    begin
-      driver.sqs.get_queue_url(queue_name: name)
-    rescue ::Aws::SQS::Errors::NonExistentQueue
-      nil
-    end
+    driver.sqs.get_queue_url(queue_name: name)
+  rescue ::Aws::SQS::Errors::NonExistentQueue
+    nil
   end
 
   protected
 
   def self.get_aws_object_id(value, **options)
     aws_object = get_aws_object(value, **options)
-    aws_object.arn.split(':')[-1] if aws_object
+    aws_object.arn.split(":")[-1] if aws_object
   end
 end

data/lib/chef/resource/aws_subnet.rb

@@ -1,4 +1,4 @@
-require 'chef/provisioning/aws_driver/aws_resource_with_entry'
+require "chef/provisioning/aws_driver/aws_resource_with_entry"
 
 #
 # An AWS subnet is a sub-section of a VPC, walled gardens within the walled garden;
@@ -16,11 +16,11 @@ require 'chef/provisioning/aws_driver/aws_resource_with_entry'
 class Chef::Resource::AwsSubnet < Chef::Provisioning::AWSDriver::AWSResourceWithEntry
   include Chef::Provisioning::AWSDriver::AWSTaggable
 
-  aws_sdk_type ::Aws::EC2::Subnet, :id => :id
+  aws_sdk_type ::Aws::EC2::Subnet, id: :id
 
-  require 'chef/resource/aws_vpc'
-  require 'chef/resource/aws_network_acl'
-  require 'chef/resource/aws_route_table'
+  require "chef/resource/aws_vpc"
+  require "chef/resource/aws_network_acl"
+  require "chef/resource/aws_route_table"
 
   #
   # The name of this subnet.
@@ -35,7 +35,7 @@ class Chef::Resource::AwsSubnet < Chef::Provisioning::AWSDriver::AWSResourceWith
   # - An actual `aws_vpc` resource.
   # - An AWS `VPC` object.
   #
-  attribute :vpc, kind_of: [ String, AwsVpc, ::Aws::EC2::Vpc ]
+  attribute :vpc, kind_of: [String, AwsVpc, ::Aws::EC2::Vpc]
 
   #
   # The CIDR block of IP addresses allocated to this subnet.
@@ -62,7 +62,7 @@ class Chef::Resource::AwsSubnet < Chef::Provisioning::AWSDriver::AWSResourceWith
   #
   # Whether to give public IP addresses to new instances in this subnet by default.
   #
-  attribute :map_public_ip_on_launch, kind_of: [ TrueClass, FalseClass ]
+  attribute :map_public_ip_on_launch, kind_of: [TrueClass, FalseClass]
 
   #
   # The route table to associate with this subnet.
@@ -76,7 +76,7 @@ class Chef::Resource::AwsSubnet < Chef::Provisioning::AWSDriver::AWSResourceWith
   #
   # By default, an implicit association with the main route table is made (`:default_to_main`)
   #
-  attribute :route_table#, kind_of: [ String, AwsRouteTable, ::Aws::EC2::RouteTable ], equal_to: [ :default_to_main ]
+  attribute :route_table # , kind_of: [ String, AwsRouteTable, ::Aws::EC2::RouteTable ], equal_to: [ :default_to_main ]
 
   #
   # The Network ACL to associate with this subnet. Subnets may only
@@ -84,7 +84,7 @@ class Chef::Resource::AwsSubnet < Chef::Provisioning::AWSDriver::AWSResourceWith
   #
   # TODO: See if it's possible to disassociate a Network ACL.
   #
-  attribute :network_acl, kind_of: [ String, AwsNetworkAcl, ::Aws::EC2::NetworkAcl ]
+  attribute :network_acl, kind_of: [String, AwsNetworkAcl, ::Aws::EC2::NetworkAcl]
 
   attribute :subnet_id, kind_of: String, aws_id_attribute: true, default: lazy {
     name =~ /^subnet-[a-f0-9]+$/ ? name : nil

data/lib/chef/resource/aws_vpc.rb

@@ -1,4 +1,4 @@
-require 'chef/provisioning/aws_driver/aws_resource_with_entry'
+require "chef/provisioning/aws_driver/aws_resource_with_entry"
 
 #
 # Represents an AWS VPC.
@@ -29,10 +29,10 @@ class Chef::Resource::AwsVpc < Chef::Provisioning::AWSDriver::AWSResourceWithEnt
   include Chef::Provisioning::AWSDriver::AWSTaggable
   aws_sdk_type ::Aws::EC2::Vpc,
                id: :id,
-               option_names: [:vpc, :vpc_id, :peer_vpc_id]
+               option_names: %i{vpc vpc_id peer_vpc_id}
 
-  require 'chef/resource/aws_dhcp_options'
-  require 'chef/resource/aws_route_table'
+  require "chef/resource/aws_dhcp_options"
+  require "chef/resource/aws_route_table"
   #
   # The name of this VPC.
   #
@@ -57,7 +57,7 @@ class Chef::Resource::AwsVpc < Chef::Provisioning::AWSDriver::AWSResourceWithEnt
   #
   # Defaults, not surprisingly, to `default`.
   #
-  attribute :instance_tenancy, equal_to: [ :default, :dedicated ]
+  attribute :instance_tenancy, equal_to: %i{default dedicated}
 
   #
   # Whether this VPC should have an Internet Gateway or not.
@@ -68,7 +68,7 @@ class Chef::Resource::AwsVpc < Chef::Provisioning::AWSDriver::AWSResourceWithEnt
   #   detach if not.
   # - You may specify the AWS ID of an actual Internet Gateway
   #
-  attribute :internet_gateway#, kind_of: [ String, ::Aws::EC2::InternetGateway ], equal_to: [ true, false, :detach ]
+  attribute :internet_gateway # , kind_of: [ String, ::Aws::EC2::InternetGateway ], equal_to: [ true, false, :detach ]
 
   #
   # The main route table.
@@ -78,7 +78,7 @@ class Chef::Resource::AwsVpc < Chef::Provisioning::AWSDriver::AWSResourceWithEnt
   # - An actual `aws_route_table` resource.
   # - An AWS `route_table` object.
   #
-  attribute :main_route_table, kind_of: [ String, AwsRouteTable, ::Aws::EC2::RouteTable ]
+  attribute :main_route_table, kind_of: [String, AwsRouteTable, ::Aws::EC2::RouteTable]
 
   #
   # The routes for the main route table.
@@ -104,7 +104,7 @@ class Chef::Resource::AwsVpc < Chef::Provisioning::AWSDriver::AWSResourceWithEnt
   #
   # The DHCP options for this VPC.
   #
-  attribute :dhcp_options, kind_of: [ AwsDhcpOptions, ::Aws::EC2::DhcpOptions, String ]
+  attribute :dhcp_options, kind_of: [AwsDhcpOptions, ::Aws::EC2::DhcpOptions, String]
 
   #
   # Indicates whether the DNS resolution is supported for the VPC. If this
@@ -117,7 +117,7 @@ class Chef::Resource::AwsVpc < Chef::Provisioning::AWSDriver::AWSResourceWithEnt
   # For more information, see Amazon DNS Server:
   # - http://docs.aws.amazon.com/AmazonVPC/latest/UserGuide/VPC_DHCP_Options.html#AmazonDNS
   #
-  attribute :enable_dns_support, equal_to: [ true, false ]
+  attribute :enable_dns_support, equal_to: [true, false]
 
   #
   # Indicates whether the instances launched in the VPC get DNS hostnames. If
@@ -125,7 +125,7 @@ class Chef::Resource::AwsVpc < Chef::Provisioning::AWSDriver::AWSResourceWithEnt
   # they do not. If you want your instances to get DNS hostnames, you must also
   # set enable_dns_support to true.
   #
-  attribute :enable_dns_hostnames, equal_to: [ true, false ]
+  attribute :enable_dns_hostnames, equal_to: [true, false]
 
   attribute :vpc_id, kind_of: String, aws_id_attribute: true, default: lazy {
     name =~ /^vpc-[a-f0-9]+$/ ? name : nil
@@ -141,6 +141,6 @@ class Chef::Resource::AwsVpc < Chef::Provisioning::AWSDriver::AWSResourceWithEnt
   def exists?(result)
     return true if result.data
   rescue ::Aws::EC2::Errors::InvalidVpcIDNotFound
-    return false
+    false
   end
 end

data/lib/chef/resource/aws_vpc_peering_connection.rb

@@ -1,4 +1,4 @@
-require 'chef/provisioning/aws_driver/aws_resource_with_entry'
+require "chef/provisioning/aws_driver/aws_resource_with_entry"
 
 #
 # An AWS peering connection, specifying which VPC to peer.
@@ -15,7 +15,7 @@ class Chef::Resource::AwsVpcPeeringConnection < Chef::Provisioning::AWSDriver::A
   aws_sdk_type ::Aws::EC2::VpcPeeringConnection
   actions :accept, :create, :destroy, :purge, :nothing
 
-  require 'chef/resource/aws_vpc'
+  require "chef/resource/aws_vpc"
 
   #
   # The name of this peering connection.
@@ -32,7 +32,7 @@ class Chef::Resource::AwsVpcPeeringConnection < Chef::Provisioning::AWSDriver::A
   #
   # This is required for new peering connections.
   #
-  attribute :vpc, kind_of: [ String, AwsVpc, ::Aws::EC2::Vpc ]
+  attribute :vpc, kind_of: [String, AwsVpc, ::Aws::EC2::Vpc]
 
   #
   # The VPC to peer
@@ -45,7 +45,7 @@ class Chef::Resource::AwsVpcPeeringConnection < Chef::Provisioning::AWSDriver::A
   #
   # This is required for new peering connections.
   #
-  attribute :peer_vpc, kind_of: [ String, AwsVpc, ::Aws::EC2::Vpc ]
+  attribute :peer_vpc, kind_of: [String, AwsVpc, ::Aws::EC2::Vpc]
 
   #
   # The target VPC account id to peer

data/spec/aws_support.rb

@@ -4,39 +4,39 @@
 # AWS objects and clean them up.
 #
 module AWSSupport
-  require 'cheffish/rspec/chef_run_support'
+  require "cheffish/rspec/chef_run_support"
   def self.extended(other)
     other.extend Cheffish::RSpec::ChefRunSupport
   end
 
-  require 'chef/provisioning/aws_driver'
-  require 'aws_support/matchers/create_an_aws_object'
-  require 'aws_support/matchers/update_an_aws_object'
-  require 'aws_support/matchers/destroy_an_aws_object'
-  require 'aws_support/matchers/have_aws_object_tags'
-  require 'aws_support/matchers/match_an_aws_object'
-  require 'aws_support/delayed_stream'
-  require 'chef/provisioning/aws_driver/resources'
-  require 'aws_support/aws_resource_run_wrapper'
+  require "chef/provisioning/aws_driver"
+  require "aws_support/matchers/create_an_aws_object"
+  require "aws_support/matchers/update_an_aws_object"
+  require "aws_support/matchers/destroy_an_aws_object"
+  require "aws_support/matchers/have_aws_object_tags"
+  require "aws_support/matchers/match_an_aws_object"
+  require "aws_support/delayed_stream"
+  require "chef/provisioning/aws_driver/resources"
+  require "aws_support/aws_resource_run_wrapper"
 
   # Add AWS to the list of objects which can be matched against a Hash or Array
-  require 'aws-sdk'
-  require 'aws_support/deep_matcher/matchable_object'
-  require 'aws_support/deep_matcher/matchable_array'
+  require "aws-sdk"
+  require "aws_support/deep_matcher/matchable_object"
+  require "aws_support/deep_matcher/matchable_array"
   DeepMatcher::MatchableObject.matchable_classes << proc { |o| o.class.name =~ /^(AWS|Aws)::(AutoScaling|EC2|ELB|IAM|S3|RDS|CloudSearch|CloudWatch|Route53|ElasticsearchService)($|::)/ }
-  DeepMatcher::MatchableArray.matchable_classes  #<< AWS::Core::Data::List
+  DeepMatcher::MatchableArray.matchable_classes # << AWS::Core::Data::List
 
   def purge_all
     before :all do
       driver = self.driver
       recipe do
-        vpcs = driver.ec2.describe_vpcs({filters: [{name: "tag-value", values: ["test_vpc"]}]})[:vpcs]
+        vpcs = driver.ec2.describe_vpcs(filters: [{ name: "tag-value", values: ["test_vpc"] }])[:vpcs]
         vpcs.each do |vpc|
           aws_vpc vpc.vpc_id do
             action :purge
           end
         end
-        aws_key_pair 'test_key_pair' do
+        aws_key_pair "test_key_pair" do
           action :purge
         end
       end.converge
@@ -44,41 +44,41 @@ module AWSSupport
   end
 
   def setup_public_vpc
-    aws_vpc 'test_vpc' do
-      cidr_block '10.0.0.0/16'
+    aws_vpc "test_vpc" do
+      cidr_block "10.0.0.0/16"
       internet_gateway true
       enable_dns_hostnames true
       # TODO : uncomment this when fix main routes in aws_vpc resource as per new version
       # main_routes '0.0.0.0/0' => :internet_gateway
     end
 
-    aws_key_pair 'test_key_pair' do
+    aws_key_pair "test_key_pair" do
       allow_overwrite true
     end
 
     before :context do
       # TODO : Need to fix below line as per version two commenting out for now since its failing and not able to proceed for other specs
-      image = driver.ec2.describe_images({filters: [{name: 'name', values: ['test_machine_image']}]}).first
+      image = driver.ec2.describe_images(filters: [{ name: "name", values: ["test_machine_image"] }]).first
       image.delete unless image
 
-      default_sg = test_vpc.aws_object.security_groups({filters: [{name: 'group-name', values: ['default']}]}).first
+      default_sg = test_vpc.aws_object.security_groups(filters: [{ name: "group-name", values: ["default"] }]).first
       recipe do
         aws_security_group default_sg do
-          inbound_rules '0.0.0.0/0' => 22
+          inbound_rules "0.0.0.0/0" => 22
         end
       end.converge
     end
 
-    aws_security_group 'test_security_group' do
-      vpc 'test_vpc'
-      inbound_rules '0.0.0.0/0' => [ 22, 80 ]
-      outbound_rules [ 22, 80 ] => '0.0.0.0/0'
+    aws_security_group "test_security_group" do
+      vpc "test_vpc"
+      inbound_rules "0.0.0.0/0" => [22, 80]
+      outbound_rules [22, 80] => "0.0.0.0/0"
     end
 
-    azs = driver.ec2_client.describe_availability_zones.availability_zones.map {|r| r.zone_name}
-    aws_subnet 'test_public_subnet' do
-      vpc 'test_vpc'
-      cidr_block '10.0.0.0/24'
+    azs = driver.ec2_client.describe_availability_zones.availability_zones.map(&:zone_name)
+    aws_subnet "test_public_subnet" do
+      vpc "test_vpc"
+      cidr_block "10.0.0.0/24"
       map_public_ip_on_launch true
       availability_zone azs.first
     end
@@ -98,9 +98,9 @@ module AWSSupport
       module_eval(&block)
     end
 
-    if ENV['AWS_TEST_DRIVER']  && !ENV['AWS_TEST_DRIVER'].empty?
-      aws_driver = Chef::Provisioning.driver_for_url(ENV['AWS_TEST_DRIVER'])
-      when_the_repository "exists #{description ? "and #{description}" : ""}", *tags, &context_block
+    if ENV["AWS_TEST_DRIVER"] && !ENV["AWS_TEST_DRIVER"].empty?
+      aws_driver = Chef::Provisioning.driver_for_url(ENV["AWS_TEST_DRIVER"])
+      when_the_repository "exists #{description ? "and #{description}" : ''}", *tags, &context_block
     else
       skip "AWS_TEST_DRIVER not set ... cannot run AWS tests.  Set AWS_TEST_DRIVER=aws or aws:profile:region to run tests that hit AWS." do
         context description, *tags, &context_block
@@ -126,7 +126,7 @@ module AWSSupport
       # in the order declared, and destroyed in reverse order.
       #
       aws_resources = Chef::Provisioning::AWSDriver::Resources.constants
-      aws_resources.map! {|r| Chef::Provisioning::AWSDriver::Resources.const_get(r) }
+      aws_resources.map! { |r| Chef::Provisioning::AWSDriver::Resources.const_get(r) }
 
       aws_resources += [Chef::Resource::Machine, Chef::Resource::MachineImage, Chef::Resource::MachineBatch, Chef::Resource::LoadBalancer]
       aws_resources.each do |resource_class|
@@ -154,9 +154,9 @@ module AWSSupport
             end
             begin
               resource.converge
-            rescue
-              puts "ERROR #{$!}"
-              puts $!.backtrace.join("\n")
+            rescue StandardError
+              puts "ERROR #{$ERROR_INFO}"
+              puts $ERROR_INFO.backtrace.join("\n")
               raise
             end
           end
@@ -175,7 +175,7 @@ module AWSSupport
         after :example do
           # Close up delayed streams so they don't print out their garbage later in the run
           unless chef_config[:include_output_after_example]
-            delayed_streams.each { |s| s.close }
+            delayed_streams.each(&:close)
           end
 
           # Destroy any objects we know got created during the test
@@ -205,19 +205,19 @@ module AWSSupport
     Chef::Provisioning::AWSDriver::Resources.constants.each do |resource_class|
       resource_class = Chef::Provisioning::AWSDriver::Resources.const_get(resource_class)
       resource_name = resource_class.resource_name
-      define_method("update_an_#{resource_name}") do |name, expected_updates={}, &block|
+      define_method("update_an_#{resource_name}") do |name, expected_updates = {}, &block|
         AWSSupport::Matchers::UpdateAnAWSObject.new(self, resource_class, name, expected_updates, block)
       end
-      define_method("create_an_#{resource_name}") do |name, expected_values={}, &block|
+      define_method("create_an_#{resource_name}") do |name, expected_values = {}, &block|
         AWSSupport::Matchers::CreateAnAWSObject.new(self, resource_class, name, expected_values, block)
       end
-      define_method("have_#{resource_name}_tags") do |name, expected_tags={}|
+      define_method("have_#{resource_name}_tags") do |name, expected_tags = {}|
         AWSSupport::Matchers::HaveAWSObjectTags.new(self, resource_class, name, expected_tags)
       end
-      define_method("destroy_an_#{resource_name}") do |name, expected_values={}|
+      define_method("destroy_an_#{resource_name}") do |name, _expected_values = {}|
         AWSSupport::Matchers::DestroyAnAWSObject.new(self, resource_class, name)
       end
-      define_method("match_an_#{resource_name}") do |name, expected_values={}, &block|
+      define_method("match_an_#{resource_name}") do |name, expected_values = {}, &block|
         AWSSupport::Matchers::MatchAnAWSObject.new(self, resource_class, name, expected_values, block)
       end
     end
@@ -256,12 +256,11 @@ module AWSSupport
     end
 
     def default_vpc
-      @default_vpc ||= driver.ec2.describe_vpcs({filters: [{name: "isDefault", values: ["true"]}]})[:vpcs].first
+      @default_vpc ||= driver.ec2.describe_vpcs(filters: [{ name: "isDefault", values: ["true"] }])[:vpcs].first
     end
 
     def driver
       self.class.driver
     end
   end
-
 end

data/spec/aws_support/aws_resource_run_wrapper.rb

@@ -1,10 +1,10 @@
-require 'cheffish/rspec/recipe_run_wrapper'
+require "cheffish/rspec/recipe_run_wrapper"
 
 module AWSSupport
   class AWSResourceRunWrapper < Cheffish::RSpec::RecipeRunWrapper
     def initialize(example, resource_type, name, &properties)
       super(example.chef_config) do
-        if properties && properties.parameters.size > 0
+        if properties && !properties.parameters.empty?
           public_send(resource_type, name) { instance_exec(example, &properties) }
         else
           public_send(resource_type, name, &properties)

data/spec/aws_support/deep_matcher.rb

@@ -5,8 +5,7 @@ module AWSSupport
   # cache the result, which is then returned verbatim from failure_message.
   #
   module DeepMatcher
-
-    require 'aws_support/deep_matcher/match_values_failure_messages'
+    require "aws_support/deep_matcher/match_values_failure_messages"
 
     include MatchValuesFailureMessages
 
@@ -33,7 +32,7 @@ module AWSSupport
     #
     # @return A failure message, or empty string if it does not fail.
     #
-    def match_failure_messages(actual, identifier='value')
+    def match_failure_messages(_actual, _identifier = "value")
       raise NotImplementedError, :match_failure_messages
     end
   end