aptible-cli 0.24.1 → 0.24.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57fd2762ecb6e2608548c08837ffa4c9cc3b233b4c4c12aae197001acd6c090a
-  data.tar.gz: a9612cf83e1fbd680b6b0cc41daab09a7028f581b3f52bb6663b176e77b9a321
+  metadata.gz: f23bd0dde480e09b51d6876d15ff0628739d632197ae600bc2bc567bd54d7ee9
+  data.tar.gz: 7c2952e17c06a6c9593a5cbcbb3898e333d2c5e2a6d32bff053cd42798e87287
 SHA512:
-  metadata.gz: b044b0ead595595831ec2608c48cfe0782de00272f424b21c5e2c4c8f384d2d3778d5f1aa331ff3e55e77e3670582f49d13245ca10b77a6986efc4d360fb847e
-  data.tar.gz: 0a8a57cfd54a701edd13355b3048d570d0ba6a8f4d64199c95ec24130c34e1baf7a08afc79142df48f6d3cc37099a75bb452a7ae22c32c3dac53a753b9ce17f6
+  metadata.gz: b41752dc657d784ed2cc6da0ed4bc2c54f730adc59b02de4120d30aed2c6626b93a25b6049551051a17f1f6c841c9cac200f70eb480c1330c37543440e3d431e
+  data.tar.gz: 0f3a5c06f634a87ff7768914f8d383a86bbee84a4c6dc511797f752bdc777f29bd4882d46e8b93e53124d35fba16e1a0589cae9355e16c17392c9026322e3b69

data/.github/workflows/test.yml

@@ -11,7 +11,7 @@ on:
 jobs:
   test:
     name: Build and Publish
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
@@ -48,3 +48,18 @@ jobs:
                contains(needs.*.result, 'failure')
             || contains(needs.*.result, 'cancelled')
           }}
+
+  report-version:
+    runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/master'
+    steps:
+      - name: Report version
+        run: |
+          curl -sS -X POST -u "$ENFORCER_USERNAME:$ENFORCER_PASSWORD" \
+           -H "Content-Type: application/json" \
+           -d '{"name":"aptible-cli", "type":"client", "version": "${{ github.sha }}"}' \
+          "$ENFORCER_API/repo_version"
+        env:
+          ENFORCER_API: https://app-83237.aptible-test-leeroy.com
+          ENFORCER_USERNAME: aptible
+          ENFORCER_PASSWORD: ${{ secrets.ENFORCER_PASSWORD }}

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    aptible-cli (0.24.1)
+    aptible-cli (0.24.3)
       activesupport (>= 4.0, < 6.0)
       aptible-api (~> 1.6.5)
       aptible-auth (~> 1.2.5)

data/lib/aptible/cli/agent.rb

@@ -1,5 +1,6 @@
 require 'base64'
 require 'uri'
+require 'logger'
 
 require 'aptible/auth'
 require 'thor'
@@ -8,6 +9,7 @@ require 'chronic_duration'
 
 require_relative 'helpers/ssh'
 require_relative 'helpers/token'
+require_relative 'helpers/telemetry'
 require_relative 'helpers/operation'
 require_relative 'helpers/environment'
 require_relative 'helpers/app'
@@ -80,7 +82,13 @@ module Aptible
 
       def initialize(*)
         nag_toolbelt unless toolbelt?
-        Aptible::Resource.configure { |conf| conf.user_agent = version_string }
+        Aptible::Resource.configure do |conf|
+          conf.user_agent = version_string
+          level = Logger::WARN
+          debug_level = ENV['APTIBLE_DEBUG']
+          level = debug_level if debug_level
+          conf.logger.tap { |l| l.level = level }
+        end
         warn_sso_enforcement
         super
       end

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

@@ -151,12 +151,27 @@ module Aptible
           service
         end
 
+        def apps_href
+          href = '/apps'
+          if Renderer.format != 'json'
+            href = '/apps?per_page=5000&no_embed=true'
+          end
+          href
+        end
+
+        def apps_all
+          Aptible::Api::App.all(
+            token: fetch_token,
+            href: apps_href
+          )
+        end
+
         def apps_from_handle(handle, environment)
           # TODO: This should probably use each_app for more efficiency.
           if environment
             environment.apps
           else
-            Aptible::Api::App.all(token: fetch_token)
+            apps_all
           end.select { |a| a.handle == handle }
         end
 

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

@@ -31,12 +31,27 @@ module Aptible
           end
         end
 
-        def databases_from_handle(handle, environment)
-          if environment
-            databases = environment.databases
-          else
-            databases = Aptible::Api::Database.all(token: fetch_token)
+        def databases_href
+          href = '/databases'
+          if Renderer.format != 'json'
+            href = '/databases?per_page=5000&no_embed=true'
           end
+          href
+        end
+
+        def databases_all
+          Aptible::Api::Database.all(
+            token: fetch_token,
+            href: databases_href
+          )
+        end
+
+        def databases_from_handle(handle, environment)
+          databases = if environment
+                        environment.databases
+                      else
+                        databases_all
+                      end
           databases.select { |a| a.handle == handle }
         end
 

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

@@ -6,6 +6,14 @@ module Aptible
       module Environment
         include Helpers::Token
 
+        def environment_href
+          href = '/accounts'
+          if Renderer.format != 'json'
+            href = '/accounts?per_page=5000&no_embed=true'
+          end
+          href
+        end
+
         def scoped_environments(options)
           if options[:environment]
             if (environment = environment_from_handle(options[:environment]))
@@ -14,7 +22,11 @@ module Aptible
               raise Thor::Error, 'Specified account does not exist'
             end
           else
-            Aptible::Api::Account.all(token: fetch_token)
+            href = environment_href
+            Aptible::Api::Account.all(
+              token: fetch_token,
+              href: href
+            )
           end
         end
 
@@ -30,13 +42,26 @@ module Aptible
 
         def environment_from_handle(handle)
           return nil unless handle
-          Aptible::Api::Account.all(token: fetch_token).find do |a|
+          href = environment_href
+          Aptible::Api::Account.all(token: fetch_token, href: href).find do |a|
             a.handle == handle
           end
         end
 
+        def environment_map(accounts)
+          acc_map = {}
+          accounts.each do |account|
+            acc_map[account.links.self.href] = account
+          end
+          acc_map
+        end
+
         def ensure_default_environment
-          environments = Aptible::Api::Account.all(token: fetch_token)
+          href = environment_href
+          environments = Aptible::Api::Account.all(
+            token: fetch_token,
+            href: href
+          )
           case environments.count
           when 0
             e = 'No environments. Go to https://app.aptible.com/ to proceed'

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

@@ -38,8 +38,10 @@ module Aptible
           # operation failed, poll_for_success will immediately fall through to
           # the error message.
           unless code == 0
-            e = 'Disconnected from logs, waiting for operation to complete'
-            CLI.logger.warn e
+            msg = ['Disconnected from logs, waiting for operation to complete',
+                   'Once complete, the logs can be viewed here:',
+                   "    #{ui_log_url(operation)}"]
+            msg.each { |e| CLI.logger.warn e }
             poll_for_success(operation)
           end
         end
@@ -76,8 +78,9 @@ module Aptible
           res = http.request(Net::HTTP::Get.new(uri.request_uri, headers))
           # note: res body with a 200 is target redirect location for download
           if !res || res.code != '200' || res.body.nil?
-            raise Thor::Error, 'Unable to retrieve the operation\'s logs. '\
-            'If the issue persists please contact support for assistance.'
+            raise Thor::Error, 'Unable to retrieve the operation\'s logs. ' \
+            'If the issue persists please contact support for assistance, or ' \
+            "view them at #{ui_log_url(operation)}"
           end
           res
         end
@@ -96,6 +99,10 @@ module Aptible
           end
           res
         end
+
+        def ui_log_url(operation)
+          "https://app.aptible.com/operations/#{operation.id}"
+        end
       end
     end
   end

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

@@ -0,0 +1,58 @@
+require 'httpclient'
+require 'securerandom'
+require 'uri'
+
+module Aptible
+  module CLI
+    module Helpers
+      module Telemetry
+        def telemetry(cmd, options = {})
+          token_hash = decode_token
+          format = Renderer.format
+          format = 'text' if format.nil?
+          sub = token_hash[0]['sub']
+          parsed_url = URI.parse(sub)
+          path_components = parsed_url.path.split('/')
+          user_or_org_id = path_components.last
+          # https://github.com/aptible/aptible-resource/blob/7c3a79e6eee9c88aa7dbf332e550508f22a5b08d/lib/hyper_resource/modules/http.rb#L21
+          client = HTTPClient.new.tap do |c|
+            c.cookie_manager = nil
+            c.connect_timeout = 30
+            c.send_timeout = 45
+            c.keep_alive_timeout = 15
+            c.ssl_config.set_default_paths
+          end
+
+          value = {
+            'email' => token_hash[0]['email'],
+            'format' => format,
+            'cmd' => cmd,
+            'options' => options,
+            'version' => version_string,
+            # https://stackoverflow.com/a/73973555
+            'github' => ENV['GITHUB_ACTIONS'],
+            'gitlab' => ENV['GITLAB_CI'],
+            'travis' => ENV['TRAVIS'],
+            'circleci' => ENV['CIRCLECI'],
+            'ci' => ENV['CI']
+          }
+
+          begin
+            uri = URI('https://tuna.aptible.com/www/e')
+            client.get(
+              uri,
+              'id' => SecureRandom.uuid,
+              'user_id' => user_or_org_id,
+              'type' => 'cli_telemetry',
+              'url' => sub,
+              'value' => value
+            )
+          rescue
+            # since this is just for telemetry we don't want to notify
+            # user of an error
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,4 +1,5 @@
 require 'aptible/auth'
+require 'jwt'
 
 require_relative 'config_path'
 
@@ -46,6 +47,11 @@ module Aptible
         def token_file
           File.join(aptible_config_path, 'tokens.json').freeze
         end
+
+        def decode_token
+          tok = fetch_token
+          JWT.decode(tok, nil, false)
+        end
       end
     end
   end

data/lib/aptible/cli/renderer.rb

@@ -9,8 +9,12 @@ module Aptible
     module Renderer
       FORMAT_VAR = 'APTIBLE_OUTPUT_FORMAT'.freeze
 
+      def self.format
+        ENV[FORMAT_VAR]
+      end
+
       def self.current
-        case (format = ENV[FORMAT_VAR])
+        case format
         when 'json'
           Json.new
         when 'text'

data/lib/aptible/cli/resource_formatter.rb

@@ -108,6 +108,13 @@ module Aptible
           attach_account(node, account)
         end
 
+        def inject_database_minimal(node, database, account)
+          node.value('id', database.id)
+          node.value('handle', database.handle)
+          node.value('created_at', database.created_at)
+          attach_account(node, account)
+        end
+
         def inject_database(node, database, account)
           node.value('id', database.id)
           node.value('handle', database.handle)

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

@@ -7,17 +7,34 @@ module Aptible
             include Helpers::App
             include Helpers::Environment
             include Helpers::Token
+            include Helpers::Telemetry
 
             desc 'apps', 'List all applications'
             option :environment, aliases: '--env'
             def apps
+              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.each_app do |app|
+                  accounts = scoped_environments(options)
+                  acc_map = environment_map(accounts)
+
+                  if Renderer.format == 'json'
+                    accounts.each do |account|
+                      account.each_app do |app|
+                        node.object do |n|
+                          ResourceFormatter.inject_app(n, app, account)
+                        end
+                      end
+                    end
+                  else
+                    apps_all.each do |app|
+                      account = acc_map[app.links.account.href]
+                      next if account.nil?
+
                       node.object do |n|
                         ResourceFormatter.inject_app(n, app, account)
                       end
@@ -30,6 +47,8 @@ module Aptible
             desc 'apps:create HANDLE', 'Create a new application'
             option :environment, aliases: '--env'
             define_method 'apps:create' do |handle|
+              telemetry(__method__, options.merge(handle: handle))
+
               environment = ensure_environment(options)
               app = environment.create_app(handle: handle)
 
@@ -56,6 +75,8 @@ module Aptible
             option :container_profile, type: :string,
                                        desc: 'Examples: m c r'
             define_method 'apps:scale' do |type|
+              telemetry(__method__, options.merge(type: type))
+
               service = ensure_service(options, type)
 
               container_count = options[:container_count]
@@ -89,6 +110,8 @@ module Aptible
             desc 'apps:deprovision', 'Deprovision an app'
             app_options
             define_method 'apps:deprovision' do
+              telemetry(__method__, options)
+
               app = ensure_app(options)
               CLI.logger.info "Deprovisioning #{app.handle}..."
               op = app.create_operation!(type: 'deprovision')
@@ -108,6 +131,12 @@ module Aptible
                  ' drain destinations, you must restart the app.'
             option :environment, aliases: '--env'
             define_method 'apps:rename' do |old_handle, new_handle|
+              opts = options.merge(
+                old_handle: old_handle,
+                new_handle: new_handle
+              )
+              telemetry(__method__, opts)
+
               env = ensure_environment(options)
               app = ensure_app(options.merge(app: old_handle))
               app.update!(handle: new_handle)

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

@@ -6,6 +6,7 @@ module Aptible
           thor.class_eval do
             include Helpers::Token
             include Helpers::Database
+            include Helpers::Telemetry
 
             desc 'backup:restore BACKUP_ID ' \
                  '[--environment ENVIRONMENT_HANDLE] [--handle HANDLE] ' \
@@ -24,6 +25,8 @@ module Aptible
                                        desc: 'Examples: m c r'
             option :iops, type: :numeric
             define_method 'backup:restore' do |backup_id|
+              telemetry(__method__, options.merge(backup_id: backup_id))
+
               backup = Aptible::Api::Backup.find(backup_id, token: fetch_token)
               raise Thor::Error, "Backup ##{backup_id} not found" if backup.nil?
 
@@ -74,6 +77,8 @@ module Aptible
                    default: '99y',
                    desc: 'Limit backups returned (example usage: 1w, 1y, etc.)'
             define_method 'backup:list' do |handle|
+              telemetry(__method__, options.merge(handle: handle))
+
               age = ChronicDuration.parse(options[:max_age])
               raise Thor::Error, "Invalid age: #{options[:max_age]}" if age.nil?
               min_created_at = Time.now - age
@@ -101,6 +106,8 @@ module Aptible
                              desc: 'Limit backups returned '\
                                    '(example usage: 1w, 1y, etc.)'
             define_method 'backup:orphaned' do
+              telemetry(__method__, options)
+
               age = ChronicDuration.parse(options[:max_age])
               raise Thor::Error, "Invalid age: #{options[:max_age]}" if age.nil?
               min_created_at = Time.now - age
@@ -126,6 +133,8 @@ module Aptible
             desc 'backup:purge BACKUP_ID',
                  'Permanently delete a backup and any copies of it'
             define_method 'backup:purge' do |backup_id|
+              telemetry(__method__, options.merge(backup_id: backup_id))
+
               backup = Aptible::Api::Backup.find(backup_id, token: fetch_token)
               raise Thor::Error, "Backup ##{backup_id} not found" if backup.nil?
 

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

@@ -10,10 +10,13 @@ module Aptible
           thor.class_eval do
             include Helpers::Environment
             include Term::ANSIColor
+            include Helpers::Telemetry
 
             desc 'backup_retention_policy [ENVIRONMENT_HANDLE]',
                  'Show the current backup retention policy for the environment'
             define_method 'backup_retention_policy' do |env|
+              telemetry(__method__, options.merge(env: env))
+
               account = ensure_environment(environment: env)
               policy = account.backup_retention_policies.first
               unless policy
@@ -52,6 +55,8 @@ module Aptible
                    desc: 'Do not prompt for confirmation if the new policy ' \
                          'retains fewer backups than the current policy'
             define_method 'backup_retention_policy:set' do |env|
+              telemetry(__method__, options.merge(env: env))
+
               if options.empty?
                 raise Thor::Error,
                       'Please specify at least one attribute to change'

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

@@ -7,10 +7,13 @@ module Aptible
           thor.class_eval do
             include Helpers::Operation
             include Helpers::App
+            include Helpers::Telemetry
 
             desc 'config', "Print an app's current configuration"
             app_options
             def config
+              telemetry(__method__, options)
+
               app = ensure_app(options)
               config = app.current_configuration
               env = config ? config.env : {}
@@ -32,6 +35,8 @@ module Aptible
                  "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
               env = config ? config.env : {}
@@ -49,6 +54,8 @@ module Aptible
                  'Add an ENV variable to an app'
             app_options
             define_method 'config:add' do |*args|
+              telemetry(__method__, options)
+
               # FIXME: define_method - ?! Seriously, WTF Thor.
               app = ensure_app(options)
               env = extract_env(args)
@@ -61,6 +68,7 @@ module Aptible
                  'Add an ENV variable to an app'
             app_options
             define_method 'config:set' do |*args|
+              telemetry(__method__, options)
               send('config:add', *args)
             end
 
@@ -68,6 +76,8 @@ module Aptible
                  'Remove an ENV variable from an app'
             app_options
             define_method 'config:rm' do |*args|
+              telemetry(__method__, options)
+
               # FIXME: define_method - ?! Seriously, WTF Thor.
               app = ensure_app(options)
               env = Hash[args.map do |arg|
@@ -84,6 +94,7 @@ module Aptible
                  'Remove an ENV variable from an app'
             app_options
             define_method 'config:unset' do |*args|
+              telemetry(__method__, options)
               send('config:rm', *args)
             end
           end