Merge branch 'main' into feat/separate-pr-des-gen

.cloudbuild/library_generation/library_generation.Dockerfile

@@ -14,7 +14,7 @@
 
 # install gapic-generator-java in a separate layer so we don't overload the image
 # with the transferred source code and jars
-FROM gcr.io/cloud-devrel-public-resources/java21 AS ggj-build
+FROM gcr.io/cloud-devrel-public-resources/java21@sha256:2ceff5eeea72260258df56d42e44ed413e52ee421c1b77393c5f2c9c4d7c41da AS ggj-build
 
 WORKDIR /sdk-platform-java
 COPY . .
@@ -27,7 +27,7 @@ RUN cp "/root/.m2/repository/com/google/api/gapic-generator-java/${DOCKER_GAPIC_
   "./gapic-generator-java.jar"
 
 # build from the root of this repo:
-FROM gcr.io/cloud-devrel-public-resources/python
+FROM gcr.io/cloud-devrel-public-resources/python@sha256:9c5ea427632f195ad164054831968389d86fdde4a15abca651f3fcb2a71268cb
 
 SHELL [ "/bin/bash", "-c" ]
 

generation_config.yaml

@@ -1,4 +1,4 @@
-googleapis_commitish: b6a27d13a2f0223051ef720e4e9d0d52323560e6
+googleapis_commitish: beea48a164c2a8cc8485185c3a4f56c587090e1a
 # the libraries are ordered with respect to library name, which is
 # java-{library.library_name} or java-{library.api-shortname} when
 # library.library_name is not defined.

java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/IamPolicyProto.java

@@ -79,11 +79,11 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "am.v1.TestIamPermissionsRequest\032).google"
           + ".iam.v1.TestIamPermissionsResponse\"/\202\323\344\223"
           + "\002)\"$/v1/{resource=**}:testIamPermissions"
-          + ":\001*\032\036\312A\033iam-meta-api.googleapis.comB\177\n\021c"
+          + ":\001*\032\036\312A\033iam-meta-api.googleapis.comB|\n\021c"
           + "om.google.iam.v1B\016IamPolicyProtoP\001Z)clou"
-          + "d.google.com/go/iam/apiv1/iampb;iampb\370\001\001"
-          + "\252\002\023Google.Cloud.Iam.V1\312\002\023Google\\Cloud\\Ia"
-          + "m\\V1b\006proto3"
+          + "d.google.com/go/iam/apiv1/iampb;iampb\252\002\023"
+          + "Google.Cloud.Iam.V1\312\002\023Google\\Cloud\\Iam\\V"
+          + "1b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(

java-iam/proto-google-iam-v1/src/main/proto/google/iam/v1/iam_policy.proto

@@ -24,7 +24,6 @@ import "google/iam/v1/options.proto";
 import "google/iam/v1/policy.proto";
 import "google/protobuf/field_mask.proto";
 
-option cc_enable_arenas = true;
 option csharp_namespace = "Google.Cloud.Iam.V1";
 option go_package = "cloud.google.com/go/iam/apiv1/iampb;iampb";
 option java_multiple_files = true;
@@ -34,7 +33,6 @@ option php_namespace = "Google\\Cloud\\Iam\\V1";
 
 // API Overview
 //
-//
 // Manages Identity and Access Management (IAM) policies.
 //
 // Any implementation of an API that offers access control features
@@ -89,7 +87,8 @@ service IAMPolicy {
   // Note: This operation is designed to be used for building permission-aware
   // UIs and command-line tools, not for authorization checking. This operation
   // may "fail open" without warning.
-  rpc TestIamPermissions(TestIamPermissionsRequest) returns (TestIamPermissionsResponse) {
+  rpc TestIamPermissions(TestIamPermissionsRequest)
+      returns (TestIamPermissionsResponse) {
     option (google.api.http) = {
       post: "/v1/{resource=**}:testIamPermissions"
       body: "*"
@@ -103,7 +102,8 @@ message SetIamPolicyRequest {
   // See the operation documentation for the appropriate value for this field.
   string resource = 1 [
     (google.api.field_behavior) = REQUIRED,
-    (google.api.resource_reference).type = "*"];
+    (google.api.resource_reference).type = "*"
+  ];
 
   // REQUIRED: The complete policy to be applied to the `resource`. The size of
   // the policy is limited to a few 10s of KB. An empty policy is a
@@ -125,7 +125,8 @@ message GetIamPolicyRequest {
   // See the operation documentation for the appropriate value for this field.
   string resource = 1 [
     (google.api.field_behavior) = REQUIRED,
-    (google.api.resource_reference).type = "*"];
+    (google.api.resource_reference).type = "*"
+  ];
 
   // OPTIONAL: A `GetPolicyOptions` object for specifying options to
   // `GetIamPolicy`.
@@ -136,9 +137,10 @@ message GetIamPolicyRequest {
 message TestIamPermissionsRequest {
   // REQUIRED: The resource for which the policy detail is being requested.
   // See the operation documentation for the appropriate value for this field.
-  string resource = 1[
+  string resource = 1 [
     (google.api.field_behavior) = REQUIRED,
-    (google.api.resource_reference).type = "*"];
+    (google.api.resource_reference).type = "*"
+  ];
 
   // The set of permissions to check for the `resource`. Permissions with
   // wildcards (such as '*' or 'storage.*') are not allowed. For more