brightbox-cli 4.7.0 → 4.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7421a4af403275a028e9738bfd7a32b3d9ec9c747a0ea5ddfdf570e51a4cafdd
-  data.tar.gz: f36372d185741699dc9f53595cf5acf633457a2ba002d045e731f15d54f02799
+  metadata.gz: 1957aedb76eb618990c1deca7846319433ce2cc3b88ed2f4b3eac0b4aca3b3c0
+  data.tar.gz: b7a83328c30eb76699b880cb8a6a356cf61bf3e362c19c50b1f8c4dcbbc17c6d
 SHA512:
-  metadata.gz: a3d2173640f650163f2602757c472174fe285f209c03d763aa8ca3e214ab67df5f94b1497abc8660675c7db2452b12b720ccaeb477ddaf2e3c5431a0b3d4e1f8
-  data.tar.gz: dd875beb01cbe080cf47fc4eeaadf6581a95671fdd3808972901d883c601df40cb23291d7fd3681b289025eb31f83c66011ae8eaa5981340f08f5fd9997e7afd
+  metadata.gz: 1a2a3316ce568a85d06eea928b5382d0a9a0b2737e2e14c01940a2f2071f8cd10d5c7a25c4f3af2878d5d453c98d70b1bfb50a6fa92b46ed7c5ca4f075fb844f
+  data.tar.gz: 3cd77f4748d94aea53ac8685268228f112aef95e9c8b9a8aca00692d67dc10e92948fa5acef2c696cf6ce08c58920ded07a1167e3933fcc4faf9e2736c480903

data/.github/workflows/ruby.yml

@@ -20,7 +20,7 @@ jobs:
 
     strategy:
       matrix:
-        ruby: ["2.5", "2.6", "2.7", "3.0", "3.1", "head"]
+        ruby: ["2.5", "2.6", "2.7", "3.0", "3.1", "3.2", "3.3"]
 
     steps:
     - uses: actions/checkout@v3

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+### v4.8.0 / 2024-10-23
+
+[Full Changelog](https://github.com/brightbox/brightbox-cli/compare/v4.7.0...v4.8.0)
+
+Changes:
+
+* Increase supported Server `user-data` limit to match 64KiB now
+  supported by API.
+
 ### v4.7.0 / 2024-01-03
 
 [Full Changelog](https://github.com/brightbox/brightbox-cli/compare/v4.6.0...v4.7.0)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    brightbox-cli (4.7.0)
+    brightbox-cli (4.8.0)
       dry-inflector (= 0.2.0)
       fog-brightbox (>= 1.11.0)
       fog-core (< 2.0)
@@ -18,14 +18,14 @@ GEM
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.2)
-    builder (3.2.4)
+    builder (3.3.0)
     coderay (1.1.3)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.3.4)
     crack (0.4.5)
       rexml
     diff-lcs (1.5.0)
     dry-inflector (0.2.0)
-    excon (0.108.0)
+    excon (0.112.0)
     fog-brightbox (1.11.0)
       dry-inflector
       fog-core (>= 1.45, < 3.0)
@@ -38,16 +38,18 @@ GEM
       fog-core
       multi_json (~> 1.10)
     formatador (0.3.0)
-    gli (2.21.1)
+    gli (2.21.5)
     hashdiff (1.0.1)
     highline (2.1.0)
     hirb (0.7.3)
     i18n (1.10.0)
       concurrent-ruby (~> 1.0)
+    logger (1.6.1)
     method_source (1.0.0)
-    mime-types (3.5.2)
+    mime-types (3.6.0)
+      logger
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2023.1205)
+    mime-types-data (3.2024.1001)
     mocha (1.14.0)
     multi_json (1.15.0)
     parallel (1.22.1)

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

@@ -69,10 +69,8 @@ module Brightbox
         if user_data_file
           raise "Cannot specify user data on command line and in file at same time" if user_data
 
-          # Wot we use to read the data, be it from stdin or a file on disk
+          # Used to read the data, be it from stdin or a file on disk
           file_handler = lambda do |fh|
-            raise "User data file too big (>16k)" if fh.stat.size > 16 * 1024
-
             user_data = fh.read
           end
           # Figure out how to invoke file_handler, and then invoke it
@@ -88,7 +86,7 @@ module Brightbox
             require "base64"
             user_data = Base64.encode64(user_data)
           end
-          raise "User data too big (>16k)" if user_data.size > 16 * 1024
+          raise "Encoded user-data exceeds 64KiB limit" if user_data.size > 64 * 1024
         end
 
         # Split server groups into array of identifiers (or empty array)

data/lib/brightbox-cli/version.rb

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

data/spec/commands/servers/create_spec.rb

@@ -195,6 +195,58 @@ describe "brightbox servers" do
       end
     end
 
+    context "with --user-data flag" do
+      before do
+        expect(Brightbox::Image).to receive(:find).with("img-12345").and_return(image)
+        expect(Brightbox::Type).to receive(:find_by_handle).and_return(type)
+      end
+
+      context "with user data string within limit" do
+        let(:argv) { ["servers", "create", "--user-data", user_data, "--no-base64", "img-12345"] }
+        let(:user_data) { ("a" * 65_535) }
+
+        it "requests new server with user data" do
+          stub_request(:post, "http://api.brightbox.localhost/1.0/servers?account_id=acc-12345")
+            .with(:headers => { "Content-Type" => "application/json" },
+                  body: hash_including(user_data: user_data))
+            .and_return(status: 202, body: sample_response)
+
+          aggregate_failures do
+            expect(stderr).not_to match("ERROR")
+            expect(stdout).to match("srv-12345")
+          end
+        end
+      end
+
+      context "with user data string encoded by client" do
+        let(:argv) { ["servers", "create", "--user-data", user_data, "--base64", "img-12345"] }
+        let(:encoded_user_data) { Base64.encode64(user_data) }
+        let(:user_data) { ("a" * 48_345) }
+
+        it "requests new server with user data" do
+          stub_request(:post, "http://api.brightbox.localhost/1.0/servers?account_id=acc-12345")
+            .with(:headers => { "Content-Type" => "application/json" },
+                  body: hash_including(user_data: encoded_user_data))
+            .and_return(status: 202, body: sample_response)
+
+          aggregate_failures do
+            expect(stderr).not_to match("ERROR")
+            expect(stdout).to match("srv-12345")
+          end
+        end
+      end
+
+      context "with user data string exceeding limit" do
+        let(:argv) { ["servers", "create", "--user-data", user_data, "img-12345"] }
+        let(:user_data) { ("a" * 65_535) + "b" }
+
+        it "errors" do
+          expect(stderr).to match("Encoded user-data exceeds 64KiB limit")
+          expect(stdout).not_to match("srv-12345")
+        end
+      end
+    end
+
     def sample_response
       '{
         "id": "srv-12345",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brightbox-cli
 version: !ruby/object:Gem::Version
-  version: 4.7.0
+  version: 4.8.0
 platform: ruby
 authors:
 - John Leach
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-03 00:00:00.000000000 Z
+date: 2024-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-brightbox
@@ -819,7 +819,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: The Brightbox cloud management system