brightbox-cli 4.8.0 → 5.0.0.rc1

data/spec/commands/configmaps/update_spec.rb

@@ -27,7 +27,7 @@ describe "brightbox configmaps update" do
     it "does not error" do
       expect { output }.to_not raise_error
 
-      expect(stderr).to eq("ERROR: You must specify the config map ID as the first argument\n")
+      expect(stderr).to include("ERROR: You must specify the config map ID as the first argument\n")
 
       expect(stdout).to match("")
     end
@@ -73,7 +73,7 @@ describe "brightbox configmaps update" do
     it "does not error" do
       expect { output }.to_not raise_error
 
-      expect(stderr).to eq("Updating cfg-0932s\n")
+      expect(stderr).to include("Updating cfg-0932s\n")
 
       aggregate_failures do
         expect(stdout).to match("cfg-0932s")
@@ -134,7 +134,7 @@ describe "brightbox configmaps update" do
       it "does not error" do
         expect { output }.to_not raise_error
 
-        expect(stderr).to eq("Updating cfg-25hrt\n")
+        expect(stderr).to include("Updating cfg-25hrt\n")
 
         aggregate_failures do
           expect(stdout).to match("cfg-25hrt")
@@ -148,7 +148,7 @@ describe "brightbox configmaps update" do
       it "does not error" do
         expect { output }.to_not raise_error
 
-        expect(stderr).to eq("ERROR: Config map data was not valid JSON\n")
+        expect(stderr).to include("ERROR: Config map data was not valid JSON\n")
 
         expect(stdout).to eq("")
       end
@@ -218,7 +218,7 @@ describe "brightbox configmaps update" do
         it "does not error" do
           expect { output }.to_not raise_error
 
-          expect(stderr).to eq("Updating cfg-gr45a\n")
+          expect(stderr).to include("Updating cfg-gr45a\n")
 
           aggregate_failures do
             expect(stdout).to match("cfg-gr45a")
@@ -231,7 +231,7 @@ describe "brightbox configmaps update" do
           it "does not error" do
             expect { output }.to_not raise_error
 
-            expect(stderr).to eq("ERROR: Config map data was not valid JSON\n")
+            expect(stderr).to include("ERROR: Config map data was not valid JSON\n")
 
             expect(stdout).to eq("")
           end
@@ -303,7 +303,7 @@ describe "brightbox configmaps update" do
         it "does not error" do
           expect { output }.to_not raise_error
 
-          expect(stderr).to eq("Updating cfg-stdin\n")
+          expect(stderr).to include("Updating cfg-stdin\n")
 
           aggregate_failures do
             expect(stdout).to match("cfg-stdin")
@@ -316,7 +316,7 @@ describe "brightbox configmaps update" do
           it "does not error" do
             expect { output }.to_not raise_error
 
-            expect(stderr).to eq("ERROR: Config map data was not valid JSON\n")
+            expect(stderr).to include("ERROR: Config map data was not valid JSON\n")
 
             expect(stdout).to eq("")
           end
@@ -332,7 +332,7 @@ describe "brightbox configmaps update" do
         it "does not error" do
           expect { output }.to_not raise_error
 
-          expect(stderr).to eq("ERROR: Config map data can only be passed by either 'data' or 'data-file'\n")
+          expect(stderr).to include("ERROR: Config map data can only be passed by either 'data' or 'data-file'\n")
 
           expect(stdout).to eq("")
         end

data/spec/commands/lbs/create_spec.rb

@@ -11,20 +11,131 @@ describe "brightbox lbs" do
       cache_access_token(config, "f83da712e6299cda953513ec07f7a754f747d727")
     end
 
-    context "" do
+    context "without nodes arguments" do
       let(:argv) { %w[lbs create] }
+      let(:expected_args) { { nodes: [] } }
 
-      it "does not error" do
-        expect { output }.to_not raise_error
+      let(:json_response) do
+        <<~EOS
+        {
+          "id": "lba-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" => []))
+          .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 include("Creating a new load balancer\n")
+        expect(stdout).to include("lba-12345")
+      end
+    end
+
+    context "with a nodes argument" do
+      let(:argv) { %w[lbs create srv-12345] }
+      let(:expected_args) { { nodes: [{ node: "srv-12345" }] } }
+
+      let(:json_response) do
+        <<~EOS
+        {
+          "id": "lba-12345",
+          "nodes": [
+            {
+              "id": "srv-12345"
+            }
+          ]
+        }
+        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" }]))
+          .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 include("Creating a new load balancer\n")
+        expect(stdout).to include("lba-12345")
+      end
+    end
+
+    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" }] } }
+
+      let(:json_response) do
+        <<~EOS
+        {
+          "id": "lba-12345",
+          "nodes": [
+            {
+              "id": "srv-12345"
+            },
+            {
+              "id": "srv-54321"
+            }
+          ]
+        }
+        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" }, { "node" => "srv-54321" }]))
+          .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 include("Creating a new load balancer\n")
+        expect(stdout).to include("lba-12345")
+      end
+    end
+
+    context "with --buffer_size" do
+      let(:argv) { %w[lbs create --buffer-size 1024 srv-12345] }
+      let(:expected_args) { { nodes: [{ node: "srv-12345" }], buffer_size: 1024 } }
+
+      let(:json_response) do
+        <<~EOS
+        {
+          "id": "lba-12345",
+          "buffer_size": 1024
+        }
+        EOS
+      end
+
+      before do
+        stub_request(:post, "http://api.brightbox.localhost/1.0/load_balancers?account_id=acc-12345")
+          .with(:body => hash_including("buffer_size" => 1024))
+          .to_return(:status => 202, :body => json_response)
+      end
+
+      it "includes buffer_size in response" do
+        expect(Brightbox::LoadBalancer).to receive(:create).with(hash_including(expected_args)).and_call_original
+
+        expect(stderr).to include("Creating a new load balancer\n")
+        expect(stdout).to include("lba-12345")
       end
     end
 
-    context "--ssl-min-ver=TLSv1.0" do
+    context "with --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
+        <<~EOS
         {
           "id":"lba-12345",
           "ssl_minimum_version":"TLSv1.0"
@@ -40,7 +151,48 @@ 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
+
+    context "--acme-domains=example.com" do
+      let(:argv) { ["lbs", "create", "--acme-domains", "example.com", "--listeners", "443:443:https:5000", "lba-12345"] }
+      let(:json_response) do
+        <<~EOS
+        {
+          "id":"lba-12345",
+          "acme": {
+            "domains": [
+              {
+                "identifier": "example.com",
+                "last_message": null,
+                "status": "pending"
+              }
+            ]
+          },
+          "certificate": null,
+          "listeners": [
+            {
+              "in": 443,
+              "out": 443,
+              "protocol": "https",
+              "proxy_protocol": null,
+              "timeout": 5000
+            }
+          ]
+        }
+        EOS
+      end
+
+      before do
+        stub_request(:post, "http://api.brightbox.localhost/1.0/load_balancers?account_id=acc-12345")
+          .with(body: hash_including(domains: ["example.com"]))
+          .to_return(:status => 202, :body => json_response)
+      end
+
+      it "includes acme_certificate_domain in response" do
+        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

@@ -6,11 +6,107 @@ describe "brightbox lbs" do
     let(:stdout) { output.stdout }
     let(:stderr) { output.stderr }
 
-    context "" do
+    before do
+      config = config_from_contents(USER_APP_CONFIG_CONTENTS)
+      cache_access_token(config, "f83da712e6299cda953513ec07f7a754f747d727")
+    end
+
+    context "without identifier argument" do
       let(:argv) { %w[lbs show] }
+      let(:json_response) do
+        <<~EOS
+        [
+          {
+            "id":"lba-12345",
+            "name":"app-lb1",
+            "status":"active",
+            "created_at":"2012-03-05T12: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")
+          .to_return(:status => 200, :body => json_response)
+      end
+
+      it "shows load balancer details" do
+        aggregate_failures do
+          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")
+        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",
+          "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-12345",
+              "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)
+      end
 
-      it "does not error" do
-        expect { output }.to_not raise_error
+      it "shows load balancer details" do
+        aggregate_failures do
+          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
   end

data/spec/commands/lbs/update_spec.rb

@@ -23,7 +23,7 @@ describe "brightbox lbs" do
       let(:argv) { ["lbs", "update", "--ssl-min-ver", "TLSv1.0", "lba-12345"] }
 
       let(:json_response) do
-        <<-EOS
+        <<~EOS
         {
           "id":"lba-12345",
           "ssl_minimum_version":"TLSv1.0"
@@ -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
@@ -50,7 +50,7 @@ describe "brightbox lbs" do
       let(:argv) { ["lbs", "update", "--sslv3", "lba-grt24"] }
 
       let(:json_response) do
-        <<-EOS
+        <<~EOS
         {
           "id":"lba-grt24",
           "ssl_minimum_version":"TLSv1.0"
@@ -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
@@ -77,7 +77,7 @@ describe "brightbox lbs" do
       let(:argv) { ["lbs", "update", "--no-sslv3", "lba-kl432"] }
 
       let(:json_response) do
-        <<-EOS
+        <<~EOS
         {
           "id":"lba-kl432",
           "ssl_minimum_version":"TLSv1.0"
@@ -95,9 +95,53 @@ 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
+
+    context "--acme-domains=example.com" do
+      let(:argv) { ["lbs", "update", "--acme-domains", "example.com", "--listeners", "443:443:https:5000", "lba-12345"] }
+      let(:json_response) do
+        <<~EOS
+        {
+          "id":"lba-12345",
+          "acme": {
+            "domains": [
+              {
+                "identifier": "example.com",
+                "last_message": null,
+                "status": "pending"
+              }
+            ]
+          },
+          "certificate": null,
+          "listeners": [
+            {
+              "in": 443,
+              "out": 443,
+              "protocol": "https",
+              "proxy_protocol": null,
+              "timeout": 5000
+            }
+          ]
+        }
+        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 => '{"id":"lba-12345"}')
+
+        stub_request(:put, "http://api.brightbox.localhost/1.0/load_balancers/lba-12345?account_id=acc-12345")
+          .with(body: hash_including(domains: ["example.com"]))
+          .to_return(:status => 202, :body => json_response)
+      end
+
+      it "includes acme_certificate_domain in response" do
+        expect(stderr).to include("Updating load balancer lba-12345\n")
+        expect(stdout).to include("lba-12345")
+      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