chef-provisioning-aws 3.0.4 → 3.0.6

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

@@ -1,16 +1,14 @@
 class Chef
-module Provisioning
-module AWSDriver
-module Exceptions
-
-  class MultipleSecurityGroupError < RuntimeError
-    def initialize(name, groups)
-      super "Found security groups with ids [#{groups.map {|sg| sg.id}}] that share name #{name}. " \
-        "Names are unique within VPCs - specify VPC to find by name."
+  module Provisioning
+    module AWSDriver
+      module Exceptions
+        class MultipleSecurityGroupError < RuntimeError
+          def initialize(name, groups)
+            super "Found security groups with ids [#{groups.map(&:id)}] that share name #{name}. " \
+              "Names are unique within VPCs - specify VPC to find by name."
+          end
+        end
+      end
     end
   end
-
-end
-end
-end
 end

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

@@ -1,77 +1,77 @@
-require 'chef/resource/lwrp_base'
+require "chef/resource/lwrp_base"
 
 class Chef
-module Provisioning
-module AWSDriver
-  class SuperLWRP < Chef::Resource::LWRPBase
-    #
-    # Add the :default lazy { ... } and :coerce validation_opts to `attribute`
-    #
-    if self.respond_to?(:properties)
-      # in Chef 12.5+, properties replace attributes and these respond to
-      # coerce and default with a lazy block - no need for overwriting!
-    else
-      def self.attribute(attr_name, validation_opts={})
-        if validation_opts[:default].is_a?(Chef::DelayedEvaluator)
-          lazy_default = validation_opts.delete(:default)
-        end
-        coerce = validation_opts.delete(:coerce)
-        if lazy_default || coerce
-          define_method(attr_name) do |arg=nil|
-            arg = instance_exec(arg, &coerce) if coerce && !arg.nil?
+  module Provisioning
+    module AWSDriver
+      class SuperLWRP < Chef::Resource::LWRPBase
+        #
+        # Add the :default lazy { ... } and :coerce validation_opts to `attribute`
+        #
+        if respond_to?(:properties)
+          # in Chef 12.5+, properties replace attributes and these respond to
+          # coerce and default with a lazy block - no need for overwriting!
+        else
+          def self.attribute(attr_name, validation_opts = {})
+            if validation_opts[:default].is_a?(Chef::DelayedEvaluator)
+              lazy_default = validation_opts.delete(:default)
+            end
+            coerce = validation_opts.delete(:coerce)
+            if lazy_default || coerce
+              define_method(attr_name) do |arg = nil|
+                arg = instance_exec(arg, &coerce) if coerce && !arg.nil?
 
-            result = set_or_return(attr_name.to_sym, arg, validation_opts)
+                result = set_or_return(attr_name.to_sym, arg, validation_opts)
 
-            if result.nil? && arg.nil?
-              result = instance_eval(&lazy_default) if lazy_default
-            end
+                if result.nil? && arg.nil?
+                  result = instance_eval(&lazy_default) if lazy_default
+                end
 
-            result
-          end
-          define_method(:"#{attr_name}=") do |arg|
-            if arg.nil?
-              remove_instance_variable(:"@#{arg}")
+                result
+              end
+              define_method(:"#{attr_name}=") do |arg|
+                if arg.nil?
+                  remove_instance_variable(:"@#{arg}")
+                else
+                  set_or_return(attr_name.to_sym, arg, validation_opts)
+                end
+              end
             else
-              set_or_return(attr_name.to_sym, arg, validation_opts)
+              super
             end
           end
-        else
-          super
-        end
-      end
 
-      # Below chef 12.5 you cannot do `default lazy: { ... }` - this adds that
-      def self.lazy(&block)
-        Chef::DelayedEvaluator.new(&block)
-      end
-    end
-
-    # copy from Chef 12.5 params_validate.rb at http://redirx.me/?t35q.
-    if !method_defined?(:_pv_is)
-      def _pv_is(opts, key, to_be, raise_error: true)
-        return true if !opts.has_key?(key.to_s) && !opts.has_key?(key.to_sym)
-        value = _pv_opts_lookup(opts, key)
-        to_be = [ to_be ].flatten(1)
-        to_be.each do |tb|
-          case tb
-          when Proc
-            return true if instance_exec(value, &tb)
-          when Property
-            validate(opts, { key => tb.validation_options })
-            return true
-          else
-            return true if tb === value
+          # Below chef 12.5 you cannot do `default lazy: { ... }` - this adds that
+          def self.lazy(&block)
+            Chef::DelayedEvaluator.new(&block)
           end
         end
 
-        if raise_error
-          raise ::Chef::Exceptions::ValidationFailed, "Option #{key} must be one of: #{to_be.join(", ")}!  You passed #{value.inspect}."
-        else
-          false
+        # copy from Chef 12.5 params_validate.rb at http://redirx.me/?t35q.
+        unless method_defined?(:_pv_is)
+          def _pv_is(opts, key, to_be, raise_error: true)
+            return true if !opts.key?(key.to_s) && !opts.key?(key.to_sym)
+            value = _pv_opts_lookup(opts, key)
+            to_be = [to_be].flatten(1)
+            to_be.each do |tb|
+              case tb
+              when Proc
+                return true if instance_exec(value, &tb)
+              when Property
+                validate(opts, key => tb.validation_options)
+                return true
+              else
+                return true if tb === value
+              end
+            end
+
+            if raise_error
+              raise ::Chef::Exceptions::ValidationFailed, "Option #{key} must be one of: #{to_be.join(', ')}!  You passed #{value.inspect}."
+            else
+              false
+            end
+          end
         end
       end
     end
   end
 end
-end
-end

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

@@ -1,4 +1,4 @@
-require 'chef/provisioning/aws_driver/aws_tagger'
+require "chef/provisioning/aws_driver/aws_tagger"
 
 module Chef::Provisioning::AWSDriver::TaggingStrategy
   module AutoScalingConvergeTags
@@ -12,6 +12,7 @@ module Chef::Provisioning::AWSDriver::TaggingStrategy
         Chef::Provisioning::AWSDriver::AWSTagger.new(auto_scaling_strategy, action_handler)
       end
     end
+
     def converge_tags
       aws_tagger.converge_tags
     end
@@ -19,58 +20,56 @@ module Chef::Provisioning::AWSDriver::TaggingStrategy
 end
 
 module Chef::Provisioning::AWSDriver::TaggingStrategy
-class AutoScaling
-
-  attr_reader :auto_scaling_client, :group_name, :desired_tags
+  class AutoScaling
+    attr_reader :auto_scaling_client, :group_name, :desired_tags
 
-  def initialize(auto_scaling_client, group_name, desired_tags)
-    @auto_scaling_client = auto_scaling_client
-    @group_name = group_name
-    @desired_tags = desired_tags
-  end
+    def initialize(auto_scaling_client, group_name, desired_tags)
+      @auto_scaling_client = auto_scaling_client
+      @group_name = group_name
+      @desired_tags = desired_tags
+    end
 
-  def current_tags
-    # http://docs.aws.amazon.com/sdkforruby/api/Aws/AutoScaling/Client.html#describe_tags-instance_method
-    resp = auto_scaling_client.describe_tags({
-      filters: [
-        {
-          name: "auto-scaling-group",
-          values: [group_name]
-        }
-      ]
-    })
-    Hash[resp.tags.map {|t| [t.key, t.value]}]
-  end
+    def current_tags
+      # http://docs.aws.amazon.com/sdkforruby/api/Aws/AutoScaling/Client.html#describe_tags-instance_method
+      resp = auto_scaling_client.describe_tags(
+        filters: [
+          {
+            name: "auto-scaling-group",
+            values: [group_name]
+          }
+        ]
+      )
+      Hash[resp.tags.map { |t| [t.key, t.value] }]
+    end
 
-  def set_tags(tags)
-    # http://docs.aws.amazon.com/sdkforruby/api/Aws/AutoScaling/Client.html#create_or_update_tags-instance_method
-    auto_scaling_client.create_or_update_tags({
-      tags: tags.map {|k,v|
-        {
-          resource_id: group_name,
-          key: k,
-          value: v,
-          resource_type: "auto-scaling-group",
-          propagate_at_launch: false
-        }
-      }
-    })
-  end
+    def set_tags(tags)
+      # http://docs.aws.amazon.com/sdkforruby/api/Aws/AutoScaling/Client.html#create_or_update_tags-instance_method
+      auto_scaling_client.create_or_update_tags(
+        tags: tags.map do |k, v|
+          {
+            resource_id: group_name,
+            key: k,
+            value: v,
+            resource_type: "auto-scaling-group",
+            propagate_at_launch: false
+          }
+        end
+      )
+    end
 
-  def delete_tags(tag_keys)
-    # http://docs.aws.amazon.com/sdkforruby/api/Aws/AutoScaling/Client.html#delete_tags-instance_method
-    auto_scaling_client.delete_tags({
-      tags: tag_keys.map {|k|
-        {
-          resource_id: group_name,
-          key: k,
-          value: nil,
-          resource_type: "auto-scaling-group",
-          propagate_at_launch: false
-        }
-      }
-    })
+    def delete_tags(tag_keys)
+      # http://docs.aws.amazon.com/sdkforruby/api/Aws/AutoScaling/Client.html#delete_tags-instance_method
+      auto_scaling_client.delete_tags(
+        tags: tag_keys.map do |k|
+          {
+            resource_id: group_name,
+            key: k,
+            value: nil,
+            resource_type: "auto-scaling-group",
+            propagate_at_launch: false
+          }
+        end
+      )
+    end
   end
-
-end
 end

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

@@ -1,4 +1,4 @@
-require 'chef/provisioning/aws_driver/aws_tagger'
+require "chef/provisioning/aws_driver/aws_tagger"
 
 module Chef::Provisioning::AWSDriver::TaggingStrategy
   module EC2ConvergeTags
@@ -12,6 +12,7 @@ module Chef::Provisioning::AWSDriver::TaggingStrategy
         Chef::Provisioning::AWSDriver::AWSTagger.new(ec2_strategy, action_handler)
       end
     end
+
     def converge_tags
       aws_tagger.converge_tags
     end
@@ -19,46 +20,44 @@ module Chef::Provisioning::AWSDriver::TaggingStrategy
 end
 
 module Chef::Provisioning::AWSDriver::TaggingStrategy
-class EC2
-
-  attr_reader :ec2_client, :aws_object_id, :desired_tags
+  class EC2
+    attr_reader :ec2_client, :aws_object_id, :desired_tags
 
-  def initialize(ec2_client, aws_object_id, desired_tags)
-    @ec2_client = ec2_client
-    @aws_object_id = aws_object_id
-    @desired_tags = desired_tags
-  end
+    def initialize(ec2_client, aws_object_id, desired_tags)
+      @ec2_client = ec2_client
+      @aws_object_id = aws_object_id
+      @desired_tags = desired_tags
+    end
 
-  def current_tags
-    # http://docs.aws.amazon.com/sdkforruby/api/Aws/EC2/Client.html#describe_tags-instance_method
-    resp = ec2_client.describe_tags({
-      filters: [
-        {
-          name: "resource-id",
-          values: [aws_object_id]
-        }
-      ]
-    })
-    Hash[resp.tags.map {|t| [t.key, t.value]}]
-  end
+    def current_tags
+      # http://docs.aws.amazon.com/sdkforruby/api/Aws/EC2/Client.html#describe_tags-instance_method
+      resp = ec2_client.describe_tags(
+        filters: [
+          {
+            name: "resource-id",
+            values: [aws_object_id]
+          }
+        ]
+      )
+      Hash[resp.tags.map { |t| [t.key, t.value] }]
+    end
 
-  def set_tags(tags)
-    # http://docs.aws.amazon.com/sdkforruby/api/Aws/EC2/Client.html#create_tags-instance_method
-    # "The value parameter is required, but if you don't want the tag to have a value, specify
-    #   the parameter with no value, and we set the value to an empty string."
-    ec2_client.create_tags({
-      resources: [aws_object_id],
-      tags: tags.map {|k,v| {key: k, value: v} }
-    })
-  end
+    def set_tags(tags)
+      # http://docs.aws.amazon.com/sdkforruby/api/Aws/EC2/Client.html#create_tags-instance_method
+      # "The value parameter is required, but if you don't want the tag to have a value, specify
+      #   the parameter with no value, and we set the value to an empty string."
+      ec2_client.create_tags(
+        resources: [aws_object_id],
+        tags: tags.map { |k, v| { key: k, value: v } }
+      )
+    end
 
-  def delete_tags(tag_keys)
-    # http://docs.aws.amazon.com/sdkforruby/api/Aws/EC2/Client.html#delete_tags-instance_method
-    ec2_client.delete_tags({
-      resources: [aws_object_id],
-      tags: tag_keys.map {|k| {key: k} }
-    })
+    def delete_tags(tag_keys)
+      # http://docs.aws.amazon.com/sdkforruby/api/Aws/EC2/Client.html#delete_tags-instance_method
+      ec2_client.delete_tags(
+        resources: [aws_object_id],
+        tags: tag_keys.map { |k| { key: k } }
+      )
+    end
   end
-
-end
 end

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

@@ -1,8 +1,7 @@
-require 'chef/provisioning/aws_driver/aws_tagger'
+require "chef/provisioning/aws_driver/aws_tagger"
 
 module Chef::Provisioning::AWSDriver::TaggingStrategy
   class Elasticsearch
-
     attr_reader :client, :arn, :desired_tags
 
     def initialize(client, arn, desired_tags)
@@ -12,29 +11,29 @@ module Chef::Provisioning::AWSDriver::TaggingStrategy
     end
 
     def current_tags
-      resp = client.list_tags({arn: arn})
-      Hash[resp.tag_list.map {|t| [t.key, t.value]}]
+      resp = client.list_tags(arn: arn)
+      Hash[resp.tag_list.map { |t| [t.key, t.value] }]
     rescue ::Aws::ElasticsearchService::Errors::ResourceNotFoundException
-      Hash.new
+      {}
     end
 
     def set_tags(tags)
-      tags = tags.map {|k,v|
+      tags = tags.map do |k, v|
         if v.nil?
-          {key: k}
+          { key: k }
         else
-          {key: k, value: v}
+          { key: k, value: v }
         end
-      }
-      client.add_tags({
-                        arn: arn,
-                        tag_list: tags
-                      })
+      end
+      client.add_tags(
+        arn: arn,
+        tag_list: tags
+      )
     end
 
     def delete_tags(tag_keys)
-      client.remove_tags({arn: arn,
-                          tag_keys: tag_keys})
+      client.remove_tags(arn: arn,
+                         tag_keys: tag_keys)
     end
   end
 end

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

@@ -1,39 +1,37 @@
-require 'chef/provisioning/aws_driver/aws_tagger'
+require "chef/provisioning/aws_driver/aws_tagger"
 
 module Chef::Provisioning::AWSDriver::TaggingStrategy
-class ELB
+  class ELB
+    attr_reader :elb_client, :access_point_name, :desired_tags
 
-  attr_reader :elb_client, :access_point_name, :desired_tags
+    def initialize(elb_client, access_point_name, desired_tags)
+      @elb_client = elb_client
+      @access_point_name = access_point_name
+      @desired_tags = desired_tags
+    end
 
-  def initialize(elb_client, access_point_name, desired_tags)
-    @elb_client = elb_client
-    @access_point_name = access_point_name
-    @desired_tags = desired_tags
-  end
-
-  def current_tags
-    # http://docs.aws.amazon.com/sdkforruby/api/Aws/ElasticLoadBalancing/Client.html#describe_tags-instance_method
-    resp = elb_client.describe_tags({
-      load_balancer_names: [access_point_name]
-    })
-    Hash[resp.tag_descriptions[0].tags.map {|t| [t.key, t.value]}]
-  end
+    def current_tags
+      # http://docs.aws.amazon.com/sdkforruby/api/Aws/ElasticLoadBalancing/Client.html#describe_tags-instance_method
+      resp = elb_client.describe_tags(
+        load_balancer_names: [access_point_name]
+      )
+      Hash[resp.tag_descriptions[0].tags.map { |t| [t.key, t.value] }]
+    end
 
-  def set_tags(tags)
-    # http://docs.aws.amazon.com/sdkforruby/api/Aws/ElasticLoadBalancing/Client.html#add_tags-instance_method
-    elb_client.add_tags({
-      load_balancer_names: [access_point_name],
-      tags: tags.map {|k,v| {key: k, value: v} }
-    })
-  end
+    def set_tags(tags)
+      # http://docs.aws.amazon.com/sdkforruby/api/Aws/ElasticLoadBalancing/Client.html#add_tags-instance_method
+      elb_client.add_tags(
+        load_balancer_names: [access_point_name],
+        tags: tags.map { |k, v| { key: k, value: v } }
+      )
+    end
 
-  def delete_tags(tag_keys)
-    # http://docs.aws.amazon.com/sdkforruby/api/Aws/ElasticLoadBalancing/Client.html#remove_tags-instance_method
-    elb_client.remove_tags({
-      load_balancer_names: [access_point_name],
-      tags: tag_keys.map {|k| {key: k} }
-    })
+    def delete_tags(tag_keys)
+      # http://docs.aws.amazon.com/sdkforruby/api/Aws/ElasticLoadBalancing/Client.html#remove_tags-instance_method
+      elb_client.remove_tags(
+        load_balancer_names: [access_point_name],
+        tags: tag_keys.map { |k| { key: k } }
+      )
+    end
   end
-
-end
 end