brightbox-cli 4.3.0 → 4.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 517f21d7fc3e156180d8558868220e332943bd12ee492754e727d3f23d03d89c
-  data.tar.gz: ba05065d1729812c1aa1b41f44767872ea863a8295f8074ae8050742c1903e68
+  metadata.gz: c813c009698fa955e24ce5399a95d658f8e0f657881071fcea65a3349d958676
+  data.tar.gz: b7d1cfd6faf802ea27599226aedf2632b7d33dff89b4a018b26bd4587cc5069a
 SHA512:
-  metadata.gz: 1218d3d1956bac00755dde84bc1546f43dc05f4ea3386420b47745039326ad01f50f016faee353474e620beba0105e059de437085334da2bb4c6545392426880
-  data.tar.gz: 8ca4763dfbc21624b85ca97ea70525da34e4a2adb19abb405b2f95b8f8df500180a7780d0d13ffc6bc9cfade8306ed904a0fbbd56e95af1ad33ab913f16c6e7a
+  metadata.gz: ccd5f260951570479dacfbd428abb919a5ab35447d2699f05ff8552ba1c2fb0d3b27dfc9a749a3b0c9b0e4522d5a21b4bf13cecf5c13560798505548a10a9e4d
+  data.tar.gz: '051800a849a0b1f62b6351866e3daa687016b4cb2b6eb62aa0dc7c057fb73896c6bc23a30dc7e0c01b5a9b5fc92c25a7a723daa0245e16cb733c4d40b10de03d'

data/CHANGELOG.md

@@ -1,3 +1,34 @@
+### v4.3.2 / 2023-01-12
+
+[Full Changelog](https://github.com/brightbox/brightbox-cli/compare/v4.3.1...v4.3.2)
+
+Bug fixes:
+
+* Declared top level help for `volumes` subcommand.
+* Fix `volumes update --delete-with-server` switch.
+* Fix `lbs update --sslv3` switch.
+* Fix `servers update --compatibility-mode` switch.
+
+Changes:
+
+* Added a `ignore_default` option to GLI DSL, by monkey patching, to prevent
+  unexpected switches from interfering with API calls. In some cases it was
+  impossible to determine if `--feature` or `--no-feature` had been used in the
+  command OR added as a default in GLI. This meant `update` commands would always
+  send `feature: false` in API requests even when updating names and other fields.
+  This could clear setting unexpectedly due to the behaviour.
+* Test `servers create --compatibility-mode` switch.
+* Test `cloudips update --delete-reverse-dns` switch.
+* Test `sql instances --remove-snapshots-schedule` switch.
+
+### v4.3.1 / 2023-01-11
+
+[Full Changelog](https://github.com/brightbox/brightbox-cli/compare/v4.3.0...v4.3.1)
+
+Bug fixes:
+
+* Fix `help` output crashing when encountering Array in locale file.
+
 ### v4.3.0 / 2023-01-11
 
 [Full Changelog](https://github.com/brightbox/brightbox-cli/compare/v4.2.1...v4.3.0)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    brightbox-cli (4.3.0)
+    brightbox-cli (4.3.2)
       dry-inflector (= 0.2.0)
       fog-brightbox (>= 1.9.1)
       fog-core (< 2.0)
@@ -25,7 +25,7 @@ GEM
       rexml
     diff-lcs (1.5.0)
     dry-inflector (0.2.0)
-    excon (0.97.0)
+    excon (0.97.1)
     fog-brightbox (1.9.1)
       dry-inflector
       fog-core (>= 1.45, < 3.0)

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

@@ -50,7 +50,7 @@ module Brightbox
       c.switch ["remove-ssl"], :negatable => false
 
       c.desc "Enable SSL v3 support"
-      c.switch ["sslv3"]
+      c.switch ["sslv3"], ignore_default: true
 
       c.action do |global_options, options, args|
         lb_id = args.shift

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

@@ -28,7 +28,6 @@ module Brightbox
       c.switch %i[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"

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

@@ -17,7 +17,7 @@ module Brightbox
       c.switch %i[e base64], :negatable => true
 
       c.desc "Use compatibility mode"
-      c.switch [:"compatibility-mode"], :negatable => true
+      c.switch [:"compatibility-mode"], ignore_default: true
 
       c.desc "Server groups to place server in - comma delimited list"
       c.flag [:g, "server-groups"]

data/lib/brightbox-cli/commands/volumes/attach.rb

@@ -1,4 +1,5 @@
 module Brightbox
+  desc I18n.t("volumes.desc")
   command [:volumes] do |cmd|
     cmd.desc I18n.t("volumes.attach.desc")
     cmd.arg_name I18n.t("volumes.attach.args")

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

@@ -8,8 +8,7 @@ module Brightbox
       c.flag %i[d description]
 
       c.desc I18n.t("volumes.options.delete_with_server")
-      c.default_value :ignore # So we can discard unless deliberately passed
-      c.switch ["delete-with-server"], negatable: true
+      c.switch [:"delete-with-server"], ignore_default: true
 
       c.desc I18n.t("options.name.desc")
       c.flag %i[n name]
@@ -28,8 +27,8 @@ module Brightbox
 
         # Switches will always appear in the options so we need a non-boolean
         # setting to determine if the user did not add it to their command
-        unless options["delete-with-server"] == :ignore
-          params[:delete_with_server] = options["delete-with-server"]
+        unless options[:"delete-with-server"].nil?
+          params[:delete_with_server] = options[:"delete-with-server"]
         end
 
         params[:description] = options[:description] if options[:description]

data/lib/brightbox-cli/version.rb

@@ -1,3 +1,3 @@
 module Brightbox
-  VERSION = "4.3.0".freeze unless defined?(Brightbox::VERSION)
+  VERSION = "4.3.2".freeze unless defined?(Brightbox::VERSION)
 end

data/lib/brightbox_cli.rb

@@ -23,6 +23,7 @@ end
 require "multi_json"
 require "date"
 require "gli"
+require "gli_patches"
 require "i18n"
 require "fog/brightbox"
 

data/lib/gli_patches.rb

@@ -0,0 +1,50 @@
+require "gli/dsl"
+require "gli/command_line_option"
+require "gli/option_parser_factory"
+
+module GLI
+  module DSL
+    def extract_options(names)
+      options = {}
+      options = names.pop if names.last.kind_of? Hash
+      options = {
+        :desc => @next_desc,
+        :long_desc => @next_long_desc,
+        :default_value => @next_default_value,
+        :ignore_default => @ignore_default,
+        :arg_name => @next_arg_name
+      }.merge(options)
+    end
+  end
+
+  class CommandLineOption
+    def initialize(names, options = {})
+      # Disable returning a default for this option (needed for boolean updates)
+      # which should NOT be sent unless added by the user
+      @ignore_default = !!options[:ignore_default]
+
+      super(names, options[:desc], options[:long_desc])
+      @default_value = options[:default_value]
+    end
+
+    def ignore_default?
+      @ignore_default
+    end
+  end
+
+  class OptionParserFactory
+    private
+
+    def set_defaults(options_by_name,options_hash)
+      options_by_name.values.each do |option|
+        option.names_and_aliases.each do |option_name|
+          [option_name,option_name.to_sym].each do |name|
+            next if option.ignore_default?
+
+            options_hash[name] = option.default_value if options_hash[name].nil?
+          end
+        end
+      end
+    end
+  end
+end

data/locales/en.yml

@@ -249,7 +249,7 @@ en:
     desc: Manage an account's volumes
     args:
       one: <volume>
-      optional: [<volume>...]
+      optional: "[<volume>...]"
       many: <volume>...
       specify_one_id_first: You must specify the volume ID as the first argument
       specify_many_ids: You must specify volume IDs as arguments

data/spec/commands/cloudips/update_spec.rb

@@ -1,82 +1,162 @@
 require "spec_helper"
 
-describe "brightbox cloudips" do
-  describe "update" do
-    let(:output) { FauxIO.new { Brightbox.run(argv) } }
-    let(:stdout) { output.stdout }
-    let(:stderr) { output.stderr }
+describe "brightbox cloudips update" do
+  let(:output) { FauxIO.new { Brightbox.run(argv) } }
+  let(:stdout) { output.stdout }
+  let(:stderr) { output.stderr }
 
-    before do
-      config_from_contents(USER_APP_CONFIG_CONTENTS)
+  before do
+    config_from_contents(API_CLIENT_CONFIG_CONTENTS)
+
+    stub_request(:post, "http://api.brightbox.localhost/token")
+      .to_return(
+        status: 200,
+        body: JSON.dump(
+          access_token: "ACCESS-TOKEN",
+          refresh_token: "REFRESH_TOKEN"
+        )
+      )
+
+    Brightbox.config.reauthenticate
+  end
+
+  context "" do
+    let(:argv) { %w[cloudips update] }
 
-      stub_request(:post, "http://api.brightbox.localhost/token")
-        .to_return(status: 200, body: JSON.dump(access_token: "ACCESS-TOKEN", refresh_token: "REFRESH-TOKEN"))
+    it "does not error" do
+      expect { output }.to_not raise_error
     end
+  end
 
-    context "" do
-      let(:argv) { %w[cloudips update] }
+  context "when name is updated" do
+    let(:argv) { ["cloudips", "update", "--name=#{new_name}", "cip-12345"] }
 
-      it "does not error" do
-        expect { output }.to_not raise_error
-      end
+    let(:json_response) do
+      <<-EOS
+      {
+        "id":"cip-12345",
+        "name":"#{new_name}"
+      }
+      EOS
     end
 
-    context "when name is updated" do
-      let(:argv) { ["cloudips", "update", "--name=#{new_name}", "cip-12345"] }
+    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.localhost/1.0/cloud_ips/cip-12345?account_id=acc-12345")
+          .with(:headers => { "Content-Type" => "application/json" },
+                :body => {
+                  name: "New name"
+                })
+          .and_return(:status => 200, :body => json_response)
 
-      let(:json_response) do
-        <<-EOS
-        {
-          "id":"cip-12345",
-          "name":"#{new_name}"
-        }
-        EOS
+        stub_request(:get, "http://api.brightbox.localhost/1.0/cloud_ips/cip-12345?account_id=acc-12345")
+          .with(:headers => { "Content-Type" => "application/json" })
+          .and_return(:status => 200, :body => json_response)
       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.localhost/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.localhost/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
+      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 => "" }] }
 
-      context "--name ''" do
-        let(:new_name) { "" }
-        let(:expected_args) { ["cip-12345", { :name => "" }] }
-
-        before do
-          stub_request(:put, "http://api.brightbox.localhost/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.localhost/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
+      before do
+        stub_request(:put, "http://api.brightbox.localhost/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.localhost/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
+
+  context "--reverse-dns" do
+    let(:argv) { ["cloudips", "update", "--reverse-dns", "domain.example", "cip-dfsa3"] }
+
+    let(:json_response) do
+      <<-EOS
+      {
+        "id":"cip-dfsa3",
+        "reverse_dns":"domain.example"
+      }
+      EOS
+    end
+
+    before do
+      stub_request(:put, "http://api.brightbox.localhost/1.0/cloud_ips/cip-dfsa3?account_id=acc-12345")
+        .with(:headers => { "Content-Type" => "application/json" },
+              :body => {
+                reverse_dns: "domain.example"
+              })
+        .and_return(:status => 200, :body => json_response)
+
+      stub_request(:get, "http://api.brightbox.localhost/1.0/cloud_ips/cip-dfsa3?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(stderr).to eq("")
+      expect(stdout).to include("cip-dfsa3")
+      expect(stdout).to include("domain.example")
+    end
+  end
+
+  context "--delete-reverse-dns" do
+    let(:argv) { ["cloudips", "update", "--delete-reverse-dns", "cip-dfsa3"] }
+
+    let(:json_response) do
+      <<-EOS
+      {
+        "id":"cip-dfsa3",
+        "reverse_dns":""
+      }
+      EOS
+    end
+
+    before do
+      stub_request(:put, "http://api.brightbox.localhost/1.0/cloud_ips/cip-dfsa3?account_id=acc-12345")
+        .with(:headers => { "Content-Type" => "application/json" },
+              :body => {
+                reverse_dns: ""
+              })
+        .and_return(:status => 200, :body => json_response)
+
+      stub_request(:get, "http://api.brightbox.localhost/1.0/cloud_ips/cip-dfsa3?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(stderr).to eq("")
+      expect(stdout).to include("cip-dfsa3")
+    end
+  end
+
+  context "--reverse-dns and --delete-reverse-dns options" do
+    let(:argv) { ["cloudips", "update", "--reverse-dns", "domain.example", "--delete-reverse-dns", "cip-dfsa3"] }
+
+    it "puts new name in update" do
+      expect(stderr).to eq("ERROR: You must either specify a reverse DNS record or --delete-reverse-dns\n")
+      expect(stdout).to eq("")
+    end
+  end
 end

data/spec/commands/lbs/update_spec.rb

@@ -36,7 +36,7 @@ describe "brightbox lbs" do
           .to_return(:status => 200, :body => '{"id":"lba-12345"}')
 
         stub_request(:put, "http://api.brightbox.localhost/1.0/load_balancers/lba-12345?account_id=acc-12345")
-          .with(:body => hash_including("ssl_minimum_version" => "TLSv1.0"))
+          .with(:body => { ssl_minimum_version: "TLSv1.0" })
           .to_return(:status => 202, :body => json_response)
       end
 
@@ -45,5 +45,59 @@ describe "brightbox lbs" do
         expect(stdout).to include("lba-12345")
       end
     end
+
+    context "--sslv3" do
+      let(:argv) { ["lbs", "update", "--sslv3", "lba-grt24"] }
+
+      let(:json_response) do
+        <<-EOS
+        {
+          "id":"lba-grt24",
+          "ssl_minimum_version":"TLSv1.0"
+        }
+        EOS
+      end
+
+      before do
+        stub_request(:get, "http://api.brightbox.localhost/1.0/load_balancers/lba-grt24?account_id=acc-12345")
+          .to_return(:status => 200, :body => '{"id":"lba-grt24"}')
+
+        stub_request(:put, "http://api.brightbox.localhost/1.0/load_balancers/lba-grt24?account_id=acc-12345")
+          .with(:body => { sslv3: true })
+          .to_return(:status => 202, :body => json_response)
+      end
+
+      it "includes ssl_minimum_version in response" do
+        expect(stderr).to eq("Updating load balancer lba-grt24\n")
+        expect(stdout).to include("lba-grt24")
+      end
+    end
+
+    context "--no-sslv3" do
+      let(:argv) { ["lbs", "update", "--no-sslv3", "lba-kl432"] }
+
+      let(:json_response) do
+        <<-EOS
+        {
+          "id":"lba-kl432",
+          "ssl_minimum_version":"TLSv1.0"
+        }
+        EOS
+      end
+
+      before do
+        stub_request(:get, "http://api.brightbox.localhost/1.0/load_balancers/lba-kl432?account_id=acc-12345")
+          .to_return(:status => 200, :body => '{"id":"lba-kl432"}')
+
+        stub_request(:put, "http://api.brightbox.localhost/1.0/load_balancers/lba-kl432?account_id=acc-12345")
+          .with(:body => { sslv3: false })
+          .to_return(:status => 202, :body => json_response)
+      end
+
+      it "includes ssl_minimum_version in response" do
+        expect(stderr).to eq("Updating load balancer lba-kl432\n")
+        expect(stdout).to include("lba-kl432")
+      end
+    end
   end
 end

data/spec/commands/servers/create_spec.rb

@@ -38,7 +38,10 @@ describe "brightbox servers" do
 
       it "does not error" do
         stub_request(:post, "http://api.brightbox.localhost/1.0/servers?account_id=acc-12345")
-          .with(:body => hash_including(image: "img-12345"))
+          .with(:body => {
+            image: "img-12345",
+            server_type: "typ-12345"
+          })
           .and_return(:status => 202, :body => sample_response)
 
         expect(stderr).not_to match("ERROR")
@@ -94,8 +97,12 @@ describe "brightbox servers" do
 
       it "requests new server with encryption at rest enabled" do
         stub_request(:post, "http://api.brightbox.localhost/1.0/servers?account_id=acc-12345")
-          .with(:headers => { "Content-Type" => "application/json" },
-                :body => hash_including(:disk_encrypted => true))
+          .with(headers: { "Content-Type" => "application/json" },
+                body: {
+                  disk_encrypted: true,
+                  image: "img-12345",
+                  server_type: "typ-12345"
+                })
           .and_return(:status => 202, :body => sample_response)
 
         expect(stderr).to match("Creating a nano")

data/spec/commands/servers/update_spec.rb

@@ -1,17 +1,272 @@
 require "spec_helper"
 
-describe "brightbox servers" do
-  describe "update" do
-    let(:output) { FauxIO.new { Brightbox.run(argv) } }
-    let(:stdout) { output.stdout }
-    let(:stderr) { output.stderr }
-
-    context "" do
-      let(:argv) { %w[servers update] }
-
-      it "does not error" do
-        expect { output }.to_not raise_error
-      end
+describe "brightbox servers update" do
+  let(:output) { FauxIO.new { Brightbox.run(argv) } }
+  let(:stdout) { output.stdout }
+  let(:stderr) { output.stderr }
+
+  before do
+    config_from_contents(API_CLIENT_CONFIG_CONTENTS)
+
+    stub_request(:post, "http://api.brightbox.localhost/token")
+      .to_return(
+        status: 200,
+        body: JSON.dump(
+          access_token: "ACCESS-TOKEN",
+          refresh_token: "REFRESH_TOKEN"
+        )
+      )
+
+    Brightbox.config.reauthenticate
+  end
+
+  context "without arguments" do
+    let(:argv) { %w[servers update] }
+
+    it "does not error" do
+      expect { output }.to_not raise_error
+
+      expect(stderr).to eq("ERROR: You must specify a valid server id as the first argument\n")
+
+      expect(stdout).to match("")
+    end
+  end
+
+  context "without options" do
+    let(:argv) { %w[servers update srv-klfkd] }
+
+    before do
+      stub_request(:get, "http://api.brightbox.localhost/1.0/servers/srv-klfkd?account_id=acc-12345")
+        .to_return(:status => 200, :body => {
+          id: "srv-klfkd",
+          server_type: {
+           id: "typ-12345"
+          },
+          cloud_ips: [],
+          interfaces: []
+        }.to_json)
+
+      stub_request(:get, "http://api.brightbox.localhost/1.0/images?account_id=acc-12345")
+        .to_return(:status => 200, :body => [{id: "img-12345" }].to_json)
+
+      stub_request(:put, "http://api.brightbox.localhost/1.0/servers/srv-klfkd?account_id=acc-12345")
+        .with(:body => {
+          compatibility_mode: false
+        })
+        .to_return(:status => 200, :body => {
+           id: "srv-klfkd",
+           server_type: {
+            id: "typ-12345"
+           },
+           cloud_ips: [],
+           interfaces: []
+        }.to_json)
+    end
+
+    it "does not error" do
+      expect { output }.to_not raise_error
+
+      expect(stderr).to eq("Updating server srv-klfkd\n")
+
+      expect(stdout).to match("srv-klfkd")
+    end
+  end
+
+  context "with --compatibility-mode" do
+    let(:argv) { %w[servers update --compatibility-mode srv-ds321] }
+
+    before do
+      stub_request(:get, "http://api.brightbox.localhost/1.0/servers/srv-ds321?account_id=acc-12345")
+        .to_return(:status => 200, :body => {
+          id: "srv-ds321",
+          server_type: {
+           id: "typ-12345"
+          },
+          cloud_ips: [],
+          interfaces: []
+        }.to_json)
+
+      stub_request(:get, "http://api.brightbox.localhost/1.0/images?account_id=acc-12345")
+        .to_return(:status => 200, :body => [{id: "img-12345" }].to_json)
+
+      stub_request(:put, "http://api.brightbox.localhost/1.0/servers/srv-ds321?account_id=acc-12345")
+        .with(:body => {})
+        .to_return(:status => 200, :body => {
+           id: "srv-ds321",
+           server_type: {
+            id: "typ-12345"
+           },
+           cloud_ips: [],
+           interfaces: []
+        }.to_json)
+    end
+
+    it "does not error" do
+      expect { output }.to_not raise_error
+
+      expect(stderr).to eq("Updating server srv-ds321\n")
+
+      expect(stdout).to match("srv-ds321")
+    end
+  end
+
+  context "with --no-compatibility-mode" do
+    let(:argv) { %w[servers update --no-compatibility-mode srv-ds321] }
+
+    before do
+      stub_request(:get, "http://api.brightbox.localhost/1.0/servers/srv-ds321?account_id=acc-12345")
+        .to_return(:status => 200, :body => {
+          id: "srv-ds321",
+          server_type: {
+           id: "typ-12345"
+          },
+          cloud_ips: [],
+          interfaces: []
+        }.to_json)
+
+      stub_request(:get, "http://api.brightbox.localhost/1.0/images?account_id=acc-12345")
+        .to_return(:status => 200, :body => [{id: "img-12345" }].to_json)
+
+      stub_request(:put, "http://api.brightbox.localhost/1.0/servers/srv-ds321?account_id=acc-12345")
+        .with(:body => {
+          compatibility_mode: false
+        })
+        .to_return(:status => 200, :body => {
+           id: "srv-ds321",
+           server_type: {
+            id: "typ-12345"
+           },
+           cloud_ips: [],
+           interfaces: []
+        }.to_json)
+    end
+
+    it "does not error" do
+      expect { output }.to_not raise_error
+
+      expect(stderr).to eq("Updating server srv-ds321\n")
+
+      expect(stdout).to match("srv-ds321")
+    end
+  end
+
+  context "with --base64" do
+    let(:argv) { %w[servers update --base64 srv-ds321] }
+
+    before do
+      stub_request(:get, "http://api.brightbox.localhost/1.0/servers/srv-ds321?account_id=acc-12345")
+        .to_return(:status => 200, :body => {
+          id: "srv-ds321",
+          server_type: {
+           id: "typ-12345"
+          },
+          cloud_ips: [],
+          interfaces: []
+        }.to_json)
+
+      stub_request(:get, "http://api.brightbox.localhost/1.0/images?account_id=acc-12345")
+        .to_return(:status => 200, :body => [{id: "img-12345" }].to_json)
+
+      stub_request(:put, "http://api.brightbox.localhost/1.0/servers/srv-ds321?account_id=acc-12345")
+        .with(:body => {
+          compatibility_mode: false
+        })
+        .to_return(:status => 200, :body => {
+           id: "srv-ds321",
+           server_type: {
+            id: "typ-12345"
+           },
+           cloud_ips: [],
+           interfaces: []
+        }.to_json)
+    end
+
+    it "does not error" do
+      expect { output }.to_not raise_error
+
+      expect(stderr).to eq("Updating server srv-ds321\n")
+
+      expect(stdout).to match("srv-ds321")
+    end
+  end
+
+  context "with --base64 --user-data" do
+    let(:argv) { %w[servers update --base64 --user-data hello srv-ds321] }
+
+    before do
+      stub_request(:get, "http://api.brightbox.localhost/1.0/servers/srv-ds321?account_id=acc-12345")
+        .to_return(:status => 200, :body => {
+          id: "srv-ds321",
+          server_type: {
+           id: "typ-12345"
+          },
+          cloud_ips: [],
+          interfaces: []
+        }.to_json)
+
+      stub_request(:get, "http://api.brightbox.localhost/1.0/images?account_id=acc-12345")
+        .to_return(:status => 200, :body => [{id: "img-12345" }].to_json)
+
+      stub_request(:put, "http://api.brightbox.localhost/1.0/servers/srv-ds321?account_id=acc-12345")
+        .with(:body => {
+          user_data: "aGVsbG8=\n"
+        })
+        .to_return(:status => 200, :body => {
+           id: "srv-ds321",
+           server_type: {
+            id: "typ-12345"
+           },
+           cloud_ips: [],
+           interfaces: []
+        }.to_json)
+    end
+
+    it "does not error" do
+      expect { output }.to_not raise_error
+
+      expect(stderr).to eq("Updating server srv-ds321 with 0.01k of user data\n")
+
+      expect(stdout).to match("srv-ds321")
+    end
+  end
+
+  context "with --no-base64 --user-data" do
+    let(:argv) { %w[servers update --no-base64 --user-data hello srv-ds321] }
+
+    before do
+      stub_request(:get, "http://api.brightbox.localhost/1.0/servers/srv-ds321?account_id=acc-12345")
+        .to_return(:status => 200, :body => {
+          id: "srv-ds321",
+          server_type: {
+           id: "typ-12345"
+          },
+          cloud_ips: [],
+          interfaces: []
+        }.to_json)
+
+      stub_request(:get, "http://api.brightbox.localhost/1.0/images?account_id=acc-12345")
+        .to_return(:status => 200, :body => [{id: "img-12345" }].to_json)
+
+      stub_request(:put, "http://api.brightbox.localhost/1.0/servers/srv-ds321?account_id=acc-12345")
+        .with(:body => {
+          user_data: "hello"
+        })
+        .to_return(:status => 200, :body => {
+           id: "srv-ds321",
+           server_type: {
+            id: "typ-12345"
+           },
+           cloud_ips: [],
+           interfaces: []
+        }.to_json)
+    end
+
+    it "does not error" do
+      expect { output }.to_not raise_error
+
+      expect(stderr).to eq("Updating server srv-ds321 with 0.00k of user data\n")
+
+      expect(stdout).to match("srv-ds321")
     end
   end
 end

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

@@ -26,7 +26,7 @@ describe "brightbox sql instances" do
                        "maintenance_hour":6}')
 
         stub_request(:put, "http://api.brightbox.localhost/1.0/database_servers/dbs-12345?account_id=acc-12345")
-          .with(:body => "{\"maintenance_weekday\":\"1\"}")
+          .with(body: { maintenance_weekday: "1" }.to_json)
       end
 
       it "sets custom maintenance window settings" do
@@ -46,6 +46,7 @@ describe "brightbox sql instances" do
           .to_return(:status => 200, :body => '{"id":"dbs-12345","snapshots_schedule":"34 12 * * 4","snapshots_schedule_next_at":"2016-07-07T12:34:56Z"}')
 
         stub_request(:put, "http://api.brightbox.localhost/1.0/database_servers/dbs-12345?account_id=acc-12345")
+          .with(body: { snapshots_schedule: "0 12 * * 4" }.to_json)
           .to_return(:status => 200, :body => '{"id":"dbs-12345","snapshots_schedule":"34 12 * * 4","snapshots_schedule_next_at":"2016-07-07T12:34:56Z"}')
       end
 
@@ -59,25 +60,26 @@ describe "brightbox sql instances" do
     end
 
     context "--remove-snapshots-schedule" do
-      let(:dbs) { Brightbox::DatabaseServer.find("dbs-12345") }
-      let(:argv) { %w[sql instances update --remove-snapshots-schedule dbs-12345] }
+      let(:dbs) { Brightbox::DatabaseServer.find("dbs-432sf") }
+      let(:argv) { %w[sql instances update --remove-snapshots-schedule dbs-432sf] }
       let(:expected_args) { { :snapshots_schedule => nil } }
 
       before do
-        stub_request(:get, "http://api.brightbox.localhost/1.0/database_servers/dbs-12345?account_id=acc-12345")
-          .to_return(:status => 200, :body => '{"id":"dbs-12345","snapshots_schedule":"34 12 * * 4","snapshots_schedule_next_at":"2016-07-07T12:34:56Z"}')
-          .to_return(:status => 200, :body => '{"id":"dbs-12345","snapshots_schedule":null,"snapshots_schedule_next_at":null}')
+        stub_request(:get, "http://api.brightbox.localhost/1.0/database_servers/dbs-432sf?account_id=acc-12345")
+          .to_return(:status => 200, :body => '{"id":"dbs-432sf","snapshots_schedule":"34 12 * * 4","snapshots_schedule_next_at":"2016-07-07T12:34:56Z"}')
+          .to_return(:status => 200, :body => '{"id":"dbs-432sf","snapshots_schedule":null,"snapshots_schedule_next_at":null}')
 
-        stub_request(:put, "http://api.brightbox.localhost/1.0/database_servers/dbs-12345?account_id=acc-12345")
-          .to_return(:status => 200, :body => '{"id":"dbs-12345","snapshots_schedule":null,"snapshots_schedule_next_at":null}')
+        stub_request(:put, "http://api.brightbox.localhost/1.0/database_servers/dbs-432sf?account_id=acc-12345")
+          .with(body: { snapshots_schedule: nil }.to_json)
+          .to_return(:status => 200, :body => '{"id":"dbs-432sf","snapshots_schedule":null,"snapshots_schedule_next_at":null}')
       end
 
       it "clears snapshots schedule" do
         expect(Brightbox::DatabaseServer).to receive(:find).and_return(dbs)
         expect(dbs).to receive(:update).with(expected_args).and_call_original
 
-        expect(stderr).to eq("Updating dbs-12345\n")
-        expect(stdout).to include("dbs-12345")
+        expect(stderr).to eq("Updating dbs-432sf\n")
+        expect(stdout).to include("dbs-432sf")
       end
     end
   end

data/spec/commands/volumes/update_spec.rb

@@ -46,7 +46,6 @@ describe "brightbox volumes update" do
           id: "vol-908us",
           name: "Old",
           description: nil,
-          delete_with_server: true,
           serial: "vol-908us"
         )
       )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brightbox-cli
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 4.3.2
 platform: ruby
 authors:
 - John Leach
@@ -451,6 +451,7 @@ files:
 - lib/brightbox-cli/zones.rb
 - lib/brightbox/cli/config.rb
 - lib/brightbox_cli.rb
+- lib/gli_patches.rb
 - locales/en.yml
 - spec/brightbox_spec.rb
 - spec/cassettes/Brightbox_Account/_all/when_connected_using_an_application/returns_a_collection_of_Accounts.yml