chef-provisioning-aws 3.0.4 → 3.0.6

data/lib/chef/provider/aws_instance.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::AwsInstance < Chef::Provisioning::AWSDriver::AWSProvider
   include Chef::Provisioning::AWSDriver::TaggingStrategy::EC2ConvergeTags
@@ -21,11 +21,11 @@ class Chef::Provider::AwsInstance < Chef::Provisioning::AWSDriver::AWSProvider
       # When purging, we must wait until the instance is fully terminated - thats the only way
       # to delete the network interface that I can see
       instance.wait_until_terminated do |w|
-        # TODO look at `wait_for_status` - delay and max_attempts should be configurable
+        # TODO: look at `wait_for_status` - delay and max_attempts should be configurable
         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

data/lib/chef/provider/aws_internet_gateway.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::AwsInternetGateway < Chef::Provisioning::AWSDriver::AWSProvider
   include Chef::Provisioning::AWSDriver::TaggingStrategy::EC2ConvergeTags
@@ -20,19 +20,17 @@ class Chef::Provider::AwsInternetGateway < Chef::Provisioning::AWSDriver::AWSPro
       ec2_resource = ::Aws::EC2::Resource.new(new_resource.driver.ec2)
       internet_gateway = ec2_resource.create_internet_gateway
       retry_with_backoff(::Aws::EC2::Errors::InvalidInternetGatewayIDNotFound) do
-        internet_gateway.create_tags({tags: [{key: "Name", value: new_resource.name}]})
+        internet_gateway.create_tags(tags: [{ key: "Name", value: new_resource.name }])
       end
 
-      if desired_vpc
-        attach_vpc(desired_vpc, internet_gateway)
-      end
+      attach_vpc(desired_vpc, internet_gateway) if desired_vpc
 
       internet_gateway
     end
   end
 
   def update_aws_object(internet_gateway)
-    ec2_resource = new_resource.driver.ec2.describe_internet_gateways(:internet_gateway_ids=>[internet_gateway.id])
+    ec2_resource = new_resource.driver.ec2.describe_internet_gateways(internet_gateway_ids: [internet_gateway.id])
     current_vpc = ec2_resource.internet_gateways.first.attachments.first
 
     if new_resource.vpc
@@ -57,8 +55,8 @@ class Chef::Provider::AwsInternetGateway < Chef::Provisioning::AWSDriver::AWSPro
 
   def attach_vpc(vpc, desired_gateway)
     if vpc.internet_gateways.first && vpc.internet_gateways.first != desired_gateway
-      current_driver = self.new_resource.driver
-      current_chef_server = self.new_resource.chef_server
+      current_driver = new_resource.driver
+      current_chef_server = new_resource.chef_server
       Cheffish.inline_resource(self, action) do
         aws_vpc vpc.id do
           cidr_block vpc.cidr_block
@@ -74,7 +72,7 @@ class Chef::Provider::AwsInternetGateway < Chef::Provisioning::AWSDriver::AWSPro
   end
 
   def detach_vpc(internet_gateway)
-    ec2_resource = new_resource.driver.ec2.describe_internet_gateways(:internet_gateway_ids=>[internet_gateway.id])
+    ec2_resource = new_resource.driver.ec2.describe_internet_gateways(internet_gateway_ids: [internet_gateway.id])
     vpcid = ec2_resource.internet_gateways.first.attachments.first
     vpc_id = vpcid.vpc_id unless vpcid.nil?
     if vpc_id
@@ -83,5 +81,4 @@ class Chef::Provider::AwsInternetGateway < Chef::Provisioning::AWSDriver::AWSPro
       end
     end
   end
-
 end

data/lib/chef/provider/aws_key_pair.rb

@@ -1,7 +1,6 @@
-require 'chef/provider/lwrp_base'
-require 'chef/provisioning/aws_driver/aws_provider'
-require 'aws-sdk'
-
+require "chef/provider/lwrp_base"
+require "chef/provisioning/aws_driver/aws_provider"
+require "aws-sdk"
 
 class Chef::Provider::AwsKeyPair < Chef::Provisioning::AWSDriver::AWSProvider
   provides :aws_key_pair
@@ -13,7 +12,7 @@ class Chef::Provider::AwsKeyPair < Chef::Provisioning::AWSDriver::AWSProvider
   action :destroy do
     if current_resource_exists?
       converge_by "delete AWS key pair #{new_resource.name} on region #{region}" do
-        driver.ec2.delete_key_pair({key_name:new_resource.name})
+        driver.ec2.delete_key_pair(key_name: new_resource.name)
       end
     end
   end
@@ -43,7 +42,6 @@ class Chef::Provider::AwsKeyPair < Chef::Provisioning::AWSDriver::AWSProvider
         ensure_keys(action)
       end
 
-
       # “The nice thing about standards is that you have so many to
       # choose from.” - Andrew S. Tanenbaum
       #
@@ -55,11 +53,11 @@ class Chef::Provider::AwsKeyPair < Chef::Provisioning::AWSDriver::AWSProvider
       #
       # So compute both possible AWS fingerprints and check if either of
       # them matches.
-      new_fingerprints = [Cheffish::KeyFormatter.encode(desired_key, :format => :fingerprint)]
+      new_fingerprints = [Cheffish::KeyFormatter.encode(desired_key, format: :fingerprint)]
       if RUBY_VERSION.to_f < 2.0
         if @@use_pkcs8.nil?
           begin
-            require 'openssl_pkcs8'
+            require "openssl_pkcs8"
             @@use_pkcs8 = true
           rescue LoadError
             Chef::Log.warn("The openssl_pkcs8 gem is not loaded: you may not be able to read key fingerprints created by some cloud providers.  gem install openssl_pkcs8 to fix!")
@@ -68,15 +66,15 @@ class Chef::Provider::AwsKeyPair < Chef::Provisioning::AWSDriver::AWSProvider
         end
         if @@use_pkcs8
           new_fingerprints << Cheffish::KeyFormatter.encode(desired_private_key,
-                                :format => :pkcs8sha1fingerprint)
+                                                            format: :pkcs8sha1fingerprint)
         end
       end
 
-      if !new_fingerprints.any? { |f| compare_public_key f }
+      if new_fingerprints.none? { |f| compare_public_key f }
         if new_resource.allow_overwrite
           converge_by "update #{key_description} to match local key at #{new_resource.private_key_path}" do
-            driver.ec2.delete_key_pair({key_name:new_resource.name})
-            driver.ec2.import_key_pair({key_name: new_resource.name, public_key_material: Cheffish::KeyFormatter.encode(desired_key, :format => :openssh)})
+            driver.ec2.delete_key_pair(key_name: new_resource.name)
+            driver.ec2.import_key_pair(key_name: new_resource.name, public_key_material: Cheffish::KeyFormatter.encode(desired_key, format: :openssh))
           end
         else
           raise "#{key_description} with fingerprint #{@current_fingerprint} does not match local key fingerprint(s) #{new_fingerprints}, and allow_overwrite is false!"
@@ -88,7 +86,7 @@ class Chef::Provider::AwsKeyPair < Chef::Provisioning::AWSDriver::AWSProvider
 
       # Create key
       converge_by "create #{key_description} from local key at #{new_resource.private_key_path}" do
-        driver.ec2.import_key_pair({key_name: new_resource.name, public_key_material: Cheffish::KeyFormatter.encode(desired_key, :format => :openssh)})
+        driver.ec2.import_key_pair(key_name: new_resource.name, public_key_material: Cheffish::KeyFormatter.encode(desired_key, format: :openssh))
       end
     end
   end
@@ -104,7 +102,7 @@ class Chef::Provider::AwsKeyPair < Chef::Provisioning::AWSDriver::AWSProvider
       private_key private_key_path do
         public_key_path resource.public_key_path
         if resource.private_key_options
-          resource.private_key_options.each_pair do |key,value|
+          resource.private_key_options.each_pair do |key, value|
             send(key, value)
           end
         end
@@ -135,12 +133,12 @@ class Chef::Provider::AwsKeyPair < Chef::Provisioning::AWSDriver::AWSProvider
   end
 
   def current_resource_exists?
-    @current_resource.action != [ :destroy ]
+    @current_resource.action != [:destroy]
   end
 
   def compare_public_key(new)
-    c = @current_fingerprint.split[0,2].join(' ')
-    n = new.split[0,2].join(' ')
+    c = @current_fingerprint.split[0, 2].join(" ")
+    n = new.split[0, 2].join(" ")
     c == n
   end
 

data/lib/chef/provider/aws_launch_configuration.rb

@@ -1,6 +1,6 @@
-require 'chef/provisioning/aws_driver/aws_provider'
-require 'chef/resource/aws_image'
-require 'base64'
+require "chef/provisioning/aws_driver/aws_provider"
+require "chef/resource/aws_image"
+require "base64"
 
 class Chef::Provider::AwsLaunchConfiguration < Chef::Provisioning::AWSDriver::AWSProvider
   provides :aws_launch_configuration
@@ -27,20 +27,20 @@ class Chef::Provider::AwsLaunchConfiguration < Chef::Provisioning::AWSDriver::AW
     if new_resource.image
       image_id = Chef::Resource::AwsImage.get_aws_object_id(new_resource.image, resource: new_resource)
       if image_id != launch_configuration.image_id
-        raise "#{new_resource.to_s}.image = #{new_resource.image}, but actual launch configuration has image set to #{launch_configuration.image_id}.  Cannot be modified!"
+        raise "#{new_resource}.image = #{new_resource.image}, but actual launch configuration has image set to #{launch_configuration.image_id}.  Cannot be modified!"
       end
     end
     if new_resource.instance_type
       if new_resource.instance_type != launch_configuration.instance_type
-        raise "#{new_resource.to_s}.instance_type = #{new_resource.instance_type}, but actual launch configuration has instance_type set to #{launch_configuration.instance_type}.  Cannot be modified!"
+        raise "#{new_resource}.instance_type = #{new_resource.instance_type}, but actual launch configuration has instance_type set to #{launch_configuration.instance_type}.  Cannot be modified!"
       end
     end
-    # TODO compare options
+    # TODO: compare options
   end
 
   def destroy_aws_object(launch_configuration)
     converge_by "delete launch configuration #{new_resource.name} in #{region}" do
-      # TODO add a timeout here.
+      # TODO: add a timeout here.
       # TODO is InUse really a status guaranteed to go away??
       begin
         new_resource.driver.auto_scaling_client.delete_launch_configuration(launch_configuration_name: launch_configuration.launch_configuration_name)
@@ -54,12 +54,9 @@ class Chef::Provider::AwsLaunchConfiguration < Chef::Provisioning::AWSDriver::AW
   private
 
   def ensure_base64_encoded(data)
-    begin
-      Base64.strict_decode64(data)
-      return data
-    rescue ArgumentError
-      return Base64.encode64(data)
-    end
+    Base64.strict_decode64(data)
+    data
+  rescue ArgumentError
+    Base64.encode64(data)
   end
-
 end

data/lib/chef/provider/aws_load_balancer.rb

@@ -1,7 +1,6 @@
-require 'chef/provisioning/aws_driver/aws_provider'
+require "chef/provisioning/aws_driver/aws_provider"
 
 class Chef::Provider::AwsLoadBalancer < Chef::Provisioning::AWSDriver::AWSProvider
-
   def aws_tagger
     @aws_tagger ||= begin
       elb_strategy = Chef::Provisioning::AWSDriver::TaggingStrategy::ELB.new(

data/lib/chef/provider/aws_nat_gateway.rb

@@ -1,8 +1,7 @@
-#require 'chef/provisioning/aws_driver/aws_provider'
-require 'retryable'
+# require 'chef/provisioning/aws_driver/aws_provider'
+require "retryable"
 
 class Chef::Provider::AwsNatGateway < Chef::Provisioning::AWSDriver::AWSProvider
-
   provides :aws_nat_gateway
 
   protected
@@ -14,7 +13,7 @@ class Chef::Provider::AwsNatGateway < Chef::Provisioning::AWSDriver::AWSProvider
     subnet = Chef::Resource::AwsSubnet.get_aws_object(new_resource.subnet, resource: new_resource)
 
     if new_resource.eip_address.nil?
-      # TODO Ideally it would be nice to automatically manage an eip address but
+      # TODO: Ideally it would be nice to automatically manage an eip address but
       # the lack of tagging support and the limited SDK interaction with these two
       # resources makes that too hard right now. So we force the user to manage their
       # eip address as a seperate resource.
@@ -24,8 +23,8 @@ class Chef::Provider::AwsNatGateway < Chef::Provisioning::AWSDriver::AWSProvider
 
     converge_by "create nat gateway #{new_resource.name} in region #{region} for subnet #{subnet}" do
       options = {
-          subnet_id: subnet.id,
-          allocation_id: eip_address.allocation_id
+        subnet_id: subnet.id,
+        allocation_id: eip_address.allocation_id
       }
 
       nat_gateway = new_resource.driver.ec2_resource.create_nat_gateway(options)
@@ -42,7 +41,7 @@ class Chef::Provider::AwsNatGateway < Chef::Provisioning::AWSDriver::AWSProvider
 
     if new_resource.eip_address
       eip_address = Chef::Resource::AwsEipAddress.get_aws_object(new_resource.eip_address, resource: new_resource)
-      if eip_address.nil? or eip_address.allocation_id != nat_gateway.nat_gateway_addresses.first.allocation_id
+      if eip_address.nil? || (eip_address.allocation_id != nat_gateway.nat_gateway_addresses.first.allocation_id)
         raise "Nat gateway elastic ip address cannot be changed after being created! Desired elastic ip address for #{new_resource.name} (#{nat_gateway.id}) was \"#{nat_gateway.nat_gateway_addresses.first.allocation_id}\" and actual description is \"#{eip_address.allocation_id}\""
       end
     end

data/lib/chef/provider/aws_network_acl.rb

@@ -1,6 +1,6 @@
-require 'chef/provisioning/aws_driver/aws_provider'
-require 'chef/resource/aws_vpc'
-require 'retryable'
+require "chef/provisioning/aws_driver/aws_provider"
+require "chef/resource/aws_vpc"
+require "retryable"
 
 class Chef::Provider::AwsNetworkAcl < Chef::Provisioning::AWSDriver::AWSProvider
   include Chef::Provisioning::AWSDriver::TaggingStrategy::EC2ConvergeTags
@@ -25,24 +25,24 @@ class Chef::Provider::AwsNetworkAcl < Chef::Provisioning::AWSDriver::AWSProvider
 
       network_acl = new_resource.driver.ec2_resource.create_network_acl(options)
       retry_with_backoff(::Aws::EC2::Errors::InvalidNetworkAclIDNotFound) do
-        network_acl.create_tags({tags: [{key: "Name", value: new_resource.name}]})
+        network_acl.create_tags(tags: [{ key: "Name", value: new_resource.name }])
       end
       network_acl
     end
   end
 
   def update_aws_object(network_acl)
-    if !new_resource.vpc.nil?
+    unless new_resource.vpc.nil?
       desired_vpc = Chef::Resource::AwsVpc.get_aws_object_id(new_resource.vpc, resource: new_resource)
       if desired_vpc != network_acl.vpc_id
-        raise "Network ACL VPC cannot be changed after being created!  Desired VPC for #{new_resource.to_s} was #{new_resource.vpc} (#{desired_vpc}) and actual VPC is #{network_acl.vpc_id}"
+        raise "Network ACL VPC cannot be changed after being created!  Desired VPC for #{new_resource} was #{new_resource.vpc} (#{desired_vpc}) and actual VPC is #{network_acl.vpc_id}"
       end
     end
   end
 
   def destroy_aws_object(network_acl)
-    # TODO if purging, do we need to destory the linked subnets?
-    converge_by "delete #{new_resource.to_s} in #{region}" do
+    # TODO: if purging, do we need to destory the linked subnets?
+    converge_by "delete #{new_resource} in #{region}" do
       network_acl.delete
     end
   end
@@ -55,7 +55,7 @@ class Chef::Provider::AwsNetworkAcl < Chef::Provisioning::AWSDriver::AWSProvider
     outbound_rules = new_resource.outbound_rules
     # AWS requires a deny all rule at the end. Delete here so we don't
     # try to compare.
-    current_rules.delete_if { |rule| rule[:rule_number] == 32767 }
+    current_rules.delete_if { |rule| rule[:rule_number] == 32_767 }
 
     current_inbound_rules = current_rules.select { |rule| rule[:egress] == false }
     # If inbound_rules is nil, leave rules alone. If empty array, delete all.
@@ -76,25 +76,24 @@ class Chef::Provider::AwsNetworkAcl < Chef::Provisioning::AWSDriver::AWSProvider
 
     # Get the desired rules in a comparable state
     desired_rules.clone.each do |desired_rule|
-      matching_rule = current_rules.select { |r| r[:rule_number] == desired_rule[:rule_number]}.first
-      if matching_rule
-        # Anything unhandled will be removed
-        current_rules.delete(matching_rule)
-        # Anything unhandled will be added
-        desired_rules.delete(desired_rule)
-
-        # Converting matching_rule [:rule_action] and [:port_range] to symbol & hash to match correctly with desired_rule
-        matching_rule[:rule_action] = matching_rule[:rule_action].to_sym unless matching_rule[:rule_action].nil?
-        matching_rule[:port_range] = matching_rule[:port_range].to_hash unless matching_rule[:port_range].nil?
-        if matching_rule.merge(desired_rule) != matching_rule
-          # Replace anything with a matching rule number but different attributes
-          replace_rules << desired_rule
-        end
+      matching_rule = current_rules.select { |r| r[:rule_number] == desired_rule[:rule_number] }.first
+      next unless matching_rule
+      # Anything unhandled will be removed
+      current_rules.delete(matching_rule)
+      # Anything unhandled will be added
+      desired_rules.delete(desired_rule)
+
+      # Converting matching_rule [:rule_action] and [:port_range] to symbol & hash to match correctly with desired_rule
+      matching_rule[:rule_action] = matching_rule[:rule_action].to_sym unless matching_rule[:rule_action].nil?
+      matching_rule[:port_range] = matching_rule[:port_range].to_hash unless matching_rule[:port_range].nil?
+      if matching_rule.merge(desired_rule) != matching_rule
+        # Replace anything with a matching rule number but different attributes
+        replace_rules << desired_rule
       end
     end
 
     unless replace_rules.empty? && desired_rules.empty? && current_rules.empty?
-      action_handler.report_progress "update network ACL #{new_resource.name} #{direction.to_s} rules"
+      action_handler.report_progress "update network ACL #{new_resource.name} #{direction} rules"
       replace_rules(network_acl, replace_rules)
       add_rules(network_acl, desired_rules)
       remove_rules(network_acl, current_rules)
@@ -123,14 +122,14 @@ class Chef::Provider::AwsNetworkAcl < Chef::Provisioning::AWSDriver::AWSProvider
   end
 
   def rule_direction(rule)
-    rule[:egress] == true ? 'egress' : 'ingress'
+    rule[:egress] == true ? "egress" : "ingress"
   end
 
   def entry_to_hash(entry)
-    options = [
-      :rule_number, :rule_action, :protocol, :cidr_block, :egress,
-      :port_range, :icmp_type_code
-    ]
+    options = %i{
+      rule_number rule_action protocol cidr_block egress
+      port_range icmp_type_code
+    }
     entry_hash = {}
     options.each { |option| entry_hash.merge!(option => entry.send(option.to_sym)) }
     entry_hash

data/lib/chef/provider/aws_network_interface.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::AwsNetworkInterface < Chef::Provisioning::AWSDriver::AWSProvider
   include Chef::Provisioning::AWSDriver::TaggingStrategy::EC2ConvergeTags
@@ -23,9 +23,7 @@ class Chef::Provider::AwsNetworkInterface < Chef::Provisioning::AWSDriver::AWSPr
   def action_create
     eni = super
 
-    if !new_resource.machine.nil?
-      update_eni(eni)
-    end
+    update_eni(eni) unless new_resource.machine.nil?
   end
 
   protected
@@ -50,30 +48,31 @@ class Chef::Provider::AwsNetworkInterface < Chef::Provisioning::AWSDriver::AWSPr
   end
 
   def update_aws_object(eni)
-    if options.has_key?(:subnet_id)
+    if options.key?(:subnet_id)
       if Chef::Resource::AwsSubnet.get_aws_object(options[:subnet_id], resource: new_resource).id != eni.subnet.id
         raise "#{new_resource} subnet is #{new_resource.subnet}, but actual network interface has subnet set to #{eni.subnet_id}.  Cannot be modified!"
       end
     end
 
-    # TODO implement private ip reassignment
-    if options.has_key?(:private_ip_address)
+    # TODO: implement private ip reassignment
+    if options.key?(:private_ip_address)
       if options[:private_ip_address] != eni.private_ip_address
         raise "#{new_resource} private IP is #{new_resource.private_ip_address}, but actual network interface has private IP set to #{eni.private_ip_address}.  Private IP reassignment not implemented. Cannot be modified!"
       end
     end
 
-    if options.has_key?(:description)
+    if options.key?(:description)
       if options[:description] != eni.description
         converge_by "set #{new_resource} description to #{new_resource.description}" do
-          eni.client.modify_network_interface_attribute(:network_interface_id => eni.network_interface_id,
-                                                        :description => {
-                                                            :value => new_resource.description })
+          eni.client.modify_network_interface_attribute(network_interface_id: eni.network_interface_id,
+                                                        description: {
+                                                          value: new_resource.description
+                                                        })
         end
       end
     end
 
-    if options.has_key?(:groups)
+    if options.key?(:groups)
       groups = new_resource.security_groups
       eni_security_groups = []
       eni.groups.each do |group|
@@ -82,7 +81,7 @@ class Chef::Provider::AwsNetworkInterface < Chef::Provisioning::AWSDriver::AWSPr
 
       if groups.sort != eni_security_groups.sort
         converge_by "set #{new_resource} security groups to #{groups}" do
-          eni.client.modify_network_interface_attribute(:network_interface_id => eni.network_interface_id, :groups => groups)
+          eni.client.modify_network_interface_attribute(network_interface_id: eni.network_interface_id, groups: groups)
         end
       end
     end
@@ -100,20 +99,20 @@ class Chef::Provider::AwsNetworkInterface < Chef::Provisioning::AWSDriver::AWSPr
   def expected_instance
     # use instance if already set
     @expected_instance ||= new_resource.machine ?
-      # if not, and machine is set, find and return the instance
+        # if not, and machine is set, find and return the instance
         Chef::Resource::AwsInstance.get_aws_object(new_resource.machine, resource: new_resource) :
-      # otherwise return nil
+        # otherwise return nil
         nil
   end
 
   def options
     @options ||= begin
       options = {}
-      options[:subnet_id] = new_resource.subnet if !new_resource.subnet.nil?
-      options[:private_ip_address] = new_resource.private_ip_address if !new_resource.private_ip_address.nil?
-      options[:description] = new_resource.description if !new_resource.description.nil?
-      options[:groups] = new_resource.security_groups if !new_resource.security_groups.nil?
-      options[:device_index] = new_resource.device_index if !new_resource.device_index.nil?
+      options[:subnet_id] = new_resource.subnet unless new_resource.subnet.nil?
+      options[:private_ip_address] = new_resource.private_ip_address unless new_resource.private_ip_address.nil?
+      options[:description] = new_resource.description unless new_resource.description.nil?
+      options[:groups] = new_resource.security_groups unless new_resource.security_groups.nil?
+      options[:device_index] = new_resource.device_index unless new_resource.device_index.nil?
 
       AWSResource.lookup_options(options, resource: new_resource)
     end
@@ -136,7 +135,7 @@ class Chef::Provider::AwsNetworkInterface < Chef::Provisioning::AWSDriver::AWSPr
           attach(eni)
         end
       when nil
-        raise NetworkInterfaceNotFoundError.new(new_resource)
+        raise NetworkInterfaceNotFoundError, new_resource
       else
         raise NetworkInterfaceInvalidStatusError.new(new_resource, status)
       end
@@ -193,12 +192,11 @@ class Chef::Provider::AwsNetworkInterface < Chef::Provisioning::AWSDriver::AWSPr
         Chef::Log.info("waiting for network interface to delete...")
       }
 
-      Retryable.retryable(:tries => 30, :sleep => 2, :on => NetworkInterfaceStatusTimeoutError, :ensure => log_callback) do
+      Retryable.retryable(tries: 30, sleep: 2, on: NetworkInterfaceStatusTimeoutError, ensure: log_callback) do
         result = new_resource.driver.ec2_resource.network_interface(eni.id) if eni.id
-		raise NetworkInterfaceStatusTimeoutError.new(new_resource, "exists", "deleted") if new_resource.exists?(result)
+        raise NetworkInterfaceStatusTimeoutError.new(new_resource, "exists", "deleted") if new_resource.exists?(result)
       end
       eni
     end
   end
-
 end