aptible-cli 0.16.0 → 0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b00cbbd2d4b78975a40cbfad564c786b8b8207f607f9aaefb7f3bc6a51c3d236
-  data.tar.gz: af11c4fc2c3de4eaabfe2388219f1dc1a96b07bb1a31d6863230b939419a184c
+  metadata.gz: d7a82ca8dc7db1d4eb55e92d7a78f8dda19f3b0e868d913695f9a974079cdf45
+  data.tar.gz: b043caa7662d1406a445e53e02daecdeb08e17a2fadeb448f94155091ac8c6d8
 SHA512:
-  metadata.gz: c7036bfeb4453f5981de53598a6fb7306775d40fe4d4c93c251876e0528cf6ed7ddbc5ec7322ee8829fbe4d449264fba799ba4451b42c7258ab038b19f3985e3
-  data.tar.gz: 43079246baff7cac2611d2f14c145d3e5bb2956dff8514839c473afc59dc80db1239aaabf9c1bedc587591d34d3983f19a2b44b78061d349a15cf2eebbde4314
+  metadata.gz: 1d70a4ebaf642e840db0ec5bdfc287a5ca692cf4113173251e6480818b29ad70ee83792672f601a41495b8c55312196835a3e7b12b9364290f95191fae1c2f7c
+  data.tar.gz: f3c1b30a29637d5f872349e45d54d8ce0856a2a467039483bb4cfac872204c15cb2d249650acb5debb7274584aa176459750473ca5cc2d6dc01e63435ce6042b

data/README.md

@@ -44,7 +44,7 @@ Commands:
   aptible db:clone SOURCE DEST                                                                                                       # Clone a database to create a new one
   aptible db:create HANDLE [--type TYPE] [--version VERSION] [--container-size SIZE_MB] [--size SIZE_GB]                             # Create a new database
   aptible db:deprovision HANDLE                                                                                                      # Deprovision a database
-  aptible db:dump HANDLE                                                                                                             # Dump a remote database to file
+  aptible db:dump HANDLE [pg_dump options]                                                                                           # Dump a remote database to file
   aptible db:execute HANDLE SQL_FILE                                                                                                 # Executes sql against a database
   aptible db:list                                                                                                                    # List all databases
   aptible db:reload HANDLE                                                                                                           # Reload a database

data/lib/aptible/cli/resource_formatter.rb

@@ -9,6 +9,14 @@ module Aptible
           node.value('handle', account.handle)
         end
 
+        def inject_operation(node, operation)
+          node.value('id', operation.id)
+          node.value('status', operation.status)
+          node.value('git_ref', operation.git_ref)
+          node.value('user_email', operation.user_email)
+          node.value('created_at', operation.created_at)
+        end
+
         def inject_app(node, app, account)
           node.value('id', app.id)
           node.value('handle', app.handle)
@@ -16,6 +24,12 @@ module Aptible
           node.value('status', app.status)
           node.value('git_remote', app.git_repo)
 
+          if app.last_deploy_operation
+            node.keyed_object('last_deploy_operation', 'id') do |n|
+              inject_operation(n, app.last_deploy_operation)
+            end
+          end
+
           node.list('services') do |services_list|
             app.each_service do |service|
               services_list.object do |n|

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

@@ -119,7 +119,15 @@ module Aptible
             define_method 'apps:deprovision' do
               app = ensure_app(options)
               CLI.logger.info "Deprovisioning #{app.handle}..."
-              app.create_operation!(type: 'deprovision')
+              op = app.create_operation!(type: 'deprovision')
+              begin
+                attach_to_operation_logs(op)
+              rescue HyperResource::ClientError => e
+                # A 404 here means that the operation completed successfully,
+                # and was removed faster than attach_to_operation_logs
+                # could attach to the logs.
+                raise if e.response.status != 404
+              end
             end
           end
         end

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

@@ -113,14 +113,15 @@ module Aptible
               render_database(database, database.account)
             end
 
-            desc 'db:dump HANDLE', 'Dump a remote database to file'
+            desc 'db:dump HANDLE [pg_dump options]',
+                 'Dump a remote database to file'
             option :environment
-            define_method 'db:dump' do |handle|
+            define_method 'db:dump' do |handle, *dump_options|
               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} > #{filename}`
+                `pg_dump #{url} #{dump_options.shelljoin} > #{filename}`
               end
             end
 
@@ -184,7 +185,15 @@ module Aptible
             define_method 'db:deprovision' do |handle|
               database = ensure_database(options.merge(db: handle))
               CLI.logger.info "Deprovisioning #{database.handle}..."
-              database.create_operation!(type: 'deprovision')
+              op = database.create_operation!(type: 'deprovision')
+              begin
+                attach_to_operation_logs(op)
+              rescue HyperResource::ClientError => e
+                # A 404 here means that the operation completed successfully,
+                # and was removed faster than attach_to_operation_logs
+                # could attach to the logs.
+                raise if e.response.status != 404
+              end
             end
 
             desc 'db:backup HANDLE', 'Backup a database'

data/lib/aptible/cli/version.rb

@@ -1,5 +1,5 @@
 module Aptible
   module CLI
-    VERSION = '0.16.0'.freeze
+    VERSION = '0.16.1'.freeze
   end
 end

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

@@ -133,6 +133,40 @@ describe Aptible::CLI::Agent do
 
       expect(captured_output_json).to eq(expected_json)
     end
+
+    it 'includes the last deploy operation in JSON' do
+      account = Fabricate(:account, handle: 'account')
+      op = Fabricate(:operation, type: 'deploy', status: 'succeeded')
+      app = Fabricate(:app, account: account, handle: 'app',
+                            last_deploy_operation: op)
+      allow(Aptible::Api::Account).to receive(:all).and_return([account])
+
+      expected_json = [
+        {
+          'environment' => {
+            'id' => account.id,
+            'handle' => account.handle
+          },
+          'handle' => app.handle,
+          'id' => app.id,
+          'status' => app.status,
+          'git_remote' => app.git_repo,
+          'last_deploy_operation' =>
+            {
+              'id' => op.id,
+              'status' => op.status,
+              'git_ref' => op.git_ref,
+              'user_email' => op.user_email,
+              'created_at' => op.created_at
+            },
+          'services' => []
+        }
+      ]
+
+      subject.send('apps')
+
+      expect(captured_output_json).to eq(expected_json)
+    end
   end
 
   describe '#apps:create' do
@@ -305,7 +339,18 @@ describe Aptible::CLI::Agent do
       expect(app).to receive(:create_operation!)
         .with(type: 'deprovision').and_return(operation)
 
-      expect(subject).not_to receive(:attach_to_operation_logs)
+      expect(subject).to receive(:attach_to_operation_logs).with(operation)
+
+      subject.send('apps:deprovision')
+    end
+    it 'does not fail if the operation cannot be found' do
+      expect(app).to receive(:create_operation!)
+        .with(type: 'deprovision').and_return(operation)
+
+      response = Faraday::Response.new(status: 404)
+      error = HyperResource::ClientError.new('Not Found', response: response)
+      expect(subject).to receive(:attach_to_operation_logs).with(operation)
+        .and_raise(error)
 
       subject.send('apps:deprovision')
     end

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

@@ -439,6 +439,73 @@ describe Aptible::CLI::Agent do
     end
   end
 
+  describe '#db:dump' do
+    it 'should fail if database is non-existent' do
+      allow(Aptible::Api::Database).to receive(:all) { [] }
+      expect do
+        subject.send('db:dump', handle)
+      end.to raise_error("Could not find database #{handle}")
+    end
+
+    context 'valid database' do
+      before do
+        allow(Aptible::Api::Database).to receive(:all) { [database] }
+        allow(subject).to receive(:`).with(/pg_dump .*/)
+      end
+
+      it 'prints a message indicating the dump is happening' do
+        cred = Fabricate(:database_credential, default: true, type: 'foo',
+                                               database: database)
+
+        expect(subject).to receive(:with_local_tunnel).with(cred)
+          .and_yield(socat_helper)
+
+        subject.send('db:dump', handle)
+
+        expect(captured_logs)
+          .to match(/Dumping to foobar.dump/i)
+      end
+
+      it 'invokes pg_dump with the tunnel url' do
+        cred = Fabricate(:database_credential, default: true, type: 'foo',
+                                               database: database)
+
+        expect(subject).to receive(:with_local_tunnel).with(cred)
+          .and_yield(socat_helper)
+
+        local_url = 'postgresql://aptible:password@localhost.aptible.in:4242/db'
+
+        expect(subject).to receive(:`)
+          .with(/pg_dump #{local_url}  > foobar.dump/)
+
+        subject.send('db:dump', handle)
+      end
+
+      it 'sends extra options if given' do
+        cred = Fabricate(:database_credential, default: true, type: 'foo',
+                                               database: database)
+
+        expect(subject).to receive(:with_local_tunnel).with(cred)
+          .and_yield(socat_helper)
+
+        pg_dump_options = '--exclude-table-data=events ' \
+                          '--exclude-table-data=versions'
+        allow(subject).to receive(:`).with(/pg_dump .* #{pg_dump_options} .*/)
+
+        subject.send('db:dump', handle,
+                     '--exclude-table-data=events',
+                     '--exclude-table-data=versions')
+      end
+
+      it 'fails when the database is not provisioned' do
+        allow(database).to receive(:status) { 'pending' }
+
+        expect { subject.send('db:dump', handle) }
+          .to raise_error(/foobar is not provisioned/im)
+      end
+    end
+  end
+
   describe '#db:deprovision' do
     before { expect(Aptible::Api::Database).to receive(:all) { [database] } }
 
@@ -448,7 +515,18 @@ describe Aptible::CLI::Agent do
       expect(database).to receive(:create_operation!)
         .with(type: 'deprovision').and_return(operation)
 
-      expect(subject).not_to receive(:attach_to_operation_logs)
+      expect(subject).to receive(:attach_to_operation_logs).with(operation)
+
+      subject.send('db:deprovision', handle)
+    end
+
+    it 'does not fail if the operation cannot be found' do
+      expect(database).to receive(:create_operation!)
+        .with(type: 'deprovision').and_return(operation)
+      response = Faraday::Response.new(status: 404)
+      error = HyperResource::ClientError.new('Not Found', response: response)
+      expect(subject).to receive(:attach_to_operation_logs).with(operation)
+        .and_raise(error)
 
       subject.send('db:deprovision', handle)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aptible-cli
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.16.1
 platform: ruby
 authors:
 - Frank Macreery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-15 00:00:00.000000000 Z
+date: 2018-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aptible-resource