fog-brightbox 1.5.0 → 1.7.1

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

@@ -5,32 +5,34 @@ module Fog
         include Fog::Brightbox::Compute::ResourceLocking
 
         identity :id
-        attribute :url
         attribute :resource_type
+        attribute :url
 
         attribute :name
-        attribute :username
         attribute :status
         attribute :description
 
-        attribute :source
-        attribute :source_type
         attribute :arch
-        attribute :virtual_size
-        attribute :disk_size
+        attribute :disk_size, type: :integer
         attribute :licence_name
+        attribute :min_ram, type: :integer
+        attribute :source
+        attribute :source_trigger
+        attribute :source_type
+        attribute :username
+        attribute :virtual_size, type: :integer
 
         # Boolean flags
-        attribute :public
-        attribute :official
-        attribute :compatibility_mode
+        attribute :compatibility_mode, type: :boolean
+        attribute :official, type: :boolean
+        attribute :public, type: :boolean
 
-        # Times
-        attribute :created_at, :type => :time
+        # Timestamps
+        attribute :created_at, type: :time
 
-        # Links - to be replaced
-        attribute :ancestor_id, :aliases => "ancestor", :squash => "id"
-        attribute :owner_id, :aliases => "owner", :squash => "id"
+        # Links
+        attribute :ancestor_id, aliases: "ancestor", squash: "id"
+        attribute :owner_id, aliases: "owner", squash: "id"
 
         def ready?
           status == "available"

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

@@ -5,13 +5,13 @@ module Fog
         include Fog::Brightbox::Compute::ResourceLocking
 
         identity :id
-        attribute :url
         attribute :resource_type
+        attribute :url
 
         attribute :name
         attribute :status
 
-        attribute :buffer_size
+        attribute :buffer_size, type: :integer
 
         attribute :policy
         attribute :nodes
@@ -34,14 +34,18 @@ module Fog
         # List of domains for ACME
         attribute :domains
 
-        # Times
-        attribute :created_at, :type => :time
-        attribute :deleted_at, :type => :time
+        # Booleans
+        attribute :https_redirect, type: :boolean
+
+        # Timestamps
+        attribute :created_at, type: :time
+        attribute :deleted_at, type: :time
 
-        # Links - to be replaced
+        # Links
         attribute :account
-        attribute :server
-        attribute :cloud_ip
+
+        attribute :nodes
+        attribute :cloud_ips
 
         def ready?
           status == "active"

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

@@ -14,35 +14,37 @@ module Fog
         attribute :url
 
         attribute :name
-        attribute :state,       :aliases => "status"
+        attribute :state, aliases: "status"
 
-        attribute :hostname
-        attribute :fqdn
-        attribute :user_data
+        attribute :console_token
         attribute :console_url
         attribute :fqdn
-        attribute :console_token
+        attribute :hostname
+        attribute :user_data
 
-        attribute :disk_encrypted
+        # Boolean flags
+        attribute :compatibility_mode, type: :boolean
+        attribute :disk_encrypted, type: :boolean
 
-        # Times
-        attribute :created_at, :type => :time
-        attribute :started_at, :type => :time
-        attribute :console_token_expires, :type => :time
-        attribute :deleted_at, :type => :time
+        # Timestamps
+        attribute :created_at, type: :time
+        attribute :started_at, type: :time
+        attribute :console_token_expires, type: :time
+        attribute :deleted_at, type: :time
 
-        # Links - to be replaced
-        attribute :account_id,  :aliases => "account",      :squash => "id"
-        attribute :image_id,    :aliases => "image",        :squash => "id"
+        # Links
+        attribute :account_id, aliases: "account", squash: "id"
+        attribute :image_id, aliases: "image", squash: "id"
 
-        attribute :snapshots
+        attribute :server_type
+        attribute :zone
         attribute :cloud_ip # Creation option only
+
         attribute :cloud_ips
         attribute :interfaces
         attribute :server_groups
+        attribute :snapshots
         attribute :volumes
-        attribute :zone
-        attribute :server_type
 
         def initialize(attributes = {})
           # Call super first to initialize the service object for our default image

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

@@ -6,15 +6,23 @@ module Fog
       # Certain actions can accept a server group and affect all members
       class ServerGroup < Fog::Brightbox::Model
         identity :id
-
-        attribute :url
         attribute :resource_type
+        attribute :url
+
         attribute :name
         attribute :description
-        attribute :default
-        attribute :created_at, :type => :time
+        attribute :fqdn
+
+        # Booleans
+        attribute :default, type: :boolean
+
+        # Timestamps
+        attribute :created_at, type: :time
 
-        attribute :server_ids, :aliases => "servers"
+        # Links
+        attribute :account_id, aliases: "account", squash: "id"
+        attribute :firewall_policy_id, aliases: "firewall_policy", squash: "id"
+        attribute :server_ids, aliases: "servers"
 
         def save
           options = {

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

@@ -11,13 +11,18 @@ module Fog
         attribute :ssh_key
 
         # Boolean flags
-        attribute :email_verified
-        attribute :messaging_pref
+        attribute :email_verified, type: :boolean
 
-        # Links - to be replaced
-        attribute :account_id, :aliases => "default_account", :squash => "id"
+        # Timestamps
+        attribute :created_at, type: :time
+
+        # Links
+        attribute :account_id, aliases: "default_account", squash: "id"
         attribute :accounts
 
+        # Deprecated
+        attribute :messaging_pref, type: :boolean
+
         def save
           requires :identity
 

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

@@ -3,10 +3,21 @@ module Fog
     class Compute
       class UserCollaboration < Fog::Brightbox::Model
         identity :id
+        # resource_type is buggy for this resource
+        attribute :url
+
         attribute :status
+
         attribute :email
         attribute :role
         attribute :role_label
+
+        # Timestamps
+        attribute :created_at, type: :time
+        attribute :started_at, type: :time
+        attribute :finished_at, type: :time
+
+        # Links
         attribute :account
         attribute :user
         attribute :inviter

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

@@ -5,34 +5,35 @@ module Fog
         include Fog::Brightbox::Compute::ResourceLocking
 
         identity :id
-        attribute :url
         attribute :resource_type
+        attribute :url
 
         attribute :name
-        attribute :state, :aliases => "status"
-
+        attribute :state, aliases: "status"
         attribute :description
+
         attribute :filesystem_label
         attribute :filesystem_type
         attribute :serial
-        attribute :size
+        attribute :size, type: :integer
         attribute :source
         attribute :source_type
         attribute :storage_type
 
-        attribute :boot
-        attribute :delete_with_server
-        attribute :encrypted
+        # Boolean flags
+        attribute :boot, type: :boolean
+        attribute :delete_with_server, type: :boolean
+        attribute :encrypted, type: :boolean
 
-        # Times
-        attribute :created_at, :type => :time
-        attribute :updated_at, :type => :time
-        attribute :deleted_at, :type => :time
+        # Timestamps
+        attribute :created_at, type: :time
+        attribute :updated_at, type: :time
+        attribute :deleted_at, type: :time
 
         # Links
-        attribute :account_id, :aliases => "account", :squash => "id"
-        attribute :image_id, :aliases => "image", :squash => "id"
-        attribute :server_id, :aliases => "server", :squash => "id"
+        attribute :account_id, aliases: "account", squash: "id"
+        attribute :image_id, aliases: "image", squash: "id"
+        attribute :server_id, aliases: "server", squash: "id"
 
         def attach(server)
           requires :identity

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

@@ -3,13 +3,12 @@ module Fog
     class Compute
       class Zone < Fog::Brightbox::Model
         identity :id
-        attribute :url
         attribute :resource_type
-
-        attribute :status
-        attribute :handle
+        attribute :url
 
         attribute :description
+        attribute :handle
+        attribute :status
       end
     end
   end

data/lib/fog/brightbox/models/storage/directory.rb

@@ -31,8 +31,8 @@ module Fog
         attr_writer :public
 
         def public_url
-          # raise NotImplementedError
-          ""
+          requires :key
+          @public_url ||= [service.management_url , Fog::Brightbox::Storage.escape(key, "/")].join("/")
         end
 
         def save

data/lib/fog/brightbox/oauth2.rb

@@ -6,6 +6,10 @@ module Fog
     # @see http://tools.ietf.org/html/draft-ietf-oauth-v2-10
     #
     module OAuth2
+      TWO_FACTOR_HEADER = "X-Brightbox-OTP".freeze
+
+      class TwoFactorMissingError < StandardError; end
+
       # This builds the simplest form of requesting an access token
       # based on the arguments passed in
       #
@@ -13,16 +17,38 @@ module Fog
       # @param [CredentialSet] credentials
       #
       # @return [Excon::Response]
+      # @raise [Excon::Errors::Unauthorized] if the credentials are rejected by the server
+      # @raise [Fog::Brightbox::OAuth2::TwoFactorMissingError] if opted in to 2FA and server reports header is required
       def request_access_token(connection, credentials)
         token_strategy = credentials.best_grant_strategy
 
-        connection.request(
-          :path => "/token",
-          :expects  => 200,
-          :headers  => token_strategy.headers,
-          :method   => "POST",
-          :body     => Fog::JSON.encode(token_strategy.authorization_body_data)
-        )
+        if two_factor?
+          # When 2FA opt-in is set, we can expect 401 responses as well
+          response = connection.request(
+            :path => "/token",
+            :expects  => [200, 401],
+            :headers  => token_strategy.headers,
+            :method   => "POST",
+            :body     => Fog::JSON.encode(token_strategy.authorization_body_data)
+          )
+
+          if response.status == 401 && response.headers[Fog::Brightbox::OAuth2::TWO_FACTOR_HEADER] == "required"
+            raise TwoFactorMissingError
+          elsif response.status == 401
+            raise Excon::Errors.status_error({ expects: 200 }, status: 401)
+          else
+            response
+          end
+        else
+          # Use classic behaviour and return Excon::
+          connection.request(
+            :path => "/token",
+            :expects  => 200,
+            :headers  => token_strategy.headers,
+            :method   => "POST",
+            :body     => Fog::JSON.encode(token_strategy.authorization_body_data)
+          )
+        end
       end
 
       # Encapsulates credentials required to request access tokens from the
@@ -33,12 +59,14 @@ module Fog
       class CredentialSet
         attr_reader :client_id, :client_secret, :username, :password
         attr_reader :access_token, :refresh_token, :expires_in
+        attr_reader :one_time_password
         #
         # @param [String] client_id
         # @param [String] client_secret
         # @param [Hash] options
         # @option options [String] :username
         # @option options [String] :password
+        # @option options [String] :one_time_password One Time Password for Two Factor authentication
         #
         def initialize(client_id, client_secret, options = {})
           @client_id     = client_id
@@ -48,6 +76,7 @@ module Fog
           @access_token  = options[:access_token]
           @refresh_token = options[:refresh_token]
           @expires_in    = options[:expires_in]
+          @one_time_password = options[:one_time_password]
         end
 
         # Returns true if user details are available
@@ -142,6 +171,17 @@ module Fog
             "password"   => @credentials.password
           }
         end
+
+        def headers
+          {
+            "Authorization" => authorization_header,
+            "Content-Type" => "application/json"
+          }.tap do |headers|
+            if @credentials.one_time_password
+              headers[TWO_FACTOR_HEADER] = @credentials.one_time_password
+            end
+          end
+        end
       end
 
       # This strategy attempts to use a refresh_token gained during an earlier

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

@@ -0,0 +1,22 @@
+module Fog
+  module Brightbox
+    class Compute
+      class Real
+        # Create a new config map
+        #
+        # @param [Hash] options
+        # @option options [String] :name to identify this config map
+        # @option options [Hash] :data key/values to expose in config map
+        # @option options [Boolean] :nested passed through with the API request. When true nested resources are expanded.
+        #
+        # @return [Hash] if successful Hash version of JSON object
+        # @return [NilClass] if no options were passed
+        #
+        def create_config_map(options)
+          return nil if options.empty? || options.nil?
+          wrapped_request("post", "/1.0/config_maps", [200], options)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+module Fog
+  module Brightbox
+    class Compute
+      class Real
+        # Destroy the config map
+        #
+        # @param [String] identifier Unique reference to identify the resource
+        # @param [Hash] options
+        # @option options [Boolean] :nested passed through with the API request. When true nested resources are expanded.
+        #
+        # @return [Hash] if successful Hash version of JSON object
+        #
+        def delete_config_map(identifier, options = {})
+          return nil if identifier.nil? || identifier == ""
+          wrapped_request("delete", "/1.0/config_maps/#{identifier}", [200], options)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+module Fog
+  module Brightbox
+    class Compute
+      class Real
+        # @param [String] identifier Unique reference to identify the resource
+        # @param [Hash] options
+        # @option options [Boolean] :nested passed through with the API request. When true nested resources are expanded.
+        #
+        # @return [Hash] if successful Hash version of JSON object
+        #
+        def get_config_map(identifier, options = {})
+          return nil if identifier.nil? || identifier == ""
+          wrapped_request("get", "/1.0/config_maps/#{identifier}", [200], options)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+module Fog
+  module Brightbox
+    class Compute
+      class Real
+        # Lists summary details of config maps owned by the account.
+        #
+        # @param [Hash] options
+        # @option options [Boolean] :nested passed through with the API request. When true nested resources are expanded.
+        #
+        # @return [Hash] if successful Hash version of JSON object
+        #
+        def list_config_maps(options = {})
+          wrapped_request("get", "/1.0/config_maps", [200], options)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+module Fog
+  module Brightbox
+    class Compute
+      class Real
+        # @param [String] identifier Unique reference to identify the resource
+        # @param [Hash] options
+        # @option options [String] :name to identifier this config map
+        # @option options [Hash] :data key/values to expose in config map
+        # @option options [Boolean] :nested passed through with the API request. When true nested resources are expanded.
+        #
+        # @return [Hash] if successful Hash version of JSON object
+        # @return [NilClass] if no options were passed
+        #
+        def update_config_map(identifier, options)
+          return nil if identifier.nil? || identifier == ""
+          return nil if options.empty? || options.nil?
+          wrapped_request("put", "/1.0/config_maps/#{identifier}", [200], options)
+        end
+      end
+    end
+  end
+end

data/lib/fog/brightbox/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Brightbox
-    VERSION = "1.5.0"
+    VERSION = "1.7.1"
   end
 end

data/spec/fog/brightbox/compute/credentials_spec.rb

@@ -0,0 +1,41 @@
+require "spec_helper"
+
+describe Fog::Brightbox::Compute, "#credentials" do
+  describe "when 2FA support is disabled" do
+    before do
+      @options = {
+        brightbox_client_id: "app-12345",
+        brightbox_secret: "1234567890",
+        brightbox_username: "jason.null@brightbox.com",
+        brightbox_password: "HR4life",
+        brightbox_one_time_password: "123456"
+      }
+      @service = Fog::Brightbox::Compute.new(@options)
+    end
+
+    it "does not add passed OTP to credentials" do
+      assert_kind_of Fog::Brightbox::OAuth2::CredentialSet, @service.credentials
+      assert_nil @service.credentials.one_time_password
+    end
+  end
+
+  describe "with 2FA support is enabled" do
+    before do
+      @expected_otp = "123456"
+      @options = {
+        brightbox_client_id: "app-12345",
+        brightbox_secret: "1234567890",
+        brightbox_username: "jason.null@brightbox.com",
+        brightbox_password: "HR4life",
+        brightbox_support_two_factor: true,
+        brightbox_one_time_password: @expected_otp
+      }
+      @service = Fog::Brightbox::Compute.new(@options)
+    end
+
+    it "adds passed OTP to credentials" do
+      assert_kind_of Fog::Brightbox::OAuth2::CredentialSet, @service.credentials
+      assert @expected_otp, @service.credentials.one_time_password
+    end
+  end
+end