aptible-cli 0.18.2 → 0.18.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf958faed8401636f811f03296e187e9af011fef3d6ce6aa3bc7f2aee315d5c8
-  data.tar.gz: 36214902974167a2748685d63fa9d1d659c64d4f752e3b813aeb7adb907f601b
+  metadata.gz: 99e721103b6988c5c8e41d11935449de499b29db00513732c031098f29613f29
+  data.tar.gz: 19b4bc6ce3b14b759ef100eab8ca95f12809bb0fd41e5c36b709dfd224ab774b
 SHA512:
-  metadata.gz: a1a85e655dd7e0d3267035baca9c8c5898193f524a3ac842961ec62aa0e3b4f951c89a0a1dd5a1adcf80b840b729dafb90238214d6224eff1fd524a54fb90b21
-  data.tar.gz: d85e946cb9adee2314f31078029033bd62ea44a0ef23d673c434e422817c17cf7094bff714ce5b6862c52135f30b030ae7d52a4f72e8052f2fc99b372b3016ca
+  metadata.gz: 7c5e417a9ab05f619e140ff6c444bdd9723aa6d9b5063678201e018873a8065f245074ba872fc0fd00763a54e9f7c156e67762118bdcb156893f8a9668aab8b6
+  data.tar.gz: 9355ca55bb61608245dfd0c8a1a7463ac555ab365cf389f12bec78b293861ab43f8776aef2c3c5fe8f0a0b42e3730f59ea3025d03c84ffc46d048c7b6933e90c

data/README.md

@@ -51,7 +51,7 @@ Commands:
   aptible db:modify HANDLE [--iops IOPS] [--volume-type [gp2, gp3]]                                                                                           # Modify a database disk
   aptible db:reload HANDLE                                                                                                                                    # Reload a database
   aptible db:replicate HANDLE REPLICA_HANDLE [--container-size SIZE_MB] [--disk-size SIZE_GB] [--logical --version VERSION] [--key-arn KEY_ARN]               # Create a replica/follower of a database
-  aptible db:restart HANDLE [--container-size SIZE_MB] [--disk-size SIZE_GB][--iops IOPS] [--volume-type [gp2, gp3]]                                          # Restart a database
+  aptible db:restart HANDLE [--container-size SIZE_MB] [--disk-size SIZE_GB] [--iops IOPS] [--volume-type [gp2, gp3]]                                         # Restart a database
   aptible db:tunnel HANDLE                                                                                                                                    # Create a local tunnel to a database
   aptible db:url HANDLE                                                                                                                                       # Display a database URL
   aptible db:versions                                                                                                                                         # List available database versions

data/lib/aptible/cli/agent.rb

@@ -18,6 +18,7 @@ require_relative 'helpers/vhost/option_set_builder'
 require_relative 'helpers/tunnel'
 require_relative 'helpers/system'
 require_relative 'helpers/security_key'
+require_relative 'helpers/config_path'
 
 require_relative 'subcommands/apps'
 require_relative 'subcommands/config'
@@ -43,6 +44,7 @@ module Aptible
       include Helpers::Token
       include Helpers::Ssh
       include Helpers::System
+      include Helpers::ConfigPath
       include Subcommands::Apps
       include Subcommands::Config
       include Subcommands::DB
@@ -209,7 +211,7 @@ module Aptible
         # further: to do so, edit the file `.aptible/nag_toolbelt` and put a
         # timestamp far into the future. For example, writing 1577836800 will
         # disable the warning until 2020.
-        nag_file = File.join ENV['HOME'], '.aptible', 'nag_toolbelt'
+        nag_file = File.join aptible_config_path, 'nag_toolbelt'
         nag_frequency = 12.hours
 
         last_nag = begin

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

@@ -0,0 +1,11 @@
+module Aptible
+  module CLI
+    module Helpers
+      module ConfigPath
+        def aptible_config_path
+          ENV['APTIBLE_CONFIG_PATH'] || (File.join ENV['HOME'], '.aptible')
+        end
+      end
+    end
+  end
+end

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

@@ -1,7 +1,11 @@
+require_relative 'config_path'
+
 module Aptible
   module CLI
     module Helpers
       module Ssh
+        include Helpers::ConfigPath
+
         def connect_to_ssh_portal(operation, *extra_ssh_args)
           # NOTE: This is a little tricky to get rigt, so before you make any
           # changes, read this.
@@ -126,7 +130,7 @@ module Aptible
         end
 
         def ssh_dir
-          File.join ENV['HOME'], '.aptible', 'ssh'
+          File.join aptible_config_path, 'ssh'
         end
 
         def ssh_config_file

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

@@ -1,9 +1,13 @@
 require 'aptible/auth'
 
+require_relative 'config_path'
+
 module Aptible
   module CLI
     module Helpers
       module Token
+        include Helpers::ConfigPath
+
         TOKEN_ENV_VAR = 'APTIBLE_ACCESS_TOKEN'.freeze
 
         def fetch_token
@@ -40,7 +44,7 @@ module Aptible
         end
 
         def token_file
-          File.join ENV['HOME'], '.aptible', 'tokens.json'
+          File.join(aptible_config_path, 'tokens.json').freeze
         end
       end
     end

data/lib/aptible/cli/resource_formatter.rb

@@ -5,8 +5,17 @@ module Aptible
         NO_NESTING = Object.new.freeze
 
         def inject_backup(node, backup, include_db: false)
+          origin = if backup.manual && !backup.copied_from
+                     "manual, #{backup.created_from_operation.user_email}"
+                   elsif backup.manual && backup.copied_from
+                     'manual, copy'
+                   elsif backup.copied_from
+                     'automatic, copy'
+                   else
+                     'automatic'
+                   end
           description = "#{backup.id}: #{backup.created_at}, " \
-                        "#{backup.aws_region}"
+                        "#{backup.aws_region}, #{origin}"
 
           if include_db
             db = backup.database_with_deleted
@@ -30,6 +39,13 @@ module Aptible
               inject_backup(n, backup.copied_from)
             end
           end
+
+          if backup.created_from_operation && \
+             backup.manual && !backup.copied_from
+            node.keyed_object('created_from_operation', 'id') do |n|
+              inject_operation(n, backup.created_from_operation)
+            end
+          end
         end
 
         def inject_deleted_database(node, database, account)
@@ -49,7 +65,9 @@ module Aptible
         def inject_operation(node, operation)
           node.value('id', operation.id)
           node.value('status', operation.status)
-          node.value('git_ref', operation.git_ref)
+          if %w(deploy rebuild).include?(operation.type)
+            node.value('git_ref', operation.git_ref)
+          end
           node.value('user_email', operation.user_email)
           node.value('created_at', operation.created_at)
         end

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

@@ -279,7 +279,7 @@ module Aptible
             end
 
             desc 'db:restart HANDLE ' \
-                 '[--container-size SIZE_MB] [--disk-size SIZE_GB]' \
+                 '[--container-size SIZE_MB] [--disk-size SIZE_GB] ' \
                  '[--iops IOPS] [--volume-type [gp2, gp3]]',
                  'Restart a database'
             option :environment

data/lib/aptible/cli/version.rb

@@ -1,5 +1,5 @@
 module Aptible
   module CLI
-    VERSION = '0.18.2'.freeze
+    VERSION = '0.18.3'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aptible-cli
 version: !ruby/object:Gem::Version
-  version: 0.18.2
+  version: 0.18.3
 platform: ruby
 authors:
 - Frank Macreery
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-09 00:00:00.000000000 Z
+date: 2021-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aptible-resource
@@ -274,6 +274,7 @@ files:
 - lib/aptible/cli/formatter/value.rb
 - lib/aptible/cli/helpers/app.rb
 - 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/environment.rb
 - lib/aptible/cli/helpers/operation.rb