chef-provisioning-aws 3.0.4 → 3.0.6

data/lib/chef/provider/aws_ebs_volume.rb

@@ -1,7 +1,7 @@
-require 'chef/provisioning/aws_driver/aws_provider'
-require 'cheffish'
-require 'date'
-require 'retryable'
+require "chef/provisioning/aws_driver/aws_provider"
+require "cheffish"
+require "date"
+require "retryable"
 
 class Chef::Provider::AwsEbsVolume < Chef::Provisioning::AWSDriver::AWSProvider
   include Chef::Provisioning::AWSDriver::TaggingStrategy::EC2ConvergeTags
@@ -29,9 +29,7 @@ class Chef::Provider::AwsEbsVolume < Chef::Provisioning::AWSDriver::AWSProvider
   def action_create
     volume = super
 
-    if !new_resource.machine.nil?
-      update_attachment(volume)
-    end
+    update_attachment(volume) unless new_resource.machine.nil?
   end
 
   protected
@@ -41,7 +39,7 @@ class Chef::Provider::AwsEbsVolume < Chef::Provisioning::AWSDriver::AWSProvider
     converge_by "create #{new_resource} in #{region}" do
       volume = new_resource.driver.ec2_resource.create_volume(initial_options)
       retry_with_backoff(::Aws::EC2::Errors::InvalidVolumeNotFound) do
-        new_resource.driver.ec2_resource.create_tags(resources: [volume.volume_id],tags: [{key: "Name", value: new_resource.name}])
+        new_resource.driver.ec2_resource.create_tags(resources: [volume.volume_id], tags: [{ key: "Name", value: new_resource.name }])
       end
       volume
     end
@@ -53,32 +51,32 @@ class Chef::Provider::AwsEbsVolume < Chef::Provisioning::AWSDriver::AWSProvider
   end
 
   def update_aws_object(volume)
-    if initial_options.has_key?(:availability_zone)
+    if initial_options.key?(:availability_zone)
       if availability_zone != volume.availability_zone
         raise "#{new_resource}.availability_zone is #{availability_zone}, but actual volume has availability_zone_name set to #{volume.availability_zone}.  Cannot be modified!"
       end
     end
-    if initial_options.has_key?(:size)
+    if initial_options.key?(:size)
       if initial_options[:size] != volume.size
         raise "#{new_resource}.size is #{new_resource.size}, but actual volume has size set to #{volume.size}.  Cannot be modified!"
       end
     end
-    if initial_options.has_key?(:snapshot_id)
+    if initial_options.key?(:snapshot_id)
       if initial_options[:snapshot_id] != volume.snapshot_id
         raise "#{new_resource}.snapshot is #{new_resource.snapshot}, but actual volume has snapshot set to #{volume.snapshot_id}.  Cannot be modified!"
       end
     end
-    if initial_options.has_key?(:iops)
+    if initial_options.key?(:iops)
       if initial_options[:iops] != volume.iops
         raise "#{new_resource}.iops is #{new_resource.iops}, but actual volume has iops set to #{volume.iops}.  Cannot be modified!"
       end
     end
-    if initial_options.has_key?(:volume_type)
+    if initial_options.key?(:volume_type)
       if initial_options[:volume_type] != volume.volume_type
         raise "#{new_resource}.volume_type is #{new_resource.volume_type}, but actual volume has type set to #{volume.type}.  Cannot be modified!"
       end
     end
-    if initial_options.has_key?(:encrypted)
+    if initial_options.key?(:encrypted)
       if initial_options[:encrypted] != !!volume.encrypted
         raise "#{new_resource}.encrypted is #{new_resource.encrypted}, but actual volume has encrypted set to #{volume.encrypted}.  Cannot be modified!"
       end
@@ -93,7 +91,7 @@ class Chef::Provider::AwsEbsVolume < Chef::Provisioning::AWSDriver::AWSProvider
   private
 
   def expected_instance
-    if !defined?(@expected_instance)
+    unless defined?(@expected_instance)
       if new_resource.machine == false
         @expected_instance = nil
       else
@@ -106,13 +104,13 @@ class Chef::Provider::AwsEbsVolume < Chef::Provisioning::AWSDriver::AWSProvider
   def initial_options
     @initial_options ||= begin
       options = {}
-      options[:availability_zone] = availability_zone              if !new_resource.availability_zone.nil?
-      options[:size]              = new_resource.size              if !new_resource.size.nil?
-      options[:snapshot_id]       = new_resource.snapshot          if !new_resource.snapshot.nil?
-      options[:iops]              = new_resource.iops              if !new_resource.iops.nil?
-      options[:volume_type]       = new_resource.volume_type       if !new_resource.volume_type.nil?
-      options[:encrypted]         = new_resource.encrypted         if !new_resource.encrypted.nil?
-      options[:encrypted] = !!options[:encrypted] if !options[:encrypted].nil?
+      options[:availability_zone] = availability_zone              unless new_resource.availability_zone.nil?
+      options[:size]              = new_resource.size              unless new_resource.size.nil?
+      options[:snapshot_id]       = new_resource.snapshot          unless new_resource.snapshot.nil?
+      options[:iops]              = new_resource.iops              unless new_resource.iops.nil?
+      options[:volume_type]       = new_resource.volume_type       unless new_resource.volume_type.nil?
+      options[:encrypted]         = new_resource.encrypted         unless new_resource.encrypted.nil?
+      options[:encrypted] = !!options[:encrypted] unless options[:encrypted].nil?
 
       AWSResource.lookup_options(options, resource: new_resource)
     end
@@ -135,7 +133,7 @@ class Chef::Provider::AwsEbsVolume < Chef::Provisioning::AWSDriver::AWSProvider
       when "available"
         attach(volume)
       when nil
-        raise VolumeNotFoundError.new(new_resource)
+        raise VolumeNotFoundError, new_resource
       else
         raise VolumeInvalidStatusError.new(new_resource, status)
       end
@@ -159,7 +157,7 @@ class Chef::Provider::AwsEbsVolume < Chef::Provisioning::AWSDriver::AWSProvider
       Chef::Log.info("waiting for #{new_resource} status to change to #{expected_status}...")
     }
 
-    Retryable.retryable(:tries => 120, :sleep => 2, :on => VolumeStatusTimeoutError, :ensure => log_callback) do
+    Retryable.retryable(tries: 120, sleep: 2, on: VolumeStatusTimeoutError, ensure: log_callback) do
       status = new_resource.driver.ec2_resource.volume(volume.id).state
       expected_status = "in-use" if expected_status.to_s.eql?("in_use")
       raise VolumeStatusTimeoutError.new(new_resource, status, expected_status) if status != expected_status.to_s
@@ -203,10 +201,10 @@ class Chef::Provider::AwsEbsVolume < Chef::Provisioning::AWSDriver::AWSProvider
 
     converge_by "wait for #{new_resource} in #{region} to delete" do
       log_callback = proc {
-        Chef::Log.info('waiting for volume to delete...')
+        Chef::Log.info("waiting for volume to delete...")
       }
 
-      Retryable.retryable(:tries => 30, :sleep => 2, :on => VolumeStatusTimeoutError, :ensure => log_callback) do
+      Retryable.retryable(tries: 30, sleep: 2, on: VolumeStatusTimeoutError, ensure: log_callback) do
         result = new_resource.driver.ec2_resource.volume(volume.id) if volume.id
         raise VolumeStatusTimeoutError.new(new_resource, "exists", "deleted") if new_resource.exists?(result)
       end

data/lib/chef/provider/aws_eip_address.rb

@@ -1,7 +1,7 @@
-require 'chef/provisioning/aws_driver/aws_provider'
-require 'chef/resource/aws_instance'
-require 'chef/provisioning/machine_spec'
-require 'cheffish'
+require "chef/provisioning/aws_driver/aws_provider"
+require "chef/resource/aws_instance"
+require "chef/provisioning/machine_spec"
+require "cheffish"
 
 class Chef::Provider::AwsEipAddress < Chef::Provisioning::AWSDriver::AWSProvider
   provides :aws_eip_address
@@ -9,9 +9,7 @@ class Chef::Provider::AwsEipAddress < Chef::Provisioning::AWSDriver::AWSProvider
   def action_create
     elastic_ip = super
 
-    if !new_resource.machine.nil?
-      update_association(elastic_ip)
-    end
+    update_association(elastic_ip) unless new_resource.machine.nil?
   end
 
   protected
@@ -22,7 +20,7 @@ class Chef::Provider::AwsEipAddress < Chef::Provisioning::AWSDriver::AWSProvider
       if associate_to_vpc.nil?
         if desired_instance.is_a?(::Aws::EC2::Instance) || desired_instance.is_a?(::Aws::EC2::Instance)
           associate_to_vpc = !!desired_instance.vpc_id
-          Chef::Log.debug "Since associate_to_vpc is not specified and instance #{new_resource.machine} (#{desired_instance.id}) and #{associate_to_vpc ? "is" : "is not"} in a VPC, setting associate_to_vpc to #{associate_to_vpc}."
+          Chef::Log.debug "Since associate_to_vpc is not specified and instance #{new_resource.machine} (#{desired_instance.id}) and #{associate_to_vpc ? 'is' : 'is not'} in a VPC, setting associate_to_vpc to #{associate_to_vpc}."
         end
       end
       new_resource.driver.ec2.allocate_address vpc: new_resource.associate_to_vpc
@@ -30,7 +28,7 @@ class Chef::Provider::AwsEipAddress < Chef::Provisioning::AWSDriver::AWSProvider
   end
 
   def update_aws_object(elastic_ip)
-    if !new_resource.associate_to_vpc.nil?
+    unless new_resource.associate_to_vpc.nil?
       if new_resource.associate_to_vpc != (elastic_ip.domain == "vpc")
         raise "#{new_resource}.associate_to_vpc = #{new_resource.associate_to_vpc}, but actual IP address has vpc? set to #{(elastic_ip.domain == 'vpc')}.  Cannot be modified!"
       end
@@ -38,7 +36,7 @@ class Chef::Provider::AwsEipAddress < Chef::Provisioning::AWSDriver::AWSProvider
   end
 
   def destroy_aws_object(elastic_ip)
-    #if it's attached to something in a vpc, disassociate first
+    # if it's attached to something in a vpc, disassociate first
     if !elastic_ip.instance_id.nil? && elastic_ip.domain == "vpc"
       converge_by "dissociate Elastic IP address #{new_resource.name} (#{elastic_ip.public_ip}) from #{elastic_ip.instance_id}" do
         new_resource.driver.ec2.disassociate_address public_ip: elastic_ip.public_ip
@@ -52,7 +50,7 @@ class Chef::Provider::AwsEipAddress < Chef::Provisioning::AWSDriver::AWSProvider
   private
 
   def desired_instance
-    if !defined?(@desired_instance)
+    unless defined?(@desired_instance)
       if new_resource.machine == false
         @desired_instance = false
       else
@@ -77,12 +75,11 @@ class Chef::Provider::AwsEipAddress < Chef::Provisioning::AWSDriver::AWSProvider
     # If we were told to set the association to false, disassociate it.
     #
     else
-      if !(elastic_ip.association_id.nil?)
+      unless elastic_ip.association_id.nil?
         converge_by "disassociate Elastic IP address #{new_resource.name} (#{elastic_ip.public_ip}) from #{elastic_ip.instance_id} in #{region}" do
           new_resource.driver.ec2.disassociate_address public_ip: elastic_ip.public_ip
         end
       end
     end
   end
-
 end

data/lib/chef/provider/aws_elasticsearch_domain.rb

@@ -1,5 +1,5 @@
-require 'chef/provisioning/aws_driver/aws_provider'
-require 'chef/provisioning/aws_driver/tagging_strategy/elasticsearch'
+require "chef/provisioning/aws_driver/aws_provider"
+require "chef/provisioning/aws_driver/tagging_strategy/elasticsearch"
 
 class Chef::Provider::AwsElasticsearchDomain < Chef::Provisioning::AWSDriver::AWSProvider
   provides :aws_elasticsearch_domain
@@ -10,15 +10,15 @@ class Chef::Provider::AwsElasticsearchDomain < Chef::Provisioning::AWSDriver::AW
     end
   end
 
-  def destroy_aws_object(domain)
+  def destroy_aws_object(_domain)
     converge_by "destroy Elasticsearch domain #{new_resource.domain_name}" do
-      es_client.delete_elasticsearch_domain({domain_name: new_resource.domain_name})
+      es_client.delete_elasticsearch_domain(domain_name: new_resource.domain_name)
     end
   end
 
   def update_aws_object(domain)
     updates = required_updates(domain)
-    if ! updates.empty?
+    unless updates.empty?
       converge_by updates do
         es_client.update_elasticsearch_domain_config(update_payload)
       end
@@ -30,7 +30,8 @@ class Chef::Provider::AwsElasticsearchDomain < Chef::Provisioning::AWSDriver::AW
                       strategy = Chef::Provisioning::AWSDriver::TaggingStrategy::Elasticsearch.new(
                         es_client,
                         new_resource.aws_object.arn,
-                        new_resource.aws_tags)
+                        new_resource.aws_tags
+                      )
                       Chef::Provisioning::AWSDriver::AWSTagger.new(strategy, action_handler)
                     end
   end
@@ -52,7 +53,7 @@ class Chef::Provider::AwsElasticsearchDomain < Chef::Provisioning::AWSDriver::AW
   end
 
   def update_payload
-    payload = {domain_name: new_resource.domain_name}
+    payload = { domain_name: new_resource.domain_name }
     payload.merge!(ebs_options) if ebs_options_present?
     payload.merge!(cluster_options) if cluster_options_present?
     payload.merge!(snapshot_options) if snapshot_options_present?
@@ -60,34 +61,34 @@ class Chef::Provider::AwsElasticsearchDomain < Chef::Provisioning::AWSDriver::AW
     payload
   end
 
-  EBS_OPTIONS = %i(ebs_enabled volume_type volume_size iops)
+  EBS_OPTIONS = %i{ebs_enabled volume_type volume_size iops}.freeze
   def ebs_options
     opts = EBS_OPTIONS.inject({}) do |accum, i|
-      new_resource.send(i).nil? ? accum : accum.merge({i => new_resource.send(i)})
+      new_resource.send(i).nil? ? accum : accum.merge(i => new_resource.send(i))
     end
-    {ebs_options: opts}
+    { ebs_options: opts }
   end
 
   def ebs_options_present?
-    EBS_OPTIONS.any? {|i| !new_resource.send(i).nil? }
+    EBS_OPTIONS.any? { |i| !new_resource.send(i).nil? }
   end
 
   def ebs_options_changed?(object)
     changed?(ebs_options[:ebs_options], object.ebs_options)
   end
 
-  CLUSTER_OPTIONS = %i(instance_type instance_count dedicated_master_enabled
-                       dedicated_master_type dedicated_master_count zone_awareness_enabled)
+  CLUSTER_OPTIONS = %i{instance_type instance_count dedicated_master_enabled
+                       dedicated_master_type dedicated_master_count zone_awareness_enabled}.freeze
 
   def cluster_options
     opts = CLUSTER_OPTIONS.inject({}) do |accum, i|
-      new_resource.send(i).nil? ? accum : accum.merge({i => new_resource.send(i)})
+      new_resource.send(i).nil? ? accum : accum.merge(i => new_resource.send(i))
     end
-    {elasticsearch_cluster_config: opts}
+    { elasticsearch_cluster_config: opts }
   end
 
   def cluster_options_present?
-    CLUSTER_OPTIONS.any? {|i| !new_resource.send(i).nil? }
+    CLUSTER_OPTIONS.any? { |i| !new_resource.send(i).nil? }
   end
 
   def cluster_options_changed?(object)
@@ -96,14 +97,14 @@ class Chef::Provider::AwsElasticsearchDomain < Chef::Provisioning::AWSDriver::AW
 
   def snapshot_options
     if !new_resource.automated_snapshot_start_hour.nil?
-      {snapshot_options: { automated_snapshot_start_hour: new_resource.automated_snapshot_start_hour }}
+      { snapshot_options: { automated_snapshot_start_hour: new_resource.automated_snapshot_start_hour } }
     else
       {}
     end
   end
 
   def snapshot_options_present?
-    ! new_resource.automated_snapshot_start_hour.nil?
+    !new_resource.automated_snapshot_start_hour.nil?
   end
 
   def snapshot_options_changed?(object)

data/lib/chef/provider/aws_iam_instance_profile.rb

@@ -1,4 +1,4 @@
-require 'chef/provisioning/aws_driver/aws_provider'
+require "chef/provisioning/aws_driver/aws_provider"
 
 class Chef::Provider::AwsInstanceProfile < Chef::Provisioning::AWSDriver::AWSProvider
   provides :aws_iam_instance_profile
@@ -9,7 +9,6 @@ class Chef::Provider::AwsInstanceProfile < Chef::Provisioning::AWSDriver::AWSPro
     update_attached_role(iam_instance_profile)
   end
 
-
   protected
 
   def detach_role(iam_instance_profile)
@@ -28,19 +27,19 @@ class Chef::Provider::AwsInstanceProfile < Chef::Provisioning::AWSDriver::AWSPro
       detach_role(iam_instance_profile)
       converge_by "associating role #{role} with instance profile #{new_resource.name}" do
         # Despite having collection methods for roles, instance profile can only have single role associated
-        iam_instance_profile.add_role({
+        iam_instance_profile.add_role(
           role_name: role
-        })
+        )
       end
     end
   end
 
   def create_aws_object
     converge_by "create IAM instance profile #{new_resource.name}" do
-      new_resource.driver.iam_resource.create_instance_profile({
+      new_resource.driver.iam_resource.create_instance_profile(
         path: new_resource.path || "/",
         instance_profile_name: new_resource.name
-      })
+      )
     end
   end
 
@@ -56,5 +55,4 @@ class Chef::Provider::AwsInstanceProfile < Chef::Provisioning::AWSDriver::AWSPro
       iam_instance_profile.delete
     end
   end
-
 end

data/lib/chef/provider/aws_iam_role.rb

@@ -1,5 +1,5 @@
-require 'chef/provisioning/aws_driver/aws_provider'
-require 'chef/json_compat'
+require "chef/provisioning/aws_driver/aws_provider"
+require "chef/json_compat"
 
 class Chef::Provider::AwsIamRole < Chef::Provisioning::AWSDriver::AWSProvider
   provides :aws_iam_role
@@ -15,20 +15,18 @@ class Chef::Provider::AwsIamRole < Chef::Provisioning::AWSDriver::AWSProvider
   def action_create
     role = super
 
-    if !new_resource.inline_policies.nil?
-      update_inline_policy(role)
-    end
+    update_inline_policy(role) unless new_resource.inline_policies.nil?
   end
 
   protected
 
   def create_aws_object
     converge_by "create IAM Role #{new_resource.name}" do
-      iam_resource.create_role({
+      iam_resource.create_role(
         path: new_resource.path,
         role_name: new_resource.name,
         assume_role_policy_document: new_resource.assume_role_policy_document
-      })
+      )
     end
     iam_resource.role(new_resource.name)
   end
@@ -39,10 +37,10 @@ class Chef::Provider::AwsIamRole < Chef::Provisioning::AWSDriver::AWSProvider
     end
     if new_resource.assume_role_policy_document && policy_update_required?(role.assume_role_policy_document, new_resource.assume_role_policy_document)
       converge_by "update IAM Role #{role.name} assume_role_policy_document" do
-        iam_client.update_assume_role_policy({
+        iam_client.update_assume_role_policy(
           role_name: new_resource.name,
           policy_document: new_resource.assume_role_policy_document
-        })
+        )
       end
     end
   end
@@ -64,28 +62,28 @@ class Chef::Provider::AwsIamRole < Chef::Provisioning::AWSDriver::AWSProvider
   private
 
   def update_inline_policy(role)
-    desired_inline_policies = Hash[new_resource.inline_policies.map {|k, v| [k.to_s, v]}]
-    current_inline_policies = Hash[role.policies.map {|p| [p.name, p.policy_document]}]
+    desired_inline_policies = Hash[new_resource.inline_policies.map { |k, v| [k.to_s, v] }]
+    current_inline_policies = Hash[role.policies.map { |p| [p.name, p.policy_document] }]
 
-    policies_to_put = desired_inline_policies.reject {|k,v| current_inline_policies[k] && !policy_update_required?(current_inline_policies[k], v)}
+    policies_to_put = desired_inline_policies.reject { |k, v| current_inline_policies[k] && !policy_update_required?(current_inline_policies[k], v) }
     policies_to_delete = current_inline_policies.keys - desired_inline_policies.keys
 
     policies_to_put.each do |policy_name, policy|
       converge_by "Adding or updating inline Role policy #{policy_name}" do
-        iam_client.put_role_policy({
+        iam_client.put_role_policy(
           role_name: role.name,
           policy_name: policy_name,
           policy_document: policy
-        })
+        )
       end
     end
 
     policies_to_delete.each do |policy_name|
       converge_by "Deleting inline Role policy #{policy_name}" do
-        iam_client.delete_role_policy({
+        iam_client.delete_role_policy(
           role_name: role.name,
           policy_name: policy_name
-        })
+        )
       end
     end
   end
@@ -94,5 +92,4 @@ class Chef::Provider::AwsIamRole < Chef::Provisioning::AWSDriver::AWSProvider
     # We parse the JSON into a hash to get rid of whitespace and ordering issues
     Chef::JSONCompat.parse(URI.decode(current_policy)) != Chef::JSONCompat.parse(desired_policy)
   end
-
 end

data/lib/chef/provider/aws_image.rb

@@ -1,5 +1,5 @@
-require 'chef/provisioning/aws_driver/aws_provider'
-require 'chef/provisioning/aws_driver/tagging_strategy/ec2'
+require "chef/provisioning/aws_driver/aws_provider"
+require "chef/provisioning/aws_driver/tagging_strategy/ec2"
 
 class Chef::Provider::AwsImage < Chef::Provisioning::AWSDriver::AWSProvider
   include Chef::Provisioning::AWSDriver::TaggingStrategy::EC2ConvergeTags
@@ -7,11 +7,11 @@ class Chef::Provider::AwsImage < Chef::Provisioning::AWSDriver::AWSProvider
   provides :aws_image
 
   def destroy_aws_object(image)
-    instance_id = image.tags.map {|t| [t.key, t.value] }.to_h['from-instance']
+    instance_id = image.tags.map { |t| [t.key, t.value] }.to_h["from-instance"]
     Chef::Log.debug("Found from-instance tag [#{instance_id}] on #{image.id}")
     unless instance_id
       # This is an old image and doesn't have the tag added - lets try and find it from the block device mapping
-      image.block_device_mappings.map do |dev, opts|
+      image.block_device_mappings.map do |_dev, opts|
         snapshot = new_resource.driver.ec2_resource.snapshot(opts[:snapshot_id])
         desc = snapshot.description
         m = /CreateImage\(([^\)]+)\)/.match(desc)
@@ -33,8 +33,8 @@ class Chef::Provider::AwsImage < Chef::Provisioning::AWSDriver::AWSProvider
           instance.wait_until_terminated do |w|
             w.delay = 5
             w.max_attempts = 60
-            w.before_wait do |attempts, response|
-              action_handler.report_progress "waited #{(attempts-1)*5}/#{60*5}s for #{instance.id} status to terminate..."
+            w.before_wait do |attempts, _response|
+              action_handler.report_progress "waited #{(attempts - 1) * 5}/#{60 * 5}s for #{instance.id} status to terminate..."
             end
           end
         end