Skip to content

Add URI-unsafe connection parameters support #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ikalnytskyi merged 1 commit into from
Jul 26, 2026
Merged

Add URI-unsafe connection parameters support #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,9 @@ jobs:
- name: Run setup-postgres
uses: ./
with:
username: yoda
password: GrandMaster
database: jedi_order
username: user:@/ n#m+e
password: p@ss:/ word?#
database: d@ta /#bas?:e
port: 34837
postgres-version: ${{ matrix.postgres-version }}
ssl: true
Expand All @@ -118,8 +118,8 @@ jobs:
CONNECTION_URI: ${{ steps.postgres.outputs.connection-uri }}
SERVICE_NAME: ${{ steps.postgres.outputs.service-name }}
CERTIFICATE_PATH: ${{ steps.postgres.outputs.certificate-path }}
EXPECTED_CONNECTION_URI: postgresql://yoda:GrandMaster@localhost:34837/jedi_order?sslmode=verify-ca&sslrootcert=${{ steps.postgres.outputs.certificate-path }}
EXPECTED_SERVICE_NAME: yoda
EXPECTED_CONNECTION_URI: "postgresql://user%3A%40%2F%20n%23m%2Be:p%40ss%3A%2F%20word%3F%23@localhost:34837/d%40ta%20%2F%23bas%3F%3Ae?sslmode=verify-ca&sslrootcert=${{ steps.postgres.outputs.certificate-path }}"
EXPECTED_SERVICE_NAME: "user:@/ n#m+e"
EXPECTED_SERVER_VERSION: ${{ matrix.postgres-version }}
EXPECTED_SSL: true

Expand Down
6 changes: 4 additions & 2 deletions action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ runs:
# download failures.
for attempt in 1 2 3; do
if choco install postgresql$INPUT_POSTGRES_VERSION \
--params "/Password:$INPUT_PASSWORD" \
--ia "--enable-components server,commandlinetools --extract-only 1" \
--no-progress; then
break
Expand Down Expand Up @@ -249,7 +248,10 @@ runs:

- name: Set action outputs
run: |
CONNECTION_URI="postgresql://$INPUT_USERNAME:$INPUT_PASSWORD@localhost:$INPUT_PORT/$INPUT_DATABASE"
USERNAME_ENCODED=$(jq -rn --arg s "$INPUT_USERNAME" '$s|@uri')
PASSWORD_ENCODED=$(jq -rn --arg s "$INPUT_PASSWORD" '$s|@uri')
DATABASE_ENCODED=$(jq -rn --arg s "$INPUT_DATABASE" '$s|@uri')
CONNECTION_URI="postgresql://$USERNAME_ENCODED:$PASSWORD_ENCODED@localhost:$INPUT_PORT/$DATABASE_ENCODED"
CERTIFICATE_PATH="$RUNNER_TEMP/pgdata/server.crt"

if [ "$INPUT_SSL" = "true" ]; then
Expand Down
2 changes: 1 addition & 1 deletion tests/test_action.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def connection(
if request.param == "uri":
return connection_factory(connection_uri)
elif request.param == "kv-string":
return connection_factory(f"service={service_name}")
return connection_factory(psycopg.conninfo.make_conninfo(service=service_name))
raise RuntimeError("f{request.param}: unknown value")


Expand Down
Loading