fog 1.31.0 → 1.37.0

data/lib/fog/digitalocean/compute_v2.rb

@@ -0,0 +1,109 @@
+require 'fog/digitalocean/core'
+
+module Fog
+  module Compute
+    class DigitalOceanV2 < Fog::Service
+      requires :digitalocean_token
+
+      model_path 'fog/digitalocean/models/compute_v2'
+      model :server
+      collection :servers
+      model :image
+      collection :images
+      model :region
+      collection :regions
+      model :flavor
+      collection :flavors
+      model :ssh_key
+      collection :ssh_keys
+
+      request_path 'fog/digitalocean/requests/compute_v2'
+      request :change_kernel
+      request :create_server
+      request :create_ssh_key
+      request :delete_server
+      request :delete_ssh_key
+      request :disable_backups
+      request :enable_ipv6
+      request :enable_private_networking
+      request :get_droplet_action
+      request :get_image_details
+      request :get_server_details
+      request :get_ssh_key
+      request :list_droplet_actions
+      request :list_flavors
+      request :list_images
+      request :list_regions
+      request :list_servers
+      request :list_ssh_keys
+      request :password_reset
+      request :power_cycle
+      request :power_off
+      request :power_on
+      request :reboot_server
+      request :rebuild
+      request :rename
+      request :resize
+      request :restore
+      request :shutdown
+      request :snapshot
+      request :update_ssh_key
+      request :upgrade
+
+
+      class Mock
+        def self.data
+          @data ||= Hash.new do |hash, key|
+            hash[key] = {
+              :servers  => [],
+              :ssh_keys => []
+            }
+          end
+        end
+
+        def initialize(options={})
+          @digitalocean_token = options[:digitalocean_token]
+        end
+
+        def data
+          self.class.data[@digitalocean_token]
+        end
+
+        def reset_data
+          self.class.data.delete(@digitalocean_token)
+        end
+      end
+
+      class Real
+        def initialize(options={})
+          digitalocean_token = options[:digitalocean_token]
+          persistent         = false
+          options            = {
+            headers: {
+              'Authorization' => "Bearer #{digitalocean_token}",
+            }
+          }
+          @connection        = Fog::Core::Connection.new 'https://api.digitalocean.com', persistent, options
+        end
+
+        def request(params)
+          params[:headers] ||= {}
+          begin
+            response = @connection.request(params)
+          rescue Excon::Errors::HTTPStatusError => error
+            raise case error
+                    when Excon::Errors::NotFound
+                      Fog::Compute::Bluebox::NotFound.slurp(error)
+                    else
+                      error
+                  end
+          end
+          unless response.body.empty?
+            response.body = Fog::JSON.decode(response.body)
+          end
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/digitalocean/examples/getting_started.md

@@ -1,11 +1,10 @@
 # Getting started: the compute service
 
-You'll need a DigitalOcean account and API key to use this provider.
+You'll need a DigitalOcean account and an API token to use this provider.
 
-Get one from https://cloud.digitalocean.com/api_access (fog currently uses the v1 API)
-
-Write down the Client Key and API Key, you'll need both to use the service.
+Get one from https://cloud.digitalocean.com/settings/tokens/new
 
+Write down the Access Token.
 
 ## Connecting, retrieving and managing server objects
 
@@ -21,8 +20,8 @@ require 'fog'
 
 docean = Fog::Compute.new({
   :provider => 'DigitalOcean',
-  :digitalocean_api_key   => 'poiuweoruwoeiuroiwuer', # your API key here
-  :digitalocean_client_id => 'lkjasoidfuoiu'          # your client key here
+  :version  => 'V2',
+  :digitalocean_token   => 'poiuweoruwoeiuroiwuer', # your Access Token here
 })
 ```
 
@@ -43,8 +42,9 @@ Listing all keys:
 
 ```ruby
 docean.ssh_keys.each do | key |
-   key.name
-   key.ssh_pub_key
+  puts key.name
+  puts key.public_key
+  puts key.id
 end
 ```
 
@@ -53,24 +53,6 @@ Destroying a key:
 ```ruby
 docean.ssh_keys.destroy(:id => '27100')
 ```
-
-## Boostrapping a server
-
-Fog can be used to bootstrap a server, which will create an SSH key to be assigned to a server at boot.
-
-```ruby
-server = connection.servers.bootstrap({
-  :name => 'test',
-  :image_id => 1505447,
-  :size_id => 33,
-  :region_id => 4,
-  :flavor_id => 66,
-  :public_key_path => File.expand_path('~/.ssh/id_rsa.pub'),
-  :private_key_path => File.expand_path('~/.ssh/id_rsa'),
-})
-server.wait_for { ready? }
-```
-
 ## Listing servers
 
 Listing servers and attributes:
@@ -78,13 +60,12 @@ Listing servers and attributes:
 ```ruby
 docean.servers.each do |server|
   # remember, servers are droplets
-  server.id
-  server.name
-  server.state
-  server.backups_enabled
-  server.image_id
-  server.flavor_id # server 'size' in DigitalOcean's API parlance
-  server.region_id
+  puts server.id
+  puts server.name
+  puts server.status
+  puts (server.image['slug'] || server.image['name']) # slug is only for public images, private images use name
+  puts server.size['slug']
+  puts server.region['slug']
 end
 ```
 
@@ -94,12 +75,12 @@ Creating a new server (droplet):
 
 ```ruby
 server = docean.servers.create :name => 'foobar',
-                               # use the first image listed
-                               :image_id  => docean.images.first.id,
-                               # use the first flavor listed
-                               :flavor_id => docean.flavors.first.id,
+                               # use the last image listed
+                               :image  => docean.images.last.id,
+                               # use the first flavor (aka size) listed
+                               :size => docean.flavors.first.slug,
                                # use the first region listed
-                               :region_id => docean.regions.first.id
+                               :region => docean.regions.first.slug
 ```
 
 The server is automatically started after that.
@@ -109,21 +90,18 @@ but you can easily list them too, and then decide:
 
 ```ruby
 docean.images.each do |image|
-  image.id
-  image.name
-  image.distribution
+  puts image.id
+  puts image.name
+  puts image.distribution
 end
 
 docean.flavors.each do |flavor|
-  flavor.id
-  flavor.name
+  puts flavor.slug
 end
 
 docean.regions.each do |region|
-  region.id
-  region.name
+  puts region.slug
 end
-
 ```
 
 Rebooting a server:
@@ -144,5 +122,3 @@ Destroying the server:
 ```ruby
 server.destroy
 ```
-
-

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

@@ -81,7 +81,6 @@ module Fog
 
         def setup(credentials = {})
           requires :ssh_ip_address
-          require 'net/ssh'
 
           commands = [
             %{mkdir .ssh},

data/lib/fog/digitalocean/models/compute_v2/flavor.rb

@@ -0,0 +1,17 @@
+module Fog
+  module Compute
+    class DigitalOceanV2
+      class Flavor < Fog::Model
+        identity  :slug
+        attribute :available
+        attribute :transfer
+        attribute :price_monthly
+        attribute :price_hourly
+        attribute :memory
+        attribute :vcpus
+        attribute :disk
+        attribute :regions
+      end
+    end
+  end
+end

data/lib/fog/digitalocean/models/compute_v2/flavors.rb

@@ -0,0 +1,21 @@
+module Fog
+  module Compute
+    class DigitalOceanV2
+      class Flavors < Fog::Collection
+        model Fog::Compute::DigitalOceanV2::Flavor
+
+        # Retrieves flavours (aka. sizes)
+        # @return [Fog::Compute::DigitalOceanV2:Flavor]
+        # @raise [Fog::Compute::DigitalOceanV2::NotFound] - HTTP 404
+        # @raise [Fog::Compute::DigitalOceanV2::BadRequest] - HTTP 400
+        # @raise [Fog::Compute::DigitalOceanV2::InternalServerError] - HTTP 500
+        # @raise [Fog::Compute::DigitalOceanV2::ServiceError]
+        # @see https://developers.digitalocean.com/documentation/v2/#list-all-sizes
+        def all(filters = {})
+          data = service.list_flavors.body["sizes"]
+          load(data)
+        end
+      end
+    end
+  end
+end

data/lib/fog/digitalocean/models/compute_v2/image.rb

@@ -0,0 +1,25 @@
+module Fog
+  module Compute
+    class DigitalOceanV2
+      class Image < Fog::Model
+        identity :id
+        attribute :name
+        attribute :type
+        attribute :distribution
+        attribute :slug
+        attribute :public
+        attribute :regions
+        attribute :min_disk_size
+        attribute :created_at
+      end
+
+      def transfer
+        perform_action :transfer_image
+      end
+
+      def convert_to_snapshot
+        perform_action :convert_image_to_snapshot
+      end
+    end
+  end
+end

data/lib/fog/digitalocean/models/compute_v2/images.rb

@@ -0,0 +1,36 @@
+module Fog
+  module Compute
+    class DigitalOceanV2
+      class Images < Fog::Collection
+        model Fog::Compute::DigitalOceanV2::Image
+
+        # Retrieves images
+        # @return [Fog::Compute::DigitalOceanV2:Image]
+        # @raise [Fog::Compute::DigitalOceanV2::NotFound] - HTTP 404
+        # @raise [Fog::Compute::DigitalOceanV2::BadRequest] - HTTP 400
+        # @raise [Fog::Compute::DigitalOceanV2::InternalServerError] - HTTP 500
+        # @raise [Fog::Compute::DigitalOceanV2::ServiceError]
+        # @see https://developers.digitalocean.com/documentation/v2/#list-all-images
+        def all(filters = {})
+          data = service.list_images.body["images"]
+          load(data)
+        end
+
+        # Retrieves image
+        # @param [String] id for image to be returned
+        # @return [Fog::Compute::DigitalOceanV2:Image]
+        # @raise [Fog::Compute::DigitalOceanV2::NotFound] - HTTP 404
+        # @raise [Fog::Compute::DigitalOceanV2::BadRequest] - HTTP 400
+        # @raise [Fog::Compute::DigitalOceanV2::InternalServerError] - HTTP 500
+        # @raise [Fog::Compute::DigitalOceanV2::ServiceError]
+        # @see https://developers.digitalocean.com/documentation/v2/#retrieve-an-existing-image-by-id
+        def get(id)
+          image = service.get_image_details(id).body['image']
+          new(image) if image
+        rescue Fog::Errors::NotFound
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/fog/digitalocean/models/compute_v2/region.rb

@@ -0,0 +1,13 @@
+module Fog
+  module Compute
+    class DigitalOceanV2
+      class Region < Fog::Model
+        identity :slug
+        attribute :name
+        attribute :sizes
+        attribute :available
+        attribute :features
+      end
+    end
+  end
+end

data/lib/fog/digitalocean/models/compute_v2/regions.rb

@@ -0,0 +1,21 @@
+module Fog
+  module Compute
+    class DigitalOceanV2
+      class Regions < Fog::Collection
+        model Fog::Compute::DigitalOceanV2::Region
+
+        # Retrieves regions
+        # @return [Fog::Compute::DigitalOceanV2:Regions]
+        # @raise [Fog::Compute::DigitalOceanV2::NotFound] - HTTP 404
+        # @raise [Fog::Compute::DigitalOceanV2::BadRequest] - HTTP 400
+        # @raise [Fog::Compute::DigitalOceanV2::InternalServerError] - HTTP 500
+        # @raise [Fog::Compute::DigitalOceanV2::ServiceError]
+        # @see https://developers.digitalocean.com/documentation/v2/#list-all-regions
+        def all(filters = {})
+          data = service.list_regions.body["regions"]
+          load(data)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,170 @@
+require 'fog/compute/models/server'
+
+module Fog
+  module Compute
+    class DigitalOceanV2
+      # A DigitalOcean Droplet
+      #
+      class Server < Fog::Compute::Server
+        identity :id
+        attribute :name
+        attribute :memory
+        attribute :vcpus
+        attribute :disk
+        attribute :locked
+        attribute :created_at
+        attribute :status
+        attribute :backup_ids
+        attribute :snapshot_ids
+        attribute :features
+        attribute :region
+        attribute :image
+        attribute :size
+        attribute :size_slug
+        attribute :networks
+        attribute :kernel
+        attribute :next_backup_window
+        attribute :private_networking
+        attribute :backups
+        attribute :ipv6
+        attribute :ssh_keys
+
+        def public_ip_address
+          ipv4_address
+        end
+
+        def ipv6_address
+          if (net = networks['v6'].find { |n| n['type'] == 'public' })
+            net['ip_address']
+          end
+        end
+
+        def ipv4_address
+          if (net = networks['v4'].find { |n| n['type'] == 'public' })
+            net['ip_address']
+          end
+        end
+
+        def save
+          raise Fog::Errors::Error.new('Re-saving an existing object may create a duplicate') if persisted?
+          requires :name, :region, :size, :image
+
+          options = {}
+          if attributes[:ssh_keys]
+            options[:ssh_keys] = attributes[:ssh_keys]
+          elsif @ssh_keys
+            options[:ssh_keys] = @ssh_keys.map(&:id)
+          end
+
+          options[:private_networking] = private_networking
+          options[:backups]            = backups
+          options[:ipv6]               = ipv6
+
+          data = service.create_server(name, size, image, region, options)
+
+          merge_attributes(data.body['droplet'])
+          true
+        end
+
+        def delete
+          requires :id
+          response = service.delete_server id
+          response.body
+        end
+
+        def ready?
+          status == 'active'
+        end
+
+        def locked?
+          locked
+        end
+
+        def actions
+          requires :id
+          response = service.list_droplet_actions id
+          response.body
+        end
+
+        def action(action_id)
+          requires :id
+          response = service.get_droplet_action(id, action_id)
+          response.body
+        end
+
+        def reboot
+          perform_action :reboot_server
+        end
+
+        def disable_backups
+          perform_action :disable_backups
+        end
+
+        def power_cycle
+          perform_action :power_cycle
+        end
+
+        def shutdown
+          perform_action :shutdown
+        end
+
+        def power_off
+          perform_action :power_off
+        end
+
+        def power_on
+          perform_action :power_on
+        end
+
+        def restore(image)
+          perform_action :restore, image
+        end
+
+        def password_reset
+          perform_action :password_reset
+        end
+
+        def resize(resize_disk, size)
+          perform_action :resize, resize_disk, size
+        end
+
+        def rebuild(image)
+          perform_action :rebuild, image
+        end
+
+        def rename(name)
+          perform_action :rename, name
+        end
+
+        def change_kernel(kernel)
+          perform_action :change_kernel, kernel
+        end
+
+        def enable_ipv6
+          perform_action :enable_ipv6
+        end
+
+        def enable_private_networking
+          perform_action :enable_private_networking
+        end
+
+        def snapshot(name)
+          perform_action :snapshot, name
+        end
+
+        def upgrade
+          perform_action :upgrade
+        end
+
+        private
+
+        # Performs a droplet action with the given set of arguments.
+        def perform_action(action, *args)
+          requires :id
+          response = service.send(action, id, *args)
+          response.body
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,39 @@
+require 'fog/core/collection'
+require 'fog/digitalocean/models/compute/server'
+
+module Fog
+  module Compute
+    class DigitalOceanV2
+      class Servers < Fog::Collection
+        model Fog::Compute::DigitalOceanV2::Server
+
+        # Returns list of servers
+        # @return [Fog::Compute::DigitalOceanV2::Servers]
+        # @raise [Fog::Compute::DigitalOceanV2::NotFound] - HTTP 404
+        # @raise [Fog::Compute::DigitalOceanV2::BadRequest] - HTTP 400
+        # @raise [Fog::Compute::DigitalOceanV2::InternalServerError] - HTTP 500
+        # @raise [Fog::Compute::DigitalOceanV2::ServiceError]
+        # @see https://developers.digitalocean.com/documentation/v2/#droplets
+        def all(filters = {})
+          data = service.list_servers.body['droplets']
+          load(data)
+        end
+
+        # Retrieves server
+        # @param [String] id for server to be returned
+        # @return [Fog::Compute::DigitalOceanV2:Server]
+        # @raise [Fog::Compute::DigitalOceanV2::NotFound] - HTTP 404
+        # @raise [Fog::Compute::DigitalOceanV2::BadRequest] - HTTP 400
+        # @raise [Fog::Compute::DigitalOceanV2::InternalServerError] - HTTP 500
+        # @raise [Fog::Compute::DigitalOceanV2::ServiceError]
+        # @see https://developers.digitalocean.com/documentation/v2/#retrieve-an-existing-droplet-by-id
+        def get(id)
+          server = service.get_server_details(id).body['droplet']
+          new(server) if server
+        rescue Fog::Errors::NotFound
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/fog/digitalocean/models/compute_v2/ssh_key.rb

@@ -0,0 +1,31 @@
+module Fog
+  module Compute
+    class DigitalOceanV2
+      class SshKey < Fog::Model
+        identity :id
+        attribute :fingerprint
+        attribute :public_key
+        attribute :name
+
+        def save
+          requires :name, :public_key
+          merge_attributes(service.create_ssh_key(name, public_key).body['ssh_key'])
+          true
+        end
+
+        def destroy
+          requires :id
+          service.delete_ssh_key id
+        end
+
+        def update
+          requires :id, :name
+          data = service.update_server(id, name)
+          merge_attributes(data.body['ssh_key'])
+          true
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,35 @@
+module Fog
+  module Compute
+    class DigitalOceanV2
+      class SshKeys < Fog::Collection
+        model Fog::Compute::DigitalOceanV2::SshKey
+
+        # Returns list of ssh keys
+        # @return [Fog::Compute::DigitalOceanV2::Sshkeys] Retrieves a list of ssh keys.
+        # @raise [Fog::Compute::DigitalOceanV2::NotFound] - HTTP 404
+        # @raise [Fog::Compute::DigitalOceanV2::BadRequest] - HTTP 400
+        # @raise [Fog::Compute::DigitalOceanV2::InternalServerError] - HTTP 500
+        # @raise [Fog::Compute::DigitalOceanV2::ServiceError]
+        # @see https://developers.digitalocean.com/documentation/v2/#list-all-keys
+        def all(filters={})
+          data = service.list_ssh_keys.body['ssh_keys']
+          load(data)
+        end
+
+        # Returns ssh key
+        # @return [Fog::Compute::DigitalOceanV2::Sshkeys] Retrieves a list of ssh keys.
+        # @raise [Fog::Compute::DigitalOceanV2::NotFound] - HTTP 404
+        # @raise [Fog::Compute::DigitalOceanV2::BadRequest] - HTTP 400
+        # @raise [Fog::Compute::DigitalOceanV2::InternalServerError] - HTTP 500
+        # @raise [Fog::Compute::DigitalOceanV2::ServiceError]
+        # @see https://developers.digitalocean.com/documentation/v2/#retrieve-an-existing-key
+        def get(id)
+          key = service.get_ssh_key(id).body['ssh_key']
+          new(key) if key
+        rescue Fog::Errors::NotFound
+          nil
+        end
+      end
+    end
+  end
+end