brightbox-cli 4.3.1 → 4.4.0

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.1
+  version: 4.4.0
 platform: ruby
 authors:
 - John Leach
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.1
+        version: 1.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.1
+        version: 1.10.0
 - !ruby/object:Gem::Dependency
   name: fog-core
   requirement: !ruby/object:Gem::Requirement
@@ -318,6 +318,7 @@ files:
 - lib/brightbox-cli/commands/config/client_list.rb
 - lib/brightbox-cli/commands/config/client_remove.rb
 - lib/brightbox-cli/commands/config/user_add.rb
+- lib/brightbox-cli/commands/configmaps.rb
 - lib/brightbox-cli/commands/firewall/policies_apply.rb
 - lib/brightbox-cli/commands/firewall/policies_create.rb
 - lib/brightbox-cli/commands/firewall/policies_destroy.rb
@@ -412,6 +413,7 @@ files:
 - 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/config_map.rb
 - lib/brightbox-cli/connection_manager.rb
 - lib/brightbox-cli/database_server.rb
 - lib/brightbox-cli/database_snapshot.rb
@@ -451,6 +453,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
@@ -597,6 +600,11 @@ files:
 - spec/commands/config/client_list_spec.rb
 - spec/commands/config/client_remove_spec.rb
 - spec/commands/config/user_add_spec.rb
+- spec/commands/configmaps/create_spec.rb
+- spec/commands/configmaps/destroy_spec.rb
+- spec/commands/configmaps/list_spec.rb
+- spec/commands/configmaps/show_spec.rb
+- spec/commands/configmaps/update_spec.rb
 - spec/commands/firewall_policies/update_spec.rb
 - spec/commands/groups/add_server_spec.rb
 - spec/commands/groups/create_spec.rb
@@ -959,6 +967,11 @@ test_files:
 - spec/commands/config/client_list_spec.rb
 - spec/commands/config/client_remove_spec.rb
 - spec/commands/config/user_add_spec.rb
+- spec/commands/configmaps/create_spec.rb
+- spec/commands/configmaps/destroy_spec.rb
+- spec/commands/configmaps/list_spec.rb
+- spec/commands/configmaps/show_spec.rb
+- spec/commands/configmaps/update_spec.rb
 - spec/commands/firewall_policies/update_spec.rb
 - spec/commands/groups/add_server_spec.rb
 - spec/commands/groups/create_spec.rb