brightbox-cli 4.4.0 → 4.5.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20cc19a7e6458988359a604fa90d67570b83c124b40c265a5f9beb0d3bc3a199
-  data.tar.gz: 98072a6ccd8ab0dcf4a3e3ac7f27ecf6982a7f3cf275b86e979aae0fc12461d8
+  metadata.gz: f0ce8d035bac2e5f7df7990bbb5d1d726e3635b8a1bae0bea5ab2afa764755bc
+  data.tar.gz: 99eb62ee760ca495bcf2d5f38adf3eb2b1b5f95c0587b1acf1bc796db779b2ae
 SHA512:
-  metadata.gz: 1c949f6d0679c9d72b7c7f61a6a0fd68b0669452911dde7da845a6f7e9a388c5b2a253ab0219bf6228faf4bc51ac6accfc559d714425c18499525d47b84ab73e
-  data.tar.gz: 7975e2d18399cc35bcd49f474657f6766e5d694bdbf70a1d49b79288edcbc9c07ea1d54b0757bd992ef08c517d4eef0e2a684e9ebf102f4718f3c72bc31368f9
+  metadata.gz: f3630fd90082b69c561736854708c8132b7cb08e346bce2ea5f97318ce3478cc0fdbdc2840e393bf0816064e9894ebc857d866bebdfaf416cc8781e4914b39a5
+  data.tar.gz: 5188e419ae8dff029ddf0bf2ec1c8806774e50462628e4d0f5681ac42931505f5218fee300256755830f9c69c3041e4ec39af9ee64780c8fe2e13f5b0e3e9ee0

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+### 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)

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    brightbox-cli (4.4.0)
+    brightbox-cli (4.5.0.rc1)
       dry-inflector (= 0.2.0)
-      fog-brightbox (>= 1.10.0)
+      fog-brightbox (>= 1.11.0)
       fog-core (< 2.0)
       gli (~> 2.21)
       highline (~> 2.0)
@@ -26,7 +26,7 @@ GEM
     diff-lcs (1.5.0)
     dry-inflector (0.2.0)
     excon (0.97.2)
-    fog-brightbox (1.10.0)
+    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.10.0"
+  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/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/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.4.0".freeze unless defined?(Brightbox::VERSION)
+  VERSION = "4.5.0.rc1".freeze unless defined?(Brightbox::VERSION)
 end

data/locales/en.yml

@@ -207,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
@@ -230,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:
@@ -240,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:

data/spec/commands/sql/instances/reset_spec.rb

@@ -0,0 +1,87 @@
+require "spec_helper"
+
+describe "brightbox sql instances reset" do
+  let(:output) { FauxIO.new { Brightbox.run(argv) } }
+  let(:stdout) { output.stdout }
+  let(:stderr) { output.stderr }
+
+  before do
+    config_from_contents(API_CLIENT_CONFIG_CONTENTS)
+
+    stub_request(:post, "http://api.brightbox.localhost/token")
+      .to_return(
+        status: 200,
+        body: JSON.dump(
+          access_token: "ACCESS-TOKEN",
+          refresh_token: "REFRESH_TOKEN"
+        )
+      )
+
+    Brightbox.config.reauthenticate
+  end
+
+  context "without arguments" do
+    let(:argv) { %w[sql instances reset] }
+
+    it "does not error" do
+      expect { output }.to_not raise_error
+
+      expect(stderr).to eq("ERROR: You must specify a valid SQL instance ID as the first argument\n")
+
+      expect(stdout).to match("")
+    end
+  end
+
+  context "with invalid ID" do
+    let(:argv) { %w[sql instances reset dbs-l3kd4] }
+
+    before do
+      stub_request(:get, "http://api.brightbox.localhost/1.0/database_servers/dbs-l3kd4")
+        .with(query: hash_including(account_id: "acc-12345"))
+        .to_return(
+          status: 404,
+          body: ""
+        )
+    end
+
+    it "does not error" do
+      expect { output }.to_not raise_error
+
+      expect(stderr).to eq("ERROR: Couldn't find 'dbs-l3kd4'\n")
+
+      expect(stdout).to match("")
+    end
+  end
+
+  context "with valid ID" do
+    let(:argv) { %w[sql instances reset dbs-po953] }
+
+    before do
+      stub_request(:get, "http://api.brightbox.localhost/1.0/database_servers/dbs-po953")
+        .with(query: hash_including(account_id: "acc-12345"))
+        .to_return(
+          status: 200,
+          body: {
+            id: "dbs-po953"
+          }.to_json
+        )
+
+      stub_request(:post, "http://api.brightbox.localhost/1.0/database_servers/dbs-po953/reset")
+        .with(query: hash_including(account_id: "acc-12345"))
+        .to_return(
+          status: 202,
+          body: {
+            id: "dbs-po953"
+          }.to_json
+        )
+    end
+
+    it "does not error" do
+      expect { output }.to_not raise_error
+
+      expect(stderr).to eq("Resetting dbs-po953\n")
+
+      expect(stdout).to match("dbs-po953")
+    end
+  end
+end

data/spec/commands/sql/instances/resize_spec.rb

@@ -0,0 +1,112 @@
+require "spec_helper"
+
+describe "brightbox sql instances resize" do
+  let(:output) { FauxIO.new { Brightbox.run(argv) } }
+  let(:stdout) { output.stdout }
+  let(:stderr) { output.stderr }
+
+  before do
+    config_from_contents(API_CLIENT_CONFIG_CONTENTS)
+
+    stub_request(:post, "http://api.brightbox.localhost/token")
+      .to_return(
+        status: 200,
+        body: JSON.dump(
+          access_token: "ACCESS-TOKEN",
+          refresh_token: "REFRESH_TOKEN"
+        )
+      )
+
+    Brightbox.config.reauthenticate
+  end
+
+  context "without arguments" do
+    let(:argv) { %w[sql instances resize] }
+
+    it "does not error" do
+      expect { output }.to_not raise_error
+
+      expect(stderr).to eq("ERROR: You must specify a valid SQL instance ID as the first argument\n")
+
+      expect(stdout).to match("")
+    end
+  end
+
+  context "with invalid ID" do
+    let(:argv) { %w[sql instances resize --type dbt-12345 dbs-xsd23] }
+
+    before do
+      stub_request(:get, "http://api.brightbox.localhost/1.0/database_servers/dbs-xsd23")
+        .with(query: hash_including(account_id: "acc-12345"))
+        .to_return(
+          status: 404,
+          body: ""
+        )
+    end
+
+    it "does not error" do
+      expect { output }.to_not raise_error
+
+      expect(stderr).to eq("ERROR: Couldn't find 'dbs-xsd23'\n")
+
+      expect(stdout).to match("")
+    end
+  end
+
+  context "with valid ID and invalid 'type'" do
+    let(:argv) { %w[sql instances resize --type embiggen dbs-e23ss] }
+
+    it "does not error" do
+      expect { output }.to_not raise_error
+
+      expect(stderr).to eq("ERROR: Cloud SQL type format is invalid\n")
+
+      expect(stdout).to match("")
+    end
+  end
+
+  context "with valid ID and 'type'" do
+    let(:argv) { %w[sql instances resize --type dbt-abcde dbs-zzasa] }
+
+    before do
+      stub_request(:get, "http://api.brightbox.localhost/1.0/database_servers/dbs-zzasa")
+        .with(query: hash_including(account_id: "acc-12345"))
+        .to_return(
+          status: 200,
+          body: {
+            id: "dbs-zzasa",
+            database_type: "dbt-12345"
+          }.to_json
+        )
+        .to_return(
+          status: 200,
+          body: {
+            id: "dbs-zzasa",
+            database_type: "dbt-abcde"
+          }.to_json
+        )
+
+      stub_request(:post, "http://api.brightbox.localhost/1.0/database_servers/dbs-zzasa/resize")
+        .with(query: hash_including(account_id: "acc-12345"),
+              body: {
+                new_type: "dbt-abcde"
+              }
+        )
+        .to_return(
+          status: 202,
+          body: {
+            id: "dbs-zzasa",
+            database_type: "dbt-abcde"
+          }.to_json
+        )
+    end
+
+    it "does not error" do
+      expect { output }.to_not raise_error
+
+      expect(stderr).to eq("Resizing dbs-zzasa\n")
+
+      expect(stdout).to match("dbs-zzasa")
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brightbox-cli
 version: !ruby/object:Gem::Version
-  version: 4.4.0
+  version: 4.5.0.rc1
 platform: ruby
 authors:
 - John Leach
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.11.0
 - !ruby/object:Gem::Dependency
   name: fog-core
   requirement: !ruby/object:Gem::Requirement
@@ -371,7 +371,9 @@ files:
 - lib/brightbox-cli/commands/sql/instances_destroy.rb
 - lib/brightbox-cli/commands/sql/instances_list.rb
 - lib/brightbox-cli/commands/sql/instances_locking.rb
+- lib/brightbox-cli/commands/sql/instances_reset.rb
 - lib/brightbox-cli/commands/sql/instances_reset_password.rb
+- lib/brightbox-cli/commands/sql/instances_resize.rb
 - lib/brightbox-cli/commands/sql/instances_show.rb
 - lib/brightbox-cli/commands/sql/instances_snapshot.rb
 - lib/brightbox-cli/commands/sql/instances_update.rb
@@ -656,6 +658,8 @@ files:
 - spec/commands/servers/update_spec.rb
 - spec/commands/sql/instances/create_spec.rb
 - spec/commands/sql/instances/locking_spec.rb
+- spec/commands/sql/instances/reset_spec.rb
+- spec/commands/sql/instances/resize_spec.rb
 - spec/commands/sql/instances/show_spec.rb
 - spec/commands/sql/instances/snapshot_spec.rb
 - spec/commands/sql/instances/update_spec.rb
@@ -813,9 +817,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.3.20
 signing_key:
@@ -1023,6 +1027,8 @@ test_files:
 - spec/commands/servers/update_spec.rb
 - spec/commands/sql/instances/create_spec.rb
 - spec/commands/sql/instances/locking_spec.rb
+- spec/commands/sql/instances/reset_spec.rb
+- spec/commands/sql/instances/resize_spec.rb
 - spec/commands/sql/instances/show_spec.rb
 - spec/commands/sql/instances/snapshot_spec.rb
 - spec/commands/sql/instances/update_spec.rb