Changes to authn types

2025-09-02 05:35:16 +00:00 · 2017-12-11 22:09:01 -08:00
parent 2fc465d61c
commit 446c7ae47b
19 changed files with 1347 additions and 101 deletions
--- a/client/management/v3/zz_generated_client.go
+++ b/client/management/v3/zz_generated_client.go
@@ -26,6 +26,9 @@ type Client struct {
 	Group                      GroupOperations
 	GroupMember                GroupMemberOperations
 	Identity                   IdentityOperations
+	LocalCredential            LocalCredentialOperations
+	GithubCredential           GithubCredentialOperations
+	LoginInput                 LoginInputOperations
 	DynamicSchema              DynamicSchemaOperations
 }

@@ -58,6 +61,9 @@ func NewClient(opts *clientbase.ClientOpts) (*Client, error) {
 	client.Group = newGroupClient(client)
 	client.GroupMember = newGroupMemberClient(client)
 	client.Identity = newIdentityClient(client)
+	client.LocalCredential = newLocalCredentialClient(client)
+	client.GithubCredential = newGithubCredentialClient(client)
+	client.LoginInput = newLoginInputClient(client)
 	client.DynamicSchema = newDynamicSchemaClient(client)

 	return client, nil
--- a/client/management/v3/zz_generated_github_credential.go
+++ b/client/management/v3/zz_generated_github_credential.go
@@ -0,0 +1,95 @@
+package client
+
+import (
+	"github.com/rancher/norman/types"
+)
+
+const (
+	GithubCredentialType                 = "githubCredential"
+	GithubCredentialFieldAnnotations     = "annotations"
+	GithubCredentialFieldCode            = "code"
+	GithubCredentialFieldCreated         = "created"
+	GithubCredentialFieldFinalizers      = "finalizers"
+	GithubCredentialFieldLabels          = "labels"
+	GithubCredentialFieldName            = "name"
+	GithubCredentialFieldOwnerReferences = "ownerReferences"
+	GithubCredentialFieldRemoved         = "removed"
+	GithubCredentialFieldResourcePath    = "resourcePath"
+	GithubCredentialFieldUuid            = "uuid"
+)
+
+type GithubCredential struct {
+	types.Resource
+	Annotations     map[string]string `json:"annotations,omitempty"`
+	Code            string            `json:"code,omitempty"`
+	Created         string            `json:"created,omitempty"`
+	Finalizers      []string          `json:"finalizers,omitempty"`
+	Labels          map[string]string `json:"labels,omitempty"`
+	Name            string            `json:"name,omitempty"`
+	OwnerReferences []OwnerReference  `json:"ownerReferences,omitempty"`
+	Removed         string            `json:"removed,omitempty"`
+	ResourcePath    string            `json:"resourcePath,omitempty"`
+	Uuid            string            `json:"uuid,omitempty"`
+}
+type GithubCredentialCollection struct {
+	types.Collection
+	Data   []GithubCredential `json:"data,omitempty"`
+	client *GithubCredentialClient
+}
+
+type GithubCredentialClient struct {
+	apiClient *Client
+}
+
+type GithubCredentialOperations interface {
+	List(opts *types.ListOpts) (*GithubCredentialCollection, error)
+	Create(opts *GithubCredential) (*GithubCredential, error)
+	Update(existing *GithubCredential, updates interface{}) (*GithubCredential, error)
+	ByID(id string) (*GithubCredential, error)
+	Delete(container *GithubCredential) error
+}
+
+func newGithubCredentialClient(apiClient *Client) *GithubCredentialClient {
+	return &GithubCredentialClient{
+		apiClient: apiClient,
+	}
+}
+
+func (c *GithubCredentialClient) Create(container *GithubCredential) (*GithubCredential, error) {
+	resp := &GithubCredential{}
+	err := c.apiClient.Ops.DoCreate(GithubCredentialType, container, resp)
+	return resp, err
+}
+
+func (c *GithubCredentialClient) Update(existing *GithubCredential, updates interface{}) (*GithubCredential, error) {
+	resp := &GithubCredential{}
+	err := c.apiClient.Ops.DoUpdate(GithubCredentialType, &existing.Resource, updates, resp)
+	return resp, err
+}
+
+func (c *GithubCredentialClient) List(opts *types.ListOpts) (*GithubCredentialCollection, error) {
+	resp := &GithubCredentialCollection{}
+	err := c.apiClient.Ops.DoList(GithubCredentialType, opts, resp)
+	resp.client = c
+	return resp, err
+}
+
+func (cc *GithubCredentialCollection) Next() (*GithubCredentialCollection, error) {
+	if cc != nil && cc.Pagination != nil && cc.Pagination.Next != "" {
+		resp := &GithubCredentialCollection{}
+		err := cc.client.apiClient.Ops.DoNext(cc.Pagination.Next, resp)
+		resp.client = cc.client
+		return resp, err
+	}
+	return nil, nil
+}
+
+func (c *GithubCredentialClient) ByID(id string) (*GithubCredential, error) {
+	resp := &GithubCredential{}
+	err := c.apiClient.Ops.DoByID(GithubCredentialType, id, resp)
+	return resp, err
+}
+
+func (c *GithubCredentialClient) Delete(container *GithubCredential) error {
+	return c.apiClient.Ops.DoResourceDelete(GithubCredentialType, &container.Resource)
+}
--- a/client/management/v3/zz_generated_group.go
+++ b/client/management/v3/zz_generated_group.go
@@ -8,10 +8,7 @@ const (
 	GroupType                 = "group"
 	GroupFieldAnnotations     = "annotations"
 	GroupFieldCreated         = "created"
-	GroupFieldDisplayName     = "displayName"
-	GroupFieldExternalID      = "externalID"
 	GroupFieldFinalizers      = "finalizers"
-	GroupFieldGroupName       = "groupName"
 	GroupFieldLabels          = "labels"
 	GroupFieldName            = "name"
 	GroupFieldOwnerReferences = "ownerReferences"
@@ -24,10 +21,7 @@ type Group struct {
 	types.Resource
 	Annotations     map[string]string `json:"annotations,omitempty"`
 	Created         string            `json:"created,omitempty"`
-	DisplayName     string            `json:"displayName,omitempty"`
-	ExternalID      string            `json:"externalID,omitempty"`
 	Finalizers      []string          `json:"finalizers,omitempty"`
-	GroupName       string            `json:"groupName,omitempty"`
 	Labels          map[string]string `json:"labels,omitempty"`
 	Name            string            `json:"name,omitempty"`
 	OwnerReferences []OwnerReference  `json:"ownerReferences,omitempty"`
--- a/client/management/v3/zz_generated_group_member.go
+++ b/client/management/v3/zz_generated_group_member.go
@@ -5,33 +5,33 @@ import (
 )

 const (
-	GroupMemberType                  = "groupMember"
-	GroupMemberFieldAnnotations      = "annotations"
-	GroupMemberFieldCreated          = "created"
-	GroupMemberFieldFinalizers       = "finalizers"
-	GroupMemberFieldGroupExternalID  = "groupExternalID"
-	GroupMemberFieldLabels           = "labels"
-	GroupMemberFieldMemberExternalID = "memberExternalID"
-	GroupMemberFieldName             = "name"
-	GroupMemberFieldOwnerReferences  = "ownerReferences"
-	GroupMemberFieldRemoved          = "removed"
-	GroupMemberFieldResourcePath     = "resourcePath"
-	GroupMemberFieldUuid             = "uuid"
+	GroupMemberType                 = "groupMember"
+	GroupMemberFieldAnnotations     = "annotations"
+	GroupMemberFieldCreated         = "created"
+	GroupMemberFieldExternalID      = "externalId"
+	GroupMemberFieldFinalizers      = "finalizers"
+	GroupMemberFieldGroupId         = "groupId"
+	GroupMemberFieldLabels          = "labels"
+	GroupMemberFieldName            = "name"
+	GroupMemberFieldOwnerReferences = "ownerReferences"
+	GroupMemberFieldRemoved         = "removed"
+	GroupMemberFieldResourcePath    = "resourcePath"
+	GroupMemberFieldUuid            = "uuid"
 )

 type GroupMember struct {
 	types.Resource
-	Annotations      map[string]string `json:"annotations,omitempty"`
-	Created          string            `json:"created,omitempty"`
-	Finalizers       []string          `json:"finalizers,omitempty"`
-	GroupExternalID  string            `json:"groupExternalID,omitempty"`
-	Labels           map[string]string `json:"labels,omitempty"`
-	MemberExternalID string            `json:"memberExternalID,omitempty"`
-	Name             string            `json:"name,omitempty"`
-	OwnerReferences  []OwnerReference  `json:"ownerReferences,omitempty"`
-	Removed          string            `json:"removed,omitempty"`
-	ResourcePath     string            `json:"resourcePath,omitempty"`
-	Uuid             string            `json:"uuid,omitempty"`
+	Annotations     map[string]string `json:"annotations,omitempty"`
+	Created         string            `json:"created,omitempty"`
+	ExternalID      string            `json:"externalId,omitempty"`
+	Finalizers      []string          `json:"finalizers,omitempty"`
+	GroupId         string            `json:"groupId,omitempty"`
+	Labels          map[string]string `json:"labels,omitempty"`
+	Name            string            `json:"name,omitempty"`
+	OwnerReferences []OwnerReference  `json:"ownerReferences,omitempty"`
+	Removed         string            `json:"removed,omitempty"`
+	ResourcePath    string            `json:"resourcePath,omitempty"`
+	Uuid            string            `json:"uuid,omitempty"`
 }
 type GroupMemberCollection struct {
 	types.Collection
--- a/client/management/v3/zz_generated_identity.go
+++ b/client/management/v3/zz_generated_identity.go
@@ -9,11 +9,10 @@ const (
 	IdentityFieldAnnotations     = "annotations"
 	IdentityFieldCreated         = "created"
 	IdentityFieldDisplayName     = "displayName"
-	IdentityFieldExternalID      = "externalID"
 	IdentityFieldExtraInfo       = "extraInfo"
 	IdentityFieldFinalizers      = "finalizers"
-	IdentityFieldIdentityName    = "identityName"
 	IdentityFieldLabels          = "labels"
+	IdentityFieldLoginName       = "loginName"
 	IdentityFieldMe              = "me"
 	IdentityFieldMemberOf        = "memberOf"
 	IdentityFieldName            = "name"
@@ -30,11 +29,10 @@ type Identity struct {
 	Annotations     map[string]string `json:"annotations,omitempty"`
 	Created         string            `json:"created,omitempty"`
 	DisplayName     string            `json:"displayName,omitempty"`
-	ExternalID      string            `json:"externalID,omitempty"`
 	ExtraInfo       map[string]string `json:"extraInfo,omitempty"`
 	Finalizers      []string          `json:"finalizers,omitempty"`
-	IdentityName    string            `json:"identityName,omitempty"`
 	Labels          map[string]string `json:"labels,omitempty"`
+	LoginName       string            `json:"loginName,omitempty"`
 	Me              *bool             `json:"me,omitempty"`
 	MemberOf        *bool             `json:"memberOf,omitempty"`
 	Name            string            `json:"name,omitempty"`
--- a/client/management/v3/zz_generated_local_credential.go
+++ b/client/management/v3/zz_generated_local_credential.go
@@ -0,0 +1,97 @@
+package client
+
+import (
+	"github.com/rancher/norman/types"
+)
+
+const (
+	LocalCredentialType                 = "localCredential"
+	LocalCredentialFieldAnnotations     = "annotations"
+	LocalCredentialFieldCreated         = "created"
+	LocalCredentialFieldFinalizers      = "finalizers"
+	LocalCredentialFieldLabels          = "labels"
+	LocalCredentialFieldName            = "name"
+	LocalCredentialFieldOwnerReferences = "ownerReferences"
+	LocalCredentialFieldPassword        = "password"
+	LocalCredentialFieldRemoved         = "removed"
+	LocalCredentialFieldResourcePath    = "resourcePath"
+	LocalCredentialFieldUsername        = "username"
+	LocalCredentialFieldUuid            = "uuid"
+)
+
+type LocalCredential struct {
+	types.Resource
+	Annotations     map[string]string `json:"annotations,omitempty"`
+	Created         string            `json:"created,omitempty"`
+	Finalizers      []string          `json:"finalizers,omitempty"`
+	Labels          map[string]string `json:"labels,omitempty"`
+	Name            string            `json:"name,omitempty"`
+	OwnerReferences []OwnerReference  `json:"ownerReferences,omitempty"`
+	Password        string            `json:"password,omitempty"`
+	Removed         string            `json:"removed,omitempty"`
+	ResourcePath    string            `json:"resourcePath,omitempty"`
+	Username        string            `json:"username,omitempty"`
+	Uuid            string            `json:"uuid,omitempty"`
+}
+type LocalCredentialCollection struct {
+	types.Collection
+	Data   []LocalCredential `json:"data,omitempty"`
+	client *LocalCredentialClient
+}
+
+type LocalCredentialClient struct {
+	apiClient *Client
+}
+
+type LocalCredentialOperations interface {
+	List(opts *types.ListOpts) (*LocalCredentialCollection, error)
+	Create(opts *LocalCredential) (*LocalCredential, error)
+	Update(existing *LocalCredential, updates interface{}) (*LocalCredential, error)
+	ByID(id string) (*LocalCredential, error)
+	Delete(container *LocalCredential) error
+}
+
+func newLocalCredentialClient(apiClient *Client) *LocalCredentialClient {
+	return &LocalCredentialClient{
+		apiClient: apiClient,
+	}
+}
+
+func (c *LocalCredentialClient) Create(container *LocalCredential) (*LocalCredential, error) {
+	resp := &LocalCredential{}
+	err := c.apiClient.Ops.DoCreate(LocalCredentialType, container, resp)
+	return resp, err
+}
+
+func (c *LocalCredentialClient) Update(existing *LocalCredential, updates interface{}) (*LocalCredential, error) {
+	resp := &LocalCredential{}
+	err := c.apiClient.Ops.DoUpdate(LocalCredentialType, &existing.Resource, updates, resp)
+	return resp, err
+}
+
+func (c *LocalCredentialClient) List(opts *types.ListOpts) (*LocalCredentialCollection, error) {
+	resp := &LocalCredentialCollection{}
+	err := c.apiClient.Ops.DoList(LocalCredentialType, opts, resp)
+	resp.client = c
+	return resp, err
+}
+
+func (cc *LocalCredentialCollection) Next() (*LocalCredentialCollection, error) {
+	if cc != nil && cc.Pagination != nil && cc.Pagination.Next != "" {
+		resp := &LocalCredentialCollection{}
+		err := cc.client.apiClient.Ops.DoNext(cc.Pagination.Next, resp)
+		resp.client = cc.client
+		return resp, err
+	}
+	return nil, nil
+}
+
+func (c *LocalCredentialClient) ByID(id string) (*LocalCredential, error) {
+	resp := &LocalCredential{}
+	err := c.apiClient.Ops.DoByID(LocalCredentialType, id, resp)
+	return resp, err
+}
+
+func (c *LocalCredentialClient) Delete(container *LocalCredential) error {
+	return c.apiClient.Ops.DoResourceDelete(LocalCredentialType, &container.Resource)
+}
--- a/client/management/v3/zz_generated_login_input.go
+++ b/client/management/v3/zz_generated_login_input.go
@@ -0,0 +1,105 @@
+package client
+
+import (
+	"github.com/rancher/norman/types"
+)
+
+const (
+	LoginInputType                          = "loginInput"
+	LoginInputFieldAnnotations              = "annotations"
+	LoginInputFieldCreated                  = "created"
+	LoginInputFieldDescription              = "description"
+	LoginInputFieldFinalizers               = "finalizers"
+	LoginInputFieldGithubCredential         = "githubCredential"
+	LoginInputFieldIdentityRefreshTTLMillis = "identityRefreshTTL"
+	LoginInputFieldLabels                   = "labels"
+	LoginInputFieldLocalCredential          = "localCredential"
+	LoginInputFieldName                     = "name"
+	LoginInputFieldOwnerReferences          = "ownerReferences"
+	LoginInputFieldRemoved                  = "removed"
+	LoginInputFieldResourcePath             = "resourcePath"
+	LoginInputFieldResponseType             = "responseType"
+	LoginInputFieldTTLMillis                = "ttl"
+	LoginInputFieldUuid                     = "uuid"
+)
+
+type LoginInput struct {
+	types.Resource
+	Annotations              map[string]string `json:"annotations,omitempty"`
+	Created                  string            `json:"created,omitempty"`
+	Description              string            `json:"description,omitempty"`
+	Finalizers               []string          `json:"finalizers,omitempty"`
+	GithubCredential         *GithubCredential `json:"githubCredential,omitempty"`
+	IdentityRefreshTTLMillis string            `json:"identityRefreshTTL,omitempty"`
+	Labels                   map[string]string `json:"labels,omitempty"`
+	LocalCredential          *LocalCredential  `json:"localCredential,omitempty"`
+	Name                     string            `json:"name,omitempty"`
+	OwnerReferences          []OwnerReference  `json:"ownerReferences,omitempty"`
+	Removed                  string            `json:"removed,omitempty"`
+	ResourcePath             string            `json:"resourcePath,omitempty"`
+	ResponseType             string            `json:"responseType,omitempty"`
+	TTLMillis                string            `json:"ttl,omitempty"`
+	Uuid                     string            `json:"uuid,omitempty"`
+}
+type LoginInputCollection struct {
+	types.Collection
+	Data   []LoginInput `json:"data,omitempty"`
+	client *LoginInputClient
+}
+
+type LoginInputClient struct {
+	apiClient *Client
+}
+
+type LoginInputOperations interface {
+	List(opts *types.ListOpts) (*LoginInputCollection, error)
+	Create(opts *LoginInput) (*LoginInput, error)
+	Update(existing *LoginInput, updates interface{}) (*LoginInput, error)
+	ByID(id string) (*LoginInput, error)
+	Delete(container *LoginInput) error
+}
+
+func newLoginInputClient(apiClient *Client) *LoginInputClient {
+	return &LoginInputClient{
+		apiClient: apiClient,
+	}
+}
+
+func (c *LoginInputClient) Create(container *LoginInput) (*LoginInput, error) {
+	resp := &LoginInput{}
+	err := c.apiClient.Ops.DoCreate(LoginInputType, container, resp)
+	return resp, err
+}
+
+func (c *LoginInputClient) Update(existing *LoginInput, updates interface{}) (*LoginInput, error) {
+	resp := &LoginInput{}
+	err := c.apiClient.Ops.DoUpdate(LoginInputType, &existing.Resource, updates, resp)
+	return resp, err
+}
+
+func (c *LoginInputClient) List(opts *types.ListOpts) (*LoginInputCollection, error) {
+	resp := &LoginInputCollection{}
+	err := c.apiClient.Ops.DoList(LoginInputType, opts, resp)
+	resp.client = c
+	return resp, err
+}
+
+func (cc *LoginInputCollection) Next() (*LoginInputCollection, error) {
+	if cc != nil && cc.Pagination != nil && cc.Pagination.Next != "" {
+		resp := &LoginInputCollection{}
+		err := cc.client.apiClient.Ops.DoNext(cc.Pagination.Next, resp)
+		resp.client = cc.client
+		return resp, err
+	}
+	return nil, nil
+}
+
+func (c *LoginInputClient) ByID(id string) (*LoginInput, error) {
+	resp := &LoginInput{}
+	err := c.apiClient.Ops.DoByID(LoginInputType, id, resp)
+	return resp, err
+}
+
+func (c *LoginInputClient) Delete(container *LoginInput) error {
+	return c.apiClient.Ops.DoResourceDelete(LoginInputType, &container.Resource)
+}
--- a/client/management/v3/zz_generated_token.go
+++ b/client/management/v3/zz_generated_token.go
@@ -5,49 +5,49 @@ import (
 )

 const (
-	TokenType                  = "token"
-	TokenFieldAnnotations      = "annotations"
-	TokenFieldAuthProvider     = "authProvider"
-	TokenFieldCreated          = "created"
-	TokenFieldDescription      = "description"
-	TokenFieldExternalID       = "externalID"
-	TokenFieldFinalizers       = "finalizers"
-	TokenFieldIsDerived        = "isDerived"
-	TokenFieldLabels           = "labels"
-	TokenFieldLastUpdateTime   = "lastUpdateTime"
-	TokenFieldName             = "name"
-	TokenFieldOwnerReferences  = "ownerReferences"
-	TokenFieldRefreshTTLMillis = "refreshTTL"
-	TokenFieldRemoved          = "removed"
-	TokenFieldResourcePath     = "resourcePath"
-	TokenFieldTTLMillis        = "ttl"
-	TokenFieldTokenID          = "tokenID"
-	TokenFieldTokenValue       = "tokenValue"
-	TokenFieldUser             = "user"
-	TokenFieldUuid             = "uuid"
+	TokenType                          = "token"
+	TokenFieldAnnotations              = "annotations"
+	TokenFieldAuthProvider             = "authProvider"
+	TokenFieldCreated                  = "created"
+	TokenFieldDescription              = "description"
+	TokenFieldExternalID               = "externalId"
+	TokenFieldFinalizers               = "finalizers"
+	TokenFieldIdentityRefreshTTLMillis = "identityRefreshTTL"
+	TokenFieldIsDerived                = "isDerived"
+	TokenFieldLabels                   = "labels"
+	TokenFieldLastUpdateTime           = "lastUpdateTime"
+	TokenFieldName                     = "name"
+	TokenFieldOwnerReferences          = "ownerReferences"
+	TokenFieldRemoved                  = "removed"
+	TokenFieldResourcePath             = "resourcePath"
+	TokenFieldTTLMillis                = "ttl"
+	TokenFieldTokenID                  = "tokenId"
+	TokenFieldTokenValue               = "tokenValue"
+	TokenFieldUser                     = "user"
+	TokenFieldUuid                     = "uuid"
 )

 type Token struct {
 	types.Resource
-	Annotations      map[string]string `json:"annotations,omitempty"`
-	AuthProvider     string            `json:"authProvider,omitempty"`
-	Created          string            `json:"created,omitempty"`
-	Description      string            `json:"description,omitempty"`
-	ExternalID       string            `json:"externalID,omitempty"`
-	Finalizers       []string          `json:"finalizers,omitempty"`
-	IsDerived        *bool             `json:"isDerived,omitempty"`
-	Labels           map[string]string `json:"labels,omitempty"`
-	LastUpdateTime   string            `json:"lastUpdateTime,omitempty"`
-	Name             string            `json:"name,omitempty"`
-	OwnerReferences  []OwnerReference  `json:"ownerReferences,omitempty"`
-	RefreshTTLMillis string            `json:"refreshTTL,omitempty"`
-	Removed          string            `json:"removed,omitempty"`
-	ResourcePath     string            `json:"resourcePath,omitempty"`
-	TTLMillis        string            `json:"ttl,omitempty"`
-	TokenID          string            `json:"tokenID,omitempty"`
-	TokenValue       string            `json:"tokenValue,omitempty"`
-	User             string            `json:"user,omitempty"`
-	Uuid             string            `json:"uuid,omitempty"`
+	Annotations              map[string]string `json:"annotations,omitempty"`
+	AuthProvider             string            `json:"authProvider,omitempty"`
+	Created                  string            `json:"created,omitempty"`
+	Description              string            `json:"description,omitempty"`
+	ExternalID               string            `json:"externalId,omitempty"`
+	Finalizers               []string          `json:"finalizers,omitempty"`
+	IdentityRefreshTTLMillis string            `json:"identityRefreshTTL,omitempty"`
+	IsDerived                *bool             `json:"isDerived,omitempty"`
+	Labels                   map[string]string `json:"labels,omitempty"`
+	LastUpdateTime           string            `json:"lastUpdateTime,omitempty"`
+	Name                     string            `json:"name,omitempty"`
+	OwnerReferences          []OwnerReference  `json:"ownerReferences,omitempty"`
+	Removed                  string            `json:"removed,omitempty"`
+	ResourcePath             string            `json:"resourcePath,omitempty"`
+	TTLMillis                string            `json:"ttl,omitempty"`
+	TokenID                  string            `json:"tokenId,omitempty"`
+	TokenValue               string            `json:"tokenValue,omitempty"`
+	User                     string            `json:"user,omitempty"`
+	Uuid                     string            `json:"uuid,omitempty"`
 }
 type TokenCollection struct {
 	types.Collection
--- a/client/management/v3/zz_generated_user.go
+++ b/client/management/v3/zz_generated_user.go
@@ -8,8 +8,7 @@ const (
 	UserType                 = "user"
 	UserFieldAnnotations     = "annotations"
 	UserFieldCreated         = "created"
-	UserFieldDisplayName     = "displayName"
-	UserFieldExternalID      = "externalID"
+	UserFieldExternalID      = "externalId"
 	UserFieldFinalizers      = "finalizers"
 	UserFieldLabels          = "labels"
 	UserFieldName            = "name"
@@ -17,7 +16,6 @@ const (
 	UserFieldRemoved         = "removed"
 	UserFieldResourcePath    = "resourcePath"
 	UserFieldSecret          = "secret"
-	UserFieldUserName        = "userName"
 	UserFieldUuid            = "uuid"
 )

@@ -25,8 +23,7 @@ type User struct {
 	types.Resource
 	Annotations     map[string]string `json:"annotations,omitempty"`
 	Created         string            `json:"created,omitempty"`
-	DisplayName     string            `json:"displayName,omitempty"`
-	ExternalID      string            `json:"externalID,omitempty"`
+	ExternalID      string            `json:"externalId,omitempty"`
 	Finalizers      []string          `json:"finalizers,omitempty"`
 	Labels          map[string]string `json:"labels,omitempty"`
 	Name            string            `json:"name,omitempty"`
@@ -34,7 +31,6 @@ type User struct {
 	Removed         string            `json:"removed,omitempty"`
 	ResourcePath    string            `json:"resourcePath,omitempty"`
 	Secret          string            `json:"secret,omitempty"`
-	UserName        string            `json:"userName,omitempty"`
 	Uuid            string            `json:"uuid,omitempty"`
 }
 type UserCollection struct {