Skip to content

Commit

Permalink
Merge pull request #127 from webern/go
Browse files Browse the repository at this point in the history
add go and proxy vars to twoliter make
  • Loading branch information
webern authored Jan 29, 2024
2 parents 40e21e0 + e1ee2c4 commit 1e73d0d
Showing 1 changed file with 15 additions and 1 deletion.
16 changes: 15 additions & 1 deletion twoliter/src/cargo_make.rs
Original file line number Diff line number Diff line change
Expand Up @@ -160,20 +160,30 @@ 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; 13] = [
const ENV_VARS: [&str; 23] = [
"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",
"GO_MODULES",
"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 @@ -216,7 +226,11 @@ fn test_is_build_system_env() {
assert!(is_build_system_env("BOOT_CONFIG!"));
assert!(is_build_system_env("BOOT_CONFIG_INPUT"));
assert!(is_build_system_env("GO_MODULES"));
assert!(is_build_system_env("GOPROXY"));
assert!(is_build_system_env("http_proxy"));
assert!(is_build_system_env("AWS_REGION"));

// not
assert!(!is_build_system_env("PATH"));
assert!(!is_build_system_env("HOME"));
assert!(!is_build_system_env("COLORTERM"));
Expand Down

0 comments on commit 1e73d0d

Please sign in to comment.