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 <chingor@google.com> 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 <chingor@google.com> 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 <chingor@google.com> 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.
googleapis · Apr 9, 2020 · 69517fc · 69517fc
1 parent a77fe01
commit 69517fc
Show file tree

Hide file tree

Showing 16 changed files with 342 additions and 248 deletions.
diff --git a/.kokoro/common.sh b/.kokoro/common.sh
@@ -13,18 +13,28 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# set -eo pipefail
-
 function retry_with_backoff {
     attempts_left=$1
     sleep_seconds=$2
     shift 2
     command=$@
 
+
+    # store current flag state
+    flags=$-
+
+    # allow a failures to continue
+    set +e
     echo "${command}"
     ${command}
     exit_code=$?
 
+    # restore "e" flag
+    if [[ ${flags} =~ e ]]
+    then set -e
+    else set +e
+    fi
+
     if [[ $exit_code == 0 ]]
     then
         return 0

diff --git a/.kokoro/nightly/integration.cfg b/.kokoro/nightly/integration.cfg
@@ -6,11 +6,26 @@ env_vars: {
   value: "gcr.io/cloud-devrel-kokoro-resources/java8"
 }
 
+env_vars: {
+  key: "JOB_TYPE"
+  value: "integration"
+}
+
+env_vars: {
+  key: "GCLOUD_PROJECT"
+  value: "gcloud-devel"
+}
+
 env_vars: {
   key: "ENABLE_BUILD_COP"
   value: "true"
 }
 
+env_vars: {
+    key: "GOOGLE_APPLICATION_CREDENTIALS"
+    value: "keystore/73713_java_it_service_account"
+}
+
 before_action {
   fetch_keystore {
     keystore_resource {

diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>libraries-bom</artifactId>
-      <version>4.3.0</version>
+      <version>4.4.1</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>
@@ -32,19 +32,19 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
 
 ```
 
-[//]: # ({x-version-update-start:google-cloud-dlp:released})
-
 If you are using Maven without BOM, add this to your dependencies:
 
 ```xml
 <dependency>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-dlp</artifactId>
-  <version>1.1.1</version>
+  <version>1.1.0</version>
 </dependency>
 
 ```
 
+[//]: # ({x-version-update-start:google-cloud-dlp:released})
+
 If you are using Gradle, add this to your dependencies
 ```Groovy
 compile 'com.google.cloud:google-cloud-dlp:1.1.1'

diff --git a/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DlpProto.java b/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DlpProto.java
@@ -1785,13 +1785,13 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "/{name=projects/*/locations/*/dlpJobs/*}"
           + ":finish:\001*\032F\312A\022dlp.googleapis.com\322A.http"
           + "s://www.googleapis.com/auth/cloud-platfo"
-          + "rmB\354\001\n\031com.google.privacy.dlp.v2B\010DlpPro"
+          + "rmB\205\002\n\031com.google.privacy.dlp.v2B\010DlpPro"
           + "toP\001Z8google.golang.org/genproto/googlea"
           + "pis/privacy/dlp/v2;dlp\252\002\023Google.Cloud.Dl"
-          + "p.V2\312\002\023Google\\Cloud\\Dlp\\V2\352A\\\n\'dlp.googl"
-          + "eapis.com/OrganizationLocation\0221organiza"
-          + "tions/{organization}/locations/{location"
-          + "}b\006proto3"
+          + "p.V2\312\002\023Google\\Cloud\\Dlp\\V2\352\002\026Google::Clo"
+          + "ud::Dlp::V2\352A\\\n\'dlp.googleapis.com/Organ"
+          + "izationLocation\0221organizations/{organiza"
+          + "tion}/locations/{location}b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(

diff --git a/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DlpStorage.java b/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DlpStorage.java
@@ -294,11 +294,12 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "LIKELY\020\001\022\014\n\010UNLIKELY\020\002\022\014\n\010POSSIBLE\020\003\022\n\n\006"
           + "LIKELY\020\004\022\017\n\013VERY_LIKELY\020\005*Z\n\010FileType\022\031\n"
           + "\025FILE_TYPE_UNSPECIFIED\020\000\022\017\n\013BINARY_FILE\020"
-          + "\001\022\r\n\tTEXT_FILE\020\002\022\t\n\005IMAGE\020\003\022\010\n\004AVRO\020\007B\217\001"
+          + "\001\022\r\n\tTEXT_FILE\020\002\022\t\n\005IMAGE\020\003\022\010\n\004AVRO\020\007B\250\001"
           + "\n\031com.google.privacy.dlp.v2B\nDlpStorageP"
           + "\001Z8google.golang.org/genproto/googleapis"
           + "/privacy/dlp/v2;dlp\252\002\023Google.Cloud.Dlp.V"
-          + "2\312\002\023Google\\Cloud\\Dlp\\V2b\006proto3"
+          + "2\312\002\023Google\\Cloud\\Dlp\\V2\352\002\026Google::Cloud:"
+          + ":Dlp::V2b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(

diff --git a/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Finding.java b/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Finding.java
@@ -708,12 +708,13 @@ public int getLabelsCount() {
    * <pre>
    * The labels associated with this `InspectFinding`.
    * Label keys must be between 1 and 63 characters long and must conform
-   * to the following regular expression: &#92;[a-z&#92;](&#92;[-a-z0-9&#92;]*&#92;[a-z0-9&#92;])?.
+   * to the following regular expression: `[a-z]([-a-z0-9]*[a-z0-9])?`.
    * Label values must be between 0 and 63 characters long and must conform
-   * to the regular expression (&#92;[a-z&#92;](&#92;[-a-z0-9&#92;]*&#92;[a-z0-9&#92;])?)?.
+   * to the regular expression `([a-z]([-a-z0-9]*[a-z0-9])?)?`.
    * No more than 10 labels can be associated with a given finding.
-   * Example: &lt;code&gt;"environment" : "production"&lt;/code&gt;
-   * Example: &lt;code&gt;"pipeline" : "etl"&lt;/code&gt;
+   * Examples:
+   * * `"environment" : "production"`
+   * * `"pipeline" : "etl"`
    * </pre>
    *
    * <code>map&lt;string, string&gt; labels = 10;</code>
@@ -735,12 +736,13 @@ public java.util.Map<java.lang.String, java.lang.String> getLabels() {
    * <pre>
    * The labels associated with this `InspectFinding`.
    * Label keys must be between 1 and 63 characters long and must conform
-   * to the following regular expression: &#92;[a-z&#92;](&#92;[-a-z0-9&#92;]*&#92;[a-z0-9&#92;])?.
+   * to the following regular expression: `[a-z]([-a-z0-9]*[a-z0-9])?`.
    * Label values must be between 0 and 63 characters long and must conform
-   * to the regular expression (&#92;[a-z&#92;](&#92;[-a-z0-9&#92;]*&#92;[a-z0-9&#92;])?)?.
+   * to the regular expression `([a-z]([-a-z0-9]*[a-z0-9])?)?`.
    * No more than 10 labels can be associated with a given finding.
-   * Example: &lt;code&gt;"environment" : "production"&lt;/code&gt;
-   * Example: &lt;code&gt;"pipeline" : "etl"&lt;/code&gt;
+   * Examples:
+   * * `"environment" : "production"`
+   * * `"pipeline" : "etl"`
    * </pre>
    *
    * <code>map&lt;string, string&gt; labels = 10;</code>
@@ -754,12 +756,13 @@ public java.util.Map<java.lang.String, java.lang.String> getLabelsMap() {
    * <pre>
    * The labels associated with this `InspectFinding`.
    * Label keys must be between 1 and 63 characters long and must conform
-   * to the following regular expression: &#92;[a-z&#92;](&#92;[-a-z0-9&#92;]*&#92;[a-z0-9&#92;])?.
+   * to the following regular expression: `[a-z]([-a-z0-9]*[a-z0-9])?`.
    * Label values must be between 0 and 63 characters long and must conform
-   * to the regular expression (&#92;[a-z&#92;](&#92;[-a-z0-9&#92;]*&#92;[a-z0-9&#92;])?)?.
+   * to the regular expression `([a-z]([-a-z0-9]*[a-z0-9])?)?`.
    * No more than 10 labels can be associated with a given finding.
-   * Example: &lt;code&gt;"environment" : "production"&lt;/code&gt;
-   * Example: &lt;code&gt;"pipeline" : "etl"&lt;/code&gt;
+   * Examples:
+   * * `"environment" : "production"`
+   * * `"pipeline" : "etl"`
    * </pre>
    *
    * <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
    * <pre>
    * The labels associated with this `InspectFinding`.
    * Label keys must be between 1 and 63 characters long and must conform
-   * to the following regular expression: &#92;[a-z&#92;](&#92;[-a-z0-9&#92;]*&#92;[a-z0-9&#92;])?.
+   * to the following regular expression: `[a-z]([-a-z0-9]*[a-z0-9])?`.
    * Label values must be between 0 and 63 characters long and must conform
-   * to the regular expression (&#92;[a-z&#92;](&#92;[-a-z0-9&#92;]*&#92;[a-z0-9&#92;])?)?.
+   * to the regular expression `([a-z]([-a-z0-9]*[a-z0-9])?)?`.
    * No more than 10 labels can be associated with a given finding.
-   * Example: &lt;code&gt;"environment" : "production"&lt;/code&gt;
-   * Example: &lt;code&gt;"pipeline" : "etl"&lt;/code&gt;
+   * Examples:
+   * * `"environment" : "production"`
+   * * `"pipeline" : "etl"`
    * </pre>
    *
    * <code>map&lt;string, string&gt; labels = 10;</code>
@@ -2832,12 +2836,13 @@ public int getLabelsCount() {
      * <pre>
      * The labels associated with this `InspectFinding`.
      * Label keys must be between 1 and 63 characters long and must conform
-     * to the following regular expression: &#92;[a-z&#92;](&#92;[-a-z0-9&#92;]*&#92;[a-z0-9&#92;])?.
+     * to the following regular expression: `[a-z]([-a-z0-9]*[a-z0-9])?`.
      * Label values must be between 0 and 63 characters long and must conform
-     * to the regular expression (&#92;[a-z&#92;](&#92;[-a-z0-9&#92;]*&#92;[a-z0-9&#92;])?)?.
+     * to the regular expression `([a-z]([-a-z0-9]*[a-z0-9])?)?`.
      * No more than 10 labels can be associated with a given finding.
-     * Example: &lt;code&gt;"environment" : "production"&lt;/code&gt;
-     * Example: &lt;code&gt;"pipeline" : "etl"&lt;/code&gt;
+     * Examples:
+     * * `"environment" : "production"`
+     * * `"pipeline" : "etl"`
      * </pre>
      *
      * <code>map&lt;string, string&gt; labels = 10;</code>
@@ -2859,12 +2864,13 @@ public java.util.Map<java.lang.String, java.lang.String> getLabels() {
      * <pre>
      * The labels associated with this `InspectFinding`.
      * Label keys must be between 1 and 63 characters long and must conform
-     * to the following regular expression: &#92;[a-z&#92;](&#92;[-a-z0-9&#92;]*&#92;[a-z0-9&#92;])?.
+     * to the following regular expression: `[a-z]([-a-z0-9]*[a-z0-9])?`.
      * Label values must be between 0 and 63 characters long and must conform
-     * to the regular expression (&#92;[a-z&#92;](&#92;[-a-z0-9&#92;]*&#92;[a-z0-9&#92;])?)?.
+     * to the regular expression `([a-z]([-a-z0-9]*[a-z0-9])?)?`.
      * No more than 10 labels can be associated with a given finding.
-     * Example: &lt;code&gt;"environment" : "production"&lt;/code&gt;
-     * Example: &lt;code&gt;"pipeline" : "etl"&lt;/code&gt;
+     * Examples:
+     * * `"environment" : "production"`
+     * * `"pipeline" : "etl"`
      * </pre>
      *
      * <code>map&lt;string, string&gt; labels = 10;</code>
@@ -2878,12 +2884,13 @@ public java.util.Map<java.lang.String, java.lang.String> getLabelsMap() {
      * <pre>
      * The labels associated with this `InspectFinding`.
      * Label keys must be between 1 and 63 characters long and must conform
-     * to the following regular expression: &#92;[a-z&#92;](&#92;[-a-z0-9&#92;]*&#92;[a-z0-9&#92;])?.
+     * to the following regular expression: `[a-z]([-a-z0-9]*[a-z0-9])?`.
      * Label values must be between 0 and 63 characters long and must conform
-     * to the regular expression (&#92;[a-z&#92;](&#92;[-a-z0-9&#92;]*&#92;[a-z0-9&#92;])?)?.
+     * to the regular expression `([a-z]([-a-z0-9]*[a-z0-9])?)?`.
      * No more than 10 labels can be associated with a given finding.
-     * Example: &lt;code&gt;"environment" : "production"&lt;/code&gt;
-     * Example: &lt;code&gt;"pipeline" : "etl"&lt;/code&gt;
+     * Examples:
+     * * `"environment" : "production"`
+     * * `"pipeline" : "etl"`
      * </pre>
      *
      * <code>map&lt;string, string&gt; labels = 10;</code>
@@ -2902,12 +2909,13 @@ public java.lang.String getLabelsOrDefault(
      * <pre>
      * The labels associated with this `InspectFinding`.
      * Label keys must be between 1 and 63 characters long and must conform
-     * to the following regular expression: &#92;[a-z&#92;](&#92;[-a-z0-9&#92;]*&#92;[a-z0-9&#92;])?.
+     * to the following regular expression: `[a-z]([-a-z0-9]*[a-z0-9])?`.
      * Label values must be between 0 and 63 characters long and must conform
-     * to the regular expression (&#92;[a-z&#92;](&#92;[-a-z0-9&#92;]*&#92;[a-z0-9&#92;])?)?.
+     * to the regular expression `([a-z]([-a-z0-9]*[a-z0-9])?)?`.
      * No more than 10 labels can be associated with a given finding.
-     * Example: &lt;code&gt;"environment" : "production"&lt;/code&gt;
-     * Example: &lt;code&gt;"pipeline" : "etl"&lt;/code&gt;
+     * Examples:
+     * * `"environment" : "production"`
+     * * `"pipeline" : "etl"`
      * </pre>
      *
      * <code>map&lt;string, string&gt; labels = 10;</code>
@@ -2933,12 +2941,13 @@ public Builder clearLabels() {
      * <pre>
      * The labels associated with this `InspectFinding`.
      * Label keys must be between 1 and 63 characters long and must conform
-     * to the following regular expression: &#92;[a-z&#92;](&#92;[-a-z0-9&#92;]*&#92;[a-z0-9&#92;])?.
+     * to the following regular expression: `[a-z]([-a-z0-9]*[a-z0-9])?`.
      * Label values must be between 0 and 63 characters long and must conform
-     * to the regular expression (&#92;[a-z&#92;](&#92;[-a-z0-9&#92;]*&#92;[a-z0-9&#92;])?)?.
+     * to the regular expression `([a-z]([-a-z0-9]*[a-z0-9])?)?`.
      * No more than 10 labels can be associated with a given finding.
-     * Example: &lt;code&gt;"environment" : "production"&lt;/code&gt;
-     * Example: &lt;code&gt;"pipeline" : "etl"&lt;/code&gt;
+     * Examples:
+     * * `"environment" : "production"`
+     * * `"pipeline" : "etl"`
      * </pre>
      *
      * <code>map&lt;string, string&gt; labels = 10;</code>
@@ -2961,12 +2970,13 @@ public java.util.Map<java.lang.String, java.lang.String> getMutableLabels() {
      * <pre>
      * The labels associated with this `InspectFinding`.
      * Label keys must be between 1 and 63 characters long and must conform
-     * to the following regular expression: &#92;[a-z&#92;](&#92;[-a-z0-9&#92;]*&#92;[a-z0-9&#92;])?.
+     * to the following regular expression: `[a-z]([-a-z0-9]*[a-z0-9])?`.
      * Label values must be between 0 and 63 characters long and must conform
-     * to the regular expression (&#92;[a-z&#92;](&#92;[-a-z0-9&#92;]*&#92;[a-z0-9&#92;])?)?.
+     * to the regular expression `([a-z]([-a-z0-9]*[a-z0-9])?)?`.
      * No more than 10 labels can be associated with a given finding.
-     * Example: &lt;code&gt;"environment" : "production"&lt;/code&gt;
-     * Example: &lt;code&gt;"pipeline" : "etl"&lt;/code&gt;
+     * Examples:
+     * * `"environment" : "production"`
+     * * `"pipeline" : "etl"`
      * </pre>
      *
      * <code>map&lt;string, string&gt; labels = 10;</code>
@@ -2987,12 +2997,13 @@ public Builder putLabels(java.lang.String key, java.lang.String value) {
      * <pre>
      * The labels associated with this `InspectFinding`.
      * Label keys must be between 1 and 63 characters long and must conform
-     * to the following regular expression: &#92;[a-z&#92;](&#92;[-a-z0-9&#92;]*&#92;[a-z0-9&#92;])?.
+     * to the following regular expression: `[a-z]([-a-z0-9]*[a-z0-9])?`.
      * Label values must be between 0 and 63 characters long and must conform
-     * to the regular expression (&#92;[a-z&#92;](&#92;[-a-z0-9&#92;]*&#92;[a-z0-9&#92;])?)?.
+     * to the regular expression `([a-z]([-a-z0-9]*[a-z0-9])?)?`.
      * No more than 10 labels can be associated with a given finding.
-     * Example: &lt;code&gt;"environment" : "production"&lt;/code&gt;
-     * Example: &lt;code&gt;"pipeline" : "etl"&lt;/code&gt;
+     * Examples:
+     * * `"environment" : "production"`
+     * * `"pipeline" : "etl"`
      * </pre>
      *
      * <code>map&lt;string, string&gt; labels = 10;</code>