aptible-cli 0.24.2 → 0.24.3

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

@@ -18,6 +18,7 @@ module Aptible
           thor.class_eval do
             include Helpers::Operation
             include Helpers::App
+            include Helpers::Telemetry
 
             desc 'deploy [OPTIONS] [VAR1=VAL1] [VAR2=VAL2] [...]',
                  'Deploy an app'
@@ -46,6 +47,8 @@ module Aptible
             end
             app_options
             def deploy(*args)
+              telemetry(__method__, options)
+
               app = ensure_app(options)
 
               git_ref = options[:git_commitish]

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

@@ -10,6 +10,7 @@ module Aptible
             include Helpers::Operation
             include Helpers::AppOrDatabase
             include Helpers::Vhost
+            include Helpers::Telemetry
 
             database_create_flags = Helpers::Vhost::OptionSetBuilder.new do
               create!
@@ -20,6 +21,8 @@ module Aptible
                  'Create a Database Endpoint'
             database_create_flags.declare_options(self)
             define_method 'endpoints:database:create' do |handle|
+              telemetry(__method__, options.merge(handle: handle))
+
               database = ensure_database(options.merge(db: handle))
               service = database.service
               raise Thor::Error, 'Database is not provisioned' if service.nil?
@@ -42,6 +45,8 @@ module Aptible
                  'Modify a Database Endpoint'
             database_modify_flags.declare_options(self)
             define_method 'endpoints:database:modify' do |hostname|
+              telemetry(__method__, options.merge(hostname: hostname))
+
               database = ensure_database(options.merge(db: options[:database]))
               vhost = find_vhost(each_service(database), hostname)
               vhost.update!(**database_modify_flags.prepare(database.account,
@@ -59,6 +64,8 @@ module Aptible
                  'Create an App TCP Endpoint'
             tcp_create_flags.declare_options(self)
             define_method 'endpoints:tcp:create' do |type|
+              telemetry(__method__, options.merge(type: type))
+
               create_app_vhost(
                 tcp_create_flags, options, type,
                 type: 'tcp', platform: 'elb'
@@ -74,6 +81,8 @@ module Aptible
                  'Modify an App TCP Endpoint'
             tcp_modify_flags.declare_options(self)
             define_method 'endpoints:tcp:modify' do |hostname|
+              telemetry(__method__, options.merge(hostname: hostname))
+
               modify_app_vhost(tcp_modify_flags, options, hostname)
             end
 
@@ -88,6 +97,8 @@ module Aptible
                  'Create an App TLS Endpoint'
             tls_create_flags.declare_options(self)
             define_method 'endpoints:tls:create' do |type|
+              telemetry(__method__, options.merge(type: type))
+
               create_app_vhost(
                 tls_create_flags, options, type,
                 type: 'tls', platform: 'elb'
@@ -104,6 +115,8 @@ module Aptible
                  'Modify an App TLS Endpoint'
             tls_modify_flags.declare_options(self)
             define_method 'endpoints:tls:modify' do |hostname|
+              telemetry(__method__, options.merge(hostname: hostname))
+
               modify_app_vhost(tls_modify_flags, options, hostname)
             end
 
@@ -118,6 +131,8 @@ module Aptible
                  'Create an App gRPC Endpoint'
             grpc_create_flags.declare_options(self)
             define_method 'endpoints:grpc:create' do |type|
+              telemetry(__method__, options.merge(type: type))
+
               create_app_vhost(
                 grpc_create_flags, options, type,
                 type: 'grpc', platform: 'elb'
@@ -134,6 +149,8 @@ module Aptible
                  'Modify an App gRPC Endpoint'
             grpc_modify_flags.declare_options(self)
             define_method 'endpoints:grpc:modify' do |hostname|
+              telemetry(__method__, options.merge(hostname: hostname))
+
               modify_app_vhost(grpc_modify_flags, options, hostname)
             end
 
@@ -148,6 +165,8 @@ module Aptible
                  'Create an App HTTPS Endpoint'
             https_create_flags.declare_options(self)
             define_method 'endpoints:https:create' do |type|
+              telemetry(__method__, options.merge(type: type))
+
               create_app_vhost(
                 https_create_flags, options, type,
                 type: 'http', platform: 'alb'
@@ -164,6 +183,7 @@ module Aptible
                  'Modify an App HTTPS Endpoint'
             https_modify_flags.declare_options(self)
             define_method 'endpoints:https:modify' do |hostname|
+              telemetry(__method__, options.merge(hostname: hostname))
               modify_app_vhost(https_modify_flags, options, hostname)
             end
 
@@ -171,6 +191,8 @@ module Aptible
                  'List Endpoints for an App or Database'
             app_or_database_options
             define_method 'endpoints:list' do
+              telemetry(__method__, options)
+
               resource = ensure_app_or_database(options)
 
               Formatter.render(Renderer.current) do |root|
@@ -191,6 +213,8 @@ module Aptible
                  'Deprovision an App or Database Endpoint'
             app_or_database_options
             define_method 'endpoints:deprovision' do |hostname|
+              telemetry(__method__, options.merge(hostname: hostname))
+
               resource = ensure_app_or_database(options)
               vhost = find_vhost(each_service(resource), hostname)
               op = vhost.create_operation!(type: 'deprovision')
@@ -209,6 +233,8 @@ module Aptible
             LONGDESC
             app_options
             define_method 'endpoints:renew' do |hostname|
+              telemetry(__method__, options.merge(hostname: hostname))
+
               app = ensure_app(options)
               vhost = find_vhost(app.each_service, hostname)
               op = vhost.create_operation!(type: 'renew')

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

@@ -6,10 +6,13 @@ module Aptible
           thor.class_eval do
             include Helpers::Environment
             include Helpers::Token
+            include Helpers::Telemetry
 
             desc 'environment:list', 'List all environments'
             option :environment, aliases: '--env'
             define_method 'environment:list' do
+              telemetry(__method__, options)
+
               Formatter.render(Renderer.current) do |root|
                 root.keyed_list(
                   'handle'
@@ -27,6 +30,8 @@ module Aptible
                  'Retrieve the CA certificate associated with the environment'
             option :environment, aliases: '--env'
             define_method 'environment:ca_cert' do
+              telemetry(__method__, options)
+
               Formatter.render(Renderer.current) do |root|
                 root.grouped_keyed_list(
                   'handle',
@@ -48,6 +53,12 @@ module Aptible
                  ' destinations, you must restart the apps/databases in'\
                  ' this environment.'
             define_method 'environment:rename' do |old_handle, new_handle|
+              opts = options.merge(
+                old_handle: old_handle,
+                new_handle: new_handle
+              )
+              telemetry(__method__, opts)
+
               env = ensure_environment(options.merge(environment: old_handle))
               env.update!(handle: new_handle)
               m1 = "In order for the new environment handle (#{new_handle})"\

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

@@ -7,6 +7,7 @@ module Aptible
             include Helpers::Token
             include Helpers::Database
             include Helpers::LogDrain
+            include Helpers::Telemetry
 
             drain_flags = '--environment ENVIRONMENT ' \
                           '[--drain-apps true/false] ' \
@@ -25,16 +26,25 @@ module Aptible
             desc 'log_drain:list', 'List all Log Drains'
             option :environment, aliases: '--env'
             define_method 'log_drain:list' do
+              telemetry(__method__, options)
+
               Formatter.render(Renderer.current) do |root|
                 root.grouped_keyed_list(
                   { 'environment' => 'handle' },
                   'handle'
                 ) do |node|
-                  scoped_environments(options).each do |account|
-                    account.log_drains.each do |drain|
-                      node.object do |n|
-                        ResourceFormatter.inject_log_drain(n, drain, account)
-                      end
+                  accounts = scoped_environments(options)
+                  acc_map = environment_map(accounts)
+
+                  Aptible::Api::LogDrain.all(
+                    token: fetch_token,
+                    href: '/log_drains?per_page=5000'
+                  ).each do |drain|
+                    account = acc_map[drain.links.account.href]
+                    next if account.nil?
+
+                    node.object do |n|
+                      ResourceFormatter.inject_log_drain(n, drain, account)
                     end
                   end
                 end
@@ -49,6 +59,8 @@ module Aptible
             option :db, type: :string
             option :pipeline, type: :string
             define_method 'log_drain:create:elasticsearch' do |handle|
+              telemetry(__method__, options.merge(handle: handle))
+
               account = ensure_environment(options)
               database = ensure_database(options)
 
@@ -73,6 +85,8 @@ module Aptible
             drain_options
             option :url, type: :string
             define_method 'log_drain:create:datadog' do |handle|
+              telemetry(__method__, options.merge(handle: handle))
+
               msg = 'Must be in the format of ' \
                     '"https://http-intake.logs.datadoghq.com' \
                     '/v1/input/<DD_API_KEY>".'
@@ -86,6 +100,7 @@ module Aptible
             option :url, type: :string
             drain_options
             define_method 'log_drain:create:https' do |handle|
+              telemetry(__method__, options.merge(handle: handle))
               create_https_based_log_drain(handle, options)
             end
 
@@ -96,6 +111,7 @@ module Aptible
             option :url, type: :string
             drain_options
             define_method 'log_drain:create:sumologic' do |handle|
+              telemetry(__method__, options.merge(handle: handle))
               create_https_based_log_drain(handle, options)
             end
 
@@ -106,6 +122,8 @@ module Aptible
             option :url, type: :string
             drain_options
             define_method 'log_drain:create:logdna' do |handle|
+              telemetry(__method__, options.merge(handle: handle))
+
               msg = 'Must be in the format of ' \
                     '"https://logs.logdna.com/aptible/ingest/<INGESTION KEY>".'
               create_https_based_log_drain(handle, options, url_format_msg: msg)
@@ -119,6 +137,7 @@ module Aptible
             option :port, type: :string
             drain_options
             define_method 'log_drain:create:papertrail' do |handle|
+              telemetry(__method__, options.merge(handle: handle))
               create_syslog_based_log_drain(handle, options)
             end
 
@@ -132,6 +151,7 @@ module Aptible
             option :token, type: :string
             drain_options
             define_method 'log_drain:create:syslog' do |handle|
+              telemetry(__method__, options.merge(handle: handle))
               create_syslog_based_log_drain(handle, options)
             end
 
@@ -139,6 +159,7 @@ module Aptible
                  'Deprovisions a log drain'
             option :environment, aliases: '--env'
             define_method 'log_drain:deprovision' do |handle|
+              telemetry(__method__, options.merge(handle: handle))
               account = ensure_environment(options)
               drain = ensure_log_drain(account, handle)
               op = drain.create_operation(type: :deprovision)

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

@@ -12,11 +12,14 @@ module Aptible
             include Helpers::AppOrDatabase
             include Helpers::S3LogHelpers
             include Helpers::DateHelpers
+            include Helpers::Telemetry
 
             desc 'logs [--app APP | --database DATABASE]',
                  'Follows logs from a running app or database'
             app_or_database_options
             def logs
+              telemetry(__method__, options)
+
               resource = ensure_app_or_database(options)
 
               unless resource.status == 'provisioned'
@@ -89,6 +92,8 @@ module Aptible
                    type: :string
 
             def logs_from_archive
+              telemetry(__method__, options)
+
               ensure_aws_creds
               validate_log_search_options(options)
 

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

@@ -7,12 +7,15 @@ module Aptible
             include Helpers::Environment
             include Helpers::Maintenance
             include Helpers::Token
+            include Helpers::Telemetry
 
             desc 'maintenance:apps',
                  'List Apps impacted by maintenance schedules where '\
                  'restarts are required'
             option :environment, aliases: '--env'
             define_method 'maintenance:apps' do
+              telemetry(__method__, options)
+
               found_maintenance = false
               m = maintenance_apps
               Formatter.render(Renderer.current) do |root|
@@ -48,6 +51,8 @@ module Aptible
                  'restarts are required'
             option :environment, aliases: '--env'
             define_method 'maintenance:dbs' do
+              telemetry(__method__, options)
+
               found_maintenance = false
               m = maintenance_databases
               Formatter.render(Renderer.current) do |root|

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

@@ -16,20 +16,30 @@ module Aptible
             include Helpers::Token
             include Helpers::Database
             include Helpers::MetricDrain
+            include Helpers::Telemetry
 
             desc 'metric_drain:list', 'List all Metric Drains'
             option :environment, aliases: '--env'
             define_method 'metric_drain:list' do
+              telemetry(__method__, options)
+
               Formatter.render(Renderer.current) do |root|
                 root.grouped_keyed_list(
                   { 'environment' => 'handle' },
                   'handle'
                 ) do |node|
-                  scoped_environments(options).each do |account|
-                    account.metric_drains.each do |drain|
-                      node.object do |n|
-                        ResourceFormatter.inject_metric_drain(n, drain, account)
-                      end
+                  accounts = scoped_environments(options)
+                  acc_map = environment_map(accounts)
+
+                  Aptible::Api::MetricDrain.all(
+                    token: fetch_token,
+                    href: '/metric_drains?per_page=5000'
+                  ).each do |drain|
+                    account = acc_map[drain.links.account.href]
+                    next if account.nil?
+
+                    node.object do |n|
+                      ResourceFormatter.inject_metric_drain(n, drain, account)
                     end
                   end
                 end
@@ -43,6 +53,8 @@ module Aptible
             option :environment, aliases: '--env'
 
             define_method 'metric_drain:create:influxdb' do |handle|
+              telemetry(__method__, options.merge(handle: handle))
+
               account = ensure_environment(options)
               database = ensure_database(options)
 
@@ -68,6 +80,8 @@ module Aptible
             option :db, type: :string
             option :environment, aliases: '--env'
             define_method 'metric_drain:create:influxdb:custom' do |handle|
+              telemetry(__method__, options.merge(handle: handle))
+
               account = ensure_environment(options)
 
               config = {
@@ -97,6 +111,8 @@ module Aptible
             option :url, type: :string
             option :environment, aliases: '--env'
             define_method 'metric_drain:create:influxdb:customv2' do |handle|
+              telemetry(__method__, options.merge(handle: handle))
+
               account = ensure_environment(options)
 
               config = {
@@ -123,6 +139,8 @@ module Aptible
             option :site, type: :string
             option :environment, aliases: '--env'
             define_method 'metric_drain:create:datadog' do |handle|
+              telemetry(__method__, options.merge(handle: handle))
+
               account = ensure_environment(options)
 
               config = {
@@ -152,6 +170,8 @@ module Aptible
                  'Deprovisions a Metric Drain'
             option :environment, aliases: '--env'
             define_method 'metric_drain:deprovision' do |handle|
+              telemetry(__method__, options.merge(handle: handle))
+
               account = ensure_environment(options)
               drain = ensure_metric_drain(account, handle)
               op = drain.create_operation(type: :deprovision)

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

@@ -6,9 +6,12 @@ module Aptible
           thor.class_eval do
             include Helpers::Token
             include Helpers::Operation
+            include Helpers::Telemetry
 
             desc 'operation:cancel OPERATION_ID', 'Cancel a running operation'
             define_method 'operation:cancel' do |operation_id|
+              telemetry(__method__, options.merge(operation_id: operation_id))
+
               o = Aptible::Api::Operation.find(operation_id, token: fetch_token)
               raise "Operation ##{operation_id} not found" if o.nil?
 
@@ -20,6 +23,8 @@ module Aptible
             desc 'operation:follow OPERATION_ID',
                  'Follow logs of a running operation'
             define_method 'operation:follow' do |operation_id|
+              telemetry(__method__, options.merge(operation_id: operation_id))
+
               o = Aptible::Api::Operation.find(operation_id, token: fetch_token)
               raise "Operation ##{operation_id} not found" if o.nil?
 
@@ -37,6 +42,8 @@ module Aptible
 
             desc 'operation:logs OPERATION_ID', 'View logs for given operation'
             define_method 'operation:logs' do |operation_id|
+              telemetry(__method__, options.merge(operation_id: operation_id))
+
               o = Aptible::Api::Operation.find(operation_id, token: fetch_token)
               raise "Operation ##{operation_id} not found" if o.nil?
 

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

@@ -6,10 +6,13 @@ module Aptible
           thor.class_eval do
             include Helpers::Operation
             include Helpers::App
+            include Helpers::Telemetry
 
             desc 'rebuild', 'Rebuild an app, and restart its services'
             app_options
             def rebuild
+              telemetry(__method__, options)
+
               app = ensure_app(options)
               operation = app.create_operation!(type: 'rebuild')
               CLI.logger.info 'Rebuilding app...'

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

@@ -6,6 +6,7 @@ module Aptible
           thor.class_eval do
             include Helpers::Operation
             include Helpers::App
+            include Helpers::Telemetry
 
             desc 'restart', 'Restart all services associated with an app'
             option :simulate_oom,
@@ -20,6 +21,8 @@ module Aptible
                          'default.'
             app_options
             def restart
+              telemetry(__method__, options)
+
               app = ensure_app(options)
               type = 'restart'
 

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.2'.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