Improved readme and created new secret specific for deleting annotations

Author: dhavalbhensdadiya-crest

secretmanager/README.md

@@ -12,7 +12,7 @@ the Secret Manager API using the Google Java API Client Libraries.
 
 ### Enable the API
 
-You must [enable the Secret Manager API](https://console.cloud.google.com/flows/enableapi?apiid=secretmanager.googleapis.com) for your project in order to use these samples
+You must enable the [Secret Manager API](https://console.cloud.google.com/flows/enableapi?apiid=secretmanager.googleapis.com) and [Cloud KMS API](https://console.cloud.google.com/flows/enableapi?apiid=cloudkms.googleapis.com) for your project in order to use these samples
 
 ### Set Environment Variables
 
@@ -30,5 +30,6 @@ You must ensure that the [user account or service account](https://cloud.google.
 
 * Secret Manager Admin (`roles/secretmanager.admin`)
 * Secret Manager Secret Accessor (`roles/secretmanager.secretAccessor`)
+* Cloud KMS Encrypter / Decrypter (`roles/cloudkms.cryptoKeyEncrypterDecrypter`) on the regional and global KMS key used for testing
 
 More information can be found in the [Secret Manager Docs](https://cloud.google.com/secret-manager/docs/access-control)

secretmanager/src/test/java/secretmanager/SnippetsIT.java

@@ -92,6 +92,7 @@ public class SnippetsIT {
   private static Secret TEST_SECRET;
   private static Secret TEST_SECRET_TO_DELETE;
   private static Secret TEST_SECRET_TO_DELETE_WITH_ETAG;
+  private static Secret TEST_SECRET_TO_DELETE_ANNOTATIONS;
   private static Secret TEST_SECRET_TO_DELAYED_DESTROY;
   private static Secret TEST_SECRET_WITH_VERSIONS;
   private static SecretName TEST_SECRET_WITH_DELAYED_DESTROY;
@@ -121,6 +122,7 @@ public static void beforeAll() throws Exception {
     TEST_SECRET = createSecret(true);
     TEST_SECRET_TO_DELETE = createSecret(false);
     TEST_SECRET_TO_DELETE_WITH_ETAG = createSecret(false);
+    TEST_SECRET_TO_DELETE_ANNOTATIONS = createSecret(true);
     TEST_SECRET_WITH_VERSIONS = createSecret(false);
     TEST_SECRET_TO_DELAYED_DESTROY = createSecret(false);
     TEST_SECRET_WITH_DELAYED_DESTROY = SecretName.of(PROJECT_ID, randomSecretId());
@@ -170,6 +172,7 @@ public static void afterAll() throws Exception {
     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_TO_DELETE_ANNOTATIONS.getName());
     deleteSecret(TEST_SECRET_WITH_VERSIONS.getName());
     deleteSecret(TEST_SECRET_WITH_DELAYED_DESTROY.toString());
     deleteSecret(TEST_SECRET_TO_DELAYED_DESTROY.getName());
@@ -600,7 +603,7 @@ public void testEditSecretAnnotations() throws IOException {
 
   @Test
   public void testDeleteSecretAnnotations() throws IOException {
-    SecretName name = SecretName.parse(TEST_SECRET.getName());
+    SecretName name = SecretName.parse(TEST_SECRET_TO_DELETE_ANNOTATIONS.getName());
     Secret updatedSecret = 
         DeleteSecretAnnotations.deleteSecretAnnotations(name.getProject(), name.getSecret());
 

secretmanager/src/test/java/secretmanager/regionalsamples/SnippetsIT.java

@@ -100,6 +100,7 @@ public class SnippetsIT {
   private static Secret TEST_REGIONAL_SECRET;
   private static Secret TEST_REGIONAL_SECRET_TO_DELETE;
   private static Secret TEST_REGIONAL_SECRET_TO_DELETE_WITH_ETAG;
+  private static Secret TEST_REGIONAL_SECRET_TO_DELETE_ANNOTATIONS;
   private static Secret TEST_REGIONAL_SECRET_WITH_VERSIONS;
   private static Secret TEST_REGIONAL_SECRET_TO_DELAYED_DESTROY;
   private static SecretName TEST_REGIONAL_SECRET_WITH_DELAYED_DESTROY;
@@ -132,6 +133,7 @@ public static void beforeAll() throws Exception {
     TEST_REGIONAL_SECRET = createRegionalSecret();
     TEST_REGIONAL_SECRET_TO_DELETE = createRegionalSecret();
     TEST_REGIONAL_SECRET_TO_DELETE_WITH_ETAG = createRegionalSecret();
+    TEST_REGIONAL_SECRET_TO_DELETE_ANNOTATIONS = createRegionalSecret();
     TEST_REGIONAL_SECRET_WITH_VERSIONS = createRegionalSecret();
     TEST_REGIONAL_SECRET_TO_DELAYED_DESTROY = createRegionalSecret();
     TEST_REGIONAL_SECRET_WITH_DELAYED_DESTROY =
@@ -190,6 +192,7 @@ public static void afterAll() throws Exception {
     deleteRegionalSecret(TEST_REGIONAL_SECRET_WITH_CMEK_TO_CREATE_NAME.toString());
     deleteRegionalSecret(TEST_REGIONAL_SECRET_TO_DELETE.getName());
     deleteRegionalSecret(TEST_REGIONAL_SECRET_TO_DELETE_WITH_ETAG.getName());
+    deleteRegionalSecret(TEST_REGIONAL_SECRET_TO_DELETE_ANNOTATIONS.getName());
     deleteRegionalSecret(TEST_REGIONAL_SECRET_WITH_VERSIONS.getName());
     deleteRegionalSecret(TEST_REGIONAL_SECRET_WITH_DELAYED_DESTROY.toString());
     deleteRegionalSecret(TEST_REGIONAL_SECRET_TO_DELAYED_DESTROY.getName());
@@ -703,7 +706,7 @@ public void testEditSecretAnnotations() throws IOException {
 
   @Test
   public void testDeleteRegionalSecretAnnotations() throws IOException {
-    SecretName name = SecretName.parse(TEST_REGIONAL_SECRET.getName());
+    SecretName name = SecretName.parse(TEST_REGIONAL_SECRET_TO_DELETE_ANNOTATIONS.getName());
     Secret updatedSecret = DeleteRegionalSecretAnnotations.deleteRegionalSecretAnnotations(
         name.getProject(), name.getLocation(), name.getSecret());