brightbox-cli 4.2.0 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca69156ede91fd3e18f145220446de7c27201dab8cbfeaeb345e8ecb7e5a0b4d
-  data.tar.gz: 6d3490e0f8eabb5d92ed1df481f7ca2bba8a359d7fdf02b554b0265d1fee7294
+  metadata.gz: 517f21d7fc3e156180d8558868220e332943bd12ee492754e727d3f23d03d89c
+  data.tar.gz: ba05065d1729812c1aa1b41f44767872ea863a8295f8074ae8050742c1903e68
 SHA512:
-  metadata.gz: 6e0d7038f22cf7dae99d961782761a587b7b3a13f3ad7bd00d17a95816c696b77463b681066993355c7478a935414068d98173110eefa17a38e00e24c2d9a3ec
-  data.tar.gz: 78db49f41e1d8d89fd1b69dfb70cd4d316a9d85b30f3c45c77af541934b2682b5c8e4eef07bafdaba19ca3cf29ea061fe0420c1a2c7b8221f754b7b0bafa154c
+  metadata.gz: 1218d3d1956bac00755dde84bc1546f43dc05f4ea3386420b47745039326ad01f50f016faee353474e620beba0105e059de437085334da2bb4c6545392426880
+  data.tar.gz: 8ca4763dfbc21624b85ca97ea70525da34e4a2adb19abb405b2f95b8f8df500180a7780d0d13ffc6bc9cfade8306ed904a0fbbd56e95af1ad33ab913f16c6e7a

data/CHANGELOG.md

@@ -1,8 +1,29 @@
+### v4.3.0 / 2023-01-11
+
+[Full Changelog](https://github.com/brightbox/brightbox-cli/compare/v4.2.1...v4.3.0)
+
+Enhancements:
+
+* Adds `volumes` subcommand for Volume management.
+
+Changes:
+
+* Update `fog-brightbox` to `v1.7.0`
+
+### v4.2.1 / 2022-11-16
+
+[Full Changelog](https://github.com/brightbox/brightbox-cli/compare/v4.2.0...v4.2.1)
+
+Bug fixes:
+
+* Bumped version of `highline` gem to fix issue when prompting for password during `brightbox login` command on Ruby 3.0+.
+* Fixed help output for `brightbox login` by correcting DSL declaration.
+
 ### v4.2.0 / 2022-11-01
 
 [Full Changelog](https://github.com/brightbox/brightbox-cli/compare/v4.1.0...v4.2.0)
 
-Changes:
+Enhancements:
 
 * Adds three new, mutually exclusive options to `images create` to specify
   different sources:
@@ -15,7 +36,7 @@ Changes:
 
 [Full Changelog](https://github.com/brightbox/brightbox-cli/compare/v4.0.0...v4.1.0)
 
-Changes:
+Enhancements:
 
 * Adds `volume-size` to `servers create` to allow passing of arbitrary sizes for
   network based storage types.

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    brightbox-cli (4.2.0)
+    brightbox-cli (4.3.0)
       dry-inflector (= 0.2.0)
-      fog-brightbox (>= 1.8.0)
+      fog-brightbox (>= 1.9.1)
       fog-core (< 2.0)
       gli (~> 2.21)
-      highline (~> 1.6)
+      highline (~> 2.0)
       hirb (~> 0.6)
       i18n (>= 0.6, < 1.11)
       mime-types (~> 3.0)
@@ -25,8 +25,8 @@ GEM
       rexml
     diff-lcs (1.5.0)
     dry-inflector (0.2.0)
-    excon (0.93.1)
-    fog-brightbox (1.8.0)
+    excon (0.97.0)
+    fog-brightbox (1.9.1)
       dry-inflector
       fog-core (>= 1.45, < 3.0)
       fog-json
@@ -40,7 +40,7 @@ GEM
     formatador (0.3.0)
     gli (2.21.0)
     hashdiff (1.0.1)
-    highline (1.7.10)
+    highline (2.1.0)
     hirb (0.7.3)
     i18n (1.10.0)
       concurrent-ruby (~> 1.0)
@@ -117,4 +117,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.1.4
+   2.2.33

data/brightbox-cli.gemspec

@@ -21,10 +21,10 @@ 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.8.0"
+  s.add_dependency "fog-brightbox", ">= 1.9.1"
   s.add_dependency "fog-core", "< 2.0"
   s.add_dependency "gli", "~> 2.21"
-  s.add_dependency "highline", "~> 1.6"
+  s.add_dependency "highline", "~> 2.0"
   s.add_dependency "hirb", "~> 0.6"
   s.add_dependency "i18n", ">= 0.6", "< 1.11"
   s.add_dependency "mime-types", "~> 3.0"

data/lib/brightbox-cli/commands/login.rb

@@ -1,13 +1,12 @@
 module Brightbox
+  desc I18n.t("login.desc")
+  arg :email
   command [:login] do |cmd|
-    cmd.desc I18n.t("login.desc")
-    cmd.arg_name "email"
-
     cmd.desc "password, if not specified you will be prompted"
-    cmd.flag [:p, "password"]
+    cmd.flag [:p, "password"], arg_name: "password"
 
-    cmd.desc "default account"
-    cmd.flag [:"default-account"]
+    cmd.desc "Set a default account"
+    cmd.flag [:"default-account"], arg_name: "acc-12345"
 
     cmd.flag [:"application-id"]
     cmd.flag [:"application-secret"]

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

@@ -0,0 +1,36 @@
+module Brightbox
+  command [:volumes] do |cmd|
+    cmd.desc I18n.t("volumes.attach.desc")
+    cmd.arg_name I18n.t("volumes.attach.args")
+
+    cmd.command [:attach] do |c|
+      c.desc I18n.t("volumes.options.boot")
+      c.default_value false
+      c.switch [:boot], negatable: true
+
+      c.action do |global_options, options, args|
+        vol_id = args.shift
+
+        if vol_id.nil? || !vol_id.start_with?("vol-")
+          raise I18n.t("volumes.args.specify_one_id_first")
+        end
+
+        srv_id = args.shift
+
+        if srv_id.nil? || !srv_id.start_with?("srv-")
+          raise I18n.t("volumes.attach.specify_server_id_second")
+        end
+
+        boot_flag = options[:boot]
+
+        volume = Volume.find(vol_id)
+
+        info I18n.t("volumes.attach.acting", volume: volume)
+        volume.attach(server: srv_id, boot: boot_flag)
+        volume.reload
+
+        render_table([volume], global_options)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,45 @@
+module Brightbox
+  command [:volumes] do |cmd|
+    cmd.desc I18n.t("volumes.copy.desc")
+    cmd.arg_name I18n.t("volumes.args.one")
+
+    cmd.command [:copy] do |c|
+      c.desc I18n.t("options.description.desc")
+      c.flag %i[d description]
+
+      c.desc I18n.t("volumes.options.delete_with_server")
+      c.default_value false
+      c.switch ["delete-with-server"], negatable: true
+
+      c.desc I18n.t("options.name.desc")
+      c.flag %i[n name]
+
+      c.desc I18n.t("volumes.options.serial")
+      c.flag [:serial]
+
+      c.action do |global_options, options, args|
+        vol_id = args.shift
+
+        if vol_id.nil? || !vol_id.start_with?("vol-")
+          raise I18n.t("volumes.args.specify_one_id_first")
+        end
+
+        params = {
+          delete_with_server: options["delete-with-server"]
+        }
+        params[:description] = options[:description] if options[:description]
+        params[:name] = options[:name] if options[:name]
+        params[:serial] = options[:serial] if options[:serial]
+
+        volume = Volume.find(vol_id)
+
+        unless params.empty?
+          info I18n.t("volumes.copy.acting", volume: volume)
+          volume.copy(params)
+        end
+
+        render_table([volume], global_options)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,63 @@
+module Brightbox
+  command [:volumes] do |cmd|
+    cmd.desc I18n.t("volumes.create.desc")
+
+    cmd.command [:create] do |c|
+      c.desc I18n.t("options.description.desc")
+      c.flag %i[d description]
+
+      c.desc I18n.t("volumes.options.delete_with_server")
+      c.default_value false
+      c.switch ["delete-with-server"], negatable: true
+
+      c.desc I18n.t("volumes.options.encrypted")
+      c.switch %i[e encrypted], negatable: true
+
+      c.desc I18n.t("volumes.options.fs_label")
+      c.flag ["fs-label"]
+
+      c.desc I18n.t("volumes.options.fs_type")
+      c.flag ["fs-type"]
+
+      c.desc I18n.t("volumes.options.image")
+      c.flag %i[i image]
+
+      c.desc I18n.t("options.name.desc")
+      c.flag %i[n name]
+
+      c.desc I18n.t("volumes.options.serial")
+      c.flag [:serial]
+
+      c.desc I18n.t("volumes.options.size")
+      c.flag %i[s size]
+
+      c.action do |global_options, options, _args|
+        if options[:image].nil? && options[:"fs-type"].nil?
+          raise I18n.t("volumes.create.image_or_type_required")
+        end
+
+        if !options[:image].nil? && !options[:"fs-type"].nil?
+          raise I18n.t("volumes.create.either_image_or_type")
+        end
+
+        params = {
+          delete_with_server: options[:"delete-with-server"],
+          encrypted: options[:encrypted]
+        }
+
+        params[:filesystem_label] = options[:"fs-label"] if options[:"fs-label"]
+        params[:filesystem_type] = options[:"fs-type"] if options[:"fs-type"]
+        params[:image_id] = options[:image] if options[:image]
+
+        params[:description] = options[:description] if options[:description]
+        params[:name] = options[:name] if options[:name]
+        params[:serial] = options[:serial] if options[:serial]
+        params[:size] = options[:size] if options[:size]
+
+        info I18n.t("volumes.create.acting")
+        volume = Volume.create(params)
+        render_table([volume], global_options)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+module Brightbox
+  command [:volumes] do |cmd|
+    cmd.desc I18n.t("volumes.destroy.desc")
+    cmd.arg_name I18n.t("volumes.args.many")
+
+    cmd.command [:destroy] do |c|
+      c.action do |_global_options, _options, args|
+        raise I18n.t("volumes.args.specify_many_ids") if args.empty?
+
+        volumes = Volume.find_or_call(args) do |id|
+          raise I18n.t("volumes.args.unknown_id", volume: volume)
+        end
+
+        volumes.each do |volume|
+          info I18n.t("volumes.destroy.acting", volume: volume)
+
+          begin
+            volume.destroy
+          rescue Brightbox::Api::Conflict
+            error "Could not destroy #{id}"
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,23 @@
+module Brightbox
+  command [:volumes] do |cmd|
+    cmd.desc I18n.t("volumes.detach.desc")
+    cmd.arg_name I18n.t("volumes.args.many")
+
+    cmd.command [:detach] do |c|
+      c.action do |global_options, _options, args|
+        raise I18n.t("volumes.args.specify_many_ids") if args.empty?
+
+        volumes = Volume.find_or_call(args) do |volume|
+          raise I18n.t("volumes.args.unknown_id", volume: volume)
+        end
+
+        volumes.each do |volume|
+          info I18n.t("volumes.detach.acting", volume: volume)
+          volume.detach
+        end
+
+        render_table(volumes, global_options)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+module Brightbox
+  command [:volumes] do |cmd|
+    cmd.default_command :list
+
+    cmd.desc I18n.t("volumes.list.desc")
+    cmd.arg_name I18n.t("volumes.args.optional")
+
+    cmd.command [:list] do |c|
+      c.action do |global_options, _options, args|
+        volumes = Volume.find_all_or_warn(args)
+
+        render_table(volumes, global_options)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,39 @@
+module Brightbox
+  command [:volumes] do |cmd|
+    cmd.desc I18n.t("volumes.lock.desc")
+    cmd.arg_name I18n.t("volumes.args.many")
+
+    cmd.command [:lock] do |c|
+      c.action do |_global_options, _options, args|
+        raise I18n.t("volumes.args.specify_many_ids") if args.empty?
+
+        volumes = Volume.find_or_call(args) do |volume|
+          raise I18n.t("volumes.args.unknown_id", volume: volume)
+        end
+
+        volumes.each do |volume|
+          info I18n.t("volumes.lock.acting", volume: volume)
+          volume.lock!
+        end
+      end
+    end
+
+    cmd.desc I18n.t("volumes.unlock.desc")
+    cmd.arg_name I18n.t("volumes.args.many")
+
+    cmd.command [:unlock] do |c|
+      c.action do |_global_options, _options, args|
+        raise I18n.t("volumes.args.specify_many_ids") if args.empty?
+
+        volumes = Volume.find_or_call(args) do |volume|
+          raise I18n.t("volumes.args.unknown_id", volume: volume)
+        end
+
+        volumes.each do |volume|
+          info I18n.t("volumes.unlock.acting", volume: volume)
+          volume.unlock!
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,36 @@
+module Brightbox
+  command [:volumes] do |cmd|
+    cmd.desc I18n.t("volumes.resize.desc")
+    cmd.arg_name I18n.t("volumes.args.one")
+
+    cmd.command [:resize] do |c|
+      c.desc I18n.t("volumes.options.size")
+      c.flag %i[s size]
+
+      c.action do |global_options, options, args|
+        vol_id = args.shift
+
+        if vol_id.nil? || !vol_id.start_with?("vol-")
+          raise I18n.t("volumes.args.specify_one_id_first")
+        end
+
+        if options[:size].nil?
+          raise I18n.t("volumes.resize.size_option_needed")
+        end
+
+        new_size = options[:size].to_i
+
+        volume = Volume.find(vol_id)
+        old_size = volume.size
+
+        info I18n.t("volumes.resize.acting", volume: volume)
+        volume.resize(
+          from: old_size,
+          to: new_size
+        )
+
+        render_table([volume], global_options)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+module Brightbox
+  command [:volumes] do |cmd|
+    cmd.desc I18n.t("volumes.show.desc")
+    cmd.arg_name I18n.t("volumes.args.optional")
+
+    cmd.command [:show] do |c|
+      c.action do |global_options, _options, args|
+        volumes = Volume.find_all_or_warn(args)
+
+        table_opts = global_options.merge(
+          :vertical => true,
+          :fields => Volume.detailed_fields
+        )
+        render_table(volumes, table_opts)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,50 @@
+module Brightbox
+  command [:volumes] do |cmd|
+    cmd.desc I18n.t("volumes.update.desc")
+    cmd.arg_name I18n.t("volumes.args.one")
+
+    cmd.command [:update] do |c|
+      c.desc I18n.t("options.description.desc")
+      c.flag %i[d description]
+
+      c.desc I18n.t("volumes.options.delete_with_server")
+      c.default_value :ignore # So we can discard unless deliberately passed
+      c.switch ["delete-with-server"], negatable: true
+
+      c.desc I18n.t("options.name.desc")
+      c.flag %i[n name]
+
+      c.desc I18n.t("volumes.options.serial")
+      c.flag [:serial]
+
+      c.action do |global_options, options, args|
+        vol_id = args.shift
+
+        if vol_id.nil? || !vol_id.start_with?("vol-")
+          raise I18n.t("volumes.args.specify_one_id_first")
+        end
+
+        params = {}
+
+        # Switches will always appear in the options so we need a non-boolean
+        # setting to determine if the user did not add it to their command
+        unless options["delete-with-server"] == :ignore
+          params[:delete_with_server] = options["delete-with-server"]
+        end
+
+        params[:description] = options[:description] if options[:description]
+        params[:name] = options[:name] if options[:name]
+        params[:serial] = options[:serial] if options[:serial]
+
+        volume = Volume.find(vol_id)
+
+        unless params.empty?
+          info I18n.t("volumes.update.acting", volume: volume)
+          volume.update(params)
+        end
+
+        render_table([volume], global_options)
+      end
+    end
+  end
+end

data/lib/brightbox-cli/detailed_server.rb

@@ -31,9 +31,21 @@ module Brightbox
         row_attributes[:server_groups] = server_groups.map { |sg| sg["id"] }.join(", ")
       end
 
+      row_attributes[:volumes] = volume_ids if volumes
+
       row_attributes
     end
 
+    def volume_ids
+      volumes.map do |vol|
+        if vol["boot"] == true
+          "*#{vol['id']}*"
+        else
+          vol["id"]
+        end
+      end.join(", ")
+    end
+
     def self.default_field_order
       %i[
         id
@@ -65,6 +77,7 @@ module Brightbox
         cloud_ipv6s
         snapshots
         server_groups
+        volumes
       ]
     end
   end

data/lib/brightbox-cli/version.rb

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

data/lib/brightbox-cli/volume.rb

@@ -0,0 +1,81 @@
+module Brightbox
+  class Volume < Api
+    def self.require_account?; true; end
+
+    def self.all
+      conn.volumes
+    end
+
+    def self.create(options)
+      new(conn.volumes.create(options))
+    end
+
+    def self.get(id)
+      conn.volumes.get(id)
+    end
+
+    def self.default_field_order
+      %i[
+        id
+        type
+        size
+        status
+        server
+        boot
+        name
+      ]
+    end
+
+    def self.detailed_fields
+      %i[
+        id
+        name
+        description
+        type
+        size
+        status
+        created_at
+        encrypted
+        serial
+        locked
+        filesystem_label
+        filesystem_type
+        image
+        source
+        source_type
+        server
+        boot
+        delete_with_server
+        zone
+      ]
+    end
+
+    def attach(server:, boot: false)
+      self.class.conn.attach_volume(id, server: server, boot: boot)
+      reload
+      self
+    end
+
+    def attributes
+      a = fog_model.attributes
+      a[:id] = fog_model.id
+      a[:image] = image_id
+      a[:locked] = locked?
+      a[:server] = server_id
+      a[:status] = state
+      a[:type] = storage_type
+      a[:zone] = zone_id
+      a
+    end
+
+    def to_row
+      attributes
+    end
+
+    def update(options)
+      self.class.conn.update_volume(id, options)
+      reload
+      self
+    end
+  end
+end

data/lib/brightbox_cli.rb

@@ -56,6 +56,7 @@ module Brightbox
   autoload :DatabaseType, File.expand_path("brightbox-cli/database_type", __dir__)
   autoload :DatabaseServer, File.expand_path("brightbox-cli/database_server", __dir__)
   autoload :DatabaseSnapshot, File.expand_path("brightbox-cli/database_snapshot", __dir__)
+  autoload :Volume, File.expand_path("brightbox-cli/volume", __dir__)
   autoload :Token, File.expand_path("brightbox-cli/token", __dir__)
 
   module Config