Sm tags (#10119)

vipul7499 · gemini-code-assist[bot] · web-flow · commit 5d5f26f5e10b · 2025-07-03T16:19:58.000+05:30
* feat(secretmanager): added samples for tags

* Testing latest SM version

* Testing latest SM version

* Testing latest SM version

* feat(secretmanager):fixed tests

* feat(secretmanager):fixed indentation

* fixed tests

* fixed tests

* fixed tests

* fixed tests

* Update secretmanager/src/main/java/secretmanager/CreateSecretWithTags.java

Co-authored-by: gemini-code-assist[bot] &lt;176961590+gemini-code-assist[bot]@users.noreply.github.com&gt;

* Update secretmanager/src/main/java/secretmanager/regionalsamples/CreateRegionalSecretWithTags.java

Co-authored-by: gemini-code-assist[bot] &lt;176961590+gemini-code-assist[bot]@users.noreply.github.com&gt;

* fixed pom

* fix indentation

---------

Co-authored-by: gemini-code-assist[bot] &lt;176961590+gemini-code-assist[bot]@users.noreply.github.com&gt;
diff --git a/secretmanager/pom.xml b/secretmanager/pom.xml
@@ -45,7 +45,7 @@
         <groupId>com.google.cloud</groupId>
         <scope>import</scope>
         <type>pom</type>
-        <version>26.42.0</version>
+        <version>26.62.0</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -54,8 +54,17 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-secretmanager</artifactId>
+      <version>2.66.0</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.api.grpc</groupId>
+      <artifactId>proto-google-cloud-secretmanager-v1</artifactId>
+      <version>2.66.0</version>
+    </dependency>
+    <dependency>
+        <groupId>com.google.cloud</groupId>
+        <artifactId>google-cloud-resourcemanager</artifactId>
     </dependency>
-
     <dependency>
       <groupId>com.google.protobuf</groupId>
       <artifactId>protobuf-java-util</artifactId>
diff --git a/secretmanager/src/main/java/secretmanager/CreateSecretWithTags.java b/secretmanager/src/main/java/secretmanager/CreateSecretWithTags.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
+ */
+
+package secretmanager;
+
+// [START secretmanager_create_secret_with_tags]
+import com.google.cloud.secretmanager.v1.ProjectName;
+import com.google.cloud.secretmanager.v1.Replication;
+import com.google.cloud.secretmanager.v1.Secret;
+import com.google.cloud.secretmanager.v1.SecretManagerServiceClient;
+import java.io.IOException;
+
+public class CreateSecretWithTags {
+
+  public static void createSecretWithTags() throws IOException {
+    // TODO(developer): Replace these variables before running the sample.
+    
+    // This is the id of the GCP project
+    String projectId = "your-project-id";
+    // This is the id of the secret to act on
+    String secretId = "your-secret-id";
+    // This is the key of the tag to be added
+    String tagKey = "your-tag-key";
+    // This is the value of the tag to be added
+    String tagValue = "your-tag-value";
+    createSecretWithTags(projectId, secretId, tagKey, tagValue);
+  }
+
+  // Create a secret with tags.
+  public static Secret createSecretWithTags(
+       String projectId, String secretId, String tagKey, String tagValue) throws IOException {
+    // Initialize client that will be used to send requests. This client only needs to be created
+    // once, and can be reused for multiple requests.
+    try (SecretManagerServiceClient client = SecretManagerServiceClient.create()) {
+      
+      // Build the name.
+      ProjectName projectName = ProjectName.of(projectId);
+
+      // Build the secret to create with tags.
+      Secret secret =
+          Secret.newBuilder()
+          .setReplication(
+              Replication.newBuilder()
+                  .setAutomatic(Replication.Automatic.newBuilder().build())
+                  .build())
+          .putTags(tagKey, tagValue)
+          .build();
+
+      // Create the secret.
+      Secret createdSecret = client.createSecret(projectName, secretId, secret);
+      System.out.printf("Created secret with Tags %s\n", createdSecret.getName());
+      return createdSecret;
+    }
+  }
+}
+// [END secretmanager_create_secret_with_tags]
diff --git a/secretmanager/src/main/java/secretmanager/regionalsamples/CreateRegionalSecretWithTags.java b/secretmanager/src/main/java/secretmanager/regionalsamples/CreateRegionalSecretWithTags.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
+ */
+
+package secretmanager.regionalsamples;
+
+// [START secretmanager_create_regional_secret_with_tags]
+import com.google.cloud.secretmanager.v1.LocationName;
+import com.google.cloud.secretmanager.v1.Secret;
+import com.google.cloud.secretmanager.v1.SecretManagerServiceClient;
+import com.google.cloud.secretmanager.v1.SecretManagerServiceSettings;
+import java.io.IOException;
+
+public class CreateRegionalSecretWithTags {
+
+  public static void createRegionalSecretWithTags() throws IOException {
+    // TODO(developer): Replace these variables before running the sample.
+    
+    // This is the id of the GCP project
+    String projectId = "your-project-id";
+    // Location of the secret.
+    String locationId = "your-location-id";
+    // This is the id of the secret to act on
+    String secretId = "your-secret-id";
+    // This is the key of the tag to be added
+    String tagKey = "your-tag-key";
+    // This is the value of the tag to be added
+    String tagValue = "your-tag-value";
+    createRegionalSecretWithTags(projectId, locationId, secretId, tagKey, tagValue);
+  }
+
+  // Create a secret with tags.
+  public static Secret createRegionalSecretWithTags(
+       String projectId,
+       String locationId,
+       String secretId,
+       String tagKey,
+       String tagValue)
+      throws IOException {
+    
+    // Endpoint to call the regional secret manager sever
+    String apiEndpoint = String.format("secretmanager.%s.rep.googleapis.com:443", locationId);
+    SecretManagerServiceSettings secretManagerServiceSettings =
+        SecretManagerServiceSettings.newBuilder().setEndpoint(apiEndpoint).build();
+
+    // Initialize client that will be used to send requests. This client only needs to be created
+    // once, and can be reused for multiple requests.
+    try (SecretManagerServiceClient client = 
+        SecretManagerServiceClient.create(secretManagerServiceSettings)) {
+      
+      // Build the parent name from the project.
+      LocationName location = LocationName.of(projectId, locationId);
+
+      // Build the secret to create with tags.
+      Secret secret =
+          Secret.newBuilder()
+            .putTags(tagKey, tagValue)
+            .build();
+
+      // Create the secret.
+      Secret createdSecret = client.createSecret(location.toString(), secretId, secret);
+      System.out.printf("Created secret with Tags%s\n", createdSecret.getName());
+      return createdSecret;
+    }
+  }
+}
+// [END secretmanager_create_regional_secret_with_tags]
diff --git a/secretmanager/src/test/java/secretmanager/SnippetsIT.java b/secretmanager/src/test/java/secretmanager/SnippetsIT.java
@@ -19,6 +19,19 @@
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.assertFalse;
 
+import com.google.api.gax.longrunning.OperationFuture;
+import com.google.cloud.resourcemanager.v3.CreateTagKeyMetadata;
+import com.google.cloud.resourcemanager.v3.CreateTagKeyRequest;
+import com.google.cloud.resourcemanager.v3.CreateTagValueMetadata;
+import com.google.cloud.resourcemanager.v3.CreateTagValueRequest;
+import com.google.cloud.resourcemanager.v3.DeleteTagKeyMetadata;
+import com.google.cloud.resourcemanager.v3.DeleteTagKeyRequest;
+import com.google.cloud.resourcemanager.v3.DeleteTagValueMetadata;
+import com.google.cloud.resourcemanager.v3.DeleteTagValueRequest;
+import com.google.cloud.resourcemanager.v3.TagKey;
+import com.google.cloud.resourcemanager.v3.TagKeysClient;
+import com.google.cloud.resourcemanager.v3.TagValue;
+import com.google.cloud.resourcemanager.v3.TagValuesClient;
 import com.google.cloud.secretmanager.v1.AddSecretVersionRequest;
 import com.google.cloud.secretmanager.v1.CreateSecretRequest;
 import com.google.cloud.secretmanager.v1.DeleteSecretRequest;
@@ -36,6 +49,7 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.PrintStream;
+import java.lang.Exception;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Base64;
@@ -78,6 +92,7 @@ public class SnippetsIT {
   private static Secret TEST_SECRET_WITH_VERSIONS;
   private static SecretName TEST_SECRET_TO_CREATE_NAME;
   private static SecretName TEST_SECRET_WITH_LABEL_TO_CREATE_NAME;
+  private static SecretName TEST_SECRET_WITH_TAGS_TO_CREATE_NAME;
   private static SecretName TEST_SECRET_WITH_ANNOTATION_TO_CREATE_NAME;
   private static SecretName TEST_UMMR_SECRET_TO_CREATE_NAME;
   private static SecretVersion TEST_SECRET_VERSION;
@@ -88,10 +103,13 @@ public class SnippetsIT {
   private static SecretVersion TEST_SECRET_VERSION_TO_ENABLE;
   private static SecretVersion TEST_SECRET_VERSION_TO_ENABLE_WITH_ETAG;
 
+  private static TagKey TAG_KEY;
+  private static TagValue TAG_VALUE;
+
   private ByteArrayOutputStream stdOut;
 
   @BeforeClass
-  public static void beforeAll() throws IOException {
+  public static void beforeAll() throws Exception {
     Assert.assertFalse("missing GOOGLE_CLOUD_PROJECT", Strings.isNullOrEmpty(PROJECT_ID));
 
     TEST_SECRET = createSecret(true);
@@ -100,6 +118,7 @@ public static void beforeAll() throws IOException {
     TEST_SECRET_WITH_VERSIONS = createSecret(false);
     TEST_SECRET_TO_CREATE_NAME = SecretName.of(PROJECT_ID, randomSecretId());
     TEST_UMMR_SECRET_TO_CREATE_NAME = SecretName.of(PROJECT_ID, randomSecretId());
+    TEST_SECRET_WITH_TAGS_TO_CREATE_NAME = SecretName.of(PROJECT_ID, randomSecretId());
     TEST_SECRET_WITH_LABEL_TO_CREATE_NAME = SecretName.of(PROJECT_ID, randomSecretId());
     TEST_SECRET_WITH_ANNOTATION_TO_CREATE_NAME = SecretName.of(PROJECT_ID, randomSecretId());
 
@@ -113,6 +132,7 @@ public static void beforeAll() throws IOException {
     disableSecretVersion(TEST_SECRET_VERSION_TO_ENABLE);
     TEST_SECRET_VERSION_TO_ENABLE_WITH_ETAG = disableSecretVersion(
         TEST_SECRET_VERSION_TO_ENABLE_WITH_ETAG);
+    createTags();
   }
 
   @Before
@@ -128,24 +148,86 @@ public void afterEach() {
   }
 
   @AfterClass
-  public static void afterAll() throws IOException {
+  public static void afterAll() throws Exception {
     Assert.assertFalse("missing GOOGLE_CLOUD_PROJECT", Strings.isNullOrEmpty(PROJECT_ID));
 
     deleteSecret(TEST_SECRET.getName());
     deleteSecret(TEST_SECRET_TO_CREATE_NAME.toString());
+    deleteSecret(TEST_SECRET_WITH_TAGS_TO_CREATE_NAME.toString());
     deleteSecret(TEST_SECRET_WITH_LABEL_TO_CREATE_NAME.toString());
     deleteSecret(TEST_SECRET_WITH_ANNOTATION_TO_CREATE_NAME.toString());
     deleteSecret(TEST_UMMR_SECRET_TO_CREATE_NAME.toString());
     deleteSecret(TEST_SECRET_TO_DELETE.getName());
     deleteSecret(TEST_SECRET_TO_DELETE_WITH_ETAG.getName());
     deleteSecret(TEST_SECRET_WITH_VERSIONS.getName());
+    deleteTags();
   }
 
   private static String randomSecretId() {
     Random random = new Random();
     return "java-" + random.nextLong();
   }
 
+  private static void createTags() throws Exception {
+    try (TagKeysClient tagKeysClient = TagKeysClient.create()) {
+      Random random = new Random();
+      ProjectName parent = ProjectName.of(PROJECT_ID);
+      CreateTagKeyRequest request =
+          CreateTagKeyRequest.newBuilder()
+              .setTagKey(
+                TagKey
+                .newBuilder()
+                .setParent(parent.toString())
+                .setShortName("java-" + random.nextLong())
+                .build())
+              .build();
+      OperationFuture<TagKey, CreateTagKeyMetadata> future =
+          tagKeysClient.createTagKeyOperationCallable().futureCall(request);
+      TagKey response = future.get();
+      TAG_KEY = response;
+    }
+
+    try (TagValuesClient tagValuesClient = TagValuesClient.create()) {
+      Random random = new Random();
+      CreateTagValueRequest request =
+          CreateTagValueRequest.newBuilder()
+              .setTagValue(
+                TagValue
+                .newBuilder()
+                .setParent(TAG_KEY.getName())
+                .setShortName("java-" + random.nextLong())
+                .build())
+              .build();
+      OperationFuture<TagValue, CreateTagValueMetadata> future =
+          tagValuesClient.createTagValueOperationCallable().futureCall(request);
+      TagValue response = future.get();
+      TAG_VALUE = response;
+    }
+  }
+
+  private static void deleteTags() throws Exception {
+    Thread.sleep(60000); 
+    try (TagValuesClient tagValuesClient = TagValuesClient.create()) {
+      DeleteTagValueRequest request =
+          DeleteTagValueRequest.newBuilder()
+              .setName(TAG_VALUE.getName())
+              .build();
+      OperationFuture<TagValue, DeleteTagValueMetadata> future =
+          tagValuesClient.deleteTagValueOperationCallable().futureCall(request);
+      TagValue response = future.get();
+    }
+
+    try (TagKeysClient tagKeysClient = TagKeysClient.create()) {
+      DeleteTagKeyRequest request =
+          DeleteTagKeyRequest.newBuilder()
+              .setName(TAG_KEY.getName())
+              .build();
+      OperationFuture<TagKey, DeleteTagKeyMetadata> future =
+          tagKeysClient.deleteTagKeyOperationCallable().futureCall(request);
+      TagKey response = future.get();
+    }
+  }
+
   private static Secret createSecret(boolean addAnnotation) throws IOException {
     ProjectName parent = ProjectName.of(PROJECT_ID);
 
@@ -257,6 +339,19 @@ public void testCreateSecretWithLabel() throws IOException {
     assertThat(secret.getLabelsMap()).containsEntry(LABEL_KEY, LABEL_VALUE);
   }
 
+  @Test
+  public void testCreateSecretWithTag() throws IOException {
+    SecretName name = TEST_SECRET_WITH_TAGS_TO_CREATE_NAME;
+    Secret secret = CreateSecretWithTags.createSecretWithTags(
+        name.getProject(),
+        name.getSecret(),
+        TAG_KEY.getName(),
+        TAG_VALUE.getName()
+    );
+
+    assertThat(stdOut.toString()).contains("Created secret with Tags");
+  }
+
   @Test
   public void testCreateSecretWithAnnotations() throws IOException {
     SecretName name = TEST_SECRET_WITH_ANNOTATION_TO_CREATE_NAME;
diff --git a/secretmanager/src/test/java/secretmanager/regionalsamples/SnippetsIT.java b/secretmanager/src/test/java/secretmanager/regionalsamples/SnippetsIT.java
