aptible-cli 0.19.3 → 0.19.6

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

@@ -197,6 +197,47 @@ describe Aptible::CLI::Agent do
     end
   end
 
+  describe '#apps:rename' do
+    before do
+      allow(Aptible::Api::App).to receive(:all) { [app] }
+      allow(Aptible::Api::Account).to receive(:all) { [account] }
+    end
+
+    before(:each) do
+      allow(subject).to receive(:options)
+        .and_return(environment: account.handle)
+    end
+
+    context 'with environment and app' do
+      it 'should rename properly' do
+        expect(app).to receive(:update!)
+          .with(handle: 'hello2').and_return(app)
+        subject.send('apps:rename', 'hello', 'hello2')
+        expect(captured_logs).to include(
+          'In order for the new app name (hello2) to appear in log drain and '\
+          'metric drain destinations, you must restart the app.'
+        )
+        expect(captured_logs).to include(
+          "(git@beta.aptible.com:#{account.handle}/hello2.git)"
+        )
+      end
+      it 'should fail if app does not exist' do
+        expect { subject.send('apps:rename', 'hello2', 'hello3') }
+          .to raise_error(/Could not find app hello/)
+      end
+      it 'should raise error if update fails' do
+        response = Faraday::Response.new(status: 422)
+        error = HyperResource::ClientError.new('ActiveRecord::RecordInvalid:'\
+        ' Validation failed: Handle has already been taken, Handle has already'\
+        ' been taken', response: response)
+        expect(app).to receive(:update!)
+          .with(handle: 'hello2').and_raise(error)
+        expect { subject.send('apps:rename', 'hello', 'hello2') }
+          .to raise_error(HyperResource::ClientError)
+      end
+    end
+  end
+
   describe '#apps:scale' do
     before do
       allow(Aptible::Api::App).to receive(:all) { [app] }

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

@@ -22,6 +22,9 @@ describe Aptible::CLI::Agent do
     before do
       allow(Aptible::Api::Account).to receive(:all).and_return([account])
     end
+    before do
+      subject.stub(:validate_image_type) { true }
+    end
 
     def expect_provision_database(create_opts, provision_opts = {})
       db = Fabricate(:database)
@@ -876,4 +879,39 @@ describe Aptible::CLI::Agent do
       expect(captured_output_text).to eq(expected)
     end
   end
+
+  describe '#db:rename' do
+    before do
+      allow(subject).to receive(:options)
+        .and_return(environment: account.handle)
+      allow(Aptible::Api::Account).to receive(:all) { [account] }
+    end
+    context 'with environment and db' do
+      it 'should rename properly' do
+        expect(database).to receive(:update!)
+          .with(handle: 'foo2').and_return(database)
+        subject.send('db:rename', database.handle, 'foo2')
+        expect(captured_logs).to include(
+          'In order for the new database name (foo2) to appear in log drain '\
+          'and metric drain destinations, you must reload the database.'
+        )
+      end
+      it 'should fail if db does not exist' do
+        expect { subject.send('db:rename', 'foo2', 'foo3') }
+          .to raise_error(/Could not find database foo2/)
+      end
+      it 'should raise error if update fails' do
+        response = Faraday::Response.new(status: 500)
+        error = HyperResource::ClientError.new(
+          'An error occurred: Validation failed: Handle has '\
+          'already been taken, Handle has already been taken',
+          response: response
+        )
+        expect(database).to receive(:update!)
+          .with(handle: 'foo2').and_raise(error)
+        expect { subject.send('db:rename', database.handle, 'foo2') }
+          .to raise_error(HyperResource::ClientError)
+      end
+    end
+  end
 end

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

@@ -10,47 +10,82 @@ describe Aptible::CLI::Agent do
 
   let(:token) { double 'token' }
 
-  before do
+  before(:each) do
     allow(subject).to receive(:fetch_token) { token }
     allow(Aptible::Api::Account).to receive(:all).with(token: token)
       .and_return([a1, a2])
   end
 
-  it 'lists avaliable environments' do
-    subject.send('environment:list')
+  describe('#environment:list') do
+    it 'lists avaliable environments' do
+      subject.send('environment:list')
 
-    expect(captured_output_text.split("\n")).to include('foo')
-    expect(captured_output_text.split("\n")).to include('bar')
+      expect(captured_output_text.split("\n")).to include('foo')
+      expect(captured_output_text.split("\n")).to include('bar')
+    end
   end
 
-  it 'fetches certs for all avaliable environments' do
-    subject.send('environment:ca_cert')
-
-    expect(captured_output_text.split("\n")).to include('account 1 cert')
-    expect(captured_output_text.split("\n")).to include('--account 2 cert--')
-
-    expected_accounts = [
-      {
-        'handle' => 'foo',
-        'ca_body' => 'account 1 cert',
-        'created_at' => fmt_time(a1.created_at)
-      },
-      {
-        'handle' => 'bar',
-        'ca_body' => '--account 2 cert--',
-        'created_at' => fmt_time(a2.created_at)
-      }
-    ]
-    expect(captured_output_json.map! { |account| account.except('id') })
-      .to eq(expected_accounts)
-  end
+  describe('#environment:ca_cert') do
+    it 'fetches certs for all avaliable environments' do
+      subject.send('environment:ca_cert')
+
+      expect(captured_output_text.split("\n")).to include('account 1 cert')
+      expect(captured_output_text.split("\n")).to include('--account 2 cert--')
+
+      expected_accounts = [
+        {
+          'handle' => 'foo',
+          'ca_body' => 'account 1 cert',
+          'created_at' => fmt_time(a1.created_at)
+        },
+        {
+          'handle' => 'bar',
+          'ca_body' => '--account 2 cert--',
+          'created_at' => fmt_time(a2.created_at)
+        }
+      ]
+      expect(captured_output_json.map! { |account| account.except('id') })
+        .to eq(expected_accounts)
+    end
 
-  it 'fetches certs for specified environment' do
-    subject.options = { environment: 'foo' }
-    subject.send('environment:ca_cert')
+    it 'fetches certs for specified environment' do
+      subject.options = { environment: 'foo' }
+      subject.send('environment:ca_cert')
+
+      expect(captured_output_text.split("\n")).to include('account 1 cert')
+      expect(captured_output_text.split("\n"))
+        .to_not include('--account 2 cert--')
+    end
+  end
 
-    expect(captured_output_text.split("\n")).to include('account 1 cert')
-    expect(captured_output_text.split("\n"))
-      .to_not include('--account 2 cert--')
+  describe('#environment:rename') do
+    it 'should rename properly' do
+      expect(a1).to receive(:update!)
+        .with(handle: 'foo-renamed').and_return(a1)
+      subject.send('environment:rename', 'foo', 'foo-renamed')
+      expect(captured_logs).to include(
+        'In order for the new environment handle (foo-renamed)'
+      )
+      expect(captured_logs).to include(
+        '* Your own external scripts (e.g. for CI/CD)'
+      )
+      expect(captured_logs).to include(
+        '* Git remote URLs (ex: git@beta.aptible.com:foo-renamed'
+      )
+    end
+    it 'should fail if env does not exist' do
+      expect { subject.send('environment:rename', 'foo1', 'foo2') }
+        .to raise_error(/Could not find environment foo1/)
+    end
+    it 'should raise error if update fails' do
+      response = Faraday::Response.new(status: 422)
+      error = HyperResource::ClientError.new('ActiveRecord::RecordInvalid:'\
+        ' Validation failed: Handle has already been taken, Handle has already'\
+        ' been taken', response: response)
+      expect(a1).to receive(:update!)
+        .with(handle: 'bar').and_raise(error)
+      expect { subject.send('environment:rename', 'foo', 'bar') }
+        .to raise_error(HyperResource::ClientError)
+    end
   end
 end

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

@@ -60,4 +60,137 @@ describe Aptible::CLI::Agent do
       expect { subject.send(:logs) }.to raise_error(/only one of/im)
     end
   end
+
+  describe '#logs_from_archive' do
+    context 'using string-matches' do
+      let(:files) { %w(file_1 file_2) }
+
+      before do
+        subject.options = {
+          region: 'some-region',
+          bucket: 'some-bucket',
+          decryption_keys: 'mykey',
+          string_matches: 'foo',
+          download_location: './'
+        }
+        subject.stub(:info_from_path) { { shasum: 'foo' } }
+        subject.stub(:encryption_key) { subject.options[:decryption_keys] }
+      end
+
+      it 'download all files' do
+        expect(subject).to receive(:ensure_aws_creds)
+        expect(subject).to receive(:validate_log_search_options)
+          .with(subject.options)
+
+        expect(subject).to receive(:find_s3_files_by_string_match)
+          .with(
+            subject.options[:region],
+            subject.options[:bucket],
+            subject.options[:stack],
+            subject.options[:string_matches]
+          ).and_return(files)
+
+        files.each do |f|
+          expect(subject).to receive(:decrypt_and_translate_s3_file)
+            .with(
+              f,
+              subject.options[:decryption_keys],
+              subject.options[:region],
+              subject.options[:bucket],
+              subject.options[:download_location]
+            )
+        end
+        subject.send('logs_from_archive')
+      end
+    end
+
+    context 'using app/database/endpoint  id' do
+      let(:files) { %w(file_1 file_2) }
+
+      before do
+        subject.options = {
+          region: 'some-region',
+          bucket: 'some-bucket',
+          stack: 'mystack',
+          decryption_keys: 'mykey',
+          app_id: 123,
+          download_location: './'
+        }
+        subject.stub(:info_from_path) { { shasum: 'foo' } }
+        subject.stub(:encryption_key) { subject.options[:decryption_keys] }
+      end
+
+      it 'download all files' do
+        expect(subject).to receive(:ensure_aws_creds)
+        expect(subject).to receive(:validate_log_search_options)
+          .with(subject.options)
+
+        expect(subject).to receive(:find_s3_files_by_attrs)
+          .with(
+            subject.options[:region],
+            subject.options[:bucket],
+            subject.options[:stack],
+            { type: 'apps', id: 123 },
+            nil
+          ).and_return(files)
+
+        files.each do |f|
+          expect(subject).to receive(:decrypt_and_translate_s3_file)
+            .with(
+              f,
+              subject.options[:decryption_keys],
+              subject.options[:region],
+              subject.options[:bucket],
+              subject.options[:download_location]
+            )
+        end
+        subject.send('logs_from_archive')
+      end
+    end
+
+    context 'using container id' do
+      let(:files) { %w(file_1 file_2) }
+
+      before do
+        subject.options = {
+          region: 'some-region',
+          bucket: 'some-bucket',
+          stack: 'mystack',
+          decryption_keys: 'mykey',
+          container_id:
+            '9080b96447f98b31ef9831d5fd98b09e3c5c545269734e2e825644571152457c',
+          download_location: './'
+        }
+        subject.stub(:info_from_path) { { shasum: 'foo' } }
+        subject.stub(:encryption_key) { subject.options[:decryption_keys] }
+      end
+
+      it 'download all files' do
+        expect(subject).to receive(:ensure_aws_creds)
+        expect(subject).to receive(:validate_log_search_options)
+          .with(subject.options)
+
+        expect(subject).to receive(:find_s3_files_by_attrs)
+          .with(
+            subject.options[:region],
+            subject.options[:bucket],
+            subject.options[:stack],
+            { container_id: subject.options[:container_id] },
+            nil
+          ).and_return(files)
+
+        files.each do |f|
+          expect(subject).to receive(:decrypt_and_translate_s3_file)
+            .with(
+              f,
+              subject.options[:decryption_keys],
+              subject.options[:region],
+              subject.options[:bucket],
+              subject.options[:download_location]
+            )
+        end
+        subject.send('logs_from_archive')
+      end
+    end
+  end
 end

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

@@ -145,7 +145,7 @@ describe Aptible::CLI::Agent do
           drain_type: :datadog,
           drain_configuration: {
             api_key: 'foobar',
-            series_url: 'https://app.datadoghq.eu'
+            series_url: 'https://app.datadoghq.eu/api/v1/series'
           }
         }
         expect_provision_metric_drain(opts)

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

@@ -3,6 +3,8 @@ require 'spec_helper'
 describe Aptible::CLI::Agent do
   let(:token) { 'some-token' }
   let(:operation) { Fabricate(:operation) }
+  let(:net_http_double) { double('Net::HTTP') }
+  let(:net_http_get_double) { double('Net::HTTP::Get') }
 
   before do
     allow(subject).to receive(:fetch_token).and_return(token)
@@ -26,4 +28,174 @@ describe Aptible::CLI::Agent do
       subject.send('operation:cancel', 1)
     end
   end
+
+  describe '#operation:follow' 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:follow', 1) }
+        .to raise_error('Operation #1 not found')
+    end
+
+    it 'connects to a running operation' do
+      op = Fabricate(:operation, status: 'running', type: 'restart')
+      expect(Aptible::Api::Operation).to receive(:find)
+        .with(op.id.to_s, token: token).and_return(op)
+
+      expect(subject).to receive(:attach_to_operation_logs).with(op)
+      subject.send('operation:follow', op.id.to_s)
+    end
+
+    it 'connects to a queued operation' do
+      op = Fabricate(:operation, status: 'queued', type: 'restart')
+      expect(Aptible::Api::Operation).to receive(:find)
+        .with(op.id.to_s, token: token).and_return(op)
+
+      expect(subject).to receive(:attach_to_operation_logs).with(op)
+      subject.send('operation:follow', op.id.to_s)
+    end
+
+    it 'does not connect to a failed operation' do
+      id = 34
+      status = 'failed'
+      op = Fabricate(:operation, id: id, status: status)
+      expect(Aptible::Api::Operation).to receive(:find)
+        .with(op.id.to_s, token: token).and_return(op)
+
+      expect { subject.send('operation:follow', op.id.to_s) }
+        .to raise_error(Thor::Error, /aptible operation:logs #{id}/)
+    end
+
+    it 'does not connect to a succeeded operation' do
+      id = 43
+      status = 'succeeded'
+      op = Fabricate(:operation, id: id, status: status)
+      expect(Aptible::Api::Operation).to receive(:find)
+        .with(op.id.to_s, token: token).and_return(op)
+
+      expect { subject.send('operation:follow', op.id.to_s) }
+        .to raise_error(Thor::Error, /aptible operation:logs #{id}/)
+    end
+  end
+
+  describe '#operation:logs' do
+    it 'sends operation logs request when subcommand sent' do
+      operation_id = SecureRandom.uuid
+      expect(Aptible::Api::Operation).to receive(:find).with(1, token: token)
+        .and_return(Fabricate(
+                      :operation, status: 'succeeded', id: operation_id
+        ))
+
+      # stub out operations call
+      response = instance_double(Net::HTTPResponse, body: 'https://s3.aptible.com/not-real/s3')
+
+      # stub out s3 call
+      s3_response = instance_double(Net::HTTPResponse, body: 'Mock logs')
+
+      allow(Net::HTTP).to receive(:new).twice do |_, _, _|
+        net_http_double
+      end
+      expect(response).to receive(:code).and_return('200')
+      expect(s3_response).to receive(:code).and_return('200')
+      expect(net_http_double).to receive(:use_ssl=).twice
+      expect(net_http_double).to receive(:request).twice do |request|
+        if request.path == "/operations/#{operation_id}/logs"
+          response
+        elsif request.path == '/not-real/s3'
+          s3_response
+        end
+      end
+
+      subject.send('operation:logs', 1)
+    end
+
+    it 'errors when operation is not found' do
+      expect(Aptible::Api::Operation).to receive(:find).with(1, token: token)
+        .and_return(nil)
+
+      expect { subject.send('operation:logs', 1) }
+        .to raise_error('Operation #1 not found')
+    end
+    it 'errors when operation is not status expected' do
+      operation_id = SecureRandom.uuid
+      expect(Aptible::Api::Operation).to receive(:find).with(1, token: token)
+        .and_return(Fabricate(:operation, status: 'queued', id: operation_id))
+
+      expect { subject.send('operation:logs', 1) }
+        .to raise_error('Error - You can view the logs when operation '\
+                        'is complete.')
+    end
+    it 'errors when operation logs are not found' do
+      operation_id = SecureRandom.uuid
+      expect(Aptible::Api::Operation).to receive(:find).with(1, token: token)
+        .and_return(
+          Fabricate(:operation, status: 'succeeded', id: operation_id)
+        )
+
+      # stub out operations call
+      response = Net::HTTPSuccess.new(1.0, '404', 'Not Found')
+      expect_any_instance_of(Net::HTTP)
+        .to receive(:request)
+        .with(an_instance_of(Net::HTTP::Get))
+        .and_return(response)
+
+      expect { subject.send('operation:logs', 1) }
+        .to raise_error('Unable to retrieve the operation\'s logs. '\
+          'If the issue persists please contact support for assistance.')
+    end
+    it 'errors when body is empty' do
+      operation_id = SecureRandom.uuid
+      expect(Aptible::Api::Operation).to receive(:find).with(1, token: token)
+        .and_return(Fabricate(
+                      :operation, status: 'succeeded', id: operation_id
+        ))
+
+      # stub out operations call
+      response = instance_double(Net::HTTPResponse, body: nil)
+
+      allow(Net::HTTP).to receive(:new) do |_, _, _|
+        net_http_double
+      end
+      expect(response).to receive(:code).and_return('200')
+      expect(net_http_double).to receive(:use_ssl=)
+      expect(net_http_double).to receive(:request).and_return(response)
+
+      expect { subject.send('operation:logs', 1) }
+        .to raise_error('Unable to retrieve the operation\'s logs. '\
+          'If the issue persists please contact support for assistance.')
+    end
+    it 'errors when s3 itself returns an error code' do
+      operation_id = SecureRandom.uuid
+      expect(Aptible::Api::Operation).to receive(:find).with(1, token: token)
+        .and_return(Fabricate(
+                      :operation, status: 'succeeded', id: operation_id
+        ))
+
+      # stub out operations call
+      response = instance_double(Net::HTTPResponse, body: 'https://s3.aptible.com/not-real/s3')
+
+      # stub out s3 call (to fail)
+      expect(response).to receive(:code).and_return('200')
+      s3_response = Net::HTTPSuccess.new(1.0, '404', 'Not Found')
+
+      allow(Net::HTTP).to receive(:new).twice do |_, _, _|
+        net_http_double
+      end
+      expect(net_http_double).to receive(:use_ssl=).twice
+      expect(net_http_double).to receive(:request).twice do |request|
+        if request.path == "/operations/#{operation_id}/logs"
+          response
+        elsif request.path == '/not-real/s3'
+          s3_response
+        end
+      end
+
+      expect { subject.send('operation:logs', 1) }
+        .to raise_error('Unable to retrieve operation logs, '\
+                        'S3 returned response code 404. '\
+                        'If the issue persists please contact support for '\
+                        'assistance.')
+    end
+  end
 end

data/spec/fabricators/operation_fabricator.rb

@@ -1,7 +1,12 @@
 class StubOperation < OpenStruct; end
 
+def mock_logs_url(id)
+  "https://api.aptible.com/operations/#{id}/logs"
+end
+
 Fabricator(:operation, from: :stub_operation) do
   status 'queued'
-  resource { Fabricate(:app) }
   errors { Aptible::Resource::Errors.new }
+  resource { Fabricate(:app) }
+  after_save { |operation| operation.logs_url = mock_logs_url(operation.id) }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aptible-cli
 version: !ruby/object:Gem::Version
-  version: 0.19.3
+  version: 0.19.6
 platform: ruby
 authors:
 - Frank Macreery
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-01 00:00:00.000000000 Z
+date: 2022-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aptible-resource
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -294,6 +308,7 @@ files:
 - lib/aptible/cli/helpers/log_drain.rb
 - lib/aptible/cli/helpers/metric_drain.rb
 - lib/aptible/cli/helpers/operation.rb
+- lib/aptible/cli/helpers/s3_log_helpers.rb
 - lib/aptible/cli/helpers/security_key.rb
 - lib/aptible/cli/helpers/ssh.rb
 - lib/aptible/cli/helpers/system.rb
@@ -326,10 +341,12 @@ files:
 - script/sync-readme-usage
 - spec/aptible/cli/agent_spec.rb
 - spec/aptible/cli/formatter_spec.rb
+- spec/aptible/cli/helpers/database_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/s3_log_helpers_spec.rb
 - spec/aptible/cli/helpers/ssh_spec.rb
 - spec/aptible/cli/helpers/token_spec.rb
 - spec/aptible/cli/helpers/tunnel_spec.rb
@@ -382,7 +399,7 @@ homepage: https://github.com/aptible/aptible-cli
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -397,17 +414,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.0.3
+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/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/s3_log_helpers_spec.rb
 - spec/aptible/cli/helpers/ssh_spec.rb
 - spec/aptible/cli/helpers/token_spec.rb
 - spec/aptible/cli/helpers/tunnel_spec.rb