fix: oauth client metadata as object in CRD (#71) #72
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
Demonsthere
requested changes
Jun 4, 2021
api/v1alpha1/oauth2client_types.go
Outdated
| @@ -182,6 +187,8 @@ func init() { | |||
|
|
|||
| // ToOAuth2ClientJSON converts an OAuth2Client into a OAuth2ClientJSON object that represents an OAuth2 client digestible by ORY Hydra | |||
| func (c *OAuth2Client) ToOAuth2ClientJSON() *hydra.OAuth2ClientJSON { | |||
| meta, _ := json.Marshal(c.Spec.Metadata) | |||
There was a problem hiding this comment.
this can throw an error. I wouldn't ignore it, but rather keep the invalid json here, and throw a validation error in the controller, so we can log it and maybe set a status.
There was a problem hiding this comment.
good point, added json encoding error propagation
Demonsthere
reviewed
Jun 4, 2021
| if updateErr := r.updateReconciliationStatusError(ctx, c, hydrav1alpha1.StatusRegistrationFailed, err); updateErr != nil { | ||
| return updateErr | ||
| } | ||
| return nil |
There was a problem hiding this comment.
Shouldn't we return the original error here?
Demonsthere
reviewed
Jun 4, 2021
| if updateErr := r.updateReconciliationStatusError(ctx, c, hydrav1alpha1.StatusUpdateFailed, err); updateErr != nil { | ||
| return updateErr | ||
| } | ||
| return nil |
Demonsthere
reviewed
Jun 4, 2021
| if updateErr := r.updateReconciliationStatusError(ctx, c, hydrav1alpha1.StatusRegistrationFailed, err); updateErr != nil { | ||
| return updateErr | ||
| } | ||
| return err |
There was a problem hiding this comment.
Suggested change
| return err | |
| return errors.WithStack(err) |
| if updateErr := r.updateReconciliationStatusError(ctx, c, hydrav1alpha1.StatusUpdateFailed, err); updateErr != nil { | ||
| return updateErr | ||
| } | ||
| return err |
There was a problem hiding this comment.
Suggested change
| return err | |
| return errors.WithStack(err) |
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.
Fixes #71
Simply adding
+kubebuilder:validation:Type=objectannotation is not enough, as it results inconflicting types in allOf branches in schema: string vs objecterror.Switched
Metadatatype fromjson.RawMessagetoJSONfromapiextensionspackage, which represents any valid JSON value.These types are supported: bool, int64, float64, string, []interface{}, map[string]interface{} and nil.
https://pkg.go.dev/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1#JSON