chef-metal-fog 0.8 → 0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2278f6624a0634e205da58bcc1e966b22eab39cf
-  data.tar.gz: a1f4213a340ec309ef22d4fa141262f367e379d0
+  metadata.gz: 3a9bcbbde03df9f791812bb29c97ed699293eb6b
+  data.tar.gz: a380ea7aa17ba04c859e8f99b9273a061a3d8020
 SHA512:
-  metadata.gz: dd9e876567aaf22364a1e12efd5747464ecea0722e9758a5866feb4bb0877d3fd4a9bdc7799aa31b18c67c79c4c5b1fdc517e550812b9ea8fda7315feaaef050
-  data.tar.gz: 9a4b72747673099393f9571bc81492b951c901e6b5773a6cb2d6918fa0dfc17f14b7ca03e078d673660dbc72ea7bec6b3a4f84da0833563f3c3b88640ea70db5
+  metadata.gz: e9809ef6a59ef830a3a979750c77dace55ae8d110c7472ddfab6f98725fb666c19f168a46663da8efc5ce8851c97d475694112085e99847597c4a907160f20d3
+  data.tar.gz: 30aaca87722bd80626ac23dba4c784b4a7280339dea19605094ecd4526258d64796fb2f7faa997c8d19a98623f6116fa67705ab15d0399f85df797647b6e5e28

data/lib/chef/resource/fog_key_pair.rb

@@ -26,4 +26,9 @@ class Chef::Resource::FogKeyPair < Chef::Resource::LWRPBase
   def after(&block)
     block ? @after = block : @after
   end
+
+  # We are not interested in Chef's cloning behavior here.
+  def load_prior_resource
+    Chef::Log.debug("Overloading #{resource_name}.load_prior_resource with NOOP")
+  end
 end

data/lib/chef_metal_fog/providers/aws.rb

@@ -131,70 +131,66 @@ module ChefMetalFog
         # ENV['AWS_PROFILE']
         # ENV['DEFAULT_PROFILE']
         # 'default'
-        aws_profile = if compute_options[:aws_access_key_id]
-            Chef::Log.debug("Using AWS driver access key options")
-            {
-              :aws_access_key_id => compute_options[:aws_access_key_id],
-              :aws_secret_access_key => compute_options[:aws_secret_access_key],
-              :aws_security_token => compute_options[:aws_session_token],
-              :region => compute_options[:region]
-            }
-          elsif driver_options[:aws_profile]
-            Chef::Log.debug("Using AWS profile #{driver_options[:aws_profile]}")
-            aws_credentials[driver_options[:aws_profile]]
-          elsif ENV['AWS_ACCESS_KEY_ID'] || ENV['AWS_ACCESS_KEY']
-            Chef::Log.debug("Using AWS environment variable access keys")
-            {
-              :aws_access_key_id => ENV['AWS_ACCESS_KEY_ID'] || ENV['AWS_ACCESS_KEY'],
-              :aws_secret_access_key => ENV['AWS_SECRET_ACCESS_KEY'] || ENV['AWS_SECRET_KEY'],
-              :aws_security_token => ENV['AWS_SECURITY_TOKEN'],
-              :region => ENV['AWS_REGION']
-            }
-          elsif ENV['AWS_PROFILE']
-            Chef::Log.debug("Using AWS profile #{ENV['AWS_PROFILE']} from AWS_PROFILE environment variable")
-            aws_credentials[ENV['AWS_PROFILE']]
-          else
-            Chef::Log.debug("Using AWS default profile")
-            aws_credentials.default
+        if compute_options[:aws_access_key_id]
+          Chef::Log.debug("Using AWS driver access key options")
+          aws_profile = {
+            :aws_access_key_id => compute_options[:aws_access_key_id],
+            :aws_secret_access_key => compute_options[:aws_secret_access_key],
+            :aws_security_token => compute_options[:aws_session_token],
+            :region => compute_options[:region]
+          }
+        elsif driver_options[:aws_profile]
+          Chef::Log.debug("Using AWS profile #{driver_options[:aws_profile]}")
+          aws_profile = aws_credentials[driver_options[:aws_profile]]
+        elsif ENV['AWS_ACCESS_KEY_ID'] || ENV['AWS_ACCESS_KEY']
+          Chef::Log.debug("Using AWS environment variable access keys")
+          aws_profile = {
+            :aws_access_key_id => ENV['AWS_ACCESS_KEY_ID'] || ENV['AWS_ACCESS_KEY'],
+            :aws_secret_access_key => ENV['AWS_SECRET_ACCESS_KEY'] || ENV['AWS_SECRET_KEY'],
+            :aws_security_token => ENV['AWS_SECURITY_TOKEN'],
+            :region => ENV['AWS_REGION']
+          }
+        elsif ENV['AWS_PROFILE']
+          Chef::Log.debug("Using AWS profile #{ENV['AWS_PROFILE']} from AWS_PROFILE environment variable")
+          aws_profile = aws_credentials[ENV['AWS_PROFILE']]
+          if !aws_profile
+            raise "Environment variable AWS_PROFILE is set to #{ENV['AWS_PROFILE'].inspect} but your AWS config file does not contain that profile!"
           end
-        # Endpoint configuration
-        if compute_options[:ec2_endpoint]
-          aws_profile[:ec2_endpoint] = compute_options[:ec2_endpoint]
-        elsif ENV['EC2_URL']
-          aws_profile[:ec2_endpoint] = ENV['EC2_URL']
-        end
-        if compute_options[:iam_endpoint]
-          aws_profile[:iam_endpoint] = compute_options[:iam_endpoint]
-        elsif ENV['AWS_IAM_URL']
-          aws_profile[:iam_endpoint] = ENV['AWS_IAM_URL']
         else
-          aws_profile[:iam_endpoint] = "https://iam.amazonaws.com/"
+          Chef::Log.debug("Using AWS default profile")
+          aws_profile = aws_credentials.default
         end
 
+        default_ec2_endpoint = compute_options[:ec2_endpoint] || ENV['EC2_URL']
+        default_iam_endpoint = compute_options[:iam_endpoint] || ENV['AWS_IAM_URL']
+
         # Merge in account info for profile
         if aws_profile
-          aws_profile = aws_profile.merge(aws_account_info_for(aws_profile))
+          aws_profile = aws_profile.merge(aws_account_info_for(aws_profile, default_iam_endpoint))
         end
 
         # If no profile is found (or the profile is not the right account), search
         # for a profile that matches the given account ID
         if aws_account_id && (!aws_profile || aws_profile[:aws_account_id] != aws_account_id)
-          aws_profile = find_aws_profile_for_account_id(aws_credentials, aws_account_id)
+          aws_profile = find_aws_profile_for_account_id(aws_credentials, aws_account_id, iam_endpoint)
         end
 
         if !aws_profile
           raise "No AWS profile specified!  Are you missing something in the Chef config or ~/.aws/config?"
         end
 
+        aws_profile[:ec2_endpoint] ||= default_ec2_endpoint
+        aws_profile[:iam_endpoint] ||= default_iam_endpoint
+
         aws_profile.delete_if { |key, value| value.nil? }
         aws_profile
       end
 
-      def self.find_aws_profile_for_account_id(aws_credentials, aws_account_id)
+      def self.find_aws_profile_for_account_id(aws_credentials, aws_account_id, default_iam_endpoint=nil)
         aws_profile = nil
         aws_credentials.each do |profile_name, profile|
           begin
-            aws_account_info = aws_account_info_for(profile)
+            aws_account_info = aws_account_info_for(profile, default_iam_endpoint)
           rescue
             Chef::Log.warn("Could not connect to AWS profile #{aws_credentials[:name]}: #{$!}")
             Chef::Log.debug($!.backtrace.join("\n"))
@@ -215,18 +211,23 @@ module ChefMetalFog
         aws_profile
       end
 
-      def self.aws_account_info_for(aws_profile)
+      def self.aws_account_info_for(aws_profile, default_iam_endpoint = nil)
+        iam_endpoint = aws_profile[:iam_endpoint] || default_iam_endpoint
+
         @@aws_account_info ||= {}
         @@aws_account_info[aws_profile[:aws_access_key_id]] ||= begin
           options = {
+            # Endpoint configuration
             :aws_access_key_id => aws_profile[:aws_access_key_id],
             :aws_secret_access_key => aws_profile[:aws_secret_access_key],
-            :aws_session_token => aws_profile[:aws_security_token],
-            :host => URI(aws_profile[:iam_endpoint]).host,
-            :scheme => URI(aws_profile[:iam_endpoint]).scheme,
-            :port => URI(aws_profile[:iam_endpoint]).port,
-            :path => URI(aws_profile[:iam_endpoint]).path
+            :aws_session_token => aws_profile[:aws_security_token]
           }
+          if iam_endpoint
+            options[:host] = URI(iam_endpoint).host
+            options[:scheme] = URI(iam_endpoint).scheme
+            options[:port] = URI(iam_endpoint).port
+            options[:path] = URI(iam_endpoint).path
+          end
           options.delete_if { |key, value| value.nil? }
 
           iam = Fog::AWS::IAM.new(options)
@@ -311,6 +312,10 @@ module ChefMetalFog
         new_config[:driver_options][:aws_account_info] = account_info
         id = "#{account_info[:aws_account_id]}:#{result[:driver_options][:compute_options][:region]}"
 
+        # Make sure we're using a reasonable default AMI, for now this is Ubuntu 14.04 LTS
+        result[:machine_options][:bootstrap_options][:image_id] ||=
+            default_ami_for_region(result[:driver_options][:compute_options][:region])
+
         [result, id]
       end
 
@@ -343,6 +348,31 @@ module ChefMetalFog
         end
         result
       end
+
+      private
+      def self.default_ami_for_region(region)
+        Chef::Log.debug("Choosing default AMI for region '#{region}'")
+
+        case region
+        when 'ap-northeast-1'
+          'ami-c786dcc6'
+        when 'ap-southeast-1'
+          'ami-eefca7bc'
+        when 'ap-southeast-2'
+          'ami-996706a3'
+        when 'eu-west-1'
+          'ami-4ab46b3d'
+        when 'sa-east-1'
+          'ami-6770d87a'
+        when 'us-east-1'
+          'ami-d2ff23ba'
+        when 'us-west-1'
+          'ami-73717d36'
+        when 'us-west-2'
+          'ami-f1ce8bc1'
+        end
+      end
+
     end
   end
 end

data/lib/chef_metal_fog/providers/digitalocean.rb

@@ -50,6 +50,18 @@ module ChefMetalFog
         bootstrap_options
       end
 
+      def destroy_machine(action_handler, machine_spec, machine_options)
+        server = server_for(machine_spec)
+        if server && server.state != 'archive'
+          action_handler.perform_action "destroy machine #{machine_spec.name} (#{machine_spec.location['server_id']} at #{driver_url})" do
+            server.destroy
+          end
+        end
+        machine_spec.location = nil
+        strategy = convergence_strategy_for(machine_spec, machine_options)
+        strategy.cleanup_convergence(action_handler, machine_spec)
+      end
+
       def self.compute_options_for(provider, id, config)
         new_compute_options = {}
         new_compute_options[:provider] = provider

data/lib/chef_metal_fog/version.rb

@@ -1,3 +1,3 @@
 module ChefMetalFog
-  VERSION = '0.8'
+  VERSION = '0.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-metal-fog
 version: !ruby/object:Gem::Version
-  version: '0.8'
+  version: '0.9'
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-18 00:00:00.000000000 Z
+date: 2014-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef