brightbox-cli 2.11.2 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f37c9c63622674d0abcab2e4322d1e087a87ca656f0893064e9116adf443d686
-  data.tar.gz: 01d93f26714e55f2b49b97fe9f89c027789431b4d51534835318ca33f28f4305
+  metadata.gz: d5c03039c9263c4872064938223b825be9550d1c08e2a77d438b68f1fd7b42cc
+  data.tar.gz: 85f994952c28133cf8ad08c70d16228b165373f94a90916a0a83fe365e14672d
 SHA512:
-  metadata.gz: 7905407733ca6343b596ff0c51ea9edce92f850d4bed7c86a1dcf214f8ad6098c19a861df69d642ecb568ffdaf72b764d525596e5d5cae7ee6b8a6397daa2f4d
-  data.tar.gz: bec68ef541a8d3a2a2adb7951abeddae676d98b4c3f3da15b1506a7aeab791cfa82eda052901a7d811203d72559f3ec5ffa0c3f05a3aca220476c7d85d9f8b31
+  metadata.gz: 013e062376468560718cfbf25c2e2221db7e0808bcadc6413b6cbf5532b966917de0e2c40d2ffd1a859f8fd78267c28b86166e5638d2869cfe22e9c315bd8a4b
+  data.tar.gz: f81c26c3a3705e6caa3399e1598e4c8ad399f175a0be4d26c2383ccfab8a8cfc75c2ebde0135aa9cee2f4cd220df2119a4d3a880b4c585b3dfc113384cfe57e6

data/.github/workflows/ruby.yml

@@ -0,0 +1,36 @@
+# 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: ["2.4", "2.5", "2.6", "2.7"]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby ${{ matrix.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
+      with:
+        ruby-version: ${{ matrix.ruby }}
+    - name: Install dependencies
+      run: bundle install
+    - name: Run tests
+      run: bundle exec rake

data/.travis.yml

@@ -2,10 +2,7 @@ language: ruby
 sudo: false
 
 rvm:
-  - 1.9
   - 2.0
   - 2.1
   - 2.2
   - 2.3
-  - 2.4
-  - 2.6

data/CHANGELOG.md

@@ -1,3 +1,61 @@
+### v3.2.0 / 2020-11-26
+
+[Full Changelog](https://github.com/brightbox/brightbox-cli/compare/v3.1.0...v3.2.0)
+
+Changes:
+
+* Add `--disk-encrypted` option to server creation to allow enabling encryption
+  at rest during a build.
+* Setup GitHub Actions for Ruby 2.4+ builds to reduce the delays of testing
+  using Travis.
+* Reduce number of Travis builds due to incredibly slow start up times. We are
+  approaching an hour to get a build taking less than a minute starting.
+
+### v3.1.0 / 2020-11-17
+
+[Full Changelog](https://github.com/brightbox/brightbox-cli/compare/v3.0.1...v3.1.0)
+
+Changes:
+
+* Update `fog-brightbox` to v1.2.0
+* Add `lbs` option for `--min-ssl-ver` to specify the minimum TLS/SSL protocol
+  that should be acceptable for use with the load balancer
+
+### v3.0.1 / 2020-07-01
+
+[Full Changelog](https://github.com/brightbox/brightbox-cli/compare/v3.0.0...v3.0.1)
+
+Bug fixes:
+
+* Fix `cloudips update --name` to correctly set blank names
+
+### v3.0.0 / 2020-07-01
+
+[Full Changelog](https://github.com/brightbox/brightbox-cli/compare/v2.12.0...v3.0.0)
+
+Backwards incompatible changes:
+
+* Dropped support for Ruby 1.9
+
+Changes:
+
+* Update `fog-brightbox` to v1.1.0
+* Update `rake` to v12.3.3 to resolve CVE-2020-8130
+* Update `rspec` to v3.9 to avoid issue when updating `rake`
+
+Bug fixes:
+
+* Creating an SQL instance from an existing snapshot has been fixed following
+  the update for `fog-brightbox v1.1.0`
+
+### v2.12.0 / 2020-01-28
+
+[Full Changelog](https://github.com/brightbox/brightbox-cli/compare/v2.11.2...v2.12.0)
+
+Enhancements:
+
+* Adds `token create` to always attempt to reauthenticate and display a token.
+
 ### v2.11.2 / 2020-01-07
 
 [Full Changelog](https://github.com/brightbox/brightbox-cli/compare/v2.11.1...v2.11.2)

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    brightbox-cli (2.11.2)
+    brightbox-cli (3.2.0)
       dry-inflector (< 0.2)
-      fog-brightbox (>= 0.16.0, < 1.0)
+      fog-brightbox (>= 1.3.0)
       fog-core (< 2.0)
       gli (~> 2.12.0)
       highline (~> 1.6.0)
@@ -20,14 +20,13 @@ GEM
     coderay (1.0.9)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
-    diff-lcs (1.2.5)
+    diff-lcs (1.4.3)
     dry-inflector (0.1.2)
-    excon (0.71.1)
-    fog-brightbox (0.16.1)
+    excon (0.78.0)
+    fog-brightbox (1.3.0)
       dry-inflector
-      fog-core
+      fog-core (>= 1.45, < 3.0)
       fog-json
-      mime-types
     fog-core (1.45.0)
       builder
       excon (~> 0.58)
@@ -53,15 +52,20 @@ GEM
     pry-remote (0.1.8)
       pry (~> 0.9)
       slop (~> 3.0)
-    rake (10.1.0)
-    rspec (2.99.0)
-      rspec-core (~> 2.99.0)
-      rspec-expectations (~> 2.99.0)
-      rspec-mocks (~> 2.99.0)
-    rspec-core (2.99.1)
-    rspec-expectations (2.99.1)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.99.1)
+    rake (12.3.3)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.3)
     safe_yaml (1.0.4)
     slop (3.4.5)
     vcr (2.5.0)
@@ -77,9 +81,9 @@ DEPENDENCIES
   mocha
   pry-remote
   rake
-  rspec (~> 2.99)
+  rspec
   vcr (~> 2.5)
   webmock
 
 BUNDLED WITH
-   1.16.6
+   1.17.3

data/Jenkinsfile

@@ -9,17 +9,6 @@ pipeline {
   stages {
     stage("Run tests") {
       parallel {
-        stage("Ruby 1.9.3") {
-          agent {
-            docker {
-              image 'ruby:1.9.3'
-            }
-          }
-          steps {
-            sh 'BUNDLE_APP_CONFIG=/tmp/bundle.config BUNDLE_DISABLE_SHARED_GEMS=true bundle install --deployment'
-            sh 'BUNDLE_APP_CONFIG=/tmp/bundle.config bundle exec rake test'
-          }
-        }
         stage("Ruby 2.0") {
           agent {
             docker {
@@ -28,7 +17,7 @@ pipeline {
           }
           steps {
             sh 'bundle install --deployment'
-            sh 'bundle exec rake test'
+            sh 'bundle exec rake spec'
           }
         }
         stage("Ruby 2.1") {
@@ -39,7 +28,7 @@ pipeline {
           }
           steps {
             sh 'bundle install --deployment'
-            sh 'bundle exec rake test'
+            sh 'bundle exec rake spec'
           }
         }
         stage("Ruby 2.2") {
@@ -50,7 +39,7 @@ pipeline {
           }
           steps {
             sh 'bundle install --deployment'
-            sh 'bundle exec rake test'
+            sh 'bundle exec rake spec'
           }
         }
         stage("Ruby 2.3") {
@@ -61,7 +50,7 @@ pipeline {
           }
           steps {
             sh 'bundle install --deployment'
-            sh 'bundle exec rake test'
+            sh 'bundle exec rake spec'
           }
         }
         stage("Ruby 2.4") {
@@ -72,7 +61,7 @@ pipeline {
           }
           steps {
             sh 'bundle install --deployment'
-            sh 'bundle exec rake test'
+            sh 'bundle exec rake spec'
           }
         }
         stage("Ruby 2.5") {
@@ -83,7 +72,7 @@ pipeline {
           }
           steps {
             sh 'bundle install --deployment'
-            sh 'bundle exec rake test'
+            sh 'bundle exec rake spec'
           }
         }
         stage("Ruby 2.6") {
@@ -94,7 +83,7 @@ pipeline {
           }
           steps {
             sh 'bundle install --deployment'
-            sh 'bundle exec rake test'
+            sh 'bundle exec rake spec'
           }
         }
       }

data/Rakefile

@@ -1,16 +1,6 @@
-require "bundler"
 require "rspec/core/rake_task"
 
-bbcloud_path = File.expand_path("./lib", File.dirname(__FILE__))
-$LOAD_PATH.unshift(bbcloud_path)
-
-task :default => [:test]
-
 Bundler::GemHelper.install_tasks
+RSpec::Core::RakeTask.new(:spec)
 
-RSpec::Core::RakeTask.new
-
-desc "Runs all tests (rspec and cucumber)"
-task :test do
-  Rake::Task["spec"].invoke
-end
+task :default => :spec

data/brightbox-cli.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.description = %q(Scripts to interact with the Brightbox cloud API)
   s.license     = "MIT"
 
-  s.required_ruby_version = ">= 1.9.3"
+  s.required_ruby_version = ">= 2.0"
 
   s.rubyforge_project = "brightbox-cli"
 
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "fog-brightbox", ">= 0.16.0", "< 1.0"
+  s.add_dependency "fog-brightbox", ">= 1.3.0"
   s.add_dependency "fog-core", "< 2.0"
   s.add_dependency "gli", "~> 2.12.0"
   s.add_dependency "i18n", "~> 0.6.0"
@@ -36,7 +36,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "mocha"
   s.add_development_dependency "pry-remote"
   s.add_development_dependency "rake"
-  s.add_development_dependency "rspec", "~> 2.99"
+  s.add_development_dependency "rspec"
   s.add_development_dependency "vcr", "~> 2.5"
   s.add_development_dependency "webmock"
 

data/lib/brightbox-cli/api.rb

@@ -16,7 +16,7 @@ module Brightbox
     # Returns the current connection to the Brightbox API, creating a new
     # {ConnectionManager} and connection if necessary.
     #
-    # @return [Fog::Compute::Brightbox::Real]
+    # @return [Fog::Brightbox::Compute::Real]
     #
     def self.conn
       if @@connection_manager

data/lib/brightbox-cli/cloud_ips.rb

@@ -75,7 +75,7 @@ module Brightbox
         params[:reverse_dns] = ""
       end
 
-      if options[:n] && !options[:name].empty?
+      if options[:n] && !options[:n].nil?
         params[:name] = options[:n]
       end
 

data/lib/brightbox-cli/collaboration.rb

@@ -9,7 +9,7 @@ module Brightbox
     def self.invite(email, role)
       options = { :email => email, :role => role }
       data = conn.create_collaboration(options)
-      model = Fog::Compute::Brightbox::Collaboration.new(data)
+      model = Fog::Brightbox::Compute::Collaboration.new(data)
       new(model)
     end
 

data/lib/brightbox-cli/commands/firewall/policies-update.rb

@@ -36,7 +36,7 @@ module Brightbox
         # with a request, before updating the model
         data = FirewallPolicy.conn.update_firewall_policy(policy_id, params)
 
-        model = Fog::Compute::Brightbox::FirewallPolicy.new(data)
+        model = Fog::Brightbox::Compute::FirewallPolicy.new(data)
         policy = FirewallPolicy.new(model)
 
         render_table([policy], global_options)

data/lib/brightbox-cli/commands/lbs/create.rb

@@ -52,6 +52,10 @@ module Brightbox
       c.desc "Filepath to the private key used to sign SSL certificate (OpenSSL supported formats)."
       c.flag ["ssl-key"]
 
+      c.desc "Sets the minimum version of TLS/SSL to support in the format 'TLSv1.x'"
+      c.default_value "TLSv1.2"
+      c.flag ["ssl-min-ver"]
+
       c.desc "Enable SSL v3 support"
       c.switch ["sslv3"]
 
@@ -118,6 +122,7 @@ module Brightbox
                                  :listeners => listeners,
                                  :certificate_pem => ssl_cert,
                                  :certificate_private_key => ssl_key,
+                                 :ssl_minimum_version => options["ssl-min-ver"],
                                  :sslv3 => options["sslv3"],
                                  :nodes => nodes)
         render_table([lb], global_options)

data/lib/brightbox-cli/commands/lbs/show.rb

@@ -18,6 +18,7 @@ module Brightbox
             :created_at,
             :deleted_at,
             :policy,
+            :ssl_minimum_version,
             :ssl_issuer,
             :ssl_subject,
             :ssl_valid_from,

data/lib/brightbox-cli/commands/lbs/update.rb

@@ -45,6 +45,9 @@ module Brightbox
       c.desc "Filepath to the private key used to sign SSL certificate (OpenSSL supported formats)."
       c.flag ["ssl-key"]
 
+      c.desc "Sets the minimum version of TLS/SSL to support in the format 'TLSv1.x'"
+      c.flag ["ssl-min-ver"]
+
       c.desc "Clears SSL details from the load balancer."
       c.switch ["remove-ssl"], :negatable => false
 
@@ -128,6 +131,10 @@ module Brightbox
           lbopts[:certificate_private_key] = ""
         end
 
+        if options["ssl-min-ver"]
+          lbopts[:ssl_minimum_version] = options["ssl-min-ver"] unless options["ssl-min-ver"].nil?
+        end
+
         lbopts.nilify_blanks
 
         lb = LoadBalancer.find lb_id

data/lib/brightbox-cli/commands/servers/create.rb

@@ -29,6 +29,10 @@ module Brightbox
       c.default_value true
       c.switch [:e, :base64], :negatable => true
 
+      c.desc "Enable encryption at rest for disk"
+      c.default_value false
+      c.switch ["disk-encrypted"], :negatable => false
+
       c.desc "Server groups to place server in - comma delimited list"
       c.flag [:g, "server-groups"]
 
@@ -116,6 +120,7 @@ module Brightbox
         }
 
         params[:cloud_ip] = options[:"cloud-ip"] if options.key?(:"cloud-ip")
+        params[:disk_encrypted] = options[:"disk-encrypted"] if options.key?(:"disk-encrypted")
 
         servers = Server.create_servers options[:i], params
         render_table(servers, global_options)

data/lib/brightbox-cli/commands/token.rb

@@ -10,10 +10,25 @@ module Brightbox
       c.default_value "text"
       c.flag [:format]
 
-      c.action do |global_options, options, args|
+      c.action do |_, options, _|
+        token = Token.show(Brightbox.config, options)
+        $stdout.puts token.format(options[:format] || "text")
+      end
+    end
+
+    cmd.desc "Create new OAuth2 Bearer token"
+    cmd.command [:create] do |c|
+      c.desc "Either 'text', 'token', 'json' or 'curl'"
+      c.arg_name "format"
+      c.default_value "text"
+      c.flag [:format]
+
+      c.action do |_, options, _|
+        config.reauthenticate
         token = Token.show(Brightbox.config, options)
         $stdout.puts token.format(options[:format])
       end
     end
+
   end
 end

data/lib/brightbox-cli/detailed_server.rb

@@ -49,6 +49,7 @@ module Brightbox
         :ram,
         :cores,
         :disk,
+        :disk_encrypted,
         :compatibility_mode,
         :image,
         :image_name,

data/lib/brightbox-cli/load_balancers.rb

@@ -12,6 +12,7 @@ module Brightbox
     def to_row
       attributes.merge(
         :locked => locked?,
+        :ssl_minimum_version => ssl_minimum_version,
         :ssl_issuer => certificate_issuer,
         :ssl_subject => certificate_subject,
         :ssl_valid_from => certificate_valid_from,

data/lib/brightbox-cli/version.rb

@@ -1,3 +1,3 @@
 module Brightbox
-  VERSION = "2.11.2" unless defined?(Brightbox::VERSION)
+  VERSION = "3.2.0" unless defined?(Brightbox::VERSION)
 end

data/spec/commands/cloudips/update_spec.rb

@@ -7,6 +7,13 @@ describe "brightbox cloudips" do
     let(:stdout) { output.stdout }
     let(:stderr) { output.stderr }
 
+    before do
+      config_from_contents(USER_APP_CONFIG_CONTENTS)
+
+      stub_request(:post, "http://api.brightbox.dev/token").
+        to_return(status: 200, body: JSON.dump(access_token: "ACCESS-TOKEN", refresh_token: "REFRESH-TOKEN"))
+    end
+
     context "" do
       let(:argv) { %w(cloudips update) }
 
@@ -14,5 +21,63 @@ describe "brightbox cloudips" do
         expect { output }.to_not raise_error
       end
     end
+
+    context "when name is updated" do
+      let(:argv) { ["cloudips", "update", "--name=#{new_name}", "cip-12345"] }
+
+      let(:json_response) do
+        <<-EOS
+        {
+          "id":"cip-12345",
+          "name":"#{new_name}"
+        }
+        EOS
+      end
+
+      context "--name 'New name'" do
+        let(:new_name) { "New name" }
+        let(:expected_args) { ["cip-12345", { :name => new_name }] }
+
+        before do
+          stub_request(:put, "http://api.brightbox.dev/1.0/cloud_ips/cip-12345?account_id=acc-12345")
+            .with(:headers => { "Content-Type" => "application/json" },
+                  :body => hash_including("name" => "New name"))
+            .and_return(:status => 200, :body => json_response)
+
+          stub_request(:get, "http://api.brightbox.dev/1.0/cloud_ips/cip-12345?account_id=acc-12345")
+            .with(:headers => { "Content-Type" => "application/json" })
+            .and_return(:status => 200, :body => json_response)
+        end
+
+        it "puts new name in update" do
+          expect(Brightbox::CloudIP.conn).to receive(:update_cloud_ip).with(*expected_args).and_call_original
+          expect(stderr).to eq("")
+          expect(stdout).to include("cip-12345")
+          expect(stdout).to include("New name")
+        end
+      end
+
+      context "--name ''" do
+        let(:new_name) { "" }
+        let(:expected_args) { ["cip-12345", { :name => "" }] }
+
+        before do
+          stub_request(:put, "http://api.brightbox.dev/1.0/cloud_ips/cip-12345?account_id=acc-12345")
+            .with(:headers => { "Content-Type" => "application/json" },
+                  :body => hash_including("name" => ""))
+            .and_return(:status => 200, :body => json_response)
+
+          stub_request(:get, "http://api.brightbox.dev/1.0/cloud_ips/cip-12345?account_id=acc-12345")
+            .with(:headers => { "Content-Type" => "application/json" })
+            .and_return(:status => 200, :body => json_response)
+        end
+
+        it "puts new name in update" do
+          expect(Brightbox::CloudIP.conn).to receive(:update_cloud_ip).with(*expected_args).and_call_original
+          expect(stderr).to eq("")
+          expect(stdout).to include("cip-12345")
+        end
+      end
+    end
   end
 end

data/spec/commands/lbs/create_spec.rb

@@ -7,6 +7,11 @@ describe "brightbox lbs" do
     let(:stdout) { output.stdout }
     let(:stderr) { output.stderr }
 
+    before do
+      config = config_from_contents(USER_APP_CONFIG_CONTENTS)
+      cache_access_token(config, "f83da712e6299cda953513ec07f7a754f747d727")
+    end
+
     context "" do
       let(:argv) { %w(lbs create) }
 
@@ -14,5 +19,31 @@ describe "brightbox lbs" do
         expect { output }.to_not raise_error
       end
     end
+
+    context "--ssl-min-ver=TLSv1.0" do
+      let(:argv) { ["lbs", "create", "--ssl-min-ver", "TLSv1.0", "srv-12345"] }
+      let(:expected_args) { { ssl_minimum_version: "TLSv1.0" } }
+
+      let(:json_response) do
+        <<-EOS
+        {
+          "id":"lba-12345",
+          "ssl_minimum_version":"TLSv1.0"
+        }
+        EOS
+      end
+
+      before do
+        stub_request(:post, "http://api.brightbox.dev/1.0/load_balancers?account_id=acc-12345")
+          .with(:body => hash_including("ssl_minimum_version" => "TLSv1.0"))
+          .to_return(:status => 202, :body => json_response)
+      end
+
+      it "includes ssl_minimum_version in response" do
+        expect(Brightbox::LoadBalancer).to receive(:create).with(hash_including(expected_args)).and_call_original
+        expect(stderr).to eq("Creating a new load balancer\n")
+        expect(stdout).to include("lba-12345")
+      end
+    end
   end
 end

data/spec/commands/lbs/update_spec.rb

@@ -7,6 +7,11 @@ describe "brightbox lbs" do
     let(:stdout) { output.stdout }
     let(:stderr) { output.stderr }
 
+    before do
+      config = config_from_contents(USER_APP_CONFIG_CONTENTS)
+      cache_access_token(config, "f83da712e6299cda953513ec07f7a754f747d727")
+    end
+
     context "" do
       let(:argv) { %w(lbs update) }
 
@@ -14,5 +19,32 @@ describe "brightbox lbs" do
         expect { output }.to_not raise_error
       end
     end
+
+    context "--ssl-min-ver=TLSv1.0" do
+      let(:argv) { ["lbs", "update", "--ssl-min-ver", "TLSv1.0", "lba-12345"] }
+
+      let(:json_response) do
+        <<-EOS
+        {
+          "id":"lba-12345",
+          "ssl_minimum_version":"TLSv1.0"
+        }
+        EOS
+      end
+
+      before do
+        stub_request(:get, "http://api.brightbox.dev/1.0/load_balancers/lba-12345?account_id=acc-12345")
+          .to_return(:status => 200, :body => '{"id":"lba-12345"}')
+
+        stub_request(:put, "http://api.brightbox.dev/1.0/load_balancers/lba-12345?account_id=acc-12345")
+          .with(:body => hash_including("ssl_minimum_version" => "TLSv1.0"))
+          .to_return(:status => 202, :body => json_response)
+      end
+
+      it "includes ssl_minimum_version in response" do
+        expect(stderr).to eq("Updating load balancer lba-12345\n")
+        expect(stdout).to include("lba-12345")
+      end
+    end
   end
 end

data/spec/commands/servers/create_spec.rb

@@ -7,6 +7,10 @@ describe "brightbox servers" do
     let(:stdout) { output.stdout }
     let(:stderr) { output.stderr }
 
+    let(:image) { double(:id => "img-12345", :name => "Linux") }
+    let(:type) { double(:id => "typ-12345", :handle => "nano") }
+    let(:zone) { double(:handle => "gb1-a") }
+
     before do
       config = config_from_contents(USER_APP_CONFIG_CONTENTS)
       cache_access_token(config, "f83da712e6299cda953513ec07f7a754f747d727")
@@ -27,10 +31,6 @@ describe "brightbox servers" do
     context "with --cloud-ip with nominated IP argument" do
       let(:argv) { %w(servers create --cloud-ip cip-12345 img-12345) }
 
-      let(:image) { double(:id => "img-12345", :name => "Linux") }
-      let(:type) { double(:id => "typ-12345", :handle => "nano") }
-      let(:zone) { double(:handle => "gb1-a") }
-
       before do
         expect(Brightbox::Image).to receive(:find).with("img-12345").and_return(image)
         expect(Brightbox::Type).to receive(:find_by_handle).and_return(type)
@@ -50,10 +50,6 @@ describe "brightbox servers" do
     context "with --cloud-ip true argument" do
       let(:argv) { %w(servers create --cloud-ip true img-12345) }
 
-      let(:image) { double(:id => "img-12345", :name => "Linux") }
-      let(:type) { double(:id => "typ-12345", :handle => "nano") }
-      let(:zone) { double(:handle => "gb1-a") }
-
       before do
         expect(Brightbox::Image).to receive(:find).with("img-12345").and_return(image)
         expect(Brightbox::Type).to receive(:find_by_handle).and_return(type)
@@ -70,6 +66,26 @@ describe "brightbox servers" do
       end
     end
 
+    context "with --disk-encrypted switch" do
+      let(:argv) { %w(servers create --disk-encrypted img-12345) }
+
+      before do
+        expect(Brightbox::Image).to receive(:find).with("img-12345").and_return(image)
+        expect(Brightbox::Type).to receive(:find_by_handle).and_return(type)
+      end
+
+      it "requests new server with encryption at rest enabled" do
+        stub_request(:post, "http://api.brightbox.dev/1.0/servers?account_id=acc-12345")
+          .with(:headers => { "Content-Type" => "application/json" },
+                :body => hash_including(:disk_encrypted => true))
+          .and_return(:status => 202, :body => sample_response)
+
+        expect(stderr).to match("Creating a nano")
+        expect(stderr).not_to match("ERROR")
+        expect(stdout).to match("srv-12345")
+      end
+    end
+
     def sample_response
       '{
         "id": "srv-12345",

data/spec/commands/sql/instances/create_spec.rb

@@ -104,6 +104,32 @@ describe "brightbox sql instances" do
       end
     end
 
+    context "--snapshot=dbi-1493j" do
+      let(:argv) { ["sql", "instances", "create", "--snapshot=dbi-1493j"] }
+      let(:expected_args) { { :snapshot_id => "dbi-1493j" } }
+
+      let(:json_response) do
+        <<-EOS
+        {
+          "id":"dbs-12345"
+        }
+        EOS
+      end
+
+      before do
+        stub_request(:post, "http://api.brightbox.dev/1.0/database_servers?account_id=acc-12345")
+          .with(:headers => { "Content-Type" => "application/json" },
+                :body => hash_including("snapshot" => "dbi-1493j"))
+          .and_return(:status => 202, :body => json_response)
+      end
+
+      it "includes schedule fields in response" do
+        expect(Brightbox::DatabaseServer).to receive(:create).with(expected_args).and_call_original
+        expect(stdout).to include("id: dbs-12345")
+        expect(stderr).to eql("")
+      end
+    end
+
     context "--snapshots-schedule='0 12 * * 4'" do
       let(:argv) { ["sql", "instances", "create", "--snapshots-schedule=0 12 * * 4"] }
       let(:expected_args) { { :snapshots_schedule => "0 12 * * 4" } }

data/spec/support/shared/collaborating_accounts_context.rb

@@ -19,7 +19,7 @@ shared_context "collaborating accounts" do
       "load_balancers_limit" => 5,
       "load_balancers_used" => 0
     }
-    Fog::Compute::Brightbox::Account.new(data)
+    Fog::Brightbox::Compute::Account.new(data)
   end
 
   # As returned from conn.user_collaborations.all
@@ -35,7 +35,7 @@ shared_context "collaborating accounts" do
         "status" => "active"
       }
     }
-    Fog::Compute::Brightbox::UserCollaboration.new(data)
+    Fog::Brightbox::Compute::UserCollaboration.new(data)
   end
 
   # As returned from conn.user_collaborations.all
@@ -51,6 +51,6 @@ shared_context "collaborating accounts" do
         "status" => "active"
       }
     }
-    Fog::Compute::Brightbox::UserCollaboration.new(data)
+    Fog::Brightbox::Compute::UserCollaboration.new(data)
   end
 end

data/spec/unit/brightbox/account/all_spec.rb

@@ -13,7 +13,7 @@ describe Brightbox::Account do
         expect(Brightbox::Account.all).to be_kind_of(Array)
 
         Brightbox::Account.all.each do |account|
-          expect(account).to be_kind_of(Fog::Compute::Brightbox::Account)
+          expect(account).to be_kind_of(Fog::Brightbox::Compute::Account)
         end
       end
 
@@ -31,7 +31,7 @@ describe Brightbox::Account do
         expect(Brightbox::Account.all).to be_kind_of(Array)
 
         Brightbox::Account.all.each do |account|
-          expect(account).to be_kind_of(Fog::Compute::Brightbox::Account)
+          expect(account).to be_kind_of(Fog::Brightbox::Compute::Account)
         end
       end
 

data/spec/unit/brightbox/account/get_spec.rb

@@ -18,7 +18,7 @@ describe Brightbox::Account do
         end
 
         it "returns requested account" do
-          expect(@account).to be_kind_of(Fog::Compute::Brightbox::Account)
+          expect(@account).to be_kind_of(Fog::Brightbox::Compute::Account)
           expect(@account.id).to eql(@account_id)
         end
 
@@ -46,7 +46,7 @@ describe Brightbox::Account do
         end
 
         it "returns the client's owning account" do
-          expect(@account).to be_kind_of(Fog::Compute::Brightbox::Account)
+          expect(@account).to be_kind_of(Fog::Brightbox::Compute::Account)
           expect(@account.id).to eql(@account_id)
         end
 

data/spec/unit/brightbox/api/conn_spec.rb

@@ -7,7 +7,7 @@ describe Brightbox::Api, ".conn" do
 
   context "when account is not required", vcr: true do
     it "returns a 'real' fog compute instance" do
-      expect(Brightbox::Api.conn).to be_instance_of(Fog::Compute::Brightbox::Real)
+      expect(Brightbox::Api.conn).to be_instance_of(Fog::Brightbox::Compute::Real)
     end
   end
 end

data/spec/unit/brightbox/collaborating_account_spec.rb

@@ -5,7 +5,7 @@ describe Brightbox::CollaboratingAccount do
     data = {
       "id" => "acc-12345"
     }
-    account_model = Fog::Compute::Brightbox::Account.new(data)
+    account_model = Fog::Brightbox::Compute::Account.new(data)
     Brightbox::CollaboratingAccount.new(account_model)
   end
 

data/spec/unit/brightbox/connection_manager/fetch_connection_spec.rb

@@ -19,7 +19,7 @@ describe Brightbox::ConnectionManager, "#fetch_connection" do
 
   context "when not requesting a scoped connection" do
     it "returns a fog compute instance" do
-      expect(connection_manager.fetch_connection(false)).to be_kind_of(Fog::Compute::Brightbox::Real)
+      expect(connection_manager.fetch_connection(false)).to be_kind_of(Fog::Brightbox::Compute::Real)
     end
 
     it "returns a connection without account scope" do

data/spec/unit/brightbox/database_server/cloud_ips_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 require "fog/brightbox/models/compute/database_server"
 
 describe Brightbox::DatabaseServer, "#cloud_ips" do
-  let(:fog_model) { Fog::Compute::Brightbox::DatabaseServer.new(fog_settings) }
+  let(:fog_model) { Fog::Brightbox::Compute::DatabaseServer.new(fog_settings) }
   let(:dbs) { described_class.new(fog_model) }
 
   context "when attribute is missing" do

data/spec/unit/brightbox/database_server/maintenance_window_spec.rb

@@ -4,7 +4,7 @@ require "fog/brightbox/models/compute/database_server"
 describe Brightbox::DatabaseServer do
 
   describe "#maintenance_window" do
-    let(:fog_model) { Fog::Compute::Brightbox::DatabaseServer.new(fog_settings) }
+    let(:fog_model) { Fog::Brightbox::Compute::DatabaseServer.new(fog_settings) }
     let(:dbs) { Brightbox::DatabaseServer.new(fog_model) }
 
     context "when default values" do

data/spec/unit/brightbox/user_collaboration/get_for_account_spec.rb

@@ -141,7 +141,7 @@ describe Brightbox::UserCollaboration do
       # Collection#load is private in fog so we can't just pass our collection
       # into get the correct object initialised.
       api_response_data.map do |datum|
-        Fog::Compute::Brightbox::UserCollaboration.new(datum)
+        Fog::Brightbox::Compute::UserCollaboration.new(datum)
       end
     end
   end

data/spec/unit/brightbox/user_collaboration/remove_spec.rb

@@ -52,6 +52,6 @@ describe Brightbox::UserCollaboration do
         "email_address" => "marie@example.com"
       }
     }
-    Fog::Compute::Brightbox::UserCollaboration.new(api_response_data)
+    Fog::Brightbox::Compute::UserCollaboration.new(api_response_data)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brightbox-cli
 version: !ruby/object:Gem::Version
-  version: 2.11.2
+  version: 3.2.0
 platform: ruby
 authors:
 - John Leach
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: fog-core
   requirement: !ruby/object:Gem::Requirement
@@ -188,16 +182,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.99'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.99'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
@@ -247,6 +241,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".travis.yml"
 - CHANGELOG.md
@@ -763,7 +758,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="