Mark identityClaims as required, old identity properties as optional

codeready-toolchain · Jan 12, 2024 · 5345e14 · 5345e14
1 parent d5c7803
commit 5345e14
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/api/v1alpha1/useraccount_types.go b/api/v1alpha1/useraccount_types.go
@@ -33,6 +33,7 @@ type UserAccountSpec struct {
 
 	// UserID is the user ID from RHD Identity Provider token (“sub” claim)
 	// Is to be used to create Identity and UserIdentityMapping resources
+	// +optional
 	UserID string `json:"userID"`
 
 	// If set to true then the corresponding user should not be able to login

diff --git a/api/v1alpha1/usersignup_types.go b/api/v1alpha1/usersignup_types.go
@@ -171,9 +171,11 @@ type UserSignupSpec struct {
 	TargetCluster string `json:"targetCluster,omitempty"`
 
 	// The user's user ID, obtained from the identity provider from the 'sub' (subject) claim
+	// +optional
 	Userid string `json:"userid"`
 
 	// The user's username, obtained from the identity provider.
+	// +optional
 	Username string `json:"username"`
 
 	// The user's first name, obtained from the identity provider.
@@ -199,7 +201,6 @@ type UserSignupSpec struct {
 	OriginalSub string `json:"originalSub,omitempty"`
 
 	// IdentityClaims contains as-is claim values extracted from the user's access token
-	// +optional
 	IdentityClaims IdentityClaimsEmbedded `json:"identityClaims,omitempty"`
 }
 
@@ -231,7 +232,6 @@ type PropagatedClaims struct {
 	Sub string `json:"sub"`
 
 	// UserID contains the value of the 'user_id' claim
-	// +optional
 	UserID string `json:"userID,omitempty"`
 
 	// AccountID contains the value of the 'account_id' claim

diff --git a/api/v1alpha1/zz_generated.openapi.go b/api/v1alpha1/zz_generated.openapi.go