chef-provisioning-aws 3.0.4 → 3.0.6

data/lib/chef/provisioning/aws_driver/tagging_strategy/rds.rb

@@ -1,4 +1,4 @@
-require 'chef/provisioning/aws_driver/aws_tagger'
+require "chef/provisioning/aws_driver/aws_tagger"
 
 ####################
 # NOTE FROM http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.html
@@ -19,6 +19,7 @@ module Chef::Provisioning::AWSDriver::TaggingStrategy
         Chef::Provisioning::AWSDriver::AWSTagger.new(rds_strategy, action_handler)
       end
     end
+
     def converge_tags
       aws_tagger.converge_tags
     end
@@ -33,10 +34,10 @@ module Chef::Provisioning::AWSDriver::TaggingStrategy
         account_id = begin
           u = new_resource.driver.iam.get_user
           # We've got an AWS account root credential or an IAM admin with access rights
-          u[:user][:arn].match('^arn:aws:iam::([0-9]{12}):.*$')[1]
+          u[:user][:arn].match("^arn:aws:iam::([0-9]{12}):.*$")[1]
         rescue ::Aws::IAM::Errors::AccessDenied => e
           # We've got an AWS IAM Credential
-          e.to_s.match('^User: arn:aws:iam::([0-9]{12}):.*$')[1]
+          e.to_s.match("^User: arn:aws:iam::([0-9]{12}):.*$")[1]
         end
         # arn:aws:rds:<region>:<account number>:<resourcetype>:<name>
         "arn:aws:rds:#{region}:#{account_id}:#{rds_type}:#{name}"
@@ -46,47 +47,45 @@ module Chef::Provisioning::AWSDriver::TaggingStrategy
 end
 
 module Chef::Provisioning::AWSDriver::TaggingStrategy
-class RDS
-
-  attr_reader :rds_client, :rds_object_arn, :desired_tags
+  class RDS
+    attr_reader :rds_client, :rds_object_arn, :desired_tags
 
-  def initialize(rds_client, rds_object_arn, desired_tags)
-    @rds_client = rds_client
-    @rds_object_arn = rds_object_arn
-    @desired_tags = desired_tags
-  end
+    def initialize(rds_client, rds_object_arn, desired_tags)
+      @rds_client = rds_client
+      @rds_object_arn = rds_object_arn
+      @desired_tags = desired_tags
+    end
 
-  def current_tags
-    # http://docs.aws.amazon.com/sdkforruby/api/Aws/RDS/Client.html#list_tags_for_resource-instance_method
-    resp = rds_client.list_tags_for_resource({
-      resource_name: rds_object_arn
-    })
-    Hash[resp.tag_list.map {|t| [t.key, t.value]}]
-  end
+    def current_tags
+      # http://docs.aws.amazon.com/sdkforruby/api/Aws/RDS/Client.html#list_tags_for_resource-instance_method
+      resp = rds_client.list_tags_for_resource(
+        resource_name: rds_object_arn
+      )
+      Hash[resp.tag_list.map { |t| [t.key, t.value] }]
+    end
 
-  def set_tags(tags)
-    # http://docs.aws.amazon.com/sdkforruby/api/Aws/RDS/Client.html#add_tags_to_resource-instance_method
-    # Unlike EC2, RDS tags can have a nil value
-    tags = tags.map {|k,v|
-      if v.nil?
-        {key: k}
-      else
-        {key: k, value: v}
+    def set_tags(tags)
+      # http://docs.aws.amazon.com/sdkforruby/api/Aws/RDS/Client.html#add_tags_to_resource-instance_method
+      # Unlike EC2, RDS tags can have a nil value
+      tags = tags.map do |k, v|
+        if v.nil?
+          { key: k }
+        else
+          { key: k, value: v }
+        end
       end
-    }
-    rds_client.add_tags_to_resource({
-      resource_name: rds_object_arn,
-      tags: tags
-    })
-  end
+      rds_client.add_tags_to_resource(
+        resource_name: rds_object_arn,
+        tags: tags
+      )
+    end
 
-  def delete_tags(tag_keys)
-    # http://docs.aws.amazon.com/sdkforruby/api/Aws/RDS/Client.html#remove_tags_from_resource-instance_method
-    rds_client.remove_tags_from_resource({
-      resource_name: rds_object_arn,
-      tag_keys: tag_keys
-    })
+    def delete_tags(tag_keys)
+      # http://docs.aws.amazon.com/sdkforruby/api/Aws/RDS/Client.html#remove_tags_from_resource-instance_method
+      rds_client.remove_tags_from_resource(
+        resource_name: rds_object_arn,
+        tag_keys: tag_keys
+      )
+    end
   end
-
-end
 end

data/lib/chef/provisioning/aws_driver/tagging_strategy/s3.rb

@@ -1,51 +1,49 @@
-require 'chef/provisioning/aws_driver/aws_tagger'
+require "chef/provisioning/aws_driver/aws_tagger"
 module Chef::Provisioning::AWSDriver::TaggingStrategy
-class S3
+  class S3
+    attr_reader :s3_client, :bucket_name, :desired_tags
 
-  attr_reader :s3_client, :bucket_name, :desired_tags
-
-  def initialize(s3_client, bucket_name, desired_tags)
-    @s3_client = s3_client
-    @bucket_name = bucket_name
-    @desired_tags = desired_tags
-  end
+    def initialize(s3_client, bucket_name, desired_tags)
+      @s3_client = s3_client
+      @bucket_name = bucket_name
+      @desired_tags = desired_tags
+    end
 
-  def current_tags
-    # http://docs.aws.amazon.com/sdkforruby/api/Aws/S3/Client.html#get_bucket_tagging-instance_method
-    resp = s3_client.get_bucket_tagging({
-      bucket: bucket_name
-    })
-    Hash[resp.tag_set.map {|t| [t.key, t.value]}]
-  rescue ::Aws::S3::Errors::NoSuchTagSet => e
-    # Instead of returning nil or empty, AWS raises an error :)
-    {}
-  end
+    def current_tags
+      # http://docs.aws.amazon.com/sdkforruby/api/Aws/S3/Client.html#get_bucket_tagging-instance_method
+      resp = s3_client.get_bucket_tagging(
+        bucket: bucket_name
+      )
+      Hash[resp.tag_set.map { |t| [t.key, t.value] }]
+    rescue ::Aws::S3::Errors::NoSuchTagSet => e
+      # Instead of returning nil or empty, AWS raises an error :)
+      {}
+    end
 
-  def set_tags(tags)
-    return if @is_set_tag
-    # It will also run from delete_tags to prevent two times execution of same api class variable is defined
-    @is_set_tag = true
-    # http://docs.aws.amazon.com/sdkforruby/api/Aws/S3/Client.html#put_bucket_tagging-instance_method
-    s3_client.put_bucket_tagging({
-      bucket: bucket_name,
-      tagging: {
-        tag_set: desired_tags.map {|k,v| {key: k.to_s, value: v.to_s} }
-      }
-    })
-  end
+    def set_tags(_tags)
+      return if @is_set_tag
+      # It will also run from delete_tags to prevent two times execution of same api class variable is defined
+      @is_set_tag = true
+      # http://docs.aws.amazon.com/sdkforruby/api/Aws/S3/Client.html#put_bucket_tagging-instance_method
+      s3_client.put_bucket_tagging(
+        bucket: bucket_name,
+        tagging: {
+          tag_set: desired_tags.map { |k, v| { key: k.to_s, value: v.to_s } }
+        }
+      )
+    end
 
-  def delete_tags(tag_keys)
-    if desired_tags.empty?
-      s3_client.delete_bucket_tagging({
-        bucket: bucket_name
-      })
-    else
-      set_tags(desired_tags)
+    def delete_tags(_tag_keys)
+      if desired_tags.empty?
+        s3_client.delete_bucket_tagging(
+          bucket: bucket_name
+        )
+      else
+        set_tags(desired_tags)
+      end
+      # S3 doesn't have a client action for deleting individual tags, just ALL tags.  But the
+      # put_bucket_tagging method will set the tags to what is provided so we don't need to
+      # worry about this
     end
-    # S3 doesn't have a client action for deleting individual tags, just ALL tags.  But the
-    # put_bucket_tagging method will set the tags to what is provided so we don't need to
-    # worry about this
   end
-
-end
 end

data/lib/chef/provisioning/aws_driver/version.rb

@@ -1,7 +1,7 @@
 class Chef
-module Provisioning
-module AWSDriver
-  VERSION = '3.0.4'
-end
-end
+  module Provisioning
+    module AWSDriver
+      VERSION = "3.0.6".freeze
+    end
+  end
 end

data/lib/chef/provisioning/driver_init/aws.rb

@@ -1,3 +1,3 @@
-require 'chef/provisioning/aws_driver'
+require "chef/provisioning/aws_driver"
 
-Chef::Provisioning.register_driver_class('aws', Chef::Provisioning::AWSDriver::Driver)
+Chef::Provisioning.register_driver_class("aws", Chef::Provisioning::AWSDriver::Driver)

data/lib/chef/resource/aws_auto_scaling_group.rb

@@ -1,4 +1,4 @@
-require 'chef/provisioning/aws_driver/aws_resource'
+require "chef/provisioning/aws_driver/aws_resource"
 
 class Chef::Resource::AwsAutoScalingGroup < Chef::Provisioning::AWSDriver::AWSResource
   include Chef::Provisioning::AWSDriver::AWSTaggable

data/lib/chef/resource/aws_cache_cluster.rb

@@ -1,5 +1,5 @@
-require 'chef/provisioning/aws_driver/aws_resource'
-require 'chef/resource/aws_security_group'
+require "chef/provisioning/aws_driver/aws_resource"
+require "chef/resource/aws_security_group"
 
 # AWS Elasticache Cluster
 #
@@ -32,10 +32,9 @@ class Chef::Resource::AwsCacheCluster < Chef::Provisioning::AWSDriver::AWSResour
   #
   # @param :preferred_availability_zones [String, Array] One or more preferred availability zones
   attribute :preferred_availability_zones,
-            kind_of: [ String, Array ],
+            kind_of: [String, Array],
             coerce: proc { |v| [v].flatten }
 
-
   # Number of Nodes
   #
   # @param :number_nodes [Integer] Number of nodes in the cache
@@ -65,17 +64,15 @@ class Chef::Resource::AwsCacheCluster < Chef::Provisioning::AWSDriver::AWSResour
   #
   # @param :security_groups [String, Array, AwsSecurityGroup, ::Aws::EC2::SecurityGroup] one or more VPC security groups associated with the cache cluster.
   attribute :security_groups,
-            kind_of: [ String, Array, AwsSecurityGroup, ::Aws::EC2::SecurityGroup ],
+            kind_of: [String, Array, AwsSecurityGroup, ::Aws::EC2::SecurityGroup],
             required: true,
             coerce: proc { |v| [v].flatten }
 
   def aws_object
-    begin
-      driver.elasticache
-        .describe_cache_clusters(cache_cluster_id: cluster_name)
-        .data[:cache_clusters].first
-    rescue ::Aws::ElastiCache::Errors::CacheClusterNotFound
-      nil
-    end
+    driver.elasticache
+          .describe_cache_clusters(cache_cluster_id: cluster_name)
+          .data[:cache_clusters].first
+  rescue ::Aws::ElastiCache::Errors::CacheClusterNotFound
+    nil
   end
 end

data/lib/chef/resource/aws_cache_replication_group.rb

@@ -1,5 +1,5 @@
-require 'chef/provisioning/aws_driver/aws_resource'
-require 'chef/resource/aws_security_group'
+require "chef/provisioning/aws_driver/aws_resource"
+require "chef/resource/aws_security_group"
 
 # AWS Elasticache Replication Group
 # @see See http://docs.aws.amazon.com/AWSRubySDK/latest/AWS/ElastiCache/Client/V20140930.html#create_replication_group-instance_method
@@ -56,7 +56,7 @@ class Chef::Resource::AwsCacheReplicationGroup < Chef::Provisioning::AWSDriver::
   #
   # @param
   attribute :security_groups,
-            kind_of: [ String, Array, AwsSecurityGroup, ::Aws::EC2::SecurityGroup ],
+            kind_of: [String, Array, AwsSecurityGroup, ::Aws::EC2::SecurityGroup],
             required: true,
             coerce: proc { |v| [v].flatten }
 
@@ -64,16 +64,14 @@ class Chef::Resource::AwsCacheReplicationGroup < Chef::Provisioning::AWSDriver::
   #
   # @param
   attribute :preferred_availability_zones,
-            kind_of: [ String, Array ],
+            kind_of: [String, Array],
             coerce: proc { |v| [v].flatten }
 
   def aws_object
-    begin
-      driver.elasticache
-        .describe_replication_groups(replication_group_id: group_name)
-        .data[:replication_groups].first
-    rescue ::Aws::ElastiCache::Errors::ReplicationGroupNotFoundFault
-      nil
-    end
+    driver.elasticache
+          .describe_replication_groups(replication_group_id: group_name)
+          .data[:replication_groups].first
+  rescue ::Aws::ElastiCache::Errors::ReplicationGroupNotFoundFault
+    nil
   end
 end

data/lib/chef/resource/aws_cache_subnet_group.rb

@@ -1,5 +1,5 @@
-require 'chef/provisioning/aws_driver/aws_resource'
-require 'chef/resource/aws_subnet'
+require "chef/provisioning/aws_driver/aws_resource"
+require "chef/resource/aws_subnet"
 
 # AWS Elasticache Subnet Group
 # @see http://docs.aws.amazon.com/AWSRubySDK/latest/AWS/ElastiCache/Client/V20140930.html#create_cache_subnet_group-instance_method
@@ -26,17 +26,15 @@ class Chef::Resource::AwsCacheSubnetGroup < Chef::Provisioning::AWSDriver::AWSRe
   #
   # @param :subnets [ String, Array, AwsSubnet, ::Aws::EC2::Subnet ] One or more subnets in the subnet group.
   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 }
 
   def aws_object
-    begin
-      driver.elasticache
-        .describe_cache_subnet_groups(cache_subnet_group_name: group_name)
-        .data[:cache_subnet_groups].first
-    rescue ::Aws::ElastiCache::Errors::CacheSubnetGroupNotFoundFault
-      nil
-    end
+    driver.elasticache
+          .describe_cache_subnet_groups(cache_subnet_group_name: group_name)
+          .data[:cache_subnet_groups].first
+  rescue ::Aws::ElastiCache::Errors::CacheSubnetGroupNotFoundFault
+    nil
   end
 end

data/lib/chef/resource/aws_cloudsearch_domain.rb

@@ -1,4 +1,4 @@
-require 'chef/provisioning/aws_driver/aws_resource'
+require "chef/provisioning/aws_driver/aws_resource"
 
 module AWS
   class CloudSearch
@@ -13,7 +13,7 @@ end
 class Chef::Resource::AwsCloudsearchDomain < Chef::Provisioning::AWSDriver::AWSResource
   aws_sdk_type ::Aws::CloudSearchDomain
   attribute :name, kind_of: String, name_attribute: true
-  attribute :cloudsearch_api_version, equal_to: ["20130101", "20110201"], default: "20130101"
+  attribute :cloudsearch_api_version, equal_to: %w{20130101 20110201}, default: "20130101"
 
   # Availability Options
   attribute :multi_az, kind_of: [TrueClass, FalseClass], default: false
@@ -30,7 +30,6 @@ class Chef::Resource::AwsCloudsearchDomain < Chef::Provisioning::AWSDriver::AWSR
   # For now we just allow the user to shove the policy in via a string.
   attribute :access_policies, kind_of: String
 
-
   # Indexing Options
   # TODO(ssd): Like Access Polcies, we should decide
   # whether we want a DSL for defining index fields, or just allow the
@@ -41,10 +40,10 @@ class Chef::Resource::AwsCloudsearchDomain < Chef::Provisioning::AWSDriver::AWSR
   # objects in the version of the AWS API we are using.  This will
   # return a hash with some relevant information about the domain.
   def aws_object
-    driver.cloudsearch.describe_domains(domain_names: [name])[:domain_status_list].find {|d| !d[:deleted] }
+    driver.cloudsearch.describe_domains(domain_names: [name])[:domain_status_list].find { |d| !d[:deleted] }
   end
 
-  def cloudsearch_api_version(arg=nil)
+  def cloudsearch_api_version(arg = nil)
     unless arg.nil?
       Chef::Log.warn("The ':cloudsearch_api_version' has been deprecated since it has been removed in AWS SDK version 2.")
     end

data/lib/chef/resource/aws_cloudwatch_alarm.rb

@@ -1,4 +1,4 @@
-require 'chef/provisioning/aws_driver/aws_resource'
+require "chef/provisioning/aws_driver/aws_resource"
 
 class Chef::Resource::AwsCloudwatchAlarm < Chef::Provisioning::AWSDriver::AWSResource
   include Chef::Provisioning::AWSDriver::AWSTaggable
@@ -6,24 +6,24 @@ class Chef::Resource::AwsCloudwatchAlarm < Chef::Provisioning::AWSDriver::AWSRes
   aws_sdk_type ::Aws::CloudWatch::Alarm, id: :name
 
   # This name must be unique within the user's AWS account
-  attribute :name, :kind_of => String, :name_attribute => true
-  attribute :namespace, :kind_of => String
-  attribute :metric_name, :kind_of => String
-  attribute :dimensions, :kind_of => Array
-  attribute :comparison_operator, :kind_of => String
-  attribute :evaluation_periods, :kind_of => Integer
-  attribute :period, :kind_of => [Integer,Float], coerce: proc {|v| v.to_f}
-  attribute :statistic, :kind_of => String
-  attribute :threshold, :kind_of => [Integer,Float]
-  attribute :insufficient_data_actions, :kind_of => Array, coerce: proc {|v| [v].flatten}
-  attribute :ok_actions, :kind_of => Array, coerce: proc {|v| [v].flatten}
-  attribute :alarm_actions, :kind_of => Array, coerce: proc {|v| [v].flatten}
-  attribute :actions_enabled, :kind_of => [TrueClass, FalseClass]
-  attribute :alarm_description, :kind_of => String
-  attribute :unit, :kind_of => String
+  attribute :name, kind_of: String, name_attribute: true
+  attribute :namespace, kind_of: String
+  attribute :metric_name, kind_of: String
+  attribute :dimensions, kind_of: Array
+  attribute :comparison_operator, kind_of: String
+  attribute :evaluation_periods, kind_of: Integer
+  attribute :period, kind_of: [Integer, Float], coerce: proc { |v| v.to_f }
+  attribute :statistic, kind_of: String
+  attribute :threshold, kind_of: [Integer, Float]
+  attribute :insufficient_data_actions, kind_of: Array, coerce: proc { |v| [v].flatten }
+  attribute :ok_actions, kind_of: Array, coerce: proc { |v| [v].flatten }
+  attribute :alarm_actions, kind_of: Array, coerce: proc { |v| [v].flatten }
+  attribute :actions_enabled, kind_of: [TrueClass, FalseClass]
+  attribute :alarm_description, kind_of: String
+  attribute :unit, kind_of: String
 
   def aws_object
-    # TODO exists? isn't defined yet
+    # TODO: exists? isn't defined yet
     # https://github.com/aws/aws-sdk-ruby/issues/1171
     a = driver.cloudwatch_resource.alarm(name)
     return nil if a.data.nil?
@@ -31,5 +31,4 @@ class Chef::Resource::AwsCloudwatchAlarm < Chef::Provisioning::AWSDriver::AWSRes
   rescue ::Aws::CloudWatch::Errors::NoSuchEntity
     nil
   end
-
 end

data/lib/chef/resource/aws_dhcp_options.rb

@@ -1,4 +1,4 @@
-require 'chef/provisioning/aws_driver/aws_resource_with_entry'
+require "chef/provisioning/aws_driver/aws_resource_with_entry"
 
 #
 # DHCP options for use by VPCs.
@@ -61,6 +61,6 @@ class Chef::Resource::AwsDhcpOptions < Chef::Provisioning::AWSDriver::AWSResourc
   def exists?(result)
     return true if result.data
   rescue ::Aws::EC2::Errors::InvalidDhcpOptionIDNotFound
-    return false
+    false
   end
 end

data/lib/chef/resource/aws_ebs_volume.rb

@@ -1,22 +1,22 @@
-require 'chef/provisioning/aws_driver/aws_resource_with_entry'
-require 'chef/resource/aws_instance'
+require "chef/provisioning/aws_driver/aws_resource_with_entry"
+require "chef/resource/aws_instance"
 
 class Chef::Resource::AwsEbsVolume < Chef::Provisioning::AWSDriver::AWSResourceWithEntry
   include Chef::Provisioning::AWSDriver::AWSTaggable
 
-  aws_sdk_type ::Aws::EC2::Volume, backcompat_data_bag_name: 'ebs_volumes'
+  aws_sdk_type ::Aws::EC2::Volume, backcompat_data_bag_name: "ebs_volumes"
 
-  attribute :name,    kind_of: String, name_attribute: true
+  attribute :name, kind_of: String, name_attribute: true
 
-  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 :availability_zone, kind_of: String, default: 'a'
+  attribute :availability_zone, kind_of: String, default: "a"
   attribute :size,              kind_of: Integer, default: 8
   attribute :snapshot,          kind_of: String
 
   attribute :iops,              kind_of: Integer
   attribute :volume_type,       kind_of: String
-  attribute :encrypted,         kind_of: [ TrueClass, FalseClass ]
+  attribute :encrypted,         kind_of: [TrueClass, FalseClass]
   attribute :device,            kind_of: String
 
   attribute :volume_id,         kind_of: String, aws_id_attribute: true, default: lazy {
@@ -26,12 +26,12 @@ class Chef::Resource::AwsEbsVolume < Chef::Provisioning::AWSDriver::AWSResourceW
   def aws_object
     driver, id = get_driver_and_id
     result = driver.ec2_resource.volume(id) if id
-    result && exists?(result) && ![:deleted, :deleting].include?(result.state) ? result : nil
+    result && exists?(result) && !%i{deleted deleting}.include?(result.state) ? result : nil
   end
-  
+
   def exists?(result)
     return true if result.data
   rescue ::Aws::EC2::Errors::InvalidVolumeNotFound
-    return false
+    false
   end
 end