rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-01-06 13:02:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(compute) Remove the hardcoded default value for PGXN HTTP URL. (#12030)

Browse Source 
Removes the hardcoded value for the Postgres Extensions HTTP gateway URL
as it is always provided by the calling code.
This commit is contained in:
Shockingly Good
2025-05-30 17:26:22 +02:00
committed by GitHub
parent 8d26978ed9
commit 62cd3b8d3d
1 changed files with 1 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
compute_tools/src/bin/compute_ctl.rs
View File

@@ -57,21 +57,6 @@ use tracing::{error, info};
use url::Url; use url::Url;
use utils::failpoint_support; use utils::failpoint_support;
// Compatibility hack: if the control plane specified any remote-ext-config
// use the default value for extension storage proxy gateway.
// Remove this once the control plane is updated to pass the gateway URL
fn parse_remote_ext_base_url(arg: &str) -> Result<String> {
const FALLBACK_PG_EXT_GATEWAY_BASE_URL: &str =
"http://pg-ext-s3-gateway.pg-ext-s3-gateway.svc.cluster.local";
Ok(if arg.starts_with("http") {
arg
} else {
FALLBACK_PG_EXT_GATEWAY_BASE_URL
}
.to_owned())
}
#[derive(Parser)] #[derive(Parser)]
#[command(rename_all = "kebab-case")] #[command(rename_all = "kebab-case")]
struct Cli { struct Cli {
@@ -80,7 +65,7 @@ struct Cli {
/// The base URL for the remote extension storage proxy gateway. /// The base URL for the remote extension storage proxy gateway.
/// Should be in the form of `http(s)://<gateway-hostname>[:<port>]`. /// Should be in the form of `http(s)://<gateway-hostname>[:<port>]`.
#[arg(short = 'r', long, value_parser = parse_remote_ext_base_url, alias = "remote-ext-config")] #[arg(short = 'r', long, alias = "remote-ext-config")]
pub remote_ext_base_url: Option<String>, pub remote_ext_base_url: Option<String>,
/// The port to bind the external listening HTTP server to. Clients running /// The port to bind the external listening HTTP server to. Clients running
@@ -276,18 +261,4 @@ mod test {
fn verify_cli() { fn verify_cli() {
Cli::command().debug_assert() Cli::command().debug_assert()
} }
#[test]
fn parse_pg_ext_gateway_base_url() {
let arg = "http://pg-ext-s3-gateway2";
let result = super::parse_remote_ext_base_url(arg).unwrap();
assert_eq!(result, arg);
let arg = "pg-ext-s3-gateway";
let result = super::parse_remote_ext_base_url(arg).unwrap();
assert_eq!(
result,
"http://pg-ext-s3-gateway.pg-ext-s3-gateway.svc.cluster.local"
);
}
} }