fog-brightbox 1.0.0.rc2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 596dfd578ca96a4cee58e9c7f08ee7b12138418928e1d87aad063f60338c6021
-  data.tar.gz: 91cb8da6872fdb3f58d77d21dee833cbbd2498cac588cb63fd6960e2201d2150
+  metadata.gz: 35e9bddfb076ce0f5d2aee8ffde307fa556fb566edfff3a42ec77629be90f37f
+  data.tar.gz: '08dbc3f72b46671785b30081e39379e0522a30aa4667fd676cf6a754359bd86d'
 SHA512:
-  metadata.gz: 89373d00211b08167c72f1784a86b5c739047e09da4a5b5e529a916fadefe94e567ad4eba5f2da4cbf48e5456420f18345281253feb54ab7899d5717c1e842d3
-  data.tar.gz: 6b8fc01d4b0cbb91a69cdab24cdc2d0b4cf3a7a38f24fa458ece9951cdcc840f08625484babd9ee65687e378a7dab86172971bff7a3ffa9ba2f6242e343da3f1
+  metadata.gz: 67694ea3b653fb45b935d1c7d0f5526df4a7087e16afb4588c59e5a8d9829a82958cffd78ec7b50be0af0966c1705e5107c824a48345a3a823ff7c72e676a323
+  data.tar.gz: 2170741c385dbfeb503c29f23f7289ddb4886c8318d4c15ba48ff16ee05e412b211042111f490d32a7064165806f32f9510d13fd220589e58b1294deb9d13fb0

data/.travis.yml

@@ -1,11 +1,12 @@
 sudo: false
 language: ruby
 rvm:
+  - 3.0
+  - 2.7
+  - 2.6
   - 2.5
   - 2.4
   - 2.3
   - 2.2
   - 2.1
   - 2.0
-before_install:
-  - gem install bundler

data/CHANGELOG.md

@@ -1,4 +1,42 @@
-### Master
+### 1.4.0 / 2021-02-17
+
+Changes:
+
+* Relax dependencies to allow Ruby 3.0 to be used.
+
+### 1.3.0 / 2020-11-24
+
+Changes:
+
+* Add `Server#disk_encrypted` attribute to support creation of servers with
+  LUKS based encryption at rest.
+
+### 1.2.0 / 2020-11-16
+
+Changes:
+
+* Add `LoadBalancer#ssl_minimum_version` attribute to configure the TLS/SSL
+  version supported by the load balancer.
+
+### 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:
 
@@ -10,6 +48,15 @@ Major Changes:
   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
 

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

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = "~> 2.0"
+  spec.required_ruby_version = ">= 2.0"
 
   spec.add_dependency "fog-core", ">= 1.45", "< 3.0"
   spec.add_dependency "fog-json"

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

@@ -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/models/compute/api_client.rb

@@ -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/cloud_ip.rb

@@ -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/collaboration.rb

@@ -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

@@ -37,7 +37,7 @@ module Fog
 
         def destroy
           requires :identity
-          service.destroy_collaboration(identity)
+          service.delete_collaboration(identity)
           true
         end
       end

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

@@ -34,6 +34,8 @@ module Fog
         attribute :flavor_id, "alias" => "database_server_type", :squash => "id"
         attribute :zone_id, "alias" => "zone", :squash => "id"
 
+        attribute :snapshot_id
+
         attribute :cloud_ips
 
         def save
@@ -54,6 +56,7 @@ module Fog
             options[:version] = database_version if database_version
             options[:database_type] = flavor_id if flavor_id
             options[:zone] = zone_id if zone_id
+            options[:snapshot] = snapshot_id if snapshot_id
 
             data = create_database_server(options)
           end
@@ -81,7 +84,7 @@ module Fog
 
         def destroy
           requires :identity
-          merge_attributes(service.destroy_database_server(identity))
+          merge_attributes(service.delete_database_server(identity))
           true
         end
 

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

@@ -39,7 +39,7 @@ module Fog
 
         def destroy
           requires :identity
-          merge_attributes(service.destroy_database_snapshot(identity))
+          merge_attributes(service.delete_database_snapshot(identity))
           true
         end
 

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

@@ -50,7 +50,7 @@ module Fog
 
         def destroy
           requires :identity
-          service.destroy_firewall_policy(identity)
+          service.delete_firewall_policy(identity)
           true
         end
       end

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

@@ -39,7 +39,7 @@ module Fog
 
         def destroy
           requires :identity
-          service.destroy_firewall_rule(identity)
+          service.delete_firewall_rule(identity)
           true
         end
       end

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

@@ -53,7 +53,7 @@ module Fog
 
         def destroy
           requires :identity
-          service.destroy_image(identity)
+          service.delete_image(identity)
           true
         end
       end

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

@@ -18,6 +18,8 @@ module Fog
         attribute :healthcheck
         attribute :listeners
 
+        attribute :ssl_minimum_version
+
         # These SSL attributes act only as setters. You can not read certs or keys via the API
         attribute :certificate_pem
         attribute :certificate_private_key
@@ -58,6 +60,7 @@ module Fog
             :buffer_size => buffer_size,
             :certificate_pem => certificate_pem,
             :certificate_private_key => certificate_private_key,
+            :ssl_minimum_version => ssl_minimum_version,
             :sslv3 => ssl3?
           }.delete_if { |_k, v| v.nil? || v == "" }
           data = service.create_load_balancer(options)
@@ -67,7 +70,7 @@ module Fog
 
         def destroy
           requires :identity
-          service.destroy_load_balancer(identity)
+          service.delete_load_balancer(identity)
           true
         end
 

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

@@ -21,6 +21,8 @@ module Fog
         attribute :fqdn
         attribute :console_token
 
+        attribute :disk_encrypted
+
         # Times
         attribute :created_at, :type => :time
         attribute :started_at, :type => :time
@@ -127,7 +129,7 @@ module Fog
 
         def destroy
           requires :identity
-          service.destroy_server(identity)
+          service.delete_server(identity)
           true
         end
 
@@ -188,6 +190,7 @@ module Fog
 
           options.merge!(:server_type => flavor_id) unless flavor_id.nil? || flavor_id == ""
           options.merge!(:cloud_ip => cloud_ip) unless cloud_ip.nil? || cloud_ip == ""
+          options.merge!(:disk_encrypted => disk_encrypted) if disk_encrypted
 
           data = service.create_server(options)
           merge_attributes(data)

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

@@ -76,7 +76,7 @@ module Fog
 
         def destroy
           requires :identity
-          service.destroy_server_group(identity)
+          service.delete_server_group(identity)
           true
         end
 

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

@@ -31,7 +31,7 @@ module Fog
 
         def destroy
           requires :identity
-          data = service.destroy_user_collaboration(identity)
+          data = service.delete_user_collaboration(identity)
           merge_attributes(data)
           true
         end

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

@@ -21,7 +21,7 @@ module Fog
 
         def destroy
           requires :identity
-          service.destroy_user_collaboration(identity)
+          service.delete_user_collaboration(identity)
           true
         end
       end

data/lib/fog/brightbox/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Brightbox
-    VERSION = "1.0.0.rc2"
+    VERSION = "1.4.0"
   end
 end

data/spec/fog/brightbox/config_spec.rb

@@ -220,7 +220,7 @@ describe Fog::Brightbox::Config do
       @options = {
         :brightbox_client_id => "app-12345",
         :brightbox_secret => "12345",
-        :brightbox_username => "user@example.com",
+        :brightbox_username => "user@example.test",
         :brightbox_password => "12345"
       }
       @config = Fog::Brightbox::Config.new(@options)
@@ -241,7 +241,7 @@ describe Fog::Brightbox::Config do
 
   describe "when setting management_url with URI" do
     it "sets it correctly" do
-      uri = URI.parse("https://example.com")
+      uri = URI.parse("https://example.test")
       @config = Fog::Brightbox::Config.new
       @config.storage_management_url = uri
       assert_equal @config.storage_management_url, uri
@@ -250,7 +250,7 @@ describe Fog::Brightbox::Config do
 
   describe "when setting management_url with String" do
     it "raises ArgumentError" do
-      uri = "http://example.com/wrong"
+      uri = "http://example.test/wrong"
       assert_raises(ArgumentError) { Fog::Brightbox::Config.new.storage_management_url = uri }
     end
   end

data/spec/fog/brightbox/link_helper_spec.rb

@@ -3,7 +3,7 @@ require "spec_helper"
 describe Fog::Brightbox::LinkHelper do
   describe "when initialized with an RFC5988 value" do
     before do
-      @header = "<https://www.example.com/1.0/images/img-12345>; rel=snapshot"
+      @header = "<https://www.example.test/1.0/images/img-12345>; rel=snapshot"
       @helper = Fog::Brightbox::LinkHelper.new(@header)
     end
 

data/spec/fog/brightbox/storage/authentication_request_spec.rb

@@ -47,7 +47,7 @@ describe Fog::Brightbox::Storage::AuthenticationRequest do
       stub_request(:get, "https://orbit.brightbox.com/v1").
         with(:headers => {
                "Host" => "orbit.brightbox.com:443",
-               "X-Auth-User" => "user@example.com",
+               "X-Auth-User" => "user@example.test",
                "X-Auth-Key" => "abcde"
              }).to_return(authorized_response)
     end
@@ -56,7 +56,7 @@ describe Fog::Brightbox::Storage::AuthenticationRequest do
       settings = {
         :brightbox_client_id => "app-12345",
         :brightbox_secret => "12345",
-        :brightbox_username => "user@example.com",
+        :brightbox_username => "user@example.test",
         :brightbox_password => "abcde"
       }
       @config = Fog::Brightbox::Config.new(settings)
@@ -70,7 +70,7 @@ describe Fog::Brightbox::Storage::AuthenticationRequest do
       stub_request(:get, "https://orbit.brightbox.com/v1").
         with(:headers => {
                "Host" => "orbit.brightbox.com:443",
-               "X-Auth-User" => "user@example.com",
+               "X-Auth-User" => "user@example.test",
                "X-Auth-Key" => "abcde"
              }).to_return(unauthorized_response)
     end
@@ -79,7 +79,7 @@ describe Fog::Brightbox::Storage::AuthenticationRequest do
       settings = {
         :brightbox_client_id => "app-12345",
         :brightbox_secret => "12345",
-        :brightbox_username => "user@example.com",
+        :brightbox_username => "user@example.test",
         :brightbox_password => "abcde"
       }
       @config = Fog::Brightbox::Config.new(settings)

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

@@ -19,7 +19,7 @@ describe Fog::Brightbox::Compute::DatabaseServer do
     end
   end
 
-  describe "when snapshotting withi no options" do
+  describe "when snapshotting with no options" do
     it "returns the database server" do
       stub_request(:post, "http://localhost/1.0/database_servers/dbs-12345/snapshot").
         with(:query => hash_including(:account_id),
@@ -47,4 +47,19 @@ describe Fog::Brightbox::Compute::DatabaseServer do
       assert_kind_of Fog::Brightbox::Compute::DatabaseSnapshot, @database_server.snapshot(true)
     end
   end
+
+  describe "when building from a snapshot" do
+    it "returns the new SQL instance" do
+      stub_request(:post, "http://localhost/1.0/database_servers").
+        with(:query => hash_including(:account_id),
+             :headers => { "Authorization" => "Bearer FAKECACHEDTOKEN" },
+             :body => hash_including(:snapshot => "dbi-lv426")).
+        to_return(:status => 202, :body => %q({"id": "dbs-12345"}))
+
+      @database_server = Fog::Brightbox::Compute::DatabaseServer.new(:service => service, :snapshot_id => "dbi-lv426")
+      @database_server.save
+      assert_kind_of Fog::Brightbox::Compute::DatabaseServer, @database_server
+      assert_equal "dbs-12345", @database_server.id
+    end
+  end
 end

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

@@ -18,4 +18,28 @@ describe Fog::Brightbox::Compute::LoadBalancer do
       assert_equal "load_balancer", subject.resource_name
     end
   end
+
+  describe "when creating" do
+    it "send correct JSON" do
+      options = {
+        healthcheck: {},
+        listeners: [
+          {
+            protocol: "http",
+            in: 80,
+            out: 80
+          }
+        ],
+        nodes: []
+      }
+
+      stub_request(:post, "http://localhost/1.0/load_balancers").
+        with(:query => hash_including(:account_id),
+             :headers => { "Authorization" => "Bearer FAKECACHEDTOKEN" }).
+        to_return(:status => 202, :body => %q({"id": "lba-12345"}), :headers => {})
+
+      @load_balancer = Fog::Brightbox::Compute::LoadBalancer.new({ :service => service }.merge(options))
+      assert @load_balancer.save
+    end
+  end
 end

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

@@ -19,7 +19,49 @@ describe Fog::Brightbox::Compute::Server do
     end
   end
 
-  describe "when snapshotting withi no options" do
+  describe "when creating" do
+    describe "with required image_id" do
+      it "sends correct JSON" do
+        options = {
+          image_id: "img-12345"
+        }
+
+        stub_request(:post, "http://localhost/1.0/servers").
+          with(:query => hash_including(:account_id),
+               :headers => { "Authorization" => "Bearer FAKECACHEDTOKEN",
+                             "Content-Type" => "application/json" },
+                             :body => hash_including(:image => "img-12345")).
+        to_return(:status => 202, :body => %q({"id":"srv-12345"}), :headers => {})
+
+        @server = Fog::Brightbox::Compute::Server.new({ :service => service }.merge(options))
+        assert @server.save
+      end
+    end
+
+    describe "with additional disk_encrypted" do
+      it "sends correct JSON" do
+        options = {
+          image_id: "img-12345",
+          disk_encrypted: true
+        }
+
+        stub_request(:post, "http://localhost/1.0/servers").
+          with(:query => hash_including(:account_id),
+               :headers => { "Authorization" => "Bearer FAKECACHEDTOKEN",
+                             "Content-Type" => "application/json" },
+                             :body => hash_including(:disk_encrypted => true)).
+          to_return(:status => 202,
+                    :body => %q({"id":"srv-12345","disk_encrypted":true}),
+                    :headers => {})
+
+        @server = Fog::Brightbox::Compute::Server.new({ :service => service }.merge(options))
+        assert @server.save
+        assert @server.disk_encrypted
+      end
+    end
+  end
+
+  describe "when snapshotting with no options" do
     it "returns the server" do
       stub_request(:post, "http://localhost/1.0/servers/srv-12345/snapshot").
         with(:query => hash_including(:account_id),

data/spec/fog/storage/brightbox_spec.rb

@@ -89,7 +89,7 @@ describe Fog::Brightbox::Storage do
       {
         :brightbox_client_id => "app-12345",
         :brightbox_secret => "12345",
-        :brightbox_username => "user@example.com",
+        :brightbox_username => "user@example.test",
         :brightbox_password => "abcde",
         :brightbox_account => "acc-abcde"
       }
@@ -111,7 +111,7 @@ describe Fog::Brightbox::Storage do
       {
         :brightbox_client_id => "app-12345",
         :brightbox_secret => "12345",
-        :brightbox_username => "user@example.com",
+        :brightbox_username => "user@example.test",
         :brightbox_password => "abcde"
       }
     end
@@ -204,7 +204,7 @@ describe Fog::Brightbox::Storage do
       {
         :brightbox_client_id => "app-12345",
         :brightbox_secret => "12345",
-        :brightbox_username => "user@example.com",
+        :brightbox_username => "user@example.test",
         :brightbox_password => "12345",
         :brightbox_access_token => "1234567890abcdefghijklmnopqrstuvwxyz",
         :brightbox_refresh_token => "1234567890abcdefghijklmnopqrstuvwxyz",
@@ -221,7 +221,7 @@ describe Fog::Brightbox::Storage do
 
       # The reauthentication
       stub_request(:get, "https://files.gb2.brightbox.com/v1").
-        with(:headers => { "X-Auth-User" => "user@example.com", "X-Auth-Key" => "12345" }).
+        with(:headers => { "X-Auth-User" => "user@example.test", "X-Auth-Key" => "12345" }).
         to_return(authorized_response)
 
       # Repeated request

data/tests/brightbox/compute_tests.rb

@@ -9,8 +9,8 @@ end
 Shindo.tests("Fog::Compute.new", ["brightbox"]) do
   tests("service options") do
     {
-      :brightbox_api_url => "https://example.com",
-      :brightbox_auth_url => "https://example.com",
+      :brightbox_api_url => "https://example.test",
+      :brightbox_auth_url => "https://example.test",
       :brightbox_client_id => "app-12345",
       :brightbox_secret => "12345abdef6789",
       :brightbox_username => "user-12345",

data/tests/brightbox/requests/compute/api_client_tests.rb

@@ -38,9 +38,9 @@ Shindo.tests("Fog::Compute[:brightbox] | api client requests", ["brightbox"]) do
       test("new secret is visible") { !result["secret"].nil? }
     end
 
-    tests("#destroy_api_client('#{@api_client_id}')") do
+    tests("#delete_api_client('#{@api_client_id}')") do
       pending if Fog.mocking?
-      result = Fog::Compute[:brightbox].destroy_api_client(@api_client_id)
+      result = Fog::Compute[:brightbox].delete_api_client(@api_client_id)
       data_matches_schema(Brightbox::Compute::Formats::Full::API_CLIENT, :allow_extra_keys => true) { result }
     end
   end

data/tests/brightbox/requests/compute/application_test.rb

@@ -37,9 +37,9 @@ Shindo.tests("Fog::Compute[:brightbox] | api client requests", ["brightbox"]) do
       test("new secret is visible") { !result["secret"].nil? }
     end
 
-    tests("#destroy_application('#{@application_id}')") do
+    tests("#delete_application('#{@application_id}')") do
       pending if Fog.mocking?
-      result = Fog::Compute[:brightbox].destroy_application(@application_id)
+      result = Fog::Compute[:brightbox].delete_application(@application_id)
       data_matches_schema(Brightbox::Compute::Formats::Full::APPLICATION, :allow_extra_keys => true) { result }
     end
   end

data/tests/brightbox/requests/compute/cloud_ip_tests.rb

@@ -54,9 +54,9 @@ Shindo.tests("Fog::Compute[:brightbox] | cloud ip requests", ["brightbox"]) do
       result = Fog::Compute[:brightbox].update_cloud_ip(@cloud_ip_id, :reverse_dns => "")
     end
 
-    tests("#destroy_cloud_ip('#{@cloud_ip_id}')") do
+    tests("#delete_cloud_ip('#{@cloud_ip_id}')") do
       pending if Fog.mocking?
-      result = Fog::Compute[:brightbox].destroy_cloud_ip(@cloud_ip_id)
+      result = Fog::Compute[:brightbox].delete_cloud_ip(@cloud_ip_id)
       data_matches_schema(Brightbox::Compute::Formats::Full::CLOUD_IP, :allow_extra_keys => true) { result }
     end
 

data/tests/brightbox/requests/compute/collaboration_tests.rb

@@ -1,8 +1,11 @@
 Shindo.tests("Fog::Compute[:brightbox] | collaboration requests", ["brightbox"]) do
   tests("success") do
+    @test_collaborator_email = ENV["FOG_TEST_COLLABORATOR_EMAIL"]
+    pending unless @test_collaborator_email
+
     tests("#create_collaboration") do
       pending if Fog.mocking?
-      collaboration = Fog::Compute[:brightbox].create_collaboration(:email => "paul@example.com", :role => "admin")
+      collaboration = Fog::Compute[:brightbox].create_collaboration(:email => @test_collaborator_email, :role => "admin")
       @collaboration_id = collaboration["id"]
       formats(Brightbox::Compute::Formats::Full::COLLABORATION, false) { collaboration }
     end
@@ -20,9 +23,9 @@ Shindo.tests("Fog::Compute[:brightbox] | collaboration requests", ["brightbox"])
       formats(Brightbox::Compute::Formats::Full::COLLABORATION, false) { result }
     end
 
-    tests("#destroy_collaboration") do
+    tests("#delete_collaboration") do
       pending if Fog.mocking?
-      result = Fog::Compute[:brightbox].destroy_collaboration(@collaboration_id)
+      result = Fog::Compute[:brightbox].delete_collaboration(@collaboration_id)
       formats(Brightbox::Compute::Formats::Full::COLLABORATION, false) { result }
     end
   end

data/tests/brightbox/requests/compute/database_server_tests.rb

@@ -35,8 +35,8 @@ Shindo.tests("Fog::Compute[:brightbox] | database server requests", ["brightbox"
       test("new password is visible") { !result["admin_password"].nil? }
     end
 
-    tests("#destroy_database_server('#{@database_server_id}')") do
-      result = Fog::Compute[:brightbox].destroy_database_server(@database_server_id)
+    tests("#delete_database_server('#{@database_server_id}')") do
+      result = Fog::Compute[:brightbox].delete_database_server(@database_server_id)
       data_matches_schema(Brightbox::Compute::Formats::Full::DATABASE_SERVER, :allow_extra_keys => true) { result }
     end
   end

data/tests/brightbox/requests/compute/database_snapsnot_tests.rb

@@ -32,8 +32,8 @@ Shindo.tests("Fog::Compute[:brightbox] | database snapshot requests", ["brightbo
       data_matches_schema(Brightbox::Compute::Formats::Full::DATABASE_SNAPSHOT, :allow_extra_keys => true) { result }
     end
 
-    tests("#destroy_database_snapshot('#{@database_snapshot_id}')") do
-      result = service.destroy_database_snapshot(@database_snapshot_id)
+    tests("#delete_database_snapshot('#{@database_snapshot_id}')") do
+      result = service.delete_database_snapshot(@database_snapshot_id)
       data_matches_schema(Brightbox::Compute::Formats::Full::DATABASE_SNAPSHOT, :allow_extra_keys => true) { result }
     end
   end

data/tests/brightbox/requests/compute/firewall_policy_tests.rb

@@ -31,8 +31,8 @@ Shindo.tests("Fog::Compute[:brightbox] | firewall policy requests", ["brightbox"
       returns("Fog test policy B") { result["name"] }
     end
 
-    tests("#destroy_firewall_policy('#{@firewall_policy_id}')") do
-      result = Fog::Compute[:brightbox].destroy_firewall_policy(@firewall_policy_id)
+    tests("#delete_firewall_policy('#{@firewall_policy_id}')") do
+      result = Fog::Compute[:brightbox].delete_firewall_policy(@firewall_policy_id)
       data_matches_schema(Brightbox::Compute::Formats::Full::FIREWALL_POLICY, :allow_extra_keys => true) { result }
     end
   end

data/tests/brightbox/requests/compute/firewall_rule_tests.rb

@@ -30,8 +30,8 @@ Shindo.tests("Fog::Compute[:brightbox] | firewall rule requests", ["brightbox"])
       end
     end
 
-    tests("#destroy_firewall_rule('#{@firewall_rule_id}')") do
-      result = Fog::Compute[:brightbox].destroy_firewall_rule(@firewall_rule_id)
+    tests("#delete_firewall_rule('#{@firewall_rule_id}')") do
+      result = Fog::Compute[:brightbox].delete_firewall_rule(@firewall_rule_id)
       data_matches_schema(Brightbox::Compute::Formats::Full::FIREWALL_RULE, :allow_extra_keys => true) { result }
     end
 

data/tests/brightbox/requests/compute/image_tests.rb

@@ -34,8 +34,8 @@ Shindo.tests("Fog::Compute[:brightbox] | image requests", ["brightbox"]) do
     # end
 
     ## Same as other tests - can't be deleting them unless part of the test run
-    # tests("#destroy_server('#{@image_id}')") do
-    #   result = Fog::Compute[:brightbox].destroy_image(@image_id)
+    # tests("#delete_image('#{@image_id}')") do
+    #   result = Fog::Compute[:brightbox].delete_image(@image_id)
     #   formats(Brightbox::Compute::Formats::Full::IMAGE) { result }
     # end
   end

data/tests/brightbox/requests/compute/load_balancer_tests.rb

@@ -85,9 +85,9 @@ Shindo.tests("Fog::Compute[:brightbox] | load balancer requests", ["brightbox"])
       data_matches_schema(Brightbox::Compute::Formats::Full::LOAD_BALANCER, :allow_extra_keys => true) { result }
     end
 
-    tests("#destroy_load_balancer('#{@load_balancer_id}')") do
+    tests("#delete_load_balancer('#{@load_balancer_id}')") do
       pending if Fog.mocking?
-      result = Fog::Compute[:brightbox].destroy_load_balancer(@load_balancer_id)
+      result = Fog::Compute[:brightbox].delete_load_balancer(@load_balancer_id)
       data_matches_schema(Brightbox::Compute::Formats::Full::LOAD_BALANCER, :allow_extra_keys => true) { result }
     end
 

data/tests/brightbox/requests/compute/server_group_tests.rb

@@ -61,9 +61,9 @@ Shindo.tests("Fog::Compute[:brightbox] | server group requests", ["brightbox"])
       test("group is emptied") { result["servers"].empty? }
     end
 
-    tests("#destroy_server_group('#{@server_group_id}')") do
+    tests("#delete_server_group('#{@server_group_id}')") do
       pending if Fog.mocking?
-      result = Fog::Compute[:brightbox].destroy_server_group(@server_group_id)
+      result = Fog::Compute[:brightbox].delete_server_group(@server_group_id)
       data_matches_schema(Brightbox::Compute::Formats::Full::SERVER_GROUP, :allow_extra_keys => true) { result }
     end
 

data/tests/brightbox/requests/compute/server_tests.rb

@@ -76,9 +76,9 @@ Shindo.tests("Fog::Compute[:brightbox] | server requests", ["brightbox"]) do
       @snapshot.destroy
     end
 
-    tests("#destroy_server('#{server_id}')") do
+    tests("#delete_server('#{server_id}')") do
       pending if Fog.mocking?
-      result = Fog::Compute[:brightbox].destroy_server(server_id)
+      result = Fog::Compute[:brightbox].delete_server(server_id)
       data_matches_schema(Brightbox::Compute::Formats::Full::SERVER, :allow_extra_keys => true) { result }
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-brightbox
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc2
+  version: 1.4.0
 platform: ruby
 authors:
 - Paul Thornthwaite
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-05 00:00:00.000000000 Z
+date: 1970-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -456,17 +456,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: This library can be used as a module for `fog` or as standalone provider