New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Pass job user as environment variable to task #1465
Merged
Merged
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
Pass the user who clicks the "Run Now" button as the value of the environment variable `JOB_USER` in the task environment. Can provide more granular, task-level permissions or auditability.
ssalinas
reviewed
Mar 20, 2017
@@ -184,6 +184,8 @@ private void prepareEnvironment(final SingularityTaskRequest task, SingularityTa | |||
setEnv(envBldr, "TASK_ID", taskId.getId()); | |||
setEnv(envBldr, "ESTIMATED_INSTANCE_COUNT", task.getRequest().getInstancesSafe()); | |||
|
|||
setEnv(envBldr, "JOB_USER", task.getPendingTask().getUser().or("")); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Two things.
- Wondering if
JOB_USER
is descriptive enough here. This method will get called for services and workers as well. Maybe something more likeSTARTED_BY_USER
? - In the case where
user
is not present on the pending task, would it make more sent to leave this out rather than have an empty string as the value?
Two small changes: * Change the name of the environment variable to something more descriptive (`JOB_USER` -> `STARTED_BY_USER`) * Don't set the environment variable at all if the user can't be found.
|
darcatron
reviewed
Mar 21, 2017
success = success || (environmentVariable.getName().equals("STARTED_BY_USER") && environmentVariable.getValue().equals(user)); | ||
} | ||
|
||
assertTrue("Expected env variable JOB_USER to be set to " + user, success); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
got an extra JOB_USER
lurking here
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.
Pass the user who clicks the "Run Now" button as the value of the
environment variable
STARTED_BY_USER
in the task environment. Can providemore granular, task-level permissions or auditability.