Rename master and agent_master ACL tokens in the config file format

[boxofrad]

This is a first step towards removing this non-inclusive language. In subsequent PRs we will update the naming in the API, the consul acl set-agent-token command, the auto-config API, and internal references, struct field names etc.

[hashicorp-ci]

🤔 This PR has changes in the website/ directory but does not have a type/docs-cherrypick label. If the changes are for the next version, this can be ignored. If they are updates to current docs, attach the label to auto cherrypick to the stable-website branch after merging.

[dnephin]

Looks great, nice work!

One suggestion below for making the deprecated fields a little more explicit even though we can't use the DeprecatedConfig struct. Also happy to chat about other options if you think there is a better way.

I think any of that could be done as a follow up, so nothing blocking a merge I can see.

[jkirschner-hashicorp]

@boxofrad : thanks for taking this on! I proposed some changes that make the docs easier to understand for users on Consul 1.4 - 1.10. Let me know what you think.

[boxofrad]

Thanks @jkirschner-hashicorp, that's much better. Let me know what you think now?

[jkirschner-hashicorp]

Thanks for the changes, @boxofrad!

I added a few small comments to consider before merging, but have given my approval.

[jkirschner-hashicorp]

Is the intent that, if someone is on Consul 1.11, they will follow this link, see

This is available in Consul 1.11 and later. In prior versions, use acl.tokens.master

and then find out the correct (previous) name that way?

I imagine we've had this problem before (and will have new instances of this problem in the future) when we rename things... do we mention every name everywhere? Or mention just the most recent name in most docs, but link to information about old names?

[Long term, this might be best solved by having versioned docs pages. But that's well outside the scope of this PR :) ]

[boxofrad]

Yep! In this case, it's a bit more onerous because we've already renamed the token before (acl_master_token ⇒ acl.tokens.master ⇒ acl.tokens.initial_management) so users on very old versions have a bit of a trail to follow.

do we mention every name everywhere? Or mention just the most recent name in most docs

That seems to be the case, yeah. For example, the current ACL System page mentions acl.tokens.agent_master, not acl_agent_master_token.

[jkirschner-hashicorp]

For someone on Consul <1.11, I'm not sure this text makes it clear that the initial_management token is a direct replacement (a rename), so the docs for initial_management apply here, too.

Perhaps this? Let me know what you think.

Suggested change

	- `master` ((#acl_tokens_master)) **Deprecated in Consul 1.11. Use the
	[`acl.tokens.initial_management`](#acl_tokens_initial_management) field instead.**
	- `master` ((#acl_tokens_master)) **Renamed in Consul 1.11 to
	[`acl.tokens.initial_management`](#acl_tokens_initial_management).**

Or if we must include the word deprecated...

Suggested change

	- `master` ((#acl_tokens_master)) **Deprecated in Consul 1.11. Use the
	[`acl.tokens.initial_management`](#acl_tokens_initial_management) field instead.**
	- `master` ((#acl_tokens_master)) **Deprecated in Consul 1.11: renamed to
	[`acl.tokens.initial_management`](#acl_tokens_initial_management).**

[boxofrad]

I agree, rename is clearer 👍🏻

[jkirschner-hashicorp]

Same comment as above (mention that it was renamed)

[hc-github-team-consul-core]

🍒 If backport labels were added before merging, cherry-picking will start automatically.

To retroactively trigger a backport after merging, add backport labels and re-run https://circleci.com/gh/hashicorp/consul/512839.