aptible-cli 0.24.1 → 0.24.3

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

@@ -5,10 +5,13 @@ module Aptible
         def self.included(thor)
           thor.class_eval do
             include Helpers::App
+            include Helpers::Telemetry
 
             desc 'services', 'List Services for an App'
             app_options
             def services
+              telemetry(__method__, options)
+
               app = ensure_app(options)
 
               Formatter.render(Renderer.current) do |root|
@@ -35,6 +38,8 @@ module Aptible
                    type: :boolean, default: false,
                    desc: 'Use a simple uptime healthcheck during deployments'
             define_method 'services:settings' do |service|
+              telemetry(__method__, options.merge(service: service))
+
               service = ensure_service(options, service)
               updates = {}
               updates[:force_zero_downtime] =
@@ -49,6 +54,8 @@ module Aptible
                  'Returns the associated sizing policy, if any'
             app_options
             define_method 'services:autoscaling_policy' do |service|
+              telemetry(__method__, options.merge(service: service))
+
               service = ensure_service(options, service)
               policy = service.service_sizing_policy
 
@@ -119,9 +126,9 @@ module Aptible
                    'be considered.'
             option :post_release_cooldown_seconds,
                    type: :numeric,
-                   desc: '(Default: 300) The time in seconds to wait '\
-                   'following a deploy before another scaling action can '\
-                   'be considered.'
+                   desc: '(Default: 60) The time in seconds to ignore in '\
+                   'metrics following a deploy to allow for service '\
+                   'stabilization.'
             option :mem_cpu_ratio_r_threshold,
                    type: :numeric,
                    desc: '(Default: 4.0) Establishes the ratio of Memory '\
@@ -187,6 +194,8 @@ module Aptible
                    ' a value of 2 will go from 4->2->1). Container count '\
                    'will never exceed the configured minimum.'
             define_method 'services:autoscaling_policy:set' do |service|
+              telemetry(__method__, options.merge(service: service))
+
               service = ensure_service(options, service)
               ignored_attrs = %i(autoscaling_type app environment remote)
               args = options.except(*ignored_attrs)

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

@@ -8,6 +8,7 @@ module Aptible
           thor.class_eval do
             include Helpers::Operation
             include Helpers::App
+            include Helpers::Telemetry
 
             desc 'ssh [COMMAND]', 'Run a command against an app'
             long_desc <<-LONGDESC
@@ -18,6 +19,8 @@ module Aptible
             app_options
             option :force_tty, type: :boolean
             def ssh(*args)
+              telemetry(__method__, options)
+
               app = ensure_app(options)
 
               # SSH's default behavior is as follows:

data/lib/aptible/cli/version.rb

@@ -1,5 +1,5 @@
 module Aptible
   module CLI
-    VERSION = '0.24.1'.freeze
+    VERSION = '0.24.3'.freeze
   end
 end

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

@@ -31,6 +31,9 @@ describe Aptible::CLI::Agent do
   describe '#apps' do
     it 'lists an app in an account' do
       allow(Aptible::Api::Account).to receive(:all).and_return([account])
+      allow(Aptible::Api::App)
+        .to receive(:all)
+        .and_return([app])
       subject.send('apps')
 
       expect(captured_output_text)
@@ -40,8 +43,11 @@ describe Aptible::CLI::Agent do
     it 'lists multiple apps in an account' do
       allow(Aptible::Api::Account).to receive(:all).and_return([account])
       app2 = Fabricate(:app, handle: 'foobar', account: account)
-      subject.send('apps')
+      allow(Aptible::Api::App)
+        .to receive(:all)
+        .and_return([app, app2])
 
+      subject.send('apps')
       expect(captured_output_text)
         .to eq("=== #{account.handle}\n#{app.handle}\n#{app2.handle}\n")
     end
@@ -54,6 +60,9 @@ describe Aptible::CLI::Agent do
       app21 = Fabricate(:app, account: account2, handle: 'app21')
       app22 = Fabricate(:app, account: account2, handle: 'app21')
 
+      allow(Aptible::Api::App)
+        .to receive(:all)
+        .and_return([app11, app21, app22])
       allow(Aptible::Api::Account).to receive(:all)
         .and_return([account1, account2])
 
@@ -77,6 +86,7 @@ describe Aptible::CLI::Agent do
       app2 = Fabricate(:app, account: account2, handle: 'app2')
       allow(subject).to receive(:options)
         .and_return(environment: account2.handle)
+      allow(Aptible::Api::App).to receive(:all).and_return([app2])
 
       allow(Aptible::Api::Account).to receive(:all)
         .and_return([account, account2])
@@ -90,6 +100,7 @@ describe Aptible::CLI::Agent do
       account = Fabricate(:account, handle: 'account')
       app = Fabricate(:app, account: account, handle: 'app')
       allow(Aptible::Api::Account).to receive(:all).and_return([account])
+      allow(Aptible::Api::App).to receive(:all).and_return([app])
 
       s1 = Fabricate(
         :service,
@@ -148,6 +159,7 @@ describe Aptible::CLI::Agent do
       app = Fabricate(:app, account: account, handle: 'app',
                             last_deploy_operation: op)
       allow(Aptible::Api::Account).to receive(:all).and_return([account])
+      allow(Aptible::Api::App).to receive(:all).and_return([app])
 
       expected_json = [
         {

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

@@ -9,9 +9,11 @@ describe Aptible::CLI::Agent do
 
   before do
     allow(Aptible::Api::App).to receive(:all)
-      .with(token: token).and_return([app])
+      .with(token: token, href: '/apps?per_page=5000&no_embed=true')
+      .and_return([app])
     allow(Aptible::Api::Account).to receive(:all)
-      .with(token: token).and_return([account])
+      .with(token: token, href: '/apps?per_page=5000&no_embed=true')
+      .and_return([account])
   end
 
   before { allow(subject).to receive(:options) { { app: app.handle } } }

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

@@ -269,6 +269,7 @@ describe Aptible::CLI::Agent do
       staging = Fabricate(:account, handle: 'staging')
       prod = Fabricate(:account, handle: 'production')
 
+      dbs = []
       [
         [staging, 'staging-redis-db'],
         [staging, 'staging-postgres-db'],
@@ -276,12 +277,17 @@ describe Aptible::CLI::Agent do
         [prod, 'prod-postgres-db']
       ].each do |a, h|
         d = Fabricate(:database, account: a, handle: h)
+        dbs << d
         Fabricate(:database_credential, database: d)
       end
 
       token = 'the-token'
       allow(subject).to receive(:fetch_token) { token }
-      allow(Aptible::Api::Account).to receive(:all).with(token: token)
+      allow(Aptible::Api::Database).to receive(:all)
+        .with(token: token, href: '/databases?per_page=5000&no_embed=true')
+        .and_return(dbs)
+      allow(Aptible::Api::Account).to receive(:all)
+        .with(token: token, href: '/accounts?per_page=5000&no_embed=true')
         .and_return([staging, prod])
     end
 

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

@@ -8,7 +8,9 @@ describe Aptible::CLI::Agent do
 
   before do
     allow(subject).to receive(:fetch_token) { token }
-    allow(Aptible::Api::Account).to receive(:all).with(token: token)
+    allow(Aptible::Api::Account)
+      .to receive(:all)
+      .with(token: token, href: '/accounts?per_page=5000&no_embed=true')
       .and_return([a1, a2])
   end
 
@@ -60,7 +62,9 @@ describe Aptible::CLI::Agent do
     let!(:db) { Fabricate(:database, handle: 'mydb', account: a1) }
 
     before do
-      allow(Aptible::Api::Database).to receive(:all).with(token: token)
+      allow(Aptible::Api::Database)
+        .to receive(:all)
+        .with(token: token, href: '/databases?per_page=5000&no_embed=true')
         .and_return([db])
       allow(db).to receive(:class).and_return(Aptible::Api::Database)
       stub_options
@@ -185,7 +189,9 @@ describe Aptible::CLI::Agent do
     let!(:service) { Fabricate(:service, app: app, process_type: 'web') }
 
     before do
-      allow(Aptible::Api::App).to receive(:all).with(token: token)
+      allow(Aptible::Api::App)
+        .to receive(:all)
+        .with(token: token, href: '/apps?per_page=5000&no_embed=true')
         .and_return([app])
       allow(app).to receive(:class).and_return(Aptible::Api::App)
       stub_options

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

@@ -12,7 +12,9 @@ describe Aptible::CLI::Agent do
 
   before(:each) do
     allow(subject).to receive(:fetch_token) { token }
-    allow(Aptible::Api::Account).to receive(:all).with(token: token)
+    allow(Aptible::Api::Account)
+      .to receive(:all)
+      .with(token: token, href: '/accounts?per_page=5000&no_embed=true')
       .and_return([a1, a2])
   end
 

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

@@ -10,8 +10,13 @@ describe Aptible::CLI::Agent do
   before { allow(subject).to receive(:fetch_token).and_return(token) }
 
   before do
+    allow(Aptible::Api::LogDrain).to receive(:all)
+      .with(token: token, href: '/log_drains?per_page=5000')
+      .and_return([log_drain])
+
     allow(Aptible::Api::Account).to receive(:all)
-      .with(token: token).and_return([account])
+      .with(token: token, href: '/accounts?per_page=5000&no_embed=true')
+      .and_return([account])
   end
 
   describe '#log_drain:list' do
@@ -25,8 +30,16 @@ describe Aptible::CLI::Agent do
 
     it 'lists log drains across multiple accounts' do
       other_account = Fabricate(:account)
-      Fabricate(:log_drain, handle: 'test2', account: other_account)
+      other_drain = Fabricate(
+        :log_drain,
+        handle: 'test2',
+        account: other_account
+      )
       accounts = [account, other_account]
+
+      allow(Aptible::Api::LogDrain).to receive(:all)
+        .with(token: token, href: '/log_drains?per_page=5000')
+        .and_return([log_drain, other_drain])
       allow(Aptible::Api::Account).to receive(:all).and_return(accounts)
 
       subject.send('log_drain:list')

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

@@ -55,7 +55,7 @@ describe Aptible::CLI::Agent do
       token = 'the-token'
       allow(subject).to receive(:fetch_token) { token }
       allow(Aptible::Api::Account).to receive(:all)
-        .with(token: token)
+        .with(token: token, href: '/accounts?per_page=5000&no_embed=true')
         .and_return([staging, prod])
       allow(Aptible::Api::MaintenanceDatabase).to receive(:all)
         .with(token: token)
@@ -123,7 +123,8 @@ describe Aptible::CLI::Agent do
     before do
       token = 'the-token'
       allow(subject).to receive(:fetch_token) { token }
-      allow(Aptible::Api::Account).to receive(:all).with(token: token)
+      allow(Aptible::Api::Account).to receive(:all)
+        .with(token: token, href: '/accounts?per_page=5000&no_embed=true')
         .and_return([staging, prod])
       allow(Aptible::Api::MaintenanceApp).to receive(:all).with(token: token)
         .and_return(maintenance_apps)

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

@@ -10,8 +10,13 @@ describe Aptible::CLI::Agent do
   before { allow(subject).to receive(:fetch_token).and_return(token) }
 
   before do
+    allow(Aptible::Api::MetricDrain).to receive(:all)
+      .with(token: token, href: '/metric_drains?per_page=5000')
+      .and_return([metric_drain])
+
     allow(Aptible::Api::Account).to receive(:all)
-      .with(token: token).and_return([account])
+      .with(token: token, href: '/accounts?per_page=5000&no_embed=true')
+      .and_return([account])
   end
 
   describe '#metric_drain:list' do
@@ -25,8 +30,16 @@ describe Aptible::CLI::Agent do
 
     it 'lists metric drains across multiple accounts' do
       other_account = Fabricate(:account)
-      Fabricate(:metric_drain, handle: 'test2', account: other_account)
+      other_drain = Fabricate(
+        :metric_drain,
+        handle: 'test2',
+        account: other_account
+      )
       accounts = [account, other_account]
+
+      allow(Aptible::Api::MetricDrain).to receive(:all)
+        .with(token: token, href: '/metric_drains?per_page=5000')
+        .and_return([metric_drain, other_drain])
       allow(Aptible::Api::Account).to receive(:all).and_return(accounts)
 
       subject.send('metric_drain:list')

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

@@ -142,7 +142,8 @@ describe Aptible::CLI::Agent do
 
       expect { subject.send('operation:logs', 1) }
         .to raise_error('Unable to retrieve the operation\'s logs. '\
-          'If the issue persists please contact support for assistance.')
+          'If the issue persists please contact support for assistance, ' \
+          "or view them at https://app.aptible.com/operations/#{operation_id}")
     end
     it 'errors when body is empty' do
       operation_id = SecureRandom.uuid
@@ -163,7 +164,8 @@ describe Aptible::CLI::Agent do
 
       expect { subject.send('operation:logs', 1) }
         .to raise_error('Unable to retrieve the operation\'s logs. '\
-          'If the issue persists please contact support for assistance.')
+          'If the issue persists please contact support for assistance, ' \
+          "or view them at https://app.aptible.com/operations/#{operation_id}")
     end
     it 'errors when s3 itself returns an error code' do
       operation_id = SecureRandom.uuid

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

@@ -6,7 +6,9 @@ describe Aptible::CLI::Agent do
 
   before do
     allow(subject).to receive(:fetch_token) { token }
-    allow(Aptible::Api::App).to receive(:all).with(token: token)
+    allow(Aptible::Api::App)
+      .to receive(:all)
+      .with(token: token, href: '/apps?per_page=5000&no_embed=true')
       .and_return([app])
   end
 

data/spec/fabricators/account_fabricator.rb

@@ -30,4 +30,12 @@ Fabricator(:account, from: :stub_account) do
   metric_drains { [] }
   backup_retention_policies { [] }
   created_at { Time.now }
+  links do |attrs|
+    hash = {
+      self: OpenStruct.new(
+        href: "/accounts/#{attrs[:id]}"
+      )
+    }
+    OpenStruct.new(hash)
+  end
 end

data/spec/fabricators/app_fabricator.rb

@@ -31,5 +31,14 @@ Fabricator(:app, from: :stub_app) do
   errors { Aptible::Resource::Errors.new }
   created_at { Time.now }
 
+  links do |attrs|
+    hash = {
+      account: OpenStruct.new(
+        href: "/accounts/#{attrs[:account].id}"
+      )
+    }
+    OpenStruct.new(hash)
+  end
+
   after_create { |app| app.account.apps << app }
 end

data/spec/fabricators/database_fabricator.rb

@@ -19,6 +19,14 @@ Fabricator(:database, from: :stub_database) do
   database_image
   disk { Fabricate(:database_disk) }
   service { nil }
+  links do |attrs|
+    hash = {
+      account: OpenStruct.new(
+        href: "/accounts/#{attrs[:account].id}"
+      )
+    }
+    OpenStruct.new(hash)
+  end
 
   backups { [] }
   database_credentials { [] }

data/spec/fabricators/log_drain_fabricator.rb

@@ -16,6 +16,14 @@ end
 Fabricator(:log_drain, from: :stub_log_drain) do
   id { sequence(:log_drain_id) }
   account
+  links do |attrs|
+    hash = {
+      account: OpenStruct.new(
+        href: "/accounts/#{attrs[:account].id}"
+      )
+    }
+    OpenStruct.new(hash)
+  end
 
   after_create { |drain| drain.account.log_drains << drain }
 end

data/spec/fabricators/metric_drain_fabricator.rb

@@ -3,6 +3,14 @@ class StubMetricDrain < OpenStruct; end
 Fabricator(:metric_drain, from: :stub_metric_drain) do
   id { sequence(:metric_drain_id) }
   account
+  links do |attrs|
+    hash = {
+      account: OpenStruct.new(
+        href: "/accounts/#{attrs[:account].id}"
+      )
+    }
+    OpenStruct.new(hash)
+  end
 
   after_create { |drain| drain.account.metric_drains << drain }
 end

data/spec/spec_helper.rb

@@ -76,7 +76,15 @@ module SpecHarness
 end
 
 RSpec.configure do |config|
-  config.before(:each) { reset_spec_harness }
+  config.before(:each) do
+    reset_spec_harness
+    begin
+      allow(subject)
+        .to receive(:telemetry)
+        .and_return nil
+    rescue
+    end
+  end
 
   config.include(SpecHarness)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aptible-cli
 version: !ruby/object:Gem::Version
-  version: 0.24.1
+  version: 0.24.3
 platform: ruby
 authors:
 - Frank Macreery
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-12-26 00:00:00.000000000 Z
+date: 2025-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -376,6 +376,7 @@ files:
 - lib/aptible/cli/helpers/security_key.rb
 - lib/aptible/cli/helpers/ssh.rb
 - lib/aptible/cli/helpers/system.rb
+- lib/aptible/cli/helpers/telemetry.rb
 - lib/aptible/cli/helpers/token.rb
 - lib/aptible/cli/helpers/tunnel.rb
 - lib/aptible/cli/helpers/vhost.rb
@@ -472,7 +473,7 @@ homepage: https://github.com/aptible/aptible-cli
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -488,7 +489,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3.1
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Command-line interface for Aptible services
 test_files: