aptible-cli 0.24.10 → 0.26.1

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

@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Aptible::CLI::Agent do
+  let(:token) { double('token') }
+  before { allow(subject).to receive(:fetch_token).and_return(token) }
+
+  describe '#organizations' do
+    let(:org1) { double('org1', id: 'org-1-id', name: 'Org One') }
+    let(:org2) { double('org2', id: 'org-2-id', name: 'Org Two') }
+    let(:role1) do
+      double('role1', id: 'role-1-id', name: 'Admin', organization: org1)
+    end
+    let(:role2) do
+      double('role2', id: 'role-2-id', name: 'Developer', organization: org1)
+    end
+    let(:role3) do
+      double('role3', id: 'role-3-id', name: 'Account Owners',
+                      organization: org2)
+    end
+    let(:user) do
+      double('user', roles_with_organizations: [role1, role2, role3])
+    end
+
+    before do
+      allow(subject).to receive(:whoami).and_return(user)
+    end
+
+    it 'lists organizations with roles' do
+      subject.send('organizations')
+
+      expect(captured_output_text).to include('Id: org-1-id')
+      expect(captured_output_text).to include('Name: Org One')
+      expect(captured_output_text).to include('Id: org-2-id')
+      expect(captured_output_text).to include('Name: Org Two')
+      expect(captured_output_text).to include('Roles:')
+      expect(captured_output_text).to include('Name: Admin')
+      expect(captured_output_text).to include('Name: Developer')
+      expect(captured_output_text).to include('Name: Account Owners')
+    end
+
+    it 'handles user with no roles' do
+      allow(user).to receive(:roles_with_organizations).and_return([])
+
+      subject.send('organizations')
+
+      expect(captured_output_text).to eq('')
+    end
+
+    it 'renders JSON output' do
+      allow(Aptible::CLI::Renderer).to receive(:format).and_return('json')
+
+      subject.send('organizations')
+
+      json = captured_output_json
+      expect(json).to be_a(Array)
+      expect(json.length).to eq(2)
+
+      org1_json = json.find { |o| o['id'] == 'org-1-id' }
+      expect(org1_json['name']).to eq('Org One')
+      expect(org1_json['roles'].length).to eq(2)
+      role_names = org1_json['roles'].map { |r| r['name'] }
+      expect(role_names).to contain_exactly('Admin', 'Developer')
+
+      org2_json = json.find { |o| o['id'] == 'org-2-id' }
+      expect(org2_json['name']).to eq('Org Two')
+      expect(org2_json['roles'].length).to eq(1)
+      expect(org2_json['roles'][0]['name']).to eq('Account Owners')
+    end
+
+    it 'raises Thor::Error on whoami API error' do
+      allow(subject).to receive(:whoami)
+        .and_raise(Thor::Error, '401 (invalid_token) Invalid Token')
+
+      expect { subject.send('organizations') }
+        .to raise_error(Thor::Error, /Invalid Token/)
+    end
+
+    it 'raises Thor::Error on roles_with_organizations API error' do
+      response = Faraday::Response.new(status: 403)
+      error = HyperResource::ClientError.new('403 (forbidden) Access denied',
+                                             response: response)
+      allow(user).to receive(:roles_with_organizations).and_raise(error)
+
+      expect { subject.send('organizations') }
+        .to raise_error(Thor::Error, /Access denied/)
+    end
+  end
+end

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

@@ -106,6 +106,83 @@ describe Aptible::CLI::Agent do
 
       subject.send('services:settings', 'foo')
     end
+
+    it 'allows enabling restart_free_scaling' do
+      stub_options(restart_free_scaling: true)
+      service = Fabricate(:service, app: app, process_type: 'foo')
+
+      expect(service).to receive(:update!).with(restart_free_scaling: true)
+
+      subject.send('services:settings', 'foo')
+    end
+
+    it 'allows disabling restart_free_scaling' do
+      stub_options(restart_free_scaling: false)
+      service = Fabricate(:service, app: app, process_type: 'foo')
+
+      expect(service).to receive(:update!).with(restart_free_scaling: false)
+
+      subject.send('services:settings', 'foo')
+    end
+
+    it 'allows setting restart_free_scaling with other options' do
+      stub_options(
+        restart_free_scaling: true,
+        force_zero_downtime: true,
+        stop_timeout: 45
+      )
+      service = Fabricate(:service, app: app, process_type: 'foo')
+
+      expect(service).to receive(:update!)
+        .with(
+          restart_free_scaling: true,
+          force_zero_downtime: true,
+          stop_timeout: 45
+        )
+
+      subject.send('services:settings', 'foo')
+    end
+
+    it 'does not include nil values in updates' do
+      stub_options(restart_free_scaling: nil, force_zero_downtime: true)
+      service = Fabricate(:service, app: app, process_type: 'foo')
+
+      expect(service).to receive(:update!).with(force_zero_downtime: true)
+
+      subject.send('services:settings', 'foo')
+    end
+
+    it 'does not call update! when no valid options are provided' do
+      stub_options(
+        restart_free_scaling: nil,
+        force_zero_downtime: nil,
+        simple_health_check: nil,
+        stop_timeout: nil
+      )
+      service = Fabricate(:service, app: app, process_type: 'foo')
+
+      expect(service).not_to receive(:update!)
+
+      subject.send('services:settings', 'foo')
+    end
+
+    it 'handles false values correctly (not treated as nil)' do
+      stub_options(
+        restart_free_scaling: false,
+        force_zero_downtime: false,
+        simple_health_check: false
+      )
+      service = Fabricate(:service, app: app, process_type: 'foo')
+
+      expect(service).to receive(:update!)
+        .with(
+          restart_free_scaling: false,
+          force_zero_downtime: false,
+          naive_health_check: false
+        )
+
+      subject.send('services:settings', 'foo')
+    end
   end
 
   describe '#services:sizing_policy' do

data/spec/fabricators/app_external_aws_rds_connection_fabricator.rb

@@ -0,0 +1,55 @@
+class StubAppExternalAwsRdsConnection < OpenStruct
+  def attributes
+    {
+      'id' => id,
+      'app_id' => app_id,
+      'external_aws_resource_id' => external_aws_resource_id,
+      'database_name' => database_name,
+      'database_user' => database_user,
+      'superuser' => superuser,
+      'created_at' => created_at,
+      'updated_at' => updated_at
+    }
+  end
+end
+
+Fabricator(:app_external_aws_rds_connection,
+           from: :stub_app_external_aws_rds_connection) do
+  id do
+    Fabricate.sequence(:app_external_aws_rds_connection_id) { |i| i }
+  end
+  app
+  external_aws_resource do
+    Fabricate(:external_aws_resource, resource_type: 'aws_rds_db_instance')
+  end
+
+  database_name { Fabricate.sequence(:db_name) { |i| "db_#{i}" } }
+  database_user { Fabricate.sequence(:db_user) { |i| "user_#{i}" } }
+  superuser { false }
+
+  created_at { Time.now }
+  updated_at { Time.now }
+
+  app_id do |attrs|
+    attrs[:app] ? attrs[:app].id : nil
+  end
+
+  external_aws_resource_id do |attrs|
+    attrs[:external_aws_resource] ? attrs[:external_aws_resource].id : nil
+  end
+
+  links do |attrs|
+    hash = {}
+    if attrs[:app]
+      hash[:app] = OpenStruct.new(
+        href: "/apps/#{attrs[:app].id}"
+      )
+    end
+    if attrs[:external_aws_resource]
+      hash[:external_aws_resource] = OpenStruct.new(
+        href: "/external_aws_resources/#{attrs[:external_aws_resource].id}"
+      )
+    end
+    OpenStruct.new(hash)
+  end
+end

data/spec/fabricators/external_aws_account_fabricator.rb

@@ -0,0 +1,49 @@
+class StubExternalAwsAccount < OpenStruct
+  def attributes
+    {
+      'aws_account_id' => aws_account_id,
+      'account_name' => account_name,
+      'aws_region_primary' => aws_region_primary,
+      'status' => status,
+      'discovery_enabled' => discovery_enabled,
+      'discovery_frequency' => discovery_frequency,
+      'discovery_role_arn' => discovery_role_arn,
+      'account_id' => account_id,
+      'created_at' => created_at,
+      'updated_at' => updated_at
+    }
+  end
+end
+
+Fabricator(:external_aws_account, from: :stub_external_aws_account) do
+  id { Fabricate.sequence(:external_aws_account_id) { |i| i } }
+  account
+  errors { Aptible::Resource::Errors.new }
+
+  account_name { |attrs| "External AWS Account #{attrs[:id]}" }
+  aws_account_id do
+    Fabricate.sequence(:aws_account_id) do |i|
+      format('%012d', 10_000_000_000 + i)
+    end
+  end
+  discovery_role_arn do |attrs|
+    "arn:aws:iam::#{attrs[:aws_account_id]}:role/ExampleRole"
+  end
+  aws_region_primary 'us-east-1'
+  status 'active'
+  discovery_enabled false
+  discovery_frequency 'daily'
+  account_id { |attrs| attrs[:account] ? attrs[:account].id : nil }
+  created_at { Time.now }
+  updated_at { Time.now }
+
+  links do |attrs|
+    hash = {}
+    if attrs[:account]
+      hash[:account] = OpenStruct.new(
+        href: "/accounts/#{attrs[:account].id}"
+      )
+    end
+    OpenStruct.new(hash)
+  end
+end

data/spec/fabricators/external_aws_database_credential_fabricator.rb

@@ -0,0 +1,46 @@
+class StubExternalAwsDatabaseCredential < OpenStruct
+  def attributes
+    {
+      'id' => id,
+      'external_aws_resource_id' => external_aws_resource_id,
+      'type' => type,
+      'default' => default,
+      'connection_url' => connection_url,
+      'created_at' => created_at,
+      'updated_at' => updated_at
+    }
+  end
+end
+
+Fabricator(:external_aws_database_credential,
+           from: :stub_external_aws_database_credential) do
+  id do
+    Fabricate.sequence(:external_aws_database_credential_id) { |i| i }
+  end
+  external_aws_resource do
+    Fabricate(:external_aws_resource, resource_type: 'aws_rds_db_instance')
+  end
+
+  type do
+    Fabricate.sequence(:external_aws_db_cred_type) { |i| "primary-#{i}" }
+  end
+  default { false }
+  connection_url { 'postgres://user:pass@host:5432/dbname' }
+
+  created_at { Time.now }
+  updated_at { Time.now }
+
+  external_aws_resource_id do |attrs|
+    attrs[:external_aws_resource] ? attrs[:external_aws_resource].id : nil
+  end
+
+  links do |attrs|
+    hash = {}
+    if attrs[:external_aws_resource]
+      hash[:external_aws_resource] = OpenStruct.new(
+        href: "/external_aws_resources/#{attrs[:external_aws_resource].id}"
+      )
+    end
+    OpenStruct.new(hash)
+  end
+end

data/spec/fabricators/external_aws_resource_fabricator.rb

@@ -0,0 +1,72 @@
+class StubExternalAwsResource < OpenStruct
+  def attributes
+    {
+      'id' => id,
+      'external_aws_account_id' => external_aws_account_id,
+      'resource_type' => resource_type,
+      'resource_arn' => resource_arn,
+      'resource_id' => resource_id,
+      'resource_name' => resource_name,
+      'region' => region,
+      'metadata' => metadata,
+      'tags' => tags,
+      'discovered_at' => discovered_at,
+      'last_synced_at' => last_synced_at,
+      'sync_status' => sync_status,
+      'created_at' => created_at,
+      'updated_at' => updated_at
+    }
+  end
+
+  def app_external_aws_rds_connections
+    @app_external_aws_rds_connections ||= []
+  end
+
+  def external_aws_database_credentials
+    @external_aws_database_credentials ||= []
+  end
+end
+
+Fabricator(:external_aws_resource, from: :stub_external_aws_resource) do
+  id { Fabricate.sequence(:external_aws_resource_id) { |i| i } }
+  external_aws_account
+
+  resource_type { 'aws_rds_db_instance' }
+  resource_arn do
+    Fabricate.sequence(:external_aws_resource_arn) do |i|
+      "arn:aws:rds:us-east-1:123456789012:db:example-db-#{i}"
+    end
+  end
+  resource_id do
+    Fabricate.sequence(:external_aws_resource_resource_id) do |i|
+      "db-EXAMPLE#{i}"
+    end
+  end
+  resource_name do
+    Fabricate.sequence(:external_aws_resource_name) { |i| "example-db-#{i}" }
+  end
+  region { 'us-east-1' }
+
+  metadata { { 'engine' => 'postgres', 'engine_version' => '14.7' } }
+  tags { { 'env' => 'test', 'owner' => 'spec' } }
+
+  discovered_at { Time.now }
+  last_synced_at { Time.now }
+  sync_status { 'current' }
+  created_at { Time.now }
+  updated_at { Time.now }
+
+  external_aws_account_id do |attrs|
+    attrs[:external_aws_account] ? attrs[:external_aws_account].id : nil
+  end
+
+  links do |attrs|
+    hash = {}
+    if attrs[:external_aws_account]
+      hash[:external_aws_account] = OpenStruct.new(
+        href: "/external_aws_accounts/#{attrs[:external_aws_account].id}"
+      )
+    end
+    OpenStruct.new(hash)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aptible-cli
 version: !ruby/object:Gem::Version
-  version: 0.24.10
+  version: 0.26.1
 platform: ruby
 authors:
 - Frank Macreery
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-19 00:00:00.000000000 Z
+date: 2026-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -36,28 +36,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '1.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: aptible-auth
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.5
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.5
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: aptible-billing
   requirement: !ruby/object:Gem::Requirement
@@ -422,6 +422,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.15.2
+- !ruby/object:Gem::Dependency
+  name: httplog
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.16'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.16'
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
 description: Aptible CLI
 email:
 - frank@macreery.com
@@ -432,6 +474,7 @@ extra_rdoc_files: []
 files:
 - ".dockerignore"
 - ".github/CODEOWNERS"
+- ".github/workflows/release.yml"
 - ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
@@ -462,6 +505,7 @@ files:
 - lib/aptible/cli/formatter/value.rb
 - lib/aptible/cli/helpers/app.rb
 - lib/aptible/cli/helpers/app_or_database.rb
+- lib/aptible/cli/helpers/aws_account.rb
 - lib/aptible/cli/helpers/config_path.rb
 - lib/aptible/cli/helpers/database.rb
 - lib/aptible/cli/helpers/date_helpers.rb
@@ -485,6 +529,7 @@ files:
 - lib/aptible/cli/renderer/text.rb
 - lib/aptible/cli/resource_formatter.rb
 - lib/aptible/cli/subcommands/apps.rb
+- lib/aptible/cli/subcommands/aws_accounts.rb
 - lib/aptible/cli/subcommands/backup.rb
 - lib/aptible/cli/subcommands/backup_retention_policy.rb
 - lib/aptible/cli/subcommands/config.rb
@@ -498,6 +543,7 @@ files:
 - lib/aptible/cli/subcommands/maintenance.rb
 - lib/aptible/cli/subcommands/metric_drain.rb
 - lib/aptible/cli/subcommands/operation.rb
+- lib/aptible/cli/subcommands/organizations.rb
 - lib/aptible/cli/subcommands/rebuild.rb
 - lib/aptible/cli/subcommands/restart.rb
 - lib/aptible/cli/subcommands/services.rb
@@ -527,18 +573,21 @@ files:
 - spec/aptible/cli/subcommands/deploy_spec.rb
 - spec/aptible/cli/subcommands/endpoints_spec.rb
 - spec/aptible/cli/subcommands/environment_spec.rb
+- spec/aptible/cli/subcommands/external_aws_accounts_spec.rb
 - spec/aptible/cli/subcommands/inspect_spec.rb
 - spec/aptible/cli/subcommands/log_drain_spec.rb
 - spec/aptible/cli/subcommands/logs_spec.rb
 - spec/aptible/cli/subcommands/maintenance_spec.rb
 - spec/aptible/cli/subcommands/metric_drain_spec.rb
 - spec/aptible/cli/subcommands/operation_spec.rb
+- spec/aptible/cli/subcommands/organizations_spec.rb
 - spec/aptible/cli/subcommands/rebuild_spec.rb
 - spec/aptible/cli/subcommands/restart_spec.rb
 - spec/aptible/cli/subcommands/services_spec.rb
 - spec/aptible/cli/subcommands/ssh_spec.rb
 - spec/aptible/cli_spec.rb
 - spec/fabricators/account_fabricator.rb
+- spec/fabricators/app_external_aws_rds_connection_fabricator.rb
 - spec/fabricators/app_fabricator.rb
 - spec/fabricators/backup_fabricator.rb
 - spec/fabricators/backup_retention_policy_fabricator.rb
@@ -548,6 +597,9 @@ files:
 - spec/fabricators/database_disk_fabricator.rb
 - spec/fabricators/database_fabricator.rb
 - spec/fabricators/database_image_fabricator.rb
+- spec/fabricators/external_aws_account_fabricator.rb
+- spec/fabricators/external_aws_database_credential_fabricator.rb
+- spec/fabricators/external_aws_resource_fabricator.rb
 - spec/fabricators/log_drain_fabricator.rb
 - spec/fabricators/maintenance_app_fabricator.rb
 - spec/fabricators/maintenance_database_fabricator.rb
@@ -614,18 +666,21 @@ test_files:
 - spec/aptible/cli/subcommands/deploy_spec.rb
 - spec/aptible/cli/subcommands/endpoints_spec.rb
 - spec/aptible/cli/subcommands/environment_spec.rb
+- spec/aptible/cli/subcommands/external_aws_accounts_spec.rb
 - spec/aptible/cli/subcommands/inspect_spec.rb
 - spec/aptible/cli/subcommands/log_drain_spec.rb
 - spec/aptible/cli/subcommands/logs_spec.rb
 - spec/aptible/cli/subcommands/maintenance_spec.rb
 - spec/aptible/cli/subcommands/metric_drain_spec.rb
 - spec/aptible/cli/subcommands/operation_spec.rb
+- spec/aptible/cli/subcommands/organizations_spec.rb
 - spec/aptible/cli/subcommands/rebuild_spec.rb
 - spec/aptible/cli/subcommands/restart_spec.rb
 - spec/aptible/cli/subcommands/services_spec.rb
 - spec/aptible/cli/subcommands/ssh_spec.rb
 - spec/aptible/cli_spec.rb
 - spec/fabricators/account_fabricator.rb
+- spec/fabricators/app_external_aws_rds_connection_fabricator.rb
 - spec/fabricators/app_fabricator.rb
 - spec/fabricators/backup_fabricator.rb
 - spec/fabricators/backup_retention_policy_fabricator.rb
@@ -635,6 +690,9 @@ test_files:
 - spec/fabricators/database_disk_fabricator.rb
 - spec/fabricators/database_fabricator.rb
 - spec/fabricators/database_image_fabricator.rb
+- spec/fabricators/external_aws_account_fabricator.rb
+- spec/fabricators/external_aws_database_credential_fabricator.rb
+- spec/fabricators/external_aws_resource_fabricator.rb
 - spec/fabricators/log_drain_fabricator.rb
 - spec/fabricators/maintenance_app_fabricator.rb
 - spec/fabricators/maintenance_database_fabricator.rb