feat!: [iam-admin] replace java_outer_classname option with use_java_…

…stubby_library, add DisableServiceAccountKey and EnableServiceAccountKey, and update comments (#8412)

- [ ] Regenerate this pull request now.

PiperOrigin-RevId: 474647927

Source-Link: googleapis/googleapis@a0a740c

Source-Link: https://github.com/googleapis/googleapis-gen/commit/5849ad110f25eef1e08daf29bd5a81f11fb65424
Copy-Tag: eyJwIjoiamF2YS1pYW0tYWRtaW4vLk93bEJvdC55YW1sIiwiaCI6IjU4NDlhZDExMGYyNWVlZjFlMDhkYWYyOWJkNWE4MWYxMWZiNjU0MjQifQ==

java-iam-admin/README.md

@@ -19,20 +19,20 @@ If you are using Maven, add this to your pom.xml file:
 <dependency>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-iam-admin</artifactId>
-  <version>1.2.3</version>
+  <version>1.2.5</version>
 </dependency>
 ```
 
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-iam-admin:1.2.3'
+implementation 'com.google.cloud:google-iam-admin:1.2.5'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-iam-admin" % "1.2.3"
+libraryDependencies += "com.google.cloud" % "google-iam-admin" % "1.2.5"
 ```
 
 ## Authentication

java-iam-admin/google-iam-admin/src/main/java/com/google/cloud/iam/admin/v1/IAMSettings.java

@@ -39,7 +39,9 @@
 import com.google.iam.admin.v1.DeleteRoleRequest;
 import com.google.iam.admin.v1.DeleteServiceAccountKeyRequest;
 import com.google.iam.admin.v1.DeleteServiceAccountRequest;
+import com.google.iam.admin.v1.DisableServiceAccountKeyRequest;
 import com.google.iam.admin.v1.DisableServiceAccountRequest;
+import com.google.iam.admin.v1.EnableServiceAccountKeyRequest;
 import com.google.iam.admin.v1.EnableServiceAccountRequest;
 import com.google.iam.admin.v1.GetRoleRequest;
 import com.google.iam.admin.v1.GetServiceAccountKeyRequest;
@@ -197,6 +199,18 @@ public UnaryCallSettings<DisableServiceAccountRequest, Empty> disableServiceAcco
     return ((IAMStubSettings) getStubSettings()).deleteServiceAccountKeySettings();
   }
 
+  /** Returns the object with the settings used for calls to disableServiceAccountKey. */
+  public UnaryCallSettings<DisableServiceAccountKeyRequest, Empty>
+      disableServiceAccountKeySettings() {
+    return ((IAMStubSettings) getStubSettings()).disableServiceAccountKeySettings();
+  }
+
+  /** Returns the object with the settings used for calls to enableServiceAccountKey. */
+  public UnaryCallSettings<EnableServiceAccountKeyRequest, Empty>
+      enableServiceAccountKeySettings() {
+    return ((IAMStubSettings) getStubSettings()).enableServiceAccountKeySettings();
+  }
+
   /**
    * Returns the object with the settings used for calls to signBlob.
    *
@@ -474,6 +488,18 @@ public Builder applyToAllUnaryMethods(
       return getStubSettingsBuilder().deleteServiceAccountKeySettings();
     }
 
+    /** Returns the builder for the settings used for calls to disableServiceAccountKey. */
+    public UnaryCallSettings.Builder<DisableServiceAccountKeyRequest, Empty>
+        disableServiceAccountKeySettings() {
+      return getStubSettingsBuilder().disableServiceAccountKeySettings();
+    }
+
+    /** Returns the builder for the settings used for calls to enableServiceAccountKey. */
+    public UnaryCallSettings.Builder<EnableServiceAccountKeyRequest, Empty>
+        enableServiceAccountKeySettings() {
+      return getStubSettingsBuilder().enableServiceAccountKeySettings();
+    }
+
     /**
      * Returns the builder for the settings used for calls to signBlob.
      *

java-iam-admin/google-iam-admin/src/main/java/com/google/cloud/iam/admin/v1/gapic_metadata.json

@@ -31,9 +31,15 @@
             "DisableServiceAccount": {
               "methods": ["disableServiceAccount", "disableServiceAccountCallable"]
             },
+            "DisableServiceAccountKey": {
+              "methods": ["disableServiceAccountKey", "disableServiceAccountKey", "disableServiceAccountKey", "disableServiceAccountKeyCallable"]
+            },
             "EnableServiceAccount": {
               "methods": ["enableServiceAccount", "enableServiceAccountCallable"]
             },
+            "EnableServiceAccountKey": {
+              "methods": ["enableServiceAccountKey", "enableServiceAccountKey", "enableServiceAccountKey", "enableServiceAccountKeyCallable"]
+            },
             "GetIamPolicy": {
               "methods": ["getIamPolicy", "getIamPolicy", "getIamPolicy", "getIamPolicyCallable"]
             },

java-iam-admin/google-iam-admin/src/main/java/com/google/cloud/iam/admin/v1/package-info.java

@@ -15,7 +15,9 @@
  */
 
 /**
- * The interfaces provided are listed below, along with usage samples.
+ * A client to Identity and Access Management (IAM) API
+ *
+ * <p>The interfaces provided are listed below, along with usage samples.
  *
  * <p>======================= IAMClient =======================
  *
@@ -29,9 +31,9 @@
  *   <li>&#42;&#42;Service account keys&#42;&#42;, which service accounts use to authenticate with
  *       Google APIs
  *   <li>&#42;&#42;IAM policies for service accounts&#42;&#42;, which specify the roles that a
- *       member has for the service account
+ *       principal has for the service account
  *   <li>&#42;&#42;IAM custom roles&#42;&#42;, which help you limit the number of permissions that
- *       you grant to members
+ *       you grant to principals
  * </ul>
  *
  * <p>In addition, you can use this service to complete the following tasks, among others:
@@ -42,6 +44,14 @@
  *   <li>Lint, or validate, condition expressions in an IAM policy
  * </ul>
  *
+ * <p>When you read data from the IAM API, each read is eventually consistent. In other words, if
+ * you write data with the IAM API, then immediately read that data, the read operation might return
+ * an older version of the data. To deal with this behavior, your application can retry the request
+ * with truncated exponential backoff.
+ *
+ * <p>In contrast, writing data to the IAM API is sequentially consistent. In other words, write
+ * operations are always processed in the order in which they were received.
+ *
  * <p>Sample for IAMClient:
  *
  * <pre>{@code

java-iam-admin/google-iam-admin/src/main/java/com/google/cloud/iam/admin/v1/stub/GrpcIAMStub.java

@@ -34,7 +34,9 @@
 import com.google.iam.admin.v1.DeleteRoleRequest;
 import com.google.iam.admin.v1.DeleteServiceAccountKeyRequest;
 import com.google.iam.admin.v1.DeleteServiceAccountRequest;
+import com.google.iam.admin.v1.DisableServiceAccountKeyRequest;
 import com.google.iam.admin.v1.DisableServiceAccountRequest;
+import com.google.iam.admin.v1.EnableServiceAccountKeyRequest;
 import com.google.iam.admin.v1.EnableServiceAccountRequest;
 import com.google.iam.admin.v1.GetRoleRequest;
 import com.google.iam.admin.v1.GetServiceAccountKeyRequest;
@@ -233,6 +235,26 @@ public class GrpcIAMStub extends IAMStub {
               .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance()))
               .build();
 
+  private static final MethodDescriptor<DisableServiceAccountKeyRequest, Empty>
+      disableServiceAccountKeyMethodDescriptor =
+          MethodDescriptor.<DisableServiceAccountKeyRequest, Empty>newBuilder()
+              .setType(MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName("google.iam.admin.v1.IAM/DisableServiceAccountKey")
+              .setRequestMarshaller(
+                  ProtoUtils.marshaller(DisableServiceAccountKeyRequest.getDefaultInstance()))
+              .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance()))
+              .build();
+
+  private static final MethodDescriptor<EnableServiceAccountKeyRequest, Empty>
+      enableServiceAccountKeyMethodDescriptor =
+          MethodDescriptor.<EnableServiceAccountKeyRequest, Empty>newBuilder()
+              .setType(MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName("google.iam.admin.v1.IAM/EnableServiceAccountKey")
+              .setRequestMarshaller(
+                  ProtoUtils.marshaller(EnableServiceAccountKeyRequest.getDefaultInstance()))
+              .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance()))
+              .build();
+
   private static final MethodDescriptor<SignBlobRequest, SignBlobResponse>
       signBlobMethodDescriptor =
           MethodDescriptor.<SignBlobRequest, SignBlobResponse>newBuilder()
@@ -397,6 +419,10 @@ public class GrpcIAMStub extends IAMStub {
       uploadServiceAccountKeyCallable;
   private final UnaryCallable<DeleteServiceAccountKeyRequest, Empty>
       deleteServiceAccountKeyCallable;
+  private final UnaryCallable<DisableServiceAccountKeyRequest, Empty>
+      disableServiceAccountKeyCallable;
+  private final UnaryCallable<EnableServiceAccountKeyRequest, Empty>
+      enableServiceAccountKeyCallable;
   private final UnaryCallable<SignBlobRequest, SignBlobResponse> signBlobCallable;
   private final UnaryCallable<SignJwtRequest, SignJwtResponse> signJwtCallable;
   private final UnaryCallable<GetIamPolicyRequest, Policy> getIamPolicyCallable;
@@ -613,6 +639,28 @@ protected GrpcIAMStub(
                       return params.build();
                     })
                 .build();
+    GrpcCallSettings<DisableServiceAccountKeyRequest, Empty>
+        disableServiceAccountKeyTransportSettings =
+            GrpcCallSettings.<DisableServiceAccountKeyRequest, Empty>newBuilder()
+                .setMethodDescriptor(disableServiceAccountKeyMethodDescriptor)
+                .setParamsExtractor(
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("name", String.valueOf(request.getName()));
+                      return params.build();
+                    })
+                .build();
+    GrpcCallSettings<EnableServiceAccountKeyRequest, Empty>
+        enableServiceAccountKeyTransportSettings =
+            GrpcCallSettings.<EnableServiceAccountKeyRequest, Empty>newBuilder()
+                .setMethodDescriptor(enableServiceAccountKeyMethodDescriptor)
+                .setParamsExtractor(
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("name", String.valueOf(request.getName()));
+                      return params.build();
+                    })
+                .build();
     GrpcCallSettings<SignBlobRequest, SignBlobResponse> signBlobTransportSettings =
         GrpcCallSettings.<SignBlobRequest, SignBlobResponse>newBuilder()
             .setMethodDescriptor(signBlobMethodDescriptor)
@@ -821,6 +869,16 @@ protected GrpcIAMStub(
             deleteServiceAccountKeyTransportSettings,
             settings.deleteServiceAccountKeySettings(),
             clientContext);
+    this.disableServiceAccountKeyCallable =
+        callableFactory.createUnaryCallable(
+            disableServiceAccountKeyTransportSettings,
+            settings.disableServiceAccountKeySettings(),
+            clientContext);
+    this.enableServiceAccountKeyCallable =
+        callableFactory.createUnaryCallable(
+            enableServiceAccountKeyTransportSettings,
+            settings.enableServiceAccountKeySettings(),
+            clientContext);
     this.signBlobCallable =
         callableFactory.createUnaryCallable(
             signBlobTransportSettings, settings.signBlobSettings(), clientContext);
@@ -978,6 +1036,16 @@ public UnaryCallable<DeleteServiceAccountKeyRequest, Empty> deleteServiceAccount
     return deleteServiceAccountKeyCallable;
   }
 
+  @Override
+  public UnaryCallable<DisableServiceAccountKeyRequest, Empty> disableServiceAccountKeyCallable() {
+    return disableServiceAccountKeyCallable;
+  }
+
+  @Override
+  public UnaryCallable<EnableServiceAccountKeyRequest, Empty> enableServiceAccountKeyCallable() {
+    return enableServiceAccountKeyCallable;
+  }
+
   @Override
   public UnaryCallable<SignBlobRequest, SignBlobResponse> signBlobCallable() {
     return signBlobCallable;

java-iam-admin/google-iam-admin/src/main/java/com/google/cloud/iam/admin/v1/stub/IAMStub.java

@@ -29,7 +29,9 @@
 import com.google.iam.admin.v1.DeleteRoleRequest;
 import com.google.iam.admin.v1.DeleteServiceAccountKeyRequest;
 import com.google.iam.admin.v1.DeleteServiceAccountRequest;
+import com.google.iam.admin.v1.DisableServiceAccountKeyRequest;
 import com.google.iam.admin.v1.DisableServiceAccountRequest;
+import com.google.iam.admin.v1.EnableServiceAccountKeyRequest;
 import com.google.iam.admin.v1.EnableServiceAccountRequest;
 import com.google.iam.admin.v1.GetRoleRequest;
 import com.google.iam.admin.v1.GetServiceAccountKeyRequest;
@@ -145,6 +147,14 @@ public UnaryCallable<DeleteServiceAccountKeyRequest, Empty> deleteServiceAccount
     throw new UnsupportedOperationException("Not implemented: deleteServiceAccountKeyCallable()");
   }
 
+  public UnaryCallable<DisableServiceAccountKeyRequest, Empty> disableServiceAccountKeyCallable() {
+    throw new UnsupportedOperationException("Not implemented: disableServiceAccountKeyCallable()");
+  }
+
+  public UnaryCallable<EnableServiceAccountKeyRequest, Empty> enableServiceAccountKeyCallable() {
+    throw new UnsupportedOperationException("Not implemented: enableServiceAccountKeyCallable()");
+  }
+
   @Deprecated
   public UnaryCallable<SignBlobRequest, SignBlobResponse> signBlobCallable() {
     throw new UnsupportedOperationException("Not implemented: signBlobCallable()");

java-iam-admin/google-iam-admin/src/main/java/com/google/cloud/iam/admin/v1/stub/IAMStubSettings.java

@@ -53,7 +53,9 @@
 import com.google.iam.admin.v1.DeleteRoleRequest;
 import com.google.iam.admin.v1.DeleteServiceAccountKeyRequest;
 import com.google.iam.admin.v1.DeleteServiceAccountRequest;
+import com.google.iam.admin.v1.DisableServiceAccountKeyRequest;
 import com.google.iam.admin.v1.DisableServiceAccountRequest;
+import com.google.iam.admin.v1.EnableServiceAccountKeyRequest;
 import com.google.iam.admin.v1.EnableServiceAccountRequest;
 import com.google.iam.admin.v1.GetRoleRequest;
 import com.google.iam.admin.v1.GetServiceAccountKeyRequest;
@@ -162,6 +164,10 @@ public class IAMStubSettings extends StubSettings<IAMStubSettings> {
       uploadServiceAccountKeySettings;
   private final UnaryCallSettings<DeleteServiceAccountKeyRequest, Empty>
       deleteServiceAccountKeySettings;
+  private final UnaryCallSettings<DisableServiceAccountKeyRequest, Empty>
+      disableServiceAccountKeySettings;
+  private final UnaryCallSettings<EnableServiceAccountKeyRequest, Empty>
+      enableServiceAccountKeySettings;
   private final UnaryCallSettings<SignBlobRequest, SignBlobResponse> signBlobSettings;
   private final UnaryCallSettings<SignJwtRequest, SignJwtResponse> signJwtSettings;
   private final UnaryCallSettings<GetIamPolicyRequest, Policy> getIamPolicySettings;
@@ -510,6 +516,18 @@ public UnaryCallSettings<DisableServiceAccountRequest, Empty> disableServiceAcco
     return deleteServiceAccountKeySettings;
   }
 
+  /** Returns the object with the settings used for calls to disableServiceAccountKey. */
+  public UnaryCallSettings<DisableServiceAccountKeyRequest, Empty>
+      disableServiceAccountKeySettings() {
+    return disableServiceAccountKeySettings;
+  }
+
+  /** Returns the object with the settings used for calls to enableServiceAccountKey. */
+  public UnaryCallSettings<EnableServiceAccountKeyRequest, Empty>
+      enableServiceAccountKeySettings() {
+    return enableServiceAccountKeySettings;
+  }
+
   /**
    * Returns the object with the settings used for calls to signBlob.
    *
@@ -692,6 +710,8 @@ protected IAMStubSettings(Builder settingsBuilder) throws IOException {
     createServiceAccountKeySettings = settingsBuilder.createServiceAccountKeySettings().build();
     uploadServiceAccountKeySettings = settingsBuilder.uploadServiceAccountKeySettings().build();
     deleteServiceAccountKeySettings = settingsBuilder.deleteServiceAccountKeySettings().build();
+    disableServiceAccountKeySettings = settingsBuilder.disableServiceAccountKeySettings().build();
+    enableServiceAccountKeySettings = settingsBuilder.enableServiceAccountKeySettings().build();
     signBlobSettings = settingsBuilder.signBlobSettings().build();
     signJwtSettings = settingsBuilder.signJwtSettings().build();
     getIamPolicySettings = settingsBuilder.getIamPolicySettings().build();
@@ -745,6 +765,10 @@ public static class Builder extends StubSettings.Builder<IAMStubSettings, Builde
         uploadServiceAccountKeySettings;
     private final UnaryCallSettings.Builder<DeleteServiceAccountKeyRequest, Empty>
         deleteServiceAccountKeySettings;
+    private final UnaryCallSettings.Builder<DisableServiceAccountKeyRequest, Empty>
+        disableServiceAccountKeySettings;
+    private final UnaryCallSettings.Builder<EnableServiceAccountKeyRequest, Empty>
+        enableServiceAccountKeySettings;
     private final UnaryCallSettings.Builder<SignBlobRequest, SignBlobResponse> signBlobSettings;
     private final UnaryCallSettings.Builder<SignJwtRequest, SignJwtResponse> signJwtSettings;
     private final UnaryCallSettings.Builder<GetIamPolicyRequest, Policy> getIamPolicySettings;
@@ -842,6 +866,8 @@ protected Builder(ClientContext clientContext) {
       createServiceAccountKeySettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
       uploadServiceAccountKeySettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
       deleteServiceAccountKeySettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+      disableServiceAccountKeySettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+      enableServiceAccountKeySettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
       signBlobSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
       signJwtSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
       getIamPolicySettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
@@ -876,6 +902,8 @@ protected Builder(ClientContext clientContext) {
               createServiceAccountKeySettings,
               uploadServiceAccountKeySettings,
               deleteServiceAccountKeySettings,
+              disableServiceAccountKeySettings,
+              enableServiceAccountKeySettings,
               signBlobSettings,
               signJwtSettings,
               getIamPolicySettings,
@@ -911,6 +939,8 @@ protected Builder(IAMStubSettings settings) {
       createServiceAccountKeySettings = settings.createServiceAccountKeySettings.toBuilder();
       uploadServiceAccountKeySettings = settings.uploadServiceAccountKeySettings.toBuilder();
       deleteServiceAccountKeySettings = settings.deleteServiceAccountKeySettings.toBuilder();
+      disableServiceAccountKeySettings = settings.disableServiceAccountKeySettings.toBuilder();
+      enableServiceAccountKeySettings = settings.enableServiceAccountKeySettings.toBuilder();
       signBlobSettings = settings.signBlobSettings.toBuilder();
       signJwtSettings = settings.signJwtSettings.toBuilder();
       getIamPolicySettings = settings.getIamPolicySettings.toBuilder();
@@ -943,6 +973,8 @@ protected Builder(IAMStubSettings settings) {
               createServiceAccountKeySettings,
               uploadServiceAccountKeySettings,
               deleteServiceAccountKeySettings,
+              disableServiceAccountKeySettings,
+              enableServiceAccountKeySettings,
               signBlobSettings,
               signJwtSettings,
               getIamPolicySettings,
@@ -1044,6 +1076,16 @@ private static Builder initDefaults(Builder builder) {
           .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_0_codes"))
           .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_0_params"));
 
+      builder
+          .disableServiceAccountKeySettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_params"));
+
+      builder
+          .enableServiceAccountKeySettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_params"));
+
       builder
           .signBlobSettings()
           .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
@@ -1224,6 +1266,18 @@ public Builder applyToAllUnaryMethods(
       return deleteServiceAccountKeySettings;
     }
 
+    /** Returns the builder for the settings used for calls to disableServiceAccountKey. */
+    public UnaryCallSettings.Builder<DisableServiceAccountKeyRequest, Empty>
+        disableServiceAccountKeySettings() {
+      return disableServiceAccountKeySettings;
+    }
+
+    /** Returns the builder for the settings used for calls to enableServiceAccountKey. */
+    public UnaryCallSettings.Builder<EnableServiceAccountKeyRequest, Empty>
+        enableServiceAccountKeySettings() {
+      return enableServiceAccountKeySettings;
+    }
+
     /**
      * Returns the builder for the settings used for calls to signBlob.
      *