brightbox-cli 4.3.2 → 4.5.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c813c009698fa955e24ce5399a95d658f8e0f657881071fcea65a3349d958676
-  data.tar.gz: b7d1cfd6faf802ea27599226aedf2632b7d33dff89b4a018b26bd4587cc5069a
+  metadata.gz: f0ce8d035bac2e5f7df7990bbb5d1d726e3635b8a1bae0bea5ab2afa764755bc
+  data.tar.gz: 99eb62ee760ca495bcf2d5f38adf3eb2b1b5f95c0587b1acf1bc796db779b2ae
 SHA512:
-  metadata.gz: ccd5f260951570479dacfbd428abb919a5ab35447d2699f05ff8552ba1c2fb0d3b27dfc9a749a3b0c9b0e4522d5a21b4bf13cecf5c13560798505548a10a9e4d
-  data.tar.gz: '051800a849a0b1f62b6351866e3daa687016b4cb2b6eb62aa0dc7c057fb73896c6bc23a30dc7e0c01b5a9b5fc92c25a7a723daa0245e16cb733c4d40b10de03d'
+  metadata.gz: f3630fd90082b69c561736854708c8132b7cb08e346bce2ea5f97318ce3478cc0fdbdc2840e393bf0816064e9894ebc857d866bebdfaf416cc8781e4914b39a5
+  data.tar.gz: 5188e419ae8dff029ddf0bf2ec1c8806774e50462628e4d0f5681ac42931505f5218fee300256755830f9c69c3041e4ec39af9ee64780c8fe2e13f5b0e3e9ee0

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+### v4.5.0.rc1 / 2023-01-26
+
+[Full Changelog](https://github.com/brightbox/brightbox-cli/compare/v4.4.0...v4.5.0)
+
+Enhancements:
+
+* Added `sql instances reset` subcommand for restarting DBMS on a database server.
+* Added `sql instances resize` subcommand for increasing database server resources.
+
+### v4.4.0 / 2023-01-26
+
+[Full Changelog](https://github.com/brightbox/brightbox-cli/compare/v4.3.2...v4.4.0)
+
+Enhancements:
+
+* Added `configmaps` subcommand for manage config management.
+
 ### v4.3.2 / 2023-01-12
 
 [Full Changelog](https://github.com/brightbox/brightbox-cli/compare/v4.3.1...v4.3.2)

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    brightbox-cli (4.3.2)
+    brightbox-cli (4.5.0.rc1)
       dry-inflector (= 0.2.0)
-      fog-brightbox (>= 1.9.1)
+      fog-brightbox (>= 1.11.0)
       fog-core (< 2.0)
       gli (~> 2.21)
       highline (~> 2.0)
@@ -20,13 +20,13 @@ GEM
     ast (2.4.2)
     builder (3.2.4)
     coderay (1.1.3)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.0)
     crack (0.4.5)
       rexml
     diff-lcs (1.5.0)
     dry-inflector (0.2.0)
-    excon (0.97.1)
-    fog-brightbox (1.9.1)
+    excon (0.97.2)
+    fog-brightbox (1.11.0)
       dry-inflector
       fog-core (>= 1.45, < 3.0)
       fog-json

data/brightbox-cli.gemspec

@@ -21,7 +21,7 @@ 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.9.1"
+  s.add_dependency "fog-brightbox", ">= 1.11.0"
   s.add_dependency "fog-core", "< 2.0"
   s.add_dependency "gli", "~> 2.21"
   s.add_dependency "highline", "~> 2.0"

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

@@ -0,0 +1,183 @@
+module Brightbox
+  desc I18n.t("configmaps.desc")
+  command [:configmaps] do |cmd|
+    cmd.default_command :list
+
+    cmd.desc I18n.t("configmaps.create.desc")
+    cmd.arg_name I18n.t("configmaps.args.one")
+    cmd.command [:create] do |c|
+      c.desc I18n.t("options.name.desc")
+      c.flag %i[n name]
+
+      c.desc I18n.t("configmaps.options.data_string")
+      c.flag %i[d data]
+
+      c.desc I18n.t("configmaps.options.data_file")
+      c.flag [:"data-file"]
+
+      c.action do |global_options, options, _args|
+        map_data = parse_configmap_data_options(options)
+
+        raise I18n.t("configmaps.create.data_required") if map_data.nil?
+
+        # Attempt to parse data as JSON but do not update
+        begin
+          JSON.parse(map_data)
+        rescue StandardError
+          raise I18n.t("configmaps.options.bad_data")
+        end
+
+        params = {
+          data: map_data
+        }
+        params[:name] = options[:name] if options[:name]
+
+        info I18n.t("configmaps.create.acting")
+        config_map = ConfigMap.create(params)
+
+        render_table([config_map], global_options)
+      end
+    end
+
+    cmd.desc I18n.t("configmaps.destroy.desc")
+    cmd.arg_name I18n.t("configmaps.args.many")
+    cmd.command [:destroy] do |c|
+      c.action do |_global_options, _options, args|
+        raise I18n.t("configmaps.args.specify_many_ids") if args.empty?
+
+        config_maps = ConfigMap.find_or_call(args) do |id|
+          raise I18n.t("configmaps.args.unknown_id", config_map: id)
+        end
+
+        config_maps.each do |config_map|
+          info I18n.t("configmaps.destroy.acting", config_map: config_map)
+
+          begin
+            config_map.destroy
+          rescue Brightbox::Api::Conflict
+            error I18n.t("configmaps.destroy.failed", config_map: id)
+          end
+        end
+      end
+    end
+
+    cmd.desc I18n.t("configmaps.list.desc")
+    cmd.arg_name I18n.t("configmaps.args.optional")
+    cmd.command [:list] do |c|
+      c.action do |global_options, _options, args|
+        config_maps = ConfigMap.find_all_or_warn(args)
+
+        render_table(config_maps, global_options)
+      end
+    end
+
+    cmd.desc I18n.t("configmaps.show.desc")
+    cmd.arg_name I18n.t("configmaps.args.optional")
+    cmd.command [:show] do |c|
+      c.desc I18n.t("configmaps.options.data_output")
+      c.switch [:data], negatable: false, default: false
+
+      c.desc I18n.t("configmaps.options.data_format")
+      c.flag [:format]
+
+      c.action do |global_options, options, args|
+        if options[:data]
+          unless args.length == 1
+            raise I18n.t("configmaps.options.data_args")
+          end
+
+          cfg_id = args[0]
+
+          if cfg_id.nil? || !cfg_id.start_with?("cfg-")
+            raise I18n.t("configmaps.args.specify_one_id_first")
+          end
+
+          config_map = ConfigMap.find(cfg_id)
+          data(config_map.format_data(options[:format] || "json"))
+        else
+          if options[:format] && !options[:data]
+            raise I18n.t("configmaps.options.format_no_data")
+          end
+
+          config_maps = ConfigMap.find_all_or_warn(args)
+
+          table_opts = global_options.merge(
+            vertical: true
+          )
+          render_table(config_maps, table_opts)
+        end
+      end
+    end
+
+    cmd.desc I18n.t("configmaps.update.desc")
+    cmd.arg_name I18n.t("configmaps.args.one")
+    cmd.command [:update] do |c|
+      c.desc I18n.t("options.name.desc")
+      c.flag %i[n name]
+
+      c.desc I18n.t("configmaps.options.data_string")
+      c.flag %i[d data]
+
+      c.desc I18n.t("configmaps.options.data_file")
+      c.flag [:"data-file"]
+
+      c.action do |global_options, options, args|
+        cfg_id = args[0]
+
+        if cfg_id.nil? || !cfg_id.start_with?("cfg-")
+          raise I18n.t("configmaps.args.specify_one_id_first")
+        end
+
+        params = {}
+        params[:name] = options[:name] if options[:name]
+
+        map_data = parse_configmap_data_options(options)
+
+        if map_data
+          begin
+            map_data = JSON.parse(map_data)
+          rescue StandardError
+            raise I18n.t("configmaps.options.bad_data")
+          end
+
+          params[:data] = map_data
+        end
+
+        config_map = ConfigMap.find(cfg_id)
+
+        unless params.empty?
+          info I18n.t("configmaps.update.acting", config_map: config_map)
+          config_map.update(params)
+        end
+
+        render_table([config_map], global_options)
+      end
+    end
+  end
+
+  def parse_configmap_data_options(options)
+    if options[:data] && options[:"data-file"]
+      raise I18n.t("configmaps.options.multiple_data")
+    end
+
+    map_data = options[:data]
+    data_filename = options[:"data-file"]
+
+    if data_filename
+      file_handler = lambda do |file|
+        map_data = file.read
+      end
+
+      if data_filename == "-"
+        file_handler[$stdin]
+      else
+        File.open(data_filename, "r", &file_handler)
+      end
+
+      raise map_data.inspect if map_data.nil? || map_data == ""
+    end
+
+    map_data
+  end
+  module_function :parse_configmap_data_options
+end

data/lib/brightbox-cli/commands/sql/instances_reset.rb

@@ -0,0 +1,33 @@
+module Brightbox
+  command [:sql] do |product|
+    product.command [:instances] do |cmd|
+      cmd.desc I18n.t("sql.instances.reset_password.desc")
+      cmd.arg_name "server-id"
+      cmd.command [:reset] do |c|
+        c.action do |global_options, _options, args|
+          dbs_id = args.shift
+
+          unless dbs_id =~ /^dbs-/
+            raise I18n.t("sql.instances.args.invalid")
+          end
+
+          server = DatabaseServer.find dbs_id
+
+          info I18n.t("sql.instances.reset.acting", database_server: server)
+          begin
+            server.reset
+          rescue Brightbox::Api::Conflict
+            error I18n.t("sql.instances.reset.failed", database_server: server)
+          end
+
+          table_options = global_options.merge(
+            :vertical => true,
+            :fields => DatabaseServer.detailed_fields
+          )
+
+          render_table([server], table_options)
+        end
+      end
+    end
+  end
+end

data/lib/brightbox-cli/commands/sql/instances_resize.rb

@@ -0,0 +1,42 @@
+module Brightbox
+  command [:sql] do |product|
+    product.command [:instances] do |cmd|
+      cmd.desc I18n.t("sql.instances.reset_password.desc")
+      cmd.arg_name "server-id"
+      cmd.command [:resize] do |c|
+        # Database type
+        c.desc I18n.t("sql.instances.options.type.desc")
+        c.flag %i[t type]
+
+        c.action do |global_options, options, args|
+          dbs_id = args.shift
+
+          unless dbs_id =~ /^dbs-/
+            raise I18n.t("sql.instances.args.invalid")
+          end
+
+          new_type = options[:type]
+          unless new_type =~ /^dbt-/
+            raise I18n.t("sql.instances.options.type.invalid")
+          end
+
+          server = DatabaseServer.find dbs_id
+
+          info I18n.t("sql.instances.resize.acting", database_server: server)
+          begin
+            server.resize(new_type: new_type)
+          rescue Brightbox::Api::Conflict
+            error I18n.t("sql.instances.resize.failed", database_server: server)
+          end
+
+          table_options = global_options.merge(
+            :vertical => true,
+            :fields => DatabaseServer.detailed_fields
+          )
+
+          render_table([server], table_options)
+        end
+      end
+    end
+  end
+end

data/lib/brightbox-cli/config_map.rb

@@ -0,0 +1,53 @@
+module Brightbox
+  class ConfigMap < Api
+    def self.require_account?; true; end
+
+    def self.all
+      conn.config_maps
+    end
+
+    def self.create(options)
+      new(conn.config_maps.create(options))
+    end
+
+    def self.get(id)
+      conn.config_maps.get(id)
+    end
+
+    def self.default_field_order
+      %i[id name]
+    end
+
+    def self.detailed_fields
+      %i[
+        id
+        name
+      ]
+    end
+
+    def format_data(format)
+      case format.to_sym
+      when :text
+        attributes[:data].map do |key, value|
+          "#{key.to_s.rjust(16)}: #{value}"
+        end.join("\n")
+      else
+        JSON.dump(data)
+      end
+    end
+
+    def to_row
+      {
+        id: attributes[:id],
+        name: attributes[:name],
+        data: attributes[:data]
+      }
+    end
+
+    def update(options)
+      self.class.conn.update_config_map(id, options)
+      reload
+      self
+    end
+  end
+end

data/lib/brightbox-cli/database_server.rb

@@ -24,10 +24,18 @@ module Brightbox
       self
     end
 
+    def reset
+      fog_model.reset
+    end
+
     def reset_password
       fog_model.reset_password
     end
 
+    def resize(options)
+      fog_model.resize(options[:new_type])
+    end
+
     def destroy
       fog_model.destroy
     end

data/lib/brightbox-cli/version.rb

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

data/lib/brightbox_cli.rb

@@ -53,6 +53,7 @@ module Brightbox
   autoload :FirewallRule, File.expand_path("brightbox-cli/firewall_rule", __dir__)
   autoload :FirewallRules, File.expand_path("brightbox-cli/firewall_rules", __dir__)
   autoload :Collaboration, File.expand_path("brightbox-cli/collaboration", __dir__)
+  autoload :ConfigMap, File.expand_path("brightbox-cli/config_map", __dir__)
   autoload :UserCollaboration, File.expand_path("brightbox-cli/user_collaboration", __dir__)
   autoload :DatabaseType, File.expand_path("brightbox-cli/database_type", __dir__)
   autoload :DatabaseServer, File.expand_path("brightbox-cli/database_server", __dir__)

data/locales/en.yml

@@ -51,6 +51,39 @@ en:
       desc: Remove an API client from config
     user_add:
       desc: Add new user credentials to config
+  configmaps:
+    desc: Manage config maps
+    args:
+      one: <configmap>
+      optional: "[<configmap>...]"
+      many: <configmap>...
+      specify_one_id_first: You must specify the config map ID as the first argument
+      specify_many_ids: You must specify config map IDs as arguments
+      unknown_id: Couldn't find %{config_map}
+    options:
+      data_args: You can only access data for a single config map at a time
+      data_file: A path to a file contain a JSON object containing key/values, or '-' for STDIO
+      data_string: String representing a valid JSON object
+      data_output: Return the config map data key/values
+      data_format: "Format to return 'data' in: 'json' (default) or 'text'"
+      format_no_data: The 'format' option can only be used with 'data'
+      bad_data: Config map data was not valid JSON
+      multiple_data: Config map data can only be passed by either 'data' or 'data-file'
+    create:
+      desc: Create a config map
+      acting: Creating config map
+      data_required: Config map data is required as 'data' option
+    destroy:
+      desc: Destroy config maps
+      acting: Destroying %{config_map}
+      failed: Failed to destroy %{config_map}
+    list:
+      desc: List config maps
+    show:
+      desc: Show config maps
+    update:
+      desc: Update a config map
+      acting: Updating %{config_map}
   firewall:
     policies:
       desc: Manage firewall policies
@@ -174,6 +207,14 @@ en:
     desc: Manage an account's Cloud SQL instances and snapshots
     instances:
       desc: Manage Cloud SQL instances
+      args:
+        one: <sql-instance>
+        optional: "[<sql-instance>...]"
+        many: <sql-instance>...
+        specify_one_id_first: You must specify the SQL instance ID as the first argument
+        specify_many_ids: You must specify SQL instance IDs as arguments
+        invalid: You must specify a valid SQL instance ID as the first argument
+        unknown_id: Couldn't find %{database_server}
       options:
         allow_access:
           desc: Comma separated list of IPs or IDs for servers or groups to allow access
@@ -197,6 +238,7 @@ en:
           desc: Clear an existing snapshots schedule
         type:
           desc: ID of a Cloud SQL type
+          invalid: Cloud SQL type format is invalid
         zone:
           desc: Zone to locate the instance in
       create:
@@ -207,8 +249,16 @@ en:
         desc: Lock Cloud SQL instances
       list:
         desc: List Cloud SQL instances
+      reset:
+        desc: Reset a Cloud SQL instance
+        acting: Resetting %{database_server}
+        failed: Could not reset %{database_server}
       reset_password:
         desc: Reset the admin password of a Cloud SQL instance
+      resize:
+        desc: Resize a Cloud SQL instance to use a new type
+        acting: Resizing %{database_server}
+        failed: Could not resize %{database_server}
       show:
         desc: Show details of Cloud SQL instances
       snapshot: