chef-provisioning-aws 3.0.4 → 3.0.6

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

@@ -1,18 +1,16 @@
 module Chef::Provisioning::AWSDriver
-# This module is meant to be included in a resource that is taggable
-# This will add the appropriate attribute that can be converged by the provider
-# TODO it would be nice to not have two seperate modules (taggable/tagger)
-#   and just have the provider decorate the resource or vice versa.  Complicated
-#   by resources <-> providers being many-to-many.
-module AWSTaggable
-
-  def self.included(klass)
-    # This should be a hash of tags to apply to the AWS object
-    #
-    # @param aws_tags [Hash] Should be a hash of keys & values to add.  Keys and values
-    #        can be provided as symbols or strings, but will be stored in AWS as strings.
-    klass.attribute :aws_tags, kind_of: Hash
+  # This module is meant to be included in a resource that is taggable
+  # This will add the appropriate attribute that can be converged by the provider
+  # TODO it would be nice to not have two seperate modules (taggable/tagger)
+  #   and just have the provider decorate the resource or vice versa.  Complicated
+  #   by resources <-> providers being many-to-many.
+  module AWSTaggable
+    def self.included(klass)
+      # This should be a hash of tags to apply to the AWS object
+      #
+      # @param aws_tags [Hash] Should be a hash of keys & values to add.  Keys and values
+      #        can be provided as symbols or strings, but will be stored in AWS as strings.
+      klass.attribute :aws_tags, kind_of: Hash
+    end
   end
-
-end
 end

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

@@ -1,61 +1,60 @@
-require 'retryable'
+require "retryable"
 
 module Chef::Provisioning::AWSDriver
-# Include this module on a class or instance that is responsible for tagging
-# itself.  Fill in the hook methods so it knows how to tag itself.
-class AWSTagger
-  extend Forwardable
+  # Include this module on a class or instance that is responsible for tagging
+  # itself.  Fill in the hook methods so it knows how to tag itself.
+  class AWSTagger
+    extend Forwardable
 
-  attr_reader :action_handler
+    attr_reader :action_handler
 
-  def initialize(tagging_strategy, action_handler)
-    @tagging_strategy = tagging_strategy
-    @action_handler = action_handler
-  end
-
-  def_delegators :@tagging_strategy, :desired_tags, :current_tags, :set_tags, :delete_tags
-
-  def converge_tags
-    if desired_tags.nil?
-      Chef::Log.debug "aws_tags not provided, nothing to converge"
-      return
+    def initialize(tagging_strategy, action_handler)
+      @tagging_strategy = tagging_strategy
+      @action_handler = action_handler
     end
 
-    # Duplication and normalization
-    # ::Aws::EC2::Errors::InvalidParameterValue: Tag value cannot be null. Use empty string instead.
-    n_desired_tags = Hash[desired_tags.map {|k,v| [k.to_s, v.to_s]}]
-    n_current_tags = Hash[current_tags.map {|k,v| [k.to_s, v.to_s]}]
-
-    tags_to_set = n_desired_tags.reject {|k,v| n_current_tags[k] && n_current_tags[k] == v}
-    tags_to_delete = n_current_tags.keys - n_desired_tags.keys
-    # We don't want to delete `Name`, just all other tags
-    # Tag keys and values are case sensitive - `Name` is special because it
-    # shows as the name in the console
-    tags_to_delete.delete('Name')
-
-    # Tagging frequently fails so we retry with an exponential backoff, a maximum of 10 seconds
-    Retryable.retryable(
-      :tries => 20,
-      :sleep => lambda { |n| [2**n, 10].min },
-      :on => [::Aws::EC2::Errors, Aws::S3::Errors, ::Aws::S3::Errors::ServiceError,]
-    ) do |retries, exception|
-      if retries > 0
-        Chef::Log.info "Retrying the tagging, previous try failed with #{exception.inspect}"
+    def_delegators :@tagging_strategy, :desired_tags, :current_tags, :set_tags, :delete_tags
+
+    def converge_tags
+      if desired_tags.nil?
+        Chef::Log.debug "aws_tags not provided, nothing to converge"
+        return
       end
-      unless tags_to_set.empty?
-        action_handler.perform_action "creating tags #{tags_to_set}" do
-          set_tags(tags_to_set)
+
+      # Duplication and normalization
+      # ::Aws::EC2::Errors::InvalidParameterValue: Tag value cannot be null. Use empty string instead.
+      n_desired_tags = Hash[desired_tags.map { |k, v| [k.to_s, v.to_s] }]
+      n_current_tags = Hash[current_tags.map { |k, v| [k.to_s, v.to_s] }]
+
+      tags_to_set = n_desired_tags.reject { |k, v| n_current_tags[k] && n_current_tags[k] == v }
+      tags_to_delete = n_current_tags.keys - n_desired_tags.keys
+      # We don't want to delete `Name`, just all other tags
+      # Tag keys and values are case sensitive - `Name` is special because it
+      # shows as the name in the console
+      tags_to_delete.delete("Name")
+
+      # Tagging frequently fails so we retry with an exponential backoff, a maximum of 10 seconds
+      Retryable.retryable(
+        tries: 20,
+        sleep: ->(n) { [2**n, 10].min },
+        on: [::Aws::EC2::Errors, Aws::S3::Errors, ::Aws::S3::Errors::ServiceError]
+      ) do |retries, exception|
+        if retries > 0
+          Chef::Log.info "Retrying the tagging, previous try failed with #{exception.inspect}"
         end
-        tags_to_set = []
-      end
-      unless tags_to_delete.empty?
-        action_handler.perform_action "deleting tags #{tags_to_delete}" do
-          delete_tags(tags_to_delete)
+        unless tags_to_set.empty?
+          action_handler.perform_action "creating tags #{tags_to_set}" do
+            set_tags(tags_to_set)
+          end
+          tags_to_set = []
+        end
+        unless tags_to_delete.empty?
+          action_handler.perform_action "deleting tags #{tags_to_delete}" do
+            delete_tags(tags_to_delete)
+          end
+          tags_to_delete = []
         end
-        tags_to_delete = []
       end
     end
   end
-
-end
 end

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

@@ -1,124 +1,120 @@
-require 'inifile'
-require 'csv'
-require 'chef/mixin/deep_merge'
+require "inifile"
+require "csv"
+require "chef/mixin/deep_merge"
 
 class Chef
-module Provisioning
-module AWSDriver
-  # Reads in credential files in Amazon's download format and presents the credentials to you
-  class Credentials
-    def initialize
-      @credentials = {}
-      load_default
-    end
+  module Provisioning
+    module AWSDriver
+      # Reads in credential files in Amazon's download format and presents the credentials to you
+      class Credentials
+        def initialize
+          @credentials = {}
+          load_default
+        end
 
-    include Enumerable
-    include Chef::Mixin::DeepMerge
+        include Enumerable
+        include Chef::Mixin::DeepMerge
 
-    def default
-      if @credentials.size == 0
-        raise 'No credentials loaded!  Do you have a ~/.aws/config?'
-      end
-      @credentials[ENV['AWS_DEFAULT_PROFILE'] || 'default'] || @credentials.first[1]
-    end
+        def default
+          if @credentials.empty?
+            raise "No credentials loaded!  Do you have a ~/.aws/config?"
+          end
+          @credentials[ENV["AWS_DEFAULT_PROFILE"] || "default"] || @credentials.first[1]
+        end
 
-    def keys
-      @credentials.keys
-    end
+        def keys
+          @credentials.keys
+        end
 
-    def [](name)
-      @credentials[name]
-    end
+        def [](name)
+          @credentials[name]
+        end
 
-    def each(&block)
-      @credentials.each(&block)
-    end
+        def each(&block)
+          @credentials.each(&block)
+        end
 
-    def load_inis(config_ini_file, credentials_ini_file = nil)
-      @credentials = load_config_ini(config_ini_file)
-      @credentials = deep_merge!(@credentials,
-                                 load_credentials_ini(credentials_ini_file)
-                                ) if credentials_ini_file
-    end
+        def load_inis(config_ini_file, credentials_ini_file = nil)
+          @credentials = load_config_ini(config_ini_file)
+          if credentials_ini_file
+            @credentials = deep_merge!(@credentials,
+                                       load_credentials_ini(credentials_ini_file))
+          end
+        end
 
-    def load_config_ini(config_ini_file)
-      inifile = IniFile.load(File.expand_path(config_ini_file))
-      config = {}
-      if inifile
-        inifile.each_section do |section|
-          if section =~ /^\s*profile\s+(.+)$/ || section =~ /^\s*(default)\s*/
-            profile_name = $1.strip
-            profile = inifile[section].inject({}) do |result, pair|
-              result[pair[0].to_sym] = pair[1]
-              result
+        def load_config_ini(config_ini_file)
+          inifile = IniFile.load(File.expand_path(config_ini_file))
+          config = {}
+          if inifile
+            inifile.each_section do |section|
+              next unless section =~ /^\s*profile\s+(.+)$/ || section =~ /^\s*(default)\s*/
+              profile_name = Regexp.last_match(1).strip
+              profile = inifile[section].each_with_object({}) do |pair, result|
+                result[pair[0].to_sym] = pair[1]
+              end
+              profile[:name] = profile_name
+              config[profile_name] = profile
             end
-            profile[:name] = profile_name
-            config[profile_name] = profile
           end
+          config
         end
-      end
-      config
-    end
 
-    def load_credentials_ini(credentials_ini_file)
-      inifile = IniFile.load(File.expand_path(credentials_ini_file))
-      config = {}
-      if inifile
-        inifile.each_section do |section|
-          profile = inifile[section].inject({}) do |result, pair|
-            result[pair[0].to_sym] = pair[1]
-            result
+        def load_credentials_ini(credentials_ini_file)
+          inifile = IniFile.load(File.expand_path(credentials_ini_file))
+          config = {}
+          if inifile
+            inifile.each_section do |section|
+              profile = inifile[section].each_with_object({}) do |pair, result|
+                result[pair[0].to_sym] = pair[1]
+              end
+              profile[:name] = section
+              config[section] = profile
+            end
           end
-          profile[:name] = section
-          config[section] = profile
+          config
         end
-      end
-      config
-    end
 
-    def load_csv(credentials_csv_file)
-      CSV.new(File.open(credentials_csv_file), :headers => :first_row).each do |row|
-        @credentials[row['User Name']] = {
-          :name => row['User Name'],
-          :user_name => row['User Name'],
-          :aws_access_key_id => row['Access Key Id'],
-          :aws_secret_access_key => row['Secret Access Key']
-        }
-      end
-    end
+        def load_csv(credentials_csv_file)
+          CSV.new(File.open(credentials_csv_file), headers: :first_row).each do |row|
+            @credentials[row["User Name"]] = {
+              name: row["User Name"],
+              user_name: row["User Name"],
+              aws_access_key_id: row["Access Key Id"],
+              aws_secret_access_key: row["Secret Access Key"]
+            }
+          end
+        end
 
-    def load_env_variables
-      if ENV["AWS_ACCESS_KEY_ID"] && ENV["AWS_SECRET_ACCESS_KEY"]
-        @credentials["default"] = {
-          aws_access_key_id: ENV["AWS_ACCESS_KEY_ID"],
-          aws_secret_access_key: ENV["AWS_SECRET_ACCESS_KEY"]
-        }
-      end
-    end
+        def load_env_variables
+          if ENV["AWS_ACCESS_KEY_ID"] && ENV["AWS_SECRET_ACCESS_KEY"]
+            @credentials["default"] = {
+              aws_access_key_id: ENV["AWS_ACCESS_KEY_ID"],
+              aws_secret_access_key: ENV["AWS_SECRET_ACCESS_KEY"]
+            }
+          end
+        end
 
-    def load_default
-      config_file = ENV['AWS_CONFIG_FILE'] || File.expand_path('~/.aws/config')
-      credentials_file = ENV['AWS_SHARED_CREDENTIALS_FILE'] || ENV['AWS_CREDENTIAL_FILE'] || File.expand_path('~/.aws/credentials')
-      if File.file?(config_file)
-        if File.file?(credentials_file)
-          load_inis(config_file, credentials_file)
-        else
-          load_inis(config_file)
+        def load_default
+          config_file = ENV["AWS_CONFIG_FILE"] || File.expand_path("~/.aws/config")
+          credentials_file = ENV["AWS_SHARED_CREDENTIALS_FILE"] || ENV["AWS_CREDENTIAL_FILE"] || File.expand_path("~/.aws/credentials")
+          if File.file?(config_file)
+            if File.file?(credentials_file)
+              load_inis(config_file, credentials_file)
+            else
+              load_inis(config_file)
+            end
+          end
+          load_env_variables if @credentials.empty?
         end
-      end
-      if @credentials.size == 0
-        load_env_variables
-      end
-    end
 
-    def self.method_missing(name, *args, &block)
-      singleton.send(name, *args, &block)
-    end
+        def self.method_missing(name, *args, &block)
+          singleton.send(name, *args, &block)
+        end
 
-    def self.singleton
-      @aws_credentials ||= Credentials.new
+        def self.singleton
+          @aws_credentials ||= Credentials.new
+        end
+      end
     end
   end
 end
-end
-end

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

@@ -5,52 +5,49 @@ require "aws-sdk-core/instance_profile_credentials"
 require "aws-sdk-core/assume_role_credentials"
 
 class Chef
-module Provisioning
-module AWSDriver
-
-  class LoadCredentialsError < RuntimeError; end
-
-  # Loads the credentials for the AWS SDK V2
-  # Attempts to load credentials in the order specified at http://docs.aws.amazon.com/sdkforruby/api/index.html#Configuration
-  class Credentials2
-
-    attr_reader :profile_name
-
-    # @param [Hash] options
-    # @option options [String] :profile_name (ENV["AWS_DEFAULT_PROFILE"]) The profile name to use
-    #    when loading the config from '~/.aws/credentials'.  This can be nil.
-    def initialize(options = {})
-      @profile_name = options[:profile_name] || ENV["AWS_DEFAULT_PROFILE"]
-    end
-
-    # Try to load the credentials from an ordered list of sources and return the first one that
-    # can be loaded successfully.
-    def get_credentials
-      # http://docs.aws.amazon.com/cli/latest/userguide/cli-chap-getting-started.html#cli-environment
-      credentials_file = ENV.fetch('AWS_SHARED_CREDENTIALS_FILE', ENV['AWS_CONFIG_FILE'])
-      shared_creds = ::Aws::SharedCredentials.new(
-        :profile_name => profile_name,
-        :path => credentials_file
-      )
-      instance_profile_creds = ::Aws::InstanceProfileCredentials.new(:retries => 1)
-
-      if ENV["AWS_ACCESS_KEY_ID"] && ENV["AWS_SECRET_ACCESS_KEY"]
-        creds = ::Aws::Credentials.new(
-          ENV["AWS_ACCESS_KEY_ID"],
-          ENV["AWS_SECRET_ACCESS_KEY"],
-          ENV["AWS_SESSION_TOKEN"]
-        )
-      elsif shared_creds.set?
-        creds = shared_creds
-      elsif instance_profile_creds.set?
-        creds = instance_profile_creds
-      else
-        raise LoadCredentialsError.new("Could not load credentials from the environment variables, the .aws/credentials file or the metadata service")
+  module Provisioning
+    module AWSDriver
+      class LoadCredentialsError < RuntimeError; end
+
+      # Loads the credentials for the AWS SDK V2
+      # Attempts to load credentials in the order specified at http://docs.aws.amazon.com/sdkforruby/api/index.html#Configuration
+      class Credentials2
+        attr_reader :profile_name
+
+        # @param [Hash] options
+        # @option options [String] :profile_name (ENV["AWS_DEFAULT_PROFILE"]) The profile name to use
+        #    when loading the config from '~/.aws/credentials'.  This can be nil.
+        def initialize(options = {})
+          @profile_name = options[:profile_name] || ENV["AWS_DEFAULT_PROFILE"]
+        end
+
+        # Try to load the credentials from an ordered list of sources and return the first one that
+        # can be loaded successfully.
+        def get_credentials
+          # http://docs.aws.amazon.com/cli/latest/userguide/cli-chap-getting-started.html#cli-environment
+          credentials_file = ENV.fetch("AWS_SHARED_CREDENTIALS_FILE", ENV["AWS_CONFIG_FILE"])
+          shared_creds = ::Aws::SharedCredentials.new(
+            profile_name: profile_name,
+            path: credentials_file
+          )
+          instance_profile_creds = ::Aws::InstanceProfileCredentials.new(retries: 1)
+
+          if ENV["AWS_ACCESS_KEY_ID"] && ENV["AWS_SECRET_ACCESS_KEY"]
+            creds = ::Aws::Credentials.new(
+              ENV["AWS_ACCESS_KEY_ID"],
+              ENV["AWS_SECRET_ACCESS_KEY"],
+              ENV["AWS_SESSION_TOKEN"]
+            )
+          elsif shared_creds.set?
+            creds = shared_creds
+          elsif instance_profile_creds.set?
+            creds = instance_profile_creds
+          else
+            raise LoadCredentialsError, "Could not load credentials from the environment variables, the .aws/credentials file or the metadata service"
+          end
+          creds
+        end
       end
-      creds
     end
   end
-
-end
-end
 end