mirror of
https://github.com/neondatabase/neon.git
synced 2026-05-29 19:10:38 +00:00
4d2e4b19c3
Corrects the postgres extension s3 gateway address to be not just a domain name but a full base URL. To make the code more readable, the option is renamed to "remote_ext_base_url", while keeping the old name also accessible by providing a clap argument alias. Also provides a very simple and, perhaps, even redundant unit test to confirm the logic behind parsing of the corresponding CLI argument. ## Problem As it is clearly stated in https://github.com/neondatabase/cloud/issues/26005, using of the short version of the domain name might work for now, but in the future, we should get rid of using the `default` namespace and this is where it will, most likely, break down. ## Summary of changes The changes adjust the domain name of the extension s3 gateway to use the proper base url format instead of the just domain name assuming the "default" namespace and add a new CLI argument name for to reflect the change and the expectance.
63 lines
1.8 KiB
Rust
63 lines
1.8 KiB
Rust
use std::sync::Arc;
|
|
|
|
use axum::extract::State;
|
|
use axum::response::{IntoResponse, Response};
|
|
use http::StatusCode;
|
|
use serde::Deserialize;
|
|
|
|
use crate::compute::{BUILD_TAG, ComputeNode};
|
|
use crate::http::JsonResponse;
|
|
use crate::http::extract::{Path, Query};
|
|
|
|
#[derive(Debug, Clone, Deserialize)]
|
|
pub(in crate::http) struct ExtensionServerParams {
|
|
#[serde(default)]
|
|
is_library: bool,
|
|
}
|
|
|
|
/// Download a remote extension.
|
|
pub(in crate::http) async fn download_extension(
|
|
Path(filename): Path<String>,
|
|
ext_server_params: Query<ExtensionServerParams>,
|
|
State(compute): State<Arc<ComputeNode>>,
|
|
) -> Response {
|
|
// Don't even try to download extensions if no remote storage is configured
|
|
if compute.params.remote_ext_base_url.is_none() {
|
|
return JsonResponse::error(
|
|
StatusCode::PRECONDITION_FAILED,
|
|
"remote storage is not configured",
|
|
);
|
|
}
|
|
|
|
let ext = {
|
|
let state = compute.state.lock().unwrap();
|
|
let pspec = state.pspec.as_ref().unwrap();
|
|
let spec = &pspec.spec;
|
|
|
|
let remote_extensions = match spec.remote_extensions.as_ref() {
|
|
Some(r) => r,
|
|
None => {
|
|
return JsonResponse::error(
|
|
StatusCode::CONFLICT,
|
|
"information about remote extensions is unavailable",
|
|
);
|
|
}
|
|
};
|
|
|
|
remote_extensions.get_ext(
|
|
&filename,
|
|
ext_server_params.is_library,
|
|
&BUILD_TAG,
|
|
&compute.params.pgversion,
|
|
)
|
|
};
|
|
|
|
match ext {
|
|
Ok((ext_name, ext_path)) => match compute.download_extension(ext_name, ext_path).await {
|
|
Ok(_) => StatusCode::OK.into_response(),
|
|
Err(e) => JsonResponse::error(StatusCode::INTERNAL_SERVER_ERROR, e),
|
|
},
|
|
Err(e) => JsonResponse::error(StatusCode::NOT_FOUND, e),
|
|
}
|
|
}
|