Give better error when policy was created manually #412
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
lkysow
force-pushed
the
better-duplicate-error
branch
from
a55aec7
to
6b25d9c
Compare
lkysow
requested review from
a team,
kschoche and
ishustava
and removed request for
a team
lkysow
force-pushed
the
better-duplicate-error
branch
from
6b25d9c
to
7731bf3
Compare
ishustava
approved these changes
Jan 13, 2021
Comment on lines
1113
to
1114
| tokenFile, fileCleanup := writeTempFile(t, bootToken) | ||
| defer fileCleanup() |
There was a problem hiding this comment.
This isn't blocking or anything, but we can also move the cleanup to the writeTempFile helper function if we call t.Cleanup there. I like that it declutters the code a bit.
| c.ACL.Tokens.Master = bootToken | ||
| }) | ||
| require.NoError(err) | ||
| svr.WaitForServiceIntentions(t) |
There was a problem hiding this comment.
I'm wondering if we need this since this command or test aren't creating service intentions.
There was a problem hiding this comment.
Changed to WaitForLeader()
In cases where a user creates a policy out-of-band with the same name as one consul-k8s tries to update, give a better error. This is definitely an edge case but has occurred when a user created the cross-namespace-acl-policy manually when trying to work around another issue. This will at least give a better error message in this case.
lkysow
force-pushed
the
better-duplicate-error
branch
from
7731bf3
to
1d929ac
Compare
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.
Suggestion cannot be applied right now. Please check back later.
In cases where a user creates a policy out-of-band with the same name as
one consul-k8s tries to update, give a better error.
This is definitely an edge case but has occurred when a user created the
cross-namespace-acl-policy manually when trying to work around another
issue. This will at least give a better error message in this case.
How I've tested this PR:
How I expect reviewers to test this PR:
Checklist: