internal: merge xds/envconfig into env package #4923
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
menghanl
approved these changes
Nov 2, 2021
|
LGTM, but see my comment on #4922. |
|
PR updated with the changes made in #4922 to leave RBAC in place. |
menghanl
suggested changes
Nov 9, 2021
internal/xds/bootstrap.go
Outdated
| @@ -79,11 +79,11 @@ func SetupBootstrapFile(opts BootstrapOptions) (func(), error) { | |||
| } | |||
| logger.Infof("Created bootstrap file at %q with contents: %s\n", f.Name(), bootstrapContents) | |||
|
|
|||
| origBootstrapFileName := env.BootstrapFileName | |||
| env.BootstrapFileName = f.Name() | |||
| origBootstrapFileName := envconfig.BootstrapFileName | |||
There was a problem hiding this comment.
Hmm, most (all?) of the xds variable names don't have "xds" in it. Would that be confusing?
There was a problem hiding this comment.
Makes sense. I tweaked the variable names a bit; PTAL
menghanl
approved these changes
Nov 10, 2021
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Also contains #4922
RELEASE NOTES: N/A