aptible-cli 0.26.4 → 0.26.6

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)
@@ -22,12 +25,12 @@ describe Aptible::CLI::Agent do
     end
   end
 
-  def expect_create_vhost(service, options)
+  def expect_create_vhost(service, options, settings: nil)
     expect(service).to receive(:create_vhost!).with(
       hash_including(options)
     ) do |args|
       Fabricate(:vhost, service: service, **args).tap do |v|
-        expect_operation(v, 'provision')
+        expect_operation(v, 'provision', settings: settings)
         expect(v).to receive(:reload).and_return(v)
         expect(Aptible::CLI::ResourceFormatter).to receive(:inject_vhost)
           .with(an_instance_of(Aptible::CLI::Formatter::Object), v, service)
@@ -46,8 +49,16 @@ describe Aptible::CLI::Agent do
     end
   end
 
-  def expect_operation(vhost, type)
-    expect(vhost).to receive(:create_operation!).with(type: type) do
+  def expect_operation(vhost, type, settings: nil)
+    expect(vhost).to receive(:create_operation!) do |args|
+      expect(args[:type]).to eq(type)
+
+      if settings.nil?
+        expect(args).not_to have_key(:settings)
+      else
+        expect(args[:settings]).to eq(settings)
+      end
+
       Fabricate(:operation).tap do |o|
         expect(subject).to receive(:attach_to_operation_logs).with(o)
       end
@@ -67,10 +78,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 +91,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 +104,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
@@ -161,7 +178,13 @@ describe Aptible::CLI::Agent do
       it 'lists Endpoints' do
         s = Fabricate(:service, database: db)
         v1 = Fabricate(:vhost, service: s)
+        v1.current_setting = Fabricate(:setting,
+                                       settings: { 'IDLE_TIMEOUT' => '123' },
+                                       vhost: v1)
         v2 = Fabricate(:vhost, service: s)
+        v2.current_setting = Fabricate(:setting,
+                                       settings: { 'FORCE_SSL' => 'true' },
+                                       vhost: v2)
 
         stub_options(database: db.handle)
         subject.send('endpoints:list')
@@ -170,6 +193,8 @@ describe Aptible::CLI::Agent do
 
         expect(lines).to include("Hostname: #{v1.external_host}")
         expect(lines).to include("Hostname: #{v2.external_host}")
+        expect(lines).to include('Idle Timeout: 123')
+        expect(lines).to include('Force SSL: true')
 
         expect(lines[0]).not_to eq("\n")
         expect(lines[-1]).not_to eq("\n")
@@ -223,10 +248,116 @@ 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
 
+    shared_examples 'shared create and modify ALB settings examples' do |method|
+      context 'App Vhost Settings (string)' do
+        string_options = %i(
+          idle_timeout
+          maintenance_page_url
+          release_healthcheck_timeout
+        )
+
+        let(:value) { 'some value' }
+
+        string_options.each do |option|
+          context "--#{option.to_s.tr('_', '-')}" do
+            it 'passes a value if provided' do
+              wanted = { option.to_s.upcase => value }
+              expect_create_vhost(service, {}, { settings: wanted })
+              stub_options(option => value)
+              subject.send(method, 'web')
+            end
+
+            it 'passes nothing if not provided' do
+              expect_create_vhost(service, {})
+              subject.send(method, 'web')
+            end
+
+            context 'reverting to default' do
+              it 'sends an empty string if passed an empty string' do
+                wanted = { option.to_s.upcase => '' }
+                expect_create_vhost(service, {}, { settings: wanted })
+                stub_options(option => '')
+                subject.send(method, 'web')
+              end
+
+              it 'sends an empty string if passed the string "default"' do
+                wanted = { option.to_s.upcase => '' }
+                expect_create_vhost(service, {}, { settings: wanted })
+                stub_options(option => 'default')
+                subject.send(method, 'web')
+              end
+            end
+          end
+        end
+      end
+
+      context '--ssl-protocols-override' do
+        it 'passes a valid non-PFS value' do
+          wanted = { 'SSL_PROTOCOLS_OVERRIDE' => 'TLSv1.2' }
+          expect_create_vhost(service, {}, { settings: wanted })
+          stub_options(ssl_protocols_override: 'TLSv1.2')
+          subject.send(method, 'web')
+        end
+
+        it 'passes a valid PFS value' do
+          wanted = { 'SSL_PROTOCOLS_OVERRIDE' => 'TLSv1.2 PFS' }
+          expect_create_vhost(service, {}, { settings: wanted })
+          stub_options(ssl_protocols_override: 'TLSv1.2 PFS')
+          subject.send(method, 'web')
+        end
+
+        it 'raises an error for an invalid value' do
+          stub_options(ssl_protocols_override: 'TLSv1.0')
+          expect { subject.send(method, 'web') }
+            .to raise_error(/invalid --ssl-protocols-override/im)
+        end
+
+        it 'passes nothing if not provided' do
+          expect_create_vhost(service, {})
+          subject.send(method, 'web')
+        end
+
+        it 'sends an empty string if passed the string "default"' do
+          wanted = { 'SSL_PROTOCOLS_OVERRIDE' => '' }
+          expect_create_vhost(service, {}, { settings: wanted })
+          stub_options(ssl_protocols_override: 'default')
+          subject.send(method, 'web')
+        end
+      end
+
+      context 'App Vhost Settings (boolean)' do
+        boolean_options = %i(
+          force_ssl
+          show_elb_healthchecks
+          strict_health_checks
+        )
+
+        boolean_options.each do |option|
+          [true, false].each do |value|
+            context "--#{value ? '' : 'no-'}#{option.to_s.tr('_', '-')}" do
+              it "sets the value to the string '#{value}'" do
+                wanted = { option.to_s.upcase => value.to_s }
+                expect_create_vhost(service, {}, { settings: wanted })
+                stub_options(option => value)
+                subject.send(method, 'web')
+              end
+            end
+          end
+        end
+      end
+    end
+
     shared_examples 'shared create app vhost examples' do |method|
       context 'App Vhost Options' do
         it 'fails if the app does not exist' do
@@ -424,10 +555,64 @@ describe Aptible::CLI::Agent do
       end
     end
 
+    shared_examples 'shared create idle timeout examples' do |method|
+      context 'IDLE_TIMEOUT' do
+        it 'passes idle_timeout if provided' do
+          expect_create_vhost(service, {}, { settings: { 'IDLE_TIMEOUT' => '30' } })
+          stub_options(idle_timeout: '30')
+          subject.send(method, 'web')
+        end
+      end
+    end
+
+    shared_examples 'shared create non-alb tls settings examples' do |method|
+      context '--ssl-protocols-override' do
+        it 'passes a valid non-PFS value' do
+          wanted = { 'SSL_PROTOCOLS_OVERRIDE' => 'TLSv1.2' }
+          expect_create_vhost(service, {}, { settings: wanted })
+          stub_options(ssl_protocols_override: 'TLSv1.2')
+          subject.send(method, 'web')
+        end
+
+        it 'raises an error for a PFS value' do
+          stub_options(ssl_protocols_override: 'TLSv1.2 PFS')
+          expect { subject.send(method, 'web') }
+            .to raise_error(/pfs.*only.*alb/im)
+        end
+
+        it 'raises an error for an invalid value' do
+          stub_options(ssl_protocols_override: 'TLSv1.0')
+          expect { subject.send(method, 'web') }
+            .to raise_error(/invalid --ssl-protocols-override/im)
+        end
+      end
+
+      context 'SSL_CIPHERS_OVERRIDE' do
+        it 'passes ssl_ciphers_override if provided' do
+          wanted = { 'SSL_CIPHERS_OVERRIDE' => 'HIGH:!aNULL' }
+          expect_create_vhost(service, {}, { settings: wanted })
+          stub_options(ssl_ciphers_override: 'HIGH:!aNULL')
+          subject.send(method, 'web')
+        end
+      end
+
+      context 'DISABLE_WEAK_CIPHER_SUITES' do
+        [true, false].each do |value|
+          it "sets disable_weak_cipher_suites to '#{value}'" do
+            wanted = { 'DISABLE_WEAK_CIPHER_SUITES' => value.to_s }
+            expect_create_vhost(service, {}, { settings: wanted })
+            stub_options(disable_weak_cipher_suites: value)
+            subject.send(method, 'web')
+          end
+        end
+      end
+    end
+
     describe 'endpoints:tcp:create' do
       m = 'endpoints:tcp:create'
       include_examples 'shared create app vhost examples', m
       include_examples 'shared create tcp vhost examples', m
+      include_examples 'shared create idle timeout examples', m
 
       it 'creates a TCP Endpoint' do
         expect_create_vhost(
@@ -449,6 +634,8 @@ describe Aptible::CLI::Agent do
       include_examples 'shared create app vhost examples', m
       include_examples 'shared create tcp vhost examples', m
       include_examples 'shared create tls vhost examples', m
+      include_examples 'shared create idle timeout examples', m
+      include_examples 'shared create non-alb tls settings examples', m
 
       it 'creates a TLS Endpoint' do
         expect_create_vhost(
@@ -468,6 +655,7 @@ describe Aptible::CLI::Agent do
       m = 'endpoints:https:create'
       include_examples 'shared create app vhost examples', m
       include_examples 'shared create tls vhost examples', m
+      include_examples 'shared create and modify ALB settings examples', m
 
       it 'creates a HTTP Endpoint' do
         expect_create_vhost(
@@ -500,6 +688,8 @@ describe Aptible::CLI::Agent do
       m = 'endpoints:grpc:create'
       include_examples 'shared create app vhost examples', m
       include_examples 'shared create tls vhost examples', m
+      include_examples 'shared create idle timeout examples', m
+      include_examples 'shared create non-alb tls settings examples', m
 
       it 'creates a gRPC Endpoint' do
         expect_create_vhost(

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/fabricators/setting_fabricator.rb

@@ -0,0 +1,8 @@
+class StubSetting < StubAptibleResource; end
+
+Fabricator(:setting, from: :stub_setting) do
+  settings { {} }
+  sensitive_settings { {} }
+
+  after_create { |setting| vhost.settings << setting }
+end

data/spec/fabricators/vhost_fabricator.rb

@@ -8,6 +8,8 @@ Fabricator(:vhost, from: :stub_vhost) do
   ip_whitelist { [] }
   container_ports { [] }
   created_at { Time.now }
+  settings { [] }
+  current_setting { nil }
 
   after_create { |vhost| vhost.service.vhosts << vhost }
 end

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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aptible-cli
 version: !ruby/object:Gem::Version
-  version: 0.26.4
+  version: 0.26.6
 platform: ruby
 authors:
 - Frank Macreery
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-12 00:00:00.000000000 Z
+date: 2026-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -563,6 +563,7 @@ files:
 - spec/aptible/cli/helpers/ssh_spec.rb
 - spec/aptible/cli/helpers/token_spec.rb
 - spec/aptible/cli/helpers/tunnel_spec.rb
+- spec/aptible/cli/helpers/vhost/option_set_builder_spec.rb
 - spec/aptible/cli/renderer/json_spec.rb
 - spec/aptible/cli/renderer/text_spec.rb
 - spec/aptible/cli/resource_formatter_spec.rb
@@ -608,6 +609,7 @@ files:
 - spec/fabricators/operation_fabricator.rb
 - spec/fabricators/service_fabricator.rb
 - spec/fabricators/service_sizing_policy_fabricator.rb
+- spec/fabricators/setting_fabricator.rb
 - spec/fabricators/stack_fabricator.rb
 - spec/fabricators/vhost_fabricator.rb
 - spec/mock/git
@@ -657,6 +659,7 @@ test_files:
 - spec/aptible/cli/helpers/ssh_spec.rb
 - spec/aptible/cli/helpers/token_spec.rb
 - spec/aptible/cli/helpers/tunnel_spec.rb
+- spec/aptible/cli/helpers/vhost/option_set_builder_spec.rb
 - spec/aptible/cli/renderer/json_spec.rb
 - spec/aptible/cli/renderer/text_spec.rb
 - spec/aptible/cli/resource_formatter_spec.rb
@@ -702,6 +705,7 @@ test_files:
 - spec/fabricators/operation_fabricator.rb
 - spec/fabricators/service_fabricator.rb
 - spec/fabricators/service_sizing_policy_fabricator.rb
+- spec/fabricators/setting_fabricator.rb
 - spec/fabricators/stack_fabricator.rb
 - spec/fabricators/vhost_fabricator.rb
 - spec/mock/git