fog-brightbox 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92365de2ab00f6e4c7a66c4acc2d7a6e33e74d26069bedfc68ff418f5dfb2056
-  data.tar.gz: 1211cea76e6b6345d852308cdf8198c9db4a942859e5df3e4dd9aad8dd128d29
+  metadata.gz: cfa9b2e98e5691a853fa9b6e68f37de41f10ac081d04402d4be4c5842b1ba930
+  data.tar.gz: d95737e730099ba23713c5f4c2c196c2e7aab63387c7febe1e3d2608a84174b9
 SHA512:
-  metadata.gz: 1a7db03027f2d25e710d6562d02f6c373140d90841807961e2deb10d169a48f746bd4b731b4f45a07a48f9fd18bf8b437f14e2fa11dd6b38294e20521117279e
-  data.tar.gz: cd3dd7be1ac30a847d0b60d89a7c9c3ab4c688a26074833870a9baa58e6265ad99c17e7dd8195222485c9f4f350c07850c06b92cfdda98202d627f2476f3d11b
+  metadata.gz: 43a52dc0cb5a4444eafd03d9ad6414bc3a08ab826d97e658a505229d4c7a32b2267ced2206e7d7e9f19cbc0dc02576d172fce9eb1f786c69d75f8808e0134ad8
+  data.tar.gz: fbb69efe2d339176ba36bab0ba55da159e45a525adeeb0d742819e52617a3d0f61b9e5c6b7d2e0fc2a275fc56eac15ae026cad6f4fa8446145a6c510f19b5183

data/.travis.yml

@@ -1,11 +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

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+### 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:

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

data/lib/fog/brightbox/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Brightbox
-    VERSION = "1.0.0"
+    VERSION = "1.1.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/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/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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-brightbox
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.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
@@ -465,8 +465,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       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