chef-provisioning-fog 0.12 → 0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34990906985f7a7c4de47ef2a7e670a309412324
-  data.tar.gz: ad07082eaa71fc18afdc44b5fbd22819ffc75998
+  metadata.gz: e33216302d47668520364a911ed5161cd681ca4a
+  data.tar.gz: 0cc594a02828434a96c2202f3ff7db057825cbe4
 SHA512:
-  metadata.gz: 62236621c239d507ed1393e3a6780ca72966e7f27a46d4954ea5ca4da066dc18b826c5a2cf7f3fe4b251decec583e9212774a0614228abd62a4e6f379c400eec
-  data.tar.gz: 1b7e1878546996f6d05790f3efbf5d0b855aa88db4a77553ef08c039a31c3f36979eedca140311d78a7f826339b31502ea2fef266b7902f40a3d48d8feb4579e
+  metadata.gz: 35cb4c6b4f3dbd4711db0e791568b49a614169b2b648a3f815684759219412b6a027b636ebc3e2a8ce521ef007a388aa37998bb989c95611f6b553a001e42b08
+  data.tar.gz: db0e74164bf16bb798025477d3dc1239ad3bf34eb69c823bf58ae2fcaa7c42222b6aa1100530108f4d03234de8fdf21b32afd43445c0b16bb7cbfa53bdcb917c

data/lib/chef/provisioning/fog_driver/driver.rb

@@ -53,8 +53,8 @@ module FogDriver
   # from_provider and compute_options_for, and add the new provider in the case
   # statements so that URLs for your fog provider can be generated.  If your
   # cloud provider has environment variables or standard config files (like
-  # ~/.aws/config), you can read those and merge that information in the
-  # compute_options_for function.
+  # ~/.aws/credentials or ~/.aws/config), you can read those and merge that information
+  # in the compute_options_for function.
   #
   # ## Location format
   #
@@ -155,7 +155,7 @@ module FogDriver
     # config - configuration.  :driver_options, :keys, :key_paths and :log_level are used.
     #   driver_options is a hash with these possible options:
     #   - compute_options: the hash of options to Fog::Compute.new.
-    #   - aws_config_file: aws config file (default: ~/.aws/config)
+    #   - aws_config_file: aws config file (defaults: ~/.aws/credentials, ~/.aws/config)
     #   - aws_csv_file: aws csv credentials file downloaded from EC2 interface
     #   - aws_profile: profile name to use for credentials
     #   - aws_credentials: AWSCredentials object. (will be created for you by default)

data/lib/chef/provisioning/fog_driver/providers/aws.rb

@@ -167,8 +167,9 @@ module FogDriver
       end
 
       def convergence_strategy_for(machine_spec, machine_options)
-        machine_options[:convergence_options] ||= {}
-        machine_options[:convergence_options][:ohai_hints] = { 'ec2' => ''}
+        machine_options = Cheffish::MergedConfig.new(machine_options, {
+          :convergence_options => {:ohai_hints => {'ec2' => ''}}
+        })
         super(machine_spec, machine_options)
       end
 
@@ -227,7 +228,7 @@ module FogDriver
           aws_profile = find_aws_profile_for_account_id(aws_credentials, aws_account_id, default_iam_endpoint)
         end
 
-        fail 'No AWS profile specified! Are you missing something in the Chef config or ~/.aws/config?' unless aws_profile
+        fail 'No AWS profile specified! Are you missing something in the Chef or AWS config?' unless aws_profile
 
         aws_profile[:ec2_endpoint] ||= default_ec2_endpoint
         aws_profile[:iam_endpoint] ||= default_iam_endpoint
@@ -256,7 +257,7 @@ module FogDriver
         if aws_profile
           Chef::Log.info("Discovered AWS profile #{aws_profile[:name]} pointing at account #{aws_account_id}.  Using ...")
         else
-          raise "No AWS profile leads to account ##{aws_account_id}.  Do you need to add profiles to ~/.aws/config?"
+          raise "No AWS profile leads to account #{aws_account_id}.  Do you need to add profiles to the AWS config?"
         end
         aws_profile
       end
@@ -313,9 +314,9 @@ module FogDriver
         else
           aws_credentials = Credentials.new
           if driver_options[:aws_config_file]
-            aws_credentials.load_ini(driver_options.delete(:aws_config_file))
+            aws_credentials.load_ini(driver_options[:aws_config_file])
           elsif driver_options[:aws_csv_file]
-            aws_credentials.load_csv(driver_options.delete(:aws_csv_file))
+            aws_credentials.load_csv(driver_options[:aws_csv_file])
           else
             aws_credentials.load_default
           end

data/lib/chef/provisioning/fog_driver/providers/aws/credentials.rb

@@ -1,5 +1,6 @@
 require 'inifile'
 require 'csv'
+require 'chef/mixin/deep_merge'
 
 class Chef
 module Provisioning
@@ -13,10 +14,11 @@ module FogDriver
         end
 
         include Enumerable
+        include Chef::Mixin::DeepMerge
 
         def default
           if @credentials.size == 0
-            raise "No credentials loaded!  Do you have a ~/.aws/config?"
+            raise "No credentials loaded!  Do you have one of ~/.aws/credentials or ~/.aws/config?"
           end
           @credentials[ENV['AWS_DEFAULT_PROFILE'] || 'default'] || @credentials.first[1]
         end
@@ -33,8 +35,16 @@ module FogDriver
           @credentials.each(&block)
         end
 
-        def load_ini(credentials_ini_file)
-          inifile = IniFile.load(File.expand_path(credentials_ini_file))
+        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_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*/
@@ -44,14 +54,27 @@ module FogDriver
                   result
                 end
                 profile[:name] = profile_name
-                @credentials[profile_name] = profile
+                config[profile_name] = profile
               end
             end
-          else
-            # Get it to throw an error
-            File.open(File.expand_path(credentials_ini_file)) do
+          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
+              end
+              profile[:name] = section
+              config[section] = profile
             end
           end
+          config
         end
 
         def load_csv(credentials_csv_file)
@@ -67,8 +90,13 @@ module FogDriver
 
         def load_default
           config_file = ENV['AWS_CONFIG_FILE'] || File.expand_path('~/.aws/config')
+          credentials_file = ENV['AWS_CREDENTIAL_FILE'] || File.expand_path('~/.aws/credentials')
           if File.file?(config_file)
-            load_ini(config_file)
+            if File.file?(credentials_file)
+              load_inis(config_file, credentials_file)
+            else
+              load_inis(config_file)
+            end
           end
         end
 

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

@@ -1,7 +1,7 @@
 class Chef
 module Provisioning
 module FogDriver
-  VERSION = '0.12'
+  VERSION = '0.13'
 end
 end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning-fog
 version: !ruby/object:Gem::Version
-  version: '0.12'
+  version: '0.13'
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-27 00:00:00.000000000 Z
+date: 2015-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef