mirror of
https://github.com/neondatabase/neon.git
synced 2026-10-28 14:36:51 +00:00
Parse AWS creds from control plane (#4750)
This commit is contained in:
@@ -30,7 +30,8 @@
|
||||
//! -C 'postgresql://cloud_admin@localhost/postgres' \
|
||||
//! -S /var/db/postgres/specs/current.json \
|
||||
//! -b /usr/local/bin/postgres \
|
||||
//! -r {"bucket": "my-bucket", "region": "eu-central-1", "endpoint": "http:://localhost:9000"} \
|
||||
//! -r {"bucket": "my-bucket", "region": "eu-central-1", "endpoint": "http:://localhost:9000",
|
||||
//! (optionally) "key": "AWS_SECRET_ACCESS_KEY", "id": "AWS_ACCESS_KEY_ID"}
|
||||
//! ```
|
||||
//!
|
||||
use std::collections::HashMap;
|
||||
@@ -72,10 +73,6 @@ fn main() -> Result<()> {
|
||||
let pgbin = matches.get_one::<String>("pgbin").unwrap_or(&pgbin_default);
|
||||
|
||||
let remote_ext_config = matches.get_one::<String>("remote-ext-config");
|
||||
// NOTE TODO: until control-plane changes, we can use the following line to forcibly enable remote extensions
|
||||
// let remote_ext_config = Some(
|
||||
// r#"{"bucket": "neon-dev-extensions", "region": "eu-central-1", "endpoint": null, "prefix": "5555"}"#.to_string(),
|
||||
// );
|
||||
let ext_remote_storage = remote_ext_config.map(|x| {
|
||||
init_remote_storage(x, build_tag)
|
||||
.expect("cannot initialize remote extension storage from config")
|
||||
|
||||
@@ -183,7 +183,7 @@ pub async fn download_extension(
|
||||
Ok(())
|
||||
}
|
||||
|
||||
// This function initializes the necessary structs to use remmote storage (should be fairly cheap)
|
||||
// This function initializes the necessary structs to use remote storage (should be fairly cheap)
|
||||
pub fn init_remote_storage(
|
||||
remote_ext_config: &str,
|
||||
default_prefix: &str,
|
||||
@@ -202,7 +202,17 @@ pub fn init_remote_storage(
|
||||
.unwrap_or(default_prefix)
|
||||
.to_string();
|
||||
|
||||
// TODO: potentially allow modification of other parameters
|
||||
// control plane passes the aws creds via CLI ARGS to compute_ctl
|
||||
let aws_key = remote_ext_config["key"].as_str();
|
||||
let aws_id = remote_ext_config["id"].as_str();
|
||||
if let Some(aws_key) = aws_key {
|
||||
if let Some(aws_id) = aws_id {
|
||||
std::env::set_var("AWS_SECRET_ACCESS_KEY", aws_key);
|
||||
std::env::set_var("AWS_ACCESS_KEY_ID", aws_id);
|
||||
}
|
||||
}
|
||||
|
||||
// If needed, it is easy to allow modification of other parameters
|
||||
// however, default values should be fine for now
|
||||
let config = S3Config {
|
||||
bucket_name: remote_ext_bucket.to_string(),
|
||||
|
||||
Reference in New Issue
Block a user