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

hopefully unbroken wip

Browse Source
This commit is contained in:
Alek Westover
2023-07-18 08:45:39 -04:00
parent b27fa34c00
commit 4af6a4d5e8
1 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,6 +60,7 @@ use compute_tools::params::*;
use compute_tools::spec::*;
const BUILD_TAG_DEFAULT: &str = "local";
const DEFAULT_REMOTE_EXT_CONFIG: &str = r#"{"bucket": "neon-dev-extensions", "region": "eu-central-1", "endpoint": null, "prefix": "5555"}"#;
fn main() -> Result<()> {
init_tracing_and_logging(DEFAULT_LOG_LEVEL)?;
@@ -71,25 +72,30 @@ fn main() -> Result<()> {
let pgbin_default = String::from("postgres");
let pgbin = matches.get_one::<String>("pgbin").unwrap_or(&pgbin_default);
let remote_ext_config = matches.get_one::<String>("remote-ext-config");
let remote_ext_config = matches
.get_one::<String>("remote-ext-config")
.map(|x| x.to_string());
// let remote_ext_config =
// Some(remote_ext_config.unwrap_or(DEFAULT_REMOTE_EXT_CONFIG.to_string()));
let ext_remote_storage = remote_ext_config.map(|x| {
init_remote_storage(x, build_tag)
init_remote_storage(&x, build_tag)
.expect("cannot initialize remote extension storage from config")
});
// creds used to connect to remote extensions bucket
let aws_creds = matches.get_one::<String>("awscreds");
if let Some(aws_creds) = aws_creds {
// not sure if this is a bad idea?
let aws_creds_dict: serde_json::Value = serde_json::from_str(aws_creds)?;
std::env::set_var(
"AWS_ACCESS_KEY_ID",
aws_creds_dict["ID"].as_str().expect("config parse error"),
);
std::env::set_var(
"AWS_SECRET_ACCESS_KEY",
aws_creds_dict["key"].as_str().expect("config parse error"),
);
}
// let aws_creds = matches.get_one::<String>("awscreds");
// if let Some(aws_creds) = aws_creds {
// // not sure if this is a bad idea?
// let aws_creds_dict: serde_json::Value = serde_json::from_str(aws_creds)?;
// std::env::set_var(
// "AWS_ACCESS_KEY_ID",
// aws_creds_dict["ID"].as_str().expect("config parse error"),
// );
// std::env::set_var(
// "AWS_SECRET_ACCESS_KEY",
// aws_creds_dict["key"].as_str().expect("config parse error"),
// );
// }
let http_port = *matches
.get_one::<u16>("http-port")