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

Change whitelist/blacklist to allowlist/denylist #1388

Merged
merged 4 commits into from
Jun 23, 2020

Conversation

findkim
Copy link
Contributor

@findkim findkim commented Jun 23, 2020

Updates Consul Template to use inclusive language while keeping backward compatibility for the changed configuration option names. Configuration documentation, inline documentation, and variable names are updated to have minimal occurrences of the renamed values.

  • template.function_blacklist is renamed to template.function_denylist
  • exec.env.blacklist is renamed to exec.env.denylist
  • exec.env.whitelist is renamed to exec.env.allowlist

We encourage practitioners to update their configuration to match these changes, but existing configurations are still backward compatibile.

Resolves #1387

Updates project to use inclusive language while keeping backward
compatibility for the changed configuration option names.
Fields are still exported to be loaded by mapstructure but ignored
by JSON encoding.
@findkim findkim requested a review from a team June 23, 2020 16:10
Copy link
Contributor

@eikenb eikenb left a comment

Choose a reason for hiding this comment

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

Except for the one change to the case this all looks really good. I like how you handled backwards compatibility with the *deprecated names to minimize the occurrences of the old terminology.

I'm going to go ahead and approve this as there is only one very minor change.

config/config_test.go Outdated Show resolved Hide resolved
mapstructure decoder seems to be case insensitive, but updating
the test anyway to be consistent
@findkim findkim merged commit 6c371e8 into hashicorp:master Jun 23, 2020
@findkim findkim deleted the rename-config-opt branch June 23, 2020 20:26
findkim added a commit that referenced this pull request Jul 27, 2020
Removing changelog line to match the revert of GH-1388
@eikenb eikenb added this to the 0.25.1 milestone Jul 27, 2020
eikenb pushed a commit that referenced this pull request Apr 23, 2021
PR #1388 already changed whitelist/blacklist to allowlist/denylist, but the
example in the configuration documentation was left out.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Replace whitelist/blacklist terminology with allowlist/denylist
2 participants