diff --git a/java-common-protos/README.md b/java-common-protos/README.md index e518cb2350..c41878044b 100644 --- a/java-common-protos/README.md +++ b/java-common-protos/README.md @@ -19,20 +19,20 @@ If you are using Maven, add this to your pom.xml file: com.google.api.grpc proto-google-common-protos - 2.33.0 + 2.36.0 ``` If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.api.grpc:proto-google-common-protos:2.33.0' +implementation 'com.google.api.grpc:proto-google-common-protos:2.36.0' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.api.grpc" % "proto-google-common-protos" % "2.33.0" +libraryDependencies += "com.google.api.grpc" % "proto-google-common-protos" % "2.36.0" ``` ## Authentication diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ClientProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ClientProto.java index 892ea5e27a..1efc2ff047 100644 --- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ClientProto.java +++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ClientProto.java @@ -26,6 +26,7 @@ public static void registerAllExtensions(com.google.protobuf.ExtensionRegistryLi registry.add(com.google.api.ClientProto.methodSignature); registry.add(com.google.api.ClientProto.defaultHost); registry.add(com.google.api.ClientProto.oauthScopes); + registry.add(com.google.api.ClientProto.apiVersion); } public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry registry) { @@ -141,6 +142,35 @@ public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry r com.google.protobuf.GeneratedMessage.newFileScopedGeneratedExtension( java.lang.String.class, null); + public static final int API_VERSION_FIELD_NUMBER = 525000001; + /** + * + * + *
+   * The API version of this service, which should be sent by version-aware
+   * clients to the service. This allows services to abide by the schema and
+   * behavior of the service at the time this API version was deployed.
+   * The format of the API version must be treated as opaque by clients.
+   * Services may use a format with an apparent structure, but clients must
+   * not rely on this to determine components within an API version, or attempt
+   * to construct other valid API versions. Note that this is for upcoming
+   * functionality and may not be implemented for all services.
+   *
+   * Example:
+   *
+   *   service Foo {
+   *     option (google.api.api_version) = "v1_20230821_preview";
+   *   }
+   * 
+ * + * extend .google.protobuf.ServiceOptions { ... } + */ + public static final com.google.protobuf.GeneratedMessage.GeneratedExtension< + com.google.protobuf.DescriptorProtos.ServiceOptions, java.lang.String> + apiVersion = + com.google.protobuf.GeneratedMessage.newFileScopedGeneratedExtension( + java.lang.String.class, null); + static final com.google.protobuf.Descriptors.Descriptor internal_static_google_api_CommonLanguageSettings_descriptor; static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable @@ -233,7 +263,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "2\032.google.api.DotnetSettings\022/\n\rruby_set" + "tings\030\033 \001(\0132\030.google.api.RubySettings\022+\n" + "\013go_settings\030\034 \001(\0132\026.google.api.GoSettin" - + "gs\"\376\002\n\nPublishing\0223\n\017method_settings\030\002 \003" + + "gs\"\250\003\n\nPublishing\0223\n\017method_settings\030\002 \003" + "(\0132\032.google.api.MethodSettings\022\025\n\rnew_is" + "sue_uri\030e \001(\t\022\031\n\021documentation_uri\030f \001(\t" + "\022\026\n\016api_short_name\030g \001(\t\022\024\n\014github_label" @@ -242,56 +272,59 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + " \001(\0162%.google.api.ClientLibraryOrganizat" + "ion\022;\n\020library_settings\030m \003(\0132!.google.a" + "pi.ClientLibrarySettings\022)\n!proto_refere" - + "nce_documentation_uri\030n \001(\t\"\343\001\n\014JavaSett" - + "ings\022\027\n\017library_package\030\001 \001(\t\022L\n\023service" - + "_class_names\030\002 \003(\0132/.google.api.JavaSett" - + "ings.ServiceClassNamesEntry\0222\n\006common\030\003 " - + "\001(\0132\".google.api.CommonLanguageSettings\032" - + "8\n\026ServiceClassNamesEntry\022\013\n\003key\030\001 \001(\t\022\r" - + "\n\005value\030\002 \001(\t:\0028\001\"A\n\013CppSettings\0222\n\006comm" - + "on\030\001 \001(\0132\".google.api.CommonLanguageSett" - + "ings\"A\n\013PhpSettings\0222\n\006common\030\001 \001(\0132\".go" - + "ogle.api.CommonLanguageSettings\"D\n\016Pytho" - + "nSettings\0222\n\006common\030\001 \001(\0132\".google.api.C" - + "ommonLanguageSettings\"B\n\014NodeSettings\0222\n" - + "\006common\030\001 \001(\0132\".google.api.CommonLanguag" - + "eSettings\"\252\003\n\016DotnetSettings\0222\n\006common\030\001" - + " \001(\0132\".google.api.CommonLanguageSettings" - + "\022I\n\020renamed_services\030\002 \003(\0132/.google.api." - + "DotnetSettings.RenamedServicesEntry\022K\n\021r" - + "enamed_resources\030\003 \003(\01320.google.api.Dotn" - + "etSettings.RenamedResourcesEntry\022\031\n\021igno" - + "red_resources\030\004 \003(\t\022 \n\030forced_namespace_" - + "aliases\030\005 \003(\t\022\036\n\026handwritten_signatures\030" - + "\006 \003(\t\0326\n\024RenamedServicesEntry\022\013\n\003key\030\001 \001" - + "(\t\022\r\n\005value\030\002 \001(\t:\0028\001\0327\n\025RenamedResource" - + "sEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"B" - + "\n\014RubySettings\0222\n\006common\030\001 \001(\0132\".google." - + "api.CommonLanguageSettings\"@\n\nGoSettings" - + "\0222\n\006common\030\001 \001(\0132\".google.api.CommonLang" - + "uageSettings\"\317\002\n\016MethodSettings\022\020\n\010selec" - + "tor\030\001 \001(\t\022<\n\014long_running\030\002 \001(\0132&.google" - + ".api.MethodSettings.LongRunning\022\035\n\025auto_" - + "populated_fields\030\003 \003(\t\032\315\001\n\013LongRunning\0225" - + "\n\022initial_poll_delay\030\001 \001(\0132\031.google.prot" - + "obuf.Duration\022\035\n\025poll_delay_multiplier\030\002" - + " \001(\002\0221\n\016max_poll_delay\030\003 \001(\0132\031.google.pr" - + "otobuf.Duration\0225\n\022total_poll_timeout\030\004 " - + "\001(\0132\031.google.protobuf.Duration*\243\001\n\031Clien" - + "tLibraryOrganization\022+\n\'CLIENT_LIBRARY_O" - + "RGANIZATION_UNSPECIFIED\020\000\022\t\n\005CLOUD\020\001\022\007\n\003" - + "ADS\020\002\022\n\n\006PHOTOS\020\003\022\017\n\013STREET_VIEW\020\004\022\014\n\010SH" - + "OPPING\020\005\022\007\n\003GEO\020\006\022\021\n\rGENERATIVE_AI\020\007*g\n\030" - + "ClientLibraryDestination\022*\n&CLIENT_LIBRA" - + "RY_DESTINATION_UNSPECIFIED\020\000\022\n\n\006GITHUB\020\n" - + "\022\023\n\017PACKAGE_MANAGER\020\024:9\n\020method_signatur" - + "e\022\036.google.protobuf.MethodOptions\030\233\010 \003(\t" - + ":6\n\014default_host\022\037.google.protobuf.Servi" - + "ceOptions\030\231\010 \001(\t:6\n\014oauth_scopes\022\037.googl" - + "e.protobuf.ServiceOptions\030\232\010 \001(\tBi\n\016com." - + "google.apiB\013ClientProtoP\001ZAgoogle.golang" - + ".org/genproto/googleapis/api/annotations" - + ";annotations\242\002\004GAPIb\006proto3" + + "nce_documentation_uri\030n \001(\t\022(\n rest_refe" + + "rence_documentation_uri\030o \001(\t\"\343\001\n\014JavaSe" + + "ttings\022\027\n\017library_package\030\001 \001(\t\022L\n\023servi" + + "ce_class_names\030\002 \003(\0132/.google.api.JavaSe" + + "ttings.ServiceClassNamesEntry\0222\n\006common\030" + + "\003 \001(\0132\".google.api.CommonLanguageSetting" + + "s\0328\n\026ServiceClassNamesEntry\022\013\n\003key\030\001 \001(\t" + + "\022\r\n\005value\030\002 \001(\t:\0028\001\"A\n\013CppSettings\0222\n\006co" + + "mmon\030\001 \001(\0132\".google.api.CommonLanguageSe" + + "ttings\"A\n\013PhpSettings\0222\n\006common\030\001 \001(\0132\"." + + "google.api.CommonLanguageSettings\"D\n\016Pyt" + + "honSettings\0222\n\006common\030\001 \001(\0132\".google.api" + + ".CommonLanguageSettings\"B\n\014NodeSettings\022" + + "2\n\006common\030\001 \001(\0132\".google.api.CommonLangu" + + "ageSettings\"\252\003\n\016DotnetSettings\0222\n\006common" + + "\030\001 \001(\0132\".google.api.CommonLanguageSettin" + + "gs\022I\n\020renamed_services\030\002 \003(\0132/.google.ap" + + "i.DotnetSettings.RenamedServicesEntry\022K\n" + + "\021renamed_resources\030\003 \003(\01320.google.api.Do" + + "tnetSettings.RenamedResourcesEntry\022\031\n\021ig" + + "nored_resources\030\004 \003(\t\022 \n\030forced_namespac" + + "e_aliases\030\005 \003(\t\022\036\n\026handwritten_signature" + + "s\030\006 \003(\t\0326\n\024RenamedServicesEntry\022\013\n\003key\030\001" + + " \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\0327\n\025RenamedResour" + + "cesEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001" + + "\"B\n\014RubySettings\0222\n\006common\030\001 \001(\0132\".googl" + + "e.api.CommonLanguageSettings\"@\n\nGoSettin" + + "gs\0222\n\006common\030\001 \001(\0132\".google.api.CommonLa" + + "nguageSettings\"\317\002\n\016MethodSettings\022\020\n\010sel" + + "ector\030\001 \001(\t\022<\n\014long_running\030\002 \001(\0132&.goog" + + "le.api.MethodSettings.LongRunning\022\035\n\025aut" + + "o_populated_fields\030\003 \003(\t\032\315\001\n\013LongRunning" + + "\0225\n\022initial_poll_delay\030\001 \001(\0132\031.google.pr" + + "otobuf.Duration\022\035\n\025poll_delay_multiplier" + + "\030\002 \001(\002\0221\n\016max_poll_delay\030\003 \001(\0132\031.google." + + "protobuf.Duration\0225\n\022total_poll_timeout\030" + + "\004 \001(\0132\031.google.protobuf.Duration*\243\001\n\031Cli" + + "entLibraryOrganization\022+\n\'CLIENT_LIBRARY" + + "_ORGANIZATION_UNSPECIFIED\020\000\022\t\n\005CLOUD\020\001\022\007" + + "\n\003ADS\020\002\022\n\n\006PHOTOS\020\003\022\017\n\013STREET_VIEW\020\004\022\014\n\010" + + "SHOPPING\020\005\022\007\n\003GEO\020\006\022\021\n\rGENERATIVE_AI\020\007*g" + + "\n\030ClientLibraryDestination\022*\n&CLIENT_LIB" + + "RARY_DESTINATION_UNSPECIFIED\020\000\022\n\n\006GITHUB" + + "\020\n\022\023\n\017PACKAGE_MANAGER\020\024:9\n\020method_signat" + + "ure\022\036.google.protobuf.MethodOptions\030\233\010 \003" + + "(\t:6\n\014default_host\022\037.google.protobuf.Ser" + + "viceOptions\030\231\010 \001(\t:6\n\014oauth_scopes\022\037.goo" + + "gle.protobuf.ServiceOptions\030\232\010 \001(\t:8\n\013ap" + + "i_version\022\037.google.protobuf.ServiceOptio" + + "ns\030\301\272\253\372\001 \001(\tBi\n\016com.google.apiB\013ClientPr" + + "otoP\001ZAgoogle.golang.org/genproto/google" + + "apis/api/annotations;annotations\242\002\004GAPIb" + + "\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( @@ -342,6 +375,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Organization", "LibrarySettings", "ProtoReferenceDocumentationUri", + "RestReferenceDocumentationUri", }); internal_static_google_api_JavaSettings_descriptor = getDescriptor().getMessageTypes().get(3); internal_static_google_api_JavaSettings_fieldAccessorTable = @@ -447,6 +481,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { methodSignature.internalInit(descriptor.getExtensions().get(0)); defaultHost.internalInit(descriptor.getExtensions().get(1)); oauthScopes.internalInit(descriptor.getExtensions().get(2)); + apiVersion.internalInit(descriptor.getExtensions().get(3)); com.google.api.LaunchStageProto.getDescriptor(); com.google.protobuf.DescriptorProtos.getDescriptor(); com.google.protobuf.DurationProto.getDescriptor(); diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/CommonLanguageSettings.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/CommonLanguageSettings.java index efed26fbe1..ffeacd0aac 100644 --- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/CommonLanguageSettings.java +++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/CommonLanguageSettings.java @@ -78,7 +78,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { * string reference_docs_uri = 1 [deprecated = true]; * * @deprecated google.api.CommonLanguageSettings.reference_docs_uri is deprecated. See - * google/api/client.proto;l=106 + * google/api/client.proto;l=122 * @return The referenceDocsUri. */ @java.lang.Override @@ -105,7 +105,7 @@ public java.lang.String getReferenceDocsUri() { * string reference_docs_uri = 1 [deprecated = true]; * * @deprecated google.api.CommonLanguageSettings.reference_docs_uri is deprecated. See - * google/api/client.proto;l=106 + * google/api/client.proto;l=122 * @return The bytes for referenceDocsUri. */ @java.lang.Override @@ -637,7 +637,7 @@ public Builder mergeFrom( * string reference_docs_uri = 1 [deprecated = true]; * * @deprecated google.api.CommonLanguageSettings.reference_docs_uri is deprecated. See - * google/api/client.proto;l=106 + * google/api/client.proto;l=122 * @return The referenceDocsUri. */ @java.lang.Deprecated @@ -663,7 +663,7 @@ public java.lang.String getReferenceDocsUri() { * string reference_docs_uri = 1 [deprecated = true]; * * @deprecated google.api.CommonLanguageSettings.reference_docs_uri is deprecated. See - * google/api/client.proto;l=106 + * google/api/client.proto;l=122 * @return The bytes for referenceDocsUri. */ @java.lang.Deprecated @@ -689,7 +689,7 @@ public com.google.protobuf.ByteString getReferenceDocsUriBytes() { * string reference_docs_uri = 1 [deprecated = true]; * * @deprecated google.api.CommonLanguageSettings.reference_docs_uri is deprecated. See - * google/api/client.proto;l=106 + * google/api/client.proto;l=122 * @param value The referenceDocsUri to set. * @return This builder for chaining. */ @@ -714,7 +714,7 @@ public Builder setReferenceDocsUri(java.lang.String value) { * string reference_docs_uri = 1 [deprecated = true]; * * @deprecated google.api.CommonLanguageSettings.reference_docs_uri is deprecated. See - * google/api/client.proto;l=106 + * google/api/client.proto;l=122 * @return This builder for chaining. */ @java.lang.Deprecated @@ -735,7 +735,7 @@ public Builder clearReferenceDocsUri() { * string reference_docs_uri = 1 [deprecated = true]; * * @deprecated google.api.CommonLanguageSettings.reference_docs_uri is deprecated. See - * google/api/client.proto;l=106 + * google/api/client.proto;l=122 * @param value The bytes for referenceDocsUri to set. * @return This builder for chaining. */ diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/CommonLanguageSettingsOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/CommonLanguageSettingsOrBuilder.java index 1760875411..032197ba67 100644 --- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/CommonLanguageSettingsOrBuilder.java +++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/CommonLanguageSettingsOrBuilder.java @@ -35,7 +35,7 @@ public interface CommonLanguageSettingsOrBuilder * string reference_docs_uri = 1 [deprecated = true]; * * @deprecated google.api.CommonLanguageSettings.reference_docs_uri is deprecated. See - * google/api/client.proto;l=106 + * google/api/client.proto;l=122 * @return The referenceDocsUri. */ @java.lang.Deprecated @@ -51,7 +51,7 @@ public interface CommonLanguageSettingsOrBuilder * string reference_docs_uri = 1 [deprecated = true]; * * @deprecated google.api.CommonLanguageSettings.reference_docs_uri is deprecated. See - * google/api/client.proto;l=106 + * google/api/client.proto;l=122 * @return The bytes for referenceDocsUri. */ @java.lang.Deprecated diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Documentation.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Documentation.java index 16b510bbde..6703c50a74 100644 --- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Documentation.java +++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Documentation.java @@ -35,7 +35,7 @@ * content: &#40;== include google/foo/overview.md ==&#41; * - name: Tutorial * content: &#40;== include google/foo/tutorial.md ==&#41; - * subpages; + * subpages: * - name: Java * content: &#40;== include google/foo/tutorial_java.md ==&#41; * rules: @@ -733,7 +733,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build * content: &#40;== include google/foo/overview.md ==&#41; * - name: Tutorial * content: &#40;== include google/foo/tutorial.md ==&#41; - * subpages; + * subpages: * - name: Java * content: &#40;== include google/foo/tutorial_java.md ==&#41; * rules: diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ErrorReason.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ErrorReason.java index ff8d334d6b..bae0c87f02 100644 --- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ErrorReason.java +++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ErrorReason.java @@ -783,6 +783,32 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum { * GCP_SUSPENDED = 30; */ GCP_SUSPENDED(30), + /** + * + * + *
+   * The request violates the location policies when creating resources in
+   * the restricted region.
+   *
+   * Example of an ErrorInfo when creating the Cloud Storage Bucket by
+   * "projects/123" for service storage.googleapis.com:
+   *
+   *     { "reason": "LOCATION_POLICY_VIOLATED",
+   *       "domain": "googleapis.com",
+   *       "metadata": {
+   *         "consumer": "projects/123",
+   *         "service": "storage.googleapis.com",
+   *       }
+   *     }
+   *
+   * This response indicates creating the Cloud Storage Bucket in
+   * "locations/asia-northeast3" violates at least one location policy.
+   * The troubleshooting guidance is provided in the Help links.
+   * 
+ * + * LOCATION_POLICY_VIOLATED = 31; + */ + LOCATION_POLICY_VIOLATED(31), UNRECOGNIZED(-1), ; @@ -1531,6 +1557,32 @@ public enum ErrorReason implements com.google.protobuf.ProtocolMessageEnum { * GCP_SUSPENDED = 30; */ public static final int GCP_SUSPENDED_VALUE = 30; + /** + * + * + *
+   * The request violates the location policies when creating resources in
+   * the restricted region.
+   *
+   * Example of an ErrorInfo when creating the Cloud Storage Bucket by
+   * "projects/123" for service storage.googleapis.com:
+   *
+   *     { "reason": "LOCATION_POLICY_VIOLATED",
+   *       "domain": "googleapis.com",
+   *       "metadata": {
+   *         "consumer": "projects/123",
+   *         "service": "storage.googleapis.com",
+   *       }
+   *     }
+   *
+   * This response indicates creating the Cloud Storage Bucket in
+   * "locations/asia-northeast3" violates at least one location policy.
+   * The troubleshooting guidance is provided in the Help links.
+   * 
+ * + * LOCATION_POLICY_VIOLATED = 31; + */ + public static final int LOCATION_POLICY_VIOLATED_VALUE = 31; public final int getNumber() { if (this == UNRECOGNIZED) { @@ -1616,6 +1668,8 @@ public static ErrorReason forNumber(int value) { return SERVICE_NOT_VISIBLE; case 30: return GCP_SUSPENDED; + case 31: + return LOCATION_POLICY_VIOLATED; default: return null; } diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ErrorReasonProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ErrorReasonProto.java index 6df5def6d9..29cb7db20e 100644 --- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ErrorReasonProto.java +++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ErrorReasonProto.java @@ -37,7 +37,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { static { java.lang.String[] descriptorData = { "\n\035google/api/error_reason.proto\022\ngoogle." - + "api*\354\006\n\013ErrorReason\022\034\n\030ERROR_REASON_UNSP" + + "api*\212\007\n\013ErrorReason\022\034\n\030ERROR_REASON_UNSP" + "ECIFIED\020\000\022\024\n\020SERVICE_DISABLED\020\001\022\024\n\020BILLI" + "NG_DISABLED\020\002\022\023\n\017API_KEY_INVALID\020\003\022\033\n\027AP" + "I_KEY_SERVICE_BLOCKED\020\004\022!\n\035API_KEY_HTTP_" @@ -59,10 +59,10 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "SUPPORTED\020\032\022\035\n\031ORG_RESTRICTION_VIOLATION" + "\020\033\022\"\n\036ORG_RESTRICTION_HEADER_INVALID\020\034\022\027" + "\n\023SERVICE_NOT_VISIBLE\020\035\022\021\n\rGCP_SUSPENDED" - + "\020\036Bp\n\016com.google.apiB\020ErrorReasonProtoP\001" - + "ZCgoogle.golang.org/genproto/googleapis/" - + "api/error_reason;error_reason\242\002\004GAPIb\006pr" - + "oto3" + + "\020\036\022\034\n\030LOCATION_POLICY_VIOLATED\020\037Bp\n\016com." + + "google.apiB\020ErrorReasonProtoP\001ZCgoogle.g" + + "olang.org/genproto/googleapis/api/error_" + + "reason;error_reason\242\002\004GAPIb\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/FieldInfo.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/FieldInfo.java index 9ef1359378..c69c15f885 100644 --- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/FieldInfo.java +++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/FieldInfo.java @@ -114,9 +114,9 @@ public enum Format implements com.google.protobuf.ProtocolMessageEnum { *
      * Internet Protocol v6 value as defined by [RFC
      * 2460](https://datatracker.ietf.org/doc/html/rfc2460). The value may be
-     * normalized to entirely lowercase letters, and zero-padded partial and
-     * empty octets. For example, the value `2001:DB8::` would be normalized to
-     * `2001:0db8:0:0`.
+     * normalized to entirely lowercase letters with zeros compressed, following
+     * [RFC 5952](https://datatracker.ietf.org/doc/html/rfc5952). For example,
+     * the value `2001:0DB8:0::0` would be normalized to `2001:db8::`.
      * 
* * IPV6 = 3; @@ -180,9 +180,9 @@ public enum Format implements com.google.protobuf.ProtocolMessageEnum { *
      * Internet Protocol v6 value as defined by [RFC
      * 2460](https://datatracker.ietf.org/doc/html/rfc2460). The value may be
-     * normalized to entirely lowercase letters, and zero-padded partial and
-     * empty octets. For example, the value `2001:DB8::` would be normalized to
-     * `2001:0db8:0:0`.
+     * normalized to entirely lowercase letters with zeros compressed, following
+     * [RFC 5952](https://datatracker.ietf.org/doc/html/rfc5952). For example,
+     * the value `2001:0DB8:0::0` would be normalized to `2001:db8::`.
      * 
* * IPV6 = 3; diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MonitoredResourceDescriptor.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MonitoredResourceDescriptor.java index 2bcb1c3c71..5278ae32af 100644 --- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MonitoredResourceDescriptor.java +++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MonitoredResourceDescriptor.java @@ -148,7 +148,7 @@ public com.google.protobuf.ByteString getNameBytes() { *
    * Required. The monitored resource type. For example, the type
    * `"cloudsql_database"` represents databases in Google Cloud SQL.
-   *  For a list of types, see [Monitoring resource
+   *  For a list of types, see [Monitored resource
    *  types](https://cloud.google.com/monitoring/api/resources)
    * and [Logging resource
    * types](https://cloud.google.com/logging/docs/api/v2/resource-list).
@@ -176,7 +176,7 @@ public java.lang.String getType() {
    * 
    * Required. The monitored resource type. For example, the type
    * `"cloudsql_database"` represents databases in Google Cloud SQL.
-   *  For a list of types, see [Monitoring resource
+   *  For a list of types, see [Monitored resource
    *  types](https://cloud.google.com/monitoring/api/resources)
    * and [Logging resource
    * types](https://cloud.google.com/logging/docs/api/v2/resource-list).
@@ -1076,7 +1076,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
      * 
      * Required. The monitored resource type. For example, the type
      * `"cloudsql_database"` represents databases in Google Cloud SQL.
-     *  For a list of types, see [Monitoring resource
+     *  For a list of types, see [Monitored resource
      *  types](https://cloud.google.com/monitoring/api/resources)
      * and [Logging resource
      * types](https://cloud.google.com/logging/docs/api/v2/resource-list).
@@ -1103,7 +1103,7 @@ public java.lang.String getType() {
      * 
      * Required. The monitored resource type. For example, the type
      * `"cloudsql_database"` represents databases in Google Cloud SQL.
-     *  For a list of types, see [Monitoring resource
+     *  For a list of types, see [Monitored resource
      *  types](https://cloud.google.com/monitoring/api/resources)
      * and [Logging resource
      * types](https://cloud.google.com/logging/docs/api/v2/resource-list).
@@ -1130,7 +1130,7 @@ public com.google.protobuf.ByteString getTypeBytes() {
      * 
      * Required. The monitored resource type. For example, the type
      * `"cloudsql_database"` represents databases in Google Cloud SQL.
-     *  For a list of types, see [Monitoring resource
+     *  For a list of types, see [Monitored resource
      *  types](https://cloud.google.com/monitoring/api/resources)
      * and [Logging resource
      * types](https://cloud.google.com/logging/docs/api/v2/resource-list).
@@ -1156,7 +1156,7 @@ public Builder setType(java.lang.String value) {
      * 
      * Required. The monitored resource type. For example, the type
      * `"cloudsql_database"` represents databases in Google Cloud SQL.
-     *  For a list of types, see [Monitoring resource
+     *  For a list of types, see [Monitored resource
      *  types](https://cloud.google.com/monitoring/api/resources)
      * and [Logging resource
      * types](https://cloud.google.com/logging/docs/api/v2/resource-list).
@@ -1178,7 +1178,7 @@ public Builder clearType() {
      * 
      * Required. The monitored resource type. For example, the type
      * `"cloudsql_database"` represents databases in Google Cloud SQL.
-     *  For a list of types, see [Monitoring resource
+     *  For a list of types, see [Monitored resource
      *  types](https://cloud.google.com/monitoring/api/resources)
      * and [Logging resource
      * types](https://cloud.google.com/logging/docs/api/v2/resource-list).
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MonitoredResourceDescriptorOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MonitoredResourceDescriptorOrBuilder.java
index 71ab51540f..1e0cb26cc9 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MonitoredResourceDescriptorOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/MonitoredResourceDescriptorOrBuilder.java
@@ -65,7 +65,7 @@ public interface MonitoredResourceDescriptorOrBuilder
    * 
    * Required. The monitored resource type. For example, the type
    * `"cloudsql_database"` represents databases in Google Cloud SQL.
-   *  For a list of types, see [Monitoring resource
+   *  For a list of types, see [Monitored resource
    *  types](https://cloud.google.com/monitoring/api/resources)
    * and [Logging resource
    * types](https://cloud.google.com/logging/docs/api/v2/resource-list).
@@ -82,7 +82,7 @@ public interface MonitoredResourceDescriptorOrBuilder
    * 
    * Required. The monitored resource type. For example, the type
    * `"cloudsql_database"` represents databases in Google Cloud SQL.
-   *  For a list of types, see [Monitoring resource
+   *  For a list of types, see [Monitored resource
    *  types](https://cloud.google.com/monitoring/api/resources)
    * and [Logging resource
    * types](https://cloud.google.com/logging/docs/api/v2/resource-list).
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Publishing.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Publishing.java
index a3f47414a8..7aeeb422c5 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Publishing.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Publishing.java
@@ -51,6 +51,7 @@ private Publishing() {
     organization_ = 0;
     librarySettings_ = java.util.Collections.emptyList();
     protoReferenceDocumentationUri_ = "";
+    restReferenceDocumentationUri_ = "";
   }
 
   @java.lang.Override
@@ -649,6 +650,59 @@ public com.google.protobuf.ByteString getProtoReferenceDocumentationUriBytes() {
     }
   }
 
+  public static final int REST_REFERENCE_DOCUMENTATION_URI_FIELD_NUMBER = 111;
+
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object restReferenceDocumentationUri_ = "";
+  /**
+   *
+   *
+   * 
+   * Optional link to REST reference documentation.  Example:
+   * https://cloud.google.com/pubsub/lite/docs/reference/rest
+   * 
+ * + * string rest_reference_documentation_uri = 111; + * + * @return The restReferenceDocumentationUri. + */ + @java.lang.Override + public java.lang.String getRestReferenceDocumentationUri() { + java.lang.Object ref = restReferenceDocumentationUri_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + restReferenceDocumentationUri_ = s; + return s; + } + } + /** + * + * + *
+   * Optional link to REST reference documentation.  Example:
+   * https://cloud.google.com/pubsub/lite/docs/reference/rest
+   * 
+ * + * string rest_reference_documentation_uri = 111; + * + * @return The bytes for restReferenceDocumentationUri. + */ + @java.lang.Override + public com.google.protobuf.ByteString getRestReferenceDocumentationUriBytes() { + java.lang.Object ref = restReferenceDocumentationUri_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + restReferenceDocumentationUri_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + private byte memoizedIsInitialized = -1; @java.lang.Override @@ -697,6 +751,10 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io com.google.protobuf.GeneratedMessageV3.writeString( output, 110, protoReferenceDocumentationUri_); } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(restReferenceDocumentationUri_)) { + com.google.protobuf.GeneratedMessageV3.writeString( + output, 111, restReferenceDocumentationUri_); + } getUnknownFields().writeTo(output); } @@ -746,6 +804,11 @@ public int getSerializedSize() { com.google.protobuf.GeneratedMessageV3.computeStringSize( 110, protoReferenceDocumentationUri_); } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(restReferenceDocumentationUri_)) { + size += + com.google.protobuf.GeneratedMessageV3.computeStringSize( + 111, restReferenceDocumentationUri_); + } size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; @@ -772,6 +835,8 @@ public boolean equals(final java.lang.Object obj) { if (!getLibrarySettingsList().equals(other.getLibrarySettingsList())) return false; if (!getProtoReferenceDocumentationUri().equals(other.getProtoReferenceDocumentationUri())) return false; + if (!getRestReferenceDocumentationUri().equals(other.getRestReferenceDocumentationUri())) + return false; if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -809,6 +874,8 @@ public int hashCode() { } hash = (37 * hash) + PROTO_REFERENCE_DOCUMENTATION_URI_FIELD_NUMBER; hash = (53 * hash) + getProtoReferenceDocumentationUri().hashCode(); + hash = (37 * hash) + REST_REFERENCE_DOCUMENTATION_URI_FIELD_NUMBER; + hash = (53 * hash) + getRestReferenceDocumentationUri().hashCode(); hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; @@ -968,6 +1035,7 @@ public Builder clear() { } bitField0_ = (bitField0_ & ~0x00000100); protoReferenceDocumentationUri_ = ""; + restReferenceDocumentationUri_ = ""; return this; } @@ -1049,6 +1117,9 @@ private void buildPartial0(com.google.api.Publishing result) { if (((from_bitField0_ & 0x00000200) != 0)) { result.protoReferenceDocumentationUri_ = protoReferenceDocumentationUri_; } + if (((from_bitField0_ & 0x00000400) != 0)) { + result.restReferenceDocumentationUri_ = restReferenceDocumentationUri_; + } } @java.lang.Override @@ -1193,6 +1264,11 @@ public Builder mergeFrom(com.google.api.Publishing other) { bitField0_ |= 0x00000200; onChanged(); } + if (!other.getRestReferenceDocumentationUri().isEmpty()) { + restReferenceDocumentationUri_ = other.restReferenceDocumentationUri_; + bitField0_ |= 0x00000400; + onChanged(); + } this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; @@ -1293,6 +1369,12 @@ public Builder mergeFrom( bitField0_ |= 0x00000200; break; } // case 882 + case 890: + { + restReferenceDocumentationUri_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000400; + break; + } // case 890 default: { if (!super.parseUnknownField(input, extensionRegistry, tag)) { @@ -3010,6 +3092,117 @@ public Builder setProtoReferenceDocumentationUriBytes(com.google.protobuf.ByteSt return this; } + private java.lang.Object restReferenceDocumentationUri_ = ""; + /** + * + * + *
+     * Optional link to REST reference documentation.  Example:
+     * https://cloud.google.com/pubsub/lite/docs/reference/rest
+     * 
+ * + * string rest_reference_documentation_uri = 111; + * + * @return The restReferenceDocumentationUri. + */ + public java.lang.String getRestReferenceDocumentationUri() { + java.lang.Object ref = restReferenceDocumentationUri_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + restReferenceDocumentationUri_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * + * + *
+     * Optional link to REST reference documentation.  Example:
+     * https://cloud.google.com/pubsub/lite/docs/reference/rest
+     * 
+ * + * string rest_reference_documentation_uri = 111; + * + * @return The bytes for restReferenceDocumentationUri. + */ + public com.google.protobuf.ByteString getRestReferenceDocumentationUriBytes() { + java.lang.Object ref = restReferenceDocumentationUri_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + restReferenceDocumentationUri_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * + * + *
+     * Optional link to REST reference documentation.  Example:
+     * https://cloud.google.com/pubsub/lite/docs/reference/rest
+     * 
+ * + * string rest_reference_documentation_uri = 111; + * + * @param value The restReferenceDocumentationUri to set. + * @return This builder for chaining. + */ + public Builder setRestReferenceDocumentationUri(java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + restReferenceDocumentationUri_ = value; + bitField0_ |= 0x00000400; + onChanged(); + return this; + } + /** + * + * + *
+     * Optional link to REST reference documentation.  Example:
+     * https://cloud.google.com/pubsub/lite/docs/reference/rest
+     * 
+ * + * string rest_reference_documentation_uri = 111; + * + * @return This builder for chaining. + */ + public Builder clearRestReferenceDocumentationUri() { + restReferenceDocumentationUri_ = getDefaultInstance().getRestReferenceDocumentationUri(); + bitField0_ = (bitField0_ & ~0x00000400); + onChanged(); + return this; + } + /** + * + * + *
+     * Optional link to REST reference documentation.  Example:
+     * https://cloud.google.com/pubsub/lite/docs/reference/rest
+     * 
+ * + * string rest_reference_documentation_uri = 111; + * + * @param value The bytes for restReferenceDocumentationUri to set. + * @return This builder for chaining. + */ + public Builder setRestReferenceDocumentationUriBytes(com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + restReferenceDocumentationUri_ = value; + bitField0_ |= 0x00000400; + onChanged(); + return this; + } + @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/PublishingOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/PublishingOrBuilder.java index 427c64bbb8..e0ea4943eb 100644 --- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/PublishingOrBuilder.java +++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/PublishingOrBuilder.java @@ -383,4 +383,31 @@ public interface PublishingOrBuilder * @return The bytes for protoReferenceDocumentationUri. */ com.google.protobuf.ByteString getProtoReferenceDocumentationUriBytes(); + + /** + * + * + *
+   * Optional link to REST reference documentation.  Example:
+   * https://cloud.google.com/pubsub/lite/docs/reference/rest
+   * 
+ * + * string rest_reference_documentation_uri = 111; + * + * @return The restReferenceDocumentationUri. + */ + java.lang.String getRestReferenceDocumentationUri(); + /** + * + * + *
+   * Optional link to REST reference documentation.  Example:
+   * https://cloud.google.com/pubsub/lite/docs/reference/rest
+   * 
+ * + * string rest_reference_documentation_uri = 111; + * + * @return The bytes for restReferenceDocumentationUri. + */ + com.google.protobuf.ByteString getRestReferenceDocumentationUriBytes(); } diff --git a/java-common-protos/proto-google-common-protos/src/main/proto/google/api/client.proto b/java-common-protos/proto-google-common-protos/src/main/proto/google/api/client.proto index 39bdde82a9..0952e8373c 100644 --- a/java-common-protos/proto-google-common-protos/src/main/proto/google/api/client.proto +++ b/java-common-protos/proto-google-common-protos/src/main/proto/google/api/client.proto @@ -98,6 +98,22 @@ extend google.protobuf.ServiceOptions { // ... // } string oauth_scopes = 1050; + + // The API version of this service, which should be sent by version-aware + // clients to the service. This allows services to abide by the schema and + // behavior of the service at the time this API version was deployed. + // The format of the API version must be treated as opaque by clients. + // Services may use a format with an apparent structure, but clients must + // not rely on this to determine components within an API version, or attempt + // to construct other valid API versions. Note that this is for upcoming + // functionality and may not be implemented for all services. + // + // Example: + // + // service Foo { + // option (google.api.api_version) = "v1_20230821_preview"; + // } + string api_version = 525000001; } // Required information for every language. @@ -192,6 +208,10 @@ message Publishing { // Optional link to proto reference documentation. Example: // https://cloud.google.com/pubsub/lite/docs/reference/rpc string proto_reference_documentation_uri = 110; + + // Optional link to REST reference documentation. Example: + // https://cloud.google.com/pubsub/lite/docs/reference/rest + string rest_reference_documentation_uri = 111; } // Settings for Java client libraries. diff --git a/java-common-protos/proto-google-common-protos/src/main/proto/google/api/documentation.proto b/java-common-protos/proto-google-common-protos/src/main/proto/google/api/documentation.proto index 0dabdfcf80..12936c701b 100644 --- a/java-common-protos/proto-google-common-protos/src/main/proto/google/api/documentation.proto +++ b/java-common-protos/proto-google-common-protos/src/main/proto/google/api/documentation.proto @@ -34,7 +34,7 @@ option objc_class_prefix = "GAPI"; // content: (== include google/foo/overview.md ==) // - name: Tutorial // content: (== include google/foo/tutorial.md ==) -// subpages; +// subpages: // - name: Java // content: (== include google/foo/tutorial_java.md ==) // rules: diff --git a/java-common-protos/proto-google-common-protos/src/main/proto/google/api/error_reason.proto b/java-common-protos/proto-google-common-protos/src/main/proto/google/api/error_reason.proto index c0509be4fc..cf806698da 100644 --- a/java-common-protos/proto-google-common-protos/src/main/proto/google/api/error_reason.proto +++ b/java-common-protos/proto-google-common-protos/src/main/proto/google/api/error_reason.proto @@ -567,4 +567,23 @@ enum ErrorReason { // // This response indicates the associated GCP account has been suspended. GCP_SUSPENDED = 30; + + // The request violates the location policies when creating resources in + // the restricted region. + // + // Example of an ErrorInfo when creating the Cloud Storage Bucket by + // "projects/123" for service storage.googleapis.com: + // + // { "reason": "LOCATION_POLICY_VIOLATED", + // "domain": "googleapis.com", + // "metadata": { + // "consumer": "projects/123", + // "service": "storage.googleapis.com", + // } + // } + // + // This response indicates creating the Cloud Storage Bucket in + // "locations/asia-northeast3" violates at least one location policy. + // The troubleshooting guidance is provided in the Help links. + LOCATION_POLICY_VIOLATED = 31; } diff --git a/java-common-protos/proto-google-common-protos/src/main/proto/google/api/field_info.proto b/java-common-protos/proto-google-common-protos/src/main/proto/google/api/field_info.proto index dd66340a02..e62d84579d 100644 --- a/java-common-protos/proto-google-common-protos/src/main/proto/google/api/field_info.proto +++ b/java-common-protos/proto-google-common-protos/src/main/proto/google/api/field_info.proto @@ -61,9 +61,9 @@ message FieldInfo { // Internet Protocol v6 value as defined by [RFC // 2460](https://datatracker.ietf.org/doc/html/rfc2460). The value may be - // normalized to entirely lowercase letters, and zero-padded partial and - // empty octets. For example, the value `2001:DB8::` would be normalized to - // `2001:0db8:0:0`. + // normalized to entirely lowercase letters with zeros compressed, following + // [RFC 5952](https://datatracker.ietf.org/doc/html/rfc5952). For example, + // the value `2001:0DB8:0::0` would be normalized to `2001:db8::`. IPV6 = 3; // An IP address in either v4 or v6 format as described by the individual diff --git a/java-common-protos/proto-google-common-protos/src/main/proto/google/api/monitored_resource.proto b/java-common-protos/proto-google-common-protos/src/main/proto/google/api/monitored_resource.proto index c6f9759288..08bc39b1c2 100644 --- a/java-common-protos/proto-google-common-protos/src/main/proto/google/api/monitored_resource.proto +++ b/java-common-protos/proto-google-common-protos/src/main/proto/google/api/monitored_resource.proto @@ -49,7 +49,7 @@ message MonitoredResourceDescriptor { // Required. The monitored resource type. For example, the type // `"cloudsql_database"` represents databases in Google Cloud SQL. - // For a list of types, see [Monitoring resource + // For a list of types, see [Monitored resource // types](https://cloud.google.com/monitoring/api/resources) // and [Logging resource // types](https://cloud.google.com/logging/docs/api/v2/resource-list).