pg-aws_rds_iam 0.5.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c9ccecc905798c9f5490496c9f035b4e2acf2f2f7bec49a055a131d833d2d90
-  data.tar.gz: effef9f8dde649d102ba9ee95a76937f57b5b1c802e09ebaf8b9189c6d2591c0
+  metadata.gz: 8de2c77e449ab425d3294a78bfb769377b96e33ef415144066c442103bdca6db
+  data.tar.gz: a10dcfe36a489d448cfaaa5a598af4bf99d1f29cb9abc7b0f27fb85de00c08c7
 SHA512:
-  metadata.gz: 728e3a062e3dcd036700eacabdbdf7964e46b938f444b71ce58514ae2c0c5f6379cc82821acce7a702b4d25a37ce716dcedd7f44b553b4d24aef4b1811e0b7a4
-  data.tar.gz: 9b17627b273ae33f07837eb4cd230949ee148f45b9716e74dbe117a1c78c47fc3385461c90192bec2ca0819ba831f2b6a2b69e15ebfb42e290c9f4530af66988
+  metadata.gz: e07d05f1b3ba640764c8493e0b27bc94722c8b7afb2688a9168551821dc2518eccc4d74f241a6a91bec51ea67a16e93a72924100014c6643bc7e4c1ddc0fc0aa
+  data.tar.gz: 8a3b8388bac508791363b4252283bc48d6b8412c3b99337dad6640ea1475005062bfb1528a82f042b0fd76f46f97afa85d41b221881fee9520f2e4bf2064a9df

data/CHANGELOG.md

@@ -8,6 +8,23 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 No notable changes.
 
+## [0.6.1] - 2024-11-12
+
+### Changed
+* Test against Active Record 8.0 ([#685](https://github.com/haines/pg-aws_rds_iam/pull/685))
+* Use `URI::RFC2396_PARSER.regexp[:ABS_URI_REF]` directly to resolve deprecation warning introduced in [ruby/uri#113](https://github.com/ruby/uri/pull/113) ([#685](https://github.com/haines/pg-aws_rds_iam/pull/685))
+
+## [0.6.0] - 2024-10-30
+
+### Changed
+* Require Ruby ≥ 3.1 ([#653](https://github.com/haines/pg-aws_rds_iam/pull/653))
+* Test against Ruby 3.3 ([#589](https://github.com/haines/pg-aws_rds_iam/pull/589))
+* Test against Active Record 7.1 ([#562](https://github.com/haines/pg-aws_rds_iam/pull/562))
+* Test against Active Record 7.2 ([#653](https://github.com/haines/pg-aws_rds_iam/pull/653))
+
+### Fixed
+* Generate auth token for `rails dbconsole` command ([#678](https://github.com/haines/pg-aws_rds_iam/pull/678))
+
 ## [0.5.0] - 2023-05-04
 
 ### Changed
@@ -32,8 +49,9 @@ No notable changes.
 ## [0.4.0] - 2022-06-22
 
 ### Changed
-* Test against Ruby 3.1 ([#305](https://github.com/haines/pg-aws_rds_iam/pull/305))
 * Require Ruby ≥ 2.7 and Active Record ≥ 6.0 ([#360](https://github.com/haines/pg-aws_rds_iam/pull/360))
+* Test against Ruby 3.1 ([#305](https://github.com/haines/pg-aws_rds_iam/pull/305))
+* Test against Active Record 7.0 ([#291](https://github.com/haines/pg-aws_rds_iam/pull/291))
 
 ### Fixed
 * Compatibility with `pg` ≥ 1.4 ([#356](https://github.com/haines/pg-aws_rds_iam/pull/356))
@@ -73,7 +91,8 @@ No notable changes.
 * A plugin for the [`pg` gem](https://rubygems.org/gems/pg) that adds support for [IAM authentication](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/UsingWithRDS.IAMDBAuth.html) when connecting to PostgreSQL databases hosted in Amazon RDS. ([#1](https://github.com/haines/pg-aws_rds_iam/pull/1))
 * ActiveRecord support. ([#3](https://github.com/haines/pg-aws_rds_iam/pull/3))
 
-[Unreleased]: https://github.com/haines/pg-aws_rds_iam/compare/v0.5.0...HEAD
+[Unreleased]: https://github.com/haines/pg-aws_rds_iam/compare/v0.6.0...HEAD
+[0.6.0]: https://github.com/haines/pg-aws_rds_iam/compare/v0.5.0...v0.6.0
 [0.5.0]: https://github.com/haines/pg-aws_rds_iam/compare/v0.4.2...v0.5.0
 [0.4.2]: https://github.com/haines/pg-aws_rds_iam/compare/v0.4.1...v0.4.2
 [0.4.1]: https://github.com/haines/pg-aws_rds_iam/compare/v0.4.0...v0.4.1

data/lib/pg/aws_rds_iam/active_record_postgresql_adapter.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module PG
+  module AWS_RDS_IAM
+    module ActiveRecordPostgreSQLAdapter
+      def dbconsole(config, *)
+        AuthTokenInjector.new.inject_into_psql_env! config.configuration_hash, ENV
+        super
+      end
+    end
+
+    private_constant :ActiveRecordPostgreSQLAdapter
+  end
+end

data/lib/pg/aws_rds_iam/auth_token_generator.rb

@@ -11,7 +11,7 @@ module PG
       # @param credentials [Aws::CredentialProvider] the IAM credentials with which to sign the token
       # @param region [String] the AWS region in which the RDS instances are running
       def initialize(credentials:, region:)
-        @generator = Aws::RDS::AuthTokenGenerator.new(credentials: credentials)
+        @generator = Aws::RDS::AuthTokenGenerator.new(credentials:)
         @region = region
       end
 

data/lib/pg/aws_rds_iam/auth_token_generator_registry.rb

@@ -18,8 +18,8 @@ module PG
       # @param name [String, Symbol]
       # @return [void]
       # @yieldreturn [AuthTokenGenerator]
-      def add(name, &block)
-        @registry[name.to_s] = Memoizer.new(&block)
+      def add(name, &)
+        @registry[name.to_s] = Memoizer.new(&)
       end
 
       # Looks up an {AuthTokenGenerator} by name.

data/lib/pg/aws_rds_iam/connection_info/uri.rb

@@ -5,7 +5,14 @@ module PG
     module ConnectionInfo
       class URI
         def self.match?(connection_string)
-          /\A#{::URI::ABS_URI_REF}\z/.match?(connection_string)
+          regexp =
+            if defined?(::URI::RFC2396_PARSER)
+              ::URI::RFC2396_PARSER.regexp[:ABS_URI_REF]
+            else
+              ::URI::ABS_URI_REF
+            end
+
+          /\A#{regexp}\z/.match?(connection_string)
         end
 
         attr_reader :auth_token_generator_name

data/lib/pg/aws_rds_iam/rails_dbconsole.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module PG
+  module AWS_RDS_IAM
+    module RailsDBConsole
+      private
+
+      def find_cmd_and_exec(*)
+        AuthTokenInjector.new.inject_into_psql_env! db_config.configuration_hash, ENV
+        super
+      end
+    end
+
+    private_constant :RailsDBConsole
+  end
+end

data/lib/pg/aws_rds_iam/version.rb

@@ -3,6 +3,6 @@
 module PG
   module AWS_RDS_IAM
     # The current version of the gem.
-    VERSION = "0.5.0"
+    VERSION = "0.6.1"
   end
 end

data/lib/pg/aws_rds_iam.rb

@@ -28,9 +28,23 @@ module PG
     PG::Connection.singleton_class.prepend Connection
 
     if defined?(ActiveRecord)
+      require "active_record/connection_adapters/postgresql_adapter"
+
+      if ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.respond_to?(:dbconsole)
+        require_relative "aws_rds_iam/active_record_postgresql_adapter"
+
+        ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.singleton_class.prepend ActiveRecordPostgreSQLAdapter
+      end
+
       require_relative "aws_rds_iam/active_record_postgresql_database_tasks"
 
       ActiveRecord::Tasks::PostgreSQLDatabaseTasks.prepend ActiveRecordPostgreSQLDatabaseTasks
     end
+
+    if defined?(Rails::DBConsole) && Rails::DBConsole.private_instance_methods.include?(:find_cmd_and_exec)
+      require_relative "aws_rds_iam/rails_dbconsole"
+
+      Rails::DBConsole.prepend RailsDBConsole
+    end
   end
 end

data/pg-aws_rds_iam.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
 
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 3.0"
+  spec.required_ruby_version = ">= 3.1"
 
   spec.add_dependency "aws-sdk-rds", "~> 1.0"
   spec.add_dependency "pg", "~> 1.1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg-aws_rds_iam
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Andrew Haines
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-04 00:00:00.000000000 Z
+date: 2024-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-rds
@@ -51,6 +51,7 @@ files:
 - LICENSE.txt
 - README.md
 - lib/pg/aws_rds_iam.rb
+- lib/pg/aws_rds_iam/active_record_postgresql_adapter.rb
 - lib/pg/aws_rds_iam/active_record_postgresql_database_tasks.rb
 - lib/pg/aws_rds_iam/active_record_postgresql_database_tasks/psql_env.rb
 - lib/pg/aws_rds_iam/active_record_postgresql_database_tasks/set_psql_env.rb
@@ -63,6 +64,7 @@ files:
 - lib/pg/aws_rds_iam/connection_info/keyword_value_string.rb
 - lib/pg/aws_rds_iam/connection_info/parse_error.rb
 - lib/pg/aws_rds_iam/connection_info/uri.rb
+- lib/pg/aws_rds_iam/rails_dbconsole.rb
 - lib/pg/aws_rds_iam/version.rb
 - pg-aws_rds_iam.gemspec
 homepage: https://github.com/haines/pg-aws_rds_iam
@@ -71,7 +73,7 @@ licenses:
 metadata:
   bug_tracker_uri: https://github.com/haines/pg-aws_rds_iam/issues
   changelog_uri: https://github.com/haines/pg-aws_rds_iam/blob/main/CHANGELOG.md
-  documentation_uri: https://rubydoc.info/gems/pg-aws_rds_iam/0.5.0
+  documentation_uri: https://rubydoc.info/gems/pg-aws_rds_iam/0.6.1
   homepage_uri: https://github.com/haines/pg-aws_rds_iam
   source_code_uri: https://github.com/haines/pg-aws_rds_iam
   rubygems_mfa_required: 'true'
@@ -83,14 +85,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.12
+rubygems_version: 3.5.23
 signing_key:
 specification_version: 4
 summary: IAM authentication for PostgreSQL on Amazon RDS