Merge branch 'main' into renovate/shared-dependencies

Author: mutianf

google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/BulkMutateIT.java

@@ -210,10 +210,10 @@ public void testManyMutationsOnAuthorizedView() throws IOException, InterruptedE
         .bulkMutateRowsSettings()
         .setBatchingSettings(
             batchingSettings.toBuilder().setDelayThreshold(Duration.ofHours(1)).build());
-    try (BigtableDataClient client = BigtableDataClient.create(settings);
-        Batcher<RowMutationEntry, Void> batcher =
-            client.newBulkMutationBatcher(
-                AuthorizedViewId.of(testEnvRule.env().getTableId(), testAuthorizedView.getId()))) {
+    try (BigtableDataClient client = BigtableDataClient.create(settings)) {
+      Batcher<RowMutationEntry, Void> batcher =
+          client.newBulkMutationBatcher(
+              AuthorizedViewId.of(testEnvRule.env().getTableId(), testAuthorizedView.getId()));
       String familyId = testEnvRule.env().getFamilyId();
       for (int i = 0; i < 2; i++) {
         String key = rowPrefix + "test-key";
@@ -232,26 +232,21 @@ public void testManyMutationsOnAuthorizedView() throws IOException, InterruptedE
               .first()
               .call(Query.create(testEnvRule.env().getTableId()).rowKey(rowPrefix + "test-key"));
       assertThat(row.getCells()).hasSize(100002);
-    }
 
-    // We should not be able to mutate rows outside the authorized view
-    try {
-      try (BigtableDataClient client = BigtableDataClient.create(settings);
-          Batcher<RowMutationEntry, Void> batcherOutsideAuthorizedView =
-              client.newBulkMutationBatcher(
-                  AuthorizedViewId.of(
-                      testEnvRule.env().getTableId().getTableId(), testAuthorizedView.getId()))) {
-        String keyOutsideAuthorizedView = UUID.randomUUID() + "-outside-authorized-view";
-        RowMutationEntry rowMutationEntry = RowMutationEntry.create(keyOutsideAuthorizedView);
-        rowMutationEntry.setCell(
-            testEnvRule.env().getFamilyId(), AUTHORIZED_VIEW_COLUMN_QUALIFIER, "test-value");
-        @SuppressWarnings("UnusedVariable")
-        ApiFuture<Void> ignored = batcherOutsideAuthorizedView.add(rowMutationEntry);
-        batcherOutsideAuthorizedView.flush();
+      // We should not be able to mutate rows outside the authorized view
+      String keyOutsideAuthorizedView = UUID.randomUUID() + "-outside-authorized-view";
+      RowMutationEntry rowMutationEntry = RowMutationEntry.create(keyOutsideAuthorizedView);
+      rowMutationEntry.setCell(
+          testEnvRule.env().getFamilyId(), AUTHORIZED_VIEW_COLUMN_QUALIFIER, "test-value");
+      try {
+        ApiFuture<Void> ignored = batcher.add(rowMutationEntry);
+        batcher.flush();
+        // error message  is only thrown when closing the batcher
+        batcher.close();
+        fail("Should not be able to apply bulk mutation on rows outside authorized view");
+      } catch (Exception e) {
+        // ignore
       }
-      fail("Should not be able to apply bulk mutation on rows outside authorized view");
-    } catch (Exception e) {
-      // Ignore.
     }
 
     testEnvRule

samples/snippets/src/main/java/com/example/bigtable/InstanceAdminExample.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google Inc.
+ * Copyright 2026 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,7 +41,7 @@
  * delete Cloud Bigtable Instances and Clusters.
  *
  * <ul>
- *   <li>creates production instance
+ *   <li>creates production instance (optionally with tags)
  *   <li>lists instances
  *   <li>gets instance
  *   <li>lists clusters
@@ -60,15 +60,22 @@ public class InstanceAdminExample {
 
   public static void main(String[] args) throws IOException {
 
-    if (args.length != 1) {
-      System.out.println("Missing required project id");
+    if (args.length < 1 || args.length > 2) {
+      System.out.println("Usage: java InstanceAdminExample <project-id> [createWithTags]");
+      System.out.println("  <project-id>: The Google Cloud project ID");
+      System.out.println(
+          "  [createWithTags]: Optional boolean (true/false) to enable resource tags on creation");
       return;
     }
     String projectId = args[0];
+    boolean createWithTags = false;
+    if (args.length == 2) {
+      createWithTags = Boolean.parseBoolean(args[1]);
+    }
 
     InstanceAdminExample instanceAdmin =
         new InstanceAdminExample(projectId, "ssd-instance", "ssd-cluster");
-    instanceAdmin.run();
+    instanceAdmin.run(createWithTags);
   }
 
   public InstanceAdminExample(String projectId, String instanceId, String clusterId)
@@ -85,8 +92,8 @@ public InstanceAdminExample(String projectId, String instanceId, String clusterI
     adminClient = BigtableInstanceAdminClient.create(instanceAdminSettings);
   }
 
-  public void run() {
-    createProdInstance();
+  public void run(boolean createWithTags) {
+    createProdInstance(createWithTags);
     listInstances();
     getInstance();
     listClusters();
@@ -101,21 +108,40 @@ void close() {
     adminClient.close();
   }
 
-  /** Demonstrates how to create a Production instance within a provided project. */
-  public void createProdInstance() {
+  /**
+   * Demonstrates how to create an instance within a provided project.
+   *
+   * @param createWithTags If true, adds placeholder tags to the instance.
+   *     <p>Tags are a way to organize and govern resources across Google Cloud, see [Creating and
+   *     managing tags](https://docs.cloud.google.com/resource-manager/docs/tags/tags-overview)
+   *     <p>NOTE: Unlike labels, a tag (key and value) must be created before it can be attached to
+   *     a resource. See [Creating and managing
+   *     tags](https://docs.cloud.google.com/resource-manager/docs/tags/tags-overview) and [Tags
+   *     overview](https://docs.cloud.google.com/bigtable/docs/tags) for more information.
+   */
+  public void createProdInstance(boolean createWithTags) {
     // Checks if instance exists, creates instance if does not exists.
     if (!adminClient.exists(instanceId)) {
       System.out.println("Instance does not exist, creating a PRODUCTION instance");
       // [START bigtable_create_prod_instance]
       // Creates a Production Instance with the ID "ssd-instance",
       // cluster id "ssd-cluster", 3 nodes and location "us-central1-f".
       String parent = "projects/" + projectId;
-      Instance instanceObj =
+      Instance.Builder instanceObjBuilder =
           Instance.newBuilder()
               .setDisplayName(instanceId)
               .setType(Instance.Type.PRODUCTION)
-              .putLabels("department", "accounting")
-              .build();
+              .putLabels("department", "accounting");
+
+      if (createWithTags) {
+        System.out.println("Enabling tags for instance creation.");
+        // These are placeholders. You must create these in your GCP Organization/Project first.
+        String tagKey = "tagKeys/12345";
+        String tagValue = "tagValues/6789";
+        instanceObjBuilder.putTags(tagKey, tagValue);
+      }
+      Instance instanceObj = instanceObjBuilder.build();
+
       Cluster clusterObj =
           Cluster.newBuilder()
               .setLocation("projects/" + projectId + "/locations/us-central1-f")

samples/snippets/src/test/java/com/example/bigtable/InstanceAdminExampleTest.java

@@ -88,7 +88,7 @@ public void testCreateAndDeleteInstance() throws IOException {
     String testCluster = generateId();
     InstanceAdminExample testInstanceAdmin =
         new InstanceAdminExample(projectId, testInstance, testCluster);
-    testInstanceAdmin.createProdInstance();
+    testInstanceAdmin.createProdInstance(false);
     assertTrue(adminClient.exists(testInstance));
 
     // Deletes an instance.
@@ -121,7 +121,7 @@ public void testAddAndDeleteCluster() {
 
   @Test
   public void testRunDoesNotFail() {
-    instanceAdmin.run();
+    instanceAdmin.run(false);
   }
 
   private static String generateId() {