aptible-cli 0.17.1 → 0.18.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b10127dfc01ec4af08021f37da130738584bd5468298e7519ba4ec49b87d6dd
-  data.tar.gz: 785eb00b9009419d7e952c344c642cb831fbd96c10d68b680b3bda68231d35f4
+  metadata.gz: 99e721103b6988c5c8e41d11935449de499b29db00513732c031098f29613f29
+  data.tar.gz: 19b4bc6ce3b14b759ef100eab8ca95f12809bb0fd41e5c36b709dfd224ab774b
 SHA512:
-  metadata.gz: 749b640447638c67ff246dcf8f1fcff049248d08870d2012165b9c7694fd65038533cb365f03b734bac593f9a953ce7ba5e5ce074ef4165ce2132961e9baecea
-  data.tar.gz: 4ebfa45ebe3cfebbaa8abd6306414539c4e32dee645f7146b93ba081fe61c2b8a8aba5a5e540cc607a7d8b7fcb65bee04b4700ddd2698fe211458103fc1ec9bc
+  metadata.gz: 7c5e417a9ab05f619e140ff6c444bdd9723aa6d9b5063678201e018873a8065f245074ba872fc0fd00763a54e9f7c156e67762118bdcb156893f8a9668aab8b6
+  data.tar.gz: 9355ca55bb61608245dfd0c8a1a7463ac555ab365cf389f12bec78b293861ab43f8776aef2c3c5fe8f0a0b42e3730f59ea3025d03c84ffc46d048c7b6933e90c

data/README.md

@@ -48,9 +48,10 @@ Commands:
   aptible db:dump HANDLE [pg_dump options]                                                                                                                    # Dump a remote database to file
   aptible db:execute HANDLE SQL_FILE [--on-error-stop]                                                                                                        # Executes sql against a database
   aptible db:list                                                                                                                                             # List all databases
+  aptible db:modify HANDLE [--iops IOPS] [--volume-type [gp2, gp3]]                                                                                           # Modify a database disk
   aptible db:reload HANDLE                                                                                                                                    # Reload a database
   aptible db:replicate HANDLE REPLICA_HANDLE [--container-size SIZE_MB] [--disk-size SIZE_GB] [--logical --version VERSION] [--key-arn KEY_ARN]               # Create a replica/follower of a database
-  aptible db:restart HANDLE [--container-size SIZE_MB] [--disk-size SIZE_GB]                                                                                  # Restart a database
+  aptible db:restart HANDLE [--container-size SIZE_MB] [--disk-size SIZE_GB] [--iops IOPS] [--volume-type [gp2, gp3]]                                         # Restart a database
   aptible db:tunnel HANDLE                                                                                                                                    # Create a local tunnel to a database
   aptible db:url HANDLE                                                                                                                                       # Display a database URL
   aptible db:versions                                                                                                                                         # List available database versions

data/lib/aptible/cli/agent.rb

@@ -18,6 +18,7 @@ require_relative 'helpers/vhost/option_set_builder'
 require_relative 'helpers/tunnel'
 require_relative 'helpers/system'
 require_relative 'helpers/security_key'
+require_relative 'helpers/config_path'
 
 require_relative 'subcommands/apps'
 require_relative 'subcommands/config'
@@ -43,6 +44,7 @@ module Aptible
       include Helpers::Token
       include Helpers::Ssh
       include Helpers::System
+      include Helpers::ConfigPath
       include Subcommands::Apps
       include Subcommands::Config
       include Subcommands::DB
@@ -209,7 +211,7 @@ module Aptible
         # further: to do so, edit the file `.aptible/nag_toolbelt` and put a
         # timestamp far into the future. For example, writing 1577836800 will
         # disable the warning until 2020.
-        nag_file = File.join ENV['HOME'], '.aptible', 'nag_toolbelt'
+        nag_file = File.join aptible_config_path, 'nag_toolbelt'
         nag_frequency = 12.hours
 
         last_nag = begin

data/lib/aptible/cli/helpers/config_path.rb

@@ -0,0 +1,11 @@
+module Aptible
+  module CLI
+    module Helpers
+      module ConfigPath
+        def aptible_config_path
+          ENV['APTIBLE_CONFIG_PATH'] || (File.join ENV['HOME'], '.aptible')
+        end
+      end
+    end
+  end
+end

data/lib/aptible/cli/helpers/ssh.rb

@@ -1,7 +1,11 @@
+require_relative 'config_path'
+
 module Aptible
   module CLI
     module Helpers
       module Ssh
+        include Helpers::ConfigPath
+
         def connect_to_ssh_portal(operation, *extra_ssh_args)
           # NOTE: This is a little tricky to get rigt, so before you make any
           # changes, read this.
@@ -126,7 +130,7 @@ module Aptible
         end
 
         def ssh_dir
-          File.join ENV['HOME'], '.aptible', 'ssh'
+          File.join aptible_config_path, 'ssh'
         end
 
         def ssh_config_file

data/lib/aptible/cli/helpers/token.rb

@@ -1,9 +1,13 @@
 require 'aptible/auth'
 
+require_relative 'config_path'
+
 module Aptible
   module CLI
     module Helpers
       module Token
+        include Helpers::ConfigPath
+
         TOKEN_ENV_VAR = 'APTIBLE_ACCESS_TOKEN'.freeze
 
         def fetch_token
@@ -40,7 +44,7 @@ module Aptible
         end
 
         def token_file
-          File.join ENV['HOME'], '.aptible', 'tokens.json'
+          File.join(aptible_config_path, 'tokens.json').freeze
         end
       end
     end

data/lib/aptible/cli/resource_formatter.rb

@@ -5,8 +5,17 @@ module Aptible
         NO_NESTING = Object.new.freeze
 
         def inject_backup(node, backup, include_db: false)
+          origin = if backup.manual && !backup.copied_from
+                     "manual, #{backup.created_from_operation.user_email}"
+                   elsif backup.manual && backup.copied_from
+                     'manual, copy'
+                   elsif backup.copied_from
+                     'automatic, copy'
+                   else
+                     'automatic'
+                   end
           description = "#{backup.id}: #{backup.created_at}, " \
-                        "#{backup.aws_region}"
+                        "#{backup.aws_region}, #{origin}"
 
           if include_db
             db = backup.database_with_deleted
@@ -30,6 +39,13 @@ module Aptible
               inject_backup(n, backup.copied_from)
             end
           end
+
+          if backup.created_from_operation && \
+             backup.manual && !backup.copied_from
+            node.keyed_object('created_from_operation', 'id') do |n|
+              inject_operation(n, backup.created_from_operation)
+            end
+          end
         end
 
         def inject_deleted_database(node, database, account)
@@ -43,12 +59,15 @@ module Aptible
         def inject_account(node, account)
           node.value('id', account.id)
           node.value('handle', account.handle)
+          node.value('created_at', account.created_at)
         end
 
         def inject_operation(node, operation)
           node.value('id', operation.id)
           node.value('status', operation.status)
-          node.value('git_ref', operation.git_ref)
+          if %w(deploy rebuild).include?(operation.type)
+            node.value('git_ref', operation.git_ref)
+          end
           node.value('user_email', operation.user_email)
           node.value('created_at', operation.created_at)
         end
@@ -56,6 +75,7 @@ module Aptible
         def inject_app(node, app, account)
           node.value('id', app.id)
           node.value('handle', app.handle)
+          node.value('created_at', app.created_at)
 
           node.value('status', app.status)
           node.value('git_remote', app.git_repo)
@@ -80,6 +100,7 @@ module Aptible
         def inject_database(node, database, account)
           node.value('id', database.id)
           node.value('handle', database.handle)
+          node.value('created_at', database.created_at)
 
           node.value('type', database.type)
           node.value('version', database.database_image.version)
@@ -94,10 +115,19 @@ module Aptible
           end
           attach_account(node, account)
 
-          node.value('disk_type', database.disk.ebs_volume_type)
-          node.value('disk_size', database.disk.size)
-          node.value('container_size', \
-                     database.service.container_memory_limit_mb)
+          if database.disk
+            node.value('disk_type', database.disk.ebs_volume_type)
+            node.value('disk_size', database.disk.size)
+            node.value('disk_modification_progress',
+                       database.disk.modification_progress)
+            node.value('disk_modification_status', database.disk.status)
+            node.value('disk_provisioned_iops', database.disk.baseline_iops)
+          end
+
+          if database.service
+            node.value('container_size', \
+                       database.service.container_memory_limit_mb)
+          end
         end
 
         def inject_credential(node, credential)
@@ -111,6 +141,7 @@ module Aptible
         def inject_service(node, service, app)
           node.value('id', service.id)
           node.value('service', service.process_type)
+          node.value('created_at', service.created_at)
 
           node.value('command', service.command || 'CMD')
           node.value('container_count', service.container_count)
@@ -123,6 +154,7 @@ module Aptible
           node.value('id', vhost.id)
           node.value('hostname', vhost.external_host)
           node.value('status', vhost.status)
+          node.value('created_at', vhost.created_at)
 
           case vhost.type
           when 'tcp', 'tls'

data/lib/aptible/cli/subcommands/db.rb

@@ -279,19 +279,24 @@ module Aptible
             end
 
             desc 'db:restart HANDLE ' \
-                 '[--container-size SIZE_MB] [--disk-size SIZE_GB]',
+                 '[--container-size SIZE_MB] [--disk-size SIZE_GB] ' \
+                 '[--iops IOPS] [--volume-type [gp2, gp3]]',
                  'Restart a database'
             option :environment
             option :container_size, type: :numeric
             option :disk_size, type: :numeric
             option :size, type: :numeric
+            option :iops, type: :numeric
+            option :volume_type
             define_method 'db:restart' do |handle|
               database = ensure_database(options.merge(db: handle))
 
               opts = {
                 type: 'restart',
                 container_size: options[:container_size],
-                disk_size: options[:disk_size] || options[:size]
+                disk_size: options[:disk_size] || options[:size],
+                provisioned_iops: options[:iops],
+                ebs_volume_type: options[:volume_type]
               }.delete_if { |_, v| v.nil? }
 
               CLI.logger.warn([
@@ -305,6 +310,26 @@ module Aptible
               attach_to_operation_logs(op)
             end
 
+            desc 'db:modify HANDLE ' \
+                 '[--iops IOPS] [--volume-type [gp2, gp3]]',
+                 'Modify a database disk'
+            option :environment
+            option :iops, type: :numeric
+            option :volume_type
+            define_method 'db:modify' do |handle|
+              database = ensure_database(options.merge(db: handle))
+
+              opts = {
+                type: 'modify',
+                provisioned_iops: options[:iops],
+                ebs_volume_type: options[:volume_type]
+              }.delete_if { |_, v| v.nil? }
+
+              CLI.logger.info "Modifying #{database.handle}..."
+              op = database.create_operation!(opts)
+              attach_to_operation_logs(op)
+            end
+
             desc 'db:url HANDLE', 'Display a database URL'
             option :environment
             option :type, type: :string

data/lib/aptible/cli/version.rb

@@ -1,5 +1,5 @@
 module Aptible
   module CLI
-    VERSION = '0.17.1'.freeze
+    VERSION = '0.18.3'.freeze
   end
 end

data/spec/aptible/cli/resource_formatter_spec.rb

@@ -27,6 +27,7 @@ describe Aptible::CLI::ResourceFormatter do
         'Id: 12',
         'Hostname: foo.io',
         'Status: provisioned',
+        "Created At: #{fmt_time(service.created_at)}",
         'Type: https',
         'Port: default',
         'Internal: false',

data/spec/aptible/cli/subcommands/apps_spec.rb

@@ -104,26 +104,30 @@ describe Aptible::CLI::Agent do
         {
           'environment' => {
             'id' => account.id,
-            'handle' => account.handle
+            'handle' => account.handle,
+            'created_at' => fmt_time(account.created_at)
           },
           'handle' => app.handle,
           'id' => app.id,
           'status' => app.status,
           'git_remote' => app.git_repo,
+          'created_at' => fmt_time(app.created_at),
           'services' => [
             {
               'service' => s1.process_type,
               'id' => s1.id,
               'command' => s1.command,
               'container_count' => s1.container_count,
-              'container_size' => s1.container_memory_limit_mb
+              'container_size' => s1.container_memory_limit_mb,
+              'created_at' => fmt_time(s1.created_at)
             },
             {
               'service' => s2.process_type,
               'id' => s2.id,
               'command' => 'CMD',
               'container_count' => s2.container_count,
-              'container_size' => s2.container_memory_limit_mb
+              'container_size' => s2.container_memory_limit_mb,
+              'created_at' => fmt_time(s2.created_at)
             }
           ]
         }
@@ -145,12 +149,14 @@ describe Aptible::CLI::Agent do
         {
           'environment' => {
             'id' => account.id,
-            'handle' => account.handle
+            'handle' => account.handle,
+            'created_at' => fmt_time(account.created_at)
           },
           'handle' => app.handle,
           'id' => app.id,
           'status' => app.status,
           'git_remote' => app.git_repo,
+          'created_at' => fmt_time(app.created_at),
           'last_deploy_operation' =>
             {
               'id' => op.id,

data/spec/aptible/cli/subcommands/db_spec.rb

@@ -389,6 +389,31 @@ describe Aptible::CLI::Agent do
       expect(captured_logs).to match(/restarting foobar/i)
     end
 
+    it 'allows restarting a database with provisioned iops' do
+      expect(database).to receive(:create_operation!)
+        .with(type: 'restart', provisioned_iops: 3001)
+        .and_return(op)
+
+      expect(subject).to receive(:attach_to_operation_logs).with(op)
+
+      subject.options = { iops: 3001 }
+      subject.send('db:restart', handle)
+
+      expect(captured_logs).to match(/restarting foobar/i)
+    end
+
+    it 'allows restarting a database with ebs volume type' do
+      expect(database).to receive(:create_operation!)
+        .with(type: 'restart', ebs_volume_type: 'gp2').and_return(op)
+
+      expect(subject).to receive(:attach_to_operation_logs).with(op)
+
+      subject.options = { volume_type: 'gp2' }
+      subject.send('db:restart', handle)
+
+      expect(captured_logs).to match(/restarting foobar/i)
+    end
+
     it 'allows restarting a database with (implicitly disk) size' do
       expect(database).to receive(:create_operation!)
         .with(type: 'restart', disk_size: 40).and_return(op)
@@ -419,6 +444,53 @@ describe Aptible::CLI::Agent do
     end
   end
 
+  describe '#db:modify' do
+    before { allow(Aptible::Api::Account).to receive(:all) { [account] } }
+    before { allow(Aptible::Api::Database).to receive(:all) { [database] } }
+
+    let(:op) { Fabricate(:operation) }
+
+    it 'allows modifying a database' do
+      expect(database).to receive(:create_operation!)
+        .with(type: 'modify').and_return(op)
+
+      expect(subject).to receive(:attach_to_operation_logs).with(op)
+
+      subject.send('db:modify', handle)
+
+      expect(captured_logs).to match(/modifying foobar/i)
+    end
+
+    it 'allows modifying a database with provisioned iops' do
+      expect(database).to receive(:create_operation!)
+        .with(type: 'modify', provisioned_iops: 3001).and_return(op)
+
+      expect(subject).to receive(:attach_to_operation_logs).with(op)
+
+      subject.options = { iops: 3001 }
+      subject.send('db:modify', handle)
+
+      expect(captured_logs).to match(/modifying foobar/i)
+    end
+
+    it 'allows modifying a database with ebs volume type' do
+      expect(database).to receive(:create_operation!)
+        .with(type: 'modify', ebs_volume_type: 'gp2').and_return(op)
+
+      expect(subject).to receive(:attach_to_operation_logs).with(op)
+
+      subject.options = { volume_type: 'gp2' }
+      subject.send('db:modify', handle)
+
+      expect(captured_logs).to match(/modifying foobar/i)
+    end
+
+    it 'fails if the DB is not found' do
+      expect { subject.send('db:modify', 'nope') }
+        .to raise_error(Thor::Error, 'Could not find database nope')
+    end
+  end
+
   describe '#db:url' do
     let(:databases) { [database] }
     before { expect(Aptible::Api::Database).to receive(:all) { databases } }

data/spec/aptible/cli/subcommands/environment_spec.rb

@@ -32,11 +32,13 @@ describe Aptible::CLI::Agent do
     expected_accounts = [
       {
         'handle' => 'foo',
-        'ca_body' => 'account 1 cert'
+        'ca_body' => 'account 1 cert',
+        'created_at' => fmt_time(a1.created_at)
       },
       {
         'handle' => 'bar',
-        'ca_body' => '--account 2 cert--'
+        'ca_body' => '--account 2 cert--',
+        'created_at' => fmt_time(a2.created_at)
       }
     ]
     expect(captured_output_json.map! { |account| account.except('id') })

data/spec/fabricators/account_fabricator.rb

@@ -26,4 +26,5 @@ Fabricator(:account, from: :stub_account) do
   apps { [] }
   databases { [] }
   certificates { [] }
+  created_at { Time.now }
 end

data/spec/fabricators/app_fabricator.rb

@@ -29,6 +29,7 @@ Fabricator(:app, from: :stub_app) do
   configurations { [] }
   current_configuration { nil }
   errors { Aptible::Resource::Errors.new }
+  created_at { Time.now }
 
   after_create { |app| app.account.apps << app }
 end

data/spec/fabricators/database_disk_fabricator.rb

@@ -3,5 +3,6 @@ end
 
 Fabricator(:database_disk, from: :stub_database_disk) do
   size 100
-  ebs_volume_type { 'gb2' }
+  ebs_volume_type { 'gp2' }
+  baseline_iops '300'
 end

data/spec/fabricators/database_fabricator.rb

@@ -22,6 +22,7 @@ Fabricator(:database, from: :stub_database) do
 
   backups { [] }
   database_credentials { [] }
+  created_at { Time.now }
 
   after_create do |database, transients|
     database.account.databases << database

data/spec/fabricators/service_fabricator.rb

@@ -14,6 +14,7 @@ Fabricator(:service, from: :stub_service) do
   container_count { 1 }
   container_memory_limit_mb { 512 }
   vhosts { [] }
+  created_at { Time.now }
 
   after_create do |service, transients|
     if transients[:app]

data/spec/fabricators/vhost_fabricator.rb

@@ -7,6 +7,7 @@ Fabricator(:vhost, from: :stub_vhost) do
   virtual_domain { Fabricate.sequence(:virtual_domain) { |i| "domain#{i}" } }
   ip_whitelist { [] }
   container_ports { [] }
+  created_at { Time.now }
 
   after_create { |vhost| vhost.service.vhosts << vhost }
 end

data/spec/spec_helper.rb

@@ -11,6 +11,10 @@ end
 # Require library up front
 require 'aptible/cli'
 
+def fmt_time(time)
+  time.strftime('%Y-%m-%d %H:%M:%S %z')
+end
+
 class SpecRenderer < Aptible::CLI::Renderer::Base
   def initialize
     @nodes = []

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aptible-cli
 version: !ruby/object:Gem::Version
-  version: 0.17.1
+  version: 0.18.3
 platform: ruby
 authors:
 - Frank Macreery
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-16 00:00:00.000000000 Z
+date: 2021-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aptible-resource
@@ -274,6 +274,7 @@ files:
 - lib/aptible/cli/formatter/value.rb
 - lib/aptible/cli/helpers/app.rb
 - lib/aptible/cli/helpers/app_or_database.rb
+- lib/aptible/cli/helpers/config_path.rb
 - lib/aptible/cli/helpers/database.rb
 - lib/aptible/cli/helpers/environment.rb
 - lib/aptible/cli/helpers/operation.rb