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.

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

(PDB-4934) PuppetDB does not support username@hostname auth for Azure PostgreSQL #3406

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/puppetlabs/puppetdb/cli/services.clj
Original file line number Diff line number Diff line change
Expand Up @@ -586,14 +586,15 @@

(defn- require-db-connection-as [datasource migrator]
(jdbc/with-db-connection datasource
(let [current-user (jdbc/current-user)]
(when-not (= current-user migrator)
(let [current-user (jdbc/current-user)
trimmed_migrator (str/replace migrator #"@.*" "")]
(when-not (= current-user trimmed_migrator)
(throw
(ex-info (format "Connected to database as %s, not migrator %s"
(pr-str current-user)
(pr-str migrator))
(pr-str trimmed_migrator))
{:kind ::connected-as-wrong-user
:expected migrator
:expected trimmed_migrator
:actual current-user}))))))

(defn init-with-db
Expand Down