Skip to content

Commit

Permalink
generated
Browse files Browse the repository at this point in the history
  • Loading branch information
deads2k committed Jan 2, 2018
1 parent a95f6dc commit 4503dca
Show file tree
Hide file tree
Showing 6 changed files with 73 additions and 49 deletions.
3 changes: 2 additions & 1 deletion api/protobuf-spec/github_com_openshift_api_image_v1.proto

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 18 additions & 0 deletions api/protobuf-spec/github_com_openshift_api_oauth_v1.proto

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 11 additions & 1 deletion api/swagger-spec/oapi-v1.json
Original file line number Diff line number Diff line change
Expand Up @@ -29022,7 +29022,7 @@
},
"from": {
"$ref": "v1.ObjectReference",
"description": "Optional; if specified, a reference to another image that this tag should point to. Valid values are ImageStreamTag, ImageStreamImage, and DockerImage."
"description": "Optional; if specified, a reference to another image that this tag should point to. Valid values are ImageStreamTag, ImageStreamImage, and DockerImage. ImageStreamTag references can only reference a tag within this same ImageStream."
},
"reference": {
"type": "boolean",
Expand Down Expand Up @@ -29682,6 +29682,11 @@
"refreshToken": {
"type": "string",
"description": "RefreshToken is the value by which this token can be renewed. Can be blank."
},
"inactivityTimeoutSeconds": {
"type": "integer",
"format": "int32",
"description": "InactivityTimeoutSeconds is the value in seconds, from the CreationTimestamp, after which this token can no longer be used. The value is automatically incremented when the token is used."
}
}
},
Expand Down Expand Up @@ -29917,6 +29922,11 @@
"type": "integer",
"format": "int32",
"description": "AccessTokenMaxAgeSeconds overrides the default access token max age for tokens granted to this client. 0 means no expiration."
},
"accessTokenInactivityTimeoutSeconds": {
"type": "integer",
"format": "int32",
"description": "AccessTokenInactivityTimeoutSeconds overrides the default token inactivity timeout for tokens granted to this client. The value represents the maximum amount of time that can occur between consecutive uses of the token. Tokens become invalid if they are not used within this temporal window. The user will need to acquire a new token to regain access once a token times out. This value needs to be set only if the default set in configuration is not appropriate for this client. Valid values are: - 0: Tokens for this client never time out - X: Tokens time out if there is no activity for X seconds The current minimum allowed value for X is 300 (5 minutes)"
}
}
},
Expand Down
64 changes: 18 additions & 46 deletions pkg/oauth/apis/oauth/v1/zz_generated.conversion.go
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,15 @@ func autoConvert_v1_OAuthAccessToken_To_oauth_OAuthAccessToken(in *v1.OAuthAcces
out.UserUID = in.UserUID
out.AuthorizeToken = in.AuthorizeToken
out.RefreshToken = in.RefreshToken
// WARNING: in.InactivityTimeoutSeconds requires manual conversion: does not exist in peer-type
out.InactivityTimeoutSeconds = in.InactivityTimeoutSeconds
return nil
}

// Convert_v1_OAuthAccessToken_To_oauth_OAuthAccessToken is an autogenerated conversion function.
func Convert_v1_OAuthAccessToken_To_oauth_OAuthAccessToken(in *v1.OAuthAccessToken, out *oauth.OAuthAccessToken, s conversion.Scope) error {
return autoConvert_v1_OAuthAccessToken_To_oauth_OAuthAccessToken(in, out, s)
}

func autoConvert_oauth_OAuthAccessToken_To_v1_OAuthAccessToken(in *oauth.OAuthAccessToken, out *v1.OAuthAccessToken, s conversion.Scope) error {
out.ObjectMeta = in.ObjectMeta
out.ClientName = in.ClientName
Expand All @@ -95,6 +100,7 @@ func autoConvert_oauth_OAuthAccessToken_To_v1_OAuthAccessToken(in *oauth.OAuthAc
out.UserUID = in.UserUID
out.AuthorizeToken = in.AuthorizeToken
out.RefreshToken = in.RefreshToken
out.InactivityTimeoutSeconds = in.InactivityTimeoutSeconds
return nil
}

Expand All @@ -105,17 +111,7 @@ func Convert_oauth_OAuthAccessToken_To_v1_OAuthAccessToken(in *oauth.OAuthAccess

func autoConvert_v1_OAuthAccessTokenList_To_oauth_OAuthAccessTokenList(in *v1.OAuthAccessTokenList, out *oauth.OAuthAccessTokenList, s conversion.Scope) error {
out.ListMeta = in.ListMeta
if in.Items != nil {
in, out := &in.Items, &out.Items
*out = make([]oauth.OAuthAccessToken, len(*in))
for i := range *in {
if err := Convert_v1_OAuthAccessToken_To_oauth_OAuthAccessToken(&(*in)[i], &(*out)[i], s); err != nil {
return err
}
}
} else {
out.Items = nil
}
out.Items = *(*[]oauth.OAuthAccessToken)(unsafe.Pointer(&in.Items))
return nil
}

Expand All @@ -126,17 +122,7 @@ func Convert_v1_OAuthAccessTokenList_To_oauth_OAuthAccessTokenList(in *v1.OAuthA

func autoConvert_oauth_OAuthAccessTokenList_To_v1_OAuthAccessTokenList(in *oauth.OAuthAccessTokenList, out *v1.OAuthAccessTokenList, s conversion.Scope) error {
out.ListMeta = in.ListMeta
if in.Items != nil {
in, out := &in.Items, &out.Items
*out = make([]v1.OAuthAccessToken, len(*in))
for i := range *in {
if err := Convert_oauth_OAuthAccessToken_To_v1_OAuthAccessToken(&(*in)[i], &(*out)[i], s); err != nil {
return err
}
}
} else {
out.Items = nil
}
out.Items = *(*[]v1.OAuthAccessToken)(unsafe.Pointer(&in.Items))
return nil
}

Expand Down Expand Up @@ -214,10 +200,15 @@ func autoConvert_v1_OAuthClient_To_oauth_OAuthClient(in *v1.OAuthClient, out *oa
out.GrantMethod = oauth.GrantHandlerType(in.GrantMethod)
out.ScopeRestrictions = *(*[]oauth.ScopeRestriction)(unsafe.Pointer(&in.ScopeRestrictions))
out.AccessTokenMaxAgeSeconds = (*int32)(unsafe.Pointer(in.AccessTokenMaxAgeSeconds))
// WARNING: in.AccessTokenInactivityTimeoutSeconds requires manual conversion: does not exist in peer-type
out.AccessTokenInactivityTimeoutSeconds = (*int32)(unsafe.Pointer(in.AccessTokenInactivityTimeoutSeconds))
return nil
}

// Convert_v1_OAuthClient_To_oauth_OAuthClient is an autogenerated conversion function.
func Convert_v1_OAuthClient_To_oauth_OAuthClient(in *v1.OAuthClient, out *oauth.OAuthClient, s conversion.Scope) error {
return autoConvert_v1_OAuthClient_To_oauth_OAuthClient(in, out, s)
}

func autoConvert_oauth_OAuthClient_To_v1_OAuthClient(in *oauth.OAuthClient, out *v1.OAuthClient, s conversion.Scope) error {
out.ObjectMeta = in.ObjectMeta
out.Secret = in.Secret
Expand All @@ -227,6 +218,7 @@ func autoConvert_oauth_OAuthClient_To_v1_OAuthClient(in *oauth.OAuthClient, out
out.GrantMethod = v1.GrantHandlerType(in.GrantMethod)
out.ScopeRestrictions = *(*[]v1.ScopeRestriction)(unsafe.Pointer(&in.ScopeRestrictions))
out.AccessTokenMaxAgeSeconds = (*int32)(unsafe.Pointer(in.AccessTokenMaxAgeSeconds))
out.AccessTokenInactivityTimeoutSeconds = (*int32)(unsafe.Pointer(in.AccessTokenInactivityTimeoutSeconds))
return nil
}

Expand Down Expand Up @@ -287,17 +279,7 @@ func Convert_oauth_OAuthClientAuthorizationList_To_v1_OAuthClientAuthorizationLi

func autoConvert_v1_OAuthClientList_To_oauth_OAuthClientList(in *v1.OAuthClientList, out *oauth.OAuthClientList, s conversion.Scope) error {
out.ListMeta = in.ListMeta
if in.Items != nil {
in, out := &in.Items, &out.Items
*out = make([]oauth.OAuthClient, len(*in))
for i := range *in {
if err := Convert_v1_OAuthClient_To_oauth_OAuthClient(&(*in)[i], &(*out)[i], s); err != nil {
return err
}
}
} else {
out.Items = nil
}
out.Items = *(*[]oauth.OAuthClient)(unsafe.Pointer(&in.Items))
return nil
}

Expand All @@ -308,17 +290,7 @@ func Convert_v1_OAuthClientList_To_oauth_OAuthClientList(in *v1.OAuthClientList,

func autoConvert_oauth_OAuthClientList_To_v1_OAuthClientList(in *oauth.OAuthClientList, out *v1.OAuthClientList, s conversion.Scope) error {
out.ListMeta = in.ListMeta
if in.Items != nil {
in, out := &in.Items, &out.Items
*out = make([]v1.OAuthClient, len(*in))
for i := range *in {
if err := Convert_oauth_OAuthClient_To_v1_OAuthClient(&(*in)[i], &(*out)[i], s); err != nil {
return err
}
}
} else {
out.Items = nil
}
out.Items = *(*[]v1.OAuthClient)(unsafe.Pointer(&in.Items))
return nil
}

Expand Down
9 changes: 9 additions & 0 deletions pkg/oauth/apis/oauth/zz_generated.deepcopy.go
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,15 @@ func (in *OAuthClient) DeepCopyInto(out *OAuthClient) {
**out = **in
}
}
if in.AccessTokenInactivityTimeoutSeconds != nil {
in, out := &in.AccessTokenInactivityTimeoutSeconds, &out.AccessTokenInactivityTimeoutSeconds
if *in == nil {
*out = nil
} else {
*out = new(int32)
**out = **in
}
}
return
}

Expand Down
16 changes: 15 additions & 1 deletion pkg/openapi/zz_generated.openapi.go
Original file line number Diff line number Diff line change
Expand Up @@ -6752,7 +6752,7 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA
},
"from": {
SchemaProps: spec.SchemaProps{
Description: "Optional; if specified, a reference to another image that this tag should point to. Valid values are ImageStreamTag, ImageStreamImage, and DockerImage.",
Description: "Optional; if specified, a reference to another image that this tag should point to. Valid values are ImageStreamTag, ImageStreamImage, and DockerImage. ImageStreamTag references can only reference a tag within this same ImageStream.",
Ref: ref("k8s.io/api/core/v1.ObjectReference"),
},
},
Expand Down Expand Up @@ -7458,6 +7458,13 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA
Format: "",
},
},
"inactivityTimeoutSeconds": {
SchemaProps: spec.SchemaProps{
Description: "InactivityTimeoutSeconds is the value in seconds, from the CreationTimestamp, after which this token can no longer be used. The value is automatically incremented when the token is used.",
Type: []string{"integer"},
Format: "int32",
},
},
},
},
},
Expand Down Expand Up @@ -7754,6 +7761,13 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA
Format: "int32",
},
},
"accessTokenInactivityTimeoutSeconds": {
SchemaProps: spec.SchemaProps{
Description: "AccessTokenInactivityTimeoutSeconds overrides the default token inactivity timeout for tokens granted to this client. The value represents the maximum amount of time that can occur between consecutive uses of the token. Tokens become invalid if they are not used within this temporal window. The user will need to acquire a new token to regain access once a token times out. This value needs to be set only if the default set in configuration is not appropriate for this client. Valid values are: - 0: Tokens for this client never time out - X: Tokens time out if there is no activity for X seconds The current minimum allowed value for X is 300 (5 minutes)",
Type: []string{"integer"},
Format: "int32",
},
},
},
},
},
Expand Down

0 comments on commit 4503dca

Please sign in to comment.