Skip to content
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

use allow/deny instead of the colored alternatives #9019

Merged
merged 8 commits into from
Oct 12, 2020

Conversation

greut
Copy link
Contributor

@greut greut commented Oct 3, 2020

Follow up of #8716 (on top of #8988)

Signed-off-by: Yoan Blanc <yoan@dosimple.ch>
Signed-off-by: Yoan Blanc <yoan@dosimple.ch>
@tgross tgross self-requested a review October 5, 2020 12:58
Copy link
Member

@tgross tgross left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @greut!

As you can see there's a bunch of tiny backwards compatibility issues to getting this right, so we hadn't quite gotten around to doing this yet. So thank you so much for this PR!

I've left some remarks around ensuring backwards compat. Also, if you'd be willing to take a crack at updating the documentation that'd be great. Otherwise I'd be happy to do it myself in a follow-up PR once this gets merged.

client/allocrunner/taskrunner/task_dir_hook.go Outdated Show resolved Hide resolved
@@ -43,7 +43,7 @@ func validateTask(task *structs.Task, taskEnv *taskenv.TaskEnv, conf *config.Con
var mErr multierror.Error

// Validate the user
unallowedUsers := conf.ReadStringListToMapDefault("user.blacklist", config.DefaultUserBlacklist)
unallowedUsers := conf.ReadStringListToMapDefault("user.denylist", config.DefaultUserDenylist)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We'll want to update ReadStringListToMapDefault to do the same sort of thing we've done with ReadStringListToMap so that we can keep backwards compatibility with user.blacklist.

client/client.go Outdated Show resolved Hide resolved
go.sum Outdated Show resolved Hide resolved
plugins/drivers/testutils/testing.go Outdated Show resolved Hide resolved
drivers/docker/config.go Outdated Show resolved Hide resolved
@tgross tgross added this to the 0.13 milestone Oct 5, 2020
@tgross
Copy link
Member

tgross commented Oct 5, 2020

Marking this for the 0.13 milestone because I want to make sure we get this in.

Signed-off-by: Yoan Blanc <yoan@dosimple.ch>
Signed-off-by: Yoan Blanc <yoan@dosimple.ch>
Signed-off-by: Yoan Blanc <yoan@dosimple.ch>
Signed-off-by: Yoan Blanc <yoan@dosimple.ch>
Signed-off-by: Yoan Blanc <yoan@dosimple.ch>
Copy link
Member

@tgross tgross left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Thanks again for this @greut!

@tgross tgross merged commit c14c616 into hashicorp:master Oct 12, 2020
@tgross
Copy link
Member

tgross commented Oct 12, 2020

I'll follow-up on this with updating the docs to match!

@greut greut deleted the allow-deny branch October 14, 2020 06:02
fredrikhgrelland pushed a commit to fredrikhgrelland/nomad that referenced this pull request Oct 22, 2020
@github-actions
Copy link

I'm going to lock this pull request because it has been closed for 120 days ⏳. This helps our maintainers find and focus on the active contributions.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Dec 15, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants