Skip to content
This repository was archived by the owner on Sep 27, 2023. It is now read-only.

Commit ffb764d

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
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>
1 parent e12a43f commit ffb764d

12 files changed

+1437
-1351
lines changed

‎proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ByteContentItem.java

+44
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,26 @@ public enum BytesType implements com.google.protobuf.ProtocolMessageEnum {
219219
* <code>PDF = 8;</code>
220220
*/
221221
PDF(8),
222+
/**
223+
*
224+
*
225+
* <pre>
226+
* pptx, pptm, potx, potm, pot
227+
* </pre>
228+
*
229+
* <code>POWERPOINT_DOCUMENT = 9;</code>
230+
*/
231+
POWERPOINT_DOCUMENT(9),
232+
/**
233+
*
234+
*
235+
* <pre>
236+
* xlsx, xlsm, xltx, xltm
237+
* </pre>
238+
*
239+
* <code>EXCEL_DOCUMENT = 10;</code>
240+
*/
241+
EXCEL_DOCUMENT(10),
222242
/**
223243
*
224244
*
@@ -342,6 +362,26 @@ public enum BytesType implements com.google.protobuf.ProtocolMessageEnum {
342362
* <code>PDF = 8;</code>
343363
*/
344364
public static final int PDF_VALUE = 8;
365+
/**
366+
*
367+
*
368+
* <pre>
369+
* pptx, pptm, potx, potm, pot
370+
* </pre>
371+
*
372+
* <code>POWERPOINT_DOCUMENT = 9;</code>
373+
*/
374+
public static final int POWERPOINT_DOCUMENT_VALUE = 9;
375+
/**
376+
*
377+
*
378+
* <pre>
379+
* xlsx, xlsm, xltx, xltm
380+
* </pre>
381+
*
382+
* <code>EXCEL_DOCUMENT = 10;</code>
383+
*/
384+
public static final int EXCEL_DOCUMENT_VALUE = 10;
345385
/**
346386
*
347387
*
@@ -415,6 +455,10 @@ public static BytesType forNumber(int value) {
415455
return WORD_DOCUMENT;
416456
case 8:
417457
return PDF;
458+
case 9:
459+
return POWERPOINT_DOCUMENT;
460+
case 10:
461+
return EXCEL_DOCUMENT;
418462
case 11:
419463
return AVRO;
420464
case 12:

‎proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CloudStorageRegexFileSet.java

-13
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,6 @@ public com.google.protobuf.ByteString getIncludeRegexBytes(int index) {
309309
*
310310
*
311311
* <pre>
312-
* [syntax](https://github.com/google/re2/wiki/Syntax); a guide can be found
313312
* A list of regular expressions matching file paths to exclude. All files in
314313
* the bucket that match at least one of these regular expressions will be
315314
* excluded from the scan.
@@ -329,7 +328,6 @@ public com.google.protobuf.ProtocolStringList getExcludeRegexList() {
329328
*
330329
*
331330
* <pre>
332-
* [syntax](https://github.com/google/re2/wiki/Syntax); a guide can be found
333331
* A list of regular expressions matching file paths to exclude. All files in
334332
* the bucket that match at least one of these regular expressions will be
335333
* excluded from the scan.
@@ -349,7 +347,6 @@ public int getExcludeRegexCount() {
349347
*
350348
*
351349
* <pre>
352-
* [syntax](https://github.com/google/re2/wiki/Syntax); a guide can be found
353350
* A list of regular expressions matching file paths to exclude. All files in
354351
* the bucket that match at least one of these regular expressions will be
355352
* excluded from the scan.
@@ -370,7 +367,6 @@ public java.lang.String getExcludeRegex(int index) {
370367
*
371368
*
372369
* <pre>
373-
* [syntax](https://github.com/google/re2/wiki/Syntax); a guide can be found
374370
* A list of regular expressions matching file paths to exclude. All files in
375371
* the bucket that match at least one of these regular expressions will be
376372
* excluded from the scan.
@@ -1150,7 +1146,6 @@ private void ensureExcludeRegexIsMutable() {
11501146
*
11511147
*
11521148
* <pre>
1153-
* [syntax](https://github.com/google/re2/wiki/Syntax); a guide can be found
11541149
* A list of regular expressions matching file paths to exclude. All files in
11551150
* the bucket that match at least one of these regular expressions will be
11561151
* excluded from the scan.
@@ -1170,7 +1165,6 @@ public com.google.protobuf.ProtocolStringList getExcludeRegexList() {
11701165
*
11711166
*
11721167
* <pre>
1173-
* [syntax](https://github.com/google/re2/wiki/Syntax); a guide can be found
11741168
* A list of regular expressions matching file paths to exclude. All files in
11751169
* the bucket that match at least one of these regular expressions will be
11761170
* excluded from the scan.
@@ -1190,7 +1184,6 @@ public int getExcludeRegexCount() {
11901184
*
11911185
*
11921186
* <pre>
1193-
* [syntax](https://github.com/google/re2/wiki/Syntax); a guide can be found
11941187
* A list of regular expressions matching file paths to exclude. All files in
11951188
* the bucket that match at least one of these regular expressions will be
11961189
* excluded from the scan.
@@ -1211,7 +1204,6 @@ public java.lang.String getExcludeRegex(int index) {
12111204
*
12121205
*
12131206
* <pre>
1214-
* [syntax](https://github.com/google/re2/wiki/Syntax); a guide can be found
12151207
* A list of regular expressions matching file paths to exclude. All files in
12161208
* the bucket that match at least one of these regular expressions will be
12171209
* excluded from the scan.
@@ -1232,7 +1224,6 @@ public com.google.protobuf.ByteString getExcludeRegexBytes(int index) {
12321224
*
12331225
*
12341226
* <pre>
1235-
* [syntax](https://github.com/google/re2/wiki/Syntax); a guide can be found
12361227
* A list of regular expressions matching file paths to exclude. All files in
12371228
* the bucket that match at least one of these regular expressions will be
12381229
* excluded from the scan.
@@ -1260,7 +1251,6 @@ public Builder setExcludeRegex(int index, java.lang.String value) {
12601251
*
12611252
*
12621253
* <pre>
1263-
* [syntax](https://github.com/google/re2/wiki/Syntax); a guide can be found
12641254
* A list of regular expressions matching file paths to exclude. All files in
12651255
* the bucket that match at least one of these regular expressions will be
12661256
* excluded from the scan.
@@ -1287,7 +1277,6 @@ public Builder addExcludeRegex(java.lang.String value) {
12871277
*
12881278
*
12891279
* <pre>
1290-
* [syntax](https://github.com/google/re2/wiki/Syntax); a guide can be found
12911280
* A list of regular expressions matching file paths to exclude. All files in
12921281
* the bucket that match at least one of these regular expressions will be
12931282
* excluded from the scan.
@@ -1311,7 +1300,6 @@ public Builder addAllExcludeRegex(java.lang.Iterable<java.lang.String> values) {
13111300
*
13121301
*
13131302
* <pre>
1314-
* [syntax](https://github.com/google/re2/wiki/Syntax); a guide can be found
13151303
* A list of regular expressions matching file paths to exclude. All files in
13161304
* the bucket that match at least one of these regular expressions will be
13171305
* excluded from the scan.
@@ -1334,7 +1322,6 @@ public Builder clearExcludeRegex() {
13341322
*
13351323
*
13361324
* <pre>
1337-
* [syntax](https://github.com/google/re2/wiki/Syntax); a guide can be found
13381325
* A list of regular expressions matching file paths to exclude. All files in
13391326
* the bucket that match at least one of these regular expressions will be
13401327
* excluded from the scan.

‎proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CloudStorageRegexFileSetOrBuilder.java

-4
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@ public interface CloudStorageRegexFileSetOrBuilder
131131
*
132132
*
133133
* <pre>
134-
* [syntax](https://github.com/google/re2/wiki/Syntax); a guide can be found
135134
* A list of regular expressions matching file paths to exclude. All files in
136135
* the bucket that match at least one of these regular expressions will be
137136
* excluded from the scan.
@@ -149,7 +148,6 @@ public interface CloudStorageRegexFileSetOrBuilder
149148
*
150149
*
151150
* <pre>
152-
* [syntax](https://github.com/google/re2/wiki/Syntax); a guide can be found
153151
* A list of regular expressions matching file paths to exclude. All files in
154152
* the bucket that match at least one of these regular expressions will be
155153
* excluded from the scan.
@@ -167,7 +165,6 @@ public interface CloudStorageRegexFileSetOrBuilder
167165
*
168166
*
169167
* <pre>
170-
* [syntax](https://github.com/google/re2/wiki/Syntax); a guide can be found
171168
* A list of regular expressions matching file paths to exclude. All files in
172169
* the bucket that match at least one of these regular expressions will be
173170
* excluded from the scan.
@@ -186,7 +183,6 @@ public interface CloudStorageRegexFileSetOrBuilder
186183
*
187184
*
188185
* <pre>
189-
* [syntax](https://github.com/google/re2/wiki/Syntax); a guide can be found
190186
* A list of regular expressions matching file paths to exclude. All files in
191187
* the bucket that match at least one of these regular expressions will be
192188
* excluded from the scan.

‎proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ContentOption.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*
2323
*
2424
* <pre>
25-
* Options describing which parts of the provided content should be scanned.
25+
* Deprecated and unused.
2626
* </pre>
2727
*
2828
* Protobuf enum {@code google.privacy.dlp.v2.ContentOption}

‎proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CustomInfoType.java

+6-19
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@ public interface DictionaryOrBuilder
444444
* Plane](https://en.wikipedia.org/wiki/Plane_%28Unicode%29#Basic_Multilingual_Plane)
445445
* will be replaced with whitespace when scanning for matches, so the
446446
* dictionary phrase "Sam Johnson" will match all three phrases "sam johnson",
447-
* Plane](https://en.wikipedia.org/wiki/Plane_%28Unicode%29#Basic_Multilingual_Plane)
447+
* "Sam, Johnson", and "Sam (Johnson)". Additionally, the characters
448448
* surrounding any match must be of a different type than the adjacent
449449
* characters within the word, so letters must be next to non-letters and
450450
* digits next to non-digits. For example, the dictionary word "jen" will
@@ -456,7 +456,7 @@ public interface DictionaryOrBuilder
456456
* [limits](https://cloud.google.com/dlp/limits) page contains details about
457457
* the size limits of dictionaries. For dictionaries that do not fit within
458458
* these constraints, consider using `LargeCustomDictionaryConfig` in the
459-
* [limits](https://cloud.google.com/dlp/limits) page contains details about
459+
* `StoredInfoType` API.
460460
* </pre>
461461
*
462462
* Protobuf type {@code google.privacy.dlp.v2.CustomInfoType.Dictionary}
@@ -1752,7 +1752,7 @@ protected Builder newBuilderForType(
17521752
* Plane](https://en.wikipedia.org/wiki/Plane_%28Unicode%29#Basic_Multilingual_Plane)
17531753
* will be replaced with whitespace when scanning for matches, so the
17541754
* dictionary phrase "Sam Johnson" will match all three phrases "sam johnson",
1755-
* Plane](https://en.wikipedia.org/wiki/Plane_%28Unicode%29#Basic_Multilingual_Plane)
1755+
* "Sam, Johnson", and "Sam (Johnson)". Additionally, the characters
17561756
* surrounding any match must be of a different type than the adjacent
17571757
* characters within the word, so letters must be next to non-letters and
17581758
* digits next to non-digits. For example, the dictionary word "jen" will
@@ -1764,7 +1764,7 @@ protected Builder newBuilderForType(
17641764
* [limits](https://cloud.google.com/dlp/limits) page contains details about
17651765
* the size limits of dictionaries. For dictionaries that do not fit within
17661766
* these constraints, consider using `LargeCustomDictionaryConfig` in the
1767-
* [limits](https://cloud.google.com/dlp/limits) page contains details about
1767+
* `StoredInfoType` API.
17681768
* </pre>
17691769
*
17701770
* Protobuf type {@code google.privacy.dlp.v2.CustomInfoType.Dictionary}
@@ -2486,7 +2486,6 @@ public interface RegexOrBuilder
24862486
*
24872487
*
24882488
* <pre>
2489-
* (https://github.com/google/re2/wiki/Syntax) can be found under the
24902489
* The index of the submatch to extract as findings. When not
24912490
* specified, the entire match is returned. No more than 3 may be included.
24922491
* </pre>
@@ -2500,7 +2499,6 @@ public interface RegexOrBuilder
25002499
*
25012500
*
25022501
* <pre>
2503-
* (https://github.com/google/re2/wiki/Syntax) can be found under the
25042502
* The index of the submatch to extract as findings. When not
25052503
* specified, the entire match is returned. No more than 3 may be included.
25062504
* </pre>
@@ -2514,7 +2512,6 @@ public interface RegexOrBuilder
25142512
*
25152513
*
25162514
* <pre>
2517-
* (https://github.com/google/re2/wiki/Syntax) can be found under the
25182515
* The index of the submatch to extract as findings. When not
25192516
* specified, the entire match is returned. No more than 3 may be included.
25202517
* </pre>
@@ -2706,7 +2703,6 @@ public com.google.protobuf.ByteString getPatternBytes() {
27062703
*
27072704
*
27082705
* <pre>
2709-
* (https://github.com/google/re2/wiki/Syntax) can be found under the
27102706
* The index of the submatch to extract as findings. When not
27112707
* specified, the entire match is returned. No more than 3 may be included.
27122708
* </pre>
@@ -2723,7 +2719,6 @@ public java.util.List<java.lang.Integer> getGroupIndexesList() {
27232719
*
27242720
*
27252721
* <pre>
2726-
* (https://github.com/google/re2/wiki/Syntax) can be found under the
27272722
* The index of the submatch to extract as findings. When not
27282723
* specified, the entire match is returned. No more than 3 may be included.
27292724
* </pre>
@@ -2739,7 +2734,6 @@ public int getGroupIndexesCount() {
27392734
*
27402735
*
27412736
* <pre>
2742-
* (https://github.com/google/re2/wiki/Syntax) can be found under the
27432737
* The index of the submatch to extract as findings. When not
27442738
* specified, the entire match is returned. No more than 3 may be included.
27452739
* </pre>
@@ -3250,7 +3244,6 @@ private void ensureGroupIndexesIsMutable() {
32503244
*
32513245
*
32523246
* <pre>
3253-
* (https://github.com/google/re2/wiki/Syntax) can be found under the
32543247
* The index of the submatch to extract as findings. When not
32553248
* specified, the entire match is returned. No more than 3 may be included.
32563249
* </pre>
@@ -3268,7 +3261,6 @@ public java.util.List<java.lang.Integer> getGroupIndexesList() {
32683261
*
32693262
*
32703263
* <pre>
3271-
* (https://github.com/google/re2/wiki/Syntax) can be found under the
32723264
* The index of the submatch to extract as findings. When not
32733265
* specified, the entire match is returned. No more than 3 may be included.
32743266
* </pre>
@@ -3284,7 +3276,6 @@ public int getGroupIndexesCount() {
32843276
*
32853277
*
32863278
* <pre>
3287-
* (https://github.com/google/re2/wiki/Syntax) can be found under the
32883279
* The index of the submatch to extract as findings. When not
32893280
* specified, the entire match is returned. No more than 3 may be included.
32903281
* </pre>
@@ -3301,7 +3292,6 @@ public int getGroupIndexes(int index) {
33013292
*
33023293
*
33033294
* <pre>
3304-
* (https://github.com/google/re2/wiki/Syntax) can be found under the
33053295
* The index of the submatch to extract as findings. When not
33063296
* specified, the entire match is returned. No more than 3 may be included.
33073297
* </pre>
@@ -3322,7 +3312,6 @@ public Builder setGroupIndexes(int index, int value) {
33223312
*
33233313
*
33243314
* <pre>
3325-
* (https://github.com/google/re2/wiki/Syntax) can be found under the
33263315
* The index of the submatch to extract as findings. When not
33273316
* specified, the entire match is returned. No more than 3 may be included.
33283317
* </pre>
@@ -3342,7 +3331,6 @@ public Builder addGroupIndexes(int value) {
33423331
*
33433332
*
33443333
* <pre>
3345-
* (https://github.com/google/re2/wiki/Syntax) can be found under the
33463334
* The index of the submatch to extract as findings. When not
33473335
* specified, the entire match is returned. No more than 3 may be included.
33483336
* </pre>
@@ -3362,7 +3350,6 @@ public Builder addAllGroupIndexes(java.lang.Iterable<? extends java.lang.Integer
33623350
*
33633351
*
33643352
* <pre>
3365-
* (https://github.com/google/re2/wiki/Syntax) can be found under the
33663353
* The index of the submatch to extract as findings. When not
33673354
* specified, the entire match is returned. No more than 3 may be included.
33683355
* </pre>
@@ -3443,7 +3430,7 @@ public interface SurrogateTypeOrBuilder
34433430
* [`CryptoReplaceFfxFpeConfig`](https://cloud.google.com/dlp/docs/reference/rest/v2/organizations.deidentifyTemplates#cryptoreplaceffxfpeconfig).
34443431
* These types of transformations are
34453432
* those that perform pseudonymization, thereby producing a "surrogate" as
3446-
* [`CryptoReplaceFfxFpeConfig`](https://cloud.google.com/dlp/docs/reference/rest/v2/organizations.deidentifyTemplates#cryptoreplaceffxfpeconfig).
3433+
* output. This should be used in conjunction with a field on the
34473434
* transformation such as `surrogate_info_type`. This CustomInfoType does
34483435
* not support the use of `detection_rules`.
34493436
* </pre>
@@ -3686,7 +3673,7 @@ protected Builder newBuilderForType(
36863673
* [`CryptoReplaceFfxFpeConfig`](https://cloud.google.com/dlp/docs/reference/rest/v2/organizations.deidentifyTemplates#cryptoreplaceffxfpeconfig).
36873674
* These types of transformations are
36883675
* those that perform pseudonymization, thereby producing a "surrogate" as
3689-
* [`CryptoReplaceFfxFpeConfig`](https://cloud.google.com/dlp/docs/reference/rest/v2/organizations.deidentifyTemplates#cryptoreplaceffxfpeconfig).
3676+
* output. This should be used in conjunction with a field on the
36903677
* transformation such as `surrogate_info_type`. This CustomInfoType does
36913678
* not support the use of `detection_rules`.
36923679
* </pre>

0 commit comments

Comments
 (0)