brightbox-cli 5.0.0.alpha → 5.0.0.rc2

data/spec/commands/lbs/create_spec.rb

@@ -11,48 +11,34 @@ describe "brightbox lbs" do
       cache_access_token(config, "f83da712e6299cda953513ec07f7a754f747d727")
     end
 
-    context "without required nodes arguments" do
+    context "without nodes arguments" do
       let(:argv) { %w[lbs create] }
-
-      it "does not error" do
-        expect { output }.to_not raise_error
-
-        expect(stderr).to eq("ERROR: You must specify which servers to balance connections to\n")
-      end
-    end
-
-    context "with required nodes arguments" do
-      let(:argv) { %w[lbs create srv-12345] }
-      let(:expected_args) { { nodes: [{ node: "srv-12345" }] } }
+      let(:expected_args) { { nodes: [] } }
 
       let(:json_response) do
         <<~EOS
         {
           "id": "lba-12345",
-          "nodes": [
-            {
-              "id": "srv-12345"
-            }
-          ]
+          "nodes": []
         }
         EOS
       end
 
       before do
         stub_request(:post, "http://api.brightbox.localhost/1.0/load_balancers?account_id=acc-12345")
-          .with(:body => hash_including("nodes" => [{ "node" => "srv-12345" }]))
+          .with(:body => hash_including("nodes" => []))
           .to_return(:status => 202, :body => json_response)
       end
 
       it "makes request" 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(stderr).to include("Creating a new load balancer\n")
         expect(stdout).to include("lba-12345")
       end
     end
 
-    context "with required nodes arguments" do
+    context "with a nodes argument" do
       let(:argv) { %w[lbs create srv-12345] }
       let(:expected_args) { { nodes: [{ node: "srv-12345" }] } }
 
@@ -78,12 +64,12 @@ describe "brightbox lbs" do
       it "makes request" 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(stderr).to include("Creating a new load balancer\n")
         expect(stdout).to include("lba-12345")
       end
     end
 
-    context "with multiple nodes" do
+    context "with multiple node arguments" do
       let(:argv) { %w[lbs create srv-12345 srv-54321] }
       let(:expected_args) { { nodes: [{ node: "srv-12345" }, { node: "srv-54321" }] } }
 
@@ -112,7 +98,7 @@ describe "brightbox lbs" do
       it "makes request" 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(stderr).to include("Creating a new load balancer\n")
         expect(stdout).to include("lba-12345")
       end
     end
@@ -139,7 +125,7 @@ describe "brightbox lbs" do
       it "includes buffer_size 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(stderr).to include("Creating a new load balancer\n")
         expect(stdout).to include("lba-12345")
       end
     end
@@ -165,7 +151,7 @@ describe "brightbox lbs" do
 
       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(stderr).to include("Creating a new load balancer\n")
         expect(stdout).to include("lba-12345")
       end
     end
@@ -206,7 +192,7 @@ describe "brightbox lbs" do
       end
 
       it "includes acme_certificate_domain in response" do
-        expect(stderr).to eq("Creating a new load balancer\n")
+        expect(stderr).to include("Creating a new load balancer\n")
         expect(stdout).to include("lba-12345")
       end
     end

data/spec/commands/lbs/show_spec.rb

@@ -11,47 +11,83 @@ describe "brightbox lbs" do
       cache_access_token(config, "f83da712e6299cda953513ec07f7a754f747d727")
     end
 
-    context "without identifier argument" do
+    context "without arguments" do
       let(:argv) { %w[lbs show] }
+
+      it "reports missing IDs" do
+        expect { output }.to_not raise_error
+
+        aggregate_failures do
+          expect(stderr).to include("ERROR: You must specify load balancer IDs to show")
+          expect(stdout).to be_empty
+        end
+      end
+    end
+
+    context "with identifier argument" do
+      let(:argv) { %w[lbs show lba-12345] }
       let(:json_response) do
         <<~EOS
-        [
-          {
-            "id":"lba-12345",
-            "name":"app-lb1",
-            "status":"active",
-            "created_at":"2012-03-05T12:00:00Z",
-            "nodes":[
+        {
+          "id":"lba-12345",
+          "name":"app-lb1",
+          "status":"active",
+          "created_at":"2012-03-05T12:00:00Z",
+          "acme": {
+            "domains": [
+              {
+                "identifier": "domain.test",
+                "status": "verified"
+              },
               {
-                "id":"srv-12345",
-                "status":"active"
+                "identifier": "domain2.test",
+                "status": "verified"
               }
-            ]
-          }
-        ]
+            ],
+            "certificate": {
+              "domains": [
+                "domain.test"
+              ],
+              "expires_at": "2025-12-31T23:59:59Z",
+              "fingerprint": "fingerprint",
+              "issued_at": "2025-01-01T00:00:00Z"
+            }
+          },
+          "nodes":[
+            {
+              "id":"srv-12345",
+              "status":"active"
+            }
+          ]
+        }
         EOS
       end
 
       before do
-        stub_request(:get, "http://api.brightbox.localhost/1.0/load_balancers?account_id=acc-12345")
+        stub_request(:get, "http://api.brightbox.localhost/1.0/load_balancers/lba-12345?account_id=acc-12345")
           .to_return(:status => 200, :body => json_response)
       end
 
       it "shows load balancer details" do
         aggregate_failures do
-          expect(stderr).to eq("")
+          expect(stderr).to be_empty unless ENV["DEBUG"]
           expect(stdout).to include("id: lba-12345")
           expect(stdout).to include("status: active")
           expect(stdout).to include("name: app-lb1")
           expect(stdout).to include("created_at: 2012-03-05T12:00Z")
           expect(stdout).to include("nodes: srv-12345")
+          expect(stdout).to include("acme_domains: domain.test:verified,domain2.test:verified")
+          expect(stdout).to include("acme_cert_subjects: domain.test")
+          expect(stdout).to include("acme_cert_expires_at: 2025-12-31T23:59:59Z")
+          expect(stdout).to include("acme_cert_fingerprint: fingerprint")
+          expect(stdout).to include("acme_cert_issued_at: 2025-01-01T00:00:00Z")
         end
       end
     end
 
-    context "with identifier argument" do
-      let(:argv) { %w[lbs show lba-12345] }
-      let(:json_response) do
+    context "with multiple identifiers" do
+      let(:argv) { %w[lbs show lba-12345 lba-54321] }
+      let(:json_response_1) do
         <<~EOS
         {
           "id":"lba-12345",
@@ -68,7 +104,15 @@ describe "brightbox lbs" do
                 "identifier": "domain2.test",
                 "status": "verified"
               }
-            ]
+            ],
+            "certificate": {
+              "domains": [
+                "domain.test"
+              ],
+              "expires_at": "2025-12-31T23:59:59Z",
+              "fingerprint": "fingerprint",
+              "issued_at": "2025-01-01T00:00:00Z"
+            }
           },
           "nodes":[
             {
@@ -79,21 +123,75 @@ describe "brightbox lbs" do
         }
         EOS
       end
+      let(:json_response_2) do
+        <<~EOS
+        {
+          "id":"lba-54321",
+          "name":"app-lb2",
+          "status":"active",
+          "created_at":"2012-03-05T12:00:00Z",
+          "acme": {
+            "domains": [
+              {
+                "identifier": "domain.test",
+                "status": "verified"
+              },
+              {
+                "identifier": "domain2.test",
+                "status": "verified"
+              }
+            ],
+            "certificate": {
+              "domains": [
+                "domain.test"
+              ],
+              "expires_at": "2025-12-31T23:59:59Z",
+              "fingerprint": "fingerprint",
+              "issued_at": "2025-01-01T00:00:00Z"
+            }
+          },
+          "nodes":[
+            {
+              "id":"srv-54321",
+              "status":"active"
+            }
+          ]
+        }
+        EOS
+      end
 
       before do
         stub_request(:get, "http://api.brightbox.localhost/1.0/load_balancers/lba-12345?account_id=acc-12345")
-          .to_return(:status => 200, :body => json_response)
+          .to_return(:status => 200, :body => json_response_1)
+
+        stub_request(:get, "http://api.brightbox.localhost/1.0/load_balancers/lba-54321?account_id=acc-12345")
+          .to_return(:status => 200, :body => json_response_2)
       end
 
-      it "shows load balancer details" do
+      it "shows multiple load balancer details" do
         aggregate_failures do
-          expect(stderr).to eq("")
+          expect(stderr).to be_empty unless ENV["DEBUG"]
           expect(stdout).to include("id: lba-12345")
           expect(stdout).to include("status: active")
           expect(stdout).to include("name: app-lb1")
           expect(stdout).to include("created_at: 2012-03-05T12:00Z")
           expect(stdout).to include("nodes: srv-12345")
           expect(stdout).to include("acme_domains: domain.test:verified,domain2.test:verified")
+          expect(stdout).to include("acme_cert_subjects: domain.test")
+          expect(stdout).to include("acme_cert_expires_at: 2025-12-31T23:59:59Z")
+          expect(stdout).to include("acme_cert_fingerprint: fingerprint")
+          expect(stdout).to include("acme_cert_issued_at: 2025-01-01T00:00:00Z")
+
+          expect(stdout).to include("id: lba-54321")
+          expect(stdout).to include("status: active")
+          expect(stdout).to include("name: app-lb2")
+          expect(stdout).to include("created_at: 2012-03-05T12:00Z")
+          expect(stdout).to include("nodes: srv-54321")
+          expect(stdout).to include("acme_domains: domain.test:verified,domain2.test:verified")
+          expect(stdout).to include("acme_cert_subjects: domain.test")
+          expect(stdout).to include("acme_cert_expires_at: 2025-12-31T23:59:59Z")
+          expect(stdout).to include("acme_cert_fingerprint: fingerprint")
+          expect(stdout).to include("acme_cert_issued_at: 2025-01-01T00:00:00Z")
         end
       end
     end

data/spec/commands/lbs/update_spec.rb

@@ -41,7 +41,7 @@ describe "brightbox lbs" do
       end
 
       it "includes ssl_minimum_version in response" do
-        expect(stderr).to eq("Updating load balancer lba-12345\n")
+        expect(stderr).to include("Updating load balancer lba-12345\n")
         expect(stdout).to include("lba-12345")
       end
     end
@@ -68,7 +68,7 @@ describe "brightbox lbs" do
       end
 
       it "includes ssl_minimum_version in response" do
-        expect(stderr).to eq("Updating load balancer lba-grt24\n")
+        expect(stderr).to include("Updating load balancer lba-grt24\n")
         expect(stdout).to include("lba-grt24")
       end
     end
@@ -95,7 +95,7 @@ describe "brightbox lbs" do
       end
 
       it "includes ssl_minimum_version in response" do
-        expect(stderr).to eq("Updating load balancer lba-kl432\n")
+        expect(stderr).to include("Updating load balancer lba-kl432\n")
         expect(stdout).to include("lba-kl432")
       end
     end
@@ -139,7 +139,7 @@ describe "brightbox lbs" do
       end
 
       it "includes acme_certificate_domain in response" do
-        expect(stderr).to eq("Updating load balancer lba-12345\n")
+        expect(stderr).to include("Updating load balancer lba-12345\n")
         expect(stdout).to include("lba-12345")
       end
     end

data/spec/commands/servers/show_spec.rb

@@ -6,11 +6,93 @@ describe "brightbox servers" do
     let(:stdout) { output.stdout }
     let(:stderr) { output.stderr }
 
-    context "" do
+    before do
+      WebMock.reset!
+
+      config_from_contents(API_CLIENT_CONFIG_CONTENTS)
+      stub_client_token_request
+      Brightbox.config.reauthenticate
+    end
+
+    context "without arguments" do
       let(:argv) { %w[servers show] }
 
+      it "reports missing IDs" do
+        expect { output }.to_not raise_error
+
+        aggregate_failures do
+          expect(stderr).to match("ERROR: You must specify server IDs to show")
+          expect(stdout).to be_empty
+        end
+      end
+    end
+
+    context "with identifier argument" do
+      let(:argv) { %w[servers show srv-55555] }
+
+      before do
+        stub_request(:get, "#{api_url}/1.0/images")
+          .with(query: hash_including(account_id: "acc-12345"))
+          .to_return(
+            status: 200,
+            body: {
+              images: [
+                {
+                  id: "img-12345",
+                  min_ram: 2_048
+                }
+              ]
+            }.to_json
+          )
+
+        stub_request(:get, "#{api_url}/1.0/images/img-12345")
+          .with(query: hash_including(account_id: "acc-12345"))
+          .to_return(
+            status: 200,
+            body: {
+              id: "img-12345"
+            }.to_json
+          )
+
+        stub_request(:get, "#{api_url}/1.0/servers/srv-55555")
+          .with(query: hash_including(account_id: "acc-12345"))
+          .to_return(
+            status: 200,
+            body: {
+              id: "srv-12345",
+              name: "app-server1",
+              status: "active",
+              image: {
+                id: "img-12345"
+              },
+              server_type: {
+                id: "typ-12345"
+              },
+              cloud_ips: [],
+              interfaces: [
+                {
+                  id: "int-12345",
+                  ipv4_address: "10.0.0.0",
+                  ipv6_address: "2a02:1234:abcd:5678::1"
+                }
+              ],
+              server_groups: [],
+              snapshots: []
+            }.to_json
+          )
+      end
+
       it "does not error" do
+        require "pry"
+        # binding.pry
         expect { output }.to_not raise_error
+
+        aggregate_failures do
+          expect(stderr).not_to match("ERROR")
+          expect(stdout).to match("id: srv-12345")
+          expect(stdout).to match("status: active")
+          expect(stdout).to match("name: app-server1")
+        end
       end
     end
   end

data/spec/commands/servers/update_spec.rb

@@ -26,7 +26,7 @@ describe "brightbox servers update" do
     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(stderr).to include("ERROR: You must specify a valid server id as the first argument\n")
 
       expect(stdout).to match("")
     end
@@ -66,7 +66,7 @@ describe "brightbox servers update" do
     it "does not error" do
       expect { output }.to_not raise_error
 
-      expect(stderr).to eq("Updating server srv-klfkd\n")
+      expect(stderr).to include("Updating server srv-klfkd\n")
 
       expect(stdout).to match("srv-klfkd")
     end
@@ -104,7 +104,7 @@ describe "brightbox servers update" do
     it "does not error" do
       expect { output }.to_not raise_error
 
-      expect(stderr).to eq("Updating server srv-ds321\n")
+      expect(stderr).to include("Updating server srv-ds321\n")
 
       expect(stdout).to match("srv-ds321")
     end
@@ -144,7 +144,7 @@ describe "brightbox servers update" do
     it "does not error" do
       expect { output }.to_not raise_error
 
-      expect(stderr).to eq("Updating server srv-ds321\n")
+      expect(stderr).to include("Updating server srv-ds321\n")
 
       expect(stdout).to match("srv-ds321")
     end
@@ -184,7 +184,7 @@ describe "brightbox servers update" do
     it "does not error" do
       expect { output }.to_not raise_error
 
-      expect(stderr).to eq("Updating server srv-ds321\n")
+      expect(stderr).to include("Updating server srv-ds321\n")
 
       expect(stdout).to match("srv-ds321")
     end
@@ -224,7 +224,7 @@ describe "brightbox servers update" do
     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(stderr).to include("Updating server srv-ds321 with 0.01k of user data\n")
 
       expect(stdout).to match("srv-ds321")
     end
@@ -264,7 +264,7 @@ describe "brightbox servers update" do
     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(stderr).to include("Updating server srv-ds321 with 0.00k of user data\n")
 
       expect(stdout).to match("srv-ds321")
     end

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

@@ -39,7 +39,7 @@ describe "brightbox sql instances" do
 
       it "correctly sends API parameters" do
         expect(Brightbox::DatabaseServer).to receive(:create).with(expected_args).and_call_original
-        expect(stderr).to eq("")
+        expect(stderr).to be_empty unless ENV["DEBUG"]
       end
     end
 
@@ -55,7 +55,7 @@ describe "brightbox sql instances" do
 
       it "correctly sends API parameters" do
         expect(Brightbox::DatabaseServer).to receive(:create).with(expected_args).and_call_original
-        expect(stderr).to eq("")
+        expect(stderr).to be_empty unless ENV["DEBUG"]
       end
 
       after do
@@ -69,7 +69,7 @@ describe "brightbox sql instances" do
 
       it "correctly sends API parameters" do
         expect(Brightbox::DatabaseServer).to receive(:create).with(expected_args).and_call_original
-        expect(stderr).to eq("")
+        expect(stderr).to be_empty unless ENV["DEBUG"]
         expect(stdout).to include("version: 8.0")
       end
     end
@@ -80,7 +80,7 @@ describe "brightbox sql instances" do
 
       it "correctly sends API parameters" do
         expect(Brightbox::DatabaseServer).to receive(:create).with(expected_args).and_call_original
-        expect(stderr).to eq("")
+        expect(stderr).to be_empty unless ENV["DEBUG"]
         expect(stdout).to include("version: 8.0")
       end
     end
@@ -91,7 +91,7 @@ describe "brightbox sql instances" do
 
       it "correctly sends API parameters" do
         expect(Brightbox::DatabaseServer).to receive(:create).with(expected_args).and_call_original
-        expect(stderr).to eq("")
+        expect(stderr).to be_empty unless ENV["DEBUG"]
       end
     end
 
@@ -101,7 +101,7 @@ describe "brightbox sql instances" do
 
       it "correctly sends API parameters" do
         expect(Brightbox::DatabaseServer).to receive(:create).with(expected_args).and_call_original
-        expect(stderr).to eq("")
+        expect(stderr).to be_empty unless ENV["DEBUG"]
       end
     end
 
@@ -124,7 +124,7 @@ describe "brightbox sql instances" do
       it "includes schedule fields in response" do
         expect(Brightbox::DatabaseServer).to receive(:create).with(expected_args).and_call_original
         expect(stdout).to include("id: #{sql_instance.id}")
-        expect(stderr).to eq("")
+        expect(stderr).to be_empty unless ENV["DEBUG"]
       end
     end
 
@@ -136,7 +136,7 @@ describe "brightbox sql instances" do
         expect(Brightbox::DatabaseServer).to receive(:create).with(expected_args).and_call_original
         expect(stdout).to include("snapshots_schedule: 0 12 * * 4")
         expect(stdout).to match(/snapshots_schedule_next_at: 20\d{2}-\d{2}-\d{2}T12:\d{2}Z/)
-        expect(stderr).to eq("")
+        expect(stderr).to be_empty unless ENV["DEBUG"]
       end
     end
   end

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

@@ -26,7 +26,7 @@ describe "brightbox sql instances reset" do
     it "does not error" do
       expect { output }.to_not raise_error
 
-      expect(stderr).to eq("ERROR: You must specify a valid SQL instance ID as the first argument\n")
+      expect(stderr).to include("ERROR: You must specify a valid SQL instance ID as the first argument\n")
 
       expect(stdout).to match("")
     end
@@ -47,7 +47,7 @@ describe "brightbox sql instances reset" do
     it "does not error" do
       expect { output }.to_not raise_error
 
-      expect(stderr).to eq("ERROR: Couldn't find 'dbs-l3kd4'\n")
+      expect(stderr).to include("ERROR: Couldn't find 'dbs-l3kd4'\n")
 
       expect(stdout).to match("")
     end
@@ -79,7 +79,7 @@ describe "brightbox sql instances reset" do
     it "does not error" do
       expect { output }.to_not raise_error
 
-      expect(stderr).to eq("Resetting dbs-po953\n")
+      expect(stderr).to include("Resetting dbs-po953\n")
 
       expect(stdout).to match("dbs-po953")
     end

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

@@ -26,7 +26,7 @@ describe "brightbox sql instances resize" do
     it "does not error" do
       expect { output }.to_not raise_error
 
-      expect(stderr).to eq("ERROR: You must specify a valid SQL instance ID as the first argument\n")
+      expect(stderr).to include("ERROR: You must specify a valid SQL instance ID as the first argument\n")
 
       expect(stdout).to match("")
     end
@@ -47,7 +47,7 @@ describe "brightbox sql instances resize" do
     it "does not error" do
       expect { output }.to_not raise_error
 
-      expect(stderr).to eq("ERROR: Couldn't find 'dbs-xsd23'\n")
+      expect(stderr).to include("ERROR: Couldn't find 'dbs-xsd23'\n")
 
       expect(stdout).to match("")
     end
@@ -59,7 +59,7 @@ describe "brightbox sql instances resize" do
     it "does not error" do
       expect { output }.to_not raise_error
 
-      expect(stderr).to eq("ERROR: Cloud SQL type format is invalid\n")
+      expect(stderr).to include("ERROR: Cloud SQL type format is invalid\n")
 
       expect(stdout).to match("")
     end
@@ -104,7 +104,7 @@ describe "brightbox sql instances resize" do
     it "does not error" do
       expect { output }.to_not raise_error
 
-      expect(stderr).to eq("Resizing dbs-zzasa\n")
+      expect(stderr).to include("Resizing dbs-zzasa\n")
 
       expect(stdout).to match("dbs-zzasa")
     end

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

@@ -66,8 +66,9 @@ describe "brightbox sql instances" do
       end
 
       it "simplifies the maintenance window" do
+        expect(stderr).to be_empty unless ENV["DEBUG"]
+
         expect(stdout).to include("maintenance_window: Sunday 06:00 UTC")
-        expect(stderr).to be_empty
       end
 
       it "includes snapshots schedule fields" do

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

@@ -30,7 +30,7 @@ describe "brightbox sql instances" do
       end
 
       it "sets custom maintenance window settings" do
-        expect(stderr).to eql("Updating dbs-12345\n")
+        expect(stderr).to include("Updating dbs-12345\n")
         expect(stdout).to include("dbs-12345")
       end
     end
@@ -54,7 +54,7 @@ describe "brightbox sql instances" 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(stderr).to include("Updating dbs-12345\n")
         expect(stdout).to include("dbs-12345")
       end
     end
@@ -78,7 +78,7 @@ describe "brightbox sql instances" 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-432sf\n")
+        expect(stderr).to include("Updating dbs-432sf\n")
         expect(stdout).to include("dbs-432sf")
       end
     end

data/spec/commands/sql/snapshots/list_spec.rb

@@ -17,7 +17,7 @@ describe "brightbox sql snapshots" do
       let(:argv) { %w[sql snapshots list] }
 
       it "does not output to stderr" do
-        expect(stderr).to eql("")
+        expect(stderr).to be_empty unless ENV["DEBUG"]
       end
 
       it "outputs table details to stdout" do