aptible-api 1.10.0 → 1.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 451d4c1dda3a83ffea21ffbaf33d2385ef2ef8448633dcf283f75e517b1d8a03
-  data.tar.gz: b96ca05454acffa9e91c7376763741472a921c15d7f78bb1a25714966c9bda04
+  metadata.gz: bd9276b8e979050ccc45108a050a16e142cf577b2ef6aadc274455e4975061cc
+  data.tar.gz: 9a5929e1d7acbc030b24ecbaa6816c59769d2d43805854a5137b76e127a3d201
 SHA512:
-  metadata.gz: d5a9b9f0ae9c6e879f599a82196b4bf8a086a3766e1cbcdfe2333d34d005f5997373bf13d36244886108faa23fb15fd336a7f140d390bce501477a52c40d9bfe
-  data.tar.gz: 64af4b64434d12c06606caed8becbb5b9c5081c14603f24cfd200fc54f09e8e9237a4bbd192121f084e40d08649c8abf1c8ce03040f94bf4ad5379b17e6b6577
+  metadata.gz: 1e61a0b6c7de497cb9fd60e7258a4395ca55f6c5237ba63124016ed72c68e84b0ac0f9ac143838a8210659145afebd187fb9a1891d2878ce34a7cf793f7f2cf0
+  data.tar.gz: 3e4a18a1f5dc7254a002fc8b88b147d2cc8bfcb1bb0f13a80eb9e76a825f2e2d30f00db7e81631587bded8670e8a63e36195e9e2d79ad5c0a87d35dddedbe04a

data/.github/workflows/ci.yml

@@ -17,24 +17,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        RUBY_VERSION: [2.1, 2.2, 2.3, 2.4, 2.5, 2.6]
+        RUBY_VERSION: [2.3, 2.4, 2.5, 2.6, 2.7, 3.1, 3.2, 3.3, 3.4]
+    env:
+      RUBY_VERSION: ${{ matrix.RUBY_VERSION }}
     steps:
       - name: Check out code
         uses: actions/checkout@v4
         with:
           persist-credentials: false
 
-      - name: Install Ruby
-        uses: ruby/setup-ruby@d5126b9b3579e429dd52e51e68624dda2e05be25  # v1.267.0
-        with:
-          ruby-version: ${{ matrix.RUBY_VERSION }}
-          bundler: 1.17.3
-
-      - name: Bundle install
-        run: bundle install
-
       - name: Rubocop
-        run: bundle exec rake rubocop
+        run: make lint
 
       - name: Rspec
-        run: bundle exec rspec
+        run: make test

data/.gitignore

@@ -15,3 +15,5 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+vendor
+/docker/ruby-*/

data/Dockerfile

@@ -0,0 +1,20 @@
+ARG RUBY_VERSION=2.3.1
+FROM ruby:${RUBY_VERSION}
+
+ARG BUNDLER_VERSION=1.17.3
+ENV BUNDLER_VERSION=${BUNDLER_VERSION}
+RUN if [ "${BUNDLER_VERSION}" != "" ] ; then \
+      gem install bundler -v "${BUNDLER_VERSION}" ; \
+    fi
+
+WORKDIR /app
+COPY Gemfile /app/
+COPY aptible-api.gemspec /app/
+RUN mkdir -p /app/lib/aptible/api/
+COPY lib/aptible/api/version.rb /app/lib/aptible/api/
+
+RUN bundle install
+
+COPY . /app
+
+CMD ["bash"]

data/Gemfile

@@ -1,10 +1,13 @@
 source 'https://rubygems.org'
 
-gem 'pry', 
-    git: 'https://github.com/fancyremarker/pry.git', 
-    branch: 'aptible'
-
-gem 'activesupport', '~> 4.0'
+# ActiveSupport version depends on Ruby version for compatibility
+# ActiveSupport 4.x is incompatible with Ruby 2.7+ (BigDecimal.new removed)
+if RUBY_VERSION < '2.7'
+  gem 'activesupport', '~> 4.0'
+else
+  gem 'activesupport', '>= 5.2'
+end
+gem "irb", "~> 1.1"
 
 # Specify your gem's dependencies in aptible-api.gemspec
 gemspec

data/Makefile

@@ -0,0 +1,68 @@
+
+export COMPOSE_IGNORE_ORPHANS ?= true
+export RUBY_VERSION ?= 2.3.1
+RUBY_VERSION_MAJOR = $(word 1,$(subst ., ,$(RUBY_VERSION)))
+export BUNDLER_VERSION ?=
+ifeq ($(BUNDLER_VERSION),)
+ifeq ($(RUBY_VERSION_MAJOR),2)
+export BUNDLER_VERSION = 1.17.3
+endif
+endif
+PROJECT_NAME = $(shell ls *.gemspec | sed 's/\.gemspec//')
+export COMPOSE_PROJECT_NAME ?= $(PROJECT_NAME)-$(subst .,_,$(RUBY_VERSION))
+
+default: help
+
+## Show this help message
+help:
+	@echo "\n\033[1;34mAvailable targets:\033[0m\n"
+	@awk 'BEGIN {FS = ":"; prev = ""} \
+					/^## / {prev = substr($$0, 4); next} \
+					/^[a-zA-Z_-]+:/ {if (prev != "") printf "  \033[1;36m%-20s\033[0m %s\n", $$1, prev; prev = ""} \
+					{prev = ""}' $(MAKEFILE_LIST) | sort
+	@echo
+
+BUILD_ARGS ?=
+## Build and pull docker compose images
+build: gemfile-lock
+	docker compose build --pull $(BUILD_ARGS)
+
+## Create a Gemfile.lock specific to the container (i.e., for the ruby version)
+gemfile-lock:
+	mkdir -pv ./docker/ruby-$(RUBY_VERSION)/ && \
+	echo '' > ./docker/ruby-$(RUBY_VERSION)/Gemfile.lock
+
+## Open shell in a docker container, supports CMD=
+bash: build
+	$(MAKE) run CMD=bash
+
+CMD ?= bash
+## Run command in a docker container, supports CMD=
+run:
+	docker compose run --rm runner $(CMD)
+
+## Run tests in a docker container, supports ARGS=
+test: build
+	$(MAKE) test-direct ARGS="$(ARGS)"
+
+## Run tests in a docker container without building, supports ARGS=
+test-direct:
+	$(MAKE) run CMD="bundle exec rspec $(ARGS)"
+
+## Run rubocop in a docker container, supports ARGS=
+lint: build
+	$(MAKE) lint-direct ARGS="$(ARGS)"
+
+## Run rubocop in a docker container without building, supports ARGS=
+lint-direct:
+	$(MAKE) run CMD="bundle exec rake rubocop $(ARGS)"
+
+## Clean up docker compose resources
+clean: clean-gemfile-lock
+	docker compose down --remove-orphans --volumes
+
+## Clean up the container specific Gemfile.lock
+clean-gemfile-lock:
+	rm -v ./docker/ruby-$(RUBY_VERSION)/Gemfile.lock ||:
+
+.PHONY: build bash test

data/Procfile

@@ -1 +1 @@
-console: bundle exec pry -r aptible/api -r aptible/auth
+console: bundle exec irb -r aptible/api -r aptible/auth

data/aptible-api.gemspec

@@ -27,7 +27,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'activesupport'
   spec.add_development_dependency 'aptible-tasks', '>= 0.2.0'
-  spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'foreman'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rake', '~> 12.3.3'

data/docker-compose.yml

@@ -0,0 +1,12 @@
+services:
+  runner:
+    build:
+      context: .
+      args:
+        RUBY_VERSION: ${RUBY_VERSION:-2.3.1}
+        BUNDLER_VERSION: ${BUNDLER_VERSION:-}
+    volumes:
+      - type: bind
+        source: .
+        target: /app
+      - ./docker/ruby-${RUBY_VERSION}/Gemfile.lock:/app/Gemfile.lock

data/lib/aptible/api/account.rb

@@ -5,6 +5,7 @@ module Aptible
     class Account < Resource
       belongs_to :stack
 
+      has_many :ai_tokens
       has_many :apps
       has_many :backups
       has_many :certificates
@@ -18,6 +19,7 @@ module Aptible
       has_many :vhosts
       has_many :service_sizing_policies
       has_many :backup_retention_policies
+      has_many :operations
       embeds_many :log_drains
 
       field :id

data/lib/aptible/api/ai_token.rb

@@ -0,0 +1,39 @@
+module Aptible
+  module Api
+    class AiToken < Resource
+      belongs_to :account
+
+      field :id
+      field :name
+      field :created_at
+      field :updated_at
+      field :expires_at
+      field :last_used_at
+      field :revoked_at
+      field :gateway_url
+      # User (on whose behalf) details
+      field :created_by_user_id
+      field :created_by_user_name
+      field :created_by_user_email
+      # Actor (who performed) details
+      field :created_by_actor_id
+      field :created_by_actor_name
+      field :created_by_actor_email
+      # Revoked by user details
+      field :revoked_by_user_id
+      field :revoked_by_user_name
+      field :revoked_by_user_email
+      # Revoked by actor details
+      field :revoked_by_actor_id
+      field :revoked_by_actor_name
+      field :revoked_by_actor_email
+
+      # Note: The 'token' field from API response is accessible via
+      # attributes['token'] to avoid conflict with aptible-resource's
+      # internal token handling (used for auth bearer token)
+      def api_key
+        attributes['token']
+      end
+    end
+  end
+end

data/lib/aptible/api/app.rb

@@ -20,6 +20,7 @@ module Aptible
       has_many :service_definitions
       has_many :code_scan_results
       embeds_many :services
+      has_many :app_external_aws_rds_connections
 
       field :id
       field :handle

data/lib/aptible/api/app_external_aws_rds_connection.rb

@@ -0,0 +1,15 @@
+module Aptible
+  module Api
+    class AppExternalAwsRdsConnection < Resource
+      belongs_to :app
+      belongs_to :external_aws_resource
+      belongs_to :external_aws_account
+
+      field :id
+      field :database_name
+      field :database_user
+      field :created_at, type: Time
+      field :updated_at, type: Time
+    end
+  end
+end

data/lib/aptible/api/external_aws_account.rb

@@ -2,6 +2,7 @@ module Aptible
   module Api
     class ExternalAwsAccount < Resource
       has_many :external_aws_resources
+      has_many :app_external_aws_rds_connections
 
       field :id
       field :organization_id

data/lib/aptible/api/external_aws_database_credential.rb

@@ -0,0 +1,15 @@
+module Aptible
+  module Api
+    class ExternalAwsDatabaseCredential < Resource
+      belongs_to :external_aws_resource
+      has_many :operations
+
+      field :id
+      field :type
+      field :default, type: Aptible::Resource::Boolean
+      field :connection_url
+      field :created_at, type: Time
+      field :updated_at, type: Time
+    end
+  end
+end

data/lib/aptible/api/external_aws_resource.rb

@@ -2,6 +2,8 @@ module Aptible
   module Api
     class ExternalAwsResource < Resource
       belongs_to :external_aws_account
+      has_many :external_aws_database_credentials
+      has_many :app_external_aws_rds_connections
 
       field :id
       field :resource_type

data/lib/aptible/api/resource.rb

@@ -15,6 +15,7 @@ module Aptible
 end
 
 require 'aptible/api/account'
+require 'aptible/api/ai_token'
 require 'aptible/api/ami'
 require 'aptible/api/ami_release'
 require 'aptible/api/app'
@@ -59,3 +60,5 @@ require 'aptible/api/maintenance'
 require 'aptible/api/vpn_tunnel'
 require 'aptible/api/external_aws_account'
 require 'aptible/api/external_aws_resource'
+require 'aptible/api/external_aws_database_credential'
+require 'aptible/api/app_external_aws_rds_connection'

data/lib/aptible/api/settings.rb

@@ -4,8 +4,8 @@ module Aptible
       belongs_to :resource
 
       field :id
-      field :keys
-      field :sensitive_keys
+      field :settings
+      field :sensitive_settings
       field :created_at, type: Time
     end
   end

data/lib/aptible/api/version.rb

@@ -1,5 +1,5 @@
 module Aptible
   module Api
-    VERSION = '1.10.0'.freeze
+    VERSION = '1.11.2'.freeze
   end
 end

data/spec/aptible/api/operation_spec.rb

@@ -48,7 +48,6 @@ describe Aptible::Api::Operation do
 
       it 'yields usable SSH connection arguments' do
         expect(subject).to receive(:create_ssh_portal_connection!)
-          .with(ssh_public_key: 'some public key')
           .and_return(ssh_portal_connection)
 
         has_yielded = false
@@ -100,7 +99,6 @@ describe Aptible::Api::Operation do
 
       it 'allows passing a custom host' do
         expect(subject).to receive(:create_ssh_portal_connection!)
-          .with(ssh_public_key: 'some public key')
           .and_return(ssh_portal_connection)
 
         has_yielded = false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aptible-api
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.11.2
 platform: ruby
 authors:
 - Frank Macreery
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-05 00:00:00.000000000 Z
+date: 2025-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aptible-auth
@@ -94,20 +94,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.0
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: foreman
   requirement: !ruby/object:Gem::Requirement
@@ -190,20 +176,25 @@ files:
 - ".github/workflows/zizmor.yaml"
 - ".gitignore"
 - ".rspec"
+- Dockerfile
 - Gemfile
 - LICENSE.md
+- Makefile
 - Procfile
 - README.md
 - Rakefile
 - SECURITY.md
 - aptible-api.gemspec
+- docker-compose.yml
 - lib/aptible/api.rb
 - lib/aptible/api/account.rb
 - lib/aptible/api/active_plan.rb
 - lib/aptible/api/agent.rb
+- lib/aptible/api/ai_token.rb
 - lib/aptible/api/ami.rb
 - lib/aptible/api/ami_release.rb
 - lib/aptible/api/app.rb
+- lib/aptible/api/app_external_aws_rds_connection.rb
 - lib/aptible/api/aws_instance.rb
 - lib/aptible/api/backup.rb
 - lib/aptible/api/backup_retention_policy.rb
@@ -220,6 +211,7 @@ files:
 - lib/aptible/api/ephemeral_container.rb
 - lib/aptible/api/ephemeral_session.rb
 - lib/aptible/api/external_aws_account.rb
+- lib/aptible/api/external_aws_database_credential.rb
 - lib/aptible/api/external_aws_resource.rb
 - lib/aptible/api/image.rb
 - lib/aptible/api/instance_layer_membership.rb