cargo pgrx test --runas envar passing
#1674
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This teaches the test `framework.rs` to pass through to `sudo` all the various cargo/rust environment variables. Turns out this might be necessary for `#[pg_test]` tests that use `std::env::var(...)`. When using `--runas` we spawn the postmaster with `sudo`, and its default policy is to reset the environment (`env_reset` flag in the sudoers file).
|
we're now doing the latter version: |
Comment on lines
+552
to
+556
| var.starts_with("CARGO") | ||
| || var.starts_with("RUST") | ||
| || var.starts_with("DEP_") | ||
| || ["OUT_DIR", "TARGET", "HOST", "NUM_JOBS", "OPT_LEVEL", "DEBUG", "PROFILE"] | ||
| .contains(&var) |
| // This ensures that in-process #[pg_test]s will see the `CARGO_xxx` envars they expect | ||
| for (var, value) in std::env::vars() { | ||
| if accept_envar(&var) { | ||
| let env_as_arg = format!("{var}={}", shlex::try_quote(&value)?); |
There was a problem hiding this comment.
if we use shlex, we should just skip the env vars that we can't quote the values of correctly, or we should panic more noisily, or we should stop iterating the env vars entirely. here is one of those options.
Suggested change
| let env_as_arg = format!("{var}={}", shlex::try_quote(&value)?); | |
| let Ok(quoted_val) = shlex::try_quote(&value) else { | |
| continue | |
| }; | |
| let env_as_arg = format!("{var}={quoted_val}"); |
Comment on lines
+565
to
+570
| for (var, value) in std::env::vars() { | ||
| if accept_envar(&var) { | ||
| let env_as_arg = format!("{var}={}", shlex::try_quote(&value)?); | ||
| cmd.arg(env_as_arg); | ||
| } | ||
| } |
There was a problem hiding this comment.
alternatively, instead of splitting and then reapplying these, why not use sudo's --preserve-env=var,var,var,...? are we worried about not having the required privilege?
There was a problem hiding this comment.
I didn’t see that in the man page. Let me investigate that and make sure we can rely on it even being there here in 2023.
|
Needs a rebase, unforch. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This teaches the test
framework.rsto pass through tosudoall the various cargo/rust environment variables.Turns out this might be necessary for
#[pg_test]tests that usestd::env::var(...). When using--runaswe spawn the postmaster withsudo, and its default policy is to reset the environment (env_resetflag in the sudoers file).