Skip to content

Commit

Permalink
add go and proxy vars to twoliter make
Browse files Browse the repository at this point in the history
Certain environments will need variables like GOPROXY and HTTP_PROXY
passed to the SDK container in docker run commands. The list of
variables added in this commit were found in the docker-go script.
  • Loading branch information
webern committed Dec 8, 2023
1 parent 0d1fbd4 commit 5fc780c
Showing 1 changed file with 13 additions and 1 deletion.
14 changes: 13 additions & 1 deletion twoliter/src/cargo_make.rs
Original file line number Diff line number Diff line change
Expand Up @@ -160,19 +160,29 @@ fn build_system_env_vars() -> Result<Vec<String>> {

/// A list of environment variables that don't conform to naming conventions but need to be passed
/// through to the `cargo make` invocation.
const ENV_VARS: [&str; 12] = [
const ENV_VARS: [&str; 22] = [
"ALLOW_MISSING_KEY",
"AMI_DATA_FILE_SUFFIX",
"CARGO_MAKE_CARGO_ARGS",
"CARGO_MAKE_CARGO_LIMIT_JOBS",
"CARGO_MAKE_DEFAULT_TESTSYS_KUBECONFIG_PATH",
"CARGO_MAKE_TESTSYS_ARGS",
"CARGO_MAKE_TESTSYS_KUBECONFIG_ARG",
"GONOPROXY",
"GOPRIVATE",
"GOPROXY",
"GOSUMDB",
"HTTPS_PROXY",
"HTTP_PROXY",
"MARK_OVA_AS_TEMPLATE",
"NO_PROXY",
"RELEASE_START_TIME",
"SSM_DATA_FILE_SUFFIX",
"VMWARE_IMPORT_SPEC_PATH",
"VMWARE_VM_NAME_DEFAULT",
"http_proxy",
"https_proxy",
"no_proxy",
];

const DISALLOWED_SDK_VARS: [&str; 4] = [
Expand Down Expand Up @@ -214,6 +224,8 @@ fn test_is_build_system_env() {
assert!(is_build_system_env("TESTSYS_!"));
assert!(is_build_system_env("BOOT_CONFIG!"));
assert!(is_build_system_env("BOOT_CONFIG_INPUT"));
assert!(is_build_system_env("GOPROXY"));
assert!(is_build_system_env("http_proxy"));
assert!(is_build_system_env("AWS_REGION"));
assert!(!is_build_system_env("PATH"));
assert!(!is_build_system_env("HOME"));
Expand Down

0 comments on commit 5fc780c

Please sign in to comment.