Skip to content
This repository was archived by the owner on Sep 18, 2023. It is now read-only.

Commit d805f7e

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
feat: added google.api.Service.publishing and client libraries settings (#481)
* feat: added google.api.Service.publishing and client libraries settings feat: added google.api.JwtLocation.cookie feat: new fields in enum google.api.ErrorReason fix: deprecate google.api.Endpoint.aliases fix: deprecate google.api.BackendRule.min_deadline docs: minor updates to comments PiperOrigin-RevId: 488484261 Source-Link: googleapis/googleapis@bd9aa78 Source-Link: https://github.com/googleapis/googleapis-gen/commit/019a6095f9c08c339a15b88088bf9625c2cd1de0 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMDE5YTYwOTVmOWMwOGMzMzlhMTViODgwODhiZjk2MjVjMmNkMWRlMCJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
1 parent c2cde01 commit d805f7e

File tree

74 files changed

+20267
-857
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+20267
-857
lines changed

‎proto-google-common-protos/src/main/java/com/google/api/AuthProto.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -67,19 +67,19 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
6767
+ "tionRule\022\020\n\010selector\030\001 \001(\t\022,\n\005oauth\030\002 \001("
6868
+ "\0132\035.google.api.OAuthRequirements\022 \n\030allo"
6969
+ "w_without_credential\030\005 \001(\010\0221\n\014requiremen"
70-
+ "ts\030\007 \003(\0132\033.google.api.AuthRequirement\"L\n"
70+
+ "ts\030\007 \003(\0132\033.google.api.AuthRequirement\"^\n"
7171
+ "\013JwtLocation\022\020\n\006header\030\001 \001(\tH\000\022\017\n\005query\030"
72-
+ "\002 \001(\tH\000\022\024\n\014value_prefix\030\003 \001(\tB\004\n\002in\"\232\001\n\014"
73-
+ "AuthProvider\022\n\n\002id\030\001 \001(\t\022\016\n\006issuer\030\002 \001(\t"
74-
+ "\022\020\n\010jwks_uri\030\003 \001(\t\022\021\n\taudiences\030\004 \001(\t\022\031\n"
75-
+ "\021authorization_url\030\005 \001(\t\022.\n\rjwt_location"
76-
+ "s\030\006 \003(\0132\027.google.api.JwtLocation\"-\n\021OAut"
77-
+ "hRequirements\022\030\n\020canonical_scopes\030\001 \001(\t\""
78-
+ "9\n\017AuthRequirement\022\023\n\013provider_id\030\001 \001(\t\022"
79-
+ "\021\n\taudiences\030\002 \001(\tBk\n\016com.google.apiB\tAu"
80-
+ "thProtoP\001ZEgoogle.golang.org/genproto/go"
81-
+ "ogleapis/api/serviceconfig;serviceconfig"
82-
+ "\242\002\004GAPIb\006proto3"
72+
+ "\002 \001(\tH\000\022\020\n\006cookie\030\004 \001(\tH\000\022\024\n\014value_prefi"
73+
+ "x\030\003 \001(\tB\004\n\002in\"\232\001\n\014AuthProvider\022\n\n\002id\030\001 \001"
74+
+ "(\t\022\016\n\006issuer\030\002 \001(\t\022\020\n\010jwks_uri\030\003 \001(\t\022\021\n\t"
75+
+ "audiences\030\004 \001(\t\022\031\n\021authorization_url\030\005 \001"
76+
+ "(\t\022.\n\rjwt_locations\030\006 \003(\0132\027.google.api.J"
77+
+ "wtLocation\"-\n\021OAuthRequirements\022\030\n\020canon"
78+
+ "ical_scopes\030\001 \001(\t\"9\n\017AuthRequirement\022\023\n\013"
79+
+ "provider_id\030\001 \001(\t\022\021\n\taudiences\030\002 \001(\tBk\n\016"
80+
+ "com.google.apiB\tAuthProtoP\001ZEgoogle.gola"
81+
+ "ng.org/genproto/googleapis/api/serviceco"
82+
+ "nfig;serviceconfig\242\002\004GAPIb\006proto3"
8383
};
8484
descriptor =
8585
com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
@@ -104,7 +104,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
104104
new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
105105
internal_static_google_api_JwtLocation_descriptor,
106106
new java.lang.String[] {
107-
"Header", "Query", "ValuePrefix", "In",
107+
"Header", "Query", "Cookie", "ValuePrefix", "In",
108108
});
109109
internal_static_google_api_AuthProvider_descriptor = getDescriptor().getMessageTypes().get(3);
110110
internal_static_google_api_AuthProvider_fieldAccessorTable =

‎proto-google-common-protos/src/main/java/com/google/api/AuthProvider.java‎

Lines changed: 115 additions & 92 deletions
Large diffs are not rendered by default.

‎proto-google-common-protos/src/main/java/com/google/api/AuthProviderOrBuilder.java‎

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -214,10 +214,11 @@ public interface AuthProviderOrBuilder
214214
*
215215
*
216216
* <pre>
217-
* Defines the locations to extract the JWT.
218-
* JWT locations can be either from HTTP headers or URL query parameters.
219-
* The rule is that the first match wins. The checking order is: checking
220-
* all headers first, then URL query parameters.
217+
* Defines the locations to extract the JWT. For now it is only used by the
218+
* Cloud Endpoints to store the OpenAPI extension [x-google-jwt-locations]
219+
* (https://cloud.google.com/endpoints/docs/openapi/openapi-extensions#x-google-jwt-locations)
220+
* JWT locations can be one of HTTP headers, URL query parameters or
221+
* cookies. The rule is that the first match wins.
221222
* If not specified, default to use following 3 locations:
222223
* 1) Authorization: Bearer
223224
* 2) x-goog-iap-jwt-assertion
@@ -237,10 +238,11 @@ public interface AuthProviderOrBuilder
237238
*
238239
*
239240
* <pre>
240-
* Defines the locations to extract the JWT.
241-
* JWT locations can be either from HTTP headers or URL query parameters.
242-
* The rule is that the first match wins. The checking order is: checking
243-
* all headers first, then URL query parameters.
241+
* Defines the locations to extract the JWT. For now it is only used by the
242+
* Cloud Endpoints to store the OpenAPI extension [x-google-jwt-locations]
243+
* (https://cloud.google.com/endpoints/docs/openapi/openapi-extensions#x-google-jwt-locations)
244+
* JWT locations can be one of HTTP headers, URL query parameters or
245+
* cookies. The rule is that the first match wins.
244246
* If not specified, default to use following 3 locations:
245247
* 1) Authorization: Bearer
246248
* 2) x-goog-iap-jwt-assertion
@@ -260,10 +262,11 @@ public interface AuthProviderOrBuilder
260262
*
261263
*
262264
* <pre>
263-
* Defines the locations to extract the JWT.
264-
* JWT locations can be either from HTTP headers or URL query parameters.
265-
* The rule is that the first match wins. The checking order is: checking
266-
* all headers first, then URL query parameters.
265+
* Defines the locations to extract the JWT. For now it is only used by the
266+
* Cloud Endpoints to store the OpenAPI extension [x-google-jwt-locations]
267+
* (https://cloud.google.com/endpoints/docs/openapi/openapi-extensions#x-google-jwt-locations)
268+
* JWT locations can be one of HTTP headers, URL query parameters or
269+
* cookies. The rule is that the first match wins.
267270
* If not specified, default to use following 3 locations:
268271
* 1) Authorization: Bearer
269272
* 2) x-goog-iap-jwt-assertion
@@ -283,10 +286,11 @@ public interface AuthProviderOrBuilder
283286
*
284287
*
285288
* <pre>
286-
* Defines the locations to extract the JWT.
287-
* JWT locations can be either from HTTP headers or URL query parameters.
288-
* The rule is that the first match wins. The checking order is: checking
289-
* all headers first, then URL query parameters.
289+
* Defines the locations to extract the JWT. For now it is only used by the
290+
* Cloud Endpoints to store the OpenAPI extension [x-google-jwt-locations]
291+
* (https://cloud.google.com/endpoints/docs/openapi/openapi-extensions#x-google-jwt-locations)
292+
* JWT locations can be one of HTTP headers, URL query parameters or
293+
* cookies. The rule is that the first match wins.
290294
* If not specified, default to use following 3 locations:
291295
* 1) Authorization: Bearer
292296
* 2) x-goog-iap-jwt-assertion
@@ -306,10 +310,11 @@ public interface AuthProviderOrBuilder
306310
*
307311
*
308312
* <pre>
309-
* Defines the locations to extract the JWT.
310-
* JWT locations can be either from HTTP headers or URL query parameters.
311-
* The rule is that the first match wins. The checking order is: checking
312-
* all headers first, then URL query parameters.
313+
* Defines the locations to extract the JWT. For now it is only used by the
314+
* Cloud Endpoints to store the OpenAPI extension [x-google-jwt-locations]
315+
* (https://cloud.google.com/endpoints/docs/openapi/openapi-extensions#x-google-jwt-locations)
316+
* JWT locations can be one of HTTP headers, URL query parameters or
317+
* cookies. The rule is that the first match wins.
313318
* If not specified, default to use following 3 locations:
314319
* 1) Authorization: Bearer
315320
* 2) x-goog-iap-jwt-assertion

‎proto-google-common-protos/src/main/java/com/google/api/BackendProto.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -46,19 +46,19 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
4646
java.lang.String[] descriptorData = {
4747
"\n\030google/api/backend.proto\022\ngoogle.api\"1"
4848
+ "\n\007Backend\022&\n\005rules\030\001 \003(\0132\027.google.api.Ba"
49-
+ "ckendRule\"\362\002\n\013BackendRule\022\020\n\010selector\030\001 "
50-
+ "\001(\t\022\017\n\007address\030\002 \001(\t\022\020\n\010deadline\030\003 \001(\001\022\024"
51-
+ "\n\014min_deadline\030\004 \001(\001\022\032\n\022operation_deadli"
52-
+ "ne\030\005 \001(\001\022A\n\020path_translation\030\006 \001(\0162\'.goo"
53-
+ "gle.api.BackendRule.PathTranslation\022\026\n\014j"
54-
+ "wt_audience\030\007 \001(\tH\000\022\026\n\014disable_auth\030\010 \001("
55-
+ "\010H\000\022\020\n\010protocol\030\t \001(\t\"e\n\017PathTranslation"
56-
+ "\022 \n\034PATH_TRANSLATION_UNSPECIFIED\020\000\022\024\n\020CO"
57-
+ "NSTANT_ADDRESS\020\001\022\032\n\026APPEND_PATH_TO_ADDRE"
58-
+ "SS\020\002B\020\n\016authenticationBn\n\016com.google.api"
59-
+ "B\014BackendProtoP\001ZEgoogle.golang.org/genp"
60-
+ "roto/googleapis/api/serviceconfig;servic"
61-
+ "econfig\242\002\004GAPIb\006proto3"
49+
+ "ckendRule\"\366\002\n\013BackendRule\022\020\n\010selector\030\001 "
50+
+ "\001(\t\022\017\n\007address\030\002 \001(\t\022\020\n\010deadline\030\003 \001(\001\022\030"
51+
+ "\n\014min_deadline\030\004 \001(\001B\002\030\001\022\032\n\022operation_de"
52+
+ "adline\030\005 \001(\001\022A\n\020path_translation\030\006 \001(\0162\'"
53+
+ ".google.api.BackendRule.PathTranslation\022"
54+
+ "\026\n\014jwt_audience\030\007 \001(\tH\000\022\026\n\014disable_auth\030"
55+
+ "\010 \001(\010H\000\022\020\n\010protocol\030\t \001(\t\"e\n\017PathTransla"
56+
+ "tion\022 \n\034PATH_TRANSLATION_UNSPECIFIED\020\000\022\024"
57+
+ "\n\020CONSTANT_ADDRESS\020\001\022\032\n\026APPEND_PATH_TO_A"
58+
+ "DDRESS\020\002B\020\n\016authenticationBn\n\016com.google"
59+
+ ".apiB\014BackendProtoP\001ZEgoogle.golang.org/"
60+
+ "genproto/googleapis/api/serviceconfig;se"
61+
+ "rviceconfig\242\002\004GAPIb\006proto3"
6262
};
6363
descriptor =
6464
com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(

‎proto-google-common-protos/src/main/java/com/google/api/BackendRule.java‎

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -471,15 +471,17 @@ public double getDeadline() {
471471
*
472472
*
473473
* <pre>
474-
* Minimum deadline in seconds needed for this method. Calls having deadline
475-
* value lower than this will be rejected.
474+
* Deprecated, do not use.
476475
* </pre>
477476
*
478-
* <code>double min_deadline = 4;</code>
477+
* <code>double min_deadline = 4 [deprecated = true];</code>
479478
*
479+
* @deprecated google.api.BackendRule.min_deadline is deprecated. See
480+
* google/api/backend.proto;l=123
480481
* @return The minDeadline.
481482
*/
482483
@java.lang.Override
484+
@java.lang.Deprecated
483485
public double getMinDeadline() {
484486
return minDeadline_;
485487
}
@@ -1625,31 +1627,35 @@ public Builder clearDeadline() {
16251627
*
16261628
*
16271629
* <pre>
1628-
* Minimum deadline in seconds needed for this method. Calls having deadline
1629-
* value lower than this will be rejected.
1630+
* Deprecated, do not use.
16301631
* </pre>
16311632
*
1632-
* <code>double min_deadline = 4;</code>
1633+
* <code>double min_deadline = 4 [deprecated = true];</code>
16331634
*
1635+
* @deprecated google.api.BackendRule.min_deadline is deprecated. See
1636+
* google/api/backend.proto;l=123
16341637
* @return The minDeadline.
16351638
*/
16361639
@java.lang.Override
1640+
@java.lang.Deprecated
16371641
public double getMinDeadline() {
16381642
return minDeadline_;
16391643
}
16401644
/**
16411645
*
16421646
*
16431647
* <pre>
1644-
* Minimum deadline in seconds needed for this method. Calls having deadline
1645-
* value lower than this will be rejected.
1648+
* Deprecated, do not use.
16461649
* </pre>
16471650
*
1648-
* <code>double min_deadline = 4;</code>
1651+
* <code>double min_deadline = 4 [deprecated = true];</code>
16491652
*
1653+
* @deprecated google.api.BackendRule.min_deadline is deprecated. See
1654+
* google/api/backend.proto;l=123
16501655
* @param value The minDeadline to set.
16511656
* @return This builder for chaining.
16521657
*/
1658+
@java.lang.Deprecated
16531659
public Builder setMinDeadline(double value) {
16541660

16551661
minDeadline_ = value;
@@ -1660,14 +1666,16 @@ public Builder setMinDeadline(double value) {
16601666
*
16611667
*
16621668
* <pre>
1663-
* Minimum deadline in seconds needed for this method. Calls having deadline
1664-
* value lower than this will be rejected.
1669+
* Deprecated, do not use.
16651670
* </pre>
16661671
*
1667-
* <code>double min_deadline = 4;</code>
1672+
* <code>double min_deadline = 4 [deprecated = true];</code>
16681673
*
1674+
* @deprecated google.api.BackendRule.min_deadline is deprecated. See
1675+
* google/api/backend.proto;l=123
16691676
* @return This builder for chaining.
16701677
*/
1678+
@java.lang.Deprecated
16711679
public Builder clearMinDeadline() {
16721680

16731681
minDeadline_ = 0D;

‎proto-google-common-protos/src/main/java/com/google/api/BackendRuleOrBuilder.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,14 +121,16 @@ public interface BackendRuleOrBuilder
121121
*
122122
*
123123
* <pre>
124-
* Minimum deadline in seconds needed for this method. Calls having deadline
125-
* value lower than this will be rejected.
124+
* Deprecated, do not use.
126125
* </pre>
127126
*
128-
* <code>double min_deadline = 4;</code>
127+
* <code>double min_deadline = 4 [deprecated = true];</code>
129128
*
129+
* @deprecated google.api.BackendRule.min_deadline is deprecated. See
130+
* google/api/backend.proto;l=123
130131
* @return The minDeadline.
131132
*/
133+
@java.lang.Deprecated
132134
double getMinDeadline();
133135

134136
/**

0 commit comments

Comments
 (0)