Skip to content

fix: encode query parameters in migrations #579

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
merged 1 commit into from
Apr 18, 2024
Merged

fix: encode query parameters in migrations #579

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: 3 additions & 7 deletions .github/workflows/bolt-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,9 @@ jobs:
- name: Bolt Test
run: nix-shell --pure --run "bolt test"

- name: Tmate
if: failure()
uses: mxschmitt/action-tmate@v3

# - name: K3D Cleanup
# if: always()
# run: nix-shell --pure --run "k3d cluster delete rivet-ci"
- name: K3D Cleanup
if: always()
run: nix-shell --pure --run "k3d cluster delete rivet-ci"

- name: Force Parallel Failure
if: failure()
Expand Down
12 changes: 10 additions & 2 deletions lib/bolt/core/src/utils/db_conn.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use std::{collections::HashMap, sync::Arc};
use urlencoding::encode;

use anyhow::*;

Expand Down Expand Up @@ -179,7 +180,10 @@ impl DatabaseConnections {

Ok(format!(
"cockroach://{}:{}@{}/{}?sslmode=verify-ca&sslrootcert=/local/crdb-ca.crt",
username, password, host, full_db_name
encode(&username),
encode(&password),
host,
encode(&full_db_name),
))
}
RuntimeKind::ClickHouse { .. } => {
Expand All @@ -196,7 +200,11 @@ impl DatabaseConnections {

Ok(format!(
"clickhouse://{}/?database={}&username={}&password={}{}",
host, db_name, clickhouse_user, clickhouse_password, query_other
host,
encode(&db_name),
encode(&clickhouse_user),
encode(&clickhouse_password),
query_other,
))
}
x @ _ => bail!("cannot migrate this type of service: {x:?}"),
Expand Down