aptible-api 1.10.0 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 451d4c1dda3a83ffea21ffbaf33d2385ef2ef8448633dcf283f75e517b1d8a03
-  data.tar.gz: b96ca05454acffa9e91c7376763741472a921c15d7f78bb1a25714966c9bda04
+  metadata.gz: 3fda12c54dc7cba1dd90ff4fdfb14e03cb0dbc1b61c763a095e505510f72de30
+  data.tar.gz: bce7f98684c73e22d92632646c1b2c556918c332e67898211156a155bc95ad90
 SHA512:
-  metadata.gz: d5a9b9f0ae9c6e879f599a82196b4bf8a086a3766e1cbcdfe2333d34d005f5997373bf13d36244886108faa23fb15fd336a7f140d390bce501477a52c40d9bfe
-  data.tar.gz: 64af4b64434d12c06606caed8becbb5b9c5081c14603f24cfd200fc54f09e8e9237a4bbd192121f084e40d08649c8abf1c8ce03040f94bf4ad5379b17e6b6577
+  metadata.gz: 8270645847647f22457f05a4cb8ad865b435f1234fb87af3f88f2bf2d7e9b18a36b0f8c6708a63cfc23d77206d8f26360b9e8e51c096051c114117d0ca0016e7
+  data.tar.gz: c99d860a1153c4c24c6360aa285cab54842ac150609be252e8506a48714533b752a2971685948f9fefa1005c1ff272c6aaa8a71aeffbe7b784198361c8ab1944

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,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+/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

@@ -18,6 +18,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/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

@@ -59,3 +59,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/version.rb

@@ -1,5 +1,5 @@
 module Aptible
   module Api
-    VERSION = '1.10.0'.freeze
+    VERSION = '1.11.1'.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.1
 platform: ruby
 authors:
 - Frank Macreery
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-05 00:00:00.000000000 Z
+date: 2025-12-16 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,13 +176,16 @@ 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
@@ -204,6 +193,7 @@ files:
 - 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 +210,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
@@ -271,7 +262,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Ruby client for api.aptible.com