fog-brightbox 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc26a1e84e598ef68b0b5fbcabd7b03057c2cd50
-  data.tar.gz: 48e03f4c51600c6d7c367f6291bce1846a9fb5ac
+  metadata.gz: 6c9a95faeba8a3a048c0c78b7a827a5c38352376
+  data.tar.gz: 1ad831ca22581854bb6dd7de9d7bac093d55693c
 SHA512:
-  metadata.gz: 34a67830a5a9b119e26755269691e10a55f0374c92c29a995faee18ef5662d2169a77142ef87c0b37dec5de2dbebd23146c93401449f63ff107f45666739431b
-  data.tar.gz: 6d89c9acdcb2c431b661179bf5aa383116cfbc6e60ba9644afc1cba55b8e98c3592a2f8b7e27ee9b0ad1fa39a6010f66009e028ce1859b2ec1462b2ad4104934
+  metadata.gz: 8964770e126300956aa66cc50211bc04fe4cf102f979526cef423034cc613991ba5478844ce612a7ae355d82d1fc5a630d7143f81bcddae400a689c981d3077f
+  data.tar.gz: cb04b1cc0e8ded94525bcf3f65b9b4911da51ee48853d0b7ca942034fb412fb9d7cfb056d67effc27878f75ea0a08648e3c1f2bbb2efafb4f7a4cd251bd84e99

data/.gitignore

@@ -1,3 +1,4 @@
+coverage
 Gemfile.lock
 gemfiles/*.lock
 pkg

data/.travis.yml

@@ -1,3 +1,4 @@
+sudo: false
 language: ruby
 rvm:
   - 2.2.0

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+### 0.9.0 / 2015-08-18
+
+Changes:
+
+* Updated the OAuth model to better reflect the final OAuth 2.0 spec. This is
+  not a breaking change since the server side component remain backwards
+  compatible so usage of the `fog` API should not have changed.
+* Updated `travis.yml` to use faster container architecture.
+* Moved `shindo` tests into repo from main `fog` gem. These act as acceptance
+  tests against real environments.
+* Moved OAuth module specs from Shindo to Minispec.
+
+Bug fixes:
+
+* Use `Authorization: Bearer` scheme rather than draft value of "Token"
+* Use `client_credentials` grant type rather than draft value of "none"
+* Remove duplicate scheme keys causing warnings in Shindo tests
+
 ### 0.8.0 / 2015-07-16
 
 Changes:

data/fog-brightbox.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "shindo"
   spec.add_development_dependency "webmock"
   spec.add_development_dependency "yard"
 end

data/lib/fog/brightbox/compute/shared.rb

@@ -197,7 +197,7 @@ module Fog
         # @return [Excon::Response]
         def authenticated_request(options)
           headers = options[:headers] || {}
-          headers.merge!("Authorization" => "OAuth #{@credentials.access_token}", "Content-Type" => "application/json")
+          headers.merge!("Authorization" => "Bearer #{@credentials.access_token}", "Content-Type" => "application/json")
           options[:headers] = headers
           # TODO: This is just a wrapper around a call to Excon::Connection#request
           #   so can be extracted from Compute by passing in the connection,

data/lib/fog/brightbox/oauth2.rb

@@ -16,16 +16,10 @@ module Fog
       def request_access_token(connection, credentials)
         token_strategy = credentials.best_grant_strategy
 
-        header_content = "#{credentials.client_id}:#{credentials.client_secret}"
-        encoded_credentials = Base64.encode64(header_content).chomp
-
         connection.request(
           :path => "/token",
           :expects  => 200,
-          :headers  => {
-            "Authorization" => "Basic #{encoded_credentials}",
-            "Content-Type" => "application/json"
-          },
+          :headers  => token_strategy.headers,
           :method   => "POST",
           :body     => Fog::JSON.encode(token_strategy.authorization_body_data)
         )
@@ -110,17 +104,28 @@ module Fog
         def authorization_body_data
           raise "Not implemented"
         end
+
+        def authorization_header
+          header_content = "#{@credentials.client_id}:#{@credentials.client_secret}"
+          "Basic #{Base64.encode64(header_content).chomp}"
+        end
+
+        def headers
+          {
+            "Authorization" => authorization_header,
+            "Content-Type" => "application/json"
+          }
+        end
       end
 
       # This implements client based authentication/authorization
-      # based on the existing trust relationship using the `none`
-      # grant type.
+      # based on the existing trust relationship using the
+      # `client_credentials` grant type.
       #
       class ClientCredentialsStrategy < GrantTypeStrategy
         def authorization_body_data
           {
-            "grant_type" => "none",
-            "client_id"  => @credentials.client_id
+            "grant_type" => "client_credentials",
           }
         end
       end
@@ -133,7 +138,6 @@ module Fog
         def authorization_body_data
           {
             "grant_type" => "password",
-            "client_id"  => @credentials.client_id,
             "username"   => @credentials.username,
             "password"   => @credentials.password
           }
@@ -147,7 +151,6 @@ module Fog
         def authorization_body_data
           {
             "grant_type"    => "refresh_token",
-            "client_id"     => @credentials.client_id,
             "refresh_token" => @credentials.refresh_token
           }
         end

data/lib/fog/brightbox/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Brightbox
-    VERSION = "0.8.0"
+    VERSION = "0.9.0"
   end
 end

data/spec/fog/brightbox/oauth2/client_credentials_strategy_spec.rb

@@ -0,0 +1,30 @@
+require "spec_helper"
+
+describe Fog::Brightbox::OAuth2::ClientCredentialsStrategy do
+  before do
+    @client_id = "app-12345"
+    @client_secret = "__mashed_keys_123__"
+    @credentials = Fog::Brightbox::OAuth2::CredentialSet.new(@client_id, @client_secret)
+    @strategy = Fog::Brightbox::OAuth2::ClientCredentialsStrategy.new(@credentials)
+  end
+
+  it "tests #respond_to?(:authorization_body_data) returns true"  do
+    assert @strategy.respond_to?(:authorization_body_data)
+  end
+
+  it "tests #respond_to?(:headers) returns true"  do
+    assert @strategy.respond_to?(:headers)
+  end
+
+  it "tests #authorization_body_data" do
+    authorization_body_data = @strategy.authorization_body_data
+    assert_equal "client_credentials", authorization_body_data["grant_type"]
+    refute_includes authorization_body_data, "client_id"
+  end
+
+  it "tests #headers" do
+    headers = @strategy.headers
+    assert_equal "Basic YXBwLTEyMzQ1Ol9fbWFzaGVkX2tleXNfMTIzX18=", headers["Authorization"]
+    assert_equal "application/json", headers["Content-Type"]
+  end
+end

data/spec/fog/brightbox/oauth2/credential_set_spec.rb

@@ -0,0 +1,86 @@
+require "spec_helper"
+
+describe Fog::Brightbox::OAuth2::CredentialSet do
+  before do
+    @client_id     = "app-12345"
+    @client_secret = "__mashed_keys_123__"
+    @username      = "usr-12345"
+    @password      = "__mushed_keys_321__"
+    @access_token  = "12efde32fdfe4989"
+    @refresh_token = "7894389f9074f071"
+    @expires_in    = 7200
+  end
+
+  describe "when using client credentials" do
+    before do
+      @credentials = Fog::Brightbox::OAuth2::CredentialSet.new(@client_id, @client_secret)
+    end
+
+    it "tests #user_details? returns false" do
+      refute @credentials.user_details?
+    end
+
+    it "tests #access_token? returns false" do
+      refute @credentials.access_token?
+    end
+
+    it "tests #refresh_token? returns false" do
+      refute @credentials.refresh_token?
+    end
+
+    it "tests #best_grant_strategy returns ClientCredentialStategy" do
+      assert @credentials.best_grant_strategy.is_a?(Fog::Brightbox::OAuth2::ClientCredentialsStrategy)
+    end
+  end
+
+  describe "when using user credentials" do
+    before do
+      options = { :username => @username, :password => @password }
+      @credentials = Fog::Brightbox::OAuth2::CredentialSet.new(@client_id, @client_secret, options)
+    end
+
+    it "tests #user_details? returns true" do
+      assert @credentials.user_details?
+    end
+
+    it "tests #access_token? returns false" do
+      refute @credentials.access_token?
+    end
+
+    it "tests #refresh_token? returns false" do
+      refute @credentials.refresh_token?
+    end
+
+    it "tests #best_grant_strategy returns ClientCredentialStategy" do
+      assert @credentials.best_grant_strategy.is_a?(Fog::Brightbox::OAuth2::UserCredentialsStrategy)
+    end
+  end
+
+  describe "when using refresh token" do
+    before do
+      options = {
+        :username => @username,
+        :access_token => @access_token,
+        :refresh_token => @refresh_token,
+        :expires_in => @expires_in
+      }
+      @credentials = Fog::Brightbox::OAuth2::CredentialSet.new(@client_id, @client_secret, options)
+    end
+
+    it "tests #user_details? returns false" do
+      refute @credentials.user_details?
+    end
+
+    it "tests #access_token? returns true" do
+      assert @credentials.access_token?
+    end
+
+    it "tests #refresh_token? returns true" do
+      assert @credentials.refresh_token?
+    end
+
+    it "tests #best_grant_strategy returns ClientCredentialStategy" do
+      assert @credentials.best_grant_strategy.is_a?(Fog::Brightbox::OAuth2::RefreshTokenStrategy)
+    end
+  end
+end

data/spec/fog/brightbox/oauth2/grant_type_strategy_spec.rb

@@ -0,0 +1,24 @@
+require "spec_helper"
+
+describe Fog::Brightbox::OAuth2::RefreshTokenStrategy do
+  before do
+    @client_id = "app-12345"
+    @client_secret = "__mashed_keys_123__"
+    @credentials = Fog::Brightbox::OAuth2::CredentialSet.new(@client_id, @client_secret)
+    @strategy = Fog::Brightbox::OAuth2::GrantTypeStrategy.new(@credentials)
+  end
+
+  it "tests #respond_to?(:authorization_body_data) returns true"  do
+    assert @strategy.respond_to?(:authorization_body_data)
+  end
+
+  it "tests #respond_to?(:headers) returns true"  do
+    assert @strategy.respond_to?(:headers)
+  end
+
+  it "tests #headers" do
+    headers = @strategy.headers
+    assert_equal "Basic YXBwLTEyMzQ1Ol9fbWFzaGVkX2tleXNfMTIzX18=", headers["Authorization"]
+    assert_equal "application/json", headers["Content-Type"]
+  end
+end

data/spec/fog/brightbox/oauth2/refresh_token_strategy_spec.rb

@@ -0,0 +1,33 @@
+require "spec_helper"
+
+describe Fog::Brightbox::OAuth2::RefreshTokenStrategy do
+  before do
+    @client_id = "app-12345"
+    @client_secret = "__mashed_keys_123__"
+    @refresh_token = "ab4b39dddf909"
+    options = { :refresh_token => @refresh_token }
+    @credentials = Fog::Brightbox::OAuth2::CredentialSet.new(@client_id, @client_secret, options)
+    @strategy = Fog::Brightbox::OAuth2::RefreshTokenStrategy.new(@credentials)
+  end
+
+  it "tests #respond_to?(:authorization_body_data) returns true"  do
+    assert @strategy.respond_to?(:authorization_body_data)
+  end
+
+  it "tests #respond_to?(:headers) returns true"  do
+    assert @strategy.respond_to?(:headers)
+  end
+
+  it "tests #authorization_body_data" do
+    authorization_body_data = @strategy.authorization_body_data
+    assert_equal "refresh_token", authorization_body_data["grant_type"]
+    assert_equal @refresh_token, authorization_body_data["refresh_token"]
+    refute_includes authorization_body_data, "client_id"
+  end
+
+  it "tests #headers" do
+    headers = @strategy.headers
+    assert_equal "Basic YXBwLTEyMzQ1Ol9fbWFzaGVkX2tleXNfMTIzX18=", headers["Authorization"]
+    assert_equal "application/json", headers["Content-Type"]
+  end
+end

data/spec/fog/brightbox/oauth2/user_credentials_strategy_spec.rb

@@ -0,0 +1,40 @@
+require "spec_helper"
+
+describe Fog::Brightbox::OAuth2::UserCredentialsStrategy do
+  before do
+    @client_id     = "app-12345"
+    @client_secret = "__mashed_keys_123__"
+    @username      = "usr-12345"
+    @password      = "__mushed_keys_321__"
+
+    options = {
+      :username => @username,
+      :password => @password
+    }
+
+    @credentials = Fog::Brightbox::OAuth2::CredentialSet.new(@client_id, @client_secret, options)
+    @strategy = Fog::Brightbox::OAuth2::UserCredentialsStrategy.new(@credentials)
+  end
+
+  it "tests #respond_to?(:authorization_body_data) returns true"  do
+    assert @strategy.respond_to?(:authorization_body_data)
+  end
+
+  it "tests #respond_to?(:headers) returns true"  do
+    assert @strategy.respond_to?(:headers)
+  end
+
+  it "tests #authorization_body_data" do
+    authorization_body_data = @strategy.authorization_body_data
+    assert_equal "password", authorization_body_data["grant_type"]
+    assert_equal @username, authorization_body_data["username"]
+    assert_equal @password, authorization_body_data["password"]
+    refute_includes authorization_body_data, "client_id"
+  end
+
+  it "tests #headers" do
+    headers = @strategy.headers
+    assert_equal "Basic YXBwLTEyMzQ1Ol9fbWFzaGVkX2tleXNfMTIzX18=", headers["Authorization"]
+    assert_equal "application/json", headers["Content-Type"]
+  end
+end

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

@@ -24,7 +24,7 @@ describe Fog::Compute::Brightbox::DatabaseServer do
       skip if RUBY_VERSION < "1.9"
 
       stub_request(:post, "http://localhost/1.0/database_servers/dbs-12345/snapshot?account_id=").
-        with(:headers => { "Authorization" => "OAuth FAKECACHEDTOKEN" }).
+        with(:headers => { "Authorization" => "Bearer FAKECACHEDTOKEN" }).
         to_return(:status => 202, :body => %q({"id": "dbs-12345"}), :headers => {})
 
       @database_server = Fog::Compute::Brightbox::DatabaseServer.new(:service => service, :id => "dbs-12345")
@@ -39,11 +39,11 @@ describe Fog::Compute::Brightbox::DatabaseServer do
       link = "<https://api.gb1.brightbox.com/1.0/database_snapshots/dbi-12345>; rel=snapshot"
 
       stub_request(:post, "http://localhost/1.0/database_servers/dbs-12345/snapshot").
-        with(:headers => { "Authorization" => "OAuth FAKECACHEDTOKEN" }).
+        with(:headers => { "Authorization" => "Bearer FAKECACHEDTOKEN" }).
         to_return(:status => 202, :body => "{}", :headers => { "Link" => link })
 
       stub_request(:get, "http://localhost/1.0/database_snapshots/dbi-12345?account_id=").
-        with(:headers => { "Authorization" => "OAuth FAKECACHEDTOKEN" }).
+        with(:headers => { "Authorization" => "Bearer FAKECACHEDTOKEN" }).
         to_return(:status => 200, :body => %q({"id": "dbs-12345"}))
       @database_server = Fog::Compute::Brightbox::DatabaseServer.new(:service => service, :id => "dbs-12345")
       assert_kind_of Fog::Compute::Brightbox::DatabaseSnapshot, @database_server.snapshot(true)

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

@@ -24,7 +24,7 @@ describe Fog::Compute::Brightbox::Server do
       skip if RUBY_VERSION < "1.9"
 
       stub_request(:post, "http://localhost/1.0/servers/srv-12345/snapshot?account_id=").
-        with(:headers => { "Authorization" => "OAuth FAKECACHEDTOKEN" }).
+        with(:headers => { "Authorization" => "Bearer FAKECACHEDTOKEN" }).
         to_return(:status => 202, :body => %q({"id": "srv-12345"}), :headers => {})
 
       @server = Fog::Compute::Brightbox::Server.new(:service => service, :id => "srv-12345")
@@ -39,11 +39,11 @@ describe Fog::Compute::Brightbox::Server do
       link = "<https://api.gb1.brightbox.com/1.0/images/img-12345>; rel=snapshot"
 
       stub_request(:post, "http://localhost/1.0/servers/srv-12345/snapshot").
-        with(:headers => { "Authorization" => "OAuth FAKECACHEDTOKEN" }).
+        with(:headers => { "Authorization" => "Bearer FAKECACHEDTOKEN" }).
         to_return(:status => 202, :body => "{}", :headers => { "Link" => link })
 
       stub_request(:get, "http://localhost/1.0/images/img-12345?account_id=").
-        with(:headers => { "Authorization" => "OAuth FAKECACHEDTOKEN" }).
+        with(:headers => { "Authorization" => "Bearer FAKECACHEDTOKEN" }).
         to_return(:status => 200, :body => %q({"id": "img-12345"}))
       @server = Fog::Compute::Brightbox::Server.new(:service => service, :id => "srv-12345")
       assert_kind_of Fog::Compute::Brightbox::Image, @server.snapshot(true)

data/tests/brightbox/compute/helper.rb

@@ -0,0 +1 @@
+require File.expand_path("schema", File.dirname(__FILE__))

data/tests/brightbox/compute/schema.rb

@@ -0,0 +1,794 @@
+module Fog
+  module Brightbox
+    module Nullable
+      module Account; end
+      module ApiClient; end
+      module FirewallPolicy; end
+      module Image; end
+      module Interface; end
+      module LoadBalancer; end
+      module Server; end
+      module ServerGroup; end
+      module User; end
+      module Zone; end
+    end
+  end
+end
+
+Hash.send :include, Fog::Brightbox::Nullable::Account
+NilClass.send :include, Fog::Brightbox::Nullable::Account
+
+Hash.send :include, Fog::Brightbox::Nullable::ApiClient
+NilClass.send :include, Fog::Brightbox::Nullable::ApiClient
+
+Hash.send :include, Fog::Brightbox::Nullable::FirewallPolicy
+NilClass.send :include, Fog::Brightbox::Nullable::FirewallPolicy
+
+Hash.send :include, Fog::Brightbox::Nullable::Image
+NilClass.send :include, Fog::Brightbox::Nullable::Image
+
+Hash.send :include, Fog::Brightbox::Nullable::Interface
+NilClass.send :include, Fog::Brightbox::Nullable::Interface
+
+Hash.send :include, Fog::Brightbox::Nullable::LoadBalancer
+NilClass.send :include, Fog::Brightbox::Nullable::LoadBalancer
+
+Hash.send :include, Fog::Brightbox::Nullable::Server
+NilClass.send :include, Fog::Brightbox::Nullable::Server
+
+Hash.send :include, Fog::Brightbox::Nullable::ServerGroup
+NilClass.send :include, Fog::Brightbox::Nullable::ServerGroup
+
+Hash.send :include, Fog::Brightbox::Nullable::User
+NilClass.send :include, Fog::Brightbox::Nullable::User
+
+Hash.send :include, Fog::Brightbox::Nullable::Zone
+NilClass.send :include, Fog::Brightbox::Nullable::Zone
+
+class Brightbox
+  module Compute
+    module Formats
+      module Struct
+        CIP_PORT_TRANSLATOR = {
+          "protocol" => String,
+          "incoming" => Integer,
+          "outgoing" => Integer
+        }
+        LB_LISTENER = {
+          "in"              => Integer,
+          "out"             => Integer,
+          "protocol"        => String,
+          "timeout"         => Integer
+        }
+        LB_HEALTHCHECK = {
+          "type"            => String,
+          "request"         => String,
+          "port"            => Integer,
+          "interval"        => Integer,
+          "timeout"         => Integer,
+          "threshold_up"    => Integer,
+          "threshold_down"  => Integer
+        }
+      end
+
+      module Nested
+        ACCOUNT = {
+          "name"            => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "id"              => String,
+          "status"          => String
+        }
+
+        API_CLIENT = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "name"            => String,
+          "description"     => String,
+          "revoked_at"      => Fog::Nullable::String
+        }
+
+        CLOUD_IP = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "name"            => Fog::Nullable::String,
+          "public_ip"       => String,
+          "status"          => String,
+          "reverse_dns"     => String
+        }
+
+        DATABASE_SERVER = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "name"            => String,
+          "description"     => String,
+          "allow_access"    => Array,
+          "database_version" => String,
+          "status"          => String,
+          "created_at"      => String,
+          "deleted_at"      => Fog::Nullable::String
+        }
+
+        DATABASE_SNAPSHOT = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "name"            => String,
+          "description"     => String,
+          "database_version" => String,
+          "size"            => Integer,
+          "status"          => String,
+          "created_at"      => String,
+          "deleted_at"      => Fog::Nullable::String,
+          "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT
+        }
+
+        DATABASE_SERVER_TYPE = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "name"            => String,
+          "description"     => String,
+          "ram"             => Integer,
+          "disk_size"       => Integer
+        }
+
+        FIREWALL_POLICY = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "name"            => Fog::Nullable::String,
+          "default"         => Fog::Boolean,
+          "created_at"      => String,
+          "description"     => Fog::Nullable::String
+        }
+
+        FIREWALL_RULE = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "created_at"      => String,
+          "source"          => Fog::Nullable::String,
+          "source_port"     => Fog::Nullable::String,
+          "destination"     => Fog::Nullable::String,
+          "destination_port" => Fog::Nullable::String,
+          "protocol"        => Fog::Nullable::String,
+          "icmp_type_name"  => Fog::Nullable::String,
+          "description"     => Fog::Nullable::String
+        }
+
+        IMAGE = {
+          "name"            => String,
+          "created_at"      => String,
+          "resource_type"   => String,
+          "arch"            => String,
+          "url"             => String,
+          "id"              => String,
+          "description"     => String,
+          "source"          => String,
+          "status"          => String,
+          "public"          => Fog::Boolean,
+          "official"        => Fog::Boolean,
+          "owner"           => String,
+          "username"        => Fog::Nullable::String
+        }
+
+        INTERFACE = {
+          "resource_type"   => String,
+          "url"             => String,
+          "id"              => String,
+          "ipv4_address"    => String,
+          "ipv6_address"    => Fog::Nullable::String,
+          "mac_address"     => String
+        }
+
+        LOAD_BALANCER = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "name"            => String,
+          "status"          => String,
+          "created_at"      => String,
+          "deleted_at"      => Fog::Nullable::String
+        }
+
+        SERVER = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "name"            => String,
+          "status"          => String,
+          "hostname"        => String,
+          "fqdn"            => String,
+          "created_at"      => String,
+          "started_at"      => Fog::Nullable::String,
+          "deleted_at"      => Fog::Nullable::String,
+          "username"        => Fog::Nullable::String
+        }
+
+        SERVER_GROUP = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "name"            => Fog::Nullable::String,
+          "created_at"      => String,
+          "default"         => Fog::Boolean,
+          "description"     => Fog::Nullable::String
+        }
+
+        SERVER_TYPE = {
+          "name"            => String,
+          "handle"          => Fog::Nullable::String,
+          "cores"           => Integer,
+          "resource_type"   => String,
+          "disk_size"       => Integer,
+          "url"             => String,
+          "id"              => String,
+          "ram"             => Integer,
+          "status"          => String
+        }
+
+        USER = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "name"            => String,
+          "email_address"   => String
+        }
+
+        COLLABORATION = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "status"          => String,
+          "email"           => Fog::Nullable::String,
+          "role"            => String,
+          "role_label"      => String,
+          "user"            => Fog::Brightbox::Nullable::User,
+          "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT,
+          "inviter"         => Brightbox::Compute::Formats::Nested::USER
+        }
+
+        ZONE = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "handle"          => Fog::Nullable::String
+        }
+      end
+
+      module Collected
+        ACCOUNT = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "name"            => String,
+          "status"          => String,
+          "vat_registration_number" => Fog::Nullable::String,
+          "telephone_number" => Fog::Nullable::String,
+          "telephone_verified" => Fog::Nullable::Boolean,
+          "ram_limit"       => Integer,
+          "ram_used"        => Integer,
+          "cloud_ips_limit" => Integer,
+          "cloud_ips_used"  => Integer,
+          "load_balancers_limit" => Integer,
+          "load_balancers_used" => Integer,
+          "library_ftp_password" => Fog::Nullable::String,
+          "verified_telephone" => Fog::Nullable::String,
+          "verified_at"     => Fog::Nullable::String,
+          "verified_ip"     => Fog::Nullable::String,
+          "owner"           => Brightbox::Compute::Formats::Nested::USER,
+          "users"           => [Brightbox::Compute::Formats::Nested::USER],
+          "clients"         => [Brightbox::Compute::Formats::Nested::API_CLIENT],
+          "servers"         => [Brightbox::Compute::Formats::Nested::SERVER],
+          "load_balancers"  => [Brightbox::Compute::Formats::Nested::LOAD_BALANCER],
+          "cloud_ips"       => [Brightbox::Compute::Formats::Nested::CLOUD_IP],
+          "server_groups"   => [Brightbox::Compute::Formats::Nested::SERVER_GROUP],
+          "firewall_policies" => [Brightbox::Compute::Formats::Nested::FIREWALL_POLICY],
+          "images"          => [Brightbox::Compute::Formats::Nested::IMAGE],
+          "zones"           => [Brightbox::Compute::Formats::Nested::ZONE]
+        }
+
+        API_CLIENT = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "name"            => String,
+          "description"     => String,
+          "revoked_at"      => Fog::Nullable::String,
+          "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT
+        }
+
+        APPLICATION = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "name"            => Fog::Nullable::String
+        }
+
+        CLOUD_IP = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "name"            => Fog::Nullable::String,
+          "public_ip"       => String,
+          "status"          => String,
+          "reverse_dns"     => String,
+          "port_translators" => [Brightbox::Compute::Formats::Struct::CIP_PORT_TRANSLATOR],
+          "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT,
+          "interface"       => Fog::Brightbox::Nullable::Interface,
+          "load_balancer"   => Fog::Brightbox::Nullable::LoadBalancer,
+          "server"          => Fog::Brightbox::Nullable::Server,
+          "server_group" => Fog::Brightbox::Nullable::ServerGroup
+        }
+
+        DATABASE_SERVER = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "name"            => String,
+          "description"     => String,
+          "allow_access"    => Array,
+          "database_version" => String,
+          "status"          => String,
+          "created_at"      => String,
+          "deleted_at"      => Fog::Nullable::String
+        }
+
+        DATABASE_SNAPSHOT = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "name"            => String,
+          "description"     => String,
+          "database_version" => String,
+          "size"            => Integer,
+          "status"          => String,
+          "created_at"      => String,
+          "deleted_at"      => Fog::Nullable::String,
+          "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT
+        }
+
+        DATABASE_SERVER_TYPE = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "name"            => String,
+          "description"     => String,
+          "ram"             => Integer,
+          "disk_size"       => Integer
+        }
+
+        FIREWALL_POLICY = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "name"            => Fog::Nullable::String,
+          "description"     => Fog::Nullable::String,
+          "default"         => Fog::Boolean,
+          "created_at"      => String,
+          "server_group"    => Fog::Brightbox::Nullable::ServerGroup,
+          "rules"           => [Brightbox::Compute::Formats::Nested::FIREWALL_RULE]
+        }
+
+        IMAGE = {
+          "name"            => String,
+          "created_at"      => String,
+          "resource_type"   => String,
+          "arch"            => String,
+          "url"             => String,
+          "id"              => String,
+          "description"     => String,
+          "source"          => String,
+          "source_type"     => String,
+          "status"          => String,
+          "owner"           => String,
+          "username"        => Fog::Nullable::String,
+          "public"          => Fog::Boolean,
+          "official"        => Fog::Boolean,
+          "compatibility_mode" => Fog::Boolean,
+          "virtual_size"    => Integer,
+          "disk_size"       => Integer,
+          "min_ram"         => Fog::Nullable::Integer,
+          "ancestor"        => Fog::Brightbox::Nullable::Image
+        }
+
+        LOAD_BALANCER = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "name"            => String,
+          "status"          => String,
+          "created_at"      => String,
+          "deleted_at"      => Fog::Nullable::String,
+          "cloud_ips"       => [Brightbox::Compute::Formats::Nested::CLOUD_IP],
+          "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT,
+          "listeners"       => [Brightbox::Compute::Formats::Struct::LB_LISTENER],
+          "nodes"           => [Brightbox::Compute::Formats::Nested::SERVER]
+        }
+
+        SERVER = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "name"            => String,
+          "status"          => String,
+          "hostname"        => String,
+          "fqdn"            => String,
+          "created_at"      => String,
+          "started_at"      => Fog::Nullable::String,
+          "deleted_at"      => Fog::Nullable::String,
+          "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT,
+          "server_type"     => Brightbox::Compute::Formats::Nested::SERVER_TYPE,
+          "cloud_ips"       => [Brightbox::Compute::Formats::Nested::CLOUD_IP],
+          "image"           => Brightbox::Compute::Formats::Nested::IMAGE,
+          "server_groups"   => [Brightbox::Compute::Formats::Nested::SERVER_GROUP],
+          "snapshots"       => [Brightbox::Compute::Formats::Nested::IMAGE],
+          "interfaces"      => [Brightbox::Compute::Formats::Nested::INTERFACE],
+          "zone"            => Fog::Brightbox::Nullable::Zone,
+          "username"        => Fog::Nullable::String,
+          "compatibility_mode" => Fog::Boolean
+        }
+
+        SERVER_GROUP = {
+          "created_at"      => String,
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "name"            => Fog::Nullable::String,
+          "description"     => Fog::Nullable::String,
+          "default"         => Fog::Boolean,
+          "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT,
+          "servers"         => [Brightbox::Compute::Formats::Nested::SERVER],
+          "firewall_policy" => Fog::Brightbox::Nullable::FirewallPolicy
+        }
+
+        SERVER_TYPE = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "handle"          => Fog::Nullable::String,
+          "name"            => String,
+          "status"          => String,
+          "cores"           => Integer,
+          "ram"             => Integer,
+          "disk_size"       => Integer
+        }
+
+        USER = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "name"            => String,
+          "email_address"   => String,
+          "email_verified"  => Fog::Boolean,
+          "accounts"        => [Brightbox::Compute::Formats::Nested::ACCOUNT],
+          "default_account" => NilClass
+        }
+
+        COLLABORATION = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "status"          => String,
+          "role"            => String,
+          "role_label"      => String,
+          "email"           => Fog::Nullable::String,
+          "user"            => Fog::Brightbox::Nullable::User,
+          "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT,
+          "inviter"         => Brightbox::Compute::Formats::Nested::USER
+        }
+
+        ZONE = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "handle"          => Fog::Nullable::String
+        }
+      end
+
+      module Full
+        ACCOUNT = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "name"            => String,
+          "status"          => String,
+          "address_1"       => String,
+          "address_2"       => String,
+          "city"            => String,
+          "county"          => String,
+          "postcode"        => String,
+          "country_code"    => String,
+          "country_name"    => String,
+          "vat_registration_number" => Fog::Nullable::String,
+          "telephone_number" => String,
+          "telephone_verified" => Fog::Boolean,
+          "created_at"      => String,
+          "ram_limit"       => Integer,
+          "ram_used"        => Integer,
+          "cloud_ips_limit" => Integer,
+          "cloud_ips_used"  => Integer,
+          "load_balancers_limit" => Integer,
+          "load_balancers_used" => Integer,
+          "library_ftp_host" => String,
+          "library_ftp_user" => String,
+          "library_ftp_password" => Fog::Nullable::String,
+          "verified_telephone" => Fog::Nullable::String,
+          "verified_at"     => Fog::Nullable::String,
+          "verified_ip"     => Fog::Nullable::String,
+          "valid_credit_card" => Fog::Boolean,
+          "owner"           => Brightbox::Compute::Formats::Nested::USER,
+          "users"           => [Brightbox::Compute::Formats::Nested::USER],
+          "clients"         => [Brightbox::Compute::Formats::Nested::API_CLIENT],
+          "servers"         => [Brightbox::Compute::Formats::Nested::SERVER],
+          "load_balancers"  => [Brightbox::Compute::Formats::Nested::LOAD_BALANCER],
+          "cloud_ips"       => [Brightbox::Compute::Formats::Nested::CLOUD_IP],
+          "server_groups"   => [Brightbox::Compute::Formats::Nested::SERVER_GROUP],
+          "firewall_policies" => [Brightbox::Compute::Formats::Nested::FIREWALL_POLICY],
+          "images"          => [Brightbox::Compute::Formats::Nested::IMAGE],
+          "zones"           => [Brightbox::Compute::Formats::Nested::ZONE]
+        }
+
+        API_CLIENT = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "name"            => String,
+          "description"     => String,
+          "revoked_at"      => Fog::Nullable::String,
+          "secret"          => Fog::Nullable::String,
+          "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT
+        }
+
+        APPLICATION = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "name"            => Fog::Nullable::String,
+          "secret"          => Fog::Nullable::String
+        }
+
+        CLOUD_IP = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "name"            => Fog::Nullable::String,
+          "public_ip"       => String,
+          "status"          => String,
+          "reverse_dns"     => String,
+          "port_translators" => [Brightbox::Compute::Formats::Struct::CIP_PORT_TRANSLATOR],
+          "account"         => Fog::Brightbox::Nullable::Account,
+          "interface"       => Fog::Brightbox::Nullable::Interface,
+          "load_balancer"   => Fog::Brightbox::Nullable::LoadBalancer,
+          "server"          => Fog::Brightbox::Nullable::Server,
+          "server_group"    => Fog::Brightbox::Nullable::ServerGroup
+        }
+
+        DATABASE_SERVER = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "name"            => String,
+          "description"     => String,
+          "admin_username"  => Fog::Nullable::String,
+          "admin_password"  => Fog::Nullable::String,
+          "allow_access"    => Array,
+          "database_version" => String,
+          "status"          => String,
+          "created_at"      => String,
+          "deleted_at"      => Fog::Nullable::String
+        }
+
+        DATABASE_SNAPSHOT = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "name"            => String,
+          "description"     => String,
+          "database_version" => String,
+          "size"            => Integer,
+          "status"          => String,
+          "created_at"      => String,
+          "deleted_at"      => Fog::Nullable::String,
+          "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT
+        }
+
+        DATABASE_SERVER_TYPE = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "name"            => String,
+          "description"     => String,
+          "ram"             => Integer,
+          "disk_size"       => Integer
+        }
+
+        FIREWALL_POLICY = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "name"            => Fog::Nullable::String,
+          "description"     => Fog::Nullable::String,
+          "default"         => Fog::Boolean,
+          "created_at"      => String,
+          "server_group"    => Fog::Brightbox::Nullable::ServerGroup,
+          "rules"           => [Brightbox::Compute::Formats::Nested::FIREWALL_RULE]
+        }
+
+        FIREWALL_RULE = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "created_at"      => String,
+          "source"          => Fog::Nullable::String,
+          "source_port"     => Fog::Nullable::String,
+          "destination"     => Fog::Nullable::String,
+          "destination_port" => Fog::Nullable::String,
+          "protocol"        => Fog::Nullable::String,
+          "icmp_type_name"  => Fog::Nullable::String,
+          "description"     => Fog::Nullable::String,
+          "firewall_policy" => Brightbox::Compute::Formats::Nested::FIREWALL_POLICY
+        }
+
+        IMAGE = {
+          "name"            => String,
+          "created_at"      => String,
+          "resource_type"   => String,
+          "arch"            => String,
+          "url"             => String,
+          "id"              => String,
+          "description"     => String,
+          "source"          => String,
+          "source_type"     => String,
+          "status"          => String,
+          "owner"           => String, # Account ID not object
+          "username"        => Fog::Nullable::String,
+          "public"          => Fog::Boolean,
+          "official"        => Fog::Boolean,
+          "compatibility_mode" => Fog::Boolean,
+          "virtual_size"    => Integer,
+          "disk_size"       => Integer,
+          "min_ram"         => Fog::Nullable::Integer,
+          "ancestor"        => Fog::Brightbox::Nullable::Image,
+          "licence_name"    => Fog::Nullable::String
+        }
+
+        INTERFACE = {
+          "resource_type"   => String,
+          "url"             => String,
+          "id"              => String,
+          "ipv4_address"    => String,
+          "ipv6_address"    => Fog::Nullable::String,
+          "mac_address"     => String,
+          "server"          => Brightbox::Compute::Formats::Nested::SERVER
+        }
+
+        LOAD_BALANCER = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "name"            => String,
+          "status"          => String,
+          "listeners"       => [Brightbox::Compute::Formats::Struct::LB_LISTENER],
+          "policy"          => String,
+          "healthcheck"     => Brightbox::Compute::Formats::Struct::LB_HEALTHCHECK,
+          "certificate"     => Fog::Nullable::Hash,
+          "created_at"      => String,
+          "deleted_at"      => Fog::Nullable::String,
+          "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT,
+          "nodes"           => [Brightbox::Compute::Formats::Nested::SERVER],
+          "cloud_ips"       => [Brightbox::Compute::Formats::Nested::CLOUD_IP]
+        }
+
+        SERVER = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "name"            => String,
+          "status"          => String,
+          "hostname"        => String,
+          "fqdn"            => String,
+          "created_at"      => String,
+          "started_at"      => Fog::Nullable::String,
+          "deleted_at"      => Fog::Nullable::String,
+          "user_data"       => Fog::Nullable::String,
+          "console_url"     => Fog::Nullable::String,
+          "console_token"   => Fog::Nullable::String,
+          "console_token_expires" => Fog::Nullable::String,
+          "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT,
+          "server_type"     => Brightbox::Compute::Formats::Nested::SERVER_TYPE,
+          "cloud_ips"       => [Brightbox::Compute::Formats::Nested::CLOUD_IP],
+          "image"           => Brightbox::Compute::Formats::Nested::IMAGE,
+          "snapshots"       => [Brightbox::Compute::Formats::Nested::IMAGE],
+          "server_groups"   => [Brightbox::Compute::Formats::Nested::SERVER_GROUP],
+          "interfaces"      => [Brightbox::Compute::Formats::Nested::INTERFACE],
+          "zone"            => Fog::Brightbox::Nullable::Zone,
+          "licence_name"    => Fog::Nullable::String,
+          "username"        => Fog::Nullable::String,
+          "compatibility_mode" => Fog::Boolean
+        }
+
+        SERVER_GROUP = {
+          "created_at"      => String,
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "name"            => String,
+          "description"     => Fog::Nullable::String,
+          "default"         => Fog::Boolean,
+          "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT,
+          "servers"         => [Brightbox::Compute::Formats::Nested::SERVER],
+          "firewall_policy" => Fog::Brightbox::Nullable::FirewallPolicy
+        }
+
+        SERVER_TYPE = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "handle"          => Fog::Nullable::String,
+          "name"            => String,
+          "status"          => String,
+          "cores"           => Integer,
+          "ram"             => Integer,
+          "disk_size"       => Integer
+        }
+
+        USER = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "name"            => String,
+          "email_address"   => String,
+          "email_verified"  => Fog::Boolean,
+          "accounts"        => [Brightbox::Compute::Formats::Nested::ACCOUNT],
+          "default_account" => Fog::Brightbox::Nullable::Account,
+          "ssh_key"         => Fog::Nullable::String,
+          "messaging_pref"  => Fog::Boolean
+        }
+
+        COLLABORATION = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "status"          => String,
+          "role"            => String,
+          "role_label"      => String,
+          "email"           => Fog::Nullable::String,
+          "user"            => Fog::Brightbox::Nullable::User,
+          "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT,
+          "inviter"         => Brightbox::Compute::Formats::Nested::USER
+        }
+
+        ZONE = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "handle"          => String
+        }
+      end
+
+      module Collection
+        ACCOUNTS = [Brightbox::Compute::Formats::Collected::ACCOUNT]
+        API_CLIENTS = [Brightbox::Compute::Formats::Collected::API_CLIENT]
+        APPLICATION = [Brightbox::Compute::Formats::Collected::APPLICATION]
+        CLOUD_IPS = [Brightbox::Compute::Formats::Collected::CLOUD_IP]
+        COLLABORATIONS = [Brightbox::Compute::Formats::Collected::COLLABORATION]
+        DATABASE_SERVERS = [Brightbox::Compute::Formats::Collected::DATABASE_SERVER]
+        DATABASE_SERVER_TYPES = [Brightbox::Compute::Formats::Collected::DATABASE_SERVER_TYPE]
+        DATABASE_SNAPSHOTS = [Brightbox::Compute::Formats::Collected::DATABASE_SNAPSHOT]
+        FIREWALL_POLICIES = [Brightbox::Compute::Formats::Collected::FIREWALL_POLICY]
+        IMAGES = [Brightbox::Compute::Formats::Collected::IMAGE]
+        LOAD_BALANCERS = [Brightbox::Compute::Formats::Collected::LOAD_BALANCER]
+        SERVERS = [Brightbox::Compute::Formats::Collected::SERVER]
+        SERVER_GROUPS = [Brightbox::Compute::Formats::Collected::SERVER_GROUP]
+        SERVER_TYPES = [Brightbox::Compute::Formats::Collected::SERVER_TYPE]
+        USERS = [Brightbox::Compute::Formats::Collected::USER]
+        ZONES = [Brightbox::Compute::Formats::Collected::ZONE]
+      end
+    end
+  end
+end