rancher/types
1
0
Fork 0
mirror of https://github.com/rancher/types.git synced 2025-09-24 19:39:13 +00:00
Code Issues Releases Wiki Activity

Changes to Token type to add explicit Identity fields

Browse Source
This commit is contained in:
Prachi Damle
2017-12-13 16:18:52 -08:00
committed by Craig Jellick
parent 9c9def8b3c
commit 46c3c3bd6c
5 changed files with 51 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
apis/management.cattle.io/v3/authn_types.go
View File

@@ -8,16 +8,18 @@ type Token struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
TokenID string `json:"tokenId,omitempty"`
TokenValue string `json:"tokenValue,omitempty"`
User string `json:"user,omitempty"`
ExternalID string `json:"externalId,omitempty"`
AuthProvider string `json:"authProvider,omitempty"`
TTLMillis string `json:"ttl,omitempty"`
IdentityRefreshTTLMillis string `json:"identityRefreshTTL,omitempty"`
LastUpdateTime string `json:"lastUpdateTime,omitempty"`
IsDerived bool `json:"isDerived,omitempty"`
Description string `json:"description,omitempty"`
TokenID string `json:"tokenId,omitempty"`
UserIdentity Identity `json:"userIdentity,omitempty"`
GroupIdentities []Identity `json:"groupIdentities,omitempty"`
ProviderInfo map[string]string `json:"providerInfo,omitempty"`
User string `json:"user,omitempty"`
ExternalID string `json:"externalId,omitempty"`
AuthProvider string `json:"authProvider,omitempty"`
TTLMillis string `json:"ttl,omitempty"`
IdentityRefreshTTLMillis string `json:"identityRefreshTTL,omitempty"`
LastUpdateTime string `json:"lastUpdateTime,omitempty"`
IsDerived bool `json:"isDerived,omitempty"`
Description string `json:"description,omitempty"`
}
type User struct {

15
apis/management.cattle.io/v3/zz_generated_deepcopy.go
View File

@@ -2308,6 +2308,21 @@ func (in *Token) DeepCopyInto(out *Token) {
*out = *in
out.TypeMeta = in.TypeMeta
in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
in.UserIdentity.DeepCopyInto(&out.UserIdentity)
if in.GroupIdentities != nil {
in, out := &in.GroupIdentities, &out.GroupIdentities
*out = make([]Identity, len(*in))
for i := range *in {
(*in)[i].DeepCopyInto(&(*out)[i])
}
}
if in.ProviderInfo != nil {
in, out := &in.ProviderInfo, &out.ProviderInfo
*out = make(map[string]string, len(*in))
for key, val := range *in {
(*out)[key] = val
}
}
return
}

32
apis/management.cattle.io/v3/zz_generated_k8s_client.go
View File

@@ -28,11 +28,11 @@ type Interface interface {
CatalogsGetter
TemplatesGetter
TemplateVersionsGetter
IdentitiesGetter
TokensGetter
UsersGetter
GroupsGetter
GroupMembersGetter
IdentitiesGetter
DynamicSchemasGetter
}
@@ -55,11 +55,11 @@ type Client struct {
catalogControllers map[string]CatalogController
templateControllers map[string]TemplateController
templateVersionControllers map[string]TemplateVersionController
identityControllers map[string]IdentityController
tokenControllers map[string]TokenController
userControllers map[string]UserController
groupControllers map[string]GroupController
groupMemberControllers map[string]GroupMemberController
identityControllers map[string]IdentityController
dynamicSchemaControllers map[string]DynamicSchemaController
}
@@ -91,11 +91,11 @@ func NewForConfig(config rest.Config) (Interface, error) {
catalogControllers: map[string]CatalogController{},
templateControllers: map[string]TemplateController{},
templateVersionControllers: map[string]TemplateVersionController{},
identityControllers: map[string]IdentityController{},
tokenControllers: map[string]TokenController{},
userControllers: map[string]UserController{},
groupControllers: map[string]GroupController{},
groupMemberControllers: map[string]GroupMemberController{},
identityControllers: map[string]IdentityController{},
dynamicSchemaControllers: map[string]DynamicSchemaController{},
}, nil
}
@@ -294,6 +294,19 @@ func (c *Client) TemplateVersions(namespace string) TemplateVersionInterface {
}
}
type IdentitiesGetter interface {
Identities(namespace string) IdentityInterface
}
func (c *Client) Identities(namespace string) IdentityInterface {
objectClient := clientbase.NewObjectClient(namespace, c.restClient, &IdentityResource, IdentityGroupVersionKind, identityFactory{})
return &identityClient{
ns: namespace,
client: c,
objectClient: objectClient,
}
}
type TokensGetter interface {
Tokens(namespace string) TokenInterface
}
@@ -346,19 +359,6 @@ func (c *Client) GroupMembers(namespace string) GroupMemberInterface {
}
}
type IdentitiesGetter interface {
Identities(namespace string) IdentityInterface
}
func (c *Client) Identities(namespace string) IdentityInterface {
objectClient := clientbase.NewObjectClient(namespace, c.restClient, &IdentityResource, IdentityGroupVersionKind, identityFactory{})
return &identityClient{
ns: namespace,
client: c,
objectClient: objectClient,
}
}
type DynamicSchemasGetter interface {
DynamicSchemas(namespace string) DynamicSchemaInterface
}