Skip to content
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

Support hostnames that include "psql" #50

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Support hostnames that include "psql" #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
faba5e0
Support hostnames that include "psql"
spowser Nov 16, 2023
d185553
Support Node 16
spowser Nov 16, 2023
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
2 changes: 1 addition & 1 deletion action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ inputs:
description: 'Additional options supported by postgresql simple SQL shell. These options will be applied when executing the given file on the Azure DB for Postgresql. In case of multiple files, the same args will be applied for all files'
required: false
runs:
using: 'node12'
using: 'node16'
main: 'lib/main.js'
3 changes: 2 additions & 1 deletion src/Utils/ActionInputs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ export class ActionInputs {
}

private parseConnectionString() {
this._connectionString = this._connectionString.replace('psql', "").replace(/["]+/g, '').trim();
// Replace the "psql " part of the psql command copied from the Azure portal connection info
this._connectionString = this._connectionString.replace(/^psql\s/,'').replace(/["]+/g, '').trim();
if (!this.validateConnectionString()) {
throw new Error(`Please provide a valid connection string. A valid connection string is a series of keyword/value pairs separated by space. Spaces around the equal sign are optional. To write an empty value, or a value containing spaces, surround it with single quotes, e.g., keyword = 'a value'. Single quotes and backslashes within the value must be escaped with a backslash`);
}
Expand Down