gapinc-fog 1.12.1.2.1 → 1.14.0

data/lib/fog/digitalocean/compute.rb

@@ -90,17 +90,46 @@ module Fog
           params[:query].merge!(:api_key   => @digitalocean_api_key)
           params[:query].merge!(:client_id => @digitalocean_client_id)
 
-          response = @connection.request(params)
+          response = retry_event_lock { parse @connection.request(params) }
 
           unless response.body.empty?
-            response.body = Fog::JSON.decode(response.body)
             if response.body['status'] != 'OK'
-              raise Fog::Errors::Error.new response.body.to_s
+              case response.body['error_message']
+              when /No Droplets Found/
+                raise Fog::Errors::NotFound.new
+              else
+                raise Fog::Errors::Error.new response.body.to_s
+              end
             end
           end
           response
         end
 
+        private
+
+        def parse(response)
+          return response if response.body.empty?
+          response.body = Fog::JSON.decode(response.body)
+          response
+        end
+
+        def retry_event_lock
+          count   = 0
+          reponse = nil
+          while count < 5
+            response = yield
+
+            if response.body && response.body['error_message'] =~ /There is already a pending event for the droplet/
+              count += 1
+              sleep count ** 3
+            else
+              break
+            end
+          end
+
+          response
+        end
+
       end
     end
   end

data/lib/fog/digitalocean/models/compute/server.rb

@@ -7,18 +7,26 @@ module Fog
       # A DigitalOcean Droplet
       #
       class Server < Fog::Compute::Server
-        
+
         identity  :id
         attribute :name
-       	attribute :state,	:aliases => 'status'
+        attribute :state, :aliases => 'status'
         attribute :image_id
         attribute :region_id
-        attribute :flavor_id,         :aliases => 'size_id'
+        attribute :flavor_id, :aliases => 'size_id'
         # Not documented in their API, but
         # available nevertheless
-        attribute :ip_address
+        attribute :public_ip_address, :aliases => 'ip_address'
         attribute :backups_active
 
+        attr_writer :ssh_keys
+
+        # Deprecated: Use public_ip_address instead.
+        def ip_address
+          Fog::Logger.warning("ip_address has been deprecated. Use public_ip_address instead")
+          public_ip_address
+        end
+
         # Reboot the server (soft reboot).
         #
         # The preferred method of rebooting a server.
@@ -52,7 +60,7 @@ module Fog
         # Works as a power switch.
         # The server consumes resources while powered off
         # so you are still charged.
-        # 
+        #
         # @see https://www.digitalocean.com/community/questions/am-i-charged-while-my-droplet-is-in-a-powered-off-state
         def stop
           requires :id
@@ -64,7 +72,7 @@ module Fog
         # The server consumes resources while powered on
         # so you will be charged.
         #
-        # Each time a server is spun up, even if for a few seconds, 
+        # Each time a server is spun up, even if for a few seconds,
         # it is charged for an hour.
         #
         def start
@@ -72,6 +80,25 @@ module Fog
           service.power_on_server self.id
         end
 
+        def setup(credentials = {})
+          requires :public_ip_address
+          require 'net/ssh'
+
+          commands = [
+            %{mkdir .ssh},
+            %{passwd -l #{username}},
+            %{echo "#{Fog::JSON.encode(Fog::JSON.sanitize(attributes))}" >> ~/attributes.json}
+          ]
+          if public_key
+            commands << %{echo "#{public_key}" >> ~/.ssh/authorized_keys}
+          end
+
+          # wait for aws to be ready
+          wait_for { sshable?(credentials) }
+
+          Fog::SSH.new(public_ip_address, username, credentials).run(commands)
+        end
+
         # Creates the server (not to be called directly).
         #
         # Usually called by Fog::Collection#create
@@ -85,7 +112,7 @@ module Fog
         #                     :image_id  => image_id_here,
         #                     :flavor_id => flavor_id_here,
         #                     :region_id => region_id_here
-        # 
+        #
         # @return [Boolean]
         def save
           raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
@@ -93,11 +120,13 @@ module Fog
 
           options = {}
           if attributes[:ssh_key_ids]
-            options[:ssh_key_ids] = attributes[:ssh_key_ids] 
+            options[:ssh_key_ids] = attributes[:ssh_key_ids]
+          elsif @ssh_keys
+            options[:ssh_key_ids] = @ssh_keys.map(&:id)
           end
-          data = service.create_server name, 
-                                       flavor_id, 
-                                       image_id, 
+          data = service.create_server name,
+                                       flavor_id,
+                                       image_id,
                                        region_id,
                                        options
           merge_attributes(data.body['droplet'])
@@ -105,7 +134,7 @@ module Fog
         end
 
         # Destroy the server, freeing up the resources.
-        # 
+        #
         # DigitalOcean will stop charging you for the resources
         # the server was using.
         #
@@ -115,9 +144,9 @@ module Fog
         # IMPORTANT: As of 2013/01/31, you should wait some time to
         # destroy the server after creating it. If you try to destroy
         # the server too fast, the destroy event may be lost and the
-        # server will remain running and consuming resources, so 
+        # server will remain running and consuming resources, so
         # DigitalOcean will keep charging you.
-        # Double checked this with DigitalOcean staff and confirmed 
+        # Double checked this with DigitalOcean staff and confirmed
         # that it's the way it works right now.
         #
         # Double check the server has been destroyed!

data/lib/fog/digitalocean/models/compute/servers.rb

@@ -6,16 +6,39 @@ module Fog
     class DigitalOcean
 
       class Servers < Fog::Collection
+
         model Fog::Compute::DigitalOcean::Server
 
         def all(filters = {})
-          load service.list_servers.body['droplets']
+          data = service.list_servers.body['droplets']
+          load(data)
         end
 
-        def get(id)
-          if server = service.get_server_details(id).body['droplet']
-            new server
+        def bootstrap(new_attributes = {})
+          server = new(new_attributes)
+
+          raise(ArgumentError, "public_key_path is required to configure the server.") unless new_attributes[:public_key_path]
+          raise(ArgumentError, "private_key_path is required to configure the server.") unless new_attributes[:private_key_path]
+          credential = Fog.respond_to?(:credential) && Fog.credential || :default
+          name       = "fog_#{credential}"
+          ssh_key    = service.ssh_keys.detect { |key| key.name == name }
+          if ssh_key.nil?
+            ssh_key = service.ssh_keys.create(
+              :name        => name,
+              :ssh_pub_key => File.read(new_attributes[:public_key_path])
+            )
           end
+          server.ssh_keys = [ssh_key]
+
+          server.save
+          server.wait_for { ready? }
+          server.setup :keys => [new_attributes[:private_key_path]]
+          server
+        end
+
+        def get(id)
+          server = service.get_server_details(id).body['droplet']
+          new(server) if server
         rescue Fog::Errors::NotFound
           nil
         end

data/lib/fog/digitalocean/models/compute/ssh_keys.rb

@@ -15,9 +15,8 @@ module Fog
         end
 
         def get(uri)
-          if data = service.get_ssh_key(uri)
-            new(data.body)
-          end
+          data = service.get_ssh_key(uri).body['ssh_key']
+          new(data)
         rescue Fog::Errors::NotFound
           nil
         end

data/lib/fog/digitalocean/requests/compute/create_server.rb

@@ -6,9 +6,9 @@ module Fog
         #
         # FIXME: missing ssh keys support
         #
-        def create_server( name, 
-                           size_id, 
-                           image_id, 
+        def create_server( name,
+                           size_id,
+                           image_id,
                            region_id,
                            options = {} )
 
@@ -20,9 +20,10 @@ module Fog
           }
 
           if options[:ssh_key_ids]
+            options[:ssh_key_ids]    = options[:ssh_key_ids].join(",") if options[:ssh_key_ids].is_a? Array
             query_hash[:ssh_key_ids] = options[:ssh_key_ids]
           end
-          
+
           request(
             :expects  => [200],
             :method   => 'GET',
@@ -35,9 +36,9 @@ module Fog
 
       class Mock
 
-        def create_server( name, 
-                           size_id, 
-                           image_id, 
+        def create_server( name,
+                           size_id,
+                           image_id,
                            region_id,
                            options = {} )
           response = Excon::Response.new
@@ -50,6 +51,7 @@ module Fog
             "size_id" => size_id,
             "image_id" => image_id,
             "region_id" => region_id,
+            "ip_address" => "127.0.0.1",
             "status" => 'active'
           }
 

data/lib/fog/digitalocean/requests/compute/destroy_server.rb

@@ -25,6 +25,9 @@ module Fog
             "event_id" => Fog::Mock.random_numbers(1).to_i,
             "status" => "OK"
           }
+
+          server = self.data[:servers].reject! { |s| s['id'] == id }
+
           response
         end
 

data/lib/fog/digitalocean/requests/compute/list_images.rb

@@ -1,6 +1,6 @@
 module Fog
   module Compute
-    class DigitalOcean 
+    class DigitalOcean
       class Real
 
         def list_images(options = {})
@@ -23,18 +23,18 @@ module Fog
             "images" => [
               # Sample image
               {
-                "id" => 1601, 
-                "name" => "CentOS 5.8 x64", 
+                "id" => 1601,
+                "name" => "CentOS 5.8 x64",
                 "distribution" => "CentOS"
               },
               {
-                "id" => 1602, 
-                "name" => "CentOS 5.8 x32", 
+                "id" => 1602,
+                "name" => "CentOS 5.8 x32",
                 "distribution" => "CentOS"
               },
               {
                 "id" => 2676,
-                "name" => "Ubuntu 12.04 x64 Server", 
+                "name" => "Ubuntu 12.04 x64",
                 "distribution" => "Ubuntu"
               },
 

data/lib/fog/dnsimple/dns.rb

@@ -29,7 +29,10 @@ module Fog
 
         def self.data
           @data ||= Hash.new do |hash, key|
-            hash[key] = {}
+            hash[key] = {
+              :domains => [],
+              :records => {}
+            }
           end
         end
 

data/lib/fog/dnsimple/models/dns/record.rb

@@ -25,7 +25,7 @@ module Fog
         end
 
         def destroy
-          service.delete_record(zone.domain, identity)
+          service.delete_record(zone.id, identity)
           true
         end
 
@@ -41,12 +41,12 @@ module Fog
 
           # decide whether its a new record or update of an existing
           if id.nil?
-            data = service.create_record(zone.domain, name, type, value, options)
+            data = service.create_record(zone.id, name, type, value, options)
           else
             options[:name] = name if name
             options[:content] = value if value
             options[:type] = type if type
-            data = service.update_record(zone.domain, id, options)
+            data = service.update_record(zone.id, id, options)
           end
 
           merge_attributes(data.body["record"])

data/lib/fog/dnsimple/requests/dns/create_domain.rb

@@ -22,6 +22,42 @@ module Fog
         end
 
       end
+
+      class Mock
+
+        def create_domain(name)
+          response = Excon::Response.new
+          response.status = 201
+
+          body = {
+            "domain" =>  {
+              "auto_renew"         => nil,
+              "created_at"         => Time.now.iso8601,
+              "expires_on"         => Date.today + 365,
+              "id"                 => Fog::Mock.random_numbers(1).to_i,
+              "language"           => nil,
+              "lockable"           => true,
+              "name"               => name,
+              "name_server_status" => "unknown",
+              "registrant_id"      => nil,
+              "state"              => "registered",
+              "token"              => "4fIFYWYiJayvL2tkf_mkBkqC4L+4RtYqDA",
+              "unicode_name"       => name,
+              "updated_at"         => Time.now.iso8601,
+              "user_id"            => 1,
+              "record_count"       => 0,
+              "service_count"      => 0,
+              "private_whois?"     => false
+            }
+          }
+          self.data[:domains] << body
+
+          response.body = body
+          response
+        end
+
+      end
+
     end
   end
 end

data/lib/fog/dnsimple/requests/dns/create_record.rb

@@ -43,6 +43,33 @@ module Fog
         end
 
       end
+
+      class Mock
+
+        def create_record(domain, name, type, content, options = {})
+          response = Excon::Response.new
+          response.status = 201
+          body = {
+            "record" => {
+              "name" => name,
+              "record_type" => type,
+              "content" => content,
+              "created_at" => Time.now.iso8601,
+              "updated_at" => Time.now.iso8601,
+              "id" => Fog::Mock.random_numbers(1).to_i,
+              "domain_id" => domain
+            }.merge(options)
+          }
+
+          self.data[:records][domain] ||= []
+          self.data[:records][domain] << body
+
+          response.body = body
+          response
+        end
+
+      end
+
     end
   end
 end

data/lib/fog/dnsimple/requests/dns/delete_domain.rb

@@ -21,6 +21,18 @@ module Fog
         end
 
       end
+
+      class Mock
+
+        def delete_domain(name)
+          self.data[:records].delete name
+          self.data[:domains].reject! { |domain| domain["domain"]["name"] == name }
+          response = Excon::Response.new
+          response.status = 200
+          response
+        end
+
+      end
     end
   end
 end