aptible-cli 0.19.8 → 0.19.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5297ec1eb7d106b2b69705d31ab05426fb64d8c553b170918c4090aaf582398f
-  data.tar.gz: d0478f4e443b88f9def1a45a9db9b029f62d36e6d73bc53c6a686c858bfd3e83
+  metadata.gz: 32982651526f1859445bcdfa762881e25f68b72dbce3ecca1a0169a900f4cca5
+  data.tar.gz: 21a14594b144844b6e833ba2f5811736d0c642839375aadbbea356853478c8ec
 SHA512:
-  metadata.gz: 9e0490170403f7272b481a09272115aafc5d1a3c65b21c26d357e149fc305b5ffef0c04903d8e677f865b992d76551828e3621a338d2bc6c6ee69a33222b8ddf
-  data.tar.gz: fa77c4fd5462b8b99a5f0ae8146e876e163e8faf6b2e34aa1275cdbea6d920d40b48b9f1fb08820b92d3b5ab02de681c17b20a4192305b7c674760cdfbd80ba3
+  metadata.gz: 50a22a2a0c8eee1b4c65912a0e986cb723250b7541a6ded2e31112ae11d06cca48ae05329395d1d8f44704e917818d037f3b5d47eac74f3f320ab39ed1496527
+  data.tar.gz: 398cc5e09a3c0b1458a633ad4e5b0bcdb09040160207052face94142dee4b171ecfbe9c68af51007cb8e16cff03249e7821cd041834c4a161e66a10e770d0ea5

data/Dockerfile

@@ -0,0 +1,10 @@
+FROM ruby:2.7.8
+
+WORKDIR /app
+COPY . /app
+
+RUN ./cleanup_bundler
+RUN gem install bundler -v '< 2'
+RUN bundle install
+
+CMD ["/app/bin/aptible"]

data/README.md

@@ -35,8 +35,11 @@ Commands:
   aptible backup:orphaned                                                                                                                                                                                                                                                                                                                                       # List backups associated with deprovisioned databases
   aptible backup:purge BACKUP_ID                                                                                                                                                                                                                                                                                                                                # Permanently delete a backup and any copies of it
   aptible backup:restore BACKUP_ID [--environment ENVIRONMENT_HANDLE] [--handle HANDLE] [--container-size SIZE_MB] [--disk-size SIZE_GB] [--key-arn KEY_ARN]                                                                                                                                                                                                    # Restore a backup
+  aptible backup_retention_policy [ENVIRONMENT_HANDLE]                                                                                                                                                                                                                                                                                                          # Show the current backup retention policy for the environment
+  aptible backup_retention_policy:set [ENVIRONMENT_HANDLE] [--daily DAILY_BACKUPS] [--monthly MONTHLY_BACKUPS] [--yearly YEARLY_BACKUPS] [--make-copy|--no-make-copy] [--keep-final|--no-keep-final]                                                                                                                                                            # Set the environemnt's backup retention policy
   aptible config                                                                                                                                                                                                                                                                                                                                                # Print an app's current configuration
   aptible config:add [VAR1=VAL1] [VAR2=VAL2] [...]                                                                                                                                                                                                                                                                                                              # Add an ENV variable to an app
+  aptible config:get [VAR1]                                                                                                                                                                                                                                                                                                                                     # Print a specific key within an app's current configuration
   aptible config:rm [VAR1] [VAR2] [...]                                                                                                                                                                                                                                                                                                                         # Remove an ENV variable from an app
   aptible config:set [VAR1=VAL1] [VAR2=VAL2] [...]                                                                                                                                                                                                                                                                                                              # Add an ENV variable to an app
   aptible config:unset [VAR1] [VAR2] [...]                                                                                                                                                                                                                                                                                                                      # Remove an ENV variable from an app

data/docker-compose.yml

@@ -0,0 +1,10 @@
+services:
+  # docker compose run cli bash
+  # export APTIBLE_ACCESS_TOKEN=xxx
+  # bundle exec ./bin/aptible help
+  cli:
+    build: .
+    volumes:
+      - type: bind
+        source: .
+        target: /app

data/lib/aptible/cli/agent.rb

@@ -42,6 +42,7 @@ require_relative 'subcommands/endpoints'
 require_relative 'subcommands/log_drain'
 require_relative 'subcommands/metric_drain'
 require_relative 'subcommands/maintenance'
+require_relative 'subcommands/backup_retention_policy'
 
 module Aptible
   module CLI
@@ -70,6 +71,7 @@ module Aptible
       include Subcommands::LogDrain
       include Subcommands::MetricDrain
       include Subcommands::Maintenance
+      include Subcommands::BackupRetentionPolicy
 
       # Forward return codes on failures.
       def self.exit_on_failure?

data/lib/aptible/cli/resource_formatter.rb

@@ -247,10 +247,10 @@ module Aptible
           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} "\
+          label = "#{maintenance_resource.handle} between #{window_start} " \
                   "and #{window_end}"
-          restart_command = "#{command_prefix}"\
-                            " #{maintenance_resource.handle}"\
+          restart_command = "#{command_prefix}" \
+                            " #{maintenance_resource.handle}" \
                             " --environment #{account.handle}"
           node.value('label', label)
           node.value('handle', maintenance_resource.handle)
@@ -259,6 +259,17 @@ module Aptible
           attach_account(node, account)
         end
 
+        def inject_backup_retention_policy(node, policy, account)
+          node.value('id', policy.id)
+          node.value('daily', policy.daily)
+          node.value('monthly', policy.monthly)
+          node.value('yearly', policy.yearly)
+          node.value('make_copy', policy.make_copy)
+          node.value('keep_final', policy.keep_final)
+
+          attach_account(node, account)
+        end
+
         private
 
         def attach_account(node, account)

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

@@ -0,0 +1,80 @@
+require 'term/ansicolor'
+require 'uri'
+require 'English'
+
+module Aptible
+  module CLI
+    module Subcommands
+      module BackupRetentionPolicy
+        def self.included(thor)
+          thor.class_eval do
+            include Helpers::Environment
+            include Term::ANSIColor
+
+            desc 'backup_retention_policy [ENVIRONMENT_HANDLE]',
+                 'Show the current backup retention policy for the environment'
+            define_method 'backup_retention_policy' do |env|
+              account = ensure_environment(environment: env)
+              policy = account.backup_retention_policies.first
+              unless policy
+                # Show the default policy
+                policy = Aptible::Api::BackupRetentionPolicy.new
+                policy.attributes[:id] = 'default'
+                policy.attributes[:daily] = 90
+                policy.attributes[:monthly] = 72
+                policy.attributes[:yearly] = 0
+                policy.attributes[:make_copy] = true
+                policy.attributes[:keep_final] = true
+              end
+
+              Formatter.render(Renderer.current) do |root|
+                root.object do |node|
+                  ResourceFormatter.inject_backup_retention_policy(
+                    node, policy, account
+                  )
+                end
+              end
+            end
+
+            desc 'backup_retention_policy:set [ENVIRONMENT_HANDLE] ' \
+                 '[--daily DAILY_BACKUPS] [--monthly MONTHLY_BACKUPS] ' \
+                 '[--yearly YEARLY_BACKUPS] [--make-copy|--no-make-copy] ' \
+                 '[--keep-final|--no-keep-final]',
+                 "Set the environemnt's backup retention policy"
+            option :daily, type: :numeric,
+                           desc: 'Number of daily backups to retain',
+                           default: 90
+            option :monthly, type: :numeric,
+                             desc: 'Number of monthly backups to retain',
+                             default: 72
+            option :yearly, type: :numeric,
+                            desc: 'Number of yarly backups to retain',
+                            default: 0
+            option :make_copy, type: :boolean,
+                               desc: 'If backup copies should be created',
+                               default: true
+            option(
+              :keep_final,
+              type: :boolean,
+              desc: 'If final backups should be kept when databases are '\
+                    'deprovisioned',
+              default: true
+            )
+            define_method 'backup_retention_policy:set' do |env|
+              account = ensure_environment(environment: env)
+              policy = account.create_backup_retention_policy!(**options)
+
+              Formatter.render(Renderer.current) do |root|
+                root.object do |node|
+                  ResourceFormatter.inject_backup_retention_policy(
+                    node, policy.reload, account
+                  )
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -29,6 +29,23 @@ module Aptible
               end
             end
 
+            desc 'config:get [VAR1]',
+                 "Print a specific key within an app's current configuration"
+            app_options
+            define_method 'config:get' do |*args|
+              app = ensure_app(options)
+              config = app.current_configuration
+              env = config ? config.env : {}
+
+              Formatter.render(Renderer.current) do |root|
+                key = args[0]
+                value = env
+                        .select { |k| k == key }
+                        .map { |_, v| v }
+                root.value(value)
+              end
+            end
+
             desc 'config:add [VAR1=VAL1] [VAR2=VAL2] [...]',
                  'Add an ENV variable to an app'
             app_options

data/lib/aptible/cli/version.rb

@@ -1,5 +1,5 @@
 module Aptible
   module CLI
-    VERSION = '0.19.8'.freeze
+    VERSION = '0.19.9'.freeze
   end
 end

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

@@ -57,6 +57,28 @@ describe Aptible::CLI::Agent do
     end
   end
 
+  describe '#config:get' do
+    it 'should show single environment variable specified' do
+      app.current_configuration = Fabricate(
+        :configuration, app: app, env: { 'FOO' => 'BAR', 'QUX' => 'two words' }
+      )
+      subject.send('config:get', 'FOO')
+
+      expect(captured_output_text).to match(/BAR/)
+      expect(captured_output_text).not_to match(/two\\ words/)
+      expect(captured_output_json).to match_array(['BAR'])
+    end
+
+    it 'should show empty line when env var not found' do
+      app.current_configuration = Fabricate(
+        :configuration, app: app, env: { 'FOO' => 'BAR', 'QUX' => 'two words' }
+      )
+      subject.send('config:get', 'MIZ')
+
+      expect(captured_output_text).to eq('')
+    end
+  end
+
   describe '#config:set' do
     it 'sets environment variables' do
       expect(app).to receive(:create_operation!)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aptible-cli
 version: !ruby/object:Gem::Version
-  version: 0.19.8
+  version: 0.19.9
 platform: ruby
 authors:
 - Frank Macreery
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-15 00:00:00.000000000 Z
+date: 2024-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aptible-resource
@@ -294,6 +294,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- Dockerfile
 - Gemfile
 - LICENSE.md
 - README.md
@@ -304,6 +305,7 @@ files:
 - bin/aptible
 - cleanup_bundler
 - codecov.yml
+- docker-compose.yml
 - lib/aptible/cli.rb
 - lib/aptible/cli/agent.rb
 - lib/aptible/cli/error.rb
@@ -341,6 +343,7 @@ files:
 - lib/aptible/cli/resource_formatter.rb
 - lib/aptible/cli/subcommands/apps.rb
 - lib/aptible/cli/subcommands/backup.rb
+- lib/aptible/cli/subcommands/backup_retention_policy.rb
 - lib/aptible/cli/subcommands/config.rb
 - lib/aptible/cli/subcommands/db.rb
 - lib/aptible/cli/subcommands/deploy.rb