pg-aws_rds_iam 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 920be3b0e703f19eb05fbd79801ee15ffc4a261d811682426f8ff90e870b7445
-  data.tar.gz: b8b799ef04905de4e760320b6b7928f6e989ca7f167b2e5c0b5fa94b87c786a7
+  metadata.gz: e30706e0bd824304eea8f942c41a9a4b7d9ef3d1de045bb5e584c0dd59c0e820
+  data.tar.gz: fa2c711695830b43c1a1e58722f69f7e27fb57c9514d572ff300e68c0e9000cd
 SHA512:
-  metadata.gz: 8661064d598861e2c7f9a0d91598335627c12acc901ec92a4de1b833a1b768dec4d3108a86d2d6e7331b831645db9092b4ea5b8ef2c0f36330465d2764203117
-  data.tar.gz: 439ab6a13b36c36baeb56c0e3bbdf33406e92816209e30cc6ed080e068e96eea201fcde24499d8a664bbc3523628fc9fd90ab83845800301d1fed852716f00ac
+  metadata.gz: 0b6e875a21ec9d67ca170ba07236ed9482679f61ffd79cd2df888814b5a463bb72ce9f908d0e44c425ca3dbd5fe258415af9598e265c28cbbdbf6358b33a6d23
+  data.tar.gz: 674a9f7bfa03cfb3b6b8200ee60de00b0cdaa79dae92827f38242ba33042ee6323c3597863b9ca4ce7834d14e6f6daab339696029a1de3284c648b66cf87157a

data/.github/workflows/{pull-request.yml → ci.yml}

@@ -1,31 +1,24 @@
-name: Pull request
+name: CI
 
-on:
-  - pull_request
+on: pull_request
 
 jobs:
-  check-gemfile-lock:
-    name: Check Gemfile.lock
+  lint:
+    name: Lint
 
     runs-on: ubuntu-latest
 
-    container:
-      image: ruby:alpine
-
     steps:
-      - name: Install dependencies
-        run: apk add git
-
       - name: Check out source code
         uses: actions/checkout@v3
 
-      - name: Install Bundler
-        run: bin/install-bundler
+      - name: Install Ruby and gems
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
 
-      - name: Check Gemfile.lock
-        run: bin/bundle lock
-        env:
-          BUNDLE_FROZEN: true
+      - name: Run RuboCop
+        run: bin/rake rubocop
 
   version-matrix:
     name: Generate version matrix
@@ -36,9 +29,6 @@ jobs:
       matrix: ${{ steps.version-matrix.outputs.matrix }}
 
     steps:
-      - name: Check if secrets are available
-        run: test -n "${{ secrets.AVAILABLE }}"
-
       - name: Check out source code
         uses: actions/checkout@v3
 
@@ -56,55 +46,28 @@ jobs:
 
     runs-on: ubuntu-latest
 
-    container:
-      image: ruby:${{ matrix.ruby }}-alpine
-
     env:
       BUNDLE_PATH: ${{ github.workspace }}/vendor/bundle
       ACTIVERECORD_VERSION: ${{ matrix.activerecord }}
       PG_VERSION: ${{ matrix.pg }}
 
     steps:
-      - name: Install dependencies
-        run: apk add build-base git postgresql-client postgresql-dev tar
-
       - name: Check out source code
         uses: actions/checkout@v3
 
-      - name: Install Bundler
-        run: bin/install-bundler
+      - name: Install Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
 
       - name: Update Gemfile.lock
         run: bin/bundle lock --update activerecord pg
 
-      - name: Compute cache key
-        id: cache-key
-        run: |
-          source /etc/os-release
-          postgresql_version=$(apk info --installed postgresql-dev --verbose)
-          printf \
-            "::set-output name=cache-key::alpine-%s-ruby-%s-%s\n" \
-            "${VERSION_ID}" \
-            "${RUBY_VERSION}" \
-            "${postgresql_version}"
-
-      - name: Cache gems
-        uses: actions/cache@v3
-        with:
-          key: ${{ steps.cache-key.outputs.cache-key }}-gems-${{ hashFiles('Gemfile.lock') }}
-          path: vendor/bundle
-          restore-keys: |
-            ${{ steps.cache-key.outputs.cache-key }}-gems-
-
       - name: Install gems
-        run: bin/bundle install
-        env:
-          BUNDLE_FROZEN: true
-          BUNDLE_JOBS: 4
-          BUNDLE_RETRY: 3
-
-      - name: Run RuboCop
-        run: bin/rake rubocop
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
 
       - name: Run unit tests
         run: bin/rake test:unit
@@ -119,9 +82,12 @@ jobs:
           SECURITY_GROUP_ID: ${{ secrets.SECURITY_GROUP_ID }}
 
   test-results:
+    name: Check test results
+
     if: always()
 
     needs:
+      - version-matrix
       - test
 
     runs-on: ubuntu-latest

data/.ruby-version

@@ -1 +1 @@
-ruby-3.1.2
+ruby-3.2.0

data/CHANGELOG.md

@@ -8,6 +8,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 No notable changes.
 
+## [0.4.2] - 2023-01-10
+
+### Changed
+* Test against Ruby 3.2 ([#442](https://github.com/haines/pg-aws_rds_iam/pull/442))
+
+### Fixed
+* Handle empty host in connection URIs ([#442](https://github.com/haines/pg-aws_rds_iam/pull/442))
+
 ## [0.4.1] - 2022-07-20
 
 ### Fixed
@@ -17,7 +25,7 @@ No notable changes.
 
 ### 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))
+* Require Ruby ≥ 2.7 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))
@@ -57,7 +65,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.4.1...HEAD
+[Unreleased]: https://github.com/haines/pg-aws_rds_iam/compare/v0.4.2...HEAD
+[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
 [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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pg-aws_rds_iam (0.4.1)
+    pg-aws_rds_iam (0.4.2)
       aws-sdk-rds (~> 1.0)
       pg (>= 0.18, < 2.0)
 
@@ -21,67 +21,67 @@ GEM
     ansi (1.5.0)
     ast (2.4.2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.607.0)
-    aws-sdk-core (3.131.2)
+    aws-partitions (1.689.0)
+    aws-sdk-core (3.168.4)
       aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.525.0)
-      aws-sigv4 (~> 1.1)
+      aws-partitions (~> 1, >= 1.651.0)
+      aws-sigv4 (~> 1.5)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-ec2 (1.322.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-ec2 (1.356.0)
+      aws-sdk-core (~> 3, >= 3.165.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-rds (1.148.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-rds (1.169.0)
+      aws-sdk-core (~> 3, >= 3.165.0)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.5.0)
+    aws-sigv4 (1.5.2)
       aws-eventstream (~> 1, >= 1.0.2)
     builder (3.2.4)
     coderay (1.1.3)
-    commonmarker (0.23.5)
+    commonmarker (0.23.6)
     concurrent-ruby (1.1.10)
     i18n (1.11.0)
       concurrent-ruby (~> 1.0)
-    jmespath (1.6.1)
-    json (2.6.2)
+    jmespath (1.6.2)
+    json (2.6.3)
     method_source (1.0.0)
-    minitest (5.16.2)
+    minitest (5.17.0)
     minitest-reporters (1.5.0)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
     parallel (1.22.1)
-    parser (3.1.2.0)
+    parser (3.1.3.0)
       ast (~> 2.4.1)
-    pg (1.4.1)
+    pg (1.4.5)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.5.0)
+    regexp_parser (2.6.1)
     rexml (3.2.5)
-    rubocop (1.31.2)
+    rubocop (1.42.0)
       json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.1.0.0)
+      parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.18.0, < 2.0)
+      rubocop-ast (>= 1.24.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.19.1)
+    rubocop-ast (1.24.1)
       parser (>= 3.1.1.0)
-    rubocop-minitest (0.20.1)
+    rubocop-minitest (0.25.1)
       rubocop (>= 0.90, < 2.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
     ruby-progressbar (1.11.0)
-    timecop (0.9.5)
+    timecop (0.9.6)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.2.0)
+    unicode-display_width (2.3.0)
     webrick (1.7.0)
     yard (0.9.28)
       webrick (~> 1.7.0)
@@ -107,4 +107,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   2.3.18
+   2.4.3

data/bin/version-matrix

@@ -11,7 +11,15 @@ end
 ruby_activerecord_requirements = {
   "2.7" => ">= 6.0",
   "3.0" => ">= 6.0",
-  "3.1" => ">= 6.0"
+  "3.1" => ">= 6.0",
+  "3.2" => ">= 6.0"
+}
+
+ruby_pg_requirements = {
+  "2.7" => "> 0",
+  "3.0" => "> 0",
+  "3.1" => "> 0",
+  "3.2" => ">= 1.3"
 }
 
 activerecord_pg_requirements = {
@@ -22,7 +30,12 @@ activerecord_pg_requirements = {
 
 versions = ruby_activerecord_requirements.flat_map do |ruby_version, activerecord_requirement|
   minor_versions("activerecord", activerecord_requirement).flat_map do |activerecord_version|
-    minor_versions("pg", activerecord_pg_requirements.fetch(activerecord_version)).map do |pg_version|
+    pg_requirement = [
+      ruby_pg_requirements.fetch(ruby_version),
+      activerecord_pg_requirements.fetch(activerecord_version)
+    ].flatten
+
+    minor_versions("pg", pg_requirement).map do |pg_version|
       {
         ruby: ruby_version,
         activerecord: activerecord_version,
@@ -34,4 +47,7 @@ end
 
 matrix = { include: versions }
 
-puts "::set-output name=matrix::#{matrix.to_json}"
+puts JSON.pretty_generate(matrix)
+
+output_file = ENV.fetch("GITHUB_OUTPUT", false)
+File.write output_file, "matrix=#{matrix.to_json}" if output_file

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

@@ -21,7 +21,9 @@ module PG
         end
 
         def host
-          @uri.host || @query["host"]
+          return @query["host"] if @uri.host.nil? || @uri.host.empty?
+
+          @uri.host
         end
 
         def port

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.4.1"
+    VERSION = "0.4.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg-aws_rds_iam
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Andrew Haines
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-20 00:00:00.000000000 Z
+date: 2023-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-rds
@@ -53,7 +53,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/dependabot.yml"
-- ".github/workflows/pull-request.yml"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".ruby-version"
@@ -94,7 +94,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.4.1
+  documentation_uri: https://rubydoc.info/gems/pg-aws_rds_iam/0.4.2
   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'
@@ -113,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.18
+rubygems_version: 3.4.3
 signing_key:
 specification_version: 4
 summary: IAM authentication for PostgreSQL on Amazon RDS