chef-provisioning-aws 3.0.4 → 3.0.6

data/lib/chef/resource/aws_eip_address.rb

@@ -1,11 +1,11 @@
-require 'chef/provisioning/aws_driver/aws_resource_with_entry'
+require "chef/provisioning/aws_driver/aws_resource_with_entry"
 
 class Chef::Resource::AwsEipAddress < Chef::Provisioning::AWSDriver::AWSResourceWithEntry
-  aws_sdk_type ::Aws::OpsWorks::Types::ElasticIp, option_names: [ :public_ip ], id: :public_ip, managed_entry_id_name: 'public_ip', backcompat_data_bag_name: 'eip_addresses'
+  aws_sdk_type ::Aws::OpsWorks::Types::ElasticIp, option_names: [:public_ip], id: :public_ip, managed_entry_id_name: "public_ip", backcompat_data_bag_name: "eip_addresses"
 
   attribute :name, kind_of: String, name_attribute: true
 
-  # TODO network interface
+  # TODO: network interface
   attribute :machine,          kind_of: [String, FalseClass]
   attribute :associate_to_vpc, kind_of: [TrueClass, FalseClass]
 
@@ -22,9 +22,9 @@ class Chef::Resource::AwsEipAddress < Chef::Provisioning::AWSDriver::AWSResource
 
   def action(*args)
     # Backcompat for associate and disassociate
-    if args == [ :associate ]
+    if args == [:associate]
       super(:create)
-    elsif args == [ :disassociate ]
+    elsif args == [:disassociate]
       machine false
       super(:create)
     else

data/lib/chef/resource/aws_elasticsearch_domain.rb

@@ -1,4 +1,4 @@
-require 'chef/provisioning/aws_driver/aws_resource'
+require "chef/provisioning/aws_driver/aws_resource"
 
 module AWS
   class Elasticsearch
@@ -24,7 +24,7 @@ class Chef::Resource::AwsElasticsearchDomain < Chef::Provisioning::AWSDriver::AW
 
   # EBS Options
   attribute :ebs_enabled, kind_of: [TrueClass, FalseClass]
-  attribute :volume_type, equal_to: ["standard", "gp2", "io1"]
+  attribute :volume_type, equal_to: %w{standard gp2 io1}
   attribute :volume_size, kind_of: Integer
   attribute :iops, kind_of: Integer
 
@@ -36,7 +36,7 @@ class Chef::Resource::AwsElasticsearchDomain < Chef::Provisioning::AWSDriver::AW
 
   def aws_object
     driver.elasticsearch_client
-      .describe_elasticsearch_domains(domain_names: [domain_name])[:domain_status_list]
-      .find { |d| !d[:deleted] }
+          .describe_elasticsearch_domains(domain_names: [domain_name])[:domain_status_list]
+          .find { |d| !d[:deleted] }
   end
 end

data/lib/chef/resource/aws_iam_instance_profile.rb

@@ -1,4 +1,4 @@
-require 'chef/provisioning/aws_driver/aws_resource'
+require "chef/provisioning/aws_driver/aws_resource"
 
 #
 # An AWS IAM instance profile, a container for an IAM role that you can use to
@@ -13,23 +13,22 @@ require 'chef/provisioning/aws_driver/aws_resource'
 class Chef::Resource::AwsIamInstanceProfile < Chef::Provisioning::AWSDriver::AWSResource
   # We don't want any lookup_options to try and build a resource from a :iam_instance_profile string,
   # its either a name or an ARN
-  aws_sdk_type ::Aws::IAM::InstanceProfile, :option_names => []
+  aws_sdk_type ::Aws::IAM::InstanceProfile, option_names: []
 
   #
   # The name of the instance profile to create.
   #
-  attribute :name,   kind_of: String, name_attribute: true
+  attribute :name, kind_of: String, name_attribute: true
 
   #
   # The path to the instance profile. For more information about paths, see http://docs.aws.amazon.com/IAM/latest/UserGuide/reference_identifiers.html
   #
   attribute :path,    kind_of: String
 
-  attribute :role,    kind_of: [ String, AwsIamRole, ::Aws::IAM::Role]
+  attribute :role,    kind_of: [String, AwsIamRole, ::Aws::IAM::Role]
 
   def aws_object
     result = driver.iam_resource.instance_profile(name)
     result && result.exists? ? result : nil
   end
-
 end

data/lib/chef/resource/aws_iam_role.rb

@@ -1,4 +1,4 @@
-require 'chef/provisioning/aws_driver/aws_resource'
+require "chef/provisioning/aws_driver/aws_resource"
 
 #
 # An AWS IAM role, specifying set of policies for acessing other AWS services.
@@ -37,7 +37,7 @@ class Chef::Resource::AwsIamRole < Chef::Provisioning::AWSDriver::AWSResource
   #
   attribute :inline_policies, kind_of: Hash, callbacks: {
     "inline_policies must be a hash maping policy names to policy documents" => proc do |policies|
-      policies.all? {|policy_name, policy| (policy_name.is_a?(String) || policy_name.is_a?(Symbol)) && policy.is_a?(String)}
+      policies.all? { |policy_name, policy| (policy_name.is_a?(String) || policy_name.is_a?(Symbol)) && policy.is_a?(String) }
     end
   }
 
@@ -51,5 +51,4 @@ class Chef::Resource::AwsIamRole < Chef::Provisioning::AWSDriver::AWSResource
   rescue ::Aws::IAM::Errors::NoSuchEntity
     nil
   end
-
 end

data/lib/chef/resource/aws_image.rb

@@ -1,12 +1,12 @@
-require 'chef/provisioning/aws_driver/aws_resource_with_entry'
-require 'chef/provisioning/aws_driver/aws_taggable'
+require "chef/provisioning/aws_driver/aws_resource_with_entry"
+require "chef/provisioning/aws_driver/aws_taggable"
 
 class Chef::Resource::AwsImage < Chef::Provisioning::AWSDriver::AWSResourceWithEntry
   include Chef::Provisioning::AWSDriver::AWSTaggable
 
   aws_sdk_type ::Aws::EC2::Image,
                managed_entry_type: :machine_image,
-               managed_entry_id_name: 'image_id'
+               managed_entry_id_name: "image_id"
 
   attribute :name, kind_of: String, name_attribute: true
 

data/lib/chef/resource/aws_instance.rb

@@ -1,5 +1,5 @@
-require 'chef/provisioning/aws_driver/aws_resource_with_entry'
-require 'chef/provisioning/aws_driver/aws_taggable'
+require "chef/provisioning/aws_driver/aws_resource_with_entry"
+require "chef/provisioning/aws_driver/aws_taggable"
 
 class Chef::Resource::AwsInstance < Chef::Provisioning::AWSDriver::AWSResourceWithEntry
   include Chef::Provisioning::AWSDriver::AWSTaggable
@@ -7,8 +7,8 @@ class Chef::Resource::AwsInstance < Chef::Provisioning::AWSDriver::AWSResourceWi
   # The require needs to be inside this class otherwise it gets loaded before the rest of the SDK
   # and starts causing issues - AWS expects to load all this stuff itself
   aws_sdk_type ::Aws::EC2::Instance,
-    managed_entry_type: :machine,
-    managed_entry_id_name: 'instance_id'
+               managed_entry_type: :machine,
+               managed_entry_id_name: "instance_id"
 
   attribute :name, kind_of: String, name_attribute: true
 

data/lib/chef/resource/aws_internet_gateway.rb

@@ -14,7 +14,7 @@ class Chef::Resource::AwsInternetGateway < Chef::Provisioning::AWSDriver::AWSRes
 
   aws_sdk_type ::Aws::EC2::InternetGateway, id: :id
 
-  require 'chef/resource/aws_vpc'
+  require "chef/resource/aws_vpc"
 
   #
   # Extend actions for the internet gateway
@@ -34,7 +34,7 @@ class Chef::Resource::AwsInternetGateway < Chef::Provisioning::AWSDriver::AWSRes
   # - 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]
 
   attribute :internet_gateway_id, kind_of: String, aws_id_attribute: true, default: lazy {
     name =~ /^igw-[a-f0-9]+$/ ? name : nil
@@ -50,6 +50,6 @@ class Chef::Resource::AwsInternetGateway < Chef::Provisioning::AWSDriver::AWSRes
   def exists?(result)
     return true if result.data
   rescue ::Aws::EC2::Errors::InvalidInternetGatewayIDNotFound
-    return false
+    false
   end
 end

data/lib/chef/resource/aws_key_pair.rb

@@ -1,21 +1,21 @@
-require 'chef/provisioning/aws_driver/aws_resource'
+require "chef/provisioning/aws_driver/aws_resource"
 
 class Chef::Resource::AwsKeyPair < Chef::Provisioning::AWSDriver::AWSResource
   aws_sdk_type ::Aws::EC2::KeyPair, id: :name
 
   # Private key to use as input (will be generated if it does not exist)
-  attribute :private_key_path, :kind_of => String
+  attribute :private_key_path, kind_of: String
   # Public key to use as input (will be generated if it does not exist)
-  attribute :public_key_path, :kind_of => String
+  attribute :public_key_path, kind_of: String
   # List of parameters to the private_key resource used for generation of the key
-  attribute :private_key_options, :kind_of => Hash
+  attribute :private_key_options, kind_of: Hash
 
-  # TODO what is the right default for this?
-  attribute :allow_overwrite, :kind_of => [TrueClass, FalseClass], :default => false
+  # TODO: what is the right default for this?
+  attribute :allow_overwrite, kind_of: [TrueClass, FalseClass], default: false
 
   def aws_object
     resource = ::Aws::EC2::Resource.new(driver.ec2)
-    result = resource.key_pairs.find{|b| b.name==name}
+    result = resource.key_pairs.find { |b| b.name == name }
     result
   end
 end

data/lib/chef/resource/aws_launch_configuration.rb

@@ -1,15 +1,15 @@
-require 'chef/provisioning/aws_driver/aws_resource'
+require "chef/provisioning/aws_driver/aws_resource"
 
 class Chef::Resource::AwsLaunchConfiguration < Chef::Provisioning::AWSDriver::AWSResource
   aws_sdk_type ::Aws::AutoScaling::LaunchConfiguration, id: :name
 
   attribute :name,          kind_of: String, name_attribute: true
-  attribute :image,         kind_of: [ String, ::Aws::EC2::Image, ::Aws::EC2::Image ]
+  attribute :image,         kind_of: [String, ::Aws::EC2::Image, ::Aws::EC2::Image]
   attribute :instance_type, kind_of: String
-  attribute :options,       kind_of: Hash,   default: {}
+  attribute :options,       kind_of: Hash, default: {}
 
   def aws_object
-    launchconfig = ::Aws::AutoScaling::LaunchConfiguration.new(name,{client: driver.auto_scaling_client} )
+    launchconfig = ::Aws::AutoScaling::LaunchConfiguration.new(name, client: driver.auto_scaling_client)
     result = launchconfig.data
     result
   end

data/lib/chef/resource/aws_load_balancer.rb

@@ -1,30 +1,30 @@
-require 'chef/provisioning/aws_driver/aws_resource'
-require 'chef/provisioning/aws_driver/aws_taggable'
+require "chef/provisioning/aws_driver/aws_resource"
+require "chef/provisioning/aws_driver/aws_taggable"
 
 class Chef::Resource::AwsLoadBalancer < Chef::Provisioning::AWSDriver::AWSResource
   include Chef::Provisioning::AWSDriver::AWSTaggable
 
   aws_sdk_type ::Aws::AutoScaling::LoadBalancer
 
-  attribute :name, kind_of: String,  name_attribute: true
+  attribute :name, kind_of: String, name_attribute: true
 
   attribute :load_balancer_id, kind_of: String, aws_id_attribute: true, default: lazy {
     name =~ /^elb-[a-f0-9]+$/ ? name : nil
   }
 
   def aws_object
-    result=nil
+    result = nil
     begin
-      result = driver.elb.describe_load_balancers({ load_balancer_names: [name] }).load_balancer_descriptions
+      result = driver.elb.describe_load_balancers(load_balancer_names: [name]).load_balancer_descriptions
       if result.length == 1
         result = result[0]
       else
         raise "Must have 0 or 1 load balancers which match name!"
       end
-    rescue ::Aws::ElasticLoadBalancing::Errors::LoadBalancerNotFound => e
+    rescue ::Aws::ElasticLoadBalancing::Errors::LoadBalancerNotFound
       Chef::Log.debug("No loadbalancer named #{name} - returning nil!")
       result = nil
-    end 
+    end
     result
   end
 end

data/lib/chef/resource/aws_nat_gateway.rb

@@ -33,33 +33,33 @@ class Aws::EC2::NatGateway < ::Aws::Resources::Resource
   end
 
   def delete
-    @client.delete_nat_gateway({ nat_gateway_id: @id })
+    @client.delete_nat_gateway(nat_gateway_id: @id)
   end
 
   private
+
   def get_nat_gateway_struct
-    @client.describe_nat_gateways({ nat_gateway_ids: [@id] }).nat_gateways.first
+    @client.describe_nat_gateways(nat_gateway_ids: [@id]).nat_gateways.first
   end
 end
 
 # See comment on class above as to why we add these methods to the AWS SDK
 class Aws::EC2::Resource
   def create_nat_gateway(options)
-    nat_gateway_struct = self.client.create_nat_gateway(options).nat_gateway
-    self.nat_gateway(nat_gateway_struct.nat_gateway_id)
+    nat_gateway_struct = client.create_nat_gateway(options).nat_gateway
+    nat_gateway(nat_gateway_struct.nat_gateway_id)
   end
 
   def nat_gateway(nat_gateway_id)
-    ::Aws::EC2::NatGateway.new(nat_gateway_id, {client: client})
+    ::Aws::EC2::NatGateway.new(nat_gateway_id, client: client)
   end
 end
 
 class Chef::Resource::AwsNatGateway < Chef::Provisioning::AWSDriver::AWSResourceWithEntry
+  aws_sdk_type ::Aws::EC2::NatGateway, id: :nat_gateway_id, managed_entry_id_name: "nat_gateway_id"
 
-  aws_sdk_type ::Aws::EC2::NatGateway, id: :nat_gateway_id, managed_entry_id_name: 'nat_gateway_id'
-
-  require 'chef/resource/aws_subnet'
-  require 'chef/resource/aws_eip_address'
+  require "chef/resource/aws_subnet"
+  require "chef/resource/aws_eip_address"
 
   #
   # The name of this nat gateway.
@@ -74,7 +74,7 @@ class Chef::Resource::AwsNatGateway < Chef::Provisioning::AWSDriver::AWSResource
   # - An actual `aws_subnet` resource.
   # - An Aws `Subnet` object.
   #
-  attribute :subnet, kind_of: [ String, AwsSubnet, ::Aws::EC2::Subnet ]
+  attribute :subnet, kind_of: [String, AwsSubnet, ::Aws::EC2::Subnet]
 
   #
   # A elastic ip address for the nat gateway.
@@ -84,7 +84,7 @@ class Chef::Resource::AwsNatGateway < Chef::Provisioning::AWSDriver::AWSResource
   # - An actual `aws_eip_address` resource.
   # - nil, meaning that no EIP exists yet and needs to be created.
   #
-  attribute :eip_address, kind_of: [ String, ::Aws::OpsWorks::Types::ElasticIp, AwsEipAddress, nil ], default: nil
+  attribute :eip_address, kind_of: [String, ::Aws::OpsWorks::Types::ElasticIp, AwsEipAddress, nil], default: nil
 
   attribute :nat_gateway_id, kind_of: String, aws_id_attribute: true, default: lazy {
     name =~ /^nat-[A-Fa-f0-9]+$/ ? name : nil

data/lib/chef/resource/aws_network_acl.rb

@@ -1,6 +1,6 @@
-require 'chef/provisioning/aws_driver/aws_resource_with_entry'
-require 'chef/resource/aws_vpc'
-require 'chef/resource/aws_subnet'
+require "chef/provisioning/aws_driver/aws_resource_with_entry"
+require "chef/resource/aws_vpc"
+require "chef/resource/aws_subnet"
 
 class Chef::Resource::AwsNetworkAcl < Chef::Provisioning::AWSDriver::AWSResourceWithEntry
   include Chef::Provisioning::AWSDriver::AWSTaggable
@@ -20,7 +20,7 @@ class Chef::Resource::AwsNetworkAcl < Chef::Provisioning::AWSDriver::AWSResource
   # - 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]
 
   #
   # Accepts rules in the format:
@@ -34,11 +34,11 @@ class Chef::Resource::AwsNetworkAcl < Chef::Provisioning::AWSDriver::AWSResource
   # However, if either is set to `[]` all respective current rules will be removed.
   #
   attribute :inbound_rules,
-            kind_of: [ Array, Hash ],
+            kind_of: [Array, Hash],
             coerce: proc { |v| v && [v].flatten }
 
   attribute :outbound_rules,
-            kind_of: [ Array, Hash ],
+            kind_of: [Array, Hash],
             coerce: proc { |v| v && [v].flatten }
 
   attribute :network_acl_id,
@@ -57,7 +57,6 @@ class Chef::Resource::AwsNetworkAcl < Chef::Provisioning::AWSDriver::AWSResource
   def exists?(result)
     return true if result.data
   rescue ::Aws::EC2::Errors::InvalidNetworkAclIDNotFound
-    return false
+    false
   end
-
 end

data/lib/chef/resource/aws_network_interface.rb

@@ -1,6 +1,6 @@
-require 'chef/provisioning/aws_driver/aws_resource'
-require 'chef/resource/aws_subnet'
-require 'chef/resource/aws_eip_address'
+require "chef/provisioning/aws_driver/aws_resource"
+require "chef/resource/aws_subnet"
+require "chef/resource/aws_eip_address"
 
 class Chef::Resource::AwsNetworkInterface < Chef::Provisioning::AWSDriver::AWSResourceWithEntry
   include Chef::Provisioning::AWSDriver::AWSTaggable
@@ -13,20 +13,20 @@ class Chef::Resource::AwsNetworkInterface < Chef::Provisioning::AWSDriver::AWSRe
     name =~ /^eni-[a-f0-9]+$/ ? name : nil
   }
 
-  attribute :subnet,                 kind_of: [ String, ::Aws::EC2::Subnet, AwsSubnet ]
+  attribute :subnet,                 kind_of: [String, ::Aws::EC2::Subnet, AwsSubnet]
 
   attribute :private_ip_address,     kind_of: String
 
   attribute :description,            kind_of: String
 
-  attribute :security_groups,        kind_of: Array #(Array<SecurityGroup>, Array<String>)
+  attribute :security_groups,        kind_of: Array # (Array<SecurityGroup>, Array<String>)
 
-  attribute :machine,                kind_of: [ String, FalseClass, AwsInstance, ::Aws::EC2::Instance, ::Aws::EC2::Instance ]
+  attribute :machine,                kind_of: [String, FalseClass, AwsInstance, ::Aws::EC2::Instance, ::Aws::EC2::Instance]
 
   attribute :device_index,           kind_of: Integer
 
-  # TODO implement eip address association
-  #attribute :elastic_ip_address,     kind_of: [ String, ::Aws::OpsWorks::Types::ElasticIp, AwsEipAddress, FalseClass ]
+  # TODO: implement eip address association
+  # attribute :elastic_ip_address,     kind_of: [ String, ::Aws::OpsWorks::Types::ElasticIp, AwsEipAddress, FalseClass ]
 
   def aws_object
     driver, id = get_driver_and_id
@@ -37,6 +37,6 @@ class Chef::Resource::AwsNetworkInterface < Chef::Provisioning::AWSDriver::AWSRe
   def exists?(result)
     return true if result.data
   rescue ::Aws::EC2::Errors::InvalidNetworkInterfaceIDNotFound
-    return false
+    false
   end
 end

data/lib/chef/resource/aws_rds_instance.rb

@@ -1,5 +1,5 @@
-require 'chef/provisioning/aws_driver/aws_rds_resource'
-require 'chef/provisioning/aws_driver/aws_taggable'
+require "chef/provisioning/aws_driver/aws_rds_resource"
+require "chef/provisioning/aws_driver/aws_taggable"
 
 class Chef::Resource::AwsRdsInstance < Chef::Provisioning::AWSDriver::AWSRDSResource
   include Chef::Provisioning::AWSDriver::AWSTaggable
@@ -32,8 +32,8 @@ class Chef::Resource::AwsRdsInstance < Chef::Provisioning::AWSDriver::AWSRDSReso
   attribute :additional_options, kind_of: Hash, default: {}
 
   def aws_object
-    result = self.driver.rds_resource.db_instance(name)
-    return nil unless result && result.db_instance_status != 'deleting'
+    result = driver.rds_resource.db_instance(name)
+    return nil unless result && result.db_instance_status != "deleting"
     result
   rescue ::Aws::RDS::Errors::DBInstanceNotFound
     nil

data/lib/chef/resource/aws_rds_parameter_group.rb

@@ -1,5 +1,5 @@
-require 'chef/provisioning/aws_driver/aws_rds_resource'
-require 'chef/provisioning/aws_driver/aws_taggable'
+require "chef/provisioning/aws_driver/aws_rds_resource"
+require "chef/provisioning/aws_driver/aws_taggable"
 
 class Chef::Resource::AwsRdsParameterGroup < Chef::Provisioning::AWSDriver::AWSRDSResource
   include Chef::Provisioning::AWSDriver::AWSTaggable
@@ -19,7 +19,7 @@ class Chef::Resource::AwsRdsParameterGroup < Chef::Provisioning::AWSDriver::AWSR
     initial_request = driver.rds.describe_db_parameters(db_parameter_group_name: name, max_records: 100)
     marker = initial_request[:marker]
     parameters = initial_request[:parameters]
-    while !marker.nil?
+    until marker.nil?
       more_results = driver.rds.describe_db_parameters(db_parameter_group_name: name, max_records: 100, marker: marker)
       parameters += more_results[:parameters]
       marker = more_results[:marker]

data/lib/chef/resource/aws_rds_subnet_group.rb

@@ -1,6 +1,6 @@
-require 'chef/provisioning/aws_driver/aws_rds_resource'
-require 'chef/provisioning/aws_driver/aws_taggable'
-require 'chef/resource/aws_subnet'
+require "chef/provisioning/aws_driver/aws_rds_resource"
+require "chef/provisioning/aws_driver/aws_taggable"
+require "chef/resource/aws_subnet"
 
 class Chef::Resource::AwsRdsSubnetGroup < Chef::Provisioning::AWSDriver::AWSRDSResource
   include Chef::Provisioning::AWSDriver::AWSTaggable
@@ -10,7 +10,7 @@ class Chef::Resource::AwsRdsSubnetGroup < Chef::Provisioning::AWSDriver::AWSRDSR
   attribute :name, kind_of: String, name_attribute: true
   attribute :description, kind_of: String, required: true
   attribute :subnets,
-            kind_of: [ String, Array, AwsSubnet, ::Aws::EC2::Subnet ],
+            kind_of: [String, Array, AwsSubnet, ::Aws::EC2::Subnet],
             required: true,
             coerce: proc { |v| [v].flatten }