DLP: Add autoPopulateTimespan option for creating job triggers. (GoogleCloudPlatform#1134)

micheldavid · dzlier-gcp · commit 5a1564a4b60f · 2018-06-21T11:36:42.000-07:00
diff --git a/dlp/src/main/java/com/example/dlp/Triggers.java b/dlp/src/main/java/com/example/dlp/Triggers.java
@@ -31,6 +31,7 @@
 import com.google.privacy.dlp.v2.ProjectName;
 import com.google.privacy.dlp.v2.Schedule;
 import com.google.privacy.dlp.v2.StorageConfig;
+import com.google.privacy.dlp.v2.StorageConfig.TimespanConfig;
 import com.google.protobuf.Duration;
 import java.util.ArrayList;
 import java.util.List;
@@ -52,6 +53,7 @@ public class Triggers {
    * @param triggerId (Optional) name of the trigger to be created
    * @param displayName (Optional) display name for the trigger to be created
    * @param description (Optional) description for the trigger to be created
+   * @param autoPopulateTimespan If true, limits scans to new content only.
    * @param scanPeriod How often to wait between scans, in days (minimum = 1 day)
    * @param infoTypes infoTypes of information to match eg. InfoType.PHONE_NUMBER,
    *     InfoType.EMAIL_ADDRESS
@@ -65,6 +67,7 @@ private static void createTrigger(
       String description,
       String bucketName,
       String fileName,
+      boolean autoPopulateTimespan,
       int scanPeriod,
       List<InfoType> infoTypes,
       Likelihood minLikelihood,
@@ -82,8 +85,13 @@ private static void createTrigger(
                   CloudStorageOptions.FileSet.newBuilder()
                       .setUrl("gs://" + bucketName + "/" + fileName))
               .build();
+
+      TimespanConfig timespanConfig = TimespanConfig.newBuilder()
+          .setEnableAutoPopulationOfTimespanConfig(autoPopulateTimespan).build();
+
       StorageConfig storageConfig =
-          StorageConfig.newBuilder().setCloudStorageOptions(cloudStorageOptions).build();
+          StorageConfig.newBuilder().setCloudStorageOptions(cloudStorageOptions)
+              .setTimespanConfig(timespanConfig).build();
 
       InspectConfig.FindingLimits findingLimits =
           InspectConfig.FindingLimits.newBuilder().setMaxFindingsPerRequest(maxFindings).build();
@@ -216,6 +224,10 @@ public static void main(String[] args) throws Exception {
     Option gcsFileNameOption = Option.builder("fileName").hasArg(true).required(false).build();
     commandLineOptions.addOption(gcsFileNameOption);
 
+    Option autoPopulateTimespanOption = Option.builder("autoPopulateTimespan").required(false)
+        .build();
+    commandLineOptions.addOption(autoPopulateTimespanOption);
+
     Option minLikelihoodOption =
         Option.builder("minLikelihood").hasArg(true).required(false).build();
 
@@ -268,6 +280,8 @@ public static void main(String[] args) throws Exception {
       String description = cmd.getOptionValue(descriptionOption.getOpt(), "");
       String bucketName = cmd.getOptionValue(bucketNameOption.getOpt());
       String fileName = cmd.getOptionValue(gcsFileNameOption.getOpt());
+      boolean autoPopulateTimespan = Boolean
+          .valueOf(cmd.getOptionValue(autoPopulateTimespanOption.getOpt()));
       int scanPeriod = Integer.valueOf(cmd.getOptionValue(scanPeriodOption.getOpt()));
       List<InfoType> infoTypesList = new ArrayList<>();
       if (cmd.hasOption(infoTypesOption.getOpt())) {
@@ -283,6 +297,7 @@ public static void main(String[] args) throws Exception {
           description,
           bucketName,
           fileName,
+          autoPopulateTimespan,
           scanPeriod,
           infoTypesList,
           minLikelihood,
diff --git a/dlp/src/test/java/com/example/dlp/TriggersIT.java b/dlp/src/test/java/com/example/dlp/TriggersIT.java
@@ -39,17 +39,13 @@ public class TriggersIT {
   //CHECKSTYLE ON: AbbreviationAsWordInName
 
   private ByteArrayOutputStream bout;
-  private PrintStream out;
 
   private String bucketName = System.getenv("GOOGLE_CLOUD_PROJECT") + "/dlp";
-  private String topicId = "dlp-tests";
-  private String subscriptionId = "dlp-test";
 
   @Before
   public void setUp() {
     bout = new ByteArrayOutputStream();
-    out = new PrintStream(bout);
-    System.setOut(out);
+    System.setOut(new PrintStream(bout));
     assertNotNull(System.getenv("GOOGLE_APPLICATION_CREDENTIALS"));
   }
 
@@ -74,6 +70,7 @@ public void testCreateTrigger() throws Exception {
           bucketName,
           "-fileName",
           "test.txt",
+          "-autoPopulateTimespan",
           "-scanPeriod",
           "1"
         });
