brightbox-cli 3.0.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c5b05513e19a2b2086a60adcdcc9db34da763ea57057fe3cd4565f13d996325
-  data.tar.gz: 2330375316fccfb4681d2eafd793070821ac58e8af68d73c9b8370301a4ecd43
+  metadata.gz: 881d758fc2932375edc56797f613f757a7f83729087cf2335a44736f4554fe1d
+  data.tar.gz: cfb933331637277089d47a0feccf9456e18b45f0a248aa27f233c52f24ba2f61
 SHA512:
-  metadata.gz: a2b9f70e55d3ac5273a6179ff17bd10f5c99d75c628d67dfd671413d657717d34f00a8ecbbb1397b952b56ed34b55249e836c09417c32b69eebcb677877b941e
-  data.tar.gz: de89095e13e79781b3c04828a4e20e1150056a4e3f838fa19923f949741c332cbeb4bb4b46b38566f2a7dc2b6e76b893cd658963b5194b33f7a79674cf650314
+  metadata.gz: a7b28703cc70a953b900f0caabaf036ff78c1e914810fcba9523b7f8b44ae5c7d148ee09f08d073d71449b587024f7d64ead1f88a659c3a2d2a52c502134d23a
+  data.tar.gz: ea62fcbe6b909e8b7cb8744da7acacd50c75bcb0c109fada221ef135ff1c1ac0d88dc01d8975ef3a8068c75e86956ce244ab88abc641e2dc3d79ed474502e59d

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.1", "2.2", "2.3", "2.4", "2.5", "2.6", "2.7", "3.0"]
+
+    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/CHANGELOG.md

@@ -1,3 +1,53 @@
+### v3.3.0 / 2021-09-17
+
+[Full Changelog](https://github.com/brightbox/brightbox-cli/compare/v3.2.0...v3.3.0)
+
+Changes:
+
+* Update `fog-brightbox` to v1.4.0` (allowing Ruby 3.0 support)
+* Added support for getting 2FA from helper
+* Added missing `sql snapshot` fields
+* Infrastructure changes to test on more versions of Ruby
+* Added GitHub actions support for CI testing.
+* Removed Travis CI support.
+
+Bug fixes:
+
+* Updates `crack` gem to switch from `safe_yaml` to `rexml`
+* Bump addressable from 2.3.8 to 2.8.0. (fixing ReDoS vulnerability)
+* Bump rexml from 3.2.4 to 3.2.5 (fixing round-trip vulnerability bugs)
+
+### 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)

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    brightbox-cli (3.0.0)
+    brightbox-cli (3.3.0)
       dry-inflector (< 0.2)
-      fog-brightbox (>= 1.1.0)
+      fog-brightbox (>= 1.3.0)
       fog-core (< 2.0)
       gli (~> 2.12.0)
       highline (~> 1.6.0)
@@ -15,15 +15,16 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.8)
+    addressable (2.8.0)
+      public_suffix (>= 2.0.2, < 5.0)
     builder (3.2.4)
     coderay (1.0.9)
-    crack (0.4.2)
-      safe_yaml (~> 1.0.0)
+    crack (0.4.5)
+      rexml
     diff-lcs (1.4.3)
     dry-inflector (0.1.2)
-    excon (0.75.0)
-    fog-brightbox (1.1.0)
+    excon (0.79.0)
+    fog-brightbox (1.4.0)
       dry-inflector
       fog-core (>= 1.45, < 3.0)
       fog-json
@@ -52,7 +53,9 @@ GEM
     pry-remote (0.1.8)
       pry (~> 0.9)
       slop (~> 3.0)
+    public_suffix (2.0.5)
     rake (12.3.3)
+    rexml (3.2.5)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -66,7 +69,6 @@ GEM
       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)
     webmock (1.21.0)

data/Jenkinsfile

@@ -17,7 +17,7 @@ pipeline {
           }
           steps {
             sh 'bundle install --deployment'
-            sh 'bundle exec rake test'
+            sh 'bundle exec rake spec'
           }
         }
         stage("Ruby 2.1") {
@@ -28,7 +28,7 @@ pipeline {
           }
           steps {
             sh 'bundle install --deployment'
-            sh 'bundle exec rake test'
+            sh 'bundle exec rake spec'
           }
         }
         stage("Ruby 2.2") {
@@ -39,7 +39,7 @@ pipeline {
           }
           steps {
             sh 'bundle install --deployment'
-            sh 'bundle exec rake test'
+            sh 'bundle exec rake spec'
           }
         }
         stage("Ruby 2.3") {
@@ -50,7 +50,7 @@ pipeline {
           }
           steps {
             sh 'bundle install --deployment'
-            sh 'bundle exec rake test'
+            sh 'bundle exec rake spec'
           }
         }
         stage("Ruby 2.4") {
@@ -61,7 +61,7 @@ pipeline {
           }
           steps {
             sh 'bundle install --deployment'
-            sh 'bundle exec rake test'
+            sh 'bundle exec rake spec'
           }
         }
         stage("Ruby 2.5") {
@@ -72,7 +72,7 @@ pipeline {
           }
           steps {
             sh 'bundle install --deployment'
-            sh 'bundle exec rake test'
+            sh 'bundle exec rake spec'
           }
         }
         stage("Ruby 2.6") {
@@ -83,7 +83,7 @@ pipeline {
           }
           steps {
             sh 'bundle install --deployment'
-            sh 'bundle exec rake test'
+            sh 'bundle exec rake spec'
           }
         }
       }

data/README

@@ -9,17 +9,6 @@ You can sign up at https://manage.brightbox.com
 
 {<img src="https://travis-ci.org/brightbox/brightbox-cli.png?branch=master" alt="Build Status" />}[https://travis-ci.org/brightbox/brightbox-cli]
 
-== UPGRADE NOTES
-
-Version 1.0.0 adds a new top level `brightbox` command for the suite.
-
-This may clash with our `brightbox` (brightbox-deployment) gem which, before
-version 2.4.0, used `brightbox` as the name for it's binary. Please ensure you
-update your `brightbox` gem to avoid using the wrong command.
-
-We have included backwards compatible binaries for all the older CLI commands
-(brightbox-accounts, brightbox-servers etc...) but recommend getting used to the
-new form.
 
 == Installation instructions
 
@@ -36,7 +25,11 @@ For a list of available commands use:
 
    $ brightbox help
 
-To add client (account based) credentials use:
+To login with your user credentials use:
+
+   $ brightbox login john@example.com
+
+To instead add api client (account-specific) credentials use:
 
    $ brightbox config client_add cli-2igtb theclientsecret
    Using config file /home/ubuntu/.brightbox/config
@@ -49,7 +42,14 @@ To browse available resources use the resource name as the command:
    $ brightbox images
    ... List of images
 
-Command structure may be subject to change.
+=== Two factor authentication ===
+
+If you've enabled two factor authentication for your user, you can enable it in
+your config and the CLI will prompt for a two factor pin when needed:
+
+    [john@example.com]
+    username = john@example.com
+    two_factor = true
 
 === Integrating with a password manager
 
@@ -64,6 +64,13 @@ appropriate section:
     username = john@example.com
     password_helper_command = pass john-example-com-brightbox
 
+You can also specify a separate helper command to retrive two factor pins:
+
+    [john@example.com]
+    username = john@example.com
+    password_helper_command = pass john-example-com-brightbox
+    two_factor_helper_command = get-two-factor-pin john-example-com-brightbox
+
 === Using GPG to secure passwords
 
 If you use an OAuth application to access your accounts
@@ -108,6 +115,20 @@ incorrectly or there may be an issue with your GPG configuration.
 
 To remove the password delete the `~/.brightbox/main.password.gpg` file.
 
+=== Integrating with a password manager
+
+You can retrieve your passwords from an external password manager by specifying
+a password helper command. This command will be executed any time your password
+is required and its output used as your password.
+
+Configure the command in your config file (usually ~/.brightbox/config) in the
+appropriate section:
+
+    [john@example.com]
+    username = john@example.com
+    password_helper_command = pass john-example-com-brightbox
+
+
 == Usage guides
 
 * http://docs.brightbox.com/reference/cli
@@ -130,6 +151,18 @@ in the path, just specify the full path to it:
 
     complete -C /full/path/to/bin/_brightbox-bash-completer -o filenames brightbox
 
+== UPGRADE NOTES
+
+Version 1.0.0 adds a new top level `brightbox` command for the suite.
+
+This may clash with our `brightbox` (brightbox-deployment) gem which, before
+version 2.4.0, used `brightbox` as the name for it's binary. Please ensure you
+update your `brightbox` gem to avoid using the wrong command.
+
+We have included backwards compatible binaries for all the older CLI commands
+(brightbox-accounts, brightbox-servers etc...) but recommend getting used to the
+new form.
+
 == Testing
 
 You should be able to run the specs and features with the following steps:

data/brightbox-cli.gemspec

@@ -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", ">= 1.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"

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/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/sql/snapshots_show.rb

@@ -21,8 +21,13 @@ module Brightbox
               :name,
               :description,
               :status,
+              :database_engine,
+              :database_version,
               :locked,
-              :created_on
+              :created_on,
+              :created_at,
+              :size,
+              :source
             ]
           )
           render_table(servers, table_opts)

data/lib/brightbox-cli/config/two_factor_auth.rb

@@ -17,7 +17,10 @@ module Brightbox
       end
 
       def two_factor_pin
-        @two_factor_pin ||= prompt_for_two_factor_pin if two_factor_enabled
+        if two_factor_enabled
+          @two_factor_pin ||= Brightbox.config.two_factor_helper_password
+          @two_factor_pin ||= prompt_for_two_factor_pin
+        end
       end
 
       def prompt_for_two_factor_pin

data/lib/brightbox-cli/config/two_factor_helper.rb

@@ -0,0 +1,38 @@
+module Brightbox
+  module Config
+    module TwoFactorHelper
+      attr_accessor :two_factor_helper_password
+
+      def two_factor_helper_command
+        return config[client_name]["two_factor_helper_command"] unless client_name.nil?
+      end
+
+      # Return the two_factor code from the helper if it's possible
+      def two_factor_helper_password
+        if defined?(@two_factor_helper_password) && !@two_factor_helper_password.nil?
+          return @two_factor_helper_password
+        end
+
+        if two_factor_helper_command
+          @two_factor_helper_password = two_factor_helper_call
+        else
+          @two_factor_helper_password = nil
+        end
+      end
+
+      private
+
+      def two_factor_helper_call
+        info "INFO: Calling two factor helper to obtain two factor"
+        begin
+          cmd = two_factor_helper_command.split(/\s+/)
+          IO.popen(cmd, "r") do |io|
+            io.readline.chomp
+          end
+        rescue Errno::ENOENT
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/brightbox-cli/config.rb

@@ -15,6 +15,7 @@ module Brightbox
     include Brightbox::Config::GpgEncryptedPasswords
     include Brightbox::Config::PasswordHelper
     include Brightbox::Config::TwoFactorAuth
+    include Brightbox::Config::TwoFactorHelper
     include Brightbox::Config::AuthenticationTokens
     include Brightbox::Config::Accounts
     include Brightbox::Config::Clients

data/lib/brightbox-cli/database_snapshot.rb

@@ -23,7 +23,7 @@ module Brightbox
     end
 
     def self.default_field_order
-      [:id, :status, :created_on, :name]
+      [:id, :status, :created_on, :size, :name]
     end
 
     def to_row

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 = "3.0.0" unless defined?(Brightbox::VERSION)
+  VERSION = "3.3.0" unless defined?(Brightbox::VERSION)
 end

data/lib/brightbox_cli.rb

@@ -73,6 +73,7 @@ require_relative "brightbox-cli/config/cache"
 require_relative "brightbox-cli/config/gpg_encrypted_passwords"
 require_relative "brightbox-cli/config/password_helper"
 require_relative "brightbox-cli/config/two_factor_auth"
+require_relative "brightbox-cli/config/two_factor_helper"
 require_relative "brightbox-cli/config/authentication_tokens"
 require_relative "brightbox-cli/config/accounts"
 require_relative "brightbox-cli/config/clients"

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" } }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brightbox-cli
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.3.0
 platform: ruby
 authors:
 - John Leach
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: fog-core
   requirement: !ruby/object:Gem::Requirement
@@ -241,8 +241,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -372,6 +372,7 @@ files:
 - lib/brightbox-cli/config/sections.rb
 - lib/brightbox-cli/config/to_fog.rb
 - lib/brightbox-cli/config/two_factor_auth.rb
+- lib/brightbox-cli/config/two_factor_helper.rb
 - lib/brightbox-cli/config/user_application.rb
 - lib/brightbox-cli/connection_manager.rb
 - lib/brightbox-cli/database_server.rb

data/.travis.yml

@@ -1,10 +0,0 @@
-language: ruby
-sudo: false
-
-rvm:
-  - 2.0
-  - 2.1
-  - 2.2
-  - 2.3
-  - 2.4
-  - 2.6