aptible-cli 0.26.2 → 0.26.5

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

@@ -14,9 +14,17 @@ describe Aptible::CLI::Agent do
       .with(token: token, href: '/metric_drains?per_page=5000')
       .and_return([metric_drain])
 
+    allow(Aptible::Api::MetricDrain).to receive(:all)
+      .with(token: token, href: "/accounts/#{account.id}/metric_drains")
+      .and_return([metric_drain])
+
     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
@@ -53,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')
@@ -82,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/fabricators/account_fabricator.rb

@@ -1,4 +1,4 @@
-class StubAccount < OpenStruct
+class StubAccount < StubAptibleResource
   def each_app(&block)
     return enum_for(:each_app) if block.nil?
     apps.each(&block)
@@ -34,6 +34,14 @@ Fabricator(:account, from: :stub_account) do
     hash = {
       self: OpenStruct.new(
         href: "/accounts/#{attrs[:id]}"
+      ),
+      metric_drains: OpenStruct.new(
+        base_href: "/accounts/#{attrs[:id]}/metric_drains",
+        href: "/accounts/#{attrs[:id]}/metric_drains"
+      ),
+      log_drains: OpenStruct.new(
+        base_href: "/accounts/#{attrs[:id]}/log_drains",
+        href: "/accounts/#{attrs[:id]}/log_drains"
       )
     }
     OpenStruct.new(hash)

data/spec/fabricators/app_external_aws_rds_connection_fabricator.rb

@@ -1,4 +1,4 @@
-class StubAppExternalAwsRdsConnection < OpenStruct
+class StubAppExternalAwsRdsConnection < StubAptibleResource
   def attributes
     {
       'id' => id,

data/spec/fabricators/app_fabricator.rb

@@ -1,4 +1,4 @@
-class StubApp < OpenStruct
+class StubApp < StubAptibleResource
   def vhosts
     services.map(&:vhosts).flatten
   end

data/spec/fabricators/backup_fabricator.rb

@@ -1,4 +1,4 @@
-class StubBackup < OpenStruct; end
+class StubBackup < StubAptibleResource; end
 
 Fabricator(:backup, from: :stub_backup) do
   id { sequence(:backup_id) }

data/spec/fabricators/backup_retention_policy_fabricator.rb

@@ -1,4 +1,4 @@
-class StubBackupRetentionPolicy < OpenStruct
+class StubBackupRetentionPolicy < StubAptibleResource
   def reload
     self
   end

data/spec/fabricators/certificate_fabricator.rb

@@ -1,4 +1,4 @@
-class StubCertificate < OpenStruct; end
+class StubCertificate < StubAptibleResource; end
 
 Fabricator(:certificate, from: :stub_certificate) do
   account

data/spec/fabricators/configuration_fabricator.rb

@@ -1,4 +1,4 @@
-class StubConfiguration < OpenStruct
+class StubConfiguration < StubAptibleResource
 end
 
 Fabricator(:configuration, from: :stub_configuration) do

data/spec/fabricators/database_credential_fabricator.rb

@@ -1,4 +1,4 @@
-class StubDatabaseCredential < OpenStruct; end
+class StubDatabaseCredential < StubAptibleResource; end
 
 Fabricator(:database_credential, from: :stub_database_credential) do
   database

data/spec/fabricators/database_disk_fabricator.rb

@@ -1,4 +1,4 @@
-class StubDatabaseDisk < OpenStruct
+class StubDatabaseDisk < StubAptibleResource
 end
 
 Fabricator(:database_disk, from: :stub_database_disk) do

data/spec/fabricators/database_fabricator.rb

@@ -1,7 +1,13 @@
-class StubDatabase < OpenStruct
+class StubDatabase < StubAptibleResource
   def provisioned?
     status == 'provisioned'
   end
+
+  def objects
+    {
+      'database_credentials' => database_credentials
+    }
+  end
 end
 
 Fabricator(:database, from: :stub_database) do
@@ -23,6 +29,9 @@ Fabricator(:database, from: :stub_database) do
     hash = {
       account: OpenStruct.new(
         href: "/accounts/#{attrs[:account].id}"
+      ),
+      database_credentials: OpenStruct.new(
+        href: "/databases/#{attrs[:handle]}/database_credentials"
       )
     }
     OpenStruct.new(hash)

data/spec/fabricators/database_image_fabricator.rb

@@ -1,4 +1,4 @@
-class StubDatabaseImage < OpenStruct
+class StubDatabaseImage < StubAptibleResource
 end
 
 Fabricator(:database_image, from: :stub_database_image) do

data/spec/fabricators/external_aws_account_fabricator.rb

@@ -1,4 +1,4 @@
-class StubExternalAwsAccount < OpenStruct
+class StubExternalAwsAccount < StubAptibleResource
   def attributes
     {
       'aws_account_id' => aws_account_id,

data/spec/fabricators/external_aws_database_credential_fabricator.rb

@@ -1,4 +1,4 @@
-class StubExternalAwsDatabaseCredential < OpenStruct
+class StubExternalAwsDatabaseCredential < StubAptibleResource
   def attributes
     {
       'id' => id,

data/spec/fabricators/external_aws_resource_fabricator.rb

@@ -1,4 +1,4 @@
-class StubExternalAwsResource < OpenStruct
+class StubExternalAwsResource < StubAptibleResource
   def attributes
     {
       'id' => id,

data/spec/fabricators/log_drain_fabricator.rb

@@ -1,4 +1,4 @@
-class StubLogDrain < OpenStruct
+class StubLogDrain < StubAptibleResource
   def attributes
     # I foresee hard-coding values like this
     # being hard to debug in the future,

data/spec/fabricators/maintenance_app_fabricator.rb

@@ -1,4 +1,4 @@
-class StubMaintenanceApp < OpenStruct; end
+class StubMaintenanceApp < StubAptibleResource; end
 
 Fabricator(:maintenance_app, from: :stub_maintenance_app) do
   id { Fabricate.sequence(:app_id) { |i| i } }

data/spec/fabricators/maintenance_database_fabricator.rb

@@ -1,4 +1,4 @@
-class StubMaintenanceDatabase < OpenStruct; end
+class StubMaintenanceDatabase < StubAptibleResource; end
 
 Fabricator(:maintenance_database, from: :stub_maintenance_database) do
   id { Fabricate.sequence(:database_id) { |i| i } }

data/spec/fabricators/metric_drain_fabricator.rb

@@ -1,7 +1,21 @@
-class StubMetricDrain < OpenStruct; end
+class StubMetricDrain < StubAptibleResource
+  def attributes
+    # Don't blame me, I'm just following the example in StubLogDrain,
+    # see the comment there.
+    {
+      'drain_configuration' => drain_configuration
+    }
+  end
+end
 
 Fabricator(:metric_drain, from: :stub_metric_drain) do
   id { sequence(:metric_drain_id) }
+  drain_configuration do
+    {
+      'api_key' => 'asdf',
+      'series_url' => 'https://localhost.aptible.in/api/v1/series'
+    }
+  end
   account
   links do |attrs|
     hash = {

data/spec/fabricators/operation_fabricator.rb

@@ -1,4 +1,4 @@
-class StubOperation < OpenStruct; end
+class StubOperation < StubAptibleResource; end
 
 def mock_logs_url(id)
   "https://api.aptible.com/operations/#{id}/logs"

data/spec/fabricators/service_fabricator.rb

@@ -1,4 +1,4 @@
-class StubService < OpenStruct
+class StubService < StubAptibleResource
   def each_vhost(&block)
     return enum_for(:each_vhost) if block.nil?
     vhosts.each(&block)

data/spec/fabricators/service_sizing_policy_fabricator.rb

@@ -1,4 +1,4 @@
-class StubServiceSizingPolicy < OpenStruct; end
+class StubServiceSizingPolicy < StubAptibleResource; end
 
 Fabricator(:service_sizing_policy, from: :stub_service_sizing_policy) do
   autoscaling 'vertical'

data/spec/fabricators/stack_fabricator.rb

@@ -1,4 +1,4 @@
-class StubStack < OpenStruct; end
+class StubStack < StubAptibleResource; end
 
 Fabricator(:stack, from: :stub_stack) do
   name 'foo'

data/spec/fabricators/vhost_fabricator.rb

@@ -1,4 +1,4 @@
-class StubVhost < OpenStruct; end
+class StubVhost < StubAptibleResource; end
 
 Fabricator(:vhost, from: :stub_vhost) do
   service

data/spec/spec_helper.rb

@@ -8,6 +8,11 @@ Dir["#{File.dirname(__FILE__)}/shared/**/*.rb"].each do |file|
   require file
 end
 
+# Load support files (shared classes used by fabricators, etc.)
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each do |file|
+  require file
+end
+
 # Require library up front
 require 'aptible/cli'
 
@@ -76,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

data/spec/support/stub_aptible_resource.rb

@@ -0,0 +1,25 @@
+class StubAptibleResource < OpenStruct
+  def headers
+    @headers ||= {}
+  end
+
+  def find_by_url(_url)
+    self
+  end
+
+  def href
+    self[:href] || "/#{self.class.resource_path}/#{id}"
+  end
+
+  def self.resource_path
+    name = to_s.sub(/^Stub/, '')
+    snake = name.gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+                .gsub(/([a-z\d])([A-Z])/, '\1_\2')
+                .downcase
+    if snake.end_with?('y')
+      snake.sub(/y$/, 'ies')
+    else
+      "#{snake}s"
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aptible-cli
 version: !ruby/object:Gem::Version
-  version: 0.26.2
+  version: 0.26.5
 platform: ruby
 authors:
 - Frank Macreery
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-02-13 00:00:00.000000000 Z
+date: 2026-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -478,6 +478,7 @@ files:
 - ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - Dockerfile
 - Gemfile
 - Gemfile.lock
@@ -619,6 +620,7 @@ files:
 - spec/script/ssh-spawn
 - spec/shared/mock_ssh_context.rb
 - spec/spec_helper.rb
+- spec/support/stub_aptible_resource.rb
 homepage: https://github.com/aptible/aptible-cli
 licenses:
 - MIT
@@ -712,3 +714,4 @@ test_files:
 - spec/script/ssh-spawn
 - spec/shared/mock_ssh_context.rb
 - spec/spec_helper.rb
+- spec/support/stub_aptible_resource.rb