check error type instead of string #145
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
Signed-off-by: Craig Tabita <ctab@google.com>
ctab
force-pushed
the
check_for_unrecognized_template_type
branch
from
6ee54c2
to
a90bebc
Compare
maxsmythe
requested changes
Jun 19, 2019
| @@ -130,8 +129,7 @@ func (r *ReconcileConstraint) Reconcile(request reconcile.Request) (reconcile.Re | |||
| // Handle deletion | |||
| if containsString(finalizerName, instance.GetFinalizers()) { | |||
| if _, err := r.opa.RemoveConstraint(context.Background(), instance); err != nil { | |||
| // TODO make the unrecognized constraint error detectable via class introspection | |||
| if !(strings.HasPrefix(err.Error(), "Constraint kind ") && strings.HasSuffix(err.Error(), " is not recognized")) { | |||
| if reflect.TypeOf(err).String() == "client.UnrecognizedConstraintError" { | |||
There was a problem hiding this comment.
Type switching would be the better approach (no strings):
if _, ok := err.(client.UnrecognizedConstraintError); ok {
}
There was a problem hiding this comment.
Thanks @maxsmythe - just changed it
Signed-off-by: Craig Tabita <ctab@google.com>
maxsmythe
reviewed
Jun 21, 2019
| @@ -130,8 +128,7 @@ func (r *ReconcileConstraint) Reconcile(request reconcile.Request) (reconcile.Re | |||
| // Handle deletion | |||
| if containsString(finalizerName, instance.GetFinalizers()) { | |||
| if _, err := r.opa.RemoveConstraint(context.Background(), instance); err != nil { | |||
| // TODO make the unrecognized constraint error detectable via class introspection | |||
| if !(strings.HasPrefix(err.Error(), "Constraint kind ") && strings.HasSuffix(err.Error(), " is not recognized")) { | |||
| if _, ok := err.(*opa.UnrecognizedConstraintError); ok { | |||
There was a problem hiding this comment.
Currently opa.UnrecognizedConstraintError is a value, not a pointer, so this type check would never be true.
We should actually update the frameworks library to use a pointer-to-a-string, much like:
Signed-off-by: Craig Tabita <ctab@google.com>
…b/gatekeeper into check_for_unrecognized_template_type Signed-off-by: Craig Tabita <ctab@google.com>
maxsmythe
approved these changes
Jun 21, 2019
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.
No description provided.