aptible-cli 0.7.5 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a46c716db34062c50939791b35288542ab1dacc4
-  data.tar.gz: 54293b621aba536d05c4ea25740fe61530e9209f
+  metadata.gz: fe2b01937188ac5154d4b1f3ad75c4b614099f6b
+  data.tar.gz: 34b46d94e014464efab70894071fbe79e0db388d
 SHA512:
-  metadata.gz: 35fadaf8062518242be514c26c66f406cb9f3ebf79128986852a4a51ef84365610f5058b90fbdcf426a18e5bfc68d4ec3afd03935b6e08d9955961bc1f24d0bb
-  data.tar.gz: 96a7acb0ac08381a76753035670d6e26f3d72347ce1b5c2f64f7259a960b73ad12de3e35aedd0b30890a7d2701785059f45218a107fc35a6626106875aafe367
+  metadata.gz: 621652b7947a133f0c5a3981238f1537eba48b18db5f45dbbd26ad492c6480636b76086b7ceb7541df789469770aef204fcf98c996b757d6c1aa63e74a377193
+  data.tar.gz: f7497688bb7fa6a4c9c612b8414d2afe040fb1a66e350be1042f6e135728b6120a0831c0b14e00bea9b38325006f2c1d2c060a3ffae3d0129bb6537f41e26d28

data/aptible-cli.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{spec/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'aptible-api', '~> 0.9.7'
+  spec.add_dependency 'aptible-api', '~> 0.9.14'
   spec.add_dependency 'aptible-auth', '~> 0.11.8'
   spec.add_dependency 'aptible-resource', '~> 0.3.6'
   spec.add_dependency 'thor', '~> 0.19.1'
@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'aptible-tasks', '>= 0.2.0'
   spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec', '~> 2.0'
+  spec.add_development_dependency 'rspec', '~> 3.2'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'climate_control'
   spec.add_development_dependency 'fabrication', '~> 2.15.2'

data/lib/aptible/cli/agent.rb

@@ -21,6 +21,7 @@ require_relative 'subcommands/rebuild'
 require_relative 'subcommands/restart'
 require_relative 'subcommands/ssh'
 require_relative 'subcommands/backup'
+require_relative 'subcommands/operation'
 
 module Aptible
   module CLI
@@ -28,6 +29,7 @@ module Aptible
       include Thor::Actions
 
       include Helpers::Token
+      include Helpers::Ssh
       include Subcommands::Apps
       include Subcommands::Config
       include Subcommands::DB
@@ -38,6 +40,7 @@ module Aptible
       include Subcommands::Restart
       include Subcommands::SSH
       include Subcommands::Backup
+      include Subcommands::Operation
 
       # Forward return codes on failures.
       def self.exit_on_failure?

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

@@ -55,12 +55,19 @@ module Aptible
         # Creates a local tunnel and yields the helper
 
         def with_local_tunnel(database, port = 0)
-          tunnel_helper = Helpers::Tunnel.new(ssh_env(database),
-                                              ssh_args(database))
+          op = database.create_operation!(type: 'tunnel', status: 'succeeded')
 
-          tunnel_helper.start(port)
-          yield tunnel_helper if block_given?
-          tunnel_helper.stop
+          with_ssh_cmd(op) do |base_ssh_cmd, credential|
+            ssh_cmd = base_ssh_cmd + ['-o', 'SendEnv=ACCESS_TOKEN']
+            ssh_env = { 'ACCESS_TOKEN' => fetch_token }
+
+            socket_path = credential.ssh_port_forward_socket
+            tunnel_helper = Helpers::Tunnel.new(ssh_env, ssh_cmd, socket_path)
+
+            tunnel_helper.start(port)
+            yield tunnel_helper if block_given?
+            tunnel_helper.stop
+          end
         end
 
         # Creates a local PG tunnel and yields the url to it
@@ -84,20 +91,6 @@ module Aptible
           "#{uri.scheme}://#{uri.user}:#{uri.password}@" \
           "localhost.aptible.in:#{local_port}#{uri.path}"
         end
-
-        def ssh_env(database)
-          {
-            'ACCESS_TOKEN' => fetch_token,
-            'APTIBLE_DATABASE' => database.href
-          }
-        end
-
-        def ssh_args(database)
-          broadwayjoe_ssh_command(database.account) + [
-            '-o', 'SendEnv=ACCESS_TOKEN',
-            '-o', 'SendEnv=APTIBLE_DATABASE'
-          ]
-        end
       end
     end
   end

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

@@ -11,8 +11,8 @@ module Aptible
         def poll_for_success(operation)
           wait_for_completion operation
           return if operation.status == 'succeeded'
-          fail Thor::Error,
-               'Operation failed. Please contact support@aptible.com'
+
+          fail Thor::Error, "Operation ##{operation.id} failed."
         end
 
         def wait_for_completion(operation)
@@ -23,23 +23,34 @@ module Aptible
         end
 
         def attach_to_operation_logs(operation)
+          # TODO: This isn't actually guaranteed to connect to the operation
+          # logs, since the action will depend on what operation we're actually
+          # connecting for. There might be ways to make this better.
           ENV['ACCESS_TOKEN'] = fetch_token
-          ENV['APTIBLE_OPERATION'] = operation.id.to_s
-          ENV['APTIBLE_CLI_COMMAND'] = 'oplog'
-
-          cmd = dumptruck_ssh_command(operation.resource.account) + [
-            '-o', 'SendEnv=ACCESS_TOKEN',
-            '-o', 'SendEnv=APTIBLE_OPERATION',
-            '-o', 'SendEnv=APTIBLE_CLI_COMMAND'
-          ]
 
-          success = Kernel.system(*cmd)
+          success = connect_to_ssh_portal(
+            operation,
+            '-o', 'SendEnv=ACCESS_TOKEN'
+          )
 
-          # If Dumptruck is down, fall back to polling for success. If the
+          # If the portal is down, fall back to polling for success. If the
           # operation failed, poll_for_success will immediately fall through to
           # the error message.
           poll_for_success(operation) unless success
         end
+
+        def cancel_operation(operation)
+          puts "Cancelling #{prettify_operation(operation)}..."
+          operation.update!(cancelled: true)
+        end
+
+        def prettify_operation(o)
+          bits = [o.status, o.type, "##{o.id}"]
+          if o.resource.respond_to?(:handle)
+            bits.concat ['on', o.resource.handle]
+          end
+          bits.join ' '
+        end
       end
     end
   end

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

@@ -2,23 +2,80 @@ module Aptible
   module CLI
     module Helpers
       module Ssh
-        def dumptruck_ssh_command(account)
-          base_ssh_command(account, :dumptruck_port)
+        def connect_to_ssh_portal(operation, *extra_ssh_args)
+          # TODO: Should we rescue Interrupt here?
+          with_ssh_cmd(operation) do |base_ssh_cmd|
+            ssh_cmd = base_ssh_cmd + extra_ssh_args
+            Kernel.system(*ssh_cmd)
+          end
         end
 
-        def broadwayjoe_ssh_command(account)
-          base_ssh_command(account, :bastion_port)
+        def with_ssh_cmd(operation)
+          ensure_ssh_dir!
+          ensure_config!
+          ensure_key!
+
+          operation.with_ssh_cmd(private_key_file) do |cmd, connection|
+            yield cmd + common_ssh_args, connection
+          end
         end
 
         private
 
-        def base_ssh_command(account, port_method)
+        def ensure_ssh_dir!
+          FileUtils.mkdir_p(ssh_dir, mode: 0o700)
+        end
+
+        def ensure_config!
+          return if File.exist?(ssh_config_file)
+          File.open(ssh_config_file, 'w', 0o600) { |f| f.write('') }
+        end
+
+        def ensure_key!
+          key_files = [private_key_file, public_key_file]
+          return if key_files.all? { |f| File.exist?(f) }
+
+          # If we're missing *some* files, then we should clean them up.
+
+          # rubocop:disable Lint/HandleExceptions
+          key_files.each do |key_file|
+            begin
+              File.delete(key_file)
+            rescue Errno::ENOENT
+              # We don't care, that's what we want.
+            end
+          end
+          # rubocop:enable Lint/HandleExceptions
+
+          begin
+            cmd = ['ssh-keygen', '-t', 'rsa', '-N', '', '-f', private_key_file]
+            out, status = Open3.capture2e(*cmd)
+            raise "Failed to generate ssh key: #{out}" unless status.success?
+          rescue Errno::ENOENT
+            raise 'ssh-keygen must be installed'
+          end
+        end
+
+        def ssh_dir
+          File.join ENV['HOME'], '.aptible', 'ssh'
+        end
+
+        def ssh_config_file
+          File.join ssh_dir, 'config'
+        end
+
+        def private_key_file
+          File.join ssh_dir, 'id_rsa'
+        end
+
+        def public_key_file
+          "#{private_key_file}.pub"
+        end
+
+        def common_ssh_args
           log_level = ENV['APTIBLE_SSH_VERBOSE'] ? 'VERBOSE' : 'ERROR'
 
           [
-            'ssh',
-            "root@#{account.bastion_host}",
-            '-p', account.public_send(port_method).to_s,
             '-o', 'StrictHostKeyChecking=no',
             '-o', 'UserKnownHostsFile=/dev/null',
             '-o', 'TCPKeepAlive=yes',
@@ -26,7 +83,8 @@ module Aptible
             '-o', 'ServerAliveInterval=60',
             '-o', "LogLevel=#{log_level}",
             '-o', 'ControlMaster=no',
-            '-o', 'ControlPath=none'
+            '-o', 'ControlPath=none',
+            '-F', ssh_config_file
           ]
         end
       end

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

@@ -23,40 +23,25 @@ module Aptible
                     end
 
       class Tunnel
-        def initialize(env, ssh_cmd)
+        def initialize(env, ssh_cmd, socket_path)
           @env = env
           @ssh_cmd = ssh_cmd
+          @socket_path = socket_path
         end
 
         def start(desired_port = 0)
           @local_port = desired_port
           @local_port = random_local_port if @local_port.zero?
 
-          # First, grab a remote port
-          out, err, status = Open3.capture3(@env, *@ssh_cmd)
-          fail "Failed to request remote port: #{err}" unless status.success?
-          remote_port = out.chomp
-
-          # Then, spin up a SSH session using that port and port forwarding.
-          # Pass ExitOnForwardFailure to ensure nothing else can be listening
-          # on this port (thanks to Diego Argueta for reporting this issue).
-          tunnel_env = @env.merge(
-            'TUNNEL_PORT' => remote_port, # Request a specific port
-            'TUNNEL_SIGNAL_OPEN' => '1'   # Request signal when tunnel is up
-          )
-
-          # TODO: Dynamically compose SendEnv from tunnel_env
           tunnel_cmd = @ssh_cmd + [
-            '-L', "#{@local_port}:localhost:#{remote_port}",
-            '-o', 'SendEnv=TUNNEL_PORT',
-            '-o', 'SendEnv=TUNNEL_SIGNAL_OPEN',
+            '-L', "#{@local_port}:#{@socket_path}",
             '-o', 'ExitOnForwardFailure=yes'
           ]
 
           out_read, out_write = IO.pipe
           err_read, err_write = IO.pipe
 
-          @pid = Process.spawn(tunnel_env, *tunnel_cmd, SPAWN_OPTS
+          @pid = Process.spawn(@env, *tunnel_cmd, SPAWN_OPTS
             .merge(in: :close, out: out_write, err: err_write))
 
           # Wait for the tunnel to come up before returning. The other end

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

@@ -8,27 +8,33 @@ module Aptible
           thor.class_eval do
             include Helpers::Operation
             include Helpers::App
+            include Helpers::Database
 
-            desc 'logs', 'Follows logs from a running app'
+            desc 'logs', 'Follows logs from a running app or database'
             app_options
+            option :database
             def logs
-              app = ensure_app(options)
-              unless app.status == 'provisioned' && app.services.any?
-                fail Thor::Error, 'Unable to retrieve logs. ' \
-                                  "Have you deployed #{app.handle} yet?"
+              if options[:app] && options[:database]
+                m = 'You must specify only one of --app and --database'
+                fail Thor::Error, m
               end
 
-              ENV['ACCESS_TOKEN'] = fetch_token
-              ENV['APTIBLE_APP'] = app.href
-              ENV['APTIBLE_CLI_COMMAND'] = 'logs'
+              resource = \
+                if options[:database]
+                  ensure_database(options.merge(db: options[:database]))
+                else
+                  ensure_app(options)
+                end
+
+              unless resource.status == 'provisioned'
+                fail Thor::Error, 'Unable to retrieve logs. ' \
+                                  "Have you deployed #{resource.handle} yet?"
+              end
 
-              cmd = dumptruck_ssh_command(app.account) + [
-                '-o', 'SendEnv=ACCESS_TOKEN',
-                '-o', 'SendEnv=APTIBLE_APP',
-                '-o', 'SendEnv=APTIBLE_CLI_COMMAND'
-              ]
+              op = resource.create_operation!(type: 'logs', status: 'succeeded')
 
-              Kernel.exec(*cmd)
+              ENV['ACCESS_TOKEN'] = fetch_token
+              connect_to_ssh_portal(op, '-o', 'SendEnv=ACCESS_TOKEN', '-T')
             end
           end
         end

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

@@ -0,0 +1,23 @@
+module Aptible
+  module CLI
+    module Subcommands
+      module Operation
+        def self.included(thor)
+          thor.class_eval do
+            include Helpers::Token
+            include Helpers::Operation
+
+            desc 'operation:cancel OPERATION_ID', 'Cancel a running operation'
+            define_method 'operation:cancel' do |operation_id|
+              o = Aptible::Api::Operation.find(operation_id, token: fetch_token)
+              fail "Operation ##{operation_id} not found" if o.nil?
+
+              puts "Requesting cancellation on #{prettify_operation(o)}..."
+              o.update!(cancelled: true)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -12,20 +12,15 @@ module Aptible
             desc 'ps', 'Display running processes for an app - DEPRECATED'
             app_options
             def ps
-              app = ensure_app(options)
               deprecated('This command is deprecated on Aptible v2 stacks.')
 
-              ENV['ACCESS_TOKEN'] = fetch_token
-              ENV['APTIBLE_APP'] = app.href
-              ENV['APTIBLE_CLI_COMMAND'] = 'ps'
+              app = ensure_app(options)
 
-              cmd = dumptruck_ssh_command(app.account) + [
-                '-o', 'SendEnv=ACCESS_TOKEN',
-                '-o', 'SendEnv=APTIBLE_APP',
-                '-o', 'SendEnv=APTIBLE_CLI_COMMAND'
-              ]
+              op = app.create_operation!(type: 'ps', status: 'succeeded')
 
-              Kernel.exec(*cmd)
+              ENV['ACCESS_TOKEN'] = fetch_token
+              opts = ['-o', 'SendEnv=ACCESS_TOKEN']
+              connect_to_ssh_portal(op, *opts)
             end
           end
         end

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

@@ -8,7 +8,6 @@ module Aptible
           thor.class_eval do
             include Helpers::Operation
             include Helpers::App
-            include Helpers::Ssh
 
             desc 'ssh [COMMAND]', 'Run a command against an app'
             long_desc <<-LONGDESC
@@ -21,18 +20,14 @@ module Aptible
             def ssh(*args)
               app = ensure_app(options)
 
-              ENV['ACCESS_TOKEN'] = fetch_token
-              ENV['APTIBLE_APP'] = app.href
-              ENV['APTIBLE_COMMAND'] = command_from_args(*args)
-
-              cmd = broadwayjoe_ssh_command(app.account) + [
-                '-o', 'SendEnv=ACCESS_TOKEN',
-                '-o', 'SendEnv=APTIBLE_APP',
-                '-o', 'SendEnv=APTIBLE_COMMAND'
-              ]
-              cmd << '-tt' if options[:force_tty]
+              op = app.create_operation!(type: 'execute',
+                                         command: command_from_args(*args),
+                                         status: 'succeeded')
 
-              Kernel.exec(*cmd)
+              ENV['ACCESS_TOKEN'] = fetch_token
+              opts = ['-o', 'SendEnv=ACCESS_TOKEN']
+              opts << '-tt' if options[:force_tty]
+              connect_to_ssh_portal(op, *opts)
             end
 
             private

data/lib/aptible/cli/version.rb

@@ -1,5 +1,5 @@
 module Aptible
   module CLI
-    VERSION = '0.7.5'.freeze
+    VERSION = '0.8.0'.freeze
   end
 end

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

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe Aptible::CLI::Helpers::Operation do
+  subject { Class.new.send(:include, described_class).new }
+
+  describe '#prettify_operation' do
+    it 'works for app operations' do
+      op = Fabricate(:operation, id: 123, type: 'deploy', status: 'running',
+                                 resource: Fabricate(:app, handle: 'myapp'))
+
+      expect(subject.prettify_operation(op))
+        .to eq('running deploy #123 on myapp')
+    end
+
+    it 'works for backup operations' do
+      op = Fabricate(:operation, id: 123, type: 'restore', status: 'queued',
+                                 resource: Fabricate(:backup))
+
+      expect(subject.prettify_operation(op))
+        .to eq('queued restore #123')
+    end
+  end
+end

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

@@ -0,0 +1,92 @@
+require 'spec_helper'
+
+describe Aptible::CLI::Helpers::Ssh do
+  let!(:work_dir) { Dir.mktmpdir }
+  after { FileUtils.remove_entry work_dir }
+  around { |example| ClimateControl.modify(HOME: work_dir) { example.run } }
+
+  subject { Class.new.send(:include, described_class).new }
+
+  let(:ssh_dir) { File.join(work_dir, '.aptible', 'ssh') }
+  let(:config_file) { File.join(ssh_dir, 'config') }
+  let(:private_key_file) { File.join(ssh_dir, 'id_rsa') }
+  let(:public_key_file) { "#{private_key_file}.pub" }
+
+  describe '#ensure_ssh_dir!' do
+    it 'creates the directory' do
+      subject.send(:ensure_ssh_dir!)
+      expect(Dir.exist?(ssh_dir)).to be_truthy
+    end
+
+    it 'works if the directory already exists' do
+      subject.send(:ensure_ssh_dir!)
+      subject.send(:ensure_ssh_dir!)
+    end
+  end
+
+  describe '#ensure_config!' do
+    before { subject.send(:ensure_ssh_dir!) }
+
+    it 'creates the config file' do
+      subject.send(:ensure_config!)
+      expect(File.exist?(config_file)).to be_truthy
+    end
+  end
+
+  describe '#ensure_key!' do
+    before { subject.send(:ensure_ssh_dir!) }
+
+    it 'creates the key if it does not exist' do
+      subject.send(:ensure_key!)
+
+      expect(File.exist?(private_key_file)).to be_truthy
+      expect(File.exist?(public_key_file)).to be_truthy
+    end
+
+    it 'does not recreate the key if it already exists' do
+      subject.send(:ensure_key!)
+      k1 = File.read(private_key_file)
+      subject.send(:ensure_key!)
+      k2 = File.read(private_key_file)
+
+      expect(k2).to eq(k1)
+    end
+
+    it 'recreates the key if either part is missing' do
+      subject.send(:ensure_key!)
+      k1 = File.read(private_key_file)
+      File.delete(private_key_file)
+
+      subject.send(:ensure_key!)
+      k2 = File.read(private_key_file)
+      File.delete(public_key_file)
+
+      subject.send(:ensure_key!)
+      k3 = File.read(private_key_file)
+
+      expect(k2).not_to eq(k1)
+      expect(k3).not_to eq(k2)
+    end
+  end
+
+  describe '#with_ssh_cmd' do
+    it 'delegates and yields usable SSH parameters' do
+      operation = double('operation')
+      connection = double('connection')
+
+      expect(operation).to receive(:with_ssh_cmd).with(private_key_file)
+        .and_yield(['some-ssh'], connection)
+
+      has_yielded = false
+
+      subject.with_ssh_cmd(operation) do |cmd, c|
+        expect(cmd).to include('some-ssh')
+        expect(cmd).to include(config_file)
+        expect(c).to be(connection)
+        has_yielded = true
+      end
+
+      expect(has_yielded).to be_truthy
+    end
+  end
+end

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

@@ -3,56 +3,48 @@ require 'spec_helper'
 describe Aptible::CLI::Helpers::Tunnel do
   include_context 'mock ssh'
 
-  it 'forwards traffic to the remote port given by the server (1234)' do
-    helper = described_class.new({}, ['ssh'])
+  it 'opens a tunnel' do
+    helper = described_class.new({}, ['ssh'], '/some.sock')
 
     helper.start(0)
     helper.stop
 
     mock_argv = read_mock_argv
-    expect(mock_argv.size).to eq(8)
+    expect(mock_argv.size).to eq(4)
 
     expect(mock_argv.shift).to eq('-L')
-    expect(mock_argv.shift).to match(/\d+:localhost:1234$/)
-    expect(mock_argv.shift).to eq('-o')
-    expect(mock_argv.shift).to eq('SendEnv=TUNNEL_PORT')
-    expect(mock_argv.shift).to eq('-o')
-    expect(mock_argv.shift).to eq('SendEnv=TUNNEL_SIGNAL_OPEN')
+    expect(mock_argv.shift).to match(%r{\d+:/some\.sock$})
     expect(mock_argv.shift).to eq('-o')
     expect(mock_argv.shift).to eq('ExitOnForwardFailure=yes')
   end
 
   it 'accepts a desired local port' do
-    helper = described_class.new({}, ['ssh'])
+    helper = described_class.new({}, ['ssh'], '/some.sock')
     helper.start(5678)
     helper.stop
 
     mock_argv = read_mock_argv
-    expect(mock_argv.size).to eq(8)
+    expect(mock_argv.size).to eq(4)
 
     expect(mock_argv.shift).to eq('-L')
-    expect(mock_argv.shift).to eq('5678:localhost:1234')
-  end
-
-  it 'captures and displays port discovery errors' do
-    helper = described_class.new({ 'FAIL_PORT' => '1' }, ['ssh'])
-    expect { helper.start }
-      .to raise_error(/Failed to request.*Something went wrong/m)
+    expect(mock_argv.shift).to eq('5678:/some.sock')
   end
 
   it 'captures and displays tunnel errors' do
-    helper = described_class.new({ 'FAIL_TUNNEL' => '1' }, ['ssh'])
+    helper = described_class.new({ 'FAIL_TUNNEL' => '1' }, ['ssh'],
+                                 '/some.sock')
+
     expect { helper.start(0) }
       .to raise_error(/Tunnel did not come up.*Something went wrong/m)
   end
 
   it 'should fail if #port is called before #start' do
-    socat = described_class.new({}, [])
+    socat = described_class.new({}, [], '/some.sock')
     expect { socat.port }.to raise_error(/You must call #start/)
   end
 
   it 'should fail if #stop is called before #start' do
-    socat = described_class.new({}, [])
+    socat = described_class.new({}, [], '/some.sock')
     expect { socat.stop }.to raise_error(/You must call #start/)
   end
 end

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

@@ -3,26 +3,59 @@ require 'spec_helper'
 describe Aptible::CLI::Agent do
   before { subject.stub(:ask) }
   before { subject.stub(:save_token) }
-  before { subject.stub(:fetch_token) { double 'token' } }
+  before { subject.stub(:fetch_token) { 'some token' } }
 
-  let!(:app) { Fabricate(:app, handle: 'foobar') }
-  let!(:service) { Fabricate(:service, app: app) }
+  let(:app) { Fabricate(:app, handle: 'foo') }
+  let(:database) { Fabricate(:database, handle: 'bar', status: 'provisioned') }
+  let(:service) { Fabricate(:service, app: app) }
 
   describe '#logs' do
     before { allow(Aptible::Api::Account).to receive(:all) { [app.account] } }
-    before { allow(Aptible::Api::App).to receive(:all) { [app] } }
-    before { subject.options = { app: app.handle } }
 
-    it 'should fail if the app is unprovisioned' do
-      app.status = 'pending'
-      expect { subject.send('logs') }
-        .to raise_error(Thor::Error, /Have you deployed foobar yet/)
+    context 'App resource' do
+      before { allow(Aptible::Api::App).to receive(:all) { [app] } }
+      before { subject.options = { app: app.handle } }
+
+      it 'should fail if the app is unprovisioned' do
+        app.status = 'pending'
+        expect { subject.send('logs') }
+          .to raise_error(Thor::Error, /Have you deployed foo yet/)
+      end
+
+      it 'create a logs operation and connect to the SSH portal' do
+        op = double('operation')
+        expect(app).to receive(:create_operation!).with(
+          type: 'logs', status: 'succeeded'
+        ).and_return(op)
+        expect(subject).to receive(:connect_to_ssh_portal).with(op, any_args)
+        subject.send('logs')
+      end
     end
 
-    it 'should fail if the app has no services' do
-      app.services = []
-      expect { subject.send('logs') }
-        .to raise_error(Thor::Error, /Have you deployed foobar yet/)
+    context 'Database resource' do
+      before { allow(Aptible::Api::Database).to receive(:all) { [database] } }
+      before { subject.options = { database: database.handle } }
+
+      it 'should fail if the database is unprovisioned' do
+        database.status = 'pending'
+        expect { subject.send('logs') }
+          .to raise_error(Thor::Error, /Have you deployed bar yet/)
+      end
+
+      it 'create a logs operation and connect to the SSH portal' do
+        op = double('operation')
+        expect(database).to receive(:create_operation!).with(
+          type: 'logs', status: 'succeeded'
+        ).and_return(op)
+        expect(subject).to receive(:connect_to_ssh_portal).with(op, any_args)
+        subject.send('logs')
+      end
+    end
+
+    it 'should fail when passed both --app and --database' do
+      subject.options = { app: 'foo', database: 'bar' }
+
+      expect { subject.send(:logs) }.to raise_error(/only one of/im)
     end
   end
 end

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

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe Aptible::CLI::Agent do
+  let(:token) { 'some-token' }
+  let(:operation) { Fabricate(:operation) }
+
+  before do
+    allow(subject).to receive(:fetch_token).and_return(token)
+    allow(subject).to receive(:say) { |m| messages << m }
+  end
+
+  describe '#operation:cancel' do
+    it 'fails if the operation cannot be found' do
+      expect(Aptible::Api::Operation).to receive(:find).with(1, token: token)
+        .and_return(nil)
+
+      expect { subject.send('operation:cancel', 1) }
+        .to raise_error('Operation #1 not found')
+    end
+
+    it 'sets the cancelled flag on the operation' do
+      expect(Aptible::Api::Operation).to receive(:find).with(1, token: token)
+        .and_return(operation)
+
+      expect(operation).to receive(:update!).with(cancelled: true)
+
+      subject.send('operation:cancel', 1)
+    end
+  end
+end

data/spec/mock/ssh

@@ -1,18 +1,9 @@
 #!/usr/bin/env ruby
-
-# Emulate server behavior
-
-if ENV['TUNNEL_PORT']
-  fail 'Something went wrong!' if ENV['FAIL_TUNNEL']
-  puts 'TUNNEL READY'
-else
-  fail 'Something went wrong!' if ENV['FAIL_PORT']
-  puts 1234
-end
-
-# Log to SSH_MOCK_OUTFILE
 require 'json'
 
+fail 'Something went wrong!' if ENV['FAIL_TUNNEL']
+
+# Log arguments to SSH_MOCK_OUTFILE
 File.open(ENV.fetch('SSH_MOCK_OUTFILE'), 'w') do |f|
   f.write({
     'argc' => ARGV.size,
@@ -20,3 +11,5 @@ File.open(ENV.fetch('SSH_MOCK_OUTFILE'), 'w') do |f|
     'env' => ENV.to_hash
   }.to_json)
 end
+
+puts 'TUNNEL READY'

data/spec/mock/ssh_mock.rb

@@ -1,18 +1,9 @@
 #!/usr/bin/env ruby
-
-# Emulate server behavior
-
-if ENV['TUNNEL_PORT']
-  fail 'Something went wrong!' if ENV['FAIL_TUNNEL']
-  puts 'TUNNEL READY'
-else
-  fail 'Something went wrong!' if ENV['FAIL_PORT']
-  puts 1234
-end
-
-# Log to SSH_MOCK_OUTFILE
 require 'json'
 
+fail 'Something went wrong!' if ENV['FAIL_TUNNEL']
+
+# Log arguments to SSH_MOCK_OUTFILE
 File.open(ENV.fetch('SSH_MOCK_OUTFILE'), 'w') do |f|
   f.write({
     'argc' => ARGV.size,
@@ -20,3 +11,5 @@ File.open(ENV.fetch('SSH_MOCK_OUTFILE'), 'w') do |f|
     'env' => ENV.to_hash
   }.to_json)
 end
+
+puts 'TUNNEL READY'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aptible-cli
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.8.0
 platform: ruby
 authors:
 - Frank Macreery
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.7
+        version: 0.9.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.7
+        version: 0.9.14
 - !ruby/object:Gem::Dependency
   name: aptible-auth
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -241,6 +241,7 @@ files:
 - lib/aptible/cli/subcommands/db.rb
 - lib/aptible/cli/subcommands/domains.rb
 - lib/aptible/cli/subcommands/logs.rb
+- lib/aptible/cli/subcommands/operation.rb
 - lib/aptible/cli/subcommands/ps.rb
 - lib/aptible/cli/subcommands/rebuild.rb
 - lib/aptible/cli/subcommands/restart.rb
@@ -249,14 +250,16 @@ files:
 - spec/aptible/cli/agent_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
 - spec/aptible/cli/helpers/options_handle_strategy_spec.rb
+- spec/aptible/cli/helpers/ssh_spec.rb
 - spec/aptible/cli/helpers/tunnel_spec.rb
 - spec/aptible/cli/subcommands/apps_spec.rb
 - spec/aptible/cli/subcommands/backup_spec.rb
 - spec/aptible/cli/subcommands/db_spec.rb
 - spec/aptible/cli/subcommands/domains_spec.rb
 - spec/aptible/cli/subcommands/logs_spec.rb
-- spec/aptible/cli/subcommands/ps_spec.rb
+- spec/aptible/cli/subcommands/operation_spec.rb
 - spec/aptible/cli/subcommands/restart_spec.rb
 - spec/fabricators/account_fabricator.rb
 - spec/fabricators/app_fabricator.rb
@@ -299,14 +302,16 @@ test_files:
 - spec/aptible/cli/agent_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
 - spec/aptible/cli/helpers/options_handle_strategy_spec.rb
+- spec/aptible/cli/helpers/ssh_spec.rb
 - spec/aptible/cli/helpers/tunnel_spec.rb
 - spec/aptible/cli/subcommands/apps_spec.rb
 - spec/aptible/cli/subcommands/backup_spec.rb
 - spec/aptible/cli/subcommands/db_spec.rb
 - spec/aptible/cli/subcommands/domains_spec.rb
 - spec/aptible/cli/subcommands/logs_spec.rb
-- spec/aptible/cli/subcommands/ps_spec.rb
+- spec/aptible/cli/subcommands/operation_spec.rb
 - spec/aptible/cli/subcommands/restart_spec.rb
 - spec/fabricators/account_fabricator.rb
 - spec/fabricators/app_fabricator.rb

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

@@ -1,36 +0,0 @@
-require 'spec_helper'
-
-describe Aptible::CLI::Agent do
-  include_context 'mock ssh'
-
-  let(:account) do
-    Fabricate(:account, bastion_host: 'bastion.com', dumptruck_port: 45022)
-  end
-  let(:app) { Fabricate(:app, account: account) }
-
-  before { subject.stub(:ask) }
-  before { subject.stub(:save_token) }
-  before { subject.stub(:fetch_token) { double 'token' } }
-  before { subject.stub(:ensure_app) { app } }
-
-  before do
-    allow(Kernel).to receive(:exec) do |*args|
-      Kernel.system(*args)
-    end
-  end
-
-  describe '#ps' do
-    it 'should set ENV["APTIBLE_CLI_COMMAND"]' do
-      subject.send('ps')
-      expect(read_mock_env['APTIBLE_CLI_COMMAND']).to eq('ps')
-    end
-
-    it 'should construct a proper SSH call' do
-      subject.send('ps')
-
-      mock_argv = read_mock_argv
-      expect(mock_argv).to include('root@bastion.com')
-      expect(mock_argv).to include('45022')
-    end
-  end
-end