aptible-cli 0.26.1 → 0.26.4

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

@@ -65,7 +65,9 @@ module Aptible
         end
 
         def ensure_log_drain(account, handle)
-          drains = account.log_drains.select { |d| d.handle == handle }
+          link = account.links['log_drains'].base_href
+          account_drains = Aptible::Api::LogDrain.all(href: link, token: fetch_token)
+          drains = account_drains.select { |d| d.handle == handle }
 
           if drains.empty?
             raise Thor::Error, "No drain found with handle #{handle}"

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

@@ -19,7 +19,9 @@ module Aptible
         end
 
         def ensure_metric_drain(account, handle)
-          drains = account.metric_drains.select { |d| d.handle == handle }
+          link = account.links['metric_drains'].base_href
+          account_drains = Aptible::Api::MetricDrain.all(href: link, token: fetch_token)
+          drains = account_drains.select { |d| d.handle == handle }
 
           if drains.empty?
             raise Thor::Error, "No drain found with handle #{handle}"

data/lib/aptible/cli/resource_formatter.rb

@@ -128,6 +128,10 @@ module Aptible
         end
 
         def inject_database(node, database, account)
+          # Some callers pass a database object with sensitive attributes already, others do not.
+          # Avoid creating extra 'show' activity if we already have the needed info
+          database = with_sensitive(database) if database.objects[:database_credentials].nil?
+
           node.value('id', database.id)
           node.value('handle', database.handle)
           node.value('created_at', database.created_at)
@@ -203,8 +207,8 @@ module Aptible
             node.value('type', 'https')
             node.value('port', port)
             node.value('load_balancing_algorithm_type', vhost
-                        .load_balancing_algorithm_type)
-            node.value('shared', vhost.shared)
+                        .load_balancing_algorithm_type || 'round_robin')
+            node.value('shared', vhost.shared || 'false')
           end
 
           node.value('internal', vhost.internal)
@@ -243,6 +247,9 @@ module Aptible
                      log_drain.drain_ephemeral_sessions)
           node.value('drain_proxies', log_drain.drain_proxies)
 
+          # These can be either optional for the drain type,
+          # or sensitive attributes we don't need to worry about
+          # in text output
           optional_attrs = %w(drain_username drain_host drain_port url)
           optional_attrs.each do |attr|
             value = log_drain.attributes[attr]
@@ -257,7 +264,13 @@ module Aptible
           node.value('handle', metric_drain.handle)
           node.value('drain_type', metric_drain.drain_type)
           node.value('created_at', metric_drain.created_at)
-          node.value('drain_configuration', metric_drain.drain_configuration)
+
+          # Sensitive attributes we don't need to worry about being missing in text output
+          optional_attrs = %w(drain_configuration)
+          optional_attrs.each do |attr|
+            value = metric_drain.attributes[attr]
+            node.value(attr, value) unless value.nil?
+          end
 
           attach_account(node, account)
         end

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

@@ -65,7 +65,7 @@ module Aptible
               end
             end
 
-            desc 'apps:scale SERVICE ' \
+            desc 'apps:scale [--app APP] SERVICE ' \
                  '[--container-count COUNT] [--container-size SIZE_MB] ' \
                  '[--container-profile PROFILE]',
                  'Scale a service'
@@ -107,7 +107,7 @@ module Aptible
               attach_to_operation_logs(op)
             end
 
-            desc 'apps:deprovision', 'Deprovision an app'
+            desc 'apps:deprovision [--app APP]', 'Deprovision an app'
             app_options
             define_method 'apps:deprovision' do
               telemetry(__method__, options)

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

@@ -9,13 +9,13 @@ module Aptible
             include Helpers::App
             include Helpers::Telemetry
 
-            desc 'config', "Print an app's current configuration"
+            desc 'config [--app APP]', "Print an app's current configuration"
             app_options
             def config
               telemetry(__method__, options)
 
               app = ensure_app(options)
-              config = app.current_configuration
+              config = current_configuration(app)
               env = config ? config.env : {}
 
               Formatter.render(Renderer.current) do |root|
@@ -31,14 +31,14 @@ module Aptible
               end
             end
 
-            desc 'config:get [VAR1]',
+            desc 'config:get [--app APP] [VAR1]',
                  "Print a specific key within an app's current configuration"
             app_options
             define_method 'config:get' do |*args|
               telemetry(__method__, options)
 
               app = ensure_app(options)
-              config = app.current_configuration
+              config = current_configuration(app)
               env = config ? config.env : {}
 
               Formatter.render(Renderer.current) do |root|
@@ -50,7 +50,7 @@ module Aptible
               end
             end
 
-            desc 'config:add [VAR1=VAL1] [VAR2=VAL2] [...]',
+            desc 'config:add [--app APP] [VAR1=VAL1] [VAR2=VAL2] [...]',
                  'Add an ENV variable to an app'
             app_options
             define_method 'config:add' do |*args|
@@ -64,7 +64,7 @@ module Aptible
               attach_to_operation_logs(operation)
             end
 
-            desc 'config:set [VAR1=VAL1] [VAR2=VAL2] [...]',
+            desc 'config:set [--app APP] [VAR1=VAL1] [VAR2=VAL2] [...]',
                  'Add an ENV variable to an app'
             app_options
             define_method 'config:set' do |*args|
@@ -72,7 +72,7 @@ module Aptible
               send('config:add', *args)
             end
 
-            desc 'config:rm [VAR1] [VAR2] [...]',
+            desc 'config:rm [--app APP] [VAR1] [VAR2] [...]',
                  'Remove an ENV variable from an app'
             app_options
             define_method 'config:rm' do |*args|
@@ -90,7 +90,7 @@ module Aptible
               attach_to_operation_logs(operation)
             end
 
-            desc 'config:unset [VAR1] [VAR2] [...]',
+            desc 'config:unset [--app APP] [VAR1] [VAR2] [...]',
                  'Remove an ENV variable from an app'
             app_options
             define_method 'config:unset' do |*args|

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

@@ -335,13 +335,13 @@ module Aptible
               return use_rds_tunnel(handle, desired_port) if aws_rds_db?(handle)
 
               database = ensure_database(options.merge(db: handle))
-              credential = find_credential(database, options[:type])
+              credential, credentials = find_credential(database, options[:type])
 
               m = "Creating #{credential.type} tunnel to #{database.handle}..."
               CLI.logger.info m
 
               if options[:type].nil?
-                types = database.database_credentials.map(&:type)
+                types = credentials.map(&:type)
                 unless types.empty?
                   valid = types.join(', ')
                   CLI.logger.info 'Use --type TYPE to specify a tunnel type'
@@ -481,7 +481,8 @@ module Aptible
               telemetry(__method__, options.merge(handle: handle))
 
               database = ensure_database(options.merge(db: handle))
-              credential = find_credential(database, options[:type])
+
+              credential, _credentials = find_credential(database, options[:type])
 
               Formatter.render(Renderer.current) do |root|
                 root.keyed_object('connection_url') do |node|

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

@@ -19,7 +19,7 @@ module Aptible
             include Helpers::App
             include Helpers::Telemetry
 
-            desc 'deploy [OPTIONS] [VAR1=VAL1] [VAR2=VAL2] [...]',
+            desc 'deploy [--app APP] [OPTIONS] [VAR1=VAL1] [VAR2=VAL2] [...]',
                  'Deploy an app'
             option :git_commitish,
                    desc: 'Deploy a specific git commit or branch: the ' \

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

@@ -44,6 +44,8 @@ module Aptible
                     account = acc_map[drain.links.account.href]
                     next if account.nil?
 
+                    # JSON output format we potentially show sensitive attributes
+                    drain = with_sensitive(drain) if Renderer.format == 'json'
                     node.object do |n|
                       ResourceFormatter.inject_log_drain(n, drain, account)
                     end

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

@@ -134,11 +134,11 @@ module Aptible
                   options[:string_matches]
                 )
               elsif id_options.any?
-                if options[:container_id]
-                  search_attrs = { container_id: options[:container_id] }
-                else
-                  search_attrs = { type: r_type, id: id_options.compact.first }
-                end
+                search_attrs = if options[:container_id]
+                                 { container_id: options[:container_id] }
+                               else
+                                 { type: r_type, id: id_options.compact.first }
+                               end
                 files = find_s3_files_by_attrs(
                   options[:region],
                   options[:bucket],

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

@@ -38,6 +38,8 @@ module Aptible
                     account = acc_map[drain.links.account.href]
                     next if account.nil?
 
+                    # JSON output format we potentially show sensitive attributes
+                    drain = with_sensitive(drain) if Renderer.format == 'json'
                     node.object do |n|
                       ResourceFormatter.inject_metric_drain(n, drain, account)
                     end

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

@@ -8,7 +8,8 @@ module Aptible
             include Helpers::App
             include Helpers::Telemetry
 
-            desc 'rebuild', 'Rebuild an app, and restart its services'
+            desc 'rebuild [--app APP]',
+                 'Rebuild an app, and restart its services'
             app_options
             def rebuild
               telemetry(__method__, options)

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

@@ -8,7 +8,8 @@ module Aptible
             include Helpers::App
             include Helpers::Telemetry
 
-            desc 'restart', 'Restart all services associated with an app'
+            desc 'restart [--app APP]',
+                 'Restart all services associated with an app'
             option :simulate_oom,
                    type: :boolean,
                    desc: 'Add this flag to simulate an OOM restart and test ' \

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

@@ -7,7 +7,7 @@ module Aptible
             include Helpers::App
             include Helpers::Telemetry
 
-            desc 'services', 'List Services for an App'
+            desc 'services [--app APP]', 'List Services for an App'
             app_options
             def services
               telemetry(__method__, options)
@@ -25,7 +25,7 @@ module Aptible
               end
             end
 
-            desc 'services:settings SERVICE'\
+            desc 'services:settings [--app APP] SERVICE'\
                    ' [--force-zero-downtime|--no-force-zero-downtime]'\
                    ' [--simple-health-check|--no-simple-health-check]'\
                    ' [--restart-free-scaling|--no-restart-free-scaling]'\
@@ -69,7 +69,7 @@ module Aptible
               service.update!(**updates) if updates.any?
             end
 
-            desc 'services:autoscaling_policy SERVICE',
+            desc 'services:autoscaling_policy [--app APP] SERVICE',
                  'Returns the associated sizing policy, if any'
             app_options
             define_method 'services:autoscaling_policy' do |service|
@@ -99,7 +99,7 @@ module Aptible
 
             map 'services:sizing_policy' => 'services:autoscaling_policy'
 
-            desc 'services:autoscaling_policy:set SERVICE '\
+            desc 'services:autoscaling_policy:set [--app APP] SERVICE '\
                    '--autoscaling-type (horizontal|vertical) '\
                    '[--metric-lookback-seconds SECONDS] '\
                    '[--percentile PERCENTILE] '\

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

@@ -10,7 +10,7 @@ module Aptible
             include Helpers::App
             include Helpers::Telemetry
 
-            desc 'ssh [COMMAND]', 'Run a command against an app'
+            desc 'ssh [--app APP] [COMMAND]', 'Run a command against an app'
             long_desc <<-LONGDESC
               Runs an interactive command against a remote Aptible app
 

data/lib/aptible/cli/version.rb

@@ -1,5 +1,5 @@
 module Aptible
   module CLI
-    VERSION = '0.26.1'.freeze
+    VERSION = '0.26.4'.freeze
   end
 end

data/lib/aptible/cli.rb

@@ -7,6 +7,20 @@ require 'aptible/cli/formatter'
 require 'aptible/cli/renderer'
 require 'aptible/cli/resource_formatter'
 
+# Set no_sensitive_extras=true as the default for all API resources.
+# This avoids returning sensitive embedded data unless explicitly requested.
+Aptible::Api::Resource.headers = { 'Prefer' => 'no_sensitive_extras=true' }
+
+def with_sensitive(resource)
+  resource.headers['Prefer'] = 'no_sensitive_extras=false'
+  resource.find_by_url(resource.href)
+end
+
+def without_sensitive(resource)
+  resource.headers['Prefer'] = 'no_sensitive_extras=true'
+  resource.find_by_url(resource.href)
+end
+
 module Aptible
   module CLI
     class TtyLogFormatter

data/spec/aptible/cli/agent_spec.rb

@@ -428,6 +428,76 @@ describe Aptible::CLI::Agent do
         end
       end
 
+      context 'failed_login_attempt_id handling' do
+        before do
+          allow(subject).to receive(:options)
+            .and_return(email: email, password: password)
+          expect(subject).to receive(:ask).with('2FA Token: ')
+            .once
+            .and_return(token)
+        end
+
+        it 'should extract failed_login_attempt_id when present' do
+          e = make_oauth2_error(
+            'otp_token_required',
+            'failed_login_attempt_id' => 'attempt-123'
+          )
+
+          expect(Aptible::Auth::Token).to receive(:create)
+            .with(email: email, password: password, expires_in: 1.week.seconds)
+            .once
+            .and_raise(e)
+
+          expect(Aptible::Auth::Token).to receive(:create)
+            .with(email: email, password: password, otp_token: token,
+                  previous_login_attempt_id: 'attempt-123',
+                  expires_in: 12.hours.seconds)
+            .once
+            .and_return(token)
+
+          subject.login
+        end
+
+        it 'should handle nil exception_context gracefully' do
+          parsed = { 'error' => 'otp_token_required' }
+          response = double('response',
+                            parsed: parsed,
+                            body: 'error otp_token_required')
+          allow(response).to receive(:error=)
+          e = OAuth2::Error.new(response)
+
+          expect(Aptible::Auth::Token).to receive(:create)
+            .with(email: email, password: password, expires_in: 1.week.seconds)
+            .once
+            .and_raise(e)
+
+          expect(Aptible::Auth::Token).to receive(:create)
+            .with(email: email, password: password, otp_token: token,
+                  expires_in: 12.hours.seconds)
+            .once
+            .and_return(token)
+
+          subject.login
+        end
+
+        it 'should handle missing failed_login_attempt_id gracefully' do
+          e = make_oauth2_error('otp_token_required', {})
+
+          expect(Aptible::Auth::Token).to receive(:create)
+            .with(email: email, password: password, expires_in: 1.week.seconds)
+            .once
+            .and_raise(e)
+
+          expect(Aptible::Auth::Token).to receive(:create)
+            .with(email: email, password: password, otp_token: token,
+                  expires_in: 12.hours.seconds)
+            .once
+            .and_return(token)
+
+          subject.login
+        end
+      end
+
       context 'SSO logins' do
         let(:token) { 'eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzUxMiJ9.eyJpZCI6I' }
 

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

@@ -17,6 +17,9 @@ describe Aptible::CLI::Agent do
   end
 
   before { allow(subject).to receive(:options) { { app: app.handle } } }
+  before do
+    allow(subject).to receive(:current_configuration, &:current_configuration)
+  end
   let(:operation) { Fabricate(:operation, resource: app) }
 
   describe '#config' do
@@ -60,6 +63,11 @@ describe Aptible::CLI::Agent do
   end
 
   describe '#config:get' do
+    it 'shows nothing for an unconfigured app' do
+      subject.send('config:get', 'FOO')
+      expect(captured_output_text).to eq('')
+    end
+
     it 'should show single environment variable specified' do
       app.current_configuration = Fabricate(
         :configuration, app: app, env: { 'FOO' => 'BAR', 'QUX' => 'two words' }

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

@@ -10,6 +10,9 @@ describe Aptible::CLI::Agent do
     allow(subject).to receive(:ask)
     allow(subject).to receive(:save_token)
     allow(subject).to receive(:fetch_token) { token }
+    allow(Aptible::Api::DatabaseCredential).to receive(:all) do
+      database.database_credentials
+    end
   end
 
   let(:handle) { 'foobar' }
@@ -226,41 +229,6 @@ describe Aptible::CLI::Agent do
         expect { subject.send('db:tunnel', handle) }
           .to raise_error(/foobar is not provisioned/im)
       end
-
-      context 'v1 stack' do
-        before do
-          allow(database.account.stack).to receive(:version) { 'v1' }
-        end
-
-        it 'falls back to the database itself if no type is given' do
-          expect(subject).to receive(:with_local_tunnel).with(database, 0)
-          subject.send('db:tunnel', handle)
-        end
-
-        it 'falls back to the database itself if type matches' do
-          subject.options = { type: 'bar' }
-          allow(database).to receive(:type) { 'bar' }
-
-          expect(subject).to receive(:with_local_tunnel).with(database, 0)
-          subject.send('db:tunnel', handle)
-        end
-
-        it 'does not fall back to the database itself if type mismatches' do
-          subject.options = { type: 'bar' }
-          allow(database).to receive(:type) { 'foo' }
-
-          expect { subject.send('db:tunnel', handle) }
-            .to raise_error(/no credential with type bar/im)
-        end
-
-        it 'does not suggest other types that do not exist' do
-          expect(subject).to receive(:with_local_tunnel).with(database, 0)
-
-          subject.send('db:tunnel', handle)
-
-          expect(captured_logs).not_to match(/use --type type/i)
-        end
-      end
     end
   end
 
@@ -845,22 +813,6 @@ describe Aptible::CLI::Agent do
         expect { subject.send('db:url', handle) }
           .to raise_error(/Multiple databases/)
       end
-
-      context 'v1 stack' do
-        before do
-          allow(database.account.stack).to receive(:version) { 'v1' }
-        end
-
-        it 'returns the URL of a specified DB' do
-          connection_url = 'postgresql://aptible-v1:password@lega.cy:4242/db'
-          expect(database).to receive(:connection_url)
-            .and_return(connection_url)
-
-          subject.send('db:url', handle)
-
-          expect(captured_output_text.chomp).to eq(connection_url)
-        end
-      end
     end
   end
 

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

@@ -14,9 +14,15 @@ describe Aptible::CLI::Agent do
       .with(token: token, href: '/log_drains?per_page=5000')
       .and_return([log_drain])
 
+    allow(Aptible::Api::LogDrain).to receive(:all)
+      .with(token: token, href: "/accounts/#{account.id}/log_drains")
+      .and_return([log_drain])
+
     allow(Aptible::Api::Account).to receive(:all)
       .with(token: token, href: '/accounts?per_page=5000&no_embed=true')
       .and_return([account])
+
+    allow(account).to receive(:reload).and_return(account)
   end
 
   describe '#log_drain:list' do

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

@@ -14,6 +14,10 @@ describe Aptible::CLI::Agent do
       .with(token: token, href: '/metric_drains?per_page=5000')
       .and_return([metric_drain])
 
+    allow(Aptible::Api::MetricDrain).to receive(:all)
+      .with(token: token, href: "/accounts/#{account.id}/metric_drains")
+      .and_return([metric_drain])
+
     allow(Aptible::Api::Account).to receive(:all)
       .with(token: token, href: '/accounts?per_page=5000&no_embed=true')
       .and_return([account])

data/spec/fabricators/account_fabricator.rb

@@ -1,4 +1,4 @@
-class StubAccount < OpenStruct
+class StubAccount < StubAptibleResource
   def each_app(&block)
     return enum_for(:each_app) if block.nil?
     apps.each(&block)
@@ -34,6 +34,14 @@ Fabricator(:account, from: :stub_account) do
     hash = {
       self: OpenStruct.new(
         href: "/accounts/#{attrs[:id]}"
+      ),
+      metric_drains: OpenStruct.new(
+        base_href: "/accounts/#{attrs[:id]}/metric_drains",
+        href: "/accounts/#{attrs[:id]}/metric_drains"
+      ),
+      log_drains: OpenStruct.new(
+        base_href: "/accounts/#{attrs[:id]}/log_drains",
+        href: "/accounts/#{attrs[:id]}/log_drains"
       )
     }
     OpenStruct.new(hash)

data/spec/fabricators/app_external_aws_rds_connection_fabricator.rb

@@ -1,4 +1,4 @@
-class StubAppExternalAwsRdsConnection < OpenStruct
+class StubAppExternalAwsRdsConnection < StubAptibleResource
   def attributes
     {
       'id' => id,

data/spec/fabricators/app_fabricator.rb

@@ -1,4 +1,4 @@
-class StubApp < OpenStruct
+class StubApp < StubAptibleResource
   def vhosts
     services.map(&:vhosts).flatten
   end

data/spec/fabricators/backup_fabricator.rb

@@ -1,4 +1,4 @@
-class StubBackup < OpenStruct; end
+class StubBackup < StubAptibleResource; end
 
 Fabricator(:backup, from: :stub_backup) do
   id { sequence(:backup_id) }

data/spec/fabricators/backup_retention_policy_fabricator.rb

@@ -1,4 +1,4 @@
-class StubBackupRetentionPolicy < OpenStruct
+class StubBackupRetentionPolicy < StubAptibleResource
   def reload
     self
   end

data/spec/fabricators/certificate_fabricator.rb

@@ -1,4 +1,4 @@
-class StubCertificate < OpenStruct; end
+class StubCertificate < StubAptibleResource; end
 
 Fabricator(:certificate, from: :stub_certificate) do
   account

data/spec/fabricators/configuration_fabricator.rb

@@ -1,4 +1,4 @@
-class StubConfiguration < OpenStruct
+class StubConfiguration < StubAptibleResource
 end
 
 Fabricator(:configuration, from: :stub_configuration) do

data/spec/fabricators/database_credential_fabricator.rb

@@ -1,4 +1,4 @@
-class StubDatabaseCredential < OpenStruct; end
+class StubDatabaseCredential < StubAptibleResource; end
 
 Fabricator(:database_credential, from: :stub_database_credential) do
   database

data/spec/fabricators/database_disk_fabricator.rb

@@ -1,4 +1,4 @@
-class StubDatabaseDisk < OpenStruct
+class StubDatabaseDisk < StubAptibleResource
 end
 
 Fabricator(:database_disk, from: :stub_database_disk) do

data/spec/fabricators/database_fabricator.rb

@@ -1,7 +1,13 @@
-class StubDatabase < OpenStruct
+class StubDatabase < StubAptibleResource
   def provisioned?
     status == 'provisioned'
   end
+
+  def objects
+    {
+      'database_credentials' => database_credentials
+    }
+  end
 end
 
 Fabricator(:database, from: :stub_database) do
@@ -23,6 +29,9 @@ Fabricator(:database, from: :stub_database) do
     hash = {
       account: OpenStruct.new(
         href: "/accounts/#{attrs[:account].id}"
+      ),
+      database_credentials: OpenStruct.new(
+        href: "/databases/#{attrs[:handle]}/database_credentials"
       )
     }
     OpenStruct.new(hash)

data/spec/fabricators/database_image_fabricator.rb

@@ -1,4 +1,4 @@
-class StubDatabaseImage < OpenStruct
+class StubDatabaseImage < StubAptibleResource
 end
 
 Fabricator(:database_image, from: :stub_database_image) do

data/spec/fabricators/external_aws_account_fabricator.rb

@@ -1,4 +1,4 @@
-class StubExternalAwsAccount < OpenStruct
+class StubExternalAwsAccount < StubAptibleResource
   def attributes
     {
       'aws_account_id' => aws_account_id,

data/spec/fabricators/external_aws_database_credential_fabricator.rb

@@ -1,4 +1,4 @@
-class StubExternalAwsDatabaseCredential < OpenStruct
+class StubExternalAwsDatabaseCredential < StubAptibleResource
   def attributes
     {
       'id' => id,