aptible-cli 0.26.2 → 0.26.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 800b50ac57828f37560b0a291a280fbf4e9bbf121b35fd812d662e45ef39bd45
-  data.tar.gz: e0c70006be582d93f6e5648fae3894a481bde9cc9b43042ee399e745790aac95
+  metadata.gz: 1c756f930a26ab5b060f01270b80c9ec2963c8f739be4ffcd2a5d56e9dac2860
+  data.tar.gz: 55fdde5cde257bd36c6c16a17e7f639745f85947b1cf40269c0d73ab0093615c
 SHA512:
-  metadata.gz: 3653523bd6b9f944e5f88128a63c058aee80722288a44f5886393059f8b1ca2f7c506c45a7df06e0794ba75814574e36372ff02c73ee1efcd1c20ee803b1d0a1
-  data.tar.gz: a47e8d8f71c9ac07d5001ad65616ac123884ac97ed5ab151d6d8895564bffffa623e1ef055b32fc3d4d0c661a9e71b72859b84480bde108f645f7ce33252e81f
+  metadata.gz: 01122dab06813f9b67100c11e6e59ec6942f5263340efc26bbf73440b51c39c7cd0be7258b987fa39056092b29bf181ded4d14423d27ff795cd18bf85b97fe96
+  data.tar.gz: d7ed67882c43c958dcc60c7ef5ba518f3eb6ad72ca014f4c0b761478f2748054af64286aca26b8ac97b5ca5ea03964bc34fd422d3cf42f4996b4c6949815d870

data/.rubocop.yml

@@ -0,0 +1,5 @@
+inherit_gem:
+  aptible-tasks: .rubocop.yml
+
+Metrics/LineLength:
+  Max: 120

data/Gemfile.lock

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

data/lib/aptible/cli/agent.rb

@@ -92,10 +92,13 @@ module Aptible
           level = Logger::WARN
           debug_level = ENV['APTIBLE_DEBUG']
           level = debug_level if debug_level
-          require 'httplog' if ENV['BUNDLER_VERSION'] && \
-                               ENV['APTIBLE_LOG_HTTP_REQUEST_RESPONSE'] && \
-                               !ENV['APTIBLE_LOG_HTTP_REQUEST_RESPONSE'] \
-                               .downcase.start_with?('f')
+          if ENV['BUNDLER_VERSION'] && \
+             ENV['APTIBLE_LOG_HTTP_REQUEST_RESPONSE'] && \
+             !ENV['APTIBLE_LOG_HTTP_REQUEST_RESPONSE'] \
+             .downcase.start_with?('f')
+            require 'httplog'
+            HttpLog.configure { |c| c.log_headers = true }
+          end
           conf.logger.tap { |l| l.level = level }
         end
         warn_sso_enforcement

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

@@ -196,6 +196,17 @@ module Aptible
           raise Thor::Error, "Invalid argument: #{k}" if v.nil?
         end
 
+        def current_configuration(app)
+          conf_link = app.links['current_configuration']
+          return unless conf_link
+
+          Aptible::Api::Configuration.find_by_url(
+            conf_link.href,
+            token: fetch_token,
+            headers: { 'Prefer' => 'no_sensitive_extras=false' }
+          )
+        end
+
         private
 
         def handle_strategies

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

@@ -185,6 +185,14 @@ module Aptible
         # Creates a local tunnel and yields the helper
 
         def with_local_tunnel(credential, port = 0, target_account = nil)
+          # Credential has the senstive header set, and for some reason
+          # credential.create_operation! _lists all operations_. This would
+          # generate a show activity for every previous tunnel operation.
+          # So, we strip the sensitive header first to prevent that from happening
+          # This will also strip the connection_url, but we don't need it from
+          # this point on.
+          credential = without_sensitive(credential)
+          # Twice by here??
           op = if target_account.nil?
                  credential.create_operation!(
                    type: 'tunnel',
@@ -284,7 +292,7 @@ module Aptible
             raise Thor::Error, 'This command only works for PostgreSQL'
           end
 
-          credential = find_credential(database)
+          credential, _credentials = find_credential(database)
 
           with_local_tunnel(credential) do |tunnel_helper|
             yield local_url(credential, tunnel_helper.port)
@@ -304,7 +312,7 @@ module Aptible
           remote_url = credential.connection_url
 
           uri = URI.parse(remote_url)
-          domain = credential.database.account.stack.internal_domain
+          domain = without_sensitive(credential).database.account.stack.internal_domain
           "#{uri.scheme}://#{uri.user}:#{uri.password}@" \
           "localhost.#{domain}:#{local_port}#{uri.path}"
         end
@@ -314,21 +322,25 @@ module Aptible
             raise Thor::Error, "Database #{database.handle} is not provisioned"
           end
 
+          # Get the database credentials, without going using `with_senstive(database)`, as that
+          # would get the embedded last_operation, and generate an extra show activity
+          creds_link = database.links['database_credentials']
+          database_credentials = Aptible::Api::DatabaseCredential.all(
+            href: creds_link.href,
+            token: fetch_token,
+            headers: { 'Prefer' => 'no_sensitive_extras=false' }
+          )
+
           finder = proc { |c| c.default }
           finder = proc { |c| c.type == type } if type
-          credential = database.database_credentials.find(&finder)
+          credential = database_credentials.find(&finder)
 
-          return credential if credential
+          # It may be weird to return the credential and all the credentials, but the db:tunnel
+          # command lists all the credential types if you do not provide one, and we want to avoid
+          # generating more show activity than needed
+          return credential, database_credentials if credential
 
-          types = database.database_credentials.map(&:type)
-
-          # On v1, we fallback to the DB. We make sure to make --type work, to
-          # avoid a confusing experience for customers.
-          if database.account.stack.version == 'v1'
-            types << database.type
-            types.uniq!
-            return database if type.nil? || type == database.type
-          end
+          types = database_credentials.map(&:type)
 
           valid = types.join(', ')
 
@@ -365,6 +377,10 @@ module Aptible
         end
 
         def render_database(database, account)
+          # Maybe reload with senstive data
+          # Definately don't load the embedded last_operation
+          database.href = database.href + '?no_embed=true'
+          database = with_sensitive(database) if database.connection_url.nil?
           Formatter.render(Renderer.current) do |root|
             root.keyed_object('connection_url') do |node|
               ResourceFormatter.inject_database(node, database, account)

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

@@ -65,7 +65,9 @@ module Aptible
         end
 
         def ensure_log_drain(account, handle)
-          drains = account.log_drains.select { |d| d.handle == handle }
+          link = account.links['log_drains'].base_href
+          account_drains = Aptible::Api::LogDrain.all(href: link, token: fetch_token)
+          drains = account_drains.select { |d| d.handle == handle }
 
           if drains.empty?
             raise Thor::Error, "No drain found with handle #{handle}"

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

@@ -19,7 +19,9 @@ module Aptible
         end
 
         def ensure_metric_drain(account, handle)
-          drains = account.metric_drains.select { |d| d.handle == handle }
+          link = account.links['metric_drains'].base_href
+          account_drains = Aptible::Api::MetricDrain.all(href: link, token: fetch_token)
+          drains = account_drains.select { |d| d.handle == handle }
 
           if drains.empty?
             raise Thor::Error, "No drain found with handle #{handle}"

data/lib/aptible/cli/resource_formatter.rb

@@ -128,6 +128,10 @@ module Aptible
         end
 
         def inject_database(node, database, account)
+          # Some callers pass a database object with sensitive attributes already, others do not.
+          # Avoid creating extra 'show' activity if we already have the needed info
+          database = with_sensitive(database) if database.objects[:database_credentials].nil?
+
           node.value('id', database.id)
           node.value('handle', database.handle)
           node.value('created_at', database.created_at)
@@ -243,6 +247,9 @@ module Aptible
                      log_drain.drain_ephemeral_sessions)
           node.value('drain_proxies', log_drain.drain_proxies)
 
+          # These can be either optional for the drain type,
+          # or sensitive attributes we don't need to worry about
+          # in text output
           optional_attrs = %w(drain_username drain_host drain_port url)
           optional_attrs.each do |attr|
             value = log_drain.attributes[attr]
@@ -257,7 +264,13 @@ module Aptible
           node.value('handle', metric_drain.handle)
           node.value('drain_type', metric_drain.drain_type)
           node.value('created_at', metric_drain.created_at)
-          node.value('drain_configuration', metric_drain.drain_configuration)
+
+          # Sensitive attributes we don't need to worry about being missing in text output
+          optional_attrs = %w(drain_configuration)
+          optional_attrs.each do |attr|
+            value = metric_drain.attributes[attr]
+            node.value(attr, value) unless value.nil?
+          end
 
           attach_account(node, account)
         end

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

@@ -15,7 +15,7 @@ module Aptible
               telemetry(__method__, options)
 
               app = ensure_app(options)
-              config = app.current_configuration
+              config = current_configuration(app)
               env = config ? config.env : {}
 
               Formatter.render(Renderer.current) do |root|
@@ -38,7 +38,7 @@ module Aptible
               telemetry(__method__, options)
 
               app = ensure_app(options)
-              config = app.current_configuration
+              config = current_configuration(app)
               env = config ? config.env : {}
 
               Formatter.render(Renderer.current) do |root|

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

@@ -335,13 +335,13 @@ module Aptible
               return use_rds_tunnel(handle, desired_port) if aws_rds_db?(handle)
 
               database = ensure_database(options.merge(db: handle))
-              credential = find_credential(database, options[:type])
+              credential, credentials = find_credential(database, options[:type])
 
               m = "Creating #{credential.type} tunnel to #{database.handle}..."
               CLI.logger.info m
 
               if options[:type].nil?
-                types = database.database_credentials.map(&:type)
+                types = credentials.map(&:type)
                 unless types.empty?
                   valid = types.join(', ')
                   CLI.logger.info 'Use --type TYPE to specify a tunnel type'
@@ -481,7 +481,8 @@ module Aptible
               telemetry(__method__, options.merge(handle: handle))
 
               database = ensure_database(options.merge(db: handle))
-              credential = find_credential(database, options[:type])
+
+              credential, _credentials = find_credential(database, options[:type])
 
               Formatter.render(Renderer.current) do |root|
                 root.keyed_object('connection_url') do |node|

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

@@ -44,6 +44,8 @@ module Aptible
                     account = acc_map[drain.links.account.href]
                     next if account.nil?
 
+                    # JSON output format we potentially show sensitive attributes
+                    drain = with_sensitive(drain) if Renderer.format == 'json'
                     node.object do |n|
                       ResourceFormatter.inject_log_drain(n, drain, account)
                     end

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

@@ -134,11 +134,11 @@ module Aptible
                   options[:string_matches]
                 )
               elsif id_options.any?
-                if options[:container_id]
-                  search_attrs = { container_id: options[:container_id] }
-                else
-                  search_attrs = { type: r_type, id: id_options.compact.first }
-                end
+                search_attrs = if options[:container_id]
+                                 { container_id: options[:container_id] }
+                               else
+                                 { type: r_type, id: id_options.compact.first }
+                               end
                 files = find_s3_files_by_attrs(
                   options[:region],
                   options[:bucket],

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

@@ -38,6 +38,8 @@ module Aptible
                     account = acc_map[drain.links.account.href]
                     next if account.nil?
 
+                    # JSON output format we potentially show sensitive attributes
+                    drain = with_sensitive(drain) if Renderer.format == 'json'
                     node.object do |n|
                       ResourceFormatter.inject_metric_drain(n, drain, account)
                     end

data/lib/aptible/cli/version.rb

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

data/lib/aptible/cli.rb

@@ -7,6 +7,20 @@ require 'aptible/cli/formatter'
 require 'aptible/cli/renderer'
 require 'aptible/cli/resource_formatter'
 
+# Set no_sensitive_extras=true as the default for all API resources.
+# This avoids returning sensitive embedded data unless explicitly requested.
+Aptible::Api::Resource.headers = { 'Prefer' => 'no_sensitive_extras=true' }
+
+def with_sensitive(resource)
+  resource.headers['Prefer'] = 'no_sensitive_extras=false'
+  resource.find_by_url(resource.href)
+end
+
+def without_sensitive(resource)
+  resource.headers['Prefer'] = 'no_sensitive_extras=true'
+  resource.find_by_url(resource.href)
+end
+
 module Aptible
   module CLI
     class TtyLogFormatter

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

@@ -17,6 +17,9 @@ describe Aptible::CLI::Agent do
   end
 
   before { allow(subject).to receive(:options) { { app: app.handle } } }
+  before do
+    allow(subject).to receive(:current_configuration, &:current_configuration)
+  end
   let(:operation) { Fabricate(:operation, resource: app) }
 
   describe '#config' do
@@ -60,6 +63,11 @@ describe Aptible::CLI::Agent do
   end
 
   describe '#config:get' do
+    it 'shows nothing for an unconfigured app' do
+      subject.send('config:get', 'FOO')
+      expect(captured_output_text).to eq('')
+    end
+
     it 'should show single environment variable specified' do
       app.current_configuration = Fabricate(
         :configuration, app: app, env: { 'FOO' => 'BAR', 'QUX' => 'two words' }

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

@@ -10,6 +10,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::DatabaseCredential).to receive(:all) do
+      database.database_credentials
+    end
   end
 
   let(:handle) { 'foobar' }
@@ -226,41 +229,6 @@ describe Aptible::CLI::Agent do
         expect { subject.send('db:tunnel', handle) }
           .to raise_error(/foobar is not provisioned/im)
       end
-
-      context 'v1 stack' do
-        before do
-          allow(database.account.stack).to receive(:version) { 'v1' }
-        end
-
-        it 'falls back to the database itself if no type is given' do
-          expect(subject).to receive(:with_local_tunnel).with(database, 0)
-          subject.send('db:tunnel', handle)
-        end
-
-        it 'falls back to the database itself if type matches' do
-          subject.options = { type: 'bar' }
-          allow(database).to receive(:type) { 'bar' }
-
-          expect(subject).to receive(:with_local_tunnel).with(database, 0)
-          subject.send('db:tunnel', handle)
-        end
-
-        it 'does not fall back to the database itself if type mismatches' do
-          subject.options = { type: 'bar' }
-          allow(database).to receive(:type) { 'foo' }
-
-          expect { subject.send('db:tunnel', handle) }
-            .to raise_error(/no credential with type bar/im)
-        end
-
-        it 'does not suggest other types that do not exist' do
-          expect(subject).to receive(:with_local_tunnel).with(database, 0)
-
-          subject.send('db:tunnel', handle)
-
-          expect(captured_logs).not_to match(/use --type type/i)
-        end
-      end
     end
   end
 
@@ -845,22 +813,6 @@ describe Aptible::CLI::Agent do
         expect { subject.send('db:url', handle) }
           .to raise_error(/Multiple databases/)
       end
-
-      context 'v1 stack' do
-        before do
-          allow(database.account.stack).to receive(:version) { 'v1' }
-        end
-
-        it 'returns the URL of a specified DB' do
-          connection_url = 'postgresql://aptible-v1:password@lega.cy:4242/db'
-          expect(database).to receive(:connection_url)
-            .and_return(connection_url)
-
-          subject.send('db:url', handle)
-
-          expect(captured_output_text.chomp).to eq(connection_url)
-        end
-      end
     end
   end
 

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

@@ -14,9 +14,15 @@ describe Aptible::CLI::Agent do
       .with(token: token, href: '/log_drains?per_page=5000')
       .and_return([log_drain])
 
+    allow(Aptible::Api::LogDrain).to receive(:all)
+      .with(token: token, href: "/accounts/#{account.id}/log_drains")
+      .and_return([log_drain])
+
     allow(Aptible::Api::Account).to receive(:all)
       .with(token: token, href: '/accounts?per_page=5000&no_embed=true')
       .and_return([account])
+
+    allow(account).to receive(:reload).and_return(account)
   end
 
   describe '#log_drain:list' do

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

@@ -14,6 +14,10 @@ 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])

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'
 

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.4
 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