pg-aws_rds_iam 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ca0b85c869fa1f5ccac0bada663bd2f532e5566359aea7d42a1f3c922e7dec4
-  data.tar.gz: ed10f2e843a9b2fee3c09588be471e8936b1ce59059065e6648a62549b6dc6b4
+  metadata.gz: 7894b340911ed1dd4bf4ade1a3a93830f34a353107036f0bf974b098b332ad04
+  data.tar.gz: 7387170d637e6f5a57cb4e39146c03496595d7fd2bc785eae4dacd1dc7978a90
 SHA512:
-  metadata.gz: 4e8373d5955858e81ca374910698e089992f50259cb3ed8b504b51c8e78a7548fd30928b181e7dc435505d24f3cce6a38577f43fee1de7809f5a256cde570bc4
-  data.tar.gz: e93b304b942f78d74f63e3e122e53d9a464148e0d033f03903e3f39f35da06b64a56bd159f782859911c7b3b5be3c3e5ecd2311cc98f16a77009b639d04cc0bc
+  metadata.gz: 7ed4c84823ac809c74ac63358df8a31aebaa8ba09572cd8a8343a47c41768f5bb226b6ce99fb8ec052e90c37575e296538680ba1a3ab03bb4d100120fc0e044d
+  data.tar.gz: 1575d6f6e008a311edd01fb62cd9d3bf4615a14b41d0ed2f5163812999661180da5010252cf8013c82abcfc46c4d680d6dc995a21e8c02d3164949f929887b14

data/.github/workflows/pull-request.yml

@@ -17,7 +17,7 @@ jobs:
         run: apk add git
 
       - name: Check out source code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Install Bundler
         run: bin/install-bundler
@@ -40,7 +40,7 @@ jobs:
         run: test -n "${{ secrets.AVAILABLE }}"
 
       - name: Check out source code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Generate version matrix
         id: version-matrix
@@ -69,7 +69,7 @@ jobs:
         run: apk add build-base git postgresql-dev tar
 
       - name: Check out source code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Install Bundler
         run: bin/install-bundler
@@ -89,7 +89,7 @@ jobs:
             "${postgresql_version}"
 
       - name: Cache gems
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           key: ${{ steps.cache-key.outputs.cache-key }}-gems-${{ hashFiles('Gemfile.lock') }}
           path: vendor/bundle

data/.rubocop.yml

@@ -3,7 +3,7 @@ require:
   - rubocop-rake
 
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.7
   NewCops: enable
   Exclude:
     - bin/bundle
@@ -26,6 +26,9 @@ Minitest/MultipleAssertions:
 Naming/ClassAndModuleCamelCase:
   Enabled: false
 
+Naming/VariableNumber:
+  EnforcedStyle: snake_case
+
 Style/Documentation:
   Exclude:
     - lib/pg/aws_rds_iam/auth_token_injector.rb

data/.ruby-version

@@ -1 +1 @@
-ruby-3.0.2
+ruby-3.1.2

data/CHANGELOG.md

@@ -8,6 +8,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 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.6 and Active Record ≥ 6.0 ([#360](https://github.com/haines/pg-aws_rds_iam/pull/360))
+
+### Fixed
+* Compatibility with `pg` ≥ 1.4 ([#356](https://github.com/haines/pg-aws_rds_iam/pull/356))
+
 ## [0.3.2] - 2021-11-15
 
 ### Changed
@@ -43,7 +52,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.3.2...HEAD
+[Unreleased]: https://github.com/haines/pg-aws_rds_iam/compare/v0.4.0...HEAD
+[0.4.0]: https://github.com/haines/pg-aws_rds_iam/compare/v0.3.2...v0.4.0
 [0.3.2]: https://github.com/haines/pg-aws_rds_iam/compare/v0.3.1...v0.3.2
 [0.3.1]: https://github.com/haines/pg-aws_rds_iam/compare/v0.3.0...v0.3.1
 [0.3.0]: https://github.com/haines/pg-aws_rds_iam/compare/v0.2.0...v0.3.0

data/Gemfile

@@ -14,8 +14,8 @@ gem "rubocop"
 gem "rubocop-minitest"
 gem "rubocop-rake"
 gem "timecop"
-gem "yard", github: "lsegal/yard"
+gem "yard"
 
 ["activerecord", "pg"].each do |gem_name|
-  gem gem_name, *ENV["#{gem_name.upcase}_VERSION"]&.yield_self { |gem_version| "~> #{gem_version}.0" }
+  gem gem_name, *ENV["#{gem_name.upcase}_VERSION"]&.then { |gem_version| "~> #{gem_version}.0" }
 end

data/Gemfile.lock

@@ -1,95 +1,88 @@
-GIT
-  remote: https://github.com/lsegal/yard.git
-  revision: 9865620413d3519b561d87479e44f1b4fe782904
-  specs:
-    yard (0.9.26)
-      webrick (~> 1.7.0)
-
 PATH
   remote: .
   specs:
-    pg-aws_rds_iam (0.3.2)
+    pg-aws_rds_iam (0.4.0)
       aws-sdk-rds (~> 1.0)
       pg (>= 0.18, < 2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.1.3)
-      activesupport (= 6.1.3)
-    activerecord (6.1.3)
-      activemodel (= 6.1.3)
-      activesupport (= 6.1.3)
-    activesupport (6.1.3)
+    activemodel (7.0.3)
+      activesupport (= 7.0.3)
+    activerecord (7.0.3)
+      activemodel (= 7.0.3)
+      activesupport (= 7.0.3)
+    activesupport (7.0.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     ansi (1.5.0)
     ast (2.4.2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.530.0)
-    aws-sdk-core (3.122.1)
+    aws-partitions (1.600.0)
+    aws-sdk-core (3.131.2)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
-      jmespath (~> 1.0)
-    aws-sdk-ec2 (1.281.0)
-      aws-sdk-core (~> 3, >= 3.122.0)
+      jmespath (~> 1, >= 1.6.1)
+    aws-sdk-ec2 (1.319.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-rds (1.130.0)
-      aws-sdk-core (~> 3, >= 3.122.0)
+    aws-sdk-rds (1.146.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.4.0)
+    aws-sigv4 (1.5.0)
       aws-eventstream (~> 1, >= 1.0.2)
     builder (3.2.4)
     coderay (1.1.3)
-    commonmarker (0.23.2)
-    concurrent-ruby (1.1.8)
-    i18n (1.8.9)
+    commonmarker (0.23.5)
+    concurrent-ruby (1.1.10)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    jmespath (1.4.0)
+    jmespath (1.6.1)
     method_source (1.0.0)
-    minitest (5.14.4)
-    minitest-reporters (1.4.3)
+    minitest (5.16.1)
+    minitest-reporters (1.5.0)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    parallel (1.21.0)
-    parser (3.0.2.0)
+    parallel (1.22.1)
+    parser (3.1.2.0)
       ast (~> 2.4.1)
-    pg (1.2.3)
+    pg (1.4.0)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    rainbow (3.0.0)
+    rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.1.1)
+    regexp_parser (2.5.0)
     rexml (3.2.5)
-    rubocop (1.23.0)
+    rubocop (1.30.1)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.12.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.18.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.13.0)
-      parser (>= 3.0.1.1)
-    rubocop-minitest (0.16.0)
+    rubocop-ast (1.18.0)
+      parser (>= 3.1.1.0)
+    rubocop-minitest (0.20.1)
       rubocop (>= 0.90, < 2.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
     ruby-progressbar (1.11.0)
-    timecop (0.9.4)
+    timecop (0.9.5)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.1.0)
     webrick (1.7.0)
-    zeitwerk (2.4.2)
+    yard (0.9.28)
+      webrick (~> 1.7.0)
 
 PLATFORMS
   ruby
@@ -109,7 +102,7 @@ DEPENDENCIES
   rubocop-minitest
   rubocop-rake
   timecop
-  yard!
+  yard
 
 BUNDLED WITH
-   2.2.21
+   2.3.16

data/bin/version-matrix

@@ -9,15 +9,15 @@ def minor_versions(name, requirement)
 end
 
 ruby_activerecord_requirements = {
-  "2.6" => ">= 5.2",
-  "2.7" => ">= 5.2",
-  "3.0" => ">= 6.0"
+  "2.7" => ">= 6.0",
+  "3.0" => ">= 6.0",
+  "3.1" => ">= 6.0"
 }
 
 activerecord_pg_requirements = {
-  "5.2" => [">= 0.18", "< 2.0"],
   "6.0" => [">= 0.18", "< 2.0"],
-  "6.1" => "~> 1.1"
+  "6.1" => "~> 1.1",
+  "7.0" => "~> 1.1"
 }
 
 versions = ruby_activerecord_requirements.flat_map do |ruby_version, activerecord_requirement|

data/lib/pg/aws_rds_iam/connection.rb

@@ -4,7 +4,25 @@ module PG
   module AWS_RDS_IAM
     module Connection
       def conndefaults
-        super + [{
+        super + [conndefault_aws_rds_iam_auth_token_generator]
+      end
+
+      def conninfo_parse(connection_string)
+        connection_info = ConnectionInfo.new(connection_string)
+
+        super(connection_info.to_s).tap do |result|
+          result << conndefault_aws_rds_iam_auth_token_generator.merge(val: connection_info.auth_token_generator_name) if connection_info.auth_token_generator_name
+        end
+      end
+
+      def parse_connect_args(*args)
+        AuthTokenInjector.call(super)
+      end
+
+      private
+
+      def conndefault_aws_rds_iam_auth_token_generator
+        {
           keyword: "aws_rds_iam_auth_token_generator",
           envvar: nil,
           compiled: nil,
@@ -12,11 +30,7 @@ module PG
           label: "AWS-RDS-IAM-auth-token-generator",
           dispchar: "",
           dispsize: 64
-        }]
-      end
-
-      def parse_connect_args(*)
-        AuthTokenInjector.call(super)
+        }
       end
     end
 

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

@@ -12,7 +12,7 @@ module PG
 
         def initialize(connection_string)
           @uri = ::URI.parse(connection_string)
-          @query = ::URI.decode_www_form(@uri.query).to_h
+          @query = @uri.query ? ::URI.decode_www_form(@uri.query).to_h : {}
           @auth_token_generator_name = @query.delete("aws_rds_iam_auth_token_generator")
         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.3.2"
+    VERSION = "0.4.0"
   end
 end

data/pg-aws_rds_iam.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
 
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 2.6"
+  spec.required_ruby_version = ">= 2.7"
 
   spec.add_dependency "aws-sdk-rds", "~> 1.0"
   spec.add_dependency "pg", ">= 0.18", "< 2.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg-aws_rds_iam
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Andrew Haines
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-15 00:00:00.000000000 Z
+date: 2022-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-rds
@@ -90,7 +90,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.3.2
+  documentation_uri: https://rubydoc.info/gems/pg-aws_rds_iam/0.4.0
   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'
@@ -102,14 +102,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.31
+rubygems_version: 3.3.16
 signing_key:
 specification_version: 4
 summary: IAM authentication for PostgreSQL on Amazon RDS