brightbox-cli 5.0.0.rc1 → 5.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c8cd88f1d668182fcc07ad7ac31d8a3935bcf079321908ec56a364e59e0fe43
-  data.tar.gz: 4b5ae117508d213f075adebf4c70996e95001abe39a6e9de0769232d29f5d3c5
+  metadata.gz: 9eb6588f842b8e2bb0a2b48e1a1eece122697726faa67032b43a868f273b49cd
+  data.tar.gz: 41e2cd7ac07f8423f5a401196710c26befa93e50740248a0d8f430a16c67ec8d
 SHA512:
-  metadata.gz: 8b50ffa28cbb39bd012b39de3233ad1e6e29190723e2ed83f1239525c04bdbaa1927b7b26d528246fdbd5d9f6185ed08d88807ab58e7fd970b6dcadf65139b28
-  data.tar.gz: 022e0c725cc12e5d2db5178100f7434a9c52de94eb8330a88688238c9183944b1199016f75d9a868568498a37258bf13d3032b5e9fb3a357198b1605e117503e
+  metadata.gz: e6c6997a8f17a14293c46bc07b040b1d3b07fb3409e3fc60fe02b577e8f5cdf1bfde2fa5d5eb6ae526c680e558b114c28908c3d6614b8efa775a866e201830f3
+  data.tar.gz: 912baa8d1adba3c050bfc5d0f0fc69cf69621d5c28da4d063dfe4a6751e42c54d5b36dec2c017286579c745b3b9ce53bff8354f30081911bc0539e923eb3ece4

data/CHANGELOG.md

@@ -8,6 +8,9 @@ Backwards incompatible changes:
 * Update `Gemfile.lock` to use Bundler 2.4.22
 * When ENV `HOME` is not set, the working directory is used for configs
   rather than `/.brightbox` to fix issues with containers
+* `show` commands require at least one argument to
+   prevent an issue where the wrong, summary API was
+   used resulting in missing data in tables
 
 Enhancements:
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    brightbox-cli (5.0.0.rc1)
+    brightbox-cli (5.0.0.rc2)
       fog-brightbox (>= 1.12.0)
       fog-core (< 2.0)
       gli (~> 2.21)

data/lib/brightbox-cli/commands/images/show.rb

@@ -4,7 +4,11 @@ module Brightbox
     cmd.arg_name "image-id..."
     cmd.command [:show] do |c|
       c.action do |global_options, _options, args|
-        images = Image.find_all_or_warn(args)
+        raise "You must specify image IDs to show" if args.empty?
+
+        images = Image.find_or_call(args) do |id|
+          raise "Couldn't find an image with ID #{id}"
+        end
 
         display_options = {
           :vertical => true,

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

@@ -4,7 +4,11 @@ module Brightbox
     cmd.arg_name "lbs-id..."
     cmd.command [:show] do |c|
       c.action do |global_options, _options, args|
-        lbs = LoadBalancer.find_all_or_warn(args)
+        raise "You must specify load balancer IDs to show" if args.empty?
+
+        lbs = LoadBalancer.find_or_call(args) do |id|
+          raise "Couldn't find a load balancer with ID #{id}"
+        end
 
         table_opts = global_options.merge(
           :vertical => true,

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

@@ -4,7 +4,11 @@ module Brightbox
     cmd.arg_name "server-id..."
     cmd.command [:show] do |c|
       c.action do |global_options, _options, args|
-        servers = DetailedServer.find_all_or_warn(args)
+        raise "You must specify server IDs to show" if args.empty?
+
+        servers = DetailedServer.find_or_call(args) do |id|
+          raise "Couldn't find a server with ID #{id}"
+        end
 
         table_opts = global_options.merge(:vertical => true)
         render_table(servers, table_opts)

data/lib/brightbox-cli/commands/users/show.rb

@@ -4,7 +4,11 @@ module Brightbox
     cmd.arg_name "user-id..."
     cmd.command [:show] do |c|
       c.action do |global_options, _options, args|
-        users = User.find_all_or_warn(args)
+        raise "You must specify user IDs to show" if args.empty?
+
+        users = User.find_or_call(args) do |id|
+          raise "Couldn't find a user with ID #{id}"
+        end
 
         table_opts = global_options.merge(
           :vertical => true,

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

@@ -5,7 +5,11 @@ module Brightbox
 
     cmd.command [:show] do |c|
       c.action do |global_options, _options, args|
-        volumes = Volume.find_all_or_warn(args)
+        raise "You must specify volume IDs to show" if args.empty?
+
+        volumes = Volume.find_or_call(args) do |id|
+          raise "Couldn't find a volume with ID #{id}"
+        end
 
         table_opts = global_options.merge(
           :vertical => true,

data/lib/brightbox-cli/version.rb

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

data/spec/commands/images/show_spec.rb

@@ -17,35 +17,51 @@ RSpec.describe "brightbox images" do
     context "without arguments" do
       let(:argv) { %w[images show] }
 
+      it "reports missing IDs" do
+        expect { output }.to_not raise_error
+
+        aggregate_failures do
+          expect(stderr).to match("ERROR: You must specify image IDs to show")
+          expect(stdout).to eq("")
+        end
+      end
+    end
+
+    context "with identifier argument" do
+      let(:argv) { %w[images show img-11111] }
+
       before do
-        stub_request(:get, "#{api_url}/1.0/images?account_id=acc-12345")
+        expect(Brightbox::Image).to receive(:find)
+          .with("img-11111")
+          .and_call_original
+
+        stub_request(:get, "#{api_url}/1.0/images/img-11111?account_id=acc-12345")
           .to_return(
             status: 200,
-            body: [
-              {
-                id: "img-12345"
-              }
-            ].to_json
+            body: {
+              id: "img-11111",
+              min_ram: 2_048
+            }.to_json
           )
       end
 
       it "does not error" do
         expect { output }.to_not raise_error
 
-        expect(stderr).to match("")
-        expect(stderr).not_to match("ERROR")
-        expect(stdout).to match("img-12345")
+        aggregate_failures do
+          expect(stderr).to match("")
+          expect(stderr).not_to match("ERROR")
+          expect(stdout).to match("img-11111")
+
+          expect(stdout).to match("min_ram: 2048")
+        end
       end
     end
 
-    context "with identifier" do
-      let(:argv) { %w[images show img-11111] }
+    context "with multiple identifiers" do
+      let(:argv) { %w[images show img-11111 img-22222] }
 
       before do
-        expect(Brightbox::Image).to receive(:find)
-          .with("img-11111")
-          .and_call_original
-
         stub_request(:get, "#{api_url}/1.0/images/img-11111?account_id=acc-12345")
           .to_return(
             status: 200,
@@ -54,16 +70,30 @@ RSpec.describe "brightbox images" do
               min_ram: 2_048
             }.to_json
           )
+
+        stub_request(:get, "#{api_url}/1.0/images/img-22222?account_id=acc-12345")
+          .to_return(
+            status: 200,
+            body: {
+              id: "img-22222",
+              min_ram: 4_096
+            }.to_json
+          )
       end
 
       it "does not error" do
         expect { output }.to_not raise_error
 
-        expect(stderr).to match("")
-        expect(stderr).not_to match("ERROR")
-        expect(stdout).to match("img-11111")
+        aggregate_failures do
+          expect(stderr).to match("")
+          expect(stderr).not_to match("ERROR")
+
+          expect(stdout).to match("img-11111")
+          expect(stdout).to match("min_ram: 2048")
 
-        expect(stdout).to match("min_ram: 2048")
+          expect(stdout).to match("img-22222")
+          expect(stdout).to match("min_ram: 4096")
+        end
       end
     end
   end

data/spec/commands/lbs/show_spec.rb

@@ -11,29 +11,60 @@ 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": [
               {
-                "id":"srv-12345",
-                "status":"active"
+                "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?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
 
@@ -45,13 +76,18 @@ describe "brightbox lbs" do
           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",
@@ -87,13 +123,52 @@ 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 be_empty unless ENV["DEBUG"]
           expect(stdout).to include("id: lba-12345")
@@ -106,6 +181,17 @@ describe "brightbox lbs" do
           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/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/users/show_spec.rb

@@ -6,11 +6,76 @@ describe "brightbox users" 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[users show] }
 
       it "does not error" do
         expect { output }.to_not raise_error
+
+        aggregate_failures do
+          expect(stderr).to match("ERROR: You must specify user IDs to show")
+          expect(stdout).to be_empty
+        end
+      end
+    end
+
+    context "with identifier argument" do
+      let(:argv) { %w[users show usr-90781] }
+
+      before do
+        # FIXME: Two requests, one with the parameter and one without
+        #        One for ALL tests (with VCR breaking things)
+        #        One for this test standalone
+        stub_request(:get, "#{api_url}/1.0/users/usr-90781")
+          .to_return(
+            status: 200,
+            body: {
+              id: "usr-90781",
+              email_address: "user@domain.test",
+              accounts: [
+                {
+                  id: "acc-12345",
+                  name: "Test account"
+                }
+              ]
+            }.to_json
+          )
+
+        # Same again but supporting the account_id parameter
+        stub_request(:get, "#{api_url}/1.0/users/usr-90781")
+          .with(query: hash_including(account_id: "acc-12345"))
+          .to_return(
+            status: 200,
+            body: {
+              id: "usr-90781",
+              email_address: "user@domain.test",
+              accounts: [
+                {
+                  id: "acc-12345",
+                  name: "Test account"
+                }
+              ]
+            }.to_json
+          )
+      end
+
+      it "does not error" do
+        expect { output }.to_not raise_error
+
+        aggregate_failures do
+          expect(stderr).to match("")
+          expect(stderr).not_to match("ERROR")
+          expect(stdout).to match("usr-90781")
+          expect(stdout).to match("email_address: user@domain.test")
+        end
       end
     end
   end

data/spec/commands/volumes/show_spec.rb

@@ -8,45 +8,27 @@ describe "brightbox volumes show" do
   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"
-        )
-      )
+    WebMock.reset!
 
+    config_from_contents(API_CLIENT_CONFIG_CONTENTS)
+    stub_client_token_request
     Brightbox.config.reauthenticate
   end
 
   context "without arguments" do
     let(:argv) { %w[volumes show] }
 
-    before do
-      stub_request(:get, "http://api.brightbox.localhost/1.0/volumes")
-        .with(query: hash_including(account_id: "acc-12345"))
-        .to_return(
-          status: 200,
-          body: volumes_response
-        )
-    end
-
-    it "does not error" do
+    it "reports missing IDs" do
       expect { output }.to_not raise_error
 
-      expect(stderr).to be_empty unless ENV["DEBUG"]
-
       aggregate_failures do
-        expect(stdout).to match("id: vol-12345")
-        expect(stdout).to match("id: vol-abcde")
+        expect(stderr).to match("ERROR: You must specify volume IDs to show")
+        expect(stdout).to be_empty
       end
     end
   end
 
-  context "with identifier" do
+  context "with identifier argument" do
     let(:argv) { %w[volumes show vol-88878] }
 
     before do
@@ -92,4 +74,51 @@ describe "brightbox volumes show" do
       end
     end
   end
+
+  context "with multiple identifiers" do
+    let(:argv) { %w[volumes show vol-88878 vol-99999] }
+
+    before do
+      stub_request(:get, "http://api.brightbox.localhost/1.0/volumes/vol-88878")
+        .with(query: hash_including(account_id: "acc-12345"))
+        .to_return(
+          status: 200,
+          body: volume_response(
+            id: "vol-88878",
+            description: "A volume for testing",
+            filesystem_type: "ext4",
+            storage_type: "network",
+            size: 10_240,
+            status: "attached",
+            server: nil
+          )
+        )
+
+      stub_request(:get, "http://api.brightbox.localhost/1.0/volumes/vol-99999")
+        .with(query: hash_including(account_id: "acc-12345"))
+        .to_return(
+          status: 200,
+          body: volume_response(
+            id: "vol-99999",
+            description: "Another volume for testing",
+            filesystem_type: "ext4",
+            storage_type: "network",
+            size: 10_240,
+            status: "attached",
+            server: nil
+          )
+        )
+    end
+
+    it "does not error" do
+      expect { output }.to_not raise_error
+
+      expect(stderr).not_to match("ERROR")
+
+      aggregate_failures do
+        expect(stdout).to match("id: vol-88878")
+        expect(stdout).to match("id: vol-99999")
+      end
+    end
+  end
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brightbox-cli
 version: !ruby/object:Gem::Version
-  version: 5.0.0.rc1
+  version: 5.0.0.rc2
 platform: ruby
 authors:
 - John Leach
 - Paul Thornthwaite
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-20 00:00:00.000000000 Z
+date: 2025-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-brightbox
@@ -827,7 +826,6 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -838,12 +836,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.4.19
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: The Brightbox cloud management system
 test_files: