aptible-cli 0.16.8 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f9abbc0bef99a8ca0f69c0b3d9751e529d9b37b5528315b03481acc84b68868
-  data.tar.gz: 916d97a558b654865ae9cbcf4532058a9070d19dbe6d984be7a5f233eb2884e6
+  metadata.gz: 9ffdd3315dbbee4f94b8b02bb6c6695829c511cf950448997b603cce77253d20
+  data.tar.gz: ac9983ee76d69580194e58d1f1acd6927f4addcbe2dbaec132ae133aa13d215a
 SHA512:
-  metadata.gz: 6ef0c0c9dc25afdf19b680fcabcfd589cd74f246d7442361e79ef5f01d73382bd10ee21c9ca63a31a3f6a003ef0405c651b03e251c6e36525ddfebc86df7aeee
-  data.tar.gz: 3457904ef7ab8e5ff0a5a63fd856633fea48460e8dd88b0ae5ba8181494d893bfe45027927e57c7b217cc89fb39f09eb3fe27abdcb929d1b6fd8d6ca7a6a5b18
+  metadata.gz: d4721d191f0f6c35f6f75717b1896a5ca44441e3d912cb9af23bcde319f9f7678881a7eaf14de89e3222834c139d8c8c7bbe3eb9239d980ec55d32b47acbd835
+  data.tar.gz: 2ced7b764b4b1b0db0ed460a0afd3f14836054a15ec32d5681af077a6811743fddff655c3d27121abc6858729116d385eff2da2d0c807cbbcef3abf92b2b0183

data/.gitignore

@@ -17,4 +17,4 @@ test/tmp
 test/version_tmp
 tmp
 /.idea
-
+/.vscode

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
@@ -66,11 +67,12 @@ Commands:
   aptible endpoints:tcp:modify [--app APP] ENDPOINT_HOSTNAME                                                                                                  # Modify an App TCP Endpoint
   aptible endpoints:tls:create [--app APP] SERVICE                                                                                                            # Create an App TLS Endpoint
   aptible endpoints:tls:modify [--app APP] ENDPOINT_HOSTNAME                                                                                                  # Modify an App TLS Endpoint
+  aptible environment:ca_cert                                                                                                                                 # Retrieve the CA certificate associated with the environment
+  aptible environment:list                                                                                                                                    # List all environments
   aptible help [COMMAND]                                                                                                                                      # Describe available commands or one specific command
   aptible login                                                                                                                                               # Log in to Aptible
   aptible logs [--app APP | --database DATABASE]                                                                                                              # Follows logs from a running app or database
   aptible operation:cancel OPERATION_ID                                                                                                                       # Cancel a running operation
-  aptible ps                                                                                                                                                  # Display running processes for an app - DEPRECATED
   aptible rebuild                                                                                                                                             # Rebuild an app, and restart its services
   aptible restart                                                                                                                                             # Restart all services associated with an app
   aptible services                                                                                                                                            # List Services for an App

data/aptible-cli.gemspec

@@ -28,7 +28,11 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'git'
   spec.add_dependency 'term-ansicolor'
   spec.add_dependency 'chronic_duration', '~> 0.10.6'
+
+  # Temporarily pin ffi until https://github.com/ffi/ffi/issues/868 is fixed
+  spec.add_dependency 'ffi', '<= 1.14.1' if Gem.win_platform?
   spec.add_dependency 'win32-process' if Gem.win_platform?
+
   spec.add_dependency 'activesupport', '>= 4.0', '< 6.0'
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'aptible-tasks', '~> 0.5.8'

data/bin/aptible

@@ -10,7 +10,7 @@ end
 begin
   Aptible::CLI::Agent.start
 rescue HyperResource::ClientError => e
-  m = if e.body['error'] == 'invalid_token'
+  m = if %w(invalid_token expired_token).include? e.body['error']
         'API authentication error: please run aptible login'
       else
         "An error occurred: #{e.body['message']}"

data/lib/aptible/cli/agent.rb

@@ -23,8 +23,8 @@ require_relative 'subcommands/apps'
 require_relative 'subcommands/config'
 require_relative 'subcommands/db'
 require_relative 'subcommands/domains'
+require_relative 'subcommands/environment'
 require_relative 'subcommands/logs'
-require_relative 'subcommands/ps'
 require_relative 'subcommands/rebuild'
 require_relative 'subcommands/deploy'
 require_relative 'subcommands/restart'
@@ -47,8 +47,8 @@ module Aptible
       include Subcommands::Config
       include Subcommands::DB
       include Subcommands::Domains
+      include Subcommands::Environment
       include Subcommands::Logs
-      include Subcommands::Ps
       include Subcommands::Rebuild
       include Subcommands::Deploy
       include Subcommands::Restart
@@ -235,11 +235,7 @@ module Aptible
 
       def warn_sso_enforcement
         # If the user is also a member of
-        begin
-          token = fetch_token
-        rescue StandardError
-          return
-        end
+        token = fetch_token
         reauth = Aptible::Auth::ReauthenticateOrganization.all(token: token)
         return if reauth.empty?
 
@@ -247,6 +243,7 @@ module Aptible
                          'login method (SSO or Aptible credentials) to access',
                          'these organizations:',
                          reauth.map(&:name)].join(' '))
+      rescue StandardError
       end
 
       def version_string

data/lib/aptible/cli/resource_formatter.rb

@@ -23,6 +23,7 @@ module Aptible
           node.value('created_at', backup.created_at)
           node.value('region', backup.aws_region)
           node.value('size', backup.size)
+          node.value('manual', backup.manual)
 
           if backup.copied_from
             node.keyed_object('copied_from', 'description') do |n|
@@ -81,6 +82,7 @@ module Aptible
           node.value('handle', database.handle)
 
           node.value('type', database.type)
+          node.value('version', database.database_image.version)
           node.value('status', database.status)
 
           node.value('connection_url', database.connection_url)
@@ -91,6 +93,20 @@ module Aptible
             end
           end
           attach_account(node, account)
+
+          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.provisioned_iops)
+          end
+
+          if database.service
+            node.value('container_size', \
+                       database.service.container_memory_limit_mb)
+          end
         end
 
         def inject_credential(node, credential)

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/subcommands/environment.rb

@@ -0,0 +1,49 @@
+module Aptible
+  module CLI
+    module Subcommands
+      module Environment
+        def self.included(thor)
+          thor.class_eval do
+            include Helpers::Environment
+            include Helpers::Token
+
+            desc 'environment:list', 'List all environments'
+            option :environment
+            define_method 'environment:list' do
+              Formatter.render(Renderer.current) do |root|
+                root.keyed_list(
+                  'handle'
+                ) do |node|
+                  scoped_environments(options).each do |account|
+                    node.object do |n|
+                      ResourceFormatter.inject_account(n, account)
+                    end
+                  end
+                end
+              end
+            end
+
+            desc 'environment:ca_cert',
+                 'Retrieve the CA certificate associated with the environment'
+            option :environment
+            define_method 'environment:ca_cert' do
+              Formatter.render(Renderer.current) do |root|
+                root.grouped_keyed_list(
+                  'handle',
+                  'ca_body'
+                ) do |node|
+                  scoped_environments(options).each do |account|
+                    node.object do |n|
+                      n.value('ca_body', account.ca_body)
+                      ResourceFormatter.inject_account(n, account)
+                    end
+                  end
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/aptible/cli/version.rb

@@ -1,5 +1,5 @@
 module Aptible
   module CLI
-    VERSION = '0.16.8'.freeze
+    VERSION = '0.18.0'.freeze
   end
 end

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

@@ -0,0 +1,54 @@
+require 'spec_helper'
+
+describe Aptible::CLI::Agent do
+  let!(:a1) do
+    Fabricate(:account, handle: 'foo', ca_body: 'account 1 cert')
+  end
+  let!(:a2) do
+    Fabricate(:account, handle: 'bar', ca_body: '--account 2 cert--')
+  end
+
+  let(:token) { double 'token' }
+
+  before do
+    allow(subject).to receive(:fetch_token) { token }
+    allow(Aptible::Api::Account).to receive(:all).with(token: token)
+      .and_return([a1, a2])
+  end
+
+  it 'lists avaliable environments' do
+    subject.send('environment:list')
+
+    expect(captured_output_text.split("\n")).to include('foo')
+    expect(captured_output_text.split("\n")).to include('bar')
+  end
+
+  it 'fetches certs for all avaliable environments' do
+    subject.send('environment:ca_cert')
+
+    expect(captured_output_text.split("\n")).to include('account 1 cert')
+    expect(captured_output_text.split("\n")).to include('--account 2 cert--')
+
+    expected_accounts = [
+      {
+        'handle' => 'foo',
+        'ca_body' => 'account 1 cert'
+      },
+      {
+        'handle' => 'bar',
+        'ca_body' => '--account 2 cert--'
+      }
+    ]
+    expect(captured_output_json.map! { |account| account.except('id') })
+      .to eq(expected_accounts)
+  end
+
+  it 'fetches certs for specified environment' do
+    subject.options = { environment: 'foo' }
+    subject.send('environment:ca_cert')
+
+    expect(captured_output_text.split("\n")).to include('account 1 cert')
+    expect(captured_output_text.split("\n"))
+      .to_not include('--account 2 cert--')
+  end
+end

data/spec/fabricators/account_fabricator.rb

@@ -20,6 +20,7 @@ Fabricator(:account, from: :stub_account) do
   bastion_host 'localhost'
   dumptruck_port 1234
   handle 'aptible'
+  ca_body '--BEGIN FAKE CERT-- test --END FAKE CERT--'
   stack
 
   apps { [] }

data/spec/fabricators/database_disk_fabricator.rb

@@ -0,0 +1,7 @@
+class StubDatabaseDisk < OpenStruct
+end
+
+Fabricator(:database_disk, from: :stub_database_disk) do
+  size 100
+  ebs_volume_type { 'gb2' }
+end

data/spec/fabricators/database_fabricator.rb

@@ -16,6 +16,8 @@ Fabricator(:database, from: :stub_database) do
   status 'provisioned'
   connection_url 'postgresql://aptible:password@10.252.1.125:49158/db'
   account
+  database_image
+  disk { Fabricate(:database_disk) }
   service { nil }
 
   backups { [] }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aptible-cli
 version: !ruby/object:Gem::Version
-  version: 0.16.8
+  version: 0.18.0
 platform: ruby
 authors:
 - Frank Macreery
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-23 00:00:00.000000000 Z
+date: 2021-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aptible-resource
@@ -296,10 +296,10 @@ files:
 - lib/aptible/cli/subcommands/deploy.rb
 - lib/aptible/cli/subcommands/domains.rb
 - lib/aptible/cli/subcommands/endpoints.rb
+- lib/aptible/cli/subcommands/environment.rb
 - lib/aptible/cli/subcommands/inspect.rb
 - lib/aptible/cli/subcommands/logs.rb
 - lib/aptible/cli/subcommands/operation.rb
-- lib/aptible/cli/subcommands/ps.rb
 - lib/aptible/cli/subcommands/rebuild.rb
 - lib/aptible/cli/subcommands/restart.rb
 - lib/aptible/cli/subcommands/services.rb
@@ -325,6 +325,7 @@ files:
 - spec/aptible/cli/subcommands/deploy_spec.rb
 - spec/aptible/cli/subcommands/domains_spec.rb
 - spec/aptible/cli/subcommands/endpoints_spec.rb
+- spec/aptible/cli/subcommands/environment_spec.rb
 - spec/aptible/cli/subcommands/inspect_spec.rb
 - spec/aptible/cli/subcommands/logs_spec.rb
 - spec/aptible/cli/subcommands/operation_spec.rb
@@ -339,6 +340,7 @@ files:
 - spec/fabricators/certificate_fabricator.rb
 - spec/fabricators/configuration_fabricator.rb
 - spec/fabricators/database_credential_fabricator.rb
+- spec/fabricators/database_disk_fabricator.rb
 - spec/fabricators/database_fabricator.rb
 - spec/fabricators/database_image_fabricator.rb
 - spec/fabricators/operation_fabricator.rb
@@ -398,6 +400,7 @@ test_files:
 - spec/aptible/cli/subcommands/deploy_spec.rb
 - spec/aptible/cli/subcommands/domains_spec.rb
 - spec/aptible/cli/subcommands/endpoints_spec.rb
+- spec/aptible/cli/subcommands/environment_spec.rb
 - spec/aptible/cli/subcommands/inspect_spec.rb
 - spec/aptible/cli/subcommands/logs_spec.rb
 - spec/aptible/cli/subcommands/operation_spec.rb
@@ -412,6 +415,7 @@ test_files:
 - spec/fabricators/certificate_fabricator.rb
 - spec/fabricators/configuration_fabricator.rb
 - spec/fabricators/database_credential_fabricator.rb
+- spec/fabricators/database_disk_fabricator.rb
 - spec/fabricators/database_fabricator.rb
 - spec/fabricators/database_image_fabricator.rb
 - spec/fabricators/operation_fabricator.rb

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

@@ -1,30 +0,0 @@
-require 'shellwords'
-
-module Aptible
-  module CLI
-    module Subcommands
-      module Ps
-        def self.included(thor)
-          thor.class_eval do
-            include Helpers::Operation
-            include Helpers::App
-
-            desc 'ps', 'Display running processes for an app - DEPRECATED'
-            app_options
-            def ps
-              deprecated('This command is deprecated on Aptible v2 stacks.')
-
-              app = ensure_app(options)
-
-              op = app.create_operation!(type: 'ps', status: 'succeeded')
-
-              ENV['ACCESS_TOKEN'] = fetch_token
-              opts = ['-o', 'SendEnv=ACCESS_TOKEN']
-              exit_with_ssh_portal(op, *opts)
-            end
-          end
-        end
-      end
-    end
-  end
-end