aptible-cli 0.19.6 → 0.19.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc1a5d4d43d71792087a31f7994ed5a612dfe93ba90fd2ff3cebe63f5c8888a7
-  data.tar.gz: 7ac17167081e9edb3104b372a06622d736ce03051bb07279a690716eb7787ac9
+  metadata.gz: e2a2527ad96cee2818196a7d89f78d9de248a55c322593f8373910fe454a3c50
+  data.tar.gz: b542815810f6e0ae3c10152e12574a659772f552ff6671f056ee18de110aed90
 SHA512:
-  metadata.gz: b65bc6b0af2a8f88cc0fd72b47948ed01bbb3a32201ccaefd2b2dae3cdbe8042c6133e77862d79c63d4a0fa303460a5d453fa9f9a7ea7543af111a8101388fda
-  data.tar.gz: 7f8e3a443093b34b3b7428f249918e35327f92043cf0a35a248f7ef8aa8842f1a0d7ba8d48eeaa29f7d341be049f8f19e6b86d9d9ef91ea7401babaad2091fbf
+  metadata.gz: 387dda9c11cef985806f59db0597e036b7e3d0ab7631a1c52346885631c4404799975c1444f1be537ae18923509655176414f997a02edb7fd233eab35ba37fae
+  data.tar.gz: 2fbb10994f0e48bbb02b7658c688f4435fc34284be52cdb17f3bc73ec78807b80c4750bcbacabf50c3c4ac5ae2f96d3faf649e8555dc7a8c71929b685f246d7f

data/.travis.yml

@@ -8,7 +8,11 @@ rvm:
   - "2.4"
   - "2.5"
   - "2.6"
+  - "2.7"
 
+before_install:
+  - ./cleanup_bundler
+  - gem install bundler -v '< 2'
 script:
   - bundle exec rake
   - bundle exec script/sync-readme-usage

data/README.md

@@ -1,9 +1,7 @@
-# ![](https://raw.github.com/aptible/straptible/master/lib/straptible/rails/templates/public.api/icon-60px.png) Aptible CLI
+<br>
+<img src="https://user-images.githubusercontent.com/4295811/226700092-ffbd0c01-dba1-4880-8b77-a4d26e6228f0.svg"  width="64">
 
-[![Gem Version](https://badge.fury.io/rb/aptible-cli.png)](https://rubygems.org/gems/aptible-cli)
-[![Build Status](https://travis-ci.org/aptible/aptible-cli.png?branch=master)](https://travis-ci.org/aptible/aptible-cli)
-[![Dependency Status](https://gemnasium.com/aptible/aptible-cli.png)](https://gemnasium.com/aptible/aptible-cli)
-[![Roadmap](https://badge.waffle.io/aptible/aptible-cli.svg?label=ready&title=roadmap)](http://waffle.io/aptible/aptible-cli)
+# Aptible CLI
 
 Command-line interface for Aptible services.
 
@@ -11,8 +9,8 @@ Command-line interface for Aptible services.
 
 **NOTE: To install the `aptible` tool as a system-level binary, Aptible
 recommends you install the
-[Aptible Toolbelt](https://support.aptible.com/toolbelt/)**, which is faster
-and more robust.
+[Aptible CLI](https://www.aptible.com/docs/cli)** directly, which is
+faster and more robust.
 
 Add the following line to your application's Gemfile.
 
@@ -85,9 +83,12 @@ Commands:
   aptible login                                                                                                                                                                                                                                                                                                                                                 # Log in to Aptible
   aptible logs [--app APP | --database DATABASE]                                                                                                                                                                                                                                                                                                                # Follows logs from a running app or database
   aptible logs_from_archive --bucket NAME --region REGION --stack NAME [ --decryption-keys ONE [OR MORE] ] [ --download-location LOCATION ] [ [ --string-matches ONE [OR MORE] ] | [ --app-id ID | --database-id ID | --endpoint-id ID | --container-id ID ] [ --start-date YYYY-MM-DD --end-date YYYY-MM-DD ] ] --bucket=BUCKET --region=REGION --stack=STACK  # Retrieves container logs from an S3 archive in your own AWS account. You must provide your AWS credentials via the environment variables AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY
+  aptible maintenance:apps                                                                                                                                                                                                                                                                                                                                      # List Apps impacted by maintenance schedules where restarts are required
+  aptible maintenance:dbs                                                                                                                                                                                                                                                                                                                                       # List Databases impacted by maintenance schedules where restarts are required
   aptible metric_drain:create:datadog HANDLE --api_key DATADOG_API_KEY --site DATADOG_SITE --environment ENVIRONMENT                                                                                                                                                                                                                                            # Create a Datadog Metric Drain
   aptible metric_drain:create:influxdb HANDLE --db DATABASE_HANDLE --environment ENVIRONMENT                                                                                                                                                                                                                                                                    # Create an InfluxDB Metric Drain
   aptible metric_drain:create:influxdb:custom HANDLE --username USERNAME --password PASSWORD --url URL_INCLUDING_PORT --db INFLUX_DATABASE_NAME --environment ENVIRONMENT                                                                                                                                                                                       # Create an InfluxDB Metric Drain
+  aptible metric_drain:create:influxdb:customv2 HANDLE --org ORGANIZATION --token INFLUX_TOKEN --url URL_INCLUDING_PORT --bucket INFLUX_BUCKET_NAME --environment ENVIRONMENT                                                                                                                                                                                   # Create an InfluxDB v2 Metric Drain
   aptible metric_drain:deprovision HANDLE --environment ENVIRONMENT                                                                                                                                                                                                                                                                                             # Deprovisions a Metric Drain
   aptible metric_drain:list                                                                                                                                                                                                                                                                                                                                     # List all Metric Drains
   aptible operation:cancel OPERATION_ID                                                                                                                                                                                                                                                                                                                         # Cancel a running operation

data/SECURITY.md

@@ -0,0 +1,23 @@
+# Aptible Open Source Security Policies and Procedures
+
+This document outlines security procedures and general policies for the Aptible open source projects as found on https://github.com/aptible.
+
+  * [Reporting a Vulnerability](#reporting-a-vulnerability)
+  * [Responsible Disclosure Policy](#responsible-disclosure-policy)
+
+## Reporting a Vulnerability 
+
+The Aptible team and community take all security vulnerabilities
+seriously. Thank you for improving the security of our open source software. We appreciate your efforts and responsible disclosure and will make every effort to acknowledge your contributions.
+
+Report security vulnerabilities by emailing the Aptible security team at:
+    
+    security@aptible.com
+
+Security researchers can also privately report security vulnerabilities to repository maintainers using the GitHub "Report a Vulnerability" feature. [See how-to here](https://docs.github.com/en/code-security/security-advisories/guidance-on-reporting-and-writing/privately-reporting-a-security-vulnerability#privately-reporting-a-security-vulnerability).
+
+The Aptible team will acknowledge your email within 24 business hours and send a detailed response within 48 business hours indicating the next steps in handling your report. The Aptible security team will keep you informed of the progress and may ask for additional information or guidance.
+
+## Responsible Disclosure Policy
+
+Please see Aptible's Responsible Disclosure Policy here: https://www.aptible.com/legal/responsible-disclosure/

data/aptible-cli.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'aptible-resource', '~> 1.1'
-  spec.add_dependency 'aptible-api', '~> 1.2'
+  spec.add_dependency 'aptible-api', '~> 1.4'
   spec.add_dependency 'aptible-auth', '~> 1.2.4'
   spec.add_dependency 'aptible-billing', '~> 1.0'
   spec.add_dependency 'thor', '~> 0.20.0'
@@ -30,6 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'chronic_duration', '~> 0.10.6'
   spec.add_dependency 'cbor'
   spec.add_dependency 'aws-sdk', '~> 2.0'
+  spec.add_dependency 'bigdecimal', '~> 1.3.5' # https://github.com/ruby/bigdecimal#which-version-should-you-select
 
   # Temporarily pin ffi until https://github.com/ffi/ffi/issues/868 is fixed
   spec.add_dependency 'ffi', '<= 1.14.1' if Gem.win_platform?

data/cleanup_bundler

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+# Newer rubies have Bundler 2.x installed as default so it can't be deleted
+# We need Bundler 1.x
+
+gempaths = `gem env gempath`.split(':')
+gempaths.each do |gempath|
+  # lookup bundler-*.gemspec files and delete them
+  # this is the only way to completely cleanup default bundler
+  # Note: the bundler gemspecs' paths are different for CRuby and JRuby
+  Dir.glob(gempath.strip + '/specifications/**/bundler-*.gemspec').each do |p|
+    File.delete(p)
+  end
+end

data/lib/aptible/cli/agent.rb

@@ -21,7 +21,9 @@ require_relative 'helpers/security_key'
 require_relative 'helpers/config_path'
 require_relative 'helpers/log_drain'
 require_relative 'helpers/metric_drain'
+require_relative 'helpers/date_helpers'
 require_relative 'helpers/s3_log_helpers'
+require_relative 'helpers/maintenance'
 
 require_relative 'subcommands/apps'
 require_relative 'subcommands/config'
@@ -39,6 +41,7 @@ require_relative 'subcommands/inspect'
 require_relative 'subcommands/endpoints'
 require_relative 'subcommands/log_drain'
 require_relative 'subcommands/metric_drain'
+require_relative 'subcommands/maintenance'
 
 module Aptible
   module CLI
@@ -49,6 +52,7 @@ module Aptible
       include Helpers::Ssh
       include Helpers::System
       include Helpers::ConfigPath
+      include Helpers::DateHelpers
       include Subcommands::Apps
       include Subcommands::Config
       include Subcommands::DB
@@ -65,6 +69,7 @@ module Aptible
       include Subcommands::Endpoints
       include Subcommands::LogDrain
       include Subcommands::MetricDrain
+      include Subcommands::Maintenance
 
       # Forward return codes on failures.
       def self.exit_on_failure?

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

@@ -0,0 +1,34 @@
+module Aptible
+  module CLI
+    module Helpers
+      module DateHelpers
+        # This should only be used by the method processing user date input in
+        # S3LogHelpers. It is used to process a user-provided string into UTC.
+        def utc_date(date_string)
+          t_fmt = '%Y-%m-%d %Z'
+          Time.strptime("#{date_string} UTC", t_fmt)
+        rescue ArgumentError
+          raise Thor::Error, 'Please provide dates in YYYY-MM-DD format'
+        end
+
+        # This should only be used by the method processing timestamps from S3
+        # file names in S3LogHelpers. The file name does not include any time
+        # zone information, but we know it to be in UTC, so we add the "Z"
+        def utc_datetime(datetime_string)
+          Time.parse("#{datetime_string}Z")
+        rescue ArgumentError
+          nil
+        end
+
+        # This is used to format timestamps returned by our API into a more
+        # readable format.
+        # EG, "2023-09-05T22:00:00.000Z" returns "2023-09-05 22:00:00 UTC"
+        def utc_string(datetime_string)
+          Time.parse(datetime_string)
+        rescue ArgumentError
+          nil
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+require 'aptible/api'
+
+module Aptible
+  module CLI
+    module Helpers
+      module Maintenance
+        include Helpers::Token
+
+        def maintenance_apps
+          Aptible::Api::MaintenanceApp.all(token: fetch_token)
+        end
+
+        def maintenance_databases
+          Aptible::Api::MaintenanceDatabase.all(token: fetch_token)
+        end
+      end
+    end
+  end
+end

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

@@ -5,6 +5,8 @@ module Aptible
   module CLI
     module Helpers
       module S3LogHelpers
+        include Helpers::DateHelpers
+
         def ensure_aws_creds
           cred_errors = []
           unless ENV['AWS_ACCESS_KEY_ID']
@@ -190,19 +192,6 @@ module Aptible
           true
         end
 
-        def utc_date(date_string)
-          t_fmt = '%Y-%m-%d %Z'
-          Time.strptime("#{date_string} UTC", t_fmt)
-        rescue ArgumentError
-          raise Thor::Error, 'Please provide dates in YYYY-MM-DD format'
-        end
-
-        def utc_datetime(datetime_string)
-          Time.parse("#{datetime_string}Z")
-        rescue ArgumentError
-          nil
-        end
-
         def encryption_key(filesum, possible_keys)
           # The key can be determined from the sum
           possible_keys.each do |k|

data/lib/aptible/cli/resource_formatter.rb

@@ -2,6 +2,8 @@ module Aptible
   module CLI
     module ResourceFormatter
       class << self
+        include Helpers::DateHelpers
+
         NO_NESTING = Object.new.freeze
 
         def inject_backup(node, backup, include_db: false)
@@ -50,8 +52,7 @@ module Aptible
             end
           end
 
-          if bu_operation && \
-             backup.manual && !backup.copied_from
+          if bu_operation && !backup.copied_from
             node.keyed_object('created_from_operation', 'id') do |n|
               inject_operation(n, bu_operation)
             end
@@ -236,6 +237,28 @@ module Aptible
           attach_account(node, account)
         end
 
+        def inject_maintenance(
+          node,
+          command_prefix,
+          maintenance_resource,
+          account
+        )
+          node.value('id', maintenance_resource.id)
+          raw_start, raw_end = maintenance_resource.maintenance_deadline
+          window_start = utc_string(raw_start)
+          window_end = utc_string(raw_end)
+          label = "#{maintenance_resource.handle} between #{window_start} "\
+                  "and #{window_end}"
+          restart_command = "#{command_prefix}"\
+                            " #{maintenance_resource.handle}"\
+                            " --environment #{account.handle}"
+          node.value('label', label)
+          node.value('handle', maintenance_resource.handle)
+          node.value('restart_command', restart_command)
+
+          attach_account(node, account)
+        end
+
         private
 
         def attach_account(node, account)

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

@@ -41,7 +41,7 @@ module Aptible
               git_ref = options[:git_commitish]
               if options[:git_detach]
                 if git_ref
-                  raise Thor::Error, 'The options --git-committish and ' \
+                  raise Thor::Error, 'The options --git-commitish and ' \
                                      '--git-detach are incompatible'
                 end
                 git_ref = NULL_SHA1

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

@@ -10,7 +10,7 @@ module Aptible
           thor.class_eval do
             include Helpers::Operation
             include Helpers::AppOrDatabase
-            include Helpers::S3LogHelpers
+            include Helpers::DateHelpers
 
             desc 'logs [--app APP | --database DATABASE]',
                  'Follows logs from a running app or database'

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

@@ -0,0 +1,97 @@
+module Aptible
+  module CLI
+    module Subcommands
+      module Maintenance
+        def self.included(thor)
+          thor.class_eval do
+            include Helpers::Environment
+            include Helpers::Maintenance
+            include Helpers::Token
+
+            desc 'maintenance:apps',
+                 'List Apps impacted by maintenance schedules where '\
+                 'restarts are required'
+            option :environment
+            define_method 'maintenance:apps' do
+              found_maintenance = false
+              m = maintenance_apps
+              Formatter.render(Renderer.current) do |root|
+                root.grouped_keyed_list(
+                  { 'environment' => 'handle' },
+                  'label'
+                ) do |node|
+                  scoped_environments(options).each do |account|
+                    m.select { |app| app.account.id == account.id }
+                     .each do |app|
+                      next unless app.maintenance_deadline
+                      found_maintenance = true
+                      node.object do |n|
+                        ResourceFormatter.inject_maintenance(
+                          n,
+                          'aptible restart --app',
+                          app,
+                          account
+                        )
+                      end
+                    end
+                  end
+                end
+              end
+              if found_maintenance
+                explanation 'app'
+              else
+                no_maintenances 'app'
+              end
+            end
+            desc 'maintenance:dbs',
+                 'List Databases impacted by maintenance schedules where '\
+                 'restarts are required'
+            option :environment
+            define_method 'maintenance:dbs' do
+              found_maintenance = false
+              m = maintenance_databases
+              Formatter.render(Renderer.current) do |root|
+                root.grouped_keyed_list(
+                  { 'environment' => 'handle' },
+                  'label'
+                ) do |node|
+                  scoped_environments(options).each do |account|
+                    m.select { |db| db.account.id == account.id }
+                     .each do |db|
+                      next unless db.maintenance_deadline
+                      found_maintenance = true
+                      node.object do |n|
+                        ResourceFormatter.inject_maintenance(
+                          n,
+                          'aptible db:restart',
+                          db,
+                          account
+                        )
+                      end
+                    end
+                  end
+                end
+              end
+              if found_maintenance
+                explanation 'database'
+              else
+                no_maintenances 'database'
+              end
+            end
+          end
+        end
+
+        def explanation(resource_type)
+          CLI.logger.warn "\nYou may restart these #{resource_type}(s)"\
+                          ' at any time, or Aptible will restart it'\
+                          ' during the defined window.'
+        end
+
+        def no_maintenances(resource_type)
+          CLI.logger.info "\nNo #{resource_type}s found affected "\
+                          'by maintenance schedules.'
+        end
+      end
+    end
+  end
+end

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

@@ -5,6 +5,7 @@ module Aptible
         SITES = {
           'US1' => 'https://app.datadoghq.com',
           'US3' => 'https://us3.datadoghq.com',
+          'US5' => 'https://us5.datadoghq.com',
           'EU1' => 'https://app.datadoghq.eu',
           'US1-FED' => 'https://app.ddog-gov.com'
         }.freeze
@@ -84,6 +85,35 @@ module Aptible
               create_metric_drain(account, opts)
             end
 
+            desc 'metric_drain:create:influxdb:customv2 HANDLE '\
+                   '--org ORGANIZATION --token INFLUX_TOKEN ' \
+                   '--url URL_INCLUDING_PORT ' \
+                   '--bucket INFLUX_BUCKET_NAME ' \
+                   '--environment ENVIRONMENT',
+                 'Create an InfluxDB v2 Metric Drain'
+            option :bucket, type: :string
+            option :org, type: :string
+            option :token, type: :string
+            option :url, type: :string
+            option :environment
+            define_method 'metric_drain:create:influxdb:customv2' do |handle|
+              account = ensure_environment(options)
+
+              config = {
+                address: options[:url],
+                org: options[:org],
+                authToken: options[:token],
+                bucket: options[:bucket]
+              }
+              opts = {
+                handle: handle,
+                drain_configuration: config,
+                drain_type: :influxdb2
+              }
+
+              create_metric_drain(account, opts)
+            end
+
             desc 'metric_drain:create:datadog HANDLE '\
                  '--api_key DATADOG_API_KEY '\
                  '--site DATADOG_SITE ' \

data/lib/aptible/cli/version.rb

@@ -1,5 +1,5 @@
 module Aptible
   module CLI
-    VERSION = '0.19.6'.freeze
+    VERSION = '0.19.7'.freeze
   end
 end

data/spec/aptible/cli/helpers/date_helpers_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe Aptible::CLI::Helpers::DateHelpers do
+  subject { Class.new.send(:include, described_class).new }
+
+  describe '#utc_string' do
+    it 'should accept a Datetime string from our API and return a UTC string' do
+      result = subject.utc_string('2023-09-05T22:00:00.000Z')
+      expect(result).to eq '2023-09-05 22:00:00 UTC'
+    end
+  end
+end

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

@@ -0,0 +1,189 @@
+require 'spec_helper'
+
+describe Aptible::CLI::Agent do
+  include Aptible::CLI::Helpers::DateHelpers
+
+  let(:token) { double('token') }
+
+  before do
+    allow(subject).to receive(:ask)
+    allow(subject).to receive(:save_token)
+    allow(subject).to receive(:fetch_token) { token }
+  end
+
+  let(:handle) { 'foobar' }
+  let(:stack) { Fabricate(:stack, internal_domain: 'aptible.in') }
+  let(:account) { Fabricate(:account, stack: stack) }
+  let(:database) { Fabricate(:database, handle: handle, account: account) }
+  let(:staging) { Fabricate(:account, handle: 'staging') }
+  let(:prod) { Fabricate(:account, handle: 'production') }
+  let(:window_start) { '2073-09-05T22:00:00.000Z' }
+  let(:window_end) { '2073-09-05T23:00:00.000Z' }
+  let(:maintenance_dbs) do
+    [
+      [staging, 'staging-redis-db', [window_start, window_end]],
+      [staging, 'staging-postgres-db', nil],
+      [prod, 'prod-elsearch-db', [window_start, window_end]],
+      [prod, 'prod-postgres-db', nil]
+    ].map do |a, h, m|
+      Fabricate(
+        :maintenance_database,
+        account: a,
+        handle: h,
+        maintenance_deadline: m
+      )
+    end
+  end
+  let(:maintenance_apps) do
+    [
+      [staging, 'staging-app-1', [window_start, window_end]],
+      [staging, 'staging-app-2', nil],
+      [prod, 'prod-app-1', [window_start, window_end]],
+      [prod, 'prod-app-2', nil]
+    ].map do |a, h, m|
+      Fabricate(
+        :maintenance_app,
+        account: a,
+        handle: h,
+        maintenance_deadline: m
+      )
+    end
+  end
+
+  describe '#maintenance:dbs' do
+    before do
+      token = 'the-token'
+      allow(subject).to receive(:fetch_token) { token }
+      allow(Aptible::Api::Account).to receive(:all)
+        .with(token: token)
+        .and_return([staging, prod])
+      allow(Aptible::Api::MaintenanceDatabase).to receive(:all)
+        .with(token: token)
+        .and_return(maintenance_dbs)
+    end
+
+    context 'when no account is specified' do
+      it 'prints out the grouped database handles for all accounts' do
+        subject.send('maintenance:dbs')
+
+        expect(captured_output_text).to include('=== staging')
+        expect(captured_output_text).to include('staging-redis-db')
+        expect(captured_output_text).to include('2073-09-05 22:00:00 UTC')
+        expect(captured_output_text).to include('2073-09-05 23:00:00 UTC')
+        expect(captured_output_text).not_to include('staging-postgres-db')
+
+        expect(captured_output_text).to include('=== production')
+        expect(captured_output_text).to include('prod-elsearch-db')
+        expect(captured_output_text).to include('2073-09-05 22:00:00 UTC')
+        expect(captured_output_text).to include('2073-09-05 23:00:00 UTC')
+        expect(captured_output_text).not_to include('prod-postgres-db')
+
+        expect(captured_output_json.to_s)
+          .to include(
+            'aptible db:restart staging-redis-db --environment staging'
+          )
+        expect(captured_output_json.to_s)
+          .to include(
+            'aptible db:restart prod-elsearch-db --environment production'
+          )
+      end
+    end
+
+    context 'when a valid account is specified' do
+      it 'prints out the database handles for the account' do
+        subject.options = { environment: 'staging' }
+        subject.send('maintenance:dbs')
+
+        expect(captured_output_text).to include('=== staging')
+        expect(captured_output_text).to include('staging-redis-db')
+        expect(captured_output_text).to include('2073-09-05 22:00:00 UTC')
+        expect(captured_output_text).to include('2073-09-05 23:00:00 UTC')
+        expect(captured_output_text).not_to include('staging-postgres-db')
+
+        expect(captured_output_text).not_to include('=== production')
+        expect(captured_output_text).not_to include('prod-elsearch-db')
+        expect(captured_output_text).not_to include('prod-postgres-db')
+
+        expect(captured_output_json.to_s)
+          .to include(
+            'aptible db:restart staging-redis-db --environment staging'
+          )
+      end
+    end
+
+    context 'when an invalid account is specified' do
+      it 'prints out an error' do
+        subject.options = { environment: 'foo' }
+        expect { subject.send('maintenance:dbs') }
+          .to raise_error('Specified account does not exist')
+      end
+    end
+  end
+  describe '#maintenance:apps' do
+    before do
+      token = 'the-token'
+      allow(subject).to receive(:fetch_token) { token }
+      allow(Aptible::Api::Account).to receive(:all).with(token: token)
+        .and_return([staging, prod])
+      allow(Aptible::Api::MaintenanceApp).to receive(:all).with(token: token)
+        .and_return(maintenance_apps)
+    end
+
+    context 'when no account is specified' do
+      it 'prints out the grouped app handles for all accounts' do
+        subject.send('maintenance:apps')
+
+        expect(captured_output_text).to include('=== staging')
+        expect(captured_output_text).to include('staging-app-1')
+        expect(captured_output_text).to include('2073-09-05 22:00:00 UTC')
+        expect(captured_output_text).to include('2073-09-05 23:00:00 UTC')
+        expect(captured_output_text).not_to include('staging-app-2')
+
+        expect(captured_output_text).to include('=== production')
+        expect(captured_output_text).to include('prod-app-1')
+        expect(captured_output_text).to include('2073-09-05 22:00:00 UTC')
+        expect(captured_output_text).to include('2073-09-05 23:00:00 UTC')
+        expect(captured_output_text).not_to include('prod-app-2')
+
+        expect(captured_output_json.to_s)
+          .to include(
+            'aptible restart --app staging-app-1 --environment staging'
+          )
+        expect(captured_output_json.to_s)
+          .to include(
+            'aptible restart --app prod-app-1 --environment production'
+          )
+      end
+    end
+
+    context 'when a valid account is specified' do
+      it 'prints out the app handles for the account' do
+        subject.options = { environment: 'staging' }
+        subject.send('maintenance:apps')
+
+        expect(captured_output_text).to include('=== staging')
+        expect(captured_output_text).to include('staging-app-1')
+        expect(captured_output_text).to include('2073-09-05 22:00:00 UTC')
+        expect(captured_output_text).to include('2073-09-05 23:00:00 UTC')
+        expect(captured_output_text).not_to include('staging-app-2')
+
+        expect(captured_output_text).not_to include('=== production')
+        expect(captured_output_text).not_to include('prod-app-1')
+        expect(captured_output_text).not_to include('prod-app-2')
+
+        expect(captured_output_json.to_s)
+          .to include(
+            'aptible restart --app staging-app-1 --environment staging'
+          )
+      end
+    end
+
+    context 'when an invalid account is specified' do
+      it 'prints out an error' do
+        subject.options = { environment: 'foo' }
+        expect { subject.send('maintenance:apps') }
+          .to raise_error('Specified account does not exist')
+      end
+    end
+  end
+end

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

@@ -86,7 +86,7 @@ describe Aptible::CLI::Agent do
     end
 
     context 'influxdb:custom' do
-      it 'creates a new InfluxDB metric drain' do
+      it 'creates a new InfluxDB v1 metric drain' do
         opts = {
           handle: 'test-influxdb-custom',
           drain_type: :influxdb,
@@ -111,6 +111,32 @@ describe Aptible::CLI::Agent do
       end
     end
 
+    context 'influxdb:customv2' do
+      it 'creates a new InfluxDB v2 metric drain' do
+        opts = {
+          handle: 'test-influxdb2-custom',
+          drain_type: :influxdb2,
+          drain_configuration: {
+            address: 'https://test.foo.com:443',
+            org: 'foobar',
+            authToken: 'bar',
+            bucket: 'foo'
+          }
+        }
+        expect_provision_metric_drain(opts)
+
+        subject.options = {
+          environment: account.handle,
+          bucket: 'foo',
+          token: 'bar',
+          org: 'foobar',
+          url: 'https://test.foo.com:443'
+        }
+        subject.send('metric_drain:create:influxdb:customv2',
+                     'test-influxdb2-custom')
+      end
+    end
+
     context 'datadog' do
       it 'creates a new Datadog metric drain' do
         opts = {

data/spec/fabricators/maintenance_app_fabricator.rb

@@ -0,0 +1,10 @@
+class StubMaintenanceApp < OpenStruct; end
+
+Fabricator(:maintenance_app, from: :stub_maintenance_app) do
+  id { Fabricate.sequence(:app_id) { |i| i } }
+  handle 'hello'
+  status 'provisioned'
+  account
+  created_at { Time.now }
+  maintenance_deadline { [Time.now + 1.minute, Time.now + 2.minute] }
+end

data/spec/fabricators/maintenance_database_fabricator.rb

@@ -0,0 +1,10 @@
+class StubMaintenanceDatabase < OpenStruct; end
+
+Fabricator(:maintenance_database, from: :stub_maintenance_database) do
+  id { Fabricate.sequence(:database_id) { |i| i } }
+  handle 'hello'
+  status 'provisioned'
+  account
+  created_at { Time.now }
+  maintenance_deadline { [Time.now + 1.minute, Time.now + 2.minute] }
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aptible-cli
 version: !ruby/object:Gem::Version
-  version: 0.19.6
+  version: 0.19.7
 platform: ruby
 authors:
 - Frank Macreery
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-28 00:00:00.000000000 Z
+date: 2023-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aptible-resource
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: aptible-auth
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +150,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: bigdecimal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.5
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -284,9 +298,11 @@ files:
 - LICENSE.md
 - README.md
 - Rakefile
+- SECURITY.md
 - appveyor.yml
 - aptible-cli.gemspec
 - bin/aptible
+- cleanup_bundler
 - codecov.yml
 - lib/aptible/cli.rb
 - lib/aptible/cli/agent.rb
@@ -304,8 +320,10 @@ files:
 - lib/aptible/cli/helpers/app_or_database.rb
 - lib/aptible/cli/helpers/config_path.rb
 - lib/aptible/cli/helpers/database.rb
+- lib/aptible/cli/helpers/date_helpers.rb
 - lib/aptible/cli/helpers/environment.rb
 - lib/aptible/cli/helpers/log_drain.rb
+- lib/aptible/cli/helpers/maintenance.rb
 - lib/aptible/cli/helpers/metric_drain.rb
 - lib/aptible/cli/helpers/operation.rb
 - lib/aptible/cli/helpers/s3_log_helpers.rb
@@ -331,6 +349,7 @@ files:
 - lib/aptible/cli/subcommands/inspect.rb
 - lib/aptible/cli/subcommands/log_drain.rb
 - lib/aptible/cli/subcommands/logs.rb
+- lib/aptible/cli/subcommands/maintenance.rb
 - lib/aptible/cli/subcommands/metric_drain.rb
 - lib/aptible/cli/subcommands/operation.rb
 - lib/aptible/cli/subcommands/rebuild.rb
@@ -342,6 +361,7 @@ files:
 - spec/aptible/cli/agent_spec.rb
 - spec/aptible/cli/formatter_spec.rb
 - spec/aptible/cli/helpers/database_spec.rb
+- spec/aptible/cli/helpers/date_helpers_spec.rb
 - spec/aptible/cli/helpers/git_remote_handle_strategy_spec.rb
 - spec/aptible/cli/helpers/handle_from_git_remote_spec.rb
 - spec/aptible/cli/helpers/operation_spec.rb
@@ -363,6 +383,7 @@ files:
 - spec/aptible/cli/subcommands/inspect_spec.rb
 - spec/aptible/cli/subcommands/log_drain_spec.rb
 - spec/aptible/cli/subcommands/logs_spec.rb
+- spec/aptible/cli/subcommands/maintenance_spec.rb
 - spec/aptible/cli/subcommands/metric_drain_spec.rb
 - spec/aptible/cli/subcommands/operation_spec.rb
 - spec/aptible/cli/subcommands/rebuild_spec.rb
@@ -380,6 +401,8 @@ files:
 - spec/fabricators/database_fabricator.rb
 - spec/fabricators/database_image_fabricator.rb
 - spec/fabricators/log_drain_fabricator.rb
+- spec/fabricators/maintenance_app_fabricator.rb
+- spec/fabricators/maintenance_database_fabricator.rb
 - spec/fabricators/metric_drain_fabricator.rb
 - spec/fabricators/operation_fabricator.rb
 - spec/fabricators/service_fabricator.rb
@@ -399,7 +422,7 @@ homepage: https://github.com/aptible/aptible-cli
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -414,14 +437,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Command-line interface for Aptible services
 test_files:
 - spec/aptible/cli/agent_spec.rb
 - spec/aptible/cli/formatter_spec.rb
 - spec/aptible/cli/helpers/database_spec.rb
+- spec/aptible/cli/helpers/date_helpers_spec.rb
 - spec/aptible/cli/helpers/git_remote_handle_strategy_spec.rb
 - spec/aptible/cli/helpers/handle_from_git_remote_spec.rb
 - spec/aptible/cli/helpers/operation_spec.rb
@@ -443,6 +467,7 @@ test_files:
 - spec/aptible/cli/subcommands/inspect_spec.rb
 - spec/aptible/cli/subcommands/log_drain_spec.rb
 - spec/aptible/cli/subcommands/logs_spec.rb
+- spec/aptible/cli/subcommands/maintenance_spec.rb
 - spec/aptible/cli/subcommands/metric_drain_spec.rb
 - spec/aptible/cli/subcommands/operation_spec.rb
 - spec/aptible/cli/subcommands/rebuild_spec.rb
@@ -460,6 +485,8 @@ test_files:
 - spec/fabricators/database_fabricator.rb
 - spec/fabricators/database_image_fabricator.rb
 - spec/fabricators/log_drain_fabricator.rb
+- spec/fabricators/maintenance_app_fabricator.rb
+- spec/fabricators/maintenance_database_fabricator.rb
 - spec/fabricators/metric_drain_fabricator.rb
 - spec/fabricators/operation_fabricator.rb
 - spec/fabricators/service_fabricator.rb