feat: new Bytes and File types: POWERPOINT and EXCEL (#848)

* feat: new Bytes and File types: POWERPOINT and EXCEL PiperOrigin-RevId: 437260831 Source-Link: googleapis/googleapis@3c34a40 Source-Link: https://github.com/googleapis/googleapis-gen/commit/a4035213e686b96afc3ed66d0d04328e4ffbd4d1 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYTQwMzUyMTNlNjg2Yjk2YWZjM2VkNjZkMGQwNDMyOGU0ZmZiZDRkMSJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
googleapis · Mar 29, 2022 · ffb764d · ffb764d
1 parent e12a43f
commit ffb764d
Show file tree

Hide file tree

Showing 12 changed files with 1,437 additions and 1,351 deletions.
diff --git a/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ByteContentItem.java b/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ByteContentItem.java
@@ -219,6 +219,26 @@ public enum BytesType implements com.google.protobuf.ProtocolMessageEnum {
      * <code>PDF = 8;</code>
      */
     PDF(8),
+    /**
+     *
+     *
+     * <pre>
+     * pptx, pptm, potx, potm, pot
+     * </pre>
+     *
+     * <code>POWERPOINT_DOCUMENT = 9;</code>
+     */
+    POWERPOINT_DOCUMENT(9),
+    /**
+     *
+     *
+     * <pre>
+     * xlsx, xlsm, xltx, xltm
+     * </pre>
+     *
+     * <code>EXCEL_DOCUMENT = 10;</code>
+     */
+    EXCEL_DOCUMENT(10),
     /**
      *
      *
@@ -342,6 +362,26 @@ public enum BytesType implements com.google.protobuf.ProtocolMessageEnum {
      * <code>PDF = 8;</code>
      */
     public static final int PDF_VALUE = 8;
+    /**
+     *
+     *
+     * <pre>
+     * pptx, pptm, potx, potm, pot
+     * </pre>
+     *
+     * <code>POWERPOINT_DOCUMENT = 9;</code>
+     */
+    public static final int POWERPOINT_DOCUMENT_VALUE = 9;
+    /**
+     *
+     *
+     * <pre>
+     * xlsx, xlsm, xltx, xltm
+     * </pre>
+     *
+     * <code>EXCEL_DOCUMENT = 10;</code>
+     */
+    public static final int EXCEL_DOCUMENT_VALUE = 10;
     /**
      *
      *
@@ -415,6 +455,10 @@ public static BytesType forNumber(int value) {
           return WORD_DOCUMENT;
         case 8:
           return PDF;
+        case 9:
+          return POWERPOINT_DOCUMENT;
+        case 10:
+          return EXCEL_DOCUMENT;
         case 11:
           return AVRO;
         case 12:

diff --git a/...google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CloudStorageRegexFileSet.java b/...google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CloudStorageRegexFileSet.java
@@ -309,7 +309,6 @@ public com.google.protobuf.ByteString getIncludeRegexBytes(int index) {
    *
    *
    * <pre>
-   * [syntax](https://github.com/google/re2/wiki/Syntax); a guide can be found
    * A list of regular expressions matching file paths to exclude. All files in
    * the bucket that match at least one of these regular expressions will be
    * excluded from the scan.
@@ -329,7 +328,6 @@ public com.google.protobuf.ProtocolStringList getExcludeRegexList() {
    *
    *
    * <pre>
-   * [syntax](https://github.com/google/re2/wiki/Syntax); a guide can be found
    * A list of regular expressions matching file paths to exclude. All files in
    * the bucket that match at least one of these regular expressions will be
    * excluded from the scan.
@@ -349,7 +347,6 @@ public int getExcludeRegexCount() {
    *
    *
    * <pre>
-   * [syntax](https://github.com/google/re2/wiki/Syntax); a guide can be found
    * A list of regular expressions matching file paths to exclude. All files in
    * the bucket that match at least one of these regular expressions will be
    * excluded from the scan.
@@ -370,7 +367,6 @@ public java.lang.String getExcludeRegex(int index) {
    *
    *
    * <pre>
-   * [syntax](https://github.com/google/re2/wiki/Syntax); a guide can be found
    * A list of regular expressions matching file paths to exclude. All files in
    * the bucket that match at least one of these regular expressions will be
    * excluded from the scan.
@@ -1150,7 +1146,6 @@ private void ensureExcludeRegexIsMutable() {
      *
      *
      * <pre>
-     * [syntax](https://github.com/google/re2/wiki/Syntax); a guide can be found
      * A list of regular expressions matching file paths to exclude. All files in
      * the bucket that match at least one of these regular expressions will be
      * excluded from the scan.
@@ -1170,7 +1165,6 @@ public com.google.protobuf.ProtocolStringList getExcludeRegexList() {
      *
      *
      * <pre>
-     * [syntax](https://github.com/google/re2/wiki/Syntax); a guide can be found
      * A list of regular expressions matching file paths to exclude. All files in
      * the bucket that match at least one of these regular expressions will be
      * excluded from the scan.
@@ -1190,7 +1184,6 @@ public int getExcludeRegexCount() {
      *
      *
      * <pre>
-     * [syntax](https://github.com/google/re2/wiki/Syntax); a guide can be found
      * A list of regular expressions matching file paths to exclude. All files in
      * the bucket that match at least one of these regular expressions will be
      * excluded from the scan.
@@ -1211,7 +1204,6 @@ public java.lang.String getExcludeRegex(int index) {
      *
      *
      * <pre>
-     * [syntax](https://github.com/google/re2/wiki/Syntax); a guide can be found
      * A list of regular expressions matching file paths to exclude. All files in
      * the bucket that match at least one of these regular expressions will be
      * excluded from the scan.
@@ -1232,7 +1224,6 @@ public com.google.protobuf.ByteString getExcludeRegexBytes(int index) {
      *
      *
      * <pre>
-     * [syntax](https://github.com/google/re2/wiki/Syntax); a guide can be found
      * A list of regular expressions matching file paths to exclude. All files in
      * the bucket that match at least one of these regular expressions will be
      * excluded from the scan.
@@ -1260,7 +1251,6 @@ public Builder setExcludeRegex(int index, java.lang.String value) {
      *
      *
      * <pre>
-     * [syntax](https://github.com/google/re2/wiki/Syntax); a guide can be found
      * A list of regular expressions matching file paths to exclude. All files in
      * the bucket that match at least one of these regular expressions will be
      * excluded from the scan.
@@ -1287,7 +1277,6 @@ public Builder addExcludeRegex(java.lang.String value) {
      *
      *
      * <pre>
-     * [syntax](https://github.com/google/re2/wiki/Syntax); a guide can be found
      * A list of regular expressions matching file paths to exclude. All files in
      * the bucket that match at least one of these regular expressions will be
      * excluded from the scan.
@@ -1311,7 +1300,6 @@ public Builder addAllExcludeRegex(java.lang.Iterable<java.lang.String> values) {
      *
      *
      * <pre>
-     * [syntax](https://github.com/google/re2/wiki/Syntax); a guide can be found
      * A list of regular expressions matching file paths to exclude. All files in
      * the bucket that match at least one of these regular expressions will be
      * excluded from the scan.
@@ -1334,7 +1322,6 @@ public Builder clearExcludeRegex() {
      *
      *
      * <pre>
-     * [syntax](https://github.com/google/re2/wiki/Syntax); a guide can be found
      * A list of regular expressions matching file paths to exclude. All files in
      * the bucket that match at least one of these regular expressions will be
      * excluded from the scan.

diff --git a/...oud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CloudStorageRegexFileSetOrBuilder.java b/...oud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CloudStorageRegexFileSetOrBuilder.java
@@ -131,7 +131,6 @@ public interface CloudStorageRegexFileSetOrBuilder
    *
    *
    * <pre>
-   * [syntax](https://github.com/google/re2/wiki/Syntax); a guide can be found
    * A list of regular expressions matching file paths to exclude. All files in
    * the bucket that match at least one of these regular expressions will be
    * excluded from the scan.
@@ -149,7 +148,6 @@ public interface CloudStorageRegexFileSetOrBuilder
    *
    *
    * <pre>
-   * [syntax](https://github.com/google/re2/wiki/Syntax); a guide can be found
    * A list of regular expressions matching file paths to exclude. All files in
    * the bucket that match at least one of these regular expressions will be
    * excluded from the scan.
@@ -167,7 +165,6 @@ public interface CloudStorageRegexFileSetOrBuilder
    *
    *
    * <pre>
-   * [syntax](https://github.com/google/re2/wiki/Syntax); a guide can be found
    * A list of regular expressions matching file paths to exclude. All files in
    * the bucket that match at least one of these regular expressions will be
    * excluded from the scan.
@@ -186,7 +183,6 @@ public interface CloudStorageRegexFileSetOrBuilder
    *
    *
    * <pre>
-   * [syntax](https://github.com/google/re2/wiki/Syntax); a guide can be found
    * A list of regular expressions matching file paths to exclude. All files in
    * the bucket that match at least one of these regular expressions will be
    * excluded from the scan.

diff --git a/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ContentOption.java b/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ContentOption.java
@@ -22,7 +22,7 @@
  *
  *
  * <pre>
- * Options describing which parts of the provided content should be scanned.
+ * Deprecated and unused.
  * </pre>
  *
  * Protobuf enum {@code google.privacy.dlp.v2.ContentOption}

diff --git a/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CustomInfoType.java b/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CustomInfoType.java
@@ -444,7 +444,7 @@ public interface DictionaryOrBuilder
    * Plane](https://en.wikipedia.org/wiki/Plane_%28Unicode%29#Basic_Multilingual_Plane)
    * will be replaced with whitespace when scanning for matches, so the
    * dictionary phrase "Sam Johnson" will match all three phrases "sam johnson",
-   * Plane](https://en.wikipedia.org/wiki/Plane_%28Unicode%29#Basic_Multilingual_Plane)
+   * "Sam, Johnson", and "Sam (Johnson)". Additionally, the characters
    * surrounding any match must be of a different type than the adjacent
    * characters within the word, so letters must be next to non-letters and
    * digits next to non-digits. For example, the dictionary word "jen" will
@@ -456,7 +456,7 @@ public interface DictionaryOrBuilder
    * [limits](https://cloud.google.com/dlp/limits) page contains details about
    * the size limits of dictionaries. For dictionaries that do not fit within
    * these constraints, consider using `LargeCustomDictionaryConfig` in the
-   * [limits](https://cloud.google.com/dlp/limits) page contains details about
+   * `StoredInfoType` API.
    * </pre>
    *
    * Protobuf type {@code google.privacy.dlp.v2.CustomInfoType.Dictionary}
@@ -1752,7 +1752,7 @@ protected Builder newBuilderForType(
      * Plane](https://en.wikipedia.org/wiki/Plane_%28Unicode%29#Basic_Multilingual_Plane)
      * will be replaced with whitespace when scanning for matches, so the
      * dictionary phrase "Sam Johnson" will match all three phrases "sam johnson",
-     * Plane](https://en.wikipedia.org/wiki/Plane_%28Unicode%29#Basic_Multilingual_Plane)
+     * "Sam, Johnson", and "Sam (Johnson)". Additionally, the characters
      * surrounding any match must be of a different type than the adjacent
      * characters within the word, so letters must be next to non-letters and
      * digits next to non-digits. For example, the dictionary word "jen" will
@@ -1764,7 +1764,7 @@ protected Builder newBuilderForType(
      * [limits](https://cloud.google.com/dlp/limits) page contains details about
      * the size limits of dictionaries. For dictionaries that do not fit within
      * these constraints, consider using `LargeCustomDictionaryConfig` in the
-     * [limits](https://cloud.google.com/dlp/limits) page contains details about
+     * `StoredInfoType` API.
      * </pre>
      *
      * Protobuf type {@code google.privacy.dlp.v2.CustomInfoType.Dictionary}
@@ -2486,7 +2486,6 @@ public interface RegexOrBuilder
      *
      *
      * <pre>
-     * (https://github.com/google/re2/wiki/Syntax) can be found under the
      * The index of the submatch to extract as findings. When not
      * specified, the entire match is returned. No more than 3 may be included.
      * </pre>
@@ -2500,7 +2499,6 @@ public interface RegexOrBuilder
      *
      *
      * <pre>
-     * (https://github.com/google/re2/wiki/Syntax) can be found under the
      * The index of the submatch to extract as findings. When not
      * specified, the entire match is returned. No more than 3 may be included.
      * </pre>
@@ -2514,7 +2512,6 @@ public interface RegexOrBuilder
      *
      *
      * <pre>
-     * (https://github.com/google/re2/wiki/Syntax) can be found under the
      * The index of the submatch to extract as findings. When not
      * specified, the entire match is returned. No more than 3 may be included.
      * </pre>
@@ -2706,7 +2703,6 @@ public com.google.protobuf.ByteString getPatternBytes() {
      *
      *
      * <pre>
-     * (https://github.com/google/re2/wiki/Syntax) can be found under the
      * The index of the submatch to extract as findings. When not
      * specified, the entire match is returned. No more than 3 may be included.
      * </pre>
@@ -2723,7 +2719,6 @@ public java.util.List<java.lang.Integer> getGroupIndexesList() {
      *
      *
      * <pre>
-     * (https://github.com/google/re2/wiki/Syntax) can be found under the
      * The index of the submatch to extract as findings. When not
      * specified, the entire match is returned. No more than 3 may be included.
      * </pre>
@@ -2739,7 +2734,6 @@ public int getGroupIndexesCount() {
      *
      *
      * <pre>
-     * (https://github.com/google/re2/wiki/Syntax) can be found under the
      * The index of the submatch to extract as findings. When not
      * specified, the entire match is returned. No more than 3 may be included.
      * </pre>
@@ -3250,7 +3244,6 @@ private void ensureGroupIndexesIsMutable() {
        *
        *
        * <pre>
-       * (https://github.com/google/re2/wiki/Syntax) can be found under the
        * The index of the submatch to extract as findings. When not
        * specified, the entire match is returned. No more than 3 may be included.
        * </pre>
@@ -3268,7 +3261,6 @@ public java.util.List<java.lang.Integer> getGroupIndexesList() {
        *
        *
        * <pre>
-       * (https://github.com/google/re2/wiki/Syntax) can be found under the
        * The index of the submatch to extract as findings. When not
        * specified, the entire match is returned. No more than 3 may be included.
        * </pre>
@@ -3284,7 +3276,6 @@ public int getGroupIndexesCount() {
        *
        *
        * <pre>
-       * (https://github.com/google/re2/wiki/Syntax) can be found under the
        * The index of the submatch to extract as findings. When not
        * specified, the entire match is returned. No more than 3 may be included.
        * </pre>
@@ -3301,7 +3292,6 @@ public int getGroupIndexes(int index) {
        *
        *
        * <pre>
-       * (https://github.com/google/re2/wiki/Syntax) can be found under the
        * The index of the submatch to extract as findings. When not
        * specified, the entire match is returned. No more than 3 may be included.
        * </pre>
@@ -3322,7 +3312,6 @@ public Builder setGroupIndexes(int index, int value) {
        *
        *
        * <pre>
-       * (https://github.com/google/re2/wiki/Syntax) can be found under the
        * The index of the submatch to extract as findings. When not
        * specified, the entire match is returned. No more than 3 may be included.
        * </pre>
@@ -3342,7 +3331,6 @@ public Builder addGroupIndexes(int value) {
        *
        *
        * <pre>
-       * (https://github.com/google/re2/wiki/Syntax) can be found under the
        * The index of the submatch to extract as findings. When not
        * specified, the entire match is returned. No more than 3 may be included.
        * </pre>
@@ -3362,7 +3350,6 @@ public Builder addAllGroupIndexes(java.lang.Iterable<? extends java.lang.Integer
        *
        *
        * <pre>
-       * (https://github.com/google/re2/wiki/Syntax) can be found under the
        * The index of the submatch to extract as findings. When not
        * specified, the entire match is returned. No more than 3 may be included.
        * </pre>
@@ -3443,7 +3430,7 @@ public interface SurrogateTypeOrBuilder
    * [`CryptoReplaceFfxFpeConfig`](https://cloud.google.com/dlp/docs/reference/rest/v2/organizations.deidentifyTemplates#cryptoreplaceffxfpeconfig).
    * These types of transformations are
    * those that perform pseudonymization, thereby producing a "surrogate" as
-   * [`CryptoReplaceFfxFpeConfig`](https://cloud.google.com/dlp/docs/reference/rest/v2/organizations.deidentifyTemplates#cryptoreplaceffxfpeconfig).
+   * output. This should be used in conjunction with a field on the
    * transformation such as `surrogate_info_type`. This CustomInfoType does
    * not support the use of `detection_rules`.
    * </pre>
@@ -3686,7 +3673,7 @@ protected Builder newBuilderForType(
      * [`CryptoReplaceFfxFpeConfig`](https://cloud.google.com/dlp/docs/reference/rest/v2/organizations.deidentifyTemplates#cryptoreplaceffxfpeconfig).
      * These types of transformations are
      * those that perform pseudonymization, thereby producing a "surrogate" as
-     * [`CryptoReplaceFfxFpeConfig`](https://cloud.google.com/dlp/docs/reference/rest/v2/organizations.deidentifyTemplates#cryptoreplaceffxfpeconfig).
+     * output. This should be used in conjunction with a field on the
      * transformation such as `surrogate_info_type`. This CustomInfoType does
      * not support the use of `detection_rules`.
      * </pre>