fog 1.6.0 → 1.7.0

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

@@ -23,7 +23,6 @@ module Fog
         attribute :template
 
         attr_accessor :hostname, :password, :lb_applications, :lb_services, :lb_backends
-        attr_writer :private_key, :private_key_path, :public_key, :public_key_path, :username
 
         def initialize(attributes={})
           self.flavor_id    ||= '94fd37a7-2606-47f7-84d5-9000deda52ae' # Block 1GB Virtual Server
@@ -57,28 +56,10 @@ module Fog
           nil
         end
 
-        def private_key_path
-          @private_key_path ||= Fog.credentials[:private_key_path]
-          @private_key_path &&= File.expand_path(@private_key_path)
-        end
-
-        def private_key
-          @private_key ||= private_key_path && File.read(private_key_path)
-        end
-
         def public_ip_address
           ips.first
         end
 
-        def public_key_path
-          @public_key_path ||= Fog.credentials[:public_key_path]
-          @public_key_path &&= File.expand_path(@public_key_path)
-        end
-
-        def public_key
-          @public_key ||= public_key_path && File.read(public_key_path)
-        end
-
         def ready?
           self.state == 'running'
         end

data/lib/fog/bluebox/requests/compute/create_block.rb

@@ -6,22 +6,22 @@ module Fog
         # Create a new block
         #
         # ==== Parameters
-        # * product_id<~String> - ID of product to create block with
-        # * template_id<~String> - ID of template to create block with
-        # * location_id<~String> - ID of location to create block in
+        # * product_id<~String>   - ID of block product (size)
+        # * template_id<~String>  - ID of block OS/build template
+        # * location_id<~String>  - ID of deployment location
         # * options<~Hash>:
-        #     * password<~String> - Password for block
+        #     * password<~String>   - Password for block
         #   or
-        #     * ssh_key<~String> - ssh public key
-        #   * username<~String> - optional, defaults to deploy
+        #     * public_key<~String> - SSH public key
+        #     * username<~String>   - Defaults to deploy
         #
         # ==== Returns
         # * response<~Excon::Response>:
         #   * body<~Hash>:
         def create_block(product_id, template_id, location_id, options = {})
 
-          unless options.has_key?(:password) || options.has_key?(:ssh_key)
-            raise ArgumentError, 'Either password or ssh_key must be supplied'
+          unless options.has_key?('password') || options.has_key?('public_key')
+            raise ArgumentError, 'Either password or public_key must be supplied'
           end
 
           query = {

data/lib/fog/brightbox/compute.rb

@@ -7,11 +7,25 @@ module Fog
 
       API_URL = "https://api.gb1.brightbox.com/"
 
+      # Client credentials
       requires :brightbox_client_id, :brightbox_secret
-      recognizes :brightbox_auth_url, :brightbox_api_url, :persistent
+
+      # API endpoint settings
+      recognizes :brightbox_auth_url, :brightbox_api_url
+
+      # User credentials (still requires client details)
+      recognizes :brightbox_username, :brightbox_password, :brightbox_account
+
+      # Excon connection settings
+      recognizes :persistent
 
       model_path 'fog/brightbox/models/compute'
-      model       :account # Singular resource, no collection
+      collection  :accounts
+      model       :account
+      collection  :applications
+      model       :application
+      collection  :api_clients
+      model       :api_client
       collection  :servers
       model       :server
       collection  :server_groups
@@ -41,6 +55,7 @@ module Fog
       request :apply_to_firewall_policy
       request :remove_firewall_policy
       request :create_api_client
+      request :create_application
       request :create_cloud_ip
       request :create_firewall_policy
       request :create_firewall_rule
@@ -49,6 +64,7 @@ module Fog
       request :create_server
       request :create_server_group
       request :destroy_api_client
+      request :destroy_application
       request :destroy_cloud_ip
       request :destroy_firewall_policy
       request :destroy_firewall_rule
@@ -58,18 +74,23 @@ module Fog
       request :destroy_server_group
       request :get_account
       request :get_api_client
+      request :get_application
+      request :get_authenticated_user
       request :get_cloud_ip
       request :get_firewall_policy
       request :get_firewall_rule
       request :get_image
       request :get_interface
       request :get_load_balancer
+      request :get_scoped_account
       request :get_server
       request :get_server_group
       request :get_server_type
       request :get_user
       request :get_zone
+      request :list_accounts
       request :list_api_clients
+      request :list_applications
       request :list_cloud_ips
       request :list_firewall_policies
       request :list_images
@@ -86,6 +107,7 @@ module Fog
       request :remove_servers_server_group
       request :reset_ftp_password_account
       request :reset_secret_api_client
+      request :reset_secret_application
       request :shutdown_server
       request :snapshot_server
       request :start_server
@@ -93,10 +115,12 @@ module Fog
       request :unmap_cloud_ip
       request :update_account
       request :update_api_client
+      request :update_application
       request :update_cloud_ip
       request :update_firewall_rule
       request :update_image
       request :update_load_balancer
+      request :update_scoped_account
       request :update_server
       request :update_server_group
       request :update_user
@@ -145,22 +169,37 @@ module Fog
           @connection_options   = options[:connection_options] || {}
           @brightbox_client_id  = options[:brightbox_client_id] || Fog.credentials[:brightbox_client_id]
           @brightbox_secret     = options[:brightbox_secret] || Fog.credentials[:brightbox_secret]
+          @brightbox_username   = options[:brightbox_username] || Fog.credentials[:brightbox_username]
+          @brightbox_password   = options[:brightbox_password] || Fog.credentials[:brightbox_password]
+          @brightbox_account    = options[:brightbox_account] || Fog.credentials[:brightbox_account]
           @persistent           = options[:persistent] || false
           @connection = Fog::Connection.new(@api_url, @persistent, @connection_options)
         end
 
-        def request(method, url, expected_responses, options = nil)
+        def request(method, url, expected_responses, options = {})
           request_options = {
             :method   => method.to_s.upcase,
             :path     => url,
             :expects  => expected_responses
           }
-          request_options[:body] = Fog::JSON.encode(options) unless options.nil?
+          options[:account_id] = @brightbox_account if options[:account_id].nil? && @brightbox_account
+          request_options[:body] = Fog::JSON.encode(options) unless options.empty?
           make_request(request_options)
         end
 
+        # Returns the scoped account being used for requests
+        #
+        # API Clients:: This is the owning account
+        # User Apps::   This is the account specified by either +account_id+
+        #               option on a connection or the +brightbox_account+
+        #               setting in your configuration
+        #
+        # === Returns:
+        #
+        # <tt>Fog::Compute::Brightbox::Account</tt>
+        #
         def account
-          Fog::Compute::Brightbox::Account.new(get_account)
+          Fog::Compute::Brightbox::Account.new(get_scoped_account)
         end
 
       private
@@ -168,7 +207,17 @@ module Fog
           auth_url = options[:brightbox_auth_url] || @auth_url
 
           connection = Fog::Connection.new(auth_url)
-          @authentication_body = Fog::JSON.encode({'client_id' => @brightbox_client_id, 'grant_type' => 'none'})
+          authentication_body_hash = if @brightbox_username && @brightbox_password
+            {
+              'client_id' => @brightbox_client_id,
+              'grant_type' => 'password',
+              'username' => @brightbox_username,
+              'password' => @brightbox_password
+            }
+          else
+            {'client_id' => @brightbox_client_id, 'grant_type' => 'none'}
+          end
+          @authentication_body = Fog::JSON.encode(authentication_body_hash)
 
           response = connection.request({
             :path => "/token",
@@ -209,7 +258,7 @@ module Fog
         def select_default_image
           return @default_image_id unless @default_image_id.nil?
 
-          all_images = Fog::Compute[:brightbox].list_images
+          all_images = list_images
           official_images = all_images.select {|img| img["official"] == true}
           ubuntu_lts_images = official_images.select {|img| img["name"] =~ /Ubuntu.*LTS/}
           ubuntu_lts_i686_images = ubuntu_lts_images.select {|img| img["arch"] == "i686"}

data/lib/fog/brightbox/models/compute/accounts.rb

@@ -0,0 +1,29 @@
+require 'fog/core/collection'
+require 'fog/brightbox/models/compute/account'
+
+module Fog
+  module Compute
+    class Brightbox
+
+      class Accounts < Fog::Collection
+
+        model Fog::Compute::Brightbox::Account
+
+        def all
+          data = connection.list_accounts
+          load(data)
+        end
+
+        def get(identifier)
+          return nil if identifier.nil? || identifier == ""
+          data = connection.get_account(identifier)
+          new(data)
+        rescue Excon::Errors::NotFound
+          nil
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/brightbox/models/compute/api_client.rb

@@ -0,0 +1,37 @@
+module Fog
+  module Compute
+    class Brightbox
+      class ApiClient < Fog::Model
+        identity :id
+        attribute :name
+        attribute :description
+        attribute :secret
+        attribute :revoked_at, :type => :time
+        attribute :account_id
+
+        def save
+          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
+          options = {
+            :name => name,
+            :description => description
+          }.delete_if {|k,v| v.nil? || v == "" }
+          data = connection.create_api_client(options)
+          merge_attributes(data)
+          true
+        end
+
+        def destroy
+          requires :identity
+          connection.destroy_api_client(identity)
+          true
+        end
+
+        def reset_secret
+          requires :identity
+          connection.reset_secret_api_client(identity)
+          true
+        end
+      end
+    end
+  end
+end

data/lib/fog/brightbox/models/compute/api_clients.rb

@@ -0,0 +1,24 @@
+require "fog/core/collection"
+require "fog/brightbox/models/compute/api_client"
+
+module Fog
+  module Compute
+    class Brightbox
+      class ApiClients < Fog::Collection
+        model Fog::Compute::Brightbox::ApiClient
+
+        def all
+          data = connection.list_api_clients
+          load(data)
+        end
+
+        def get(identifier = nil)
+          data = connection.get_api_client(identifier)
+          new(data)
+        rescue Excon::Errors::NotFound
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/fog/brightbox/models/compute/application.rb

@@ -0,0 +1,27 @@
+require 'fog/core/model'
+
+module Fog
+  module Compute
+    class Brightbox
+
+      class Application < Fog::Model
+
+        identity :id
+        attribute :url
+        attribute :name
+        attribute :secret
+
+        def save
+          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
+          options = {
+            :name => name
+          }.delete_if {|k,v| v.nil? || v == "" }
+          data = connection.create_application(options)
+          merge_attributes(data)
+          true
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/brightbox/models/compute/applications.rb

@@ -0,0 +1,28 @@
+require 'fog/core/collection'
+require 'fog/brightbox/models/compute/application'
+
+module Fog
+  module Compute
+    class Brightbox
+
+      class Applications < Fog::Collection
+
+        model Fog::Compute::Brightbox::Application
+
+        def all
+          data = connection.list_applications
+          load(data)
+        end
+
+        def get(identifier)
+          data = connection.get_application(identifier)
+          new(data)
+        rescue Excon::Errors::NotFound
+          nil
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -38,8 +38,10 @@ module Fog
         attribute :server_type
 
         def initialize(attributes={})
-          self.image_id ||= Fog::Compute[:brightbox].default_image
+          # Call super first to initialize the 'connection' object for our default image
           super
+          # FIXME connection is actually <Fog::Compute::Brightbox::Real> not <Fog::Connection>
+          self.image_id ||= connection.default_image
         end
 
         def zone_id

data/lib/fog/brightbox/models/compute/users.rb

@@ -14,14 +14,12 @@ module Fog
           load(data)
         end
 
-        def get(identifier)
-          return nil if identifier.nil? || identifier == ""
+        def get(identifier = nil)
           data = connection.get_user(identifier)
           new(data)
         rescue Excon::Errors::NotFound
           nil
         end
-
       end
 
     end

data/lib/fog/brightbox/requests/compute/create_application.rb

@@ -0,0 +1,13 @@
+module Fog
+  module Compute
+    class Brightbox
+      class Real
+
+        def create_application(options)
+          request("post", "/1.0/applications", [201], options)
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/brightbox/requests/compute/create_cloud_ip.rb

@@ -3,8 +3,8 @@ module Fog
     class Brightbox
       class Real
 
-        def create_cloud_ip(options = nil)
-          request("post", "/1.0/cloud_ips", [201],options)
+        def create_cloud_ip(options = {})
+          request("post", "/1.0/cloud_ips", [201], options)
         end
 
       end

data/lib/fog/brightbox/requests/compute/destroy_application.rb

@@ -0,0 +1,14 @@
+module Fog
+  module Compute
+    class Brightbox
+      class Real
+
+        def destroy_application(identifier)
+          return nil if identifier.nil? || identifier == ""
+          request("delete", "/1.0/applications/#{identifier}", [200])
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/brightbox/requests/compute/get_account.rb

@@ -2,12 +2,36 @@ module Fog
   module Compute
     class Brightbox
       class Real
-
-        def get_account
-          request("get", "/1.0/account", [200])
+        # Requests details about an account from the API
+        #
+        # === Parameters:
+        #
+        # <tt>identifier <String></tt>:: The identifier to request (Default is +nil+)
+        #
+        # === Returns:
+        #
+        # <tt>Hash</tt>:: The JSON response parsed to a Hash
+        #
+        # === Notes:
+        #
+        # This also supports a deprecated form where if an identifier is not
+        # passed then the scoping account is returned instead. This should not
+        # be used in new code. Use #get_scoped_account instead.
+        #
+        # === Reference:
+        #
+        # https://api.gb1.brightbox.com/1.0/#account_get_account
+        #
+        def get_account(identifier = nil)
+          if identifier.nil? || identifier.empty?
+            Fog::Logger.deprecation("get_account() without a parameter is deprecated, use get_scoped_account instead [light_black](#{caller.first})[/]")
+            get_scoped_account
+          else
+            request("get", "/1.0/accounts/#{identifier}", [200])
+          end
         end
 
       end
     end
   end
-end
+end