fog-brightbox 1.0.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92365de2ab00f6e4c7a66c4acc2d7a6e33e74d26069bedfc68ff418f5dfb2056
-  data.tar.gz: 1211cea76e6b6345d852308cdf8198c9db4a942859e5df3e4dd9aad8dd128d29
+  metadata.gz: 7e91c9a644e0cd1ba3d41a180c1d03f5f6b4f30170838cc8119f694dd528737f
+  data.tar.gz: 51143d7150551695ea3027a75451c15760c0005b824df2aaeb56d1c73050db34
 SHA512:
-  metadata.gz: 1a7db03027f2d25e710d6562d02f6c373140d90841807961e2deb10d169a48f746bd4b731b4f45a07a48f9fd18bf8b437f14e2fa11dd6b38294e20521117279e
-  data.tar.gz: cd3dd7be1ac30a847d0b60d89a7c9c3ab4c688a26074833870a9baa58e6265ad99c17e7dd8195222485c9f4f350c07850c06b92cfdda98202d627f2476f3d11b
+  metadata.gz: 5eb27bf573f92cb3b3ecec889bf62c1ce072a8027e2734d8d4c5238590d6c9f4599388ef52bd6ac8e73b914fb4bf80639ff6a586646f3d06ea997b28903e40c8
+  data.tar.gz: 03a47f51347c021bbe3fafbaf1a9dc5d180d6a8995ab8ce18297234bda87aea965dc7f82b5377ba8d062b00ff76164292e420b623cf6b47aa2dc0c0e45d1da53

data/.github/workflows/ruby.yml

@@ -0,0 +1,35 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ["2.1", "2.2", "2.3", "2.4", "2.5", "2.6", "2.7", "3.0", "head"]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+    # uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rake

data/CHANGELOG.md

@@ -1,3 +1,49 @@
+### 1.4.1 / 2021-04-20
+
+Bug fixes:
+
+* Fix passing `snapshots_schedule` to database servers as the value was being
+  omitted in the model layer. This was preventing creating without a schedule
+  causing the default behaviour.
+
+### 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:

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/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
@@ -47,6 +49,9 @@ module Fog
           options[:maintenance_weekday] = maintenance_weekday
           options[:maintenance_hour] = maintenance_hour
 
+          options[:snapshots_schedule] = snapshots_schedule
+          options[:snapshots_schedule] = nil if snapshots_schedule == ""
+
           if persisted?
             data = update_database_server(options)
           else
@@ -54,6 +59,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/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)

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

@@ -1,5 +1,5 @@
 module Fog
   module Brightbox
-    VERSION = "1.0.0"
+    VERSION = "1.4.1"
   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/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.4.1
 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
@@ -163,10 +163,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -456,7 +456,7 @@ 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
@@ -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

data/.travis.yml

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