brightbox-cli 4.0.0 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf8d230d121ac70d4971ed2acf19776ed75bac9256d4f4ea7d980af8e563350a
-  data.tar.gz: feb53ae71fe302c76fcbe2f6b4e1e67723b64d706266ed3db5531195df9ec167
+  metadata.gz: ca69156ede91fd3e18f145220446de7c27201dab8cbfeaeb345e8ecb7e5a0b4d
+  data.tar.gz: 6d3490e0f8eabb5d92ed1df481f7ca2bba8a359d7fdf02b554b0265d1fee7294
 SHA512:
-  metadata.gz: c5325d637d559f620a9b5a4cff4157aa67f6da2a802329c59d81270a429958afbf5e7d9f982d59d99786f099931b64bd1f50feedd123e6221371580234ac8986
-  data.tar.gz: 97431207227f81834213a4ab61c6d77d78f526ba4ec1a1885975c4169299cb4f88c323197984391ffed000feee9523b0a4aabbc7075fc15fe8389943400cb8d9
+  metadata.gz: 6e0d7038f22cf7dae99d961782761a587b7b3a13f3ad7bd00d17a95816c696b77463b681066993355c7478a935414068d98173110eefa17a38e00e24c2d9a3ec
+  data.tar.gz: 78db49f41e1d8d89fd1b69dfb70cd4d316a9d85b30f3c45c77af541934b2682b5c8e4eef07bafdaba19ca3cf29ea061fe0420c1a2c7b8221f754b7b0bafa154c

data/CHANGELOG.md

@@ -1,3 +1,25 @@
+### v4.2.0 / 2022-11-01
+
+[Full Changelog](https://github.com/brightbox/brightbox-cli/compare/v4.1.0...v4.2.0)
+
+Changes:
+
+* Adds three new, mutually exclusive options to `images create` to specify
+  different sources:
+  * `url` can specify source as a URL for a HTTP or HTTPS download rather than
+     an existing FTP upload.
+  * `server` can specify a server ID to create a snapshot image from.
+  * `volume` can specify a volume ID to create a snapshot image from.
+
+### v4.1.0 / 2022-08-01
+
+[Full Changelog](https://github.com/brightbox/brightbox-cli/compare/v4.0.0...v4.1.0)
+
+Changes:
+
+* Adds `volume-size` to `servers create` to allow passing of arbitrary sizes for
+  network based storage types.
+
 ### v4.0.0 / 2022-08-01
 
 [Full Changelog](https://github.com/brightbox/brightbox-cli/compare/v3.3.0...v4.0.0)

data/Gemfile.lock

@@ -1,16 +1,16 @@
 PATH
   remote: .
   specs:
-    brightbox-cli (4.0.0)
+    brightbox-cli (4.2.0)
       dry-inflector (= 0.2.0)
-      fog-brightbox (>= 1.7.0)
+      fog-brightbox (>= 1.8.0)
       fog-core (< 2.0)
-      gli (~> 2.21.0)
-      highline (~> 1.6.0)
+      gli (~> 2.21)
+      highline (~> 1.6)
       hirb (~> 0.6)
       i18n (>= 0.6, < 1.11)
-      mime-types (~> 2.6)
-      multi_json (~> 1.11.0)
+      mime-types (~> 3.0)
+      multi_json (~> 1.11)
 
 GEM
   remote: https://rubygems.org/
@@ -25,8 +25,8 @@ GEM
       rexml
     diff-lcs (1.5.0)
     dry-inflector (0.2.0)
-    excon (0.92.4)
-    fog-brightbox (1.7.0)
+    excon (0.93.1)
+    fog-brightbox (1.8.0)
       dry-inflector
       fog-core (>= 1.45, < 3.0)
       fog-json
@@ -40,14 +40,16 @@ GEM
     formatador (0.3.0)
     gli (2.21.0)
     hashdiff (1.0.1)
-    highline (1.6.21)
+    highline (1.7.10)
     hirb (0.7.3)
     i18n (1.10.0)
       concurrent-ruby (~> 1.0)
     method_source (1.0.0)
-    mime-types (2.99.3)
+    mime-types (3.4.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2022.0105)
     mocha (1.14.0)
-    multi_json (1.11.3)
+    multi_json (1.15.0)
     parallel (1.22.1)
     parser (3.1.2.0)
       ast (~> 2.4.1)

data/Jenkinsfile

@@ -9,54 +9,34 @@ pipeline {
   stages {
     stage("Run tests") {
       parallel {
-        stage("Ruby 2.0") {
-          agent {
-            docker {
-              image 'ruby:2.0'
-            }
-          }
-          steps {
-            sh 'bundle install --deployment'
-            sh 'bundle exec rake spec'
-          }
-        }
-        stage("Ruby 2.1") {
-          agent {
-            docker {
-              image 'ruby:2.1'
-            }
-          }
-          steps {
-            sh 'bundle install --deployment'
-            sh 'bundle exec rake spec'
-          }
-        }
-        stage("Ruby 2.2") {
+        stage("Ruby 2.5") {
           agent {
             docker {
-              image 'ruby:2.2'
+              image 'ruby:2.5'
             }
           }
           steps {
+            sh 'gem install bundler:2.1.4'
             sh 'bundle install --deployment'
             sh 'bundle exec rake spec'
           }
         }
-        stage("Ruby 2.3") {
+        stage("Ruby 2.6") {
           agent {
             docker {
-              image 'ruby:2.3'
+              image 'ruby:2.6'
             }
           }
           steps {
+            sh 'gem install bundler:2.1.4'
             sh 'bundle install --deployment'
             sh 'bundle exec rake spec'
           }
         }
-        stage("Ruby 2.4") {
+        stage("Ruby 2.7") {
           agent {
             docker {
-              image 'ruby:2.4'
+              image 'ruby:2.7'
             }
           }
           steps {
@@ -64,10 +44,10 @@ pipeline {
             sh 'bundle exec rake spec'
           }
         }
-        stage("Ruby 2.5") {
+        stage("Ruby 3.0") {
           agent {
             docker {
-              image 'ruby:2.5'
+              image 'ruby:3.0'
             }
           }
           steps {
@@ -75,10 +55,10 @@ pipeline {
             sh 'bundle exec rake spec'
           }
         }
-        stage("Ruby 2.6") {
+        stage("Ruby 3.1") {
           agent {
             docker {
-              image 'ruby:2.6'
+              image 'ruby:3.1'
             }
           }
           steps {

data/brightbox-cli.gemspec

@@ -21,14 +21,14 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "fog-brightbox", ">= 1.7.0"
+  s.add_dependency "fog-brightbox", ">= 1.8.0"
   s.add_dependency "fog-core", "< 2.0"
-  s.add_dependency "gli", "~> 2.21.0"
-  s.add_dependency "highline", "~> 1.6.0"
+  s.add_dependency "gli", "~> 2.21"
+  s.add_dependency "highline", "~> 1.6"
   s.add_dependency "hirb", "~> 0.6"
   s.add_dependency "i18n", ">= 0.6", "< 1.11"
-  s.add_dependency "mime-types", "~> 2.6"
-  s.add_dependency "multi_json", "~> 1.11.0"
+  s.add_dependency "mime-types", "~> 3.0"
+  s.add_dependency "multi_json", "~> 1.11"
 
   # Indirect dependency
   # 0.3 drops support for Ruby < 2.7

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

@@ -11,17 +11,26 @@ module Brightbox
       c.desc "Image Username"
       c.flag [:u, "username"]
 
-      c.desc "Archtecture of the image (i686 or x86_64)"
+      c.desc "Architecture of the image (i686 or x86_64)"
       c.flag [:a, "arch"]
 
       c.desc "Source filename of the image you uploaded to the image library"
       c.flag [:s, "source"]
 
+      c.desc "Source server ID to create image from"
+      c.flag ["server"]
+
+      c.desc "Source URL of the image to download via HTTP"
+      c.flag ["url"]
+
+      c.desc "Source volume ID to create image from"
+      c.flag ["volume"]
+
       c.desc "Set image mode to be either 'virtio' or 'compatibility'"
       c.default_value "virtio"
       c.flag [:m, "mode"]
 
-      c.desc "Set image to be publically visible (true or false)"
+      c.desc "Set image to be publicly visible (true or false)"
       c.default_value "false"
       c.flag [:p, "public"]
 
@@ -30,22 +39,38 @@ module Brightbox
 
       c.action do |global_options, options, _args|
         raise "You must specify the architecture" unless options[:a]
-        raise "You must specify the source filename" unless options[:s]
         raise "Mode must be 'virtio' or 'compatibility'" unless options[:m] == "virtio" || options[:m] == "compatibility"
         raise "Public must be true or false" unless options[:p] == "true" || options[:p] == "false"
 
+        # Sources are mutually exclusive but at least one is required from this list
+        source_options = [:s, :server, :url, :volume].map { |k| options[k] }
+
+        if source_options.none?
+          raise "You must specify one of 'server', 'source', 'url', or 'volume'"
+        elsif !source_options.one?
+          raise "You cannot register from multiple sources. Use either 'source', 'server', 'url', or 'volume'"
+        end
+
         compatibility_flag = options[:m] == "compatibility"
 
         public_flag = options[:p] == "true"
 
         image_options = {
-          :name => options[:n], :arch => options[:a],
-          :username => options[:u], :source => options[:s],
+          :arch => options[:a],
           :compatibility_mode => compatibility_flag,
-          :description => options[:d], :public => public_flag,
-          :min_ram => options["min-ram"].to_i
+          :description => options[:d],
+          :min_ram => options["min-ram"].to_i,
+          :name => options[:n],
+          :public => public_flag,
+          :username => options[:u]
         }
 
+        # These should be limited to one by the mutually exclusive check earlier
+        image_options[:http_url] = options[:url] if options[:url]
+        image_options[:server] = options[:server] if options[:server]
+        image_options[:source] = options[:s] if options[:s]
+        image_options[:volume] = options[:volume] if options[:volume]
+
         image = Image.register(image_options)
 
         render_table([image], global_options)

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

@@ -37,6 +37,9 @@ module Brightbox
       c.desc I18n.t("servers.create.cloud_ip.desc")
       c.flag ["cloud-ip"]
 
+      c.desc I18n.t("servers.create.volume_size.desc")
+      c.flag ["volume-size"]
+
       c.action do |global_options, options, args|
         if args.empty?
           raise "You must specify the image_id as the first argument"
@@ -114,13 +117,17 @@ module Brightbox
           :flavor_id => type.id,
           :zone_id => zone.to_s,
           :name => options[:n],
-          :user_data => user_data,
-          :server_groups => server_groups.map(&:id)
+          :user_data => user_data
         }
 
+        params[:server_groups] = server_groups.map(&:id) if server_groups.any?
         params[:cloud_ip] = options[:"cloud-ip"] if options.key?(:"cloud-ip")
         params[:disk_encrypted] = options[:"disk-encrypted"] if options.key?(:"disk-encrypted")
 
+        if options.key?(:"volume-size") && !options[:"volume-size"].nil?
+          params[:volume_size] = options[:"volume-size"].to_i
+        end
+
         servers = Server.create_servers options[:i], params
         render_table(servers, global_options)
       end

data/lib/brightbox-cli/version.rb

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

data/locales/en.yml

@@ -144,6 +144,8 @@ en:
       desc: Create servers
       cloud_ip:
         desc: Immediately map a Cloud IP to new server? Either "true" or the identifier of the Cloud IP
+      volume_size:
+        desc: Specify a custom volume size (in MiB) when building a network block storage server
     destroy:
       desc: Destroy servers
     lock:

data/spec/commands/images/register_spec.rb

@@ -23,7 +23,67 @@ describe "brightbox images" do
       end
     end
 
-    context "with minimal arguments" do
+    context "without any source" do
+      let(:argv) { %w[images register --arch x86_64] }
+
+      it "does not error" do
+        expect { output }.to_not raise_error
+
+        expect(stderr).to match("ERROR: You must specify one of 'server', 'source', 'url', or 'volume'")
+        expect(stdout).to match("")
+      end
+    end
+
+    context "with mutually exclusive arguments" do
+      let(:argv) { %w[images register --arch x86_64 --source test.img --url http://example.com/test.img] }
+
+      it "does not error" do
+        expect { output }.to_not raise_error
+
+        expect(stderr).to match("ERROR: You cannot register from multiple sources. Use either 'source', 'server', 'url', or 'volume'")
+        expect(stdout).to match("")
+      end
+    end
+
+    context "with 'server' argument" do
+      let(:argv) { %w[images register --arch x86_64 --server srv-12345] }
+
+      before do
+        expect(Brightbox::Image).to receive(:register)
+          .with(hash_including(
+                  arch: "x86_64",
+                  server: "srv-12345"
+                ))
+          .and_call_original
+
+        stub_request(:post, "#{api_url}/1.0/images?account_id=acc-12345")
+          .with(body: /"server":"srv-12345"/)
+          .to_return(
+            status: 201,
+            body: {
+              id: "img-12345"
+            }.to_json
+          )
+
+        stub_request(:get, "#{api_url}/1.0/images/img-12345?account_id=acc-12345")
+          .to_return(
+            status: 200,
+            body: {
+              id: "img-12345"
+            }.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")
+      end
+    end
+
+    context "with 'source' argument" do
       let(:argv) { %w[images register --arch x86_64 --source custom.img] }
 
       before do
@@ -61,6 +121,82 @@ describe "brightbox images" do
       end
     end
 
+    context "with 'url' argument" do
+      let(:argv) { %w[images register --arch x86_64 --url https://example.com/os-22.iso] }
+
+      before do
+        expect(Brightbox::Image).to receive(:register)
+          .with(hash_including(
+                  arch: "x86_64",
+                  http_url: "https://example.com/os-22.iso"
+                ))
+          .and_call_original
+
+        stub_request(:post, "#{api_url}/1.0/images?account_id=acc-12345")
+          .with(body: %r{"http_url":"https://example.com/os-22.iso"})
+          .to_return(
+            status: 201,
+            body: {
+              id: "img-12345"
+            }.to_json
+          )
+
+        stub_request(:get, "#{api_url}/1.0/images/img-12345?account_id=acc-12345")
+          .to_return(
+            status: 200,
+            body: {
+              id: "img-12345"
+            }.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")
+      end
+    end
+
+    context "with 'volume' argument" do
+      let(:argv) { %w[images register --arch x86_64 --volume vol-12345] }
+
+      before do
+        expect(Brightbox::Image).to receive(:register)
+          .with(hash_including(
+                  arch: "x86_64",
+                  volume: "vol-12345"
+                ))
+          .and_call_original
+
+        stub_request(:post, "#{api_url}/1.0/images?account_id=acc-12345")
+          .with(body: /"volume":"vol-12345"/)
+          .to_return(
+            status: 201,
+            body: {
+              id: "img-12345"
+            }.to_json
+          )
+
+        stub_request(:get, "#{api_url}/1.0/images/img-12345?account_id=acc-12345")
+          .to_return(
+            status: 200,
+            body: {
+              id: "img-12345"
+            }.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")
+      end
+    end
+
     context "with min-ram argument" do
       let(:argv) { %w[images register --arch x86_64 --source custom.img --min-ram 2048] }
 

data/spec/commands/servers/create_spec.rb

@@ -28,6 +28,24 @@ describe "brightbox servers" do
       end
     end
 
+    context "with image argument" do
+      let(:argv) { %w[servers create img-12345] }
+
+      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
+
+      it "does not error" do
+        stub_request(:post, "http://api.brightbox.localhost/1.0/servers?account_id=acc-12345")
+          .with(:body => hash_including(image: "img-12345"))
+          .and_return(:status => 202, :body => sample_response)
+
+        expect(stderr).not_to match("ERROR")
+        expect(stdout).to match("srv-12345")
+      end
+    end
+
     context "with --cloud-ip with nominated IP argument" do
       let(:argv) { %w[servers create --cloud-ip cip-12345 img-12345] }
 
@@ -86,6 +104,90 @@ describe "brightbox servers" do
       end
     end
 
+    context "with --server-groups flag" do
+      let(:argv) { %w[servers create --server-groups grp-12345,grp-67890 img-12345] }
+      let(:group_ids) { %w(grp-12345 grp-67890) }
+      let(:group_one) { double(:id => "grp-12345") }
+      let(:group_two) { double(:id => "grp-67890") }
+
+      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)
+        expect(Brightbox::ServerGroup).to receive(:find_or_call).with(group_ids).and_return([group_one, group_two])
+      end
+
+      it "requests new server be in both server groups" do
+        stub_request(:post, "http://api.brightbox.localhost/1.0/servers?account_id=acc-12345")
+          .with(:headers => { "Content-Type" => "application/json" },
+                :body => hash_including(:server_groups => group_ids))
+          .and_return(:status => 202, :body => sample_response)
+
+        expect(stderr).to match("Creating a nano")
+        expect(stderr).not_to match("ERROR")
+        expect(stdout).to match("srv-12345")
+      end
+    end
+
+    context "without --server-groups flag" do
+      let(:argv) { %w[servers create img-12345] }
+
+      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
+
+      it "requests new server be in both server groups" do
+        stub_request(:post, "http://api.brightbox.localhost/1.0/servers?account_id=acc-12345")
+          .with(:headers => { "Content-Type" => "application/json" })
+          .with { |request| hash_excluding("server_groups") === JSON.parse(request.body) }
+          .and_return(:status => 202, :body => sample_response)
+
+        expect(stderr).to match("Creating a nano")
+        expect(stderr).not_to match("ERROR")
+        expect(stdout).to match("srv-12345")
+      end
+    end
+
+    context "with --volume-size switch", vcr: false do
+      context "with network storage" do
+        let(:argv) { %w[servers create --type=2gb.nbs --volume-size=10000 img-12345] }
+
+        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
+
+        it "requests new server with a custom volume size" do
+          stub_request(:post, "http://api.brightbox.localhost/1.0/servers?account_id=acc-12345")
+            .with(:headers => { "Content-Type" => "application/json" },
+                  body: hash_including(volumes: [{ image: "img-12345", size: 10000 }]))
+            .and_return(status: 202, body: sample_response)
+
+          expect(stderr).not_to match("ERROR")
+          expect(stdout).to match("srv-12345")
+        end
+      end
+
+      context "without network storage type" do
+        let(:argv) { %w[servers create --type=nano --volume-size=10000 img-12345] }
+
+        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
+
+        it "requests new server with a custom volume size" do
+          stub_request(:post, "http://api.brightbox.localhost/1.0/servers?account_id=acc-12345")
+            .with(:headers => { "Content-Type" => "application/json" },
+                  body: hash_including(volumes: [{ image: "img-12345", size: 10000 }]))
+            .and_return(status: 202, body: sample_response)
+
+          expect(stderr).not_to match("ERROR")
+          expect(stdout).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.0.0
+  version: 4.2.0
 platform: ruby
 authors:
 - John Leach
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: fog-core
   requirement: !ruby/object:Gem::Requirement
@@ -45,28 +45,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.21.0
+        version: '2.21'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.21.0
+        version: '2.21'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: hirb
   requirement: !ruby/object:Gem::Requirement
@@ -107,28 +107,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: '1.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: dry-inflector
   requirement: !ruby/object:Gem::Requirement