chef-provisioning-aws 3.0.4 → 3.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52266dc010958b6e3dab75f246cc0938958a36354134532db7edd5a6faa46410
-  data.tar.gz: 26e30d909b1abf07bebf4aabbed65e0360096d6cbe7810cbd3621ff177a09ff4
+  metadata.gz: 39194e58ff45996306d839158acfbb6d958ad733e8547189f86034d13f5efc70
+  data.tar.gz: f08035db151ea0fc87f9ae2644db78118b0882f0f98e9e0ef4aa244061e3e8ce
 SHA512:
-  metadata.gz: aa7f78ca5df5bfffc74cf5e61bf796f91e8349e3909926e2437af70fad01cf6d693fa083ddbc0ff33aeafd271df851986add1be6b9a32ee94c0554e0505a1f23
-  data.tar.gz: 4ab0fd175ec409e06787b1a04adaa6939a635fee8ec4e9b36ac9841638efc3eb2de273686b0b232a936316fd4679b68ea840d997d394cb4c3489a63709203367
+  metadata.gz: 12d794dfcda191a1dfd2763ce541e5de657388174dd37e375c8678a68b1cdf9189cfbc4607e1aea0c972d7b46261dd68beb8c0c6faf14b994b9bc32b13691bb7
+  data.tar.gz: 77033fad69ff95d2c6da77c96a130e3d918223848a8abf9bf31cbbbebf32d56917293646bb71035ed6156bd723ece6ea4b9829778eaa6bfc6c69bb89367047c8

data/Gemfile

@@ -1,13 +1,24 @@
 source "https://rubygems.org"
+
 gemspec
 
 gem "chef"
-gem 'rb-readline'
+gem "rb-readline"
 
 gem "chef-zero", ">= 4.0"
-gem "rspec", "~> 3.0"
+gem "chefstyle", "~> 0.10.0"
 gem "rake"
-gem "pry"
-gem "pry-byebug"
-gem "pry-stack_explorer"
+gem "rspec", "~> 3.0"
 gem "simplecov"
+
+group :debug do
+  gem "pry"
+  gem "pry-byebug"
+  gem "pry-stack_explorer"
+end
+
+instance_eval(ENV["GEMFILE_MOD"]) if ENV["GEMFILE_MOD"]
+
+# If you want to load debugging tools into the bundle exec sandbox,
+# add these additional dependencies into Gemfile.local
+eval_gemfile(__FILE__ + ".local") if File.exist?(__FILE__ + ".local")

data/Rakefile

@@ -1,13 +1,12 @@
-require "bundler"
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
-task :default => :spec
+task default: :spec
 
 desc "run all non-integration specs"
 RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = "spec/**/*_spec.rb"
-  # TODO add back integration tests whenever we have strategy for keys
+  # TODO: add back integration tests whenever we have strategy for keys
   spec.exclude_pattern = "spec/integration/**/*_spec.rb"
 end
 
@@ -30,17 +29,17 @@ end
 
 desc "run all specs, including :super_slow"
 task :all_slow do
-  %w(all slow).each do |t|
+  %w{all slow}.each do |t|
     Rake::Task[t].invoke
   end
 end
 
 desc "travis specific task - runs CI integration tests (regular and super_slow in parallel) and sets up travis specific ENV variables"
-task :travis, [:sub_task] do |t, args|
+task :travis, [:sub_task] do |_t, args|
   sub_task = args[:sub_task]
   if sub_task == "super_slow"
     pattern = "load_balancer_spec.rb,aws_route_table_spec.rb,machine_spec.rb,aws_eip_address_spec.rb" # This is a comma seperated list
-    pattern = pattern.split(",").map {|p| "spec/integration/**/*#{p}"}.join(",")
+    pattern = pattern.split(",").map { |p| "spec/integration/**/*#{p}" }.join(",")
   else
     pattern = "spec/integration/**/*_spec.rb"
   end
@@ -52,3 +51,13 @@ RSpec::Core::RakeTask.new(:machine_image) do |spec|
   spec.pattern = "spec/integration/machine_image_spec.rb"
   spec.rspec_opts = "-b -t super_slow -e 'machine_image can create an image in the VPC'"
 end
+
+begin
+  require "chefstyle"
+  require "rubocop/rake_task"
+  RuboCop::RakeTask.new(:chefstyle) do |task|
+    task.options << "--display-cop-names"
+  end
+rescue LoadError
+  puts "chefstyle gem is not installed"
+end

data/chef-provisioning-aws.gemspec

@@ -1,30 +1,30 @@
-$:.unshift(File.dirname(__FILE__) + '/lib')
-require 'chef/provisioning/aws_driver/version'
+$LOAD_PATH.unshift(File.dirname(__FILE__) + "/lib")
+require "chef/provisioning/aws_driver/version"
 
 Gem::Specification.new do |s|
-  s.name = 'chef-provisioning-aws'
+  s.name = "chef-provisioning-aws"
   s.version = Chef::Provisioning::AWSDriver::VERSION
   s.platform = Gem::Platform::RUBY
-  s.extra_rdoc_files = ['README.md', 'LICENSE' ]
-  s.summary = 'Provisioner for creating aws containers in Chef Provisioning.'
+  s.extra_rdoc_files = ["README.md", "LICENSE"]
+  s.summary = "Provisioner for creating aws containers in Chef Provisioning."
   s.description = s.summary
-  s.author = 'Tyler Ball'
-  s.email = 'tball@chef.io'
-  s.homepage = 'https://github.com/chef/chef-provisioning-aws'
-  s.license = 'Apache-2.0'
+  s.author = "Tyler Ball"
+  s.email = "tball@chef.io"
+  s.homepage = "https://github.com/chef/chef-provisioning-aws"
+  s.license = "Apache-2.0"
 
   s.required_ruby_version = ">= 2.1.9"
 
-  s.add_dependency 'chef-provisioning', '>= 1.0', '< 3.0'
+  s.add_dependency "chef-provisioning", ">= 1.0", "< 3.0"
 
-  s.add_dependency 'aws-sdk', ['>= 2.2.18', '< 3.0']
-  s.add_dependency 'retryable', '~> 2.0', '>= 2.0.1'
-  s.add_dependency 'ubuntu_ami', '~> 0.4', '>= 0.4.1'
+  s.add_dependency "aws-sdk", [">= 2.2.18", "< 3.0"]
+  s.add_dependency "retryable", "~> 2.0", ">= 2.0.1"
+  s.add_dependency "ubuntu_ami", "~> 0.4", ">= 0.4.1"
 
   s.bindir       = "bin"
-  s.executables  = %w( )
+  s.executables  = %w{}
 
-  s.require_path = 'lib'
-  s.files = %w(Gemfile Rakefile LICENSE README.md) + Dir.glob("*.gemspec") +
-      Dir.glob("{distro,lib,tasks,spec}/**/*", File::FNM_DOTMATCH).reject {|f| File.directory?(f) }
+  s.require_path = "lib"
+  s.files = %w{Gemfile Rakefile LICENSE README.md} + Dir.glob("*.gemspec") +
+    Dir.glob("{distro,lib,tasks,spec}/**/*", File::FNM_DOTMATCH).reject { |f| File.directory?(f) }
 end

data/lib/chef/provider/aws_auto_scaling_group.rb

@@ -1,6 +1,6 @@
-require 'chef/provisioning/aws_driver/aws_provider'
-require 'set'
-require 'chef/provisioning/aws_driver/tagging_strategy/auto_scaling'
+require "chef/provisioning/aws_driver/aws_provider"
+require "set"
+require "chef/provisioning/aws_driver/tagging_strategy/auto_scaling"
 
 class Chef::Provider::AwsAutoScalingGroup < Chef::Provisioning::AWSDriver::AWSProvider
   include Chef::Provisioning::AWSDriver::TaggingStrategy::AutoScalingConvergeTags
@@ -34,7 +34,7 @@ class Chef::Provider::AwsAutoScalingGroup < Chef::Provisioning::AWSDriver::AWSPr
   end
 
   def update_aws_object(group)
-    # TODO add updates for group
+    # TODO: add updates for group
   end
 
   def destroy_aws_object(group)
@@ -47,7 +47,7 @@ class Chef::Provider::AwsAutoScalingGroup < Chef::Provisioning::AWSDriver::AWSPr
   def desired_options
     @desired_options ||= begin
       options = new_resource.options.dup
-      %w( min_size max_size availability_zones desired_capacity ).each do |var|
+      %w{min_size max_size availability_zones desired_capacity}.each do |var|
         var = var.to_sym
         value = new_resource.public_send(var)
         options[var] = value if value
@@ -55,5 +55,4 @@ class Chef::Provider::AwsAutoScalingGroup < Chef::Provisioning::AWSDriver::AWSPr
       AWSResource.lookup_options(options, resource: new_resource)
     end
   end
-
 end

data/lib/chef/provider/aws_cache_cluster.rb

@@ -1,5 +1,5 @@
-require 'chef/provisioning/aws_driver/aws_provider'
-require 'retryable'
+require "chef/provisioning/aws_driver/aws_provider"
+require "retryable"
 
 class Chef::Provider::AwsCacheCluster < Chef::Provisioning::AWSDriver::AWSProvider
   provides :aws_cache_cluster
@@ -54,20 +54,26 @@ class Chef::Provider::AwsCacheCluster < Chef::Provisioning::AWSDriver::AWSProvid
       options[:cache_node_type] = new_resource.node_type
       options[:engine] = new_resource.engine
       options[:az_mode] = new_resource.az_mode if new_resource.az_mode
-      options[:preferred_availability_zone] =
-        new_resource.preferred_availability_zone if new_resource.preferred_availability_zone
-      options[:preferred_availability_zones] =
-        new_resource.preferred_availability_zones if new_resource.preferred_availability_zones
+      if new_resource.preferred_availability_zone
+        options[:preferred_availability_zone] =
+          new_resource.preferred_availability_zone
+      end
+      if new_resource.preferred_availability_zones
+        options[:preferred_availability_zones] =
+          new_resource.preferred_availability_zones
+      end
       options[:engine_version] = new_resource.engine_version
-      options[:cache_subnet_group_name] =
-        new_resource.subnet_group_name if new_resource.subnet_group_name
+      if new_resource.subnet_group_name
+        options[:cache_subnet_group_name] =
+          new_resource.subnet_group_name
+      end
       options[:security_group_ids] = new_resource.security_groups
       AWSResource.lookup_options(options, resource: new_resource)
     end
   end
 
   def updatable_options(options)
-    updatable = [:security_groups, :num_cache_nodes, :engine_version]
+    updatable = %i{security_groups num_cache_nodes engine_version}
     options.delete_if { |option, _value| !updatable.include?(option) }
   end
 
@@ -75,21 +81,21 @@ class Chef::Provider::AwsCacheCluster < Chef::Provisioning::AWSDriver::AWSProvid
     current_sg_ids = cache_cluster[:security_groups].map { |sg| sg[:security_group_id] }.sort
 
     if desired_options[:security_group_ids].sort != current_sg_ids ||
-      desired_options[:num_cache_nodes] != cache_cluster[:num_cache_nodes] ||
-      desired_options[:engine_version] != cache_cluster[:engine_version]
+        desired_options[:num_cache_nodes] != cache_cluster[:num_cache_nodes] ||
+        desired_options[:engine_version] != cache_cluster[:engine_version]
       true
     else
       false
     end
   end
 
-  def wait_for_cache_cluster_state(aws_object, expected_status, tries=60, sleep=5)
+  def wait_for_cache_cluster_state(aws_object, expected_status, tries = 60, sleep = 5)
     query_method = :cache_cluster_status
 
-    Retryable.retryable(:tries => tries, :sleep => sleep) do |retries, exception|
-      action_handler.report_progress "waited #{retries*sleep}/#{tries*sleep}s for <#{aws_object.class}:#{aws_object.cache_cluster_id}>##{query_method} state to change to #{expected_status}..."
+    Retryable.retryable(tries: tries, sleep: sleep) do |retries, exception|
+      action_handler.report_progress "waited #{retries * sleep}/#{tries * sleep}s for <#{aws_object.class}:#{aws_object.cache_cluster_id}>##{query_method} state to change to #{expected_status}..."
       Chef::Log.debug("Current exception in wait_for is #{exception.inspect}") if exception
-      cache_cluster =  new_resource.driver.elasticache.describe_cache_clusters(cache_cluster_id: aws_object.cache_cluster_id)
+      cache_cluster = new_resource.driver.elasticache.describe_cache_clusters(cache_cluster_id: aws_object.cache_cluster_id)
       status = cache_cluster.cache_clusters.first.cache_cluster_status
       action_handler.report_progress "Current Cluster Status: #{status}"
       raise CacheClusterStatusTimeoutError.new(aws_object, status, expected_status) if status != expected_status.to_s

data/lib/chef/provider/aws_cache_replication_group.rb

@@ -1,8 +1,8 @@
-require 'chef/provisioning/aws_driver/aws_provider'
+require "chef/provisioning/aws_driver/aws_provider"
 
 class Chef::Provider::AwsCacheReplicationGroup < Chef::Provisioning::AWSDriver::AWSProvider
   provides :aws_cache_replication_group
-  
+
   protected
 
   def create_aws_object
@@ -11,8 +11,8 @@ class Chef::Provider::AwsCacheReplicationGroup < Chef::Provisioning::AWSDriver::
     end
   end
 
-  def update_aws_object(cache_replication_group)
-    Chef::Log.warn('Updating ElastiCache replication groups is currently unsupported')
+  def update_aws_object(_cache_replication_group)
+    Chef::Log.warn("Updating ElastiCache replication groups is currently unsupported")
   end
 
   def destroy_aws_object(cache_replication_group)
@@ -39,10 +39,14 @@ class Chef::Provider::AwsCacheReplicationGroup < Chef::Provisioning::AWSDriver::
       options[:cache_node_type] = new_resource.node_type
       options[:engine] = new_resource.engine
       options[:engine_version] = new_resource.engine_version
-      options[:preferred_cache_cluster_a_zs] =
-        new_resource.preferred_availability_zones if new_resource.preferred_availability_zones
-      options[:cache_subnet_group_name] =
-        new_resource.subnet_group_name if new_resource.subnet_group_name
+      if new_resource.preferred_availability_zones
+        options[:preferred_cache_cluster_a_zs] =
+          new_resource.preferred_availability_zones
+      end
+      if new_resource.subnet_group_name
+        options[:cache_subnet_group_name] =
+          new_resource.subnet_group_name
+      end
       options[:security_group_ids] = new_resource.security_groups
       AWSResource.lookup_options(options, resource: new_resource)
     end

data/lib/chef/provider/aws_cache_subnet_group.rb

@@ -1,4 +1,4 @@
-require 'chef/provisioning/aws_driver/aws_provider'
+require "chef/provisioning/aws_driver/aws_provider"
 
 class Chef::Provider::AwsCacheSubnetGroup < Chef::Provisioning::AWSDriver::AWSProvider
   provides :aws_cache_subnet_group
@@ -49,10 +49,10 @@ class Chef::Provider::AwsCacheSubnetGroup < Chef::Provisioning::AWSDriver::AWSPr
 
   def update_required?(cache_subnet_group)
     current_subnet_ids = cache_subnet_group[:subnets]
-                           .map { |subnet| subnet[:subnet_identifier] }.sort
+                         .map { |subnet| subnet[:subnet_identifier] }.sort
     current_description = cache_subnet_group[:cache_subnet_group_description]
     if new_resource.description != current_description ||
-      desired_options[:subnet_ids].sort != current_subnet_ids
+        desired_options[:subnet_ids].sort != current_subnet_ids
       true
     else
       false

data/lib/chef/provider/aws_cloudsearch_domain.rb

@@ -1,4 +1,4 @@
-require 'chef/provisioning/aws_driver/aws_provider'
+require "chef/provisioning/aws_driver/aws_provider"
 
 class Chef::Provider::AwsCloudsearchDomain < Chef::Provisioning::AWSDriver::AWSProvider
   provides :aws_cloudsearch_domain
@@ -17,7 +17,7 @@ class Chef::Provider::AwsCloudsearchDomain < Chef::Provisioning::AWSDriver::AWSP
     create_index_fields
   end
 
-  def destroy_aws_object(domain)
+  def destroy_aws_object(_domain)
     converge_by "delete CloudSearch domain #{new_resource.name}" do
       cs_client.delete_domain(domain_name: new_resource.name)
     end
@@ -79,10 +79,10 @@ class Chef::Provider::AwsCloudsearchDomain < Chef::Provisioning::AWSDriver::AWSP
     end
   end
 
-  def update_index_fields?(domain)
-    if ! new_resource.index_fields.nil?
+  def update_index_fields?(_domain)
+    if !new_resource.index_fields.nil?
       index_fields.each do |index_field|
-        if ! new_resource.index_fields.include?(index_field.to_h[:options])
+        unless new_resource.index_fields.include?(index_field.to_h[:options])
           return true
         end
       end
@@ -96,7 +96,7 @@ class Chef::Provider::AwsCloudsearchDomain < Chef::Provisioning::AWSDriver::AWSP
     ret = {}
     ret[:desired_partition_count] = new_resource.partition_count if new_resource.partition_count
     ret[:desired_replication_count] = new_resource.replication_count if new_resource.replication_count
-    ret[:desired_instance_type] =  new_resource.instance_type if new_resource.instance_type
+    ret[:desired_instance_type] = new_resource.instance_type if new_resource.instance_type
     ret
   end
 
@@ -166,14 +166,10 @@ class Chef::Provider::AwsCloudsearchDomain < Chef::Provisioning::AWSDriver::AWSP
     cs_client.describe_index_fields(domain_name: new_resource.name).index_fields
   end
 
-  def get_option(option_name, key=nil)
+  def get_option(option_name, key = nil)
     opt = cs_client.send("describe_#{option_name}".to_sym,
-                         {domain_name: new_resource.name})[key || option_name]
-    if ! opt[:status][:pending_deletion]
-      opt[:options]
-    else
-      nil
-    end
+                         domain_name: new_resource.name)[key || option_name]
+    opt[:options] unless opt[:status][:pending_deletion]
   end
 
   def cs_client

data/lib/chef/provider/aws_cloudwatch_alarm.rb

@@ -1,4 +1,4 @@
-require 'chef/provisioning/aws_driver/aws_provider'
+require "chef/provisioning/aws_driver/aws_provider"
 
 class Chef::Provider::AwsCloudwatchAlarm < Chef::Provisioning::AWSDriver::AWSProvider
   provides :aws_cloudwatch_alarm
@@ -28,10 +28,10 @@ class Chef::Provider::AwsCloudwatchAlarm < Chef::Provisioning::AWSDriver::AWSPro
       # Because an update is a PUT, we must ensure that any properties not specified
       # on the resource that are already present on the object stay the same
       aws_object = new_resource.aws_object
-      opts = {alarm_name: new_resource.name}
-      %i(namespace metric_name comparison_operator
+      opts = { alarm_name: new_resource.name }
+      %i{namespace metric_name comparison_operator
          evaluation_periods period statistic threshold
-         actions_enabled alarm_description unit).each do |opt|
+         actions_enabled alarm_description unit}.each do |opt|
         if !new_resource.public_send(opt).nil?
           opts[opt] = new_resource.public_send(opt)
         elsif aws_object && !aws_object.public_send(opt).nil?
@@ -41,7 +41,7 @@ class Chef::Provider::AwsCloudwatchAlarm < Chef::Provisioning::AWSDriver::AWSPro
       if !new_resource.dimensions.nil?
         opts[:dimensions] = new_resource.dimensions
       elsif aws_object && !aws_object.dimensions.nil?
-        opts[:dimensions] = aws_object.dimensions.map! {|d| d.to_h}
+        opts[:dimensions] = aws_object.dimensions.map!(&:to_h)
       end
       # Normally we would just use `lookup_options` here but because these parameters
       # don't necessarily sound like sns topics we manually do it
@@ -49,7 +49,7 @@ class Chef::Provider::AwsCloudwatchAlarm < Chef::Provisioning::AWSDriver::AWSPro
         if !new_resource.public_send(opt).nil?
           opts[opt] = new_resource.public_send(opt)
           opts[opt].map! do |action|
-            if action.kind_of?(String) && !(action =~ /^arn:/)
+            if action.is_a?(String) && action !~ /^arn:/
               aws_object = Chef::Resource::AwsSnsTopic.get_aws_object(action, resource: new_resource)
               action = aws_object.attributes["TopicArn"] if aws_object
             end
@@ -67,18 +67,16 @@ class Chef::Provider::AwsCloudwatchAlarm < Chef::Provisioning::AWSDriver::AWSPro
     %i{namespace metric_name comparison_operator
        evaluation_periods period statistic threshold
        actions_enabled alarm_description unit}.each do |opt|
-      if alarm.public_send(opt) != desired_options[opt]
-        return true
-      end
+      return true if alarm.public_send(opt) != desired_options[opt]
     end
-    unless (Set.new(alarm.dimensions.map {|d| d.to_h}) ^ Set.new(desired_options[:dimensions])).empty?
+    unless (Set.new(alarm.dimensions.map(&:to_h)) ^ Set.new(desired_options[:dimensions])).empty?
       return true
     end
-    %i(insufficient_data_actions ok_actions alarm_actions).each do |opt|
+    %i{insufficient_data_actions ok_actions alarm_actions}.each do |opt|
       unless (Set.new(alarm.public_send(opt)) ^ Set.new(desired_options[opt])).empty?
         return true
       end
     end
-    return false
+    false
   end
 end

data/lib/chef/provider/aws_dhcp_options.rb

@@ -1,4 +1,4 @@
-require 'chef/provisioning/aws_driver/aws_provider'
+require "chef/provisioning/aws_driver/aws_provider"
 
 class Chef::Provider::AwsDhcpOptions < Chef::Provisioning::AWSDriver::AWSProvider
   include Chef::Provisioning::AWSDriver::TaggingStrategy::EC2ConvergeTags
@@ -9,35 +9,33 @@ class Chef::Provider::AwsDhcpOptions < Chef::Provisioning::AWSDriver::AWSProvide
 
   def create_aws_object
     options = desired_options
-    if options.empty?
-      options[:domain_name_servers] = "AmazonProvidedDNS"
-    end
+    options[:domain_name_servers] = "AmazonProvidedDNS" if options.empty?
 
     converge_by "create DHCP options #{new_resource.name} in #{region}" do
       create_dhcp_options options
     end
   end
 
-  def create_dhcp_options options
-    options = options.map{|k,v| {key: k.to_s.gsub('_', '-'), values: Array(v).map(&:to_s)}}
+  def create_dhcp_options(options)
+    options = options.map { |k, v| { key: k.to_s.tr("_", "-"), values: Array(v).map(&:to_s) } }
     ec2_resource = ::Aws::EC2::Resource.new(new_resource.driver.ec2)
-    dhcp_options = ec2_resource.create_dhcp_options({dhcp_configurations: options})
+    dhcp_options = ec2_resource.create_dhcp_options(dhcp_configurations: options)
     retry_with_backoff(::Aws::EC2::Errors::InvalidDhcpOptionIDNotFound) do
-      dhcp_options.create_tags({tags: [{key: "Name", value: new_resource.name}]})
+      dhcp_options.create_tags(tags: [{ key: "Name", value: new_resource.name }])
     end
     dhcp_options
   end
 
   def update_aws_object(dhcp_options)
     # Verify unmodifiable attributes of existing dhcp_options
-    config = dhcp_options.data.to_h[:dhcp_configurations].map{|a|{a[:key].gsub('-', '_').to_sym => a[:values].map{|k|k[:value]} }}.reduce Hash.new, :merge
-    differing_options = desired_options.select { |name, value| config[name] != Array(value).map(&:to_s) }
-    if !differing_options.empty?
+    config = dhcp_options.data.to_h[:dhcp_configurations].map { |a| { a[:key].tr("-", "_").to_sym => a[:values].map { |k| k[:value] } } }.reduce({}, :merge)
+    differing_options = desired_options.reject { |name, value| config[name] == Array(value).map(&:to_s) }
+    unless differing_options.empty?
       old_dhcp_options = dhcp_options
       # Report what we are trying to change ...
-      action_handler.report_progress "update #{new_resource.to_s}"
+      action_handler.report_progress "update #{new_resource}"
       differing_options.each do |name, value|
-        action_handler.report_progress "  set #{name} to #{value.inspect} (was #{config.has_key?(name) ? config[name].inspect : "not set"})"
+        action_handler.report_progress "  set #{name} to #{value.inspect} (was #{config.key?(name) ? config[name].inspect : 'not set'})"
       end
 
       # create new dhcp_options
@@ -49,12 +47,11 @@ class Chef::Provider::AwsDhcpOptions < Chef::Provisioning::AWSDriver::AWSProvide
       # attach dhcp_options to existing vpcs
       ec2_resource = ::Aws::EC2::Resource.new(new_resource.driver.ec2)
       ec2_resource.vpcs.each do |vpc|
-        if vpc.dhcp_options_id == old_dhcp_options.id
-          dhcp_options.associate_with_vpc({
-            dry_run: false,
-            vpc_id: vpc.id, # required
-          })
-        end
+        next unless vpc.dhcp_options_id == old_dhcp_options.id
+        dhcp_options.associate_with_vpc(
+          dry_run: false,
+          vpc_id: vpc.id, # required
+        )
       end
 
       # delete old dhcp_options
@@ -62,7 +59,7 @@ class Chef::Provider::AwsDhcpOptions < Chef::Provisioning::AWSDriver::AWSProvide
         old_dhcp_options.delete
       end
 
-      [ :replaced_aws_object, dhcp_options ]
+      [:replaced_aws_object, dhcp_options]
     end
   end
 
@@ -76,7 +73,7 @@ class Chef::Provider::AwsDhcpOptions < Chef::Provisioning::AWSDriver::AWSProvide
 
   def desired_options
     desired_options = {}
-    %w(domain_name domain_name_servers ntp_servers netbios_name_servers netbios_node_type).each do |attr|
+    %w{domain_name domain_name_servers ntp_servers netbios_name_servers netbios_node_type}.each do |attr|
       attr = attr.to_sym
       value = new_resource.public_send(attr)
       desired_options[attr] = value unless value.nil?