chef-provisioning-aws 3.0.4 → 3.0.6

data/lib/chef/resource/aws_route53_hosted_zone.rb

@@ -15,9 +15,9 @@
 # limitations under the License.
 #
 
-require 'chef/provisioning/aws_driver/aws_resource'
-require 'chef/resource/aws_route53_record_set'
-require 'securerandom'
+require "chef/provisioning/aws_driver/aws_resource"
+require "chef/resource/aws_route53_record_set"
+require "securerandom"
 
 # the AWS API doesn't have these objects linked, so give it some help.
 class Aws::Route53::Types::HostedZone
@@ -25,7 +25,6 @@ class Aws::Route53::Types::HostedZone
 end
 
 class Chef::Resource::AwsRoute53HostedZone < Chef::Provisioning::AWSDriver::AWSResourceWithEntry
-
   aws_sdk_type ::Aws::Route53::Types::HostedZone, load_provider: false
 
   resource_name :aws_route53_hosted_zone
@@ -33,7 +32,7 @@ class Chef::Resource::AwsRoute53HostedZone < Chef::Provisioning::AWSDriver::AWSR
   # name of the domain. AWS will tack on a trailing dot, so we're going to prohibit it here for consistency:
   # the name is our data bag key, and if a user has "foo.com" in one resource and "foo.com." in another, Route
   # 53 will happily accept two different domains it calls "foo.com.".
-  attribute :name, kind_of: String, callbacks: { "domain name cannot end with a dot" => lambda { |n| n !~ /\.$/ } }
+  attribute :name, kind_of: String, callbacks: { "domain name cannot end with a dot" => ->(n) { n !~ /\.$/ } }
 
   # The comment included in the CreateHostedZoneRequest element. String <= 256 characters.
   attribute :comment, kind_of: String, default: ""
@@ -42,11 +41,12 @@ class Chef::Resource::AwsRoute53HostedZone < Chef::Provisioning::AWSDriver::AWSR
   attribute :aws_route53_zone_id, kind_of: String, aws_id_attribute: true,
                                   default: lazy { name =~ /^\/hostedzone\// ? name : nil }
 
-  DEFAULTABLE_ATTRS = [:ttl, :type]
+  DEFAULTABLE_ATTRS = %i{ttl type}.freeze
 
   attribute :defaults, kind_of: Hash,
-            callbacks: { "'defaults' keys may be any of #{DEFAULTABLE_ATTRS}" => lambda { |dh|
-                                             (dh.keys - DEFAULTABLE_ATTRS).size == 0 } }
+                       callbacks: { "'defaults' keys may be any of #{DEFAULTABLE_ATTRS}" => lambda { |dh|
+                                                                                              (dh.keys - DEFAULTABLE_ATTRS).empty?
+                                                                                            } }
 
   def record_sets(&block)
     if block_given?
@@ -58,31 +58,32 @@ class Chef::Resource::AwsRoute53HostedZone < Chef::Provisioning::AWSDriver::AWSR
 
   def aws_object
     driver, id = get_driver_and_id
-    result = driver.route53_client.get_hosted_zone(id: id).hosted_zone if id rescue nil
+    begin
+      result = driver.route53_client.get_hosted_zone(id: id).hosted_zone if id
+    rescue StandardError
+      nil
+    end
     if result
       result.resource_record_sets = get_record_sets_from_aws(result.id).resource_record_sets
       result
-    else
-      nil
     end
   end
 
   # since this is used exactly once, it could plausibly be inlined in #aws_object.
-  def get_record_sets_from_aws(hosted_zone_id, opts={})
+  def get_record_sets_from_aws(hosted_zone_id, opts = {})
     params = { hosted_zone_id: hosted_zone_id }.merge(opts)
     driver.route53_client.list_resource_record_sets(params)
   end
 end
 
 class Chef::Provider::AwsRoute53HostedZone < Chef::Provisioning::AWSDriver::AWSProvider
-
   provides :aws_route53_hosted_zone
   use_inline_resources
 
-  CREATE = "CREATE"
-  UPDATE = UPSERT = "UPSERT"
-  DELETE = "DELETE"
-  RRS_COMMENT = "Managed by chef-provisioning-aws"
+  CREATE = "CREATE".freeze
+  UPDATE = UPSERT = "UPSERT".freeze
+  DELETE = "DELETE".freeze
+  RRS_COMMENT = "Managed by chef-provisioning-aws".freeze
 
   attr_accessor :record_set_list
 
@@ -91,9 +92,7 @@ class Chef::Provider::AwsRoute53HostedZone < Chef::Provisioning::AWSDriver::AWSP
     # add :private_zone here once VPC validation is enabled.
     [:comment].each do |attr|
       value = new_resource.send(attr)
-      if value
-        config[attr] = value
-      end
+      config[attr] = value if value
     end
     config
   end
@@ -107,14 +106,13 @@ class Chef::Provider::AwsRoute53HostedZone < Chef::Provisioning::AWSDriver::AWSP
 
   def create_aws_object
     converge_by "create new Route 53 zone #{new_resource}" do
-
       # AWS stores some attributes off to the side here.
       hosted_zone_config = make_hosted_zone_config(new_resource)
 
       values = {
         name: new_resource.name,
         hosted_zone_config: hosted_zone_config,
-        caller_reference: "chef-provisioning-aws-#{SecureRandom.uuid.upcase}",  # required, unique each call
+        caller_reference: "chef-provisioning-aws-#{SecureRandom.uuid.upcase}", # required, unique each call
       }
 
       # this will validate the record_set resources prior to making any AWS calls.
@@ -131,8 +129,8 @@ class Chef::Provider::AwsRoute53HostedZone < Chef::Provisioning::AWSDriver::AWSP
         new_resource.driver.route53_client.change_resource_record_sets(hosted_zone_id: new_resource.aws_route53_zone_id,
                                                                        change_batch: {
                                                                          comment: RRS_COMMENT,
-                                                                         changes: change_list,
-                                                                         })
+                                                                         changes: change_list
+                                                                       })
       end
       zone
     end
@@ -160,15 +158,15 @@ class Chef::Provider::AwsRoute53HostedZone < Chef::Provisioning::AWSDriver::AWSP
       # so it probably doesn't matter, but bears investigating.
 
       # we already checked for duplicate Chef RR resources in #get_record_sets_from_resource.
-      keyed_chef_resources = record_set_resources.reduce({}) { |coll, rs| (coll[rs.aws_key] ||= []) << rs; coll }
-      keyed_aws_objects    = aws_record_sets.reduce({})      { |coll, rs| coll[rs.aws_key] = rs; coll }
+      keyed_chef_resources = record_set_resources.each_with_object({}) { |rs, coll| (coll[rs.aws_key] ||= []) << rs; }
+      keyed_aws_objects    = aws_record_sets.each_with_object({})      { |rs, coll| coll[rs.aws_key] = rs; }
 
       # because DNS is important, we're going to err on the side of caution and only operate on records for
       # which we have a Chef resource. "total management" might be a nice resource option to have.
       keyed_chef_resources.each do |key, chef_resource_ary|
         chef_resource_ary.each do |chef_resource|
           # RR already exists...
-          if keyed_aws_objects.has_key?(key)
+          if keyed_aws_objects.key?(key)
             # ... do we want to delete it?
             if chef_resource.action.first == :destroy
               change_list << chef_resource.to_aws_change_struct(DELETE)
@@ -185,12 +183,12 @@ class Chef::Provider::AwsRoute53HostedZone < Chef::Provisioning::AWSDriver::AWSP
       end
 
       Chef::Log.debug("RecordSet changes: #{change_list.inspect}")
-      if change_list.size > 0
+      if !change_list.empty?
         new_resource.driver.route53_client.change_resource_record_sets(hosted_zone_id: new_resource.aws_route53_zone_id,
                                                                        change_batch: {
                                                                          comment: RRS_COMMENT,
-                                                                         changes: change_list,
-                                                                         })
+                                                                         changes: change_list
+                                                                       })
       else
         Chef::Log.info("All aws_route53_record_set resources up to date (nothing to do).")
       end
@@ -201,21 +199,21 @@ class Chef::Provider::AwsRoute53HostedZone < Chef::Provisioning::AWSDriver::AWSP
     converge_by "delete Route53 zone #{new_resource}" do
       Chef::Log.info("Deleting all non-SOA/NS records for #{hosted_zone.name}")
 
-      rr_changes = hosted_zone.resource_record_sets.reject { |aws_rr|
-        %w{SOA NS}.include?(aws_rr.type)
-        }.map { |aws_rr|
-          {
-            action: DELETE,
-            resource_record_set: aws_rr.to_change_struct,
-          }
+      rr_changes = hosted_zone.resource_record_sets.reject do |aws_rr|
+                     %w{SOA NS}.include?(aws_rr.type)
+                   end.map do |aws_rr|
+        {
+          action: DELETE,
+          resource_record_set: aws_rr.to_change_struct
         }
+      end
 
-      if rr_changes.size > 0
+      unless rr_changes.empty?
         aws_struct = {
           hosted_zone_id: hosted_zone.id,
           change_batch: {
             comment: "Purging RRs prior to deleting resource",
-            changes: rr_changes,
+            changes: rr_changes
           }
         }
 
@@ -229,7 +227,6 @@ class Chef::Provider::AwsRoute53HostedZone < Chef::Provisioning::AWSDriver::AWSP
   # `record_sets` is defined on the `aws_route53_hosted_zone` resource as a block attribute, so compile that,
   # validate it, and return a list of AWSRoute53RecordSet resource objects.
   def get_record_sets_from_resource(new_resource)
-
     return nil unless new_resource.record_sets
     instance_eval(&new_resource.record_sets)
 

data/lib/chef/resource/aws_route53_record_set.rb

@@ -18,7 +18,7 @@
 class ::Aws::Route53::Types::ResourceRecordSet
   # removing AWS's trailing dots may not be the best thing, but otherwise our job gets much harder.
   def aws_key
-    "#{name.sub(/\.$/, '')}"
+    name.sub(/\.$/, "").to_s
   end
 
   # the API doesn't seem to provide any facility to convert these types into the data structures used by the
@@ -28,13 +28,12 @@ class ::Aws::Route53::Types::ResourceRecordSet
       name: name,
       type: type,
       ttl: ttl,
-      resource_records: resource_records.map {|r| {:value => r.value}},
+      resource_records: resource_records.map { |r| { value: r.value } }
     }
   end
 end
 
 class Chef::Resource::AwsRoute53RecordSet < Chef::Provisioning::AWSDriver::SuperLWRP
-
   actions :create, :destroy
   default_action :create
 
@@ -43,7 +42,7 @@ class Chef::Resource::AwsRoute53RecordSet < Chef::Provisioning::AWSDriver::Super
 
   attribute :rr_name, required: true
 
-  attribute :type, equal_to: %w(SOA A TXT NS CNAME MX PTR SRV SPF AAAA), required: true
+  attribute :type, equal_to: %w{SOA A TXT NS CNAME MX PTR SRV SPF AAAA}, required: true
 
   attribute :ttl, kind_of: Integer, required: true
 
@@ -51,12 +50,12 @@ class Chef::Resource::AwsRoute53RecordSet < Chef::Provisioning::AWSDriver::Super
 
   # this gets set internally and is not intended for DSL use in recipes.
   attribute :aws_route53_zone_name, kind_of: String, required: true,
-                                    is: lambda { |zone_name| validate_zone_name!(rr_name, zone_name) }
+                                    is: ->(zone_name) { validate_zone_name!(rr_name, zone_name) }
 
   attribute :aws_route53_hosted_zone, required: true
 
   def initialize(name, *args)
-    self.rr_name(name) unless @rr_name
+    rr_name(name) unless @rr_name
     super(name, *args)
   end
 
@@ -65,31 +64,30 @@ class Chef::Resource::AwsRoute53RecordSet < Chef::Provisioning::AWSDriver::Super
     # we'll check for integers, but leave the user responsible for valid DNS names.
     when "A"
       rr_list.all? { |v| v =~ /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/ } ||
-          raise(::Chef::Exceptions::ValidationFailed,
-                "A records are of the form '141.2.25.3'")
+        raise(::Chef::Exceptions::ValidationFailed,
+              "A records are of the form '141.2.25.3'")
     when "MX"
-      rr_list.all? { |v| v =~ /^\d+\s+[^ ]+/} ||
-          raise(::Chef::Exceptions::ValidationFailed,
-                "MX records must have a priority and mail server, of the form '15 mail.example.com.'")
+      rr_list.all? { |v| v =~ /^\d+\s+[^ ]+/ } ||
+        raise(::Chef::Exceptions::ValidationFailed,
+              "MX records must have a priority and mail server, of the form '15 mail.example.com.'")
     when "SRV"
       rr_list.all? { |v| v =~ /^\d+\s+\d+\s+\d+\s+[^ ]+$/ } ||
-          raise(::Chef::Exceptions::ValidationFailed,
-                "SRV records must have a priority, weight, port, and hostname, of the form '15 10 25 service.example.com.'")
+        raise(::Chef::Exceptions::ValidationFailed,
+              "SRV records must have a priority, weight, port, and hostname, of the form '15 10 25 service.example.com.'")
     when "CNAME"
       rr_list.size == 1 ||
-                raise(::Chef::Exceptions::ValidationFailed,
-                      "CNAME records may only have a single value (a hostname).")
-
+        raise(::Chef::Exceptions::ValidationFailed,
+              "CNAME records may only have a single value (a hostname).")
 
     when "SOA", "NS", "TXT", "PTR", "AAAA", "SPF"
       true
     else
-      raise ArgumentError, "Argument '#{type}' must be one of #{%w(SOA NS A MX SRV CNAME TXT PTR AAAA SPF)}"
+      raise ArgumentError, "Argument '#{type}' must be one of %w(SOA NS A MX SRV CNAME TXT PTR AAAA SPF)"
     end
   end
 
   def validate_zone_name!(rr_name, zone_name)
-    if rr_name.end_with?('.') && rr_name !~ /#{zone_name}\.$/
+    if rr_name.end_with?(".") && rr_name !~ /#{zone_name}\.$/
       raise(::Chef::Exceptions::ValidationFailed, "RecordSet name #{rr_name} does not match parent HostedZone name #{zone_name}.")
     end
     true
@@ -97,14 +95,14 @@ class Chef::Resource::AwsRoute53RecordSet < Chef::Provisioning::AWSDriver::Super
 
   # because these resources can't actually converge themselves, we have to trigger the validations.
   def validate!
-    [:rr_name, :type, :ttl, :resource_records, :aws_route53_zone_name].each { |f| self.send(f) }
+    %i{rr_name type ttl resource_records aws_route53_zone_name}.each { |f| send(f) }
 
     # this was in an :is validator, but didn't play well with inheriting default values.
     validate_rr_type!(type, resource_records)
   end
 
   def aws_key
-    "#{fqdn}"
+    fqdn.to_s
   end
 
   def fqdn
@@ -120,7 +118,7 @@ class Chef::Resource::AwsRoute53RecordSet < Chef::Provisioning::AWSDriver::Super
       name: fqdn,
       type: type,
       ttl: ttl,
-      resource_records: resource_records.map { |rr| { value: rr } },
+      resource_records: resource_records.map { |rr| { value: rr } }
     }
   end
 
@@ -129,7 +127,7 @@ class Chef::Resource::AwsRoute53RecordSet < Chef::Provisioning::AWSDriver::Super
     # http://redirx.me/?t3zo
     {
       action: aws_action,
-      resource_record_set: self.to_aws_struct
+      resource_record_set: to_aws_struct
     }
   end
 
@@ -138,8 +136,8 @@ class Chef::Resource::AwsRoute53RecordSet < Chef::Provisioning::AWSDriver::Super
 
     record_sets.each do |rs|
       key = rs.aws_key
-      if seen.has_key?(key)
-        raise Chef::Exceptions::ValidationFailed.new("Duplicate RecordSet found in resource: [#{key}]")
+      if seen.key?(key)
+        raise Chef::Exceptions::ValidationFailed, "Duplicate RecordSet found in resource: [#{key}]"
       else
         seen[key] = 1
       end

data/lib/chef/resource/aws_route_table.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 route table, specifying where to route traffic destined for particular
@@ -16,7 +16,7 @@ class Chef::Resource::AwsRouteTable < Chef::Provisioning::AWSDriver::AWSResource
   include Chef::Provisioning::AWSDriver::AWSTaggable
   aws_sdk_type ::Aws::EC2::RouteTable
 
-  require 'chef/resource/aws_vpc'
+  require "chef/resource/aws_vpc"
 
   #
   # The name of this route table.
@@ -33,7 +33,7 @@ class Chef::Resource::AwsRouteTable < Chef::Provisioning::AWSDriver::AWSResource
   #
   # This is required for new route tables.
   #
-  attribute :vpc,    kind_of: [ String, AwsVpc, ::Aws::EC2::Vpc ], required: true
+  attribute :vpc,    kind_of: [String, AwsVpc, ::Aws::EC2::Vpc], required: true
 
   #
   # Enable route propagation from one or more virtual private gateways
@@ -43,8 +43,8 @@ class Chef::Resource::AwsRouteTable < Chef::Provisioning::AWSDriver::AWSResource
   # virtual_private_gateways ['vgw-abcd1234', 'vgw-abcd5678']
   # ```
   #
-  attribute :virtual_private_gateways, kind_of: [ String, Array ],
-            coerce: proc { |v| [v].flatten }
+  attribute :virtual_private_gateways, kind_of: [String, Array],
+                                       coerce: proc { |v| [v].flatten }
 
   #
   # The routes for this route table.
@@ -89,8 +89,8 @@ class Chef::Resource::AwsRouteTable < Chef::Provisioning::AWSDriver::AWSResource
   # ```ruby
   # ignore_route_targets ['^eni-']
   # ```
-  attribute :ignore_route_targets, kind_of: [ String, Array ], default: [],
-            coerce: proc { |v| [v].flatten }
+  attribute :ignore_route_targets, kind_of: [String, Array], default: [],
+                                   coerce: proc { |v| [v].flatten }
 
   attribute :route_table_id, kind_of: String, aws_id_attribute: true, default: lazy {
     name =~ /^rtb-[a-f0-9]+$/ ? name : nil

data/lib/chef/resource/aws_s3_bucket.rb

@@ -1,19 +1,19 @@
-require 'chef/provisioning/aws_driver/aws_resource'
+require "chef/provisioning/aws_driver/aws_resource"
 
 class Chef::Resource::AwsS3Bucket < Chef::Provisioning::AWSDriver::AWSResource
   include Chef::Provisioning::AWSDriver::AWSTaggable
 
   aws_sdk_type ::Aws::S3::Bucket, id: :name
 
-  attribute :name, :kind_of => String, :name_attribute => true
-  attribute :options, :kind_of => Hash, :default => {}
-  attribute :enable_website_hosting, :kind_of => [TrueClass, FalseClass], :default => false
-  attribute :website_options, :kind_of => Hash, :default => {}
-  attribute :recursive_delete, :kind_of => [TrueClass, FalseClass], :default => false
+  attribute :name, kind_of: String, name_attribute: true
+  attribute :options, kind_of: Hash, default: {}
+  attribute :enable_website_hosting, kind_of: [TrueClass, FalseClass], default: false
+  attribute :website_options, kind_of: Hash, default: {}
+  attribute :recursive_delete, kind_of: [TrueClass, FalseClass], default: false
 
   def aws_object
     resource = ::Aws::S3::Resource.new(driver.s3_client)
-    result = resource.buckets.find{|b| b.name==name}
+    result = resource.buckets.find { |b| b.name == name }
     result && result.exists? ? result : nil
   end
 end

data/lib/chef/resource/aws_security_group.rb

@@ -1,16 +1,16 @@
-require 'chef/provisioning/aws_driver/aws_resource'
-require 'chef/resource/aws_vpc'
-require 'chef/provisioning/aws_driver/exceptions'
+require "chef/provisioning/aws_driver/aws_resource"
+require "chef/resource/aws_vpc"
+require "chef/provisioning/aws_driver/exceptions"
 
 class Chef::Resource::AwsSecurityGroup < Chef::Provisioning::AWSDriver::AWSResource
   include Chef::Provisioning::AWSDriver::AWSTaggable
 
   aws_sdk_type ::Aws::EC2::SecurityGroup,
                id: :id,
-               option_names: [:security_group, :security_group_id, :security_group_name]
+               option_names: %i{security_group security_group_id security_group_name}
 
   attribute :name,          kind_of: String, name_attribute: true
-  attribute :vpc,           kind_of: [ String, AwsVpc, ::Aws::EC2::Vpc ]
+  attribute :vpc,           kind_of: [String, AwsVpc, ::Aws::EC2::Vpc]
   attribute :description,   kind_of: String
 
   #
@@ -46,8 +46,8 @@ class Chef::Resource::AwsSecurityGroup < Chef::Provisioning::AWSDriver::AWSResou
   #   - `inbound_rules load_balancer('myloadbalancer') => 80`
   #   - `inbound_rules AWS.ec2.security_groups.first => 80`
   #
-  attribute :inbound_rules,  kind_of: [ Array, Hash ]
-  attribute :outbound_rules, kind_of: [ Array, Hash ]
+  attribute :inbound_rules,  kind_of: [Array, Hash]
+  attribute :outbound_rules, kind_of: [Array, Hash]
 
   attribute :security_group_id, kind_of: String, aws_id_attribute: true, default: lazy {
     name =~ /^sg-[a-f0-9]+$/ ? name : nil
@@ -61,15 +61,15 @@ class Chef::Resource::AwsSecurityGroup < Chef::Provisioning::AWSDriver::AWSResou
       # provided
       if vpc
         vpc_object = Chef::Resource::AwsVpc.get_aws_object(vpc, resource: self)
-        results=vpc_object.security_groups.to_a.select { |s| s.group_name == name or s.id == name }
+        results = vpc_object.security_groups.to_a.select { |s| (s.group_name == name) || (s.id == name) }
       else
-        results=driver.ec2_resource.security_groups.to_a.select { |s| s.group_name == name or s.id == name }
+        results = driver.ec2_resource.security_groups.to_a.select { |s| (s.group_name == name) || (s.id == name) }
       end
       if results.size >= 2
         raise ::Chef::Provisioning::AWSDriver::Exceptions::MultipleSecurityGroupError.new(name, results)
       end
       result = results.first
     end
-    result ? result : nil
+    result || nil
   end
 end