brightbox-cli 5.0.0.rc2 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9eb6588f842b8e2bb0a2b48e1a1eece122697726faa67032b43a868f273b49cd
-  data.tar.gz: 41e2cd7ac07f8423f5a401196710c26befa93e50740248a0d8f430a16c67ec8d
+  metadata.gz: 5e929ec8c3d8a07bace33e5bbe1d7abf05ab2bbea81478251dda30dfaf8092de
+  data.tar.gz: dba86d8b80857f383a4b9fa4a977c6ff34f02d837e1f1f959a10133eb893f9f3
 SHA512:
-  metadata.gz: e6c6997a8f17a14293c46bc07b040b1d3b07fb3409e3fc60fe02b577e8f5cdf1bfde2fa5d5eb6ae526c680e558b114c28908c3d6614b8efa775a866e201830f3
-  data.tar.gz: 912baa8d1adba3c050bfc5d0f0fc69cf69621d5c28da4d063dfe4a6751e42c54d5b36dec2c017286579c745b3b9ce53bff8354f30081911bc0539e923eb3ece4
+  metadata.gz: b805583af2e9a07fb8d1936e116ad6bf4df7e5d95c9e531400f2e1eb79db391ddb2b6f38362c402956e73d4e5495948bbfb341cd015b98d21f3e95d998138710
+  data.tar.gz: 19925cf75cbc66ac82b5e91a34a7fc76e18fc34086b91b7eb271659665664f6907d759cebf872b56b0cb6e5bace2ef053d0f501393e123d112a2bb6ad195096d

data/CHANGELOG.md

@@ -1,6 +1,6 @@
-### v5.0.0.rc1 / 2024-12-20
+### v5.0.0 / 2025-01-20
 
-[Full Changelog](https://github.com/brightbox/brightbox-cli/compare/v4.8.0...v5.0.0.rc1)
+[Full Changelog](https://github.com/brightbox/brightbox-cli/compare/v4.8.0...v5.0.0)
 
 Backwards incompatible changes:
 
@@ -11,6 +11,8 @@ Backwards incompatible changes:
 * `show` commands require at least one argument to
    prevent an issue where the wrong, summary API was
    used resulting in missing data in tables
+* `images` architecture is now its own `arch` column and no longer
+  combined with the name field.
 
 Enhancements:
 
@@ -60,6 +62,8 @@ Testing:
   test coverage.
 * Temporary testing config directories are removed explicitly to prevent
   config bleeding in some test scenarios
+* Tests for `server activate_console` confirm support for local time and
+  time zones.
 
 ### v4.8.0 / 2024-10-23
 

data/Gemfile.lock

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

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

@@ -23,7 +23,11 @@ module Brightbox
           uri.query = "password=#{r['console_token']}"
 
           expires = Time.parse(r["console_token_expires"])
-          consoles << { :url => uri.to_s, :token => r["console_token"], :expires => expires.localtime.to_s }
+          consoles << {
+            url: uri.to_s,
+            token: r["console_token"],
+            expires: expires.localtime.to_s
+          }
         end
 
         render_table(consoles, global_options.merge(:fields => %i[url token expires], :resize => false))

data/lib/brightbox-cli/images.rb

@@ -16,7 +16,7 @@ module Brightbox
     end
 
     def self.default_field_order
-      %i[id owner type created_on status size name]
+      %i[id owner type created_on status size arch name]
     end
 
     # Filter out images that are not of the right type, account or status if the option is passed
@@ -84,7 +84,7 @@ module Brightbox
         locked: locked?,
         username: username,
         arch: arch,
-        name: name.to_s + " (#{arch})",
+        name: name.to_s,
         owner: official ? "brightbox" : owner_id,
         type: type,
         created_at: created_at,

data/lib/brightbox-cli/version.rb

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

data/spec/commands/servers/activate_console_spec.rb

@@ -6,11 +6,153 @@ 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 activate_console] }
 
       it "does not error" do
         expect { output }.to_not raise_error
+
+        aggregate_failures do
+          expect(stderr).to match("ERROR: You must specify servers to activate the console for")
+          expect(stdout).to be_empty
+        end
+      end
+    end
+
+    context "with identifier argument" do
+      let(:argv) { %w[servers activate_console srv-lv426] }
+      let(:token_expires) { "2025-01-01T01:01:01Z" }
+
+      before do
+        stub_request(:get, "#{api_url}/1.0/servers/srv-lv426")
+          .with(query: hash_including(account_id: "acc-12345"))
+          .to_return(
+            status: 200,
+            body: {
+              id: "srv-lv426",
+              console_token: nil,
+              console_token_expires: nil,
+              console_url: nil,
+              image: {
+                id: "img-12345"
+              }
+            }.to_json
+          )
+
+        stub_request(:get, "#{api_url}/1.0/images")
+          .with(query: hash_including(account_id: "acc-12345"))
+          .to_return(
+            status: 200,
+            body: [
+              {
+                id: "img-12345"
+              }
+            ].to_json
+          )
+
+        stub_request(:post, "#{api_url}/1.0/servers/srv-lv426/activate_console")
+          .with(query: hash_including(account_id: "acc-12345"))
+          .to_return(
+            status: 202,
+            body: {
+              id: "srv-lv426",
+              console_token: "<test-token-placeholder>",
+              console_token_expires: token_expires,
+              console_url: "https://console.test.test/srv-lv426",
+              image: {
+                id: "img-12345"
+              }
+            }.to_json
+          )
+      end
+
+      context "when in different time zone" do
+        around do |example|
+          original_tz = ENV["TZ"]
+          example.run
+          ENV["TZ"] = original_tz
+        end
+
+        context "when in UTC" do
+          before do
+            ENV["TZ"] = "Europe/London"
+          end
+
+          context "without daylight savings" do
+            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("url")
+                expect(stdout).to match("https://console.test.test/srv-lv426")
+
+                expect(stdout).to match("token")
+                expect(stdout).to match("<test-token-placeholder>")
+
+                expect(stdout).to match("expires")
+                expect(stdout).to match("2025-01-01T01:01")
+              end
+            end
+          end
+
+          context "with daylight savings (BST)" do
+            let(:token_expires) { "2025-07-01T01:01:01Z" }
+
+            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("url")
+                expect(stdout).to match("https://console.test.test/srv-lv426")
+
+                expect(stdout).to match("token")
+                expect(stdout).to match("<test-token-placeholder>")
+
+                expect(stdout).to match("expires")
+                expect(stdout).to match("2025-07-01T02:01")
+              end
+            end
+          end
+        end
+
+        context "when in EST" do
+          around do |example|
+            ENV["TZ"] = "America/New_York"
+            example.run
+          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("url")
+              expect(stdout).to match("https://console.test.test/srv-lv426")
+
+              expect(stdout).to match("token")
+              expect(stdout).to match("<test-token-placeholder>")
+
+              expect(stdout).to match("expires")
+              expect(stdout).to match("2024-12-31T20:01")
+            end
+          end
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brightbox-cli
 version: !ruby/object:Gem::Version
-  version: 5.0.0.rc2
+  version: 5.0.0
 platform: ruby
 authors:
 - John Leach
 - Paul Thornthwaite
 bindir: bin
 cert_chain: []
-date: 2025-01-15 00:00:00.000000000 Z
+date: 2025-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-brightbox