fog-brightbox 0.16.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e0a7fbcbe8d4b8cf7cfce8065121a8017116ad5caf17f22463df71971b2f3bc
-  data.tar.gz: f29b9da66790d0090a76c65d34526e51561a2d6dc4ad9313d2daa1ccf801c6b2
+  metadata.gz: cfa9b2e98e5691a853fa9b6e68f37de41f10ac081d04402d4be4c5842b1ba930
+  data.tar.gz: d95737e730099ba23713c5f4c2c196c2e7aab63387c7febe1e3d2608a84174b9
 SHA512:
-  metadata.gz: 3f55119efd95aaed7239c3c88e92ea884c21fca0169abd3dc47712b3848dabcec9706c98858154fd3de2423323ff1a1a1dc6215936c26d8adc14974ac52c8d6b
-  data.tar.gz: 817d96a885f8b0177f91f972c2cb172d987b040859694fdc27b078475af0c5866c195c73f12981dca32e7ea1e7ffc1b7435e0e0a8602a0c42b2c032fdb058311
+  metadata.gz: 43a52dc0cb5a4444eafd03d9ad6414bc3a08ab826d97e658a505229d4c7a32b2267ced2206e7d7e9f19cbc0dc02576d172fce9eb1f786c69d75f8808e0134ad8
+  data.tar.gz: fbb69efe2d339176ba36bab0ba55da159e45a525adeeb0d742819e52617a3d0f61b9e5c6b7d2e0fc2a275fc56eac15ae026cad6f4fa8446145a6c510f19b5183

data/.travis.yml

@@ -1,15 +1,11 @@
 sudo: false
 language: ruby
 rvm:
+  - 2.7
+  - 2.6
   - 2.5
   - 2.4
   - 2.3
   - 2.2
   - 2.1
   - 2.0
-before_install:
-  - gem install bundler
-matrix:
-  include:
-    - rvm: 1.9.3
-      gemfile: gemfiles/Gemfile.1.9.3

data/CHANGELOG.md

@@ -1,3 +1,43 @@
+### 1.1.0 / 2020-06-30
+
+Changes:
+
+* Add Ruby 2.6 and 2.7 to Travis CI testing matrix.
+* Remove bundler installation step from Travis CI.
+* Use `example.test` for testing domains rather than `example.com` to avoid
+  leaking routable traffic.
+* Add `FOG_TEST_COLLABORATOR_EMAIL` to enable ENV based setting of email
+  address when using the tests for integation tests.`
+
+Bug fixes:
+
+* Add `status` check to `ImageSelector` so that unavailable images were not
+  selected for use automatically and causing failures in tests.
+* Fix creating database servers from snapshots by adding the `snapshot_id`
+  attribute ensuring the value is not filtered when using the model.
+
+### 1.0.0 / 2018-10-05
+
+Major Changes:
+
+* Gem version has been changed 1.0 to reflect breaking changes.
+* Ruby versions 1.9 is longer supported as per fog-core v2.
+* Ruby versions 2.0 and 2.1 are no longer supported by Brightbox although a
+  hard value has not been used in the gemspec to avoid issues with `fog`
+* Remove deprecated versions of `#(get|update)_account` and `#get_user` which
+  did not require identifiers and were treated as the authenticated user.
+* Remove deprecated `Compute#request` multiple argument version.
+* Remove deprecated `#destroy_(resource)` requests.
+* Fix `#destroy_(resource)` references in models.
+
+### 0.16.1 / 2018-09-07
+
+Bug fixes:
+
+* Fix ordering issue between declaration of fog services and `autoload` modules.
+  Changes in `fog-core` would reference modules before available in autoload so
+  caused a name error.
+
 ### 0.16.0 / 2018-09-04
 
 Changes:

data/README.md

@@ -39,11 +39,10 @@ and its modules:
 * http://fog.io/
 * http://rubydoc.info/gems/fog/
 
-### Ruby 1.8.7
+### Ruby version support
 
-If you are still using Ruby 1.8.7 in production, see `gemfiles/Gemfile.1.8.7`
-for a gemfile of 1.8.7 compatible version of dependencies you may need to
-specify in your application's `Gemfile`
+As required by the main `fog-core` library, support for Ruby 1.9 was dropped in
+`v1.0.0` of this gem.
 
 ## Contributing
 

data/fog-brightbox.gemspec

@@ -14,15 +14,16 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/fog/fog-brightbox"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
+  spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "fog-core"
+  spec.required_ruby_version = "~> 2.0"
+
+  spec.add_dependency "fog-core", ">= 1.45", "< 3.0"
   spec.add_dependency "fog-json"
   spec.add_dependency "dry-inflector"
-  spec.add_dependency "mime-types"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "minitest"

data/lib/fog/brightbox.rb

@@ -11,36 +11,16 @@ module Fog
   module Brightbox
     extend Fog::Provider
 
-    service(:compute, "Compute")
-    service(:storage, "Storage")
-
-    module Compute
-      autoload :Config, File.expand_path("../brightbox/compute/config", __FILE__)
-      autoload :ImageSelector, File.expand_path("../brightbox/compute/image_selector", __FILE__)
-      autoload :ResourceLocking, File.expand_path("../brightbox/compute/resource_locking", __FILE__)
-      autoload :Shared, File.expand_path("../brightbox/compute/shared", __FILE__)
-    end
-
-    module Storage
-      autoload :AuthenticationRequest, File.expand_path("../brightbox/storage/authentication_request", __FILE__)
-      autoload :AuthenticationRequired, File.expand_path("../brightbox/storage/authentication_required", __FILE__)
-      autoload :Connection, File.expand_path("../brightbox/storage/connection", __FILE__)
-      autoload :Config, File.expand_path("../brightbox/storage/config", __FILE__)
-      autoload :ManagementUrlUnknown, File.expand_path("../brightbox/storage/management_url_unknown", __FILE__)
-    end
+    autoload :Compute, File.expand_path("../brightbox/compute", __FILE__)
+    autoload :Storage, File.expand_path("../brightbox/storage", __FILE__)
 
     autoload :Config, File.expand_path("../brightbox/config", __FILE__)
     autoload :LinkHelper, File.expand_path("../brightbox/link_helper", __FILE__)
     autoload :Model, File.expand_path("../brightbox/model", __FILE__)
     autoload :ModelHelper, File.expand_path("../brightbox/model_helper", __FILE__)
     autoload :OAuth2, File.expand_path("../brightbox/oauth2", __FILE__)
-  end
 
-  module Compute
-    autoload :Brightbox, File.expand_path("../brightbox/compute", __FILE__)
-  end
-
-  module Storage
-    autoload :Brightbox, File.expand_path("../brightbox/storage", __FILE__)
+    service(:compute, "Compute")
+    service(:storage, "Storage")
   end
 end

data/lib/fog/brightbox/compute.rb

@@ -1,6 +1,11 @@
 module Fog
-  module Compute
-    class Brightbox < Fog::Service
+  module Brightbox
+    class Compute < Fog::Service
+      autoload :Config, File.expand_path("../compute/config", __FILE__)
+      autoload :ImageSelector, File.expand_path("../compute/image_selector", __FILE__)
+      autoload :ResourceLocking, File.expand_path("../compute/resource_locking", __FILE__)
+      autoload :Shared, File.expand_path("../compute/shared", __FILE__)
+
       # Client credentials
       requires :brightbox_client_id, :brightbox_secret
 
@@ -214,39 +219,19 @@ module Fog
         # Makes an API request to the given path using passed options or those
         # set with the service setup
         #
-        # @todo Standard Fog behaviour is to return the Excon::Response but
-        #   this was unintentionally changed to be the Hash version of the
-        #   data in the body. This loses access to some details and should
-        #   be corrected in a backwards compatible manner
-        #
-        # @overload request(params)
-        #   @param [Hash] params Excon compatible options
-        #   @option params [String] :body text to be sent over a socket
-        #   @option params [Hash<Symbol, String>] :headers The default headers to supply in a request
-        #   @option params [String] :host The destination host's reachable DNS name or IP, in the form of a String
-        #   @option params [String] :path appears after 'scheme://host:port/'
-        #   @option params [Fixnum] :port The port on which to connect, to the destination host
-        #   @option params [Hash]   :query appended to the 'scheme://host:port/path/' in the form of '?key=value'
-        #   @option params [String] :scheme The protocol; 'https' causes OpenSSL to be used
-        #   @return [Excon::Response]
-        #   @see https://github.com/geemus/excon/blob/master/lib/excon/connection.rb
+        # @param [Hash] params Excon compatible options
+        # @option params [String] :body text to be sent over a socket
+        # @option params [Hash<Symbol, String>] :headers The default headers to supply in a request
+        # @option params [String] :host The destination host's reachable DNS name or IP, in the form of a String
+        # @option params [String] :path appears after 'scheme://host:port/'
+        # @option params [Fixnum] :port The port on which to connect, to the destination host
+        # @option params [Hash]   :query appended to the 'scheme://host:port/path/' in the form of '?key=value'
+        # @option params [String] :scheme The protocol; 'https' causes OpenSSL to be used
+        # @return [Excon::Response]
+        # @see https://github.com/geemus/excon/blob/master/lib/excon/connection.rb
         #
-        # @overload request(method, path, expected_responses, params = {})
-        #   @param [String] method HTTP method to use for the request
-        #   @param [String] path   The absolute path for the request
-        #   @param [Array<Fixnum>] expected_responses HTTP response codes that have been successful
-        #   @param [Hash] params Keys and values for JSON
-        #   @option params [String] :account_id The scoping account if required
-        #   @deprecated #request with multiple arguments is deprecated
-        #     since it is inconsistent with original fog version.
-        #   @return [Hash]
         def request(*args)
-          if args.size == 1
-            authenticated_request(*args)
-          else
-            Fog::Logger.deprecation("#request with multiple parameters is deprecated, use #wrapped_request instead [light_black](#{caller.first})[/]")
-            wrapped_request(*args)
-          end
+          authenticated_request(*args)
         end
 
         # Makes a request but with seperated arguments and parses the response to a hash

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

@@ -2,7 +2,7 @@ require "delegate"
 
 module Fog
   module Brightbox
-    module Compute
+    class Compute
       class Config < SimpleDelegator
         def initialize(config)
           super

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

@@ -1,6 +1,6 @@
 module Fog
   module Brightbox
-    module Compute
+    class Compute
       #
       # This selects the preferred image to use based on a number of
       # conditions
@@ -8,7 +8,7 @@ module Fog
       class ImageSelector
         # Prepares a selector with the API output
         #
-        # @param [Array<Hash>] images hash matching API output for {Fog::Compute::Brightbox#list_images}
+        # @param [Array<Hash>] images hash matching API output for {Fog::Brightbox::Compute#list_images}
         #
         def initialize(images)
           @images = images
@@ -28,6 +28,7 @@ module Fog
         def latest_ubuntu
           @images.select do |img|
             img["official"] == true &&
+              img["status"] == "available" &&
               img["arch"] == "i686" &&
               img["name"] =~ /ubuntu/i
           end.sort do |a, b|
@@ -46,7 +47,8 @@ module Fog
         def official_minimal
           @images.select do |img|
             img["official"] == true &&
-            img["virtual_size"] != 0
+              img["status"] == "available" &&
+              img["virtual_size"] != 0
           end.sort_by do |img|
             img["disk_size"]
           end.first["id"]

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

@@ -1,6 +1,6 @@
 module Fog
   module Brightbox
-    module Compute
+    class Compute
       module ResourceLocking
         def locked?
           if attributes.key?("locked") || attributes.key?(:locked)

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

@@ -1,6 +1,6 @@
 module Fog
   module Brightbox
-    module Compute
+    class Compute
       # The Shared module consists of code that was duplicated between the Real
       # and Mock implementations.
       #
@@ -79,11 +79,11 @@ module Fog
         # * For User applications this is the account specified by either +account_id+
         #   option on the service or the +brightbox_account+ setting in your configuration
         #
-        # @return [Fog::Compute::Brightbox::Account]
+        # @return [Fog::Brightbox::Compute::Account]
         #
         def account
           account_data = get_scoped_account.merge(:service => self)
-          Fog::Compute::Brightbox::Account.new(account_data)
+          Fog::Brightbox::Compute::Account.new(account_data)
         end
 
         # Returns true if authentication is being performed as a user

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Brightbox
+  module Brightbox
+    class Compute
       class Account < Fog::Brightbox::Model
         identity :id
         attribute :url

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

@@ -1,10 +1,10 @@
 require "fog/brightbox/models/compute/account"
 
 module Fog
-  module Compute
-    class Brightbox
+  module Brightbox
+    class Compute
       class Accounts < Fog::Collection
-        model Fog::Compute::Brightbox::Account
+        model Fog::Brightbox::Compute::Account
 
         def all(options = {})
           data = service.list_accounts(options)

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Brightbox
+  module Brightbox
+    class Compute
       class ApiClient < Fog::Brightbox::Model
         identity :id
         attribute :name
@@ -24,7 +24,7 @@ module Fog
 
         def destroy
           requires :identity
-          service.destroy_api_client(identity)
+          service.delete_api_client(identity)
           true
         end
 

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

@@ -1,10 +1,10 @@
 require "fog/brightbox/models/compute/api_client"
 
 module Fog
-  module Compute
-    class Brightbox
+  module Brightbox
+    class Compute
       class ApiClients < Fog::Collection
-        model Fog::Compute::Brightbox::ApiClient
+        model Fog::Brightbox::Compute::ApiClient
 
         def all
           data = service.list_api_clients

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Brightbox
+  module Brightbox
+    class Compute
       class Application < Fog::Brightbox::Model
         identity :id
         attribute :url

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

@@ -1,10 +1,10 @@
 require "fog/brightbox/models/compute/application"
 
 module Fog
-  module Compute
-    class Brightbox
+  module Brightbox
+    class Compute
       class Applications < Fog::Collection
-        model Fog::Compute::Brightbox::Application
+        model Fog::Brightbox::Compute::Application
 
         def all
           data = service.list_applications

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Brightbox
+  module Brightbox
+    class Compute
       class CloudIp < Fog::Brightbox::Model
         identity :id
         attribute :url
@@ -53,7 +53,7 @@ module Fog
 
         def destroy
           requires :identity
-          service.destroy_cloud_ip(identity)
+          service.delete_cloud_ip(identity)
         end
 
         def destination_id

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

@@ -1,10 +1,10 @@
 require "fog/brightbox/models/compute/cloud_ip"
 
 module Fog
-  module Compute
-    class Brightbox
+  module Brightbox
+    class Compute
       class CloudIps < Fog::Collection
-        model Fog::Compute::Brightbox::CloudIp
+        model Fog::Brightbox::Compute::CloudIp
 
         def all
           data = service.list_cloud_ips

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Brightbox
+  module Brightbox
+    class Compute
       class Collaboration < Fog::Brightbox::Model
         identity :id
         attribute :status
@@ -37,7 +37,7 @@ module Fog
 
         def destroy
           requires :identity
-          data = service.destroy_collaboration(identity)
+          data = service.delete_collaboration(identity)
           merge_attributes(data)
           true
         end

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

@@ -1,10 +1,10 @@
 require "fog/brightbox/models/compute/collaboration"
 
 module Fog
-  module Compute
-    class Brightbox
+  module Brightbox
+    class Compute
       class Collaborations < Fog::Collection
-        model Fog::Compute::Brightbox::Collaboration
+        model Fog::Brightbox::Compute::Collaboration
 
         def all
           data = service.list_collaborations
@@ -25,7 +25,7 @@ module Fog
         # @param [String] email The email address to use for the invitation
         # @param [String] role The role being granted. Only (+admin+ is
         #   currently supported
-        # @return [Fog::Compute::Brightbox::Collaboration]
+        # @return [Fog::Brightbox::Compute::Collaboration]
         #
         def invite(email, role)
           return nil if email.nil? || email == ""
@@ -37,7 +37,7 @@ module Fog
 
         def destroy
           requires :identity
-          service.destroy_collaboration(identity)
+          service.delete_collaboration(identity)
           true
         end
       end