aptible-cli 0.25.0 → 0.26.2

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

@@ -0,0 +1,252 @@
+# frozen_string_literal: true
+
+module Aptible
+  module CLI
+    module Subcommands
+      module AwsAccounts
+        def self.included(thor)
+          thor.class_eval do
+            include Helpers::Token
+            include Helpers::AwsAccount
+            include Helpers::Telemetry
+
+            desc 'aws_accounts', 'List external AWS accounts', hide: true
+            option :organization_id, aliases: '--org-id',
+                                     type: :string,
+                                     default: nil,
+                                     desc: 'Organization ID'
+            def aws_accounts
+              telemetry(__method__, options)
+
+              accounts = aws_accounts_all
+
+              Formatter.render(Renderer.current) do |root|
+                root.list do |list|
+                  accounts.each do |ext|
+                    list.object do |node|
+                      node.value('id', ext.id) if ext.respond_to?(:id)
+                      attrs = ext.respond_to?(:attributes) ? ext.attributes : {}
+                      %w(
+                        aws_account_id
+                        account_name
+                        aws_region_primary
+                        status
+                        discovery_enabled
+                        discovery_role_arn
+                        discovery_frequency
+                        account_id
+                        created_at
+                        updated_at
+                      ).each do |k|
+                        v = attrs[k]
+                        node.value(k, v) unless v.nil?
+                      end
+                    end
+                  end
+                end
+              end
+            end
+
+            desc 'aws_accounts:add ' \
+                 '[--account-name ACCOUNT_NAME] ' \
+                 '[--aws-account-id AWS_ACCOUNT_ID] ' \
+                 '[--org-id ORGANIZATION_ID] '\
+                 '[--aws-region-primary AWS_REGION] ' \
+                 '[--discovery-enabled|--no-discovery-enabled] ' \
+                 '[--discovery-role-arn DISCOVERY_ROLE_ARN] ' \
+                 '[--discovery-frequency FREQ]', \
+                 'Add a new external AWS account', hide: true
+            option :account_name, type: :string, desc: 'Display name'
+            option :aws_account_id, type: :string, desc: 'AWS Account ID'
+            option :organization_id, aliases: '--org-id',
+                                     type: :string,
+                                     default: nil,
+                                     desc: 'Organization ID'
+            option :aws_region_primary, type: :string,
+                                        desc: 'Primary AWS region'
+            option :discovery_enabled, type: :boolean,
+                                       desc: 'Enable resource discovery'
+            option :discovery_role_arn, type: :string,
+                                        desc: 'IAM Role ARN that Aptible ' \
+                                              'will assume to discover ' \
+                                              'resources in your AWS account'
+            option :discovery_frequency,
+                   type: :string,
+                   desc: 'Discovery frequency (e.g., daily)'
+            define_method 'aws_accounts:add' do
+              telemetry(__method__, options)
+
+              resource = create_external_aws_account!(options)
+
+              Formatter.render(Renderer.current) do |root|
+                root.object do |node|
+                  node.value('id', resource.id) if resource.respond_to?(:id)
+                  rattrs =
+                    if resource.respond_to?(:attributes)
+                      resource.attributes
+                    else
+                      {}
+                    end
+                  %w(
+                    aws_account_id
+                    account_name
+                    aws_region_primary
+                    discovery_enabled
+                    discovery_role_arn
+                    discovery_frequency
+                    account_id
+                    created_at
+                    updated_at
+                  ).each do |k|
+                    v = rattrs[k]
+                    node.value(k, v) unless v.nil?
+                  end
+                end
+              end
+            end
+
+            desc 'aws_accounts:show ID',
+                 'Show an external AWS account', \
+                 hide: true
+            define_method 'aws_accounts:show' do |id|
+              telemetry(__method__, options.merge(id: id))
+              ext = ensure_external_aws_account(id)
+              Formatter.render(Renderer.current) do |root|
+                root.object do |node|
+                  node.value('id', ext.id)
+                  rattrs =
+                    if ext.respond_to?(:attributes)
+                      ext.attributes
+                    else
+                      {}
+                    end
+                  %w(
+                    aws_account_id
+                    account_name
+                    aws_region_primary
+                    discovery_enabled
+                    discovery_role_arn
+                    discovery_frequency
+                    account_id
+                    created_at
+                    updated_at
+                  ).each do |k|
+                    v = rattrs[k]
+                    node.value(k, v) unless v.nil?
+                  end
+                end
+              end
+            end
+
+            desc 'aws_accounts:delete ID',
+                 'Delete an external AWS account', \
+                 hide: true
+            define_method 'aws_accounts:delete' do |id|
+              telemetry(__method__, options.merge(id: id))
+
+              delete_external_aws_account!(id)
+
+              Formatter.render(Renderer.current) do |root|
+                root.object do |node|
+                  node.value('id', id)
+                  node.value('deleted', true)
+                end
+              end
+            end
+
+            desc 'aws_accounts:update ID ' \
+                 '[--account-name ACCOUNT_NAME] ' \
+                 '[--aws-account-id AWS_ACCOUNT_ID] ' \
+                 '[--aws-region-primary AWS_REGION] ' \
+                 '[--discovery-enabled|--no-discovery-enabled] ' \
+                 '[--discovery-role-arn DISCOVERY_ROLE_ARN] ' \
+                 '[--remove-discovery-role-arn] ' \
+                 '[--discovery-frequency FREQ]', \
+                 'Update an external AWS account', hide: true
+            option :account_name, type: :string, desc: 'New display name'
+            option :aws_account_id, type: :string, desc: 'AWS Account ID'
+            option :aws_region_primary, type: :string,
+                                        desc: 'Primary AWS region'
+            option :discovery_enabled, type: :boolean,
+                                       desc: 'Enable resource discovery'
+            option :discovery_role_arn, type: :string,
+                                        desc: 'IAM Role ARN that Aptible ' \
+                                              'will assume to discover ' \
+                                              'resources in your AWS account'
+            option :remove_discovery_role_arn, type: :boolean,
+                                               desc: 'Remove the discovery ' \
+                                                     'role ARN from this ' \
+                                                     'account'
+            option :discovery_frequency,
+                   type: :string,
+                   desc: 'Discovery frequency (e.g., daily)'
+            define_method 'aws_accounts:update' do |id|
+              telemetry(__method__, options.merge(id: id))
+
+              ext = update_external_aws_account!(id, options)
+
+              Formatter.render(Renderer.current) do |root|
+                root.object do |node|
+                  node.value('id', ext.id)
+                  rattrs =
+                    if ext.respond_to?(:attributes)
+                      ext.attributes
+                    else
+                      {}
+                    end
+                  %w(
+                    aws_account_id
+                    account_name
+                    aws_region_primary
+                    discovery_enabled
+                    discovery_role_arn
+                    discovery_frequency
+                    account_id
+                    created_at
+                    updated_at
+                  ).each do |k|
+                    v = rattrs[k]
+                    node.value(k, v) unless v.nil?
+                  end
+                end
+              end
+            end
+
+            desc 'aws_accounts:check ID',
+                 'Check the connection for an external AWS account', \
+                 hide: true
+            define_method 'aws_accounts:check' do |id|
+              telemetry(__method__, options.merge(id: id))
+
+              response = check_external_aws_account!(id)
+
+              fmt_state = lambda do |state|
+                Renderer.format == 'json' ? state : format_check_state(state)
+              end
+
+              Formatter.render(Renderer.current) do |root|
+                root.object do |node|
+                  node.value('state', fmt_state.call(response.state))
+                  node.list('checks') do |check_list|
+                    response.checks.each do |check|
+                      check_list.object do |check_node|
+                        check_node.value('name', check.check_name)
+                        check_node.value('state', fmt_state.call(check.state))
+                        check_node.value('details', check.details) \
+                          unless check.details.nil?
+                      end
+                    end
+                  end
+                end
+              end
+
+              unless response.state == 'success'
+                raise Thor::Error, 'AWS account check failed'
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -9,7 +9,7 @@ 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)
@@ -31,7 +31,7 @@ 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|
@@ -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

@@ -27,6 +27,21 @@ module Aptible
                   accounts = scoped_environments(options)
                   acc_map = environment_map(accounts)
 
+                  # the below is done because an rds resource can belong to
+                  # multiple accounts or none. we go through and iterate
+                  # through all external_aws_resources and print them based
+                  # on connections. To avoid repeated API calls, we keep
+                  # them in these maps and only fetch relations when
+                  # necessary.
+                  rds_map = {}
+                  accts_rds_map = {}
+                  begin
+                    rds_map, accts_rds_map = fetch_rds_databases_with_accounts
+                  rescue StandardError => e
+                    CLI.logger.warn 'Unable to fetch RDS databases: ' \
+                                    "#{e.message}"
+                  end
+
                   if Renderer.format == 'json'
                     accounts.each do |account|
                       account.each_database do |db|
@@ -34,12 +49,23 @@ module Aptible
                           ResourceFormatter.inject_database(n, db, account)
                         end
                       end
+                      next unless accts_rds_map.key? account.id
+
+                      accts_rds_map[account.id].each do |rds_db|
+                        rds_map.delete(rds_db.id)
+                        node.object do |n|
+                          ResourceFormatter.inject_database_minimal(
+                            n,
+                            rds_db,
+                            account
+                          )
+                        end
+                      end
                     end
                   else
                     databases_all.each do |db|
                       account = acc_map[db.links.account.href]
                       next if account.nil?
-
                       node.object do |n|
                         ResourceFormatter.inject_database_minimal(
                           n,
@@ -48,6 +74,34 @@ module Aptible
                         )
                       end
                     end
+                    accounts.each do |account|
+                      next unless accts_rds_map.key? account.id
+
+                      accts_rds_map[account.id].each do |rds_db|
+                        rds_map.delete(rds_db.id)
+                        node.object do |n|
+                          ResourceFormatter.inject_database_minimal(
+                            n,
+                            rds_db,
+                            account
+                          )
+                        end
+                      end
+                    end
+                  end
+
+                  # Render unattached RDS databases, but exclude
+                  # if environment filter set
+                  unless options[:environment]
+                    rds_map.each_value do |db|
+                      node.object do |n|
+                        ResourceFormatter.inject_database_minimal(
+                          n,
+                          db,
+                          rds_shell_account
+                        )
+                      end
+                    end
                   end
                 end
               end
@@ -232,9 +286,13 @@ module Aptible
             define_method 'db:dump' do |handle, *dump_options|
               telemetry(__method__, options.merge(handle: handle))
 
+              filename = "#{handle}.dump"
+              if aws_rds_db?(handle)
+                return use_rds_dump(handle, filename, dump_options)
+              end
+
               database = ensure_database(options.merge(db: handle))
               with_postgres_tunnel(database) do |url|
-                filename = "#{handle}.dump"
                 CLI.logger.info "Dumping to #{filename}"
                 `pg_dump #{url} #{dump_options.shelljoin} > #{filename}`
                 exit $CHILD_STATUS.exitstatus unless $CHILD_STATUS.success?
@@ -252,6 +310,10 @@ module Aptible
               )
               telemetry(__method__, opts)
 
+              if aws_rds_db?(handle)
+                return use_rds_execute(handle, sql_path, options)
+              end
+
               database = ensure_database(options.merge(db: handle))
               with_postgres_tunnel(database) do |url|
                 CLI.logger.info "Executing #{sql_path} against #{handle}"
@@ -269,8 +331,10 @@ module Aptible
               telemetry(__method__, options.merge(handle: handle))
 
               desired_port = Integer(options[:port] || 0)
-              database = ensure_database(options.merge(db: handle))
 
+              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])
 
               m = "Creating #{credential.type} tunnel to #{database.handle}..."

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

@@ -2,9 +2,8 @@ module Aptible
   module CLI
     module Subcommands
       module Deploy
-        DOCKER_IMAGE_DEPLOY_ARGS = Hash[%w(
+        DEPRECATED_ENV = Hash[%w(
           APTIBLE_DOCKER_IMAGE
-          APTIBLE_PRIVATE_REGISTRY_EMAIL
           APTIBLE_PRIVATE_REGISTRY_USERNAME
           APTIBLE_PRIVATE_REGISTRY_PASSWORD
         ).map do |var|
@@ -20,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 ' \
@@ -40,11 +39,23 @@ module Aptible
                                        desc: 'This option only affects new ' \
                                              'services, not existing ones. ' \
                                              'Examples: m c r'
-            DOCKER_IMAGE_DEPLOY_ARGS.each_pair do |opt, var|
-              option opt,
-                     type: :string, banner: var,
-                     desc: "Shorthand for #{var}=..."
-            end
+
+            option :docker_image,
+                   type: :string,
+                   desc: 'The docker image to deploy. If none specified, ' \
+                         'the currently deployed image will be pulled again'
+            option :private_registry_username,
+                   type: :string,
+                   desc: 'Username for Docker images located in a private ' \
+                        'repository'
+            option :private_registry_password,
+                   type: :string,
+                   desc: 'Password for Docker images located in a private ' \
+                         'repository'
+            option :private_registry_email,
+                   type: :string,
+                   desc: 'This parameter is deprecated'
+
             app_options
             def deploy(*args)
               telemetry(__method__, options)
@@ -62,20 +73,43 @@ module Aptible
 
               env = extract_env(args)
 
-              DOCKER_IMAGE_DEPLOY_ARGS.each_pair do |opt, var|
+              DEPRECATED_ENV.each_pair do |opt, var|
                 val = options[opt]
+                dasherized = "--#{opt.to_s.tr('_', '-')}"
+                if env[var]
+                  m = "WARNING: The environment variable #{var} " \
+                      'will be deprecated. Use the option ' \
+                      "#{dasherized}, instead."
+                  CLI.logger.warn m
+                end
                 next unless val
                 if env[var] && env[var] != val
-                  dasherized = "--#{opt.to_s.tr('_', '-')}"
                   raise Thor::Error, "The options #{dasherized} and #{var} " \
                                      'cannot be set to different values'
                 end
-                env[var] = val
+              end
+
+              settings = {}
+              sensitive_settings = {}
+
+              if options[:docker_image]
+                settings['APTIBLE_DOCKER_IMAGE'] = options[:docker_image]
+              end
+
+              if options[:private_registry_username]
+                sensitive_settings['APTIBLE_PRIVATE_REGISTRY_USERNAME'] =
+                  options[:private_registry_username]
+              end
+              if options[:private_registry_password]
+                sensitive_settings['APTIBLE_PRIVATE_REGISTRY_PASSWORD'] =
+                  options[:private_registry_password]
               end
 
               opts = {
                 type: 'deploy',
                 env: env,
+                settings: settings,
+                sensitive_settings: sensitive_settings,
                 git_ref: git_ref,
                 container_count: options[:container_count],
                 container_size: options[:container_size],
@@ -84,7 +118,7 @@ module Aptible
 
               allow_it = [
                 opts[:git_ref],
-                opts[:env].try(:[], 'APTIBLE_DOCKER_IMAGE'),
+                opts[:settings].try(:[], 'APTIBLE_DOCKER_IMAGE'),
                 app.status == 'provisioned'
               ].any? { |x| x }
 

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

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+module Aptible
+  module CLI
+    module Subcommands
+      module Organizations
+        def self.included(thor)
+          thor.class_eval do
+            include Helpers::Token
+            include Helpers::Telemetry
+
+            desc 'organizations', 'List all organizations'
+            def organizations
+              telemetry(__method__, options)
+
+              user_orgs_and_roles = {}
+              begin
+                roles = whoami.roles_with_organizations
+              rescue HyperResource::ClientError => e
+                raise Thor::Error, e.message
+              end
+              roles.each do |role|
+                user_orgs_and_roles[role.organization.id] ||= {
+                  'org' => role.organization,
+                  'roles' => []
+                }
+                user_orgs_and_roles[role.organization.id]['roles'] << role
+              end
+              Formatter.render(Renderer.current) do |root|
+                root.list do |list|
+                  user_orgs_and_roles.each do |org_id, org_and_role|
+                    org = org_and_role['org']
+                    roles = org_and_role['roles']
+                    list.object do |node|
+                      node.value('id', org_id)
+                      node.value('name', org.name)
+                      node.list('roles') do |roles_list|
+                        roles.each do |role|
+                          roles_list.object do |role_node|
+                            role_node.value('id', role.id)
+                            role_node.value('name', role.name)
+                          end
+                        end
+                      end
+                    end
+                  end
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+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,19 +25,25 @@ 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]'\
                    ' [--stop-timeout SECONDS]',
                  'Modifies the deployment settings for a service'
             app_options
             option :force_zero_downtime,
-                   type: :boolean, default: false,
+                   type: :boolean,
                    desc: 'Force zero downtime deployments.'\
                    ' Has no effect if service has an associated Endpoint'
             option :simple_health_check,
-                   type: :boolean, default: false,
+                   type: :boolean,
                    desc: 'Use a simple uptime healthcheck during deployments'
+            option :restart_free_scaling,
+                   type: :boolean,
+                   desc: 'When enabled, scaling operations that only change '\
+                         'the number of containers will not restart existing '\
+                         'containers'
             option :stop_timeout,
                    type: :numeric,
                    desc: 'The number of seconds to wait for the service '\
@@ -46,18 +52,24 @@ module Aptible
               telemetry(__method__, options.merge(service: service))
 
               service = ensure_service(options, service)
+
               updates = {}
-              updates[:force_zero_downtime] =
-                options[:force_zero_downtime] if options[:force_zero_downtime]
-              updates[:naive_health_check] =
-                options[:simple_health_check] if options[:simple_health_check]
-              updates[:stop_timeout] =
-                options[:stop_timeout] if options[:stop_timeout]
+              vars = [
+                :force_zero_downtime, :simple_health_check,
+                :restart_free_scaling, :stop_timeout
+              ]
+              vars.each { |v| updates[v] = options[v] unless options[v].nil? }
+              # The var we use with users is different than what the API
+              # expects, so we have to map it.
+              unless updates[:simple_health_check].nil?
+                updates[:naive_health_check] = \
+                  updates.delete(:simple_health_check)
+              end
 
               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|
@@ -87,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] '\