From 84e14a918e4293f714316307f50527ae1cc654c9 Mon Sep 17 00:00:00 2001 From: rajashree <rajashree.28m@gmail.com> Date: Mon, 18 May 2020 14:11:53 -0700 Subject: [PATCH 1/2] Add UserInfo field to UserAttributes --- apis/management.cattle.io/v3/authn_types.go | 1 + 1 file changed, 1 insertion(+) diff --git a/apis/management.cattle.io/v3/authn_types.go b/apis/management.cattle.io/v3/authn_types.go index 94fb8351..62054f17 100644 --- a/apis/management.cattle.io/v3/authn_types.go +++ b/apis/management.cattle.io/v3/authn_types.go @@ -80,6 +80,7 @@ type UserAttribute struct { metav1.ObjectMeta `json:"metadata,omitempty"` UserName string + UserPrincipal Principal GroupPrincipals map[string]Principals // the value is a []Principal, but code generator cannot handle slice as a value LastRefresh string NeedsRefresh bool From e91aac4ad563cea2c05b432fb305eae952ade24c Mon Sep 17 00:00:00 2001 From: rajashree <rajashree.28m@gmail.com> Date: Mon, 18 May 2020 14:12:21 -0700 Subject: [PATCH 2/2] Generated changes --- apis/management.cattle.io/v3/zz_generated_deepcopy.go | 1 + client/management/v3/zz_generated_user_attribute.go | 2 ++ 2 files changed, 3 insertions(+) diff --git a/apis/management.cattle.io/v3/zz_generated_deepcopy.go b/apis/management.cattle.io/v3/zz_generated_deepcopy.go index 52a40e15..1a8a0549 100644 --- a/apis/management.cattle.io/v3/zz_generated_deepcopy.go +++ b/apis/management.cattle.io/v3/zz_generated_deepcopy.go @@ -10063,6 +10063,7 @@ func (in *UserAttribute) DeepCopyInto(out *UserAttribute) { *out = *in out.TypeMeta = in.TypeMeta in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + in.UserPrincipal.DeepCopyInto(&out.UserPrincipal) if in.GroupPrincipals != nil { in, out := &in.GroupPrincipals, &out.GroupPrincipals *out = make(map[string]Principals, len(*in)) diff --git a/client/management/v3/zz_generated_user_attribute.go b/client/management/v3/zz_generated_user_attribute.go index f50ded0f..dbc02228 100644 --- a/client/management/v3/zz_generated_user_attribute.go +++ b/client/management/v3/zz_generated_user_attribute.go @@ -14,6 +14,7 @@ const ( UserAttributeFieldRemoved = "removed" UserAttributeFieldUUID = "uuid" UserAttributeFieldUserName = "userName" + UserAttributeFieldUserPrincipal = "userPrincipal" ) type UserAttribute struct { @@ -29,4 +30,5 @@ type UserAttribute struct { Removed string `json:"removed,omitempty" yaml:"removed,omitempty"` UUID string `json:"uuid,omitempty" yaml:"uuid,omitempty"` UserName string `json:"userName,omitempty" yaml:"userName,omitempty"` + UserPrincipal *Principal `json:"userPrincipal,omitempty" yaml:"userPrincipal,omitempty"` }