Merge branch 'main' into release-please--branches--main

Author: blakeli0

.github/workflows/librarian_generation_check.yaml

@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-name: Librarian generate diff check on pull requests
+name: Librarian - Generate diff check on pull requests
 on:
   pull_request:
 

.github/workflows/showcase-version-check.yaml

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-name: Showcase Version Check
+name: Librarian - Showcase Version Check
 
 on:
   schedule:

.github/workflows/update_librarian_googleapis.yaml

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-name: Update librarian googleapis commitish
+name: Librarian - Update googleapis commitish and generate all
 on:
   schedule:
   - cron: '0 3 * * *' # Run once a day at 3:00 AM UTC
@@ -85,6 +85,7 @@ jobs:
           echo "has_changes=true" >> $GITHUB_OUTPUT
         fi
     - name: Install protoc
+      if: steps.detect_librarian.outputs.has_changes == 'true'
       run: |
         set -e
         VERSION="33.2"
@@ -93,42 +94,37 @@ jobs:
         sudo unzip -o /tmp/protoc.zip
         protoc --version
     - uses: actions/setup-java@v4
+      if: steps.detect_librarian.outputs.has_changes == 'true'
       with:
         java-version: "17"
         distribution: "temurin"
         cache: "maven"
     - name: Verify Java and Maven installation
+      if: steps.detect_librarian.outputs.has_changes == 'true'
       run: |
         java -version
         if ! command -v mvn &> /dev/null; then
           sudo apt-get update && sudo apt-get install -y maven
         fi
         mvn -version
     - uses: actions/setup-python@v5
+      if: steps.detect_librarian.outputs.has_changes == 'true'
       with:
         python-version: "3.12"
         cache: 'pip'
     - name: Run librarian install
+      if: steps.detect_librarian.outputs.has_changes == 'true'
       run: |
         go run github.com/googleapis/librarian/cmd/librarian@latest install
         echo "$HOME/java_tools/bin" >> $GITHUB_PATH
       env:
         PYTHONPATH: ${{ github.workspace }}/sdk-platform-java/hermetic_build/library_generation/owlbot
     - name: Generate Libraries
       if: steps.detect_librarian.outputs.has_changes == 'true'
-      id: generate
       run: |
         go run github.com/googleapis/librarian/cmd/librarian@latest generate --all
-        git add .
-        changed_files=$(git diff --cached --name-only)
-        if [[ "${changed_files}" == "" ]]; then
-          echo "has_changes=false" >> $GITHUB_OUTPUT
-          echo "No changes in libraries"
-        else
-          echo "has_changes=true" >> $GITHUB_OUTPUT
-        fi
     - name: Commit and Create PR
-      if: steps.detect_librarian.outputs.has_changes == 'true' || steps.generate.outputs.has_changes == 'true'
+      if: steps.detect_librarian.outputs.has_changes == 'true'
       env:
         GH_TOKEN: ${{ secrets.CLOUD_JAVA_BOT_GITHUB_TOKEN }}
         PR_TITLE: "chore: update googleapis commitish to ${{ steps.commit.outputs.short_commit }}"
@@ -139,7 +135,7 @@ jobs:
         if [ "${{ github.event_name }}" = "pull_request" ]; then
           echo "=== PR Test: DRY RUN MODE ACTIVE ==="
           echo "Would have checked out branch: update-librarian-googleapis-main"
-          echo "Would have committed with title: $PR_TITLE"
+          echo "Would have committed configs with title: $PR_TITLE"
           echo "Would have pushed branch and created PR."
           exit 0
         fi
@@ -153,8 +149,22 @@ jobs:
         # Create and switch to the branch (force checkout -B to discard any local state on this branch name if it existed)
         git checkout -B "${current_branch}"
         
-        # Commit the changes (they are already staged by the Detect Changes step!)
-        git commit -m "${PR_TITLE}"
+        # 1. Commit Config Changes
+        # Ensure they are staged
+        git add librarian.yaml generation_config.yaml
+        if ! git diff --cached --quiet; then
+          git commit -m "${PR_TITLE}"
+        else
+          echo "No config changes to commit"
+        fi
+        
+        # 2. Commit Generated Code
+        git add .
+        if ! git diff --cached --quiet; then
+          git commit -m "chore: generate libraries"
+        else
+          echo "No generated code changes to commit"
+        fi
         
         # Push to remote (force push to overwrite any stale branch on remote)
         git remote add remote_repo https://cloud-java-bot:"${GH_TOKEN}@github.com/${{ github.repository }}.git" || git remote set-url remote_repo https://cloud-java-bot:"${GH_TOKEN}@github.com/${{ github.repository }}.git"

generation_config.yaml

@@ -1442,7 +1442,7 @@ libraries:
   GAPICs:
   - proto_path: google/iam/admin/v1
 - api_shortname: iam-policy
-  name_pretty: IAM
+  name_pretty: Cloud IAM Policy
   product_documentation: n/a
   api_description: n/a
   release_level: stable

java-bigtable/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClient.java

@@ -125,7 +125,7 @@
 public final class BigtableInstanceAdminClient implements AutoCloseable {
   private final String projectId;
   private final BigtableInstanceAdminStub stub;
-  private final BaseBigtableInstanceAdminClient baseClient;
+  private final BigtableInstanceAdminClientV2 v2Client;
 
   /** Constructs an instance of BigtableInstanceAdminClient with the given project ID. */
   public static BigtableInstanceAdminClient create(@Nonnull String projectId) throws IOException {
@@ -148,7 +148,7 @@ private BigtableInstanceAdminClient(
       @Nonnull String projectId, @Nonnull BigtableInstanceAdminStub stub) {
     this.projectId = projectId;
     this.stub = stub;
-    this.baseClient = BaseBigtableInstanceAdminClient.create(stub);
+    this.v2Client = new BigtableInstanceAdminClientV2(stub);
   }
 
   /** Gets the project ID this client is associated with. */
@@ -157,11 +157,11 @@ public String getProjectId() {
   }
 
   /**
-   * Returns the modern autogenerated client. This provides access to the newest features and
-   * proto-based methods.
+   * Returns the modern V2 client. This provides access to the newest features and proto-based
+   * methods.
    */
-  public BaseBigtableInstanceAdminClient getBaseClient() {
-    return baseClient;
+  public BigtableInstanceAdminClientV2 getBaseClient() {
+    return v2Client;
   }
 
   /** Closes the client and frees all resources associated with it (like thread pools). */

java-bigtable/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClient.java

@@ -89,6 +89,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ScheduledExecutorService;
 import javax.annotation.Nonnull;
 
 /**
@@ -169,7 +170,7 @@ public final class BigtableTableAdminClient implements AutoCloseable {
   private final EnhancedBigtableTableAdminStub stub;
   private final String projectId;
   private final String instanceId;
-  private final BaseBigtableTableAdminClient baseClient;
+  private BigtableTableAdminClientV2 v2Client;
 
   /** Constructs an instance of BigtableTableAdminClient with the given project and instance IDs. */
   public static BigtableTableAdminClient create(
@@ -209,7 +210,6 @@ private BigtableTableAdminClient(
     this.projectId = projectId;
     this.instanceId = instanceId;
     this.stub = stub;
-    this.baseClient = BaseBigtableTableAdminClient.create(stub);
   }
 
   /** Gets the project ID of the instance whose tables this client manages. */
@@ -223,11 +223,29 @@ public String getInstanceId() {
   }
 
   /**
-   * Returns the modern autogenerated client. This provides access to the newest features and
-   * proto-based methods.
-   */
-  public BaseBigtableTableAdminClient getBaseClient() {
-    return baseClient;
+   * Returns the modern V2 client. This provides access to the newest features and proto-based
+   * methods.
+   */
+  public synchronized BigtableTableAdminClientV2 getBaseClient() {
+    if (v2Client == null) {
+      ScheduledExecutorService backgroundExecutor =
+          stub.getSettings().getBackgroundExecutorProvider().getExecutor();
+      boolean shouldAutoClose =
+          stub.getSettings().getBackgroundExecutorProvider().shouldAutoClose();
+
+      try {
+        v2Client =
+            BigtableTableAdminClientV2.create(
+                stub,
+                stub.getSettings(),
+                stub.getClientContext().getClock(),
+                backgroundExecutor,
+                shouldAutoClose);
+      } catch (IOException e) {
+        throw new IllegalStateException("Failed to initialize modern V2 table admin client", e);
+      }
+    }
+    return v2Client;
   }
 
   @Override

java-bigtable/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClientV2.java

@@ -108,7 +108,8 @@ public static final BigtableTableAdminClientV2 create(BaseBigtableTableAdminSett
 
     OperationCallable<Void, Empty, OptimizeRestoredTableMetadata>
         optimizeRestoredTableOperationBaseCallable =
-            createOptimizeRestoredTableOperationBaseCallable(stub, settings, backgroundExecutor);
+            createOptimizeRestoredTableOperationBaseCallable(
+                stub, settings.getStubSettings().getClock(), backgroundExecutor);
 
     return new BigtableTableAdminClientV2(
         stub,
@@ -118,6 +119,34 @@ public static final BigtableTableAdminClientV2 create(BaseBigtableTableAdminSett
         optimizeRestoredTableOperationBaseCallable);
   }
 
+  /**
+   * Package-private factory method to construct an instance of {@link BigtableTableAdminClientV2}
+   * by reusing an existing stub, settings, clock, and background executor.
+   *
+   * <p>This is used by the legacy {@code BigtableTableAdminClient}'s escape hatch ({@code
+   * getBaseClient()}) to wrap the legacy client's active stub, ensuring the underlying gRPC channel
+   * and resources are shared rather than recreated.
+   */
+  static BigtableTableAdminClientV2 create(
+      GrpcBigtableTableAdminStub stub,
+      BigtableTableAdminStubSettings settings,
+      ApiClock clock,
+      ScheduledExecutorService backgroundExecutor,
+      boolean shouldAutoClose)
+      throws IOException {
+    AwaitConsistencyCallableV2 awaitConsistencyCallable =
+        createAwaitConsistencyCallable(stub, settings, clock, backgroundExecutor);
+    OperationCallable<Void, Empty, OptimizeRestoredTableMetadata>
+        optimizeRestoredTableOperationBaseCallable =
+            createOptimizeRestoredTableOperationBaseCallable(stub, clock, backgroundExecutor);
+    return new BigtableTableAdminClientV2(
+        stub,
+        backgroundExecutor,
+        shouldAutoClose,
+        awaitConsistencyCallable,
+        optimizeRestoredTableOperationBaseCallable);
+  }
+
   protected BigtableTableAdminClientV2(
       GrpcBigtableTableAdminStub stub,
       @Nullable ScheduledExecutorService backgroundExecutor,
@@ -156,7 +185,7 @@ private static AwaitConsistencyCallableV2 createAwaitConsistencyCallable(
   private static OperationCallable<Void, Empty, OptimizeRestoredTableMetadata>
       createOptimizeRestoredTableOperationBaseCallable(
           GrpcBigtableTableAdminStub stub,
-          BaseBigtableTableAdminSettings settings,
+          ApiClock clock,
           ScheduledExecutorService backgroundExecutor)
           throws IOException {
 
@@ -229,7 +258,7 @@ public Empty apply(OperationSnapshot input) {
     // (including channels, credentials, and headers) for executing the polling RPCs.
     ClientContext clientContext =
         ClientContext.newBuilder()
-            .setClock(settings.getStubSettings().getClock())
+            .setClock(clock)
             .setExecutor(backgroundExecutor)
             .setDefaultCallContext(GrpcCallContext.createDefault())
             .build();

java-bigtable/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/EnhancedBigtableTableAdminStub.java

@@ -245,4 +245,12 @@ public UnaryCallable<ConsistencyRequest, Void> awaitConsistencyCallable() {
       awaitOptimizeRestoredTableCallable() {
     return optimizeRestoredTableOperationBaseCallable;
   }
+
+  public BigtableTableAdminStubSettings getSettings() {
+    return settings;
+  }
+
+  public ClientContext getClientContext() {
+    return clientContext;
+  }
 }

java-datastore/datastore-v1-proto-client/pom.xml

@@ -107,6 +107,11 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>com.google.api</groupId>
+      <artifactId>gax</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>