Skip to content

Commit 4503dca

Browse files
deads2kdeads2k
committedJan 2, 2018
generated
·
v4.1.0v3.9.0-alpha.2
1 parent a95f6dc commit 4503dca

File tree

6 files changed

+73
-49
lines changed

6 files changed

+73
-49
lines changed
 

‎api/protobuf-spec/github_com_openshift_api_image_v1.proto

+2-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/protobuf-spec/github_com_openshift_api_oauth_v1.proto

+18
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/swagger-spec/oapi-v1.json

+11-1
Original file line numberDiff line numberDiff line change
@@ -29022,7 +29022,7 @@
2902229022
},
2902329023
"from": {
2902429024
"$ref": "v1.ObjectReference",
29025-
"description": "Optional; if specified, a reference to another image that this tag should point to. Valid values are ImageStreamTag, ImageStreamImage, and DockerImage."
29025+
"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."
2902629026
},
2902729027
"reference": {
2902829028
"type": "boolean",
@@ -29682,6 +29682,11 @@
2968229682
"refreshToken": {
2968329683
"type": "string",
2968429684
"description": "RefreshToken is the value by which this token can be renewed. Can be blank."
29685+
},
29686+
"inactivityTimeoutSeconds": {
29687+
"type": "integer",
29688+
"format": "int32",
29689+
"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."
2968529690
}
2968629691
}
2968729692
},
@@ -29917,6 +29922,11 @@
2991729922
"type": "integer",
2991829923
"format": "int32",
2991929924
"description": "AccessTokenMaxAgeSeconds overrides the default access token max age for tokens granted to this client. 0 means no expiration."
29925+
},
29926+
"accessTokenInactivityTimeoutSeconds": {
29927+
"type": "integer",
29928+
"format": "int32",
29929+
"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)"
2992029930
}
2992129931
}
2992229932
},

‎pkg/oauth/apis/oauth/v1/zz_generated.conversion.go

+18-46
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,15 @@ func autoConvert_v1_OAuthAccessToken_To_oauth_OAuthAccessToken(in *v1.OAuthAcces
8181
out.UserUID = in.UserUID
8282
out.AuthorizeToken = in.AuthorizeToken
8383
out.RefreshToken = in.RefreshToken
84-
// WARNING: in.InactivityTimeoutSeconds requires manual conversion: does not exist in peer-type
84+
out.InactivityTimeoutSeconds = in.InactivityTimeoutSeconds
8585
return nil
8686
}
8787

88+
// Convert_v1_OAuthAccessToken_To_oauth_OAuthAccessToken is an autogenerated conversion function.
89+
func Convert_v1_OAuthAccessToken_To_oauth_OAuthAccessToken(in *v1.OAuthAccessToken, out *oauth.OAuthAccessToken, s conversion.Scope) error {
90+
return autoConvert_v1_OAuthAccessToken_To_oauth_OAuthAccessToken(in, out, s)
91+
}
92+
8893
func autoConvert_oauth_OAuthAccessToken_To_v1_OAuthAccessToken(in *oauth.OAuthAccessToken, out *v1.OAuthAccessToken, s conversion.Scope) error {
8994
out.ObjectMeta = in.ObjectMeta
9095
out.ClientName = in.ClientName
@@ -95,6 +100,7 @@ func autoConvert_oauth_OAuthAccessToken_To_v1_OAuthAccessToken(in *oauth.OAuthAc
95100
out.UserUID = in.UserUID
96101
out.AuthorizeToken = in.AuthorizeToken
97102
out.RefreshToken = in.RefreshToken
103+
out.InactivityTimeoutSeconds = in.InactivityTimeoutSeconds
98104
return nil
99105
}
100106

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

106112
func autoConvert_v1_OAuthAccessTokenList_To_oauth_OAuthAccessTokenList(in *v1.OAuthAccessTokenList, out *oauth.OAuthAccessTokenList, s conversion.Scope) error {
107113
out.ListMeta = in.ListMeta
108-
if in.Items != nil {
109-
in, out := &in.Items, &out.Items
110-
*out = make([]oauth.OAuthAccessToken, len(*in))
111-
for i := range *in {
112-
if err := Convert_v1_OAuthAccessToken_To_oauth_OAuthAccessToken(&(*in)[i], &(*out)[i], s); err != nil {
113-
return err
114-
}
115-
}
116-
} else {
117-
out.Items = nil
118-
}
114+
out.Items = *(*[]oauth.OAuthAccessToken)(unsafe.Pointer(&in.Items))
119115
return nil
120116
}
121117

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

127123
func autoConvert_oauth_OAuthAccessTokenList_To_v1_OAuthAccessTokenList(in *oauth.OAuthAccessTokenList, out *v1.OAuthAccessTokenList, s conversion.Scope) error {
128124
out.ListMeta = in.ListMeta
129-
if in.Items != nil {
130-
in, out := &in.Items, &out.Items
131-
*out = make([]v1.OAuthAccessToken, len(*in))
132-
for i := range *in {
133-
if err := Convert_oauth_OAuthAccessToken_To_v1_OAuthAccessToken(&(*in)[i], &(*out)[i], s); err != nil {
134-
return err
135-
}
136-
}
137-
} else {
138-
out.Items = nil
139-
}
125+
out.Items = *(*[]v1.OAuthAccessToken)(unsafe.Pointer(&in.Items))
140126
return nil
141127
}
142128

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

207+
// Convert_v1_OAuthClient_To_oauth_OAuthClient is an autogenerated conversion function.
208+
func Convert_v1_OAuthClient_To_oauth_OAuthClient(in *v1.OAuthClient, out *oauth.OAuthClient, s conversion.Scope) error {
209+
return autoConvert_v1_OAuthClient_To_oauth_OAuthClient(in, out, s)
210+
}
211+
221212
func autoConvert_oauth_OAuthClient_To_v1_OAuthClient(in *oauth.OAuthClient, out *v1.OAuthClient, s conversion.Scope) error {
222213
out.ObjectMeta = in.ObjectMeta
223214
out.Secret = in.Secret
@@ -227,6 +218,7 @@ func autoConvert_oauth_OAuthClient_To_v1_OAuthClient(in *oauth.OAuthClient, out
227218
out.GrantMethod = v1.GrantHandlerType(in.GrantMethod)
228219
out.ScopeRestrictions = *(*[]v1.ScopeRestriction)(unsafe.Pointer(&in.ScopeRestrictions))
229220
out.AccessTokenMaxAgeSeconds = (*int32)(unsafe.Pointer(in.AccessTokenMaxAgeSeconds))
221+
out.AccessTokenInactivityTimeoutSeconds = (*int32)(unsafe.Pointer(in.AccessTokenInactivityTimeoutSeconds))
230222
return nil
231223
}
232224

@@ -287,17 +279,7 @@ func Convert_oauth_OAuthClientAuthorizationList_To_v1_OAuthClientAuthorizationLi
287279

288280
func autoConvert_v1_OAuthClientList_To_oauth_OAuthClientList(in *v1.OAuthClientList, out *oauth.OAuthClientList, s conversion.Scope) error {
289281
out.ListMeta = in.ListMeta
290-
if in.Items != nil {
291-
in, out := &in.Items, &out.Items
292-
*out = make([]oauth.OAuthClient, len(*in))
293-
for i := range *in {
294-
if err := Convert_v1_OAuthClient_To_oauth_OAuthClient(&(*in)[i], &(*out)[i], s); err != nil {
295-
return err
296-
}
297-
}
298-
} else {
299-
out.Items = nil
300-
}
282+
out.Items = *(*[]oauth.OAuthClient)(unsafe.Pointer(&in.Items))
301283
return nil
302284
}
303285

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

309291
func autoConvert_oauth_OAuthClientList_To_v1_OAuthClientList(in *oauth.OAuthClientList, out *v1.OAuthClientList, s conversion.Scope) error {
310292
out.ListMeta = in.ListMeta
311-
if in.Items != nil {
312-
in, out := &in.Items, &out.Items
313-
*out = make([]v1.OAuthClient, len(*in))
314-
for i := range *in {
315-
if err := Convert_oauth_OAuthClient_To_v1_OAuthClient(&(*in)[i], &(*out)[i], s); err != nil {
316-
return err
317-
}
318-
}
319-
} else {
320-
out.Items = nil
321-
}
293+
out.Items = *(*[]v1.OAuthClient)(unsafe.Pointer(&in.Items))
322294
return nil
323295
}
324296

‎pkg/oauth/apis/oauth/zz_generated.deepcopy.go

+9
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,15 @@ func (in *OAuthClient) DeepCopyInto(out *OAuthClient) {
218218
**out = **in
219219
}
220220
}
221+
if in.AccessTokenInactivityTimeoutSeconds != nil {
222+
in, out := &in.AccessTokenInactivityTimeoutSeconds, &out.AccessTokenInactivityTimeoutSeconds
223+
if *in == nil {
224+
*out = nil
225+
} else {
226+
*out = new(int32)
227+
**out = **in
228+
}
229+
}
221230
return
222231
}
223232

‎pkg/openapi/zz_generated.openapi.go

+15-1
Original file line numberDiff line numberDiff line change
@@ -6752,7 +6752,7 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA
67526752
},
67536753
"from": {
67546754
SchemaProps: spec.SchemaProps{
6755-
Description: "Optional; if specified, a reference to another image that this tag should point to. Valid values are ImageStreamTag, ImageStreamImage, and DockerImage.",
6755+
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.",
67566756
Ref: ref("k8s.io/api/core/v1.ObjectReference"),
67576757
},
67586758
},
@@ -7458,6 +7458,13 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA
74587458
Format: "",
74597459
},
74607460
},
7461+
"inactivityTimeoutSeconds": {
7462+
SchemaProps: spec.SchemaProps{
7463+
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.",
7464+
Type: []string{"integer"},
7465+
Format: "int32",
7466+
},
7467+
},
74617468
},
74627469
},
74637470
},
@@ -7754,6 +7761,13 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA
77547761
Format: "int32",
77557762
},
77567763
},
7764+
"accessTokenInactivityTimeoutSeconds": {
7765+
SchemaProps: spec.SchemaProps{
7766+
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)",
7767+
Type: []string{"integer"},
7768+
Format: "int32",
7769+
},
7770+
},
77577771
},
77587772
},
77597773
},

0 commit comments

Comments
 (0)
Please sign in to comment.