Thanks to visit codestin.com
Credit goes to github.com

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

Commit 69517fc

Browse files
yoshi-automationyoshi-automation
authored
docs(v2): regenerate documentation from protos (#129)
* Change triggered by none of the following: This git repo (https://github.com/googleapis/java-dlp.git) Git repo https://github.com/googleapis/synthtool.git * chore: release 1.1.1 (#123) 6efb4a4 commit 6efb4a4 Author: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Date: Tue Apr 7 18:02:22 2020 +0000 chore: release 1.1.1 (#123) 🤖 I have created a release \*beep\* \*boop\* --- ### [1.1.1](https://www.github.com/googleapis/java-dlp/compare/v1.1.0...v1.1.1) (2020-04-07) ### Dependencies * update core dependencies ([#94](https://www.github.com/googleapis/java-dlp/issues/94)) ([88d8307](https://www.github.com/googleapis/java-dlp/commit/88d83071de1ce2251af5c69691221e26c9526618)) * update dependency org.threeten:threetenbp to v1.4.3 ([#105](https://www.github.com/googleapis/java-dlp/issues/105)) ([b636547](https://www.github.com/googleapis/java-dlp/commit/b63654725c1e22a3c1e0ee46b33bfbd71a65c99c)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). * build(java): fix retry_with_backoff when -e option set (#475) googleapis/synthtool@bd69a2a commit bd69a2aa7b70875f3c988e269706b22fefbef40e Author: Jeff Ching <[email protected]> Date: Wed Apr 8 14:01:08 2020 -0700 build(java): fix retry_with_backoff when -e option set (#475) * build(java): fix nightly integration test config to run integrations (#465) googleapis/synthtool@c7e0e51 commit c7e0e517d7f46f77bebd27da2e5afcaa6eee7e25 Author: Jeff Ching <[email protected]> Date: Wed Apr 8 14:06:04 2020 -0700 build(java): fix nightly integration test config to run integrations (#465) This was only running the units. * chore(java): release-please only updates non maven versions in README (#476) googleapis/synthtool@7f8e62a commit 7f8e62aa3edd225f76347a16f92e400661fdfb52 Author: Jeff Ching <[email protected]> Date: Wed Apr 8 14:14:25 2020 -0700 chore(java): release-please only updates non maven versions in README (#476) Prevent release-please and synthtool from fighting over the released library version. Synthtool updates the install snippets from the samples pom.xml files so the bots fight if they are temporarily out of sync after a release.
1 parent a77fe01 commit 69517fc

File tree

16 files changed

+342
-248
lines changed

16 files changed

+342
-248
lines changed

‎.kokoro/common.sh‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,28 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515

16-
# set -eo pipefail
17-
1816
function retry_with_backoff {
1917
attempts_left=$1
2018
sleep_seconds=$2
2119
shift 2
2220
command=$@
2321

22+
23+
# store current flag state
24+
flags=$-
25+
26+
# allow a failures to continue
27+
set +e
2428
echo "${command}"
2529
${command}
2630
exit_code=$?
2731

32+
# restore "e" flag
33+
if [[ ${flags} =~ e ]]
34+
then set -e
35+
else set +e
36+
fi
37+
2838
if [[ $exit_code == 0 ]]
2939
then
3040
return 0

‎.kokoro/nightly/integration.cfg‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,26 @@ env_vars: {
66
value: "gcr.io/cloud-devrel-kokoro-resources/java8"
77
}
88

9+
env_vars: {
10+
key: "JOB_TYPE"
11+
value: "integration"
12+
}
13+
14+
env_vars: {
15+
key: "GCLOUD_PROJECT"
16+
value: "gcloud-devel"
17+
}
18+
919
env_vars: {
1020
key: "ENABLE_BUILD_COP"
1121
value: "true"
1222
}
1323

24+
env_vars: {
25+
key: "GOOGLE_APPLICATION_CREDENTIALS"
26+
value: "keystore/73713_java_it_service_account"
27+
}
28+
1429
before_action {
1530
fetch_keystore {
1631
keystore_resource {

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
1717
<dependency>
1818
<groupId>com.google.cloud</groupId>
1919
<artifactId>libraries-bom</artifactId>
20-
<version>4.3.0</version>
20+
<version>4.4.1</version>
2121
<type>pom</type>
2222
<scope>import</scope>
2323
</dependency>
@@ -32,19 +32,19 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
3232

3333
```
3434

35-
[//]: # ({x-version-update-start:google-cloud-dlp:released})
36-
3735
If you are using Maven without BOM, add this to your dependencies:
3836

3937
```xml
4038
<dependency>
4139
<groupId>com.google.cloud</groupId>
4240
<artifactId>google-cloud-dlp</artifactId>
43-
<version>1.1.1</version>
41+
<version>1.1.0</version>
4442
</dependency>
4543

4644
```
4745

46+
[//]: # ({x-version-update-start:google-cloud-dlp:released})
47+
4848
If you are using Gradle, add this to your dependencies
4949
```Groovy
5050
compile 'com.google.cloud:google-cloud-dlp:1.1.1'

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1785,13 +1785,13 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
17851785
+ "/{name=projects/*/locations/*/dlpJobs/*}"
17861786
+ ":finish:\001*\032F\312A\022dlp.googleapis.com\322A.http"
17871787
+ "s://www.googleapis.com/auth/cloud-platfo"
1788-
+ "rmB\354\001\n\031com.google.privacy.dlp.v2B\010DlpPro"
1788+
+ "rmB\205\002\n\031com.google.privacy.dlp.v2B\010DlpPro"
17891789
+ "toP\001Z8google.golang.org/genproto/googlea"
17901790
+ "pis/privacy/dlp/v2;dlp\252\002\023Google.Cloud.Dl"
1791-
+ "p.V2\312\002\023Google\\Cloud\\Dlp\\V2\352A\\\n\'dlp.googl"
1792-
+ "eapis.com/OrganizationLocation\0221organiza"
1793-
+ "tions/{organization}/locations/{location"
1794-
+ "}b\006proto3"
1791+
+ "p.V2\312\002\023Google\\Cloud\\Dlp\\V2\352\002\026Google::Clo"
1792+
+ "ud::Dlp::V2\352A\\\n\'dlp.googleapis.com/Organ"
1793+
+ "izationLocation\0221organizations/{organiza"
1794+
+ "tion}/locations/{location}b\006proto3"
17951795
};
17961796
descriptor =
17971797
com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -294,11 +294,12 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
294294
+ "LIKELY\020\001\022\014\n\010UNLIKELY\020\002\022\014\n\010POSSIBLE\020\003\022\n\n\006"
295295
+ "LIKELY\020\004\022\017\n\013VERY_LIKELY\020\005*Z\n\010FileType\022\031\n"
296296
+ "\025FILE_TYPE_UNSPECIFIED\020\000\022\017\n\013BINARY_FILE\020"
297-
+ "\001\022\r\n\tTEXT_FILE\020\002\022\t\n\005IMAGE\020\003\022\010\n\004AVRO\020\007B\217\001"
297+
+ "\001\022\r\n\tTEXT_FILE\020\002\022\t\n\005IMAGE\020\003\022\010\n\004AVRO\020\007B\250\001"
298298
+ "\n\031com.google.privacy.dlp.v2B\nDlpStorageP"
299299
+ "\001Z8google.golang.org/genproto/googleapis"
300300
+ "/privacy/dlp/v2;dlp\252\002\023Google.Cloud.Dlp.V"
301-
+ "2\312\002\023Google\\Cloud\\Dlp\\V2b\006proto3"
301+
+ "2\312\002\023Google\\Cloud\\Dlp\\V2\352\002\026Google::Cloud:"
302+
+ ":Dlp::V2b\006proto3"
302303
};
303304
descriptor =
304305
com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(

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

Lines changed: 55 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -708,12 +708,13 @@ public int getLabelsCount() {
708708
* <pre>
709709
* The labels associated with this `InspectFinding`.
710710
* Label keys must be between 1 and 63 characters long and must conform
711-
* to the following regular expression: &#92;[a-z&#92;](&#92;[-a-z0-9&#92;]*&#92;[a-z0-9&#92;])?.
711+
* to the following regular expression: `[a-z]([-a-z0-9]*[a-z0-9])?`.
712712
* Label values must be between 0 and 63 characters long and must conform
713-
* to the regular expression (&#92;[a-z&#92;](&#92;[-a-z0-9&#92;]*&#92;[a-z0-9&#92;])?)?.
713+
* to the regular expression `([a-z]([-a-z0-9]*[a-z0-9])?)?`.
714714
* No more than 10 labels can be associated with a given finding.
715-
* Example: &lt;code&gt;"environment" : "production"&lt;/code&gt;
716-
* Example: &lt;code&gt;"pipeline" : "etl"&lt;/code&gt;
715+
* Examples:
716+
* * `"environment" : "production"`
717+
* * `"pipeline" : "etl"`
717718
* </pre>
718719
*
719720
* <code>map&lt;string, string&gt; labels = 10;</code>
@@ -735,12 +736,13 @@ public java.util.Map<java.lang.String, java.lang.String> getLabels() {
735736
* <pre>
736737
* The labels associated with this `InspectFinding`.
737738
* Label keys must be between 1 and 63 characters long and must conform
738-
* to the following regular expression: &#92;[a-z&#92;](&#92;[-a-z0-9&#92;]*&#92;[a-z0-9&#92;])?.
739+
* to the following regular expression: `[a-z]([-a-z0-9]*[a-z0-9])?`.
739740
* Label values must be between 0 and 63 characters long and must conform
740-
* to the regular expression (&#92;[a-z&#92;](&#92;[-a-z0-9&#92;]*&#92;[a-z0-9&#92;])?)?.
741+
* to the regular expression `([a-z]([-a-z0-9]*[a-z0-9])?)?`.
741742
* No more than 10 labels can be associated with a given finding.
742-
* Example: &lt;code&gt;"environment" : "production"&lt;/code&gt;
743-
* Example: &lt;code&gt;"pipeline" : "etl"&lt;/code&gt;
743+
* Examples:
744+
* * `"environment" : "production"`
745+
* * `"pipeline" : "etl"`
744746
* </pre>
745747
*
746748
* <code>map&lt;string, string&gt; labels = 10;</code>
@@ -754,12 +756,13 @@ public java.util.Map<java.lang.String, java.lang.String> getLabelsMap() {
754756
* <pre>
755757
* The labels associated with this `InspectFinding`.
756758
* Label keys must be between 1 and 63 characters long and must conform
757-
* to the following regular expression: &#92;[a-z&#92;](&#92;[-a-z0-9&#92;]*&#92;[a-z0-9&#92;])?.
759+
* to the following regular expression: `[a-z]([-a-z0-9]*[a-z0-9])?`.
758760
* Label values must be between 0 and 63 characters long and must conform
759-
* to the regular expression (&#92;[a-z&#92;](&#92;[-a-z0-9&#92;]*&#92;[a-z0-9&#92;])?)?.
761+
* to the regular expression `([a-z]([-a-z0-9]*[a-z0-9])?)?`.
760762
* No more than 10 labels can be associated with a given finding.
761-
* Example: &lt;code&gt;"environment" : "production"&lt;/code&gt;
762-
* Example: &lt;code&gt;"pipeline" : "etl"&lt;/code&gt;
763+
* Examples:
764+
* * `"environment" : "production"`
765+
* * `"pipeline" : "etl"`
763766
* </pre>
764767
*
765768
* <code>map&lt;string, string&gt; labels = 10;</code>
@@ -777,12 +780,13 @@ public java.lang.String getLabelsOrDefault(java.lang.String key, java.lang.Strin
777780
* <pre>
778781
* The labels associated with this `InspectFinding`.
779782
* Label keys must be between 1 and 63 characters long and must conform
780-
* to the following regular expression: &#92;[a-z&#92;](&#92;[-a-z0-9&#92;]*&#92;[a-z0-9&#92;])?.
783+
* to the following regular expression: `[a-z]([-a-z0-9]*[a-z0-9])?`.
781784
* Label values must be between 0 and 63 characters long and must conform
782-
* to the regular expression (&#92;[a-z&#92;](&#92;[-a-z0-9&#92;]*&#92;[a-z0-9&#92;])?)?.
785+
* to the regular expression `([a-z]([-a-z0-9]*[a-z0-9])?)?`.
783786
* No more than 10 labels can be associated with a given finding.
784-
* Example: &lt;code&gt;"environment" : "production"&lt;/code&gt;
785-
* Example: &lt;code&gt;"pipeline" : "etl"&lt;/code&gt;
787+
* Examples:
788+
* * `"environment" : "production"`
789+
* * `"pipeline" : "etl"`
786790
* </pre>
787791
*
788792
* <code>map&lt;string, string&gt; labels = 10;</code>
@@ -2832,12 +2836,13 @@ public int getLabelsCount() {
28322836
* <pre>
28332837
* The labels associated with this `InspectFinding`.
28342838
* Label keys must be between 1 and 63 characters long and must conform
2835-
* to the following regular expression: &#92;[a-z&#92;](&#92;[-a-z0-9&#92;]*&#92;[a-z0-9&#92;])?.
2839+
* to the following regular expression: `[a-z]([-a-z0-9]*[a-z0-9])?`.
28362840
* Label values must be between 0 and 63 characters long and must conform
2837-
* to the regular expression (&#92;[a-z&#92;](&#92;[-a-z0-9&#92;]*&#92;[a-z0-9&#92;])?)?.
2841+
* to the regular expression `([a-z]([-a-z0-9]*[a-z0-9])?)?`.
28382842
* No more than 10 labels can be associated with a given finding.
2839-
* Example: &lt;code&gt;"environment" : "production"&lt;/code&gt;
2840-
* Example: &lt;code&gt;"pipeline" : "etl"&lt;/code&gt;
2843+
* Examples:
2844+
* * `"environment" : "production"`
2845+
* * `"pipeline" : "etl"`
28412846
* </pre>
28422847
*
28432848
* <code>map&lt;string, string&gt; labels = 10;</code>
@@ -2859,12 +2864,13 @@ public java.util.Map<java.lang.String, java.lang.String> getLabels() {
28592864
* <pre>
28602865
* The labels associated with this `InspectFinding`.
28612866
* Label keys must be between 1 and 63 characters long and must conform
2862-
* to the following regular expression: &#92;[a-z&#92;](&#92;[-a-z0-9&#92;]*&#92;[a-z0-9&#92;])?.
2867+
* to the following regular expression: `[a-z]([-a-z0-9]*[a-z0-9])?`.
28632868
* Label values must be between 0 and 63 characters long and must conform
2864-
* to the regular expression (&#92;[a-z&#92;](&#92;[-a-z0-9&#92;]*&#92;[a-z0-9&#92;])?)?.
2869+
* to the regular expression `([a-z]([-a-z0-9]*[a-z0-9])?)?`.
28652870
* No more than 10 labels can be associated with a given finding.
2866-
* Example: &lt;code&gt;"environment" : "production"&lt;/code&gt;
2867-
* Example: &lt;code&gt;"pipeline" : "etl"&lt;/code&gt;
2871+
* Examples:
2872+
* * `"environment" : "production"`
2873+
* * `"pipeline" : "etl"`
28682874
* </pre>
28692875
*
28702876
* <code>map&lt;string, string&gt; labels = 10;</code>
@@ -2878,12 +2884,13 @@ public java.util.Map<java.lang.String, java.lang.String> getLabelsMap() {
28782884
* <pre>
28792885
* The labels associated with this `InspectFinding`.
28802886
* Label keys must be between 1 and 63 characters long and must conform
2881-
* to the following regular expression: &#92;[a-z&#92;](&#92;[-a-z0-9&#92;]*&#92;[a-z0-9&#92;])?.
2887+
* to the following regular expression: `[a-z]([-a-z0-9]*[a-z0-9])?`.
28822888
* Label values must be between 0 and 63 characters long and must conform
2883-
* to the regular expression (&#92;[a-z&#92;](&#92;[-a-z0-9&#92;]*&#92;[a-z0-9&#92;])?)?.
2889+
* to the regular expression `([a-z]([-a-z0-9]*[a-z0-9])?)?`.
28842890
* No more than 10 labels can be associated with a given finding.
2885-
* Example: &lt;code&gt;"environment" : "production"&lt;/code&gt;
2886-
* Example: &lt;code&gt;"pipeline" : "etl"&lt;/code&gt;
2891+
* Examples:
2892+
* * `"environment" : "production"`
2893+
* * `"pipeline" : "etl"`
28872894
* </pre>
28882895
*
28892896
* <code>map&lt;string, string&gt; labels = 10;</code>
@@ -2902,12 +2909,13 @@ public java.lang.String getLabelsOrDefault(
29022909
* <pre>
29032910
* The labels associated with this `InspectFinding`.
29042911
* Label keys must be between 1 and 63 characters long and must conform
2905-
* to the following regular expression: &#92;[a-z&#92;](&#92;[-a-z0-9&#92;]*&#92;[a-z0-9&#92;])?.
2912+
* to the following regular expression: `[a-z]([-a-z0-9]*[a-z0-9])?`.
29062913
* Label values must be between 0 and 63 characters long and must conform
2907-
* to the regular expression (&#92;[a-z&#92;](&#92;[-a-z0-9&#92;]*&#92;[a-z0-9&#92;])?)?.
2914+
* to the regular expression `([a-z]([-a-z0-9]*[a-z0-9])?)?`.
29082915
* No more than 10 labels can be associated with a given finding.
2909-
* Example: &lt;code&gt;"environment" : "production"&lt;/code&gt;
2910-
* Example: &lt;code&gt;"pipeline" : "etl"&lt;/code&gt;
2916+
* Examples:
2917+
* * `"environment" : "production"`
2918+
* * `"pipeline" : "etl"`
29112919
* </pre>
29122920
*
29132921
* <code>map&lt;string, string&gt; labels = 10;</code>
@@ -2933,12 +2941,13 @@ public Builder clearLabels() {
29332941
* <pre>
29342942
* The labels associated with this `InspectFinding`.
29352943
* Label keys must be between 1 and 63 characters long and must conform
2936-
* to the following regular expression: &#92;[a-z&#92;](&#92;[-a-z0-9&#92;]*&#92;[a-z0-9&#92;])?.
2944+
* to the following regular expression: `[a-z]([-a-z0-9]*[a-z0-9])?`.
29372945
* Label values must be between 0 and 63 characters long and must conform
2938-
* to the regular expression (&#92;[a-z&#92;](&#92;[-a-z0-9&#92;]*&#92;[a-z0-9&#92;])?)?.
2946+
* to the regular expression `([a-z]([-a-z0-9]*[a-z0-9])?)?`.
29392947
* No more than 10 labels can be associated with a given finding.
2940-
* Example: &lt;code&gt;"environment" : "production"&lt;/code&gt;
2941-
* Example: &lt;code&gt;"pipeline" : "etl"&lt;/code&gt;
2948+
* Examples:
2949+
* * `"environment" : "production"`
2950+
* * `"pipeline" : "etl"`
29422951
* </pre>
29432952
*
29442953
* <code>map&lt;string, string&gt; labels = 10;</code>
@@ -2961,12 +2970,13 @@ public java.util.Map<java.lang.String, java.lang.String> getMutableLabels() {
29612970
* <pre>
29622971
* The labels associated with this `InspectFinding`.
29632972
* Label keys must be between 1 and 63 characters long and must conform
2964-
* to the following regular expression: &#92;[a-z&#92;](&#92;[-a-z0-9&#92;]*&#92;[a-z0-9&#92;])?.
2973+
* to the following regular expression: `[a-z]([-a-z0-9]*[a-z0-9])?`.
29652974
* Label values must be between 0 and 63 characters long and must conform
2966-
* to the regular expression (&#92;[a-z&#92;](&#92;[-a-z0-9&#92;]*&#92;[a-z0-9&#92;])?)?.
2975+
* to the regular expression `([a-z]([-a-z0-9]*[a-z0-9])?)?`.
29672976
* No more than 10 labels can be associated with a given finding.
2968-
* Example: &lt;code&gt;"environment" : "production"&lt;/code&gt;
2969-
* Example: &lt;code&gt;"pipeline" : "etl"&lt;/code&gt;
2977+
* Examples:
2978+
* * `"environment" : "production"`
2979+
* * `"pipeline" : "etl"`
29702980
* </pre>
29712981
*
29722982
* <code>map&lt;string, string&gt; labels = 10;</code>
@@ -2987,12 +2997,13 @@ public Builder putLabels(java.lang.String key, java.lang.String value) {
29872997
* <pre>
29882998
* The labels associated with this `InspectFinding`.
29892999
* Label keys must be between 1 and 63 characters long and must conform
2990-
* to the following regular expression: &#92;[a-z&#92;](&#92;[-a-z0-9&#92;]*&#92;[a-z0-9&#92;])?.
3000+
* to the following regular expression: `[a-z]([-a-z0-9]*[a-z0-9])?`.
29913001
* Label values must be between 0 and 63 characters long and must conform
2992-
* to the regular expression (&#92;[a-z&#92;](&#92;[-a-z0-9&#92;]*&#92;[a-z0-9&#92;])?)?.
3002+
* to the regular expression `([a-z]([-a-z0-9]*[a-z0-9])?)?`.
29933003
* No more than 10 labels can be associated with a given finding.
2994-
* Example: &lt;code&gt;"environment" : "production"&lt;/code&gt;
2995-
* Example: &lt;code&gt;"pipeline" : "etl"&lt;/code&gt;
3004+
* Examples:
3005+
* * `"environment" : "production"`
3006+
* * `"pipeline" : "etl"`
29963007
* </pre>
29973008
*
29983009
* <code>map&lt;string, string&gt; labels = 10;</code>

0 commit comments

Comments
 (0)