aptible-cli 0.26.4 → 0.26.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c756f930a26ab5b060f01270b80c9ec2963c8f739be4ffcd2a5d56e9dac2860
-  data.tar.gz: 55fdde5cde257bd36c6c16a17e7f639745f85947b1cf40269c0d73ab0093615c
+  metadata.gz: 13c94bbbfe4b853700fec4e895ab0eebd02f0c5ffcddf6cfd0a597c42f665d37
+  data.tar.gz: c495f4582ca15271799caa1b71a3922c3e5bbaafa692eda9476862465971556e
 SHA512:
-  metadata.gz: 01122dab06813f9b67100c11e6e59ec6942f5263340efc26bbf73440b51c39c7cd0be7258b987fa39056092b29bf181ded4d14423d27ff795cd18bf85b97fe96
-  data.tar.gz: d7ed67882c43c958dcc60c7ef5ba518f3eb6ad72ca014f4c0b761478f2748054af64286aca26b8ac97b5ca5ea03964bc34fd422d3cf42f4996b4c6949815d870
+  metadata.gz: eb5b9e8adc78ba955f5125ca6c673894fea37fb8dd9a61775b4f44f87b9afc2c7fd9dbf8c645cd380af6fca7f754f03654a139539d9180060c6475544320b864
+  data.tar.gz: d86d87bb3c7d8dd6c57692c63c0592b99f950cd96b8b6bce1038678678a0c983c6b734ef380852b6edb8bb1e4e205fa6938b5045c8d5337f82fd4c40fb5aac2e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    aptible-cli (0.26.4)
+    aptible-cli (0.26.5)
       activesupport (>= 4.0, < 6.0)
       aptible-api (~> 1.12)
       aptible-auth (~> 1.4)

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

@@ -110,12 +110,9 @@ module Aptible
             end
           end
 
-          apps = apps_from_handle(s.app_handle, environment)
+          app = app_from_handle(s.app_handle, environment)
 
-          case apps.count
-          when 1
-            return apps.first
-          when 0
+          if app.nil?
             err_bits = ['Could not find app', s.app_handle]
             if environment
               err_bits << 'in environment'
@@ -125,11 +122,9 @@ module Aptible
             end
             err_bits << s.explain
             raise Thor::Error, err_bits.join(' ')
-          else
-            err = "Multiple apps named #{s.app_handle} exist, please specify " \
-                  'with --environment'
-            raise Thor::Error, err
           end
+
+          app
         end
 
         def ensure_service(options, type)
@@ -166,13 +161,20 @@ module Aptible
           )
         end
 
-        def apps_from_handle(handle, environment)
-          # TODO: This should probably use each_app for more efficiency.
-          if environment
-            environment.apps
-          else
-            apps_all
-          end.select { |a| a.handle == handle }
+        def app_from_handle(handle, environment)
+          url = "/find/app?handle=#{handle}"
+          url += "&environment=#{environment.handle}" unless environment.nil?
+
+          Aptible::Api::App.find_by_url(
+            url,
+            token: fetch_token
+          )
+        rescue HyperResource::ClientError => e
+          raise unless e.body.is_a?(Hash) &&
+                       e.body['error'] == 'multiple_resources_found'
+          raise Thor::Error,
+                "Multiple apps named #{handle} exist, please specify " \
+                'with --environment'
         end
 
         def extract_env(args)

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

@@ -36,16 +36,10 @@ module Aptible
             raise Thor::Error,
                   "Could not find environment #{environment_handle}"
           end
-          databases = databases_from_handle(db_handle, environment)
-          case databases.count
-          when 1
-            return databases.first
-          when 0
-            raise Thor::Error, "Could not find database #{db_handle}"
-          else
-            err = 'Multiple databases exist, please specify with --environment'
-            raise Thor::Error, err
-          end
+          db = database_from_handle(db_handle, environment)
+          raise Thor::Error, "Could not find database #{db_handle}" if db.nil?
+
+          db
         end
 
         def databases_href
@@ -140,20 +134,27 @@ module Aptible
           external_rds_databases_all.find { |a| a.handle == handle }
         end
 
-        def databases_from_handle(handle, environment)
-          databases = if environment
-                        environment.databases
-                      else
-                        databases_all
-                      end
-          databases.select { |a| a.handle == handle }
+        def database_from_handle(handle, environment)
+          url = "/find/database?handle=#{handle}"
+          url += "&environment=#{environment.handle}" unless environment.nil?
+
+          Aptible::Api::Database.find_by_url(
+            url,
+            token: fetch_token
+          )
+        rescue HyperResource::ClientError => e
+          raise unless e.body.is_a?(Hash) &&
+                       e.body['error'] == 'multiple_resources_found'
+          raise Thor::Error,
+                'Multiple databases exist, please specify ' \
+                'with --environment'
         end
 
         def clone_database(source, dest_handle)
           op = source.create_operation!(type: 'clone', handle: dest_handle)
           attach_to_operation_logs(op)
 
-          databases_from_handle(dest_handle, source.account).first
+          database_from_handle(dest_handle, source.account)
         end
 
         def replicate_database(source, dest_handle, options)
@@ -177,7 +178,7 @@ module Aptible
           op = source.create_operation!(replication_params)
           attach_to_operation_logs(op)
 
-          replica = databases_from_handle(dest_handle, source.account).first
+          replica = database_from_handle(dest_handle, source.account)
           attach_to_operation_logs(replica.operations.last)
           replica
         end

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

@@ -42,10 +42,11 @@ module Aptible
 
         def environment_from_handle(handle)
           return nil unless handle
-          href = environment_href
-          Aptible::Api::Account.all(token: fetch_token, href: href).find do |a|
-            a.handle == handle
-          end
+
+          Aptible::Api::Account.find_by_url(
+            "/find/account?handle=#{handle}",
+            token: fetch_token
+          )
         end
 
         def environment_map(accounts)

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

@@ -67,7 +67,7 @@ module Aptible
 
               account = destination_account || backup.account
 
-              database = databases_from_handle(handle, account).first
+              database = database_from_handle(handle, account)
               render_database(database, account)
             end
 

data/lib/aptible/cli/version.rb

@@ -1,5 +1,5 @@
 module Aptible
   module CLI
-    VERSION = '0.26.4'.freeze
+    VERSION = '0.26.5'.freeze
   end
 end

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

@@ -20,13 +20,17 @@ describe Aptible::CLI::Agent do
   before do
     allow(subject).to receive(:save_token)
     allow(subject).to receive(:attach_to_operation_logs)
-    allow(subject).to receive(:fetch_token) { double 'token' }
+    allow(subject).to receive(:fetch_token) { token }
+    allow(Aptible::Api::Account).to receive(:find_by_url)
+      .with("/find/account?handle=#{account.handle}", token: token)
+      .and_return(account)
   end
 
   let!(:account) { Fabricate(:account) }
   let!(:app) { Fabricate(:app, handle: 'hello', account: account) }
   let!(:service) { Fabricate(:service, app: app, process_type: 'web') }
   let(:op) { Fabricate(:operation, status: 'succeeded', resource: app) }
+  let(:token) { double 'token' }
 
   describe '#apps' do
     it 'lists an app in an account' do
@@ -83,13 +87,14 @@ describe Aptible::CLI::Agent do
 
     it 'lists filters down to one account' do
       account2 = Fabricate(:account, handle: 'account2')
+      allow(Aptible::Api::Account).to receive(:find_by_url)
+        .with("/find/account?handle=#{account2.handle}", token: token)
+        .and_return(account2)
       app2 = Fabricate(:app, account: account2, handle: 'app2')
       allow(subject).to receive(:options)
         .and_return(environment: account2.handle)
       allow(Aptible::Api::App).to receive(:all).and_return([app2])
 
-      allow(Aptible::Api::Account).to receive(:all)
-        .and_return([account, account2])
       subject.send('apps')
 
       expect(captured_output_text)
@@ -215,8 +220,11 @@ describe Aptible::CLI::Agent do
 
   describe '#apps:rename' do
     before do
-      allow(Aptible::Api::App).to receive(:all) { [app] }
-      allow(Aptible::Api::Account).to receive(:all) { [account] }
+      allow(Aptible::Api::App).to receive(:find_by_url)
+        .and_return(nil)
+      allow(Aptible::Api::App).to receive(:find_by_url)
+        .with("/find/app?handle=#{app.handle}&environment=#{account.handle}", token: token)
+        .and_return(app)
     end
 
     before(:each) do
@@ -256,7 +264,6 @@ describe Aptible::CLI::Agent do
 
   describe '#apps:scale' do
     before do
-      allow(Aptible::Api::App).to receive(:all) { [app] }
       allow(Aptible::Api::Account).to receive(:all) { [account] }
     end
 
@@ -268,9 +275,9 @@ describe Aptible::CLI::Agent do
           .with('foobar')
           .and_return(account)
 
-        expect(subject).to receive(:apps_from_handle)
+        expect(subject).to receive(:app_from_handle)
           .with('hello', account)
-          .and_return([app])
+          .and_return(app)
       end
 
       def stub_options(**opts)
@@ -330,7 +337,7 @@ describe Aptible::CLI::Agent do
       allow(subject).to receive(:options) do
         { environment: 'foo', app: 'web', container_count: 2 }
       end
-      allow(Aptible::Api::Account).to receive(:all) { [] }
+      allow(Aptible::Api::Account).to receive(:find_by_url).and_return(nil)
       allow(service).to receive(:create_operation!) { op }
 
       expect do
@@ -394,7 +401,14 @@ describe Aptible::CLI::Agent do
 
       before do
         account.apps = apps
-        allow(Aptible::Api::App).to receive(:all).and_return(apps)
+        allow(Aptible::Api::App).to receive(:find_by_url)
+          .and_return(nil)
+        allow(Aptible::Api::App).to receive(:find_by_url)
+          .with("/find/app?handle=#{app.handle}&environment=#{account.handle}", token: token)
+          .and_return(app)
+        allow(Aptible::Api::App).to receive(:find_by_url)
+          .with("/find/app?handle=#{app.handle}", token: token)
+          .and_return(app)
       end
 
       it 'scopes the app search to an environment if provided' do
@@ -415,27 +429,21 @@ describe Aptible::CLI::Agent do
       end
 
       it 'fails if no app is found' do
-        apps.pop
-
-        strategies = [dummy_strategy_factory('hello', nil, true)]
+        strategies = [dummy_strategy_factory('goodbye', nil, true)]
         allow(subject).to receive(:handle_strategies) { strategies }
 
-        expect { subject.ensure_app }.to raise_error(/not find app hello/)
+        expect { subject.ensure_app }.to raise_error(/not find app goodbye/)
       end
 
       it 'explains the strategy when it fails' do
-        apps.pop
-
-        strategies = [dummy_strategy_factory('hello', nil, true)]
+        strategies = [dummy_strategy_factory('goodbye', nil, true)]
         allow(subject).to receive(:handle_strategies) { strategies }
 
         expect { subject.ensure_app }.to raise_error(/from dummy/)
       end
 
       it 'indicates the environment when the app search was scoped' do
-        apps.pop
-
-        strategies = [dummy_strategy_factory('hello', 'aptible', true)]
+        strategies = [dummy_strategy_factory('goodbye', 'aptible', true)]
         allow(subject).to receive(:handle_strategies) { strategies }
 
         expect(subject).to receive(:environment_from_handle).with('aptible')
@@ -445,7 +453,12 @@ describe Aptible::CLI::Agent do
       end
 
       it 'fails if multiple apps are found' do
-        apps << Fabricate(:app, handle: 'hello')
+        error = HyperResource::ClientError.new('multiple resources found')
+        allow(error).to receive(:body)
+          .and_return('error' => 'multiple_resources_found')
+        allow(Aptible::Api::App).to receive(:find_by_url)
+          .with('/find/app?handle=hello', token: token)
+          .and_raise(error)
 
         strategies = [dummy_strategy_factory('hello', nil, true)]
         allow(subject).to receive(:handle_strategies) { strategies }

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

@@ -13,7 +13,9 @@ describe Aptible::CLI::Agent do
 
   before do
     allow(subject).to receive(:fetch_token).and_return(token)
-    allow(Aptible::Api::Account).to receive(:all) { [account] }
+    allow(Aptible::Api::Account).to receive(:find_by_url)
+      .with("/find/account?handle=#{account.handle}", token: token)
+      .and_return(account)
   end
 
   describe '#backup_retention_policy' do

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

@@ -20,7 +20,24 @@ describe Aptible::CLI::Agent do
 
   before do
     allow(subject).to receive(:fetch_token).and_return(token)
-    allow(Aptible::Api::Account).to receive(:all) { [account, alt_account] }
+    allow(Aptible::Api::Account).to receive(:find_by_url)
+      .with("/find/account?handle=#{account.handle}", token: token)
+      .and_return(account)
+    allow(Aptible::Api::Account).to receive(:find_by_url)
+      .with("/find/account?handle=#{alt_account.handle}", token: token)
+      .and_return(alt_account)
+    allow(Aptible::Api::Database).to receive(:find_by_url)
+      .with("/find/database?handle=#{default_handle}", token: token)
+      .and_return(database)
+    allow(Aptible::Api::Database).to receive(:find_by_url)
+      .with("/find/database?handle=#{default_handle}&environment=#{account.handle}", token: token)
+      .and_return(database)
+    allow(Aptible::Api::Database).to receive(:find_by_url)
+      .with("/find/database?handle=#{database.handle}", token: token)
+      .and_return(database)
+    allow(Aptible::Api::Database).to receive(:find_by_url)
+      .with("/find/database?handle=#{database.handle}&environment=#{account.handle}", token: token)
+      .and_return(database)
   end
 
   describe '#backup:restore' do
@@ -60,6 +77,11 @@ describe Aptible::CLI::Agent do
 
       it 'accepts a handle' do
         h = 'some-handle'
+        restored = Fabricate(:database, account: account, handle: h)
+
+        allow(Aptible::Api::Database).to receive(:find_by_url)
+          .with("/find/database?handle=#{h}&environment=#{account.handle}", token: token)
+          .and_return(database)
 
         expect(backup).to receive(:create_operation!) do |options|
           expect(options[:handle]).to eq(h)
@@ -70,7 +92,7 @@ describe Aptible::CLI::Agent do
         end
 
         expect(subject).to receive(:attach_to_operation_logs).with(op) do
-          Fabricate(:database, account: account, handle: h)
+          restored
         end
 
         subject.options = { handle: h }
@@ -143,6 +165,9 @@ describe Aptible::CLI::Agent do
         end
 
         subject.options = { environment: 'alt' }
+        allow(Aptible::Api::Database).to receive(:find_by_url)
+          .with("/find/database?handle=#{default_handle}&environment=alt", token: token)
+          .and_return(database)
         subject.send('backup:restore', 1)
       end
     end
@@ -150,7 +175,6 @@ describe Aptible::CLI::Agent do
 
   describe '#backup:list' do
     before { allow(Aptible::Api::Account).to receive(:all) { [account] } }
-    before { allow(Aptible::Api::Database).to receive(:all) { [database] } }
 
     before do
       m = allow(database).to receive(:each_backup)
@@ -192,6 +216,7 @@ describe Aptible::CLI::Agent do
     end
 
     it 'fails if the DB is not found' do
+      allow(Aptible::Api::Database).to receive(:find_by_url).and_return(nil)
       expect { subject.send('backup:list', 'nope') }
         .to raise_error(Thor::Error, 'Could not find database nope')
     end

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

@@ -8,9 +8,9 @@ describe Aptible::CLI::Agent do
   before { allow(subject).to receive(:fetch_token).and_return(token) }
 
   before do
-    allow(Aptible::Api::App).to receive(:all)
-      .with(token: token, href: '/apps?per_page=5000&no_embed=true')
-      .and_return([app])
+    allow(Aptible::Api::App).to receive(:find_by_url)
+      .with("/find/app?handle=#{app.handle}", token: token)
+      .and_return(app)
     allow(Aptible::Api::Account).to receive(:all)
       .with(token: token, href: '/apps?per_page=5000&no_embed=true')
       .and_return([account])

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

@@ -13,11 +13,17 @@ describe Aptible::CLI::Agent do
     allow(Aptible::Api::DatabaseCredential).to receive(:all) do
       database.database_credentials
     end
+    allow(Aptible::Api::Database).to receive(:find_by_url)
+      .with("/find/database?handle=#{handle}", token: token)
+      .and_return(database)
+    allow(Aptible::Api::Database).to receive(:find_by_url)
+      .with("/find/database?handle=#{handle}&environment=#{account.handle}", token: token)
+      .and_return(database)
   end
 
   let(:handle) { 'foobar' }
   let(:stack) { Fabricate(:stack, internal_domain: 'aptible.in') }
-  let(:account) { Fabricate(:account, stack: stack) }
+  let(:account) { Fabricate(:account, stack: stack, handle: 'aptible') }
   let(:database) { Fabricate(:database, handle: handle, account: account) }
   let(:socat_helper) { SocatHelperMock.new(port: 4242) }
 
@@ -151,15 +157,15 @@ describe Aptible::CLI::Agent do
 
   describe '#db:tunnel' do
     it 'should fail if database is non-existent' do
-      allow(Aptible::Api::Database).to receive(:all) { [] }
+      allow(Aptible::Api::Database).to receive(:find_by_url)
+        .with("/find/database?handle=#{handle}", token: token)
+        .and_return(nil)
       expect do
         subject.send('db:tunnel', handle)
       end.to raise_error("Could not find database #{handle}")
     end
 
     context 'valid database' do
-      before { allow(Aptible::Api::Database).to receive(:all) { [database] } }
-
       it 'prints a message explaining how to connect' do
         cred = Fabricate(:database_credential, default: true, type: 'foo',
                                                database: database)
@@ -371,6 +377,9 @@ describe Aptible::CLI::Agent do
       allow(Aptible::Api::Account).to receive(:all)
         .with(token: token, href: '/accounts?per_page=5000&no_embed=true')
         .and_return([staging, prod])
+      allow(Aptible::Api::Account).to receive(:find_by_url)
+        .with("/find/account?handle=#{staging.handle}", token: token)
+        .and_return(staging)
       allow(Aptible::Api::ExternalAwsResource).to receive(:all)
         .with(token: token)
         .and_return([])
@@ -406,6 +415,7 @@ describe Aptible::CLI::Agent do
     end
 
     context 'when an invalid account is specified' do
+      before { allow(Aptible::Api::Account).to receive(:find_by_url).and_return(nil) }
       it 'prints out an error' do
         subject.options = { environment: 'foo' }
         expect { subject.send('db:list') }
@@ -544,6 +554,9 @@ describe Aptible::CLI::Agent do
       allow(Aptible::Api::Account).to receive(:all)
         .with(token: token, href: '/accounts?per_page=5000&no_embed=true')
         .and_return([staging, prod])
+      allow(Aptible::Api::Account).to receive(:find_by_url)
+        .with("/find/account?handle=#{staging.handle}", token: token)
+        .and_return(staging)
       allow(Aptible::Api::ExternalAwsResource).to receive(:all)
         .with(token: token)
         .and_return([staging_rds, prod_rds, unattached_rds])
@@ -627,7 +640,6 @@ describe Aptible::CLI::Agent do
 
   describe '#db:backup' do
     before { allow(Aptible::Api::Account).to receive(:all) { [account] } }
-    before { allow(Aptible::Api::Database).to receive(:all) { [database] } }
 
     let(:op) { Fabricate(:operation) }
 
@@ -642,6 +654,7 @@ describe Aptible::CLI::Agent do
     end
 
     it 'fails if the DB is not found' do
+      allow(Aptible::Api::Database).to receive(:find_by_url).and_return(nil)
       expect { subject.send('db:backup', 'nope') }
         .to raise_error(Thor::Error, 'Could not find database nope')
     end
@@ -649,7 +662,6 @@ describe Aptible::CLI::Agent do
 
   describe '#db:reload' do
     before { allow(Aptible::Api::Account).to receive(:all) { [account] } }
-    before { allow(Aptible::Api::Database).to receive(:all) { [database] } }
 
     let(:op) { Fabricate(:operation) }
 
@@ -664,6 +676,7 @@ describe Aptible::CLI::Agent do
     end
 
     it 'fails if the DB is not found' do
+      allow(Aptible::Api::Database).to receive(:find_by_url).and_return(nil)
       expect { subject.send('db:reload', 'nope') }
         .to raise_error(Thor::Error, 'Could not find database nope')
     end
@@ -671,7 +684,6 @@ describe Aptible::CLI::Agent do
 
   describe '#db:restart' do
     before { allow(Aptible::Api::Account).to receive(:all) { [account] } }
-    before { allow(Aptible::Api::Database).to receive(:all) { [database] } }
 
     let(:op) { Fabricate(:operation) }
 
@@ -736,6 +748,7 @@ describe Aptible::CLI::Agent do
     end
 
     it 'fails if the DB is not found' do
+      allow(Aptible::Api::Database).to receive(:find_by_url).and_return(nil)
       expect { subject.send('db:restart', 'nope') }
         .to raise_error(Thor::Error, 'Could not find database nope')
     end
@@ -743,7 +756,6 @@ describe Aptible::CLI::Agent do
 
   describe '#db:modify' do
     before { allow(Aptible::Api::Account).to receive(:all) { [account] } }
-    before { allow(Aptible::Api::Database).to receive(:all) { [database] } }
 
     let(:op) { Fabricate(:operation) }
 
@@ -783,16 +795,15 @@ describe Aptible::CLI::Agent do
     end
 
     it 'fails if the DB is not found' do
+      allow(Aptible::Api::Database).to receive(:find_by_url).and_return(nil)
       expect { subject.send('db:modify', 'nope') }
         .to raise_error(Thor::Error, 'Could not find database nope')
     end
   end
 
   describe '#db:url' do
-    let(:databases) { [database] }
-    before { expect(Aptible::Api::Database).to receive(:all) { databases } }
-
     it 'fails if the DB is not found' do
+      allow(Aptible::Api::Database).to receive(:find_by_url).and_return(nil)
       expect { subject.send('db:url', 'nope') }
         .to raise_error(Thor::Error, 'Could not find database nope')
     end
@@ -808,7 +819,12 @@ describe Aptible::CLI::Agent do
       end
 
       it 'fails if multiple DBs are found' do
-        databases << database
+        error = HyperResource::ClientError.new('multiple resources found')
+        allow(error).to receive(:body)
+          .and_return('error' => 'multiple_resources_found')
+        allow(Aptible::Api::Database).to receive(:find_by_url)
+          .with("/find/database?handle=#{handle}", token: token)
+          .and_raise(error)
 
         expect { subject.send('db:url', handle) }
           .to raise_error(/Multiple databases/)
@@ -817,16 +833,18 @@ describe Aptible::CLI::Agent do
   end
 
   describe '#db:replicate' do
-    let(:databases) { [] }
-    before { allow(Aptible::Api::Database).to receive(:all) { databases } }
+    let(:master) { Fabricate(:database, handle: 'master') }
+    let(:replica) { Fabricate(:database, account: master.account, handle: 'replica') }
+    before do
+      allow(Aptible::Api::Database).to receive(:find_by_url)
+        .with("/find/database?handle=#{master.handle}", token: token)
+        .and_return(master)
+      allow(Aptible::Api::Database).to receive(:find_by_url)
+        .with("/find/database?handle=#{replica.handle}&environment=#{account.handle}", token: token)
+        .and_return(replica)
+    end
 
     def expect_replicate_database(opts = {})
-      master = Fabricate(:database, handle: 'master')
-      databases << master
-      replica = Fabricate(:database,
-                          account: master.account,
-                          handle: 'replica')
-
       op = Fabricate(:operation)
 
       params = { type: 'replicate', handle: 'replica' }.merge(opts)
@@ -835,7 +853,6 @@ describe Aptible::CLI::Agent do
         .with(**params).and_return(op)
 
       expect(subject).to receive(:attach_to_operation_logs).with(op) do
-        databases << replica
         replica
       end
 
@@ -867,17 +884,12 @@ describe Aptible::CLI::Agent do
     end
 
     it 'fails if the DB is not found' do
+      allow(Aptible::Api::Database).to receive(:find_by_url).and_return(nil)
       expect { subject.send('db:replicate', 'nope', 'replica') }
         .to raise_error(Thor::Error, 'Could not find database nope')
     end
 
     it 'allows logical replication of a database with --version set' do
-      master = Fabricate(:database, handle: 'master')
-      databases << master
-      replica = Fabricate(:database,
-                          account: master.account,
-                          handle: 'replica')
-
       dbimg = Fabricate(:database_image,
                         type: 'postgresql',
                         version: 10,
@@ -894,7 +906,6 @@ describe Aptible::CLI::Agent do
         .with(**params).and_return(op)
 
       expect(subject).to receive(:attach_to_operation_logs).with(op) do
-        databases << replica
         replica
       end
 
@@ -914,9 +925,6 @@ describe Aptible::CLI::Agent do
     end
 
     it 'fails if logical replication requested without --version' do
-      master = Fabricate(:database, handle: 'master', type: 'postgresql')
-      databases << master
-
       subject.options = { type: 'replicate', handle: 'replica', logical: true }
       expect { subject.send('db:replicate', 'master', 'replica') }
         .to raise_error(Thor::Error, '--version is required for logical ' \
@@ -924,9 +932,7 @@ describe Aptible::CLI::Agent do
     end
 
     it 'fails if logical replication requested for non-postgres db' do
-      master = Fabricate(:database, handle: 'master', type: 'mysql')
-      databases << master
-
+      master.type = 'mysql'
       subject.options = { type: 'replicate', handle: 'replica',
                           logical: true, version: 10 }
       expect { subject.send('db:replicate', 'master', 'replica') }
@@ -937,17 +943,13 @@ describe Aptible::CLI::Agent do
 
   describe '#db:dump' do
     it 'should fail if database is non-existent' do
-      allow(Aptible::Api::Database).to receive(:all) { [] }
+      allow(Aptible::Api::Database).to receive(:find_by_url).and_return(nil)
       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] }
-      end
-
       it 'exits with the same code as pg_dump' do
         exit_status = 123
         cred = Fabricate(:database_credential, default: true, type: 'foo',
@@ -1132,7 +1134,7 @@ describe Aptible::CLI::Agent do
   describe '#db:execute' do
     sql_path = 'file.sql'
     it 'should fail if database is non-existent' do
-      allow(Aptible::Api::Database).to receive(:all) { [] }
+      allow(Aptible::Api::Database).to receive(:find_by_url).and_return(nil)
       expect do
         subject.send('db:execute', handle, sql_path)
       end.to raise_error("Could not find database #{handle}")
@@ -1140,7 +1142,6 @@ describe Aptible::CLI::Agent do
 
     context 'valid database' do
       before do
-        allow(Aptible::Api::Database).to receive(:all) { [database] }
         allow(subject).to receive(:`).with(/psql .*/) { `exit 0` }
       end
 
@@ -1338,8 +1339,6 @@ describe Aptible::CLI::Agent do
   end
 
   describe '#db:deprovision' do
-    before { expect(Aptible::Api::Database).to receive(:all) { [database] } }
-
     let(:operation) { Fabricate(:operation, resource: database) }
 
     it 'deprovisions a database' do
@@ -1409,7 +1408,9 @@ describe Aptible::CLI::Agent do
     before do
       allow(subject).to receive(:options)
         .and_return(environment: account.handle)
-      allow(Aptible::Api::Account).to receive(:all) { [account] }
+      allow(Aptible::Api::Account).to receive(:find_by_url)
+        .with("/find/account?handle=#{account.handle}", token: token)
+        .and_return(account)
     end
     context 'with environment and db' do
       it 'should rename properly' do
@@ -1422,6 +1423,7 @@ describe Aptible::CLI::Agent do
         )
       end
       it 'should fail if db does not exist' do
+        allow(Aptible::Api::Database).to receive(:find_by_url).and_return(nil)
         expect { subject.send('db:rename', 'foo2', 'foo3') }
           .to raise_error(/Could not find database foo2/)
       end

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

@@ -4,12 +4,17 @@ describe Aptible::CLI::Agent do
   let!(:account) { Fabricate(:account, handle: 'foobar') }
   let!(:app) { Fabricate(:app, handle: 'hello', account: account) }
   let(:operation) { Fabricate(:operation) }
+  let(:token) { double 'token' }
 
   describe '#deploy' do
     before do
-      allow(Aptible::Api::App).to receive(:all) { [app] }
-      allow(Aptible::Api::Account).to receive(:all) { [account] }
-      allow(subject).to receive(:fetch_token) { double'token' }
+      allow(Aptible::Api::App).to receive(:find_by_url)
+        .with("/find/app?handle=#{app.handle}&environment=#{account.handle}", token: token)
+        .and_return(app)
+      allow(subject).to receive(:fetch_token) { token }
+      allow(Aptible::Api::Account).to receive(:find_by_url)
+        .with("/find/account?handle=#{account.handle}", token: token)
+        .and_return(account)
     end
 
     context 'with app' do

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

@@ -12,6 +12,9 @@ describe Aptible::CLI::Agent do
       .to receive(:all)
       .with(token: token, href: '/accounts?per_page=5000&no_embed=true')
       .and_return([a1, a2])
+    allow(Aptible::Api::Account).to receive(:find_by_url)
+      .with("/find/account?handle=#{a2.handle}", token: token)
+      .and_return(a2)
   end
 
   def expect_create_certificate(account, options)
@@ -67,10 +70,12 @@ describe Aptible::CLI::Agent do
     end
 
     before do
-      allow(Aptible::Api::Database)
-        .to receive(:all)
-        .with(token: token, href: '/databases?per_page=5000&no_embed=true')
-        .and_return([db, incomplete])
+      allow(Aptible::Api::Database).to receive(:find_by_url)
+        .with("/find/database?handle=#{incomplete.handle}", token: token)
+        .and_return(incomplete)
+      allow(Aptible::Api::Database).to receive(:find_by_url)
+        .with("/find/database?handle=#{db.handle}", token: token)
+        .and_return(db)
       allow(db).to receive(:class).and_return(Aptible::Api::Database)
       allow(incomplete).to receive(:class).and_return(Aptible::Api::Database)
       stub_options
@@ -78,6 +83,7 @@ describe Aptible::CLI::Agent do
 
     describe 'endpoints:database:create' do
       it 'fails if the DB does not exist' do
+        allow(Aptible::Api::Database).to receive(:find_by_url).and_return(nil)
         expect { subject.send('endpoints:database:create', 'some') }
           .to raise_error(/could not find database some/im)
       end
@@ -90,6 +96,9 @@ describe Aptible::CLI::Agent do
 
       it 'fails if the DB is not in the account' do
         stub_options(environment: 'bar')
+        expect(Aptible::Api::Database).to receive(:find_by_url)
+          .with("/find/database?handle=#{db.handle}&environment=bar", token: token)
+          .and_return(nil)
         expect { subject.send('endpoints:database:create', 'mydb') }
           .to raise_error(/could not find database mydb/im)
       end
@@ -223,6 +232,13 @@ describe Aptible::CLI::Agent do
         .to receive(:all)
         .with(token: token, href: '/apps?per_page=5000&no_embed=true')
         .and_return([app])
+
+      allow(Aptible::Api::App).to receive(:find_by_url)
+        .and_return(nil)
+      allow(Aptible::Api::App).to receive(:find_by_url)
+        .with("/find/app?handle=#{app.handle}", token: token)
+        .and_return(app)
+
       allow(app).to receive(:class).and_return(Aptible::Api::App)
       stub_options
     end

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

@@ -16,6 +16,9 @@ describe Aptible::CLI::Agent do
       .to receive(:all)
       .with(token: token, href: '/accounts?per_page=5000&no_embed=true')
       .and_return([a1, a2])
+    allow(Aptible::Api::Account).to receive(:find_by_url)
+      .with("/find/account?handle=#{a1.handle}", token: token)
+      .and_return(a1)
   end
 
   describe('#environment:list') do
@@ -123,6 +126,7 @@ describe Aptible::CLI::Agent do
       )
     end
     it 'should fail if env does not exist' do
+      allow(Aptible::Api::Account).to receive(:find_by_url).and_return(nil)
       expect { subject.send('environment:rename', 'foo1', 'foo2') }
         .to raise_error(/Could not find environment foo1/)
     end

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

@@ -22,6 +22,10 @@ describe Aptible::CLI::Agent do
       .with(token: token, href: '/accounts?per_page=5000&no_embed=true')
       .and_return([account])
 
+    allow(Aptible::Api::Account).to receive(:find_by_url)
+      .with("/find/account?handle=#{account.handle}", token: token)
+      .and_return(account)
+
     allow(account).to receive(:reload).and_return(account)
   end
 
@@ -87,6 +91,11 @@ describe Aptible::CLI::Agent do
 
     context 'elasticsearch' do
       let(:db) { Fabricate(:database, account: account, id: 5) }
+      before do
+        allow(Aptible::Api::Database).to receive(:find_by_url)
+          .with("/find/database?handle=#{db.handle}&environment=#{db.account.handle}", token: token)
+          .and_return(db)
+      end
 
       it 'creates a new Elasticsearch log drain' do
         opts = {

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

@@ -4,18 +4,23 @@ describe Aptible::CLI::Agent do
   before do
     allow(subject).to receive(:ask)
     allow(subject).to receive(:save_token)
-    allow(subject).to receive(:fetch_token) { 'some token' }
+    allow(subject).to receive(:fetch_token) { token }
   end
 
+  let(:token) { 'some token' }
   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 do
+      allow(Aptible::Api::Account).to receive(:all) { [app.account] }
+      allow(Aptible::Api::App).to receive(:find_by_url)
+        .with("/find/app?handle=#{app.handle}", token: 'some token')
+        .and_return(app)
+    end
 
     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
@@ -35,7 +40,14 @@ describe Aptible::CLI::Agent do
     end
 
     context 'Database resource' do
-      before { allow(Aptible::Api::Database).to receive(:all) { [database] } }
+      before do
+        allow(Aptible::Api::Database).to receive(:find_by_url)
+          .with("/find/database?handle=#{database.handle}&environment=#{database.account.handle}", token: token)
+          .and_return(database)
+        allow(Aptible::Api::Database).to receive(:find_by_url)
+          .with("/find/database?handle=#{database.handle}", token: token)
+          .and_return(database)
+      end
       before { subject.options = { database: database.handle } }
 
       it 'should fail if the database is unprovisioned' do

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

@@ -9,6 +9,9 @@ describe Aptible::CLI::Agent do
     allow(subject).to receive(:ask)
     allow(subject).to receive(:save_token)
     allow(subject).to receive(:fetch_token) { token }
+    allow(Aptible::Api::Account).to receive(:find_by_url)
+      .with("/find/account?handle=#{staging.handle}", token: token)
+      .and_return(staging)
   end
 
   let(:handle) { 'foobar' }
@@ -52,7 +55,6 @@ describe Aptible::CLI::Agent do
 
   describe '#maintenance:dbs' do
     before do
-      token = 'the-token'
       allow(subject).to receive(:fetch_token) { token }
       allow(Aptible::Api::Account).to receive(:all)
         .with(token: token, href: '/accounts?per_page=5000&no_embed=true')
@@ -112,6 +114,8 @@ describe Aptible::CLI::Agent do
     end
 
     context 'when an invalid account is specified' do
+      before { allow(Aptible::Api::Account).to receive(:find_by_url).and_return(nil) }
+
       it 'prints out an error' do
         subject.options = { environment: 'foo' }
         expect { subject.send('maintenance:dbs') }
@@ -121,7 +125,6 @@ describe Aptible::CLI::Agent do
   end
   describe '#maintenance:apps' do
     before do
-      token = 'the-token'
       allow(subject).to receive(:fetch_token) { token }
       allow(Aptible::Api::Account).to receive(:all)
         .with(token: token, href: '/accounts?per_page=5000&no_embed=true')
@@ -180,6 +183,8 @@ describe Aptible::CLI::Agent do
     end
 
     context 'when an invalid account is specified' do
+      before { allow(Aptible::Api::Account).to receive(:find_by_url).and_return(nil) }
+
       it 'prints out an error' do
         subject.options = { environment: 'foo' }
         expect { subject.send('maintenance:apps') }

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

@@ -21,6 +21,10 @@ describe Aptible::CLI::Agent do
     allow(Aptible::Api::Account).to receive(:all)
       .with(token: token, href: '/accounts?per_page=5000&no_embed=true')
       .and_return([account])
+
+    allow(Aptible::Api::Account).to receive(:find_by_url)
+      .with("/find/account?handle=#{account.handle}", token: token)
+      .and_return(account)
   end
 
   describe '#metric_drain:list' do
@@ -57,8 +61,6 @@ describe Aptible::CLI::Agent do
     it 'lists metric drains for a single account with --environment' do
       other_account = Fabricate(:account)
       Fabricate(:metric_drain, handle: 'test2', account: other_account)
-      accounts = [account, other_account]
-      allow(Aptible::Api::Account).to receive(:all).and_return(accounts)
 
       subject.options = { environment: account.handle }
       subject.send('metric_drain:list')
@@ -86,6 +88,12 @@ describe Aptible::CLI::Agent do
     context 'influxdb' do
       let(:db) { Fabricate(:database, account: account, id: 5) }
 
+      before do
+        allow(Aptible::Api::Database).to receive(:find_by_url)
+          .with("/find/database?handle=#{db.handle}&environment=#{db.account.handle}", token: token)
+          .and_return(db)
+      end
+
       it 'creates a new InfluxDB metric drain' do
         opts = {
           handle: 'test-influxdb',

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

@@ -6,10 +6,9 @@ describe Aptible::CLI::Agent do
 
   before do
     allow(subject).to receive(:fetch_token) { token }
-    allow(Aptible::Api::App)
-      .to receive(:all)
-      .with(token: token, href: '/apps?per_page=5000&no_embed=true')
-      .and_return([app])
+    allow(Aptible::Api::App).to receive(:find_by_url)
+      .with("/find/app?handle=#{app.handle}", token: token)
+      .and_return(app)
   end
 
   describe '#services' do

data/spec/spec_helper.rb

@@ -81,6 +81,8 @@ module SpecHarness
 end
 
 RSpec.configure do |config|
+  config.example_status_persistence_file_path = 'spec/reports/examples.txt'
+
   config.before(:each) do
     reset_spec_harness
     begin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aptible-cli
 version: !ruby/object:Gem::Version
-  version: 0.26.4
+  version: 0.26.5
 platform: ruby
 authors:
 - Frank Macreery