Add AfterClass method to cleanup DLP Triggers and Templates (GoogleCloudPlatform#2576)

shubha-rajan · web-flow · commit 5ece91845538 · 2020-04-06T13:55:36.000-07:00
* add AfterClass method to cleanup job triggers and templates

* delete only the jobs created in the tests
diff --git a/dlp/src/main/java/dlp/snippets/TriggersList.java b/dlp/src/main/java/dlp/snippets/TriggersList.java
@@ -44,7 +44,7 @@ public static void listTriggers(String projectId) throws Exception {
       DlpServiceClient.ListJobTriggersPagedResponse response =
           dlpServiceClient.listJobTriggers(listJobTriggersRequest);
 
-      // Parse the response and prpcess the results
+      // Parse the response and process the results
       System.out.println("DLP triggers found:");
       for (JobTrigger trigger : response.getPage().getValues()) {
         System.out.println("Trigger: " + trigger.getName());
diff --git a/dlp/src/test/java/dlp/snippets/TemplatesTests.java b/dlp/src/test/java/dlp/snippets/TemplatesTests.java
@@ -21,10 +21,13 @@
 import static org.junit.Assert.assertThat;
 
 import com.google.cloud.dlp.v2.DlpServiceClient;
+import com.google.cloud.dlp.v2.DlpServiceClient.ListInspectTemplatesPagedResponse;
 import com.google.privacy.dlp.v2.CreateInspectTemplateRequest;
+import com.google.privacy.dlp.v2.DeleteInspectTemplateRequest;
 import com.google.privacy.dlp.v2.InfoType;
 import com.google.privacy.dlp.v2.InspectConfig;
 import com.google.privacy.dlp.v2.InspectTemplate;
+import com.google.privacy.dlp.v2.ListInspectTemplatesRequest;
 import com.google.privacy.dlp.v2.ProjectName;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -35,6 +38,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import org.junit.After;
+import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -88,6 +92,7 @@ public void setUp() {
     System.setOut(new PrintStream(bout));
   }
 
+
   @After
   public void tearDown() {
     System.setOut(null);
@@ -99,10 +104,19 @@ public void testCreateInspectTemplate() throws Exception {
     TemplatesCreate.createInspectTemplate(PROJECT_ID);
     String output = bout.toString();
     assertThat(output, containsString("Template created: "));
+
+
+    // Delete the created template
+    String templateId = output.split("Template created: ")[1].split("\n")[0];
+    DeleteInspectTemplateRequest deleteInspectTemplateRequest =
+        DeleteInspectTemplateRequest.newBuilder().setName(templateId).build();
+    try (DlpServiceClient client = DlpServiceClient.create()) {
+      client.deleteInspectTemplate(deleteInspectTemplateRequest);
+    }
   }
 
   @Test
-  public void testListInspectemplate() throws Exception {
+  public void testListInspectTemplate() throws Exception {
     TemplatesList.listInspectTemplates(PROJECT_ID);
     String output = bout.toString();
     assertThat(output, containsString("Templates found:"));
diff --git a/dlp/src/test/java/dlp/snippets/TriggersTests.java b/dlp/src/test/java/dlp/snippets/TriggersTests.java
@@ -22,9 +22,11 @@
 import com.google.cloud.dlp.v2.DlpServiceClient;
 import com.google.privacy.dlp.v2.CloudStorageOptions;
 import com.google.privacy.dlp.v2.CreateJobTriggerRequest;
+import com.google.privacy.dlp.v2.DeleteJobTriggerRequest;
 import com.google.privacy.dlp.v2.InspectConfig;
 import com.google.privacy.dlp.v2.InspectJobConfig;
 import com.google.privacy.dlp.v2.JobTrigger;
+import com.google.privacy.dlp.v2.ListJobTriggersRequest;
 import com.google.privacy.dlp.v2.ProjectName;
 import com.google.privacy.dlp.v2.Schedule;
 import com.google.privacy.dlp.v2.StorageConfig;
@@ -36,6 +38,7 @@
 import java.util.regex.Pattern;
 import org.hamcrest.CoreMatchers;
 import org.junit.After;
+import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -104,17 +107,27 @@ public void setUp() {
     System.setOut(new PrintStream(bout));
   }
 
+
   @After
   public void tearDown() {
     System.setOut(null);
     bout.reset();
   }
 
+
   @Test
   public void testCreateTrigger() throws Exception {
     TriggersCreate.createTrigger(PROJECT_ID, GCS_PATH);
     String output = bout.toString();
     assertThat(output, CoreMatchers.containsString("Created Trigger:"));
+
+    // Delete the created trigger
+    String triggerId = output.split("Created Trigger: ")[1].split("\n")[0];
+    DeleteJobTriggerRequest deleteJobTriggerRequest =
+        DeleteJobTriggerRequest.newBuilder().setName(triggerId).build();
+    try (DlpServiceClient client = DlpServiceClient.create()) {
+      client.deleteJobTrigger(deleteJobTriggerRequest);
+    }
   }
 
   @Test
@@ -127,7 +140,7 @@ public void testListTrigger() throws Exception {
   @Test
   public void testDeleteTrigger() throws Exception {
     JobTrigger trigger = createTrigger();
-    String triggerName = createTrigger().getName();
+    String triggerName = trigger.getName();
     String triggerId;
 
     Matcher matcher = Pattern.compile("jobTriggers/").matcher(triggerName);
