chore: migrate to owlbot (#664)

googleapis · Sep 9, 2021 · ce8addc · ce8addc
1 parent fec6e09
commit ce8addc
Show file tree

Hide file tree

Showing 33 changed files with 364 additions and 590 deletions.
diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
@@ -0,0 +1,3 @@
+docker:
+  digest: sha256:4837f2a7fdff2985b4f7432f8a6d6a87beacebf3ac071746532c0ce2e3f24b9b
+  image: gcr.io/repo-automation-bots/owlbot-java:latest
diff --git a/.github/.OwlBot.yaml b/.github/.OwlBot.yaml
@@ -0,0 +1,32 @@
+# Copyright 2021 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+docker:
+  image: "gcr.io/repo-automation-bots/owlbot-java:latest"
+
+deep-remove-regex:
+- "/grpc-google-.*/src"
+- "/proto-google-.*/src"
+- "/google-.*/src"
+
+deep-preserve-regex:
+- "/google-.*/src/test/java/com/google/cloud/.*/v.*/it/IT.*Test.java"
+
+deep-copy-regex:
+- source: "/google/cloud/videointelligence/(v.*)/.*-java/proto-google-.*/src"
+  dest: "/owl-bot-staging/$1/proto-google-cloud-video-intelligence-$1/src"
+- source: "/google/cloud/videointelligence/(v.*)/.*-java/grpc-google-.*/src"
+  dest: "/owl-bot-staging/$1/grpc-google-cloud-video-intelligence-$1/src"
+- source: "/google/cloud/videointelligence/(v.*)/.*-java/gapic-google-.*/src"
+  dest: "/owl-bot-staging/$1/google-cloud-video-intelligence/src"
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -78,4 +78,4 @@ jobs:
     - run: java -version
     - run: .kokoro/build.sh
       env:
-        JOB_TYPE: clirr
+        JOB_TYPE: clirr
diff --git a/README.md b/README.md
@@ -45,7 +45,7 @@ If you are using Maven without BOM, add this to your dependencies:
 <dependency>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-video-intelligence</artifactId>
-  <version>2.0.4</version>
+  <version>2.0.5</version>
 </dependency>
 <dependency>
   <groupId>com.google.cloud</groupId>
@@ -58,20 +58,20 @@ If you are using Maven without BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:22.0.0')
+implementation platform('com.google.cloud:libraries-bom:23.0.0')
 
 implementation 'com.google.cloud:google-cloud-video-intelligence'
 ```
 If you are using Gradle without BOM, add this to your dependencies
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-video-intelligence:2.0.4'
+implementation 'com.google.cloud:google-cloud-video-intelligence:2.0.5'
 ```
 
 If you are using SBT, add this to your dependencies
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-video-intelligence" % "2.0.4"
+libraryDependencies += "com.google.cloud" % "google-cloud-video-intelligence" % "2.0.5"
 ```
 
 ## Authentication
@@ -115,8 +115,6 @@ Samples are in the [`samples/`](https://github.com/googleapis/java-video-intelli
 
 | Sample                      | Source Code                       | Try it |
 | --------------------------- | --------------------------------- | ------ |
-| None | [source code](https://github.com/googleapis/java-video-intelligence/blob/master/samples/generated/src/main/java/com/google/cloud/examples/videointelligence/v1p3beta1/VideoDetectLogoBeta.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-video-intelligence&page=editor&open_in_editor=samples/generated/src/main/java/com/google/cloud/examples/videointelligence/v1p3beta1/VideoDetectLogoBeta.java) |
-| None | [source code](https://github.com/googleapis/java-video-intelligence/blob/master/samples/generated/src/main/java/com/google/cloud/examples/videointelligence/v1p3beta1/VideoDetectLogoGcsBeta.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-video-intelligence&page=editor&open_in_editor=samples/generated/src/main/java/com/google/cloud/examples/videointelligence/v1p3beta1/VideoDetectLogoGcsBeta.java) |
 | Detect | [source code](https://github.com/googleapis/java-video-intelligence/blob/master/samples/snippets/src/main/java/beta/video/Detect.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-video-intelligence&page=editor&open_in_editor=samples/snippets/src/main/java/beta/video/Detect.java) |
 | Detect Logo | [source code](https://github.com/googleapis/java-video-intelligence/blob/master/samples/snippets/src/main/java/beta/video/DetectLogo.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-video-intelligence&page=editor&open_in_editor=samples/snippets/src/main/java/beta/video/DetectLogo.java) |
 | Detect Logo Gcs | [source code](https://github.com/googleapis/java-video-intelligence/blob/master/samples/snippets/src/main/java/beta/video/DetectLogoGcs.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-video-intelligence&page=editor&open_in_editor=samples/snippets/src/main/java/beta/video/DetectLogoGcs.java) |

diff --git a/google-cloud-video-intelligence-bom/pom.xml b/google-cloud-video-intelligence-bom/pom.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.cloud</groupId>
@@ -49,56 +49,55 @@
 
   <dependencyManagement>
     <dependencies>
-
       <dependency>
-        <groupId>com.google.api.grpc</groupId>
-        <artifactId>proto-google-cloud-video-intelligence-v1p3beta1</artifactId>
-        <version>0.90.6-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-video-intelligence-v1p3beta1:current} -->
+        <groupId>com.google.cloud</groupId>
+        <artifactId>google-cloud-video-intelligence</artifactId>
+        <version>2.0.6-SNAPSHOT</version><!-- {x-version-update:google-cloud-video-intelligence:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>grpc-google-cloud-video-intelligence-v1p1beta1</artifactId>
         <version>0.90.6-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-video-intelligence-v1p1beta1:current} -->
       </dependency>
-      <dependency>
-        <groupId>com.google.cloud</groupId>
-        <artifactId>google-cloud-video-intelligence</artifactId>
-        <version>2.0.6-SNAPSHOT</version><!-- {x-version-update:google-cloud-video-intelligence:current} -->
-      </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>grpc-google-cloud-video-intelligence-v1beta2</artifactId>
         <version>0.90.6-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-video-intelligence-v1beta2:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
-        <artifactId>proto-google-cloud-video-intelligence-v1beta2</artifactId>
-        <version>0.90.6-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-video-intelligence-v1beta2:current} -->
+        <artifactId>grpc-google-cloud-video-intelligence-v1</artifactId>
+        <version>2.0.6-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-video-intelligence-v1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
-        <artifactId>proto-google-cloud-video-intelligence-v1p1beta1</artifactId>
-        <version>0.90.6-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-video-intelligence-v1p1beta1:current} -->
+        <artifactId>grpc-google-cloud-video-intelligence-v1p2beta1</artifactId>
+        <version>0.90.6-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-video-intelligence-v1p2beta1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
-        <artifactId>grpc-google-cloud-video-intelligence-v1</artifactId>
-        <version>2.0.6-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-video-intelligence-v1:current} -->
+        <artifactId>grpc-google-cloud-video-intelligence-v1p3beta1</artifactId>
+        <version>0.90.6-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-video-intelligence-v1p3beta1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
-        <artifactId>proto-google-cloud-video-intelligence-v1</artifactId>
-        <version>2.0.6-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-video-intelligence-v1:current} -->
+        <artifactId>proto-google-cloud-video-intelligence-v1p3beta1</artifactId>
+        <version>0.90.6-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-video-intelligence-v1p3beta1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
-        <artifactId>grpc-google-cloud-video-intelligence-v1p2beta1</artifactId>
-        <version>0.90.6-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-video-intelligence-v1p2beta1:current} -->
+        <artifactId>proto-google-cloud-video-intelligence-v1beta2</artifactId>
+        <version>0.90.6-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-video-intelligence-v1beta2:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
-        <artifactId>grpc-google-cloud-video-intelligence-v1p3beta1</artifactId>
-        <version>0.90.6-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-video-intelligence-v1p3beta1:current} -->
+        <artifactId>proto-google-cloud-video-intelligence-v1p1beta1</artifactId>
+        <version>0.90.6-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-video-intelligence-v1p1beta1:current} -->
+      </dependency>
+      <dependency>
+        <groupId>com.google.api.grpc</groupId>
+        <artifactId>proto-google-cloud-video-intelligence-v1</artifactId>
+        <version>2.0.6-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-video-intelligence-v1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>

diff --git a/google-cloud-video-intelligence/pom.xml b/google-cloud-video-intelligence/pom.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.cloud</groupId>
@@ -143,4 +143,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
+</project>
diff --git a/...java/com/google/cloud/videointelligence/v1/stub/VideoIntelligenceServiceStubSettings.java b/...java/com/google/cloud/videointelligence/v1/stub/VideoIntelligenceServiceStubSettings.java
@@ -139,7 +139,9 @@ public static List<String> getDefaultServiceScopes() {
 
   /** Returns a builder for the default credentials for this service. */
   public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilder() {
-    return GoogleCredentialsProvider.newBuilder().setScopesToApply(DEFAULT_SERVICE_SCOPES);
+    return GoogleCredentialsProvider.newBuilder()
+        .setScopesToApply(DEFAULT_SERVICE_SCOPES)
+        .setUseJwtAccessWithScope(true);
   }
 
   /** Returns a builder for the default ChannelProvider for this service. */

diff --git a/...com/google/cloud/videointelligence/v1beta2/stub/VideoIntelligenceServiceStubSettings.java b/...com/google/cloud/videointelligence/v1beta2/stub/VideoIntelligenceServiceStubSettings.java
@@ -140,7 +140,9 @@ public static List<String> getDefaultServiceScopes() {
 
   /** Returns a builder for the default credentials for this service. */
   public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilder() {
-    return GoogleCredentialsProvider.newBuilder().setScopesToApply(DEFAULT_SERVICE_SCOPES);
+    return GoogleCredentialsProvider.newBuilder()
+        .setScopesToApply(DEFAULT_SERVICE_SCOPES)
+        .setUseJwtAccessWithScope(true);
   }
 
   /** Returns a builder for the default ChannelProvider for this service. */

diff --git a/...m/google/cloud/videointelligence/v1p1beta1/stub/VideoIntelligenceServiceStubSettings.java b/...m/google/cloud/videointelligence/v1p1beta1/stub/VideoIntelligenceServiceStubSettings.java
@@ -140,7 +140,9 @@ public static List<String> getDefaultServiceScopes() {
 
   /** Returns a builder for the default credentials for this service. */
   public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilder() {
-    return GoogleCredentialsProvider.newBuilder().setScopesToApply(DEFAULT_SERVICE_SCOPES);
+    return GoogleCredentialsProvider.newBuilder()
+        .setScopesToApply(DEFAULT_SERVICE_SCOPES)
+        .setUseJwtAccessWithScope(true);
   }
 
   /** Returns a builder for the default ChannelProvider for this service. */

diff --git a/...m/google/cloud/videointelligence/v1p2beta1/stub/VideoIntelligenceServiceStubSettings.java b/...m/google/cloud/videointelligence/v1p2beta1/stub/VideoIntelligenceServiceStubSettings.java
@@ -140,7 +140,9 @@ public static List<String> getDefaultServiceScopes() {
 
   /** Returns a builder for the default credentials for this service. */
   public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilder() {
-    return GoogleCredentialsProvider.newBuilder().setScopesToApply(DEFAULT_SERVICE_SCOPES);
+    return GoogleCredentialsProvider.newBuilder()
+        .setScopesToApply(DEFAULT_SERVICE_SCOPES)
+        .setUseJwtAccessWithScope(true);
   }
 
   /** Returns a builder for the default ChannelProvider for this service. */

diff --git a/...cloud/videointelligence/v1p3beta1/stub/StreamingVideoIntelligenceServiceStubSettings.java b/...cloud/videointelligence/v1p3beta1/stub/StreamingVideoIntelligenceServiceStubSettings.java
@@ -129,7 +129,9 @@ public static List<String> getDefaultServiceScopes() {
 
   /** Returns a builder for the default credentials for this service. */
   public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilder() {
-    return GoogleCredentialsProvider.newBuilder().setScopesToApply(DEFAULT_SERVICE_SCOPES);
+    return GoogleCredentialsProvider.newBuilder()
+        .setScopesToApply(DEFAULT_SERVICE_SCOPES)
+        .setUseJwtAccessWithScope(true);
   }
 
   /** Returns a builder for the default ChannelProvider for this service. */

diff --git a/...m/google/cloud/videointelligence/v1p3beta1/stub/VideoIntelligenceServiceStubSettings.java b/...m/google/cloud/videointelligence/v1p3beta1/stub/VideoIntelligenceServiceStubSettings.java
@@ -140,7 +140,9 @@ public static List<String> getDefaultServiceScopes() {
 
   /** Returns a builder for the default credentials for this service. */
   public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilder() {
-    return GoogleCredentialsProvider.newBuilder().setScopesToApply(DEFAULT_SERVICE_SCOPES);
+    return GoogleCredentialsProvider.newBuilder()
+        .setScopesToApply(DEFAULT_SERVICE_SCOPES)
+        .setUseJwtAccessWithScope(true);
   }
 
   /** Returns a builder for the default ChannelProvider for this service. */

diff --git a/owlbot.py b/owlbot.py
@@ -0,0 +1,24 @@
+# Copyright 2021 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import synthtool as s
+from synthtool.languages import java
+
+
+for library in s.get_staging_dirs():
+    # put any special-case replacements here
+    s.move(library)
+
+s.remove_staging_dirs()
+java.common_templates()
diff --git a/pom.xml b/pom.xml
@@ -154,17 +154,17 @@
   </build>
 
   <modules>
-    <module>proto-google-cloud-video-intelligence-v1p3beta1</module>
-    <module>proto-google-cloud-video-intelligence-v1beta2</module>
-    <module>proto-google-cloud-video-intelligence-v1p1beta1</module>
-    <module>proto-google-cloud-video-intelligence-v1</module>
-    <module>proto-google-cloud-video-intelligence-v1p2beta1</module>
+    <module>google-cloud-video-intelligence</module>
     <module>grpc-google-cloud-video-intelligence-v1p1beta1</module>
     <module>grpc-google-cloud-video-intelligence-v1beta2</module>
     <module>grpc-google-cloud-video-intelligence-v1</module>
     <module>grpc-google-cloud-video-intelligence-v1p2beta1</module>
     <module>grpc-google-cloud-video-intelligence-v1p3beta1</module>
-    <module>google-cloud-video-intelligence</module>
+    <module>proto-google-cloud-video-intelligence-v1p3beta1</module>
+    <module>proto-google-cloud-video-intelligence-v1beta2</module>
+    <module>proto-google-cloud-video-intelligence-v1p1beta1</module>
+    <module>proto-google-cloud-video-intelligence-v1</module>
+    <module>proto-google-cloud-video-intelligence-v1p2beta1</module>
     <module>google-cloud-video-intelligence-bom</module>
   </modules>
 
@@ -237,4 +237,4 @@
       </plugin>
     </plugins>
   </reporting>
-</project>
+</project>
diff --git a/proto-google-cloud-video-intelligence-v1beta2/clirr-ignored-differences.xml b/proto-google-cloud-video-intelligence-v1beta2/clirr-ignored-differences.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- see http://www.mojohaus.org/clirr-maven-plugin/examples/ignored-differences.html -->
+<differences>
+  <difference>
+    <differenceType>7012</differenceType>
+    <className>com/google/cloud/videointelligence/v1beta2/*OrBuilder</className>
+    <method>* get*(*)</method>
+  </difference>
+  <difference>
+    <differenceType>7012</differenceType>
+    <className>com/google/cloud/videointelligence/v1beta2/*OrBuilder</className>
+    <method>boolean contains*(*)</method>
+  </difference>
+  <difference>
+    <differenceType>7012</differenceType>
+    <className>com/google/cloud/videointelligence/v1beta2/*OrBuilder</className>
+    <method>boolean has*(*)</method>
+  </difference>
+</differences>
diff --git a/proto-google-cloud-video-intelligence-v1p1beta1/clirr-ignored-differences.xml b/proto-google-cloud-video-intelligence-v1p1beta1/clirr-ignored-differences.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- see http://www.mojohaus.org/clirr-maven-plugin/examples/ignored-differences.html -->
+<differences>
+  <difference>
+    <differenceType>7012</differenceType>
+    <className>com/google/cloud/videointelligence/v1p1beta1/*OrBuilder</className>
+    <method>* get*(*)</method>
+  </difference>
+  <difference>
+    <differenceType>7012</differenceType>
+    <className>com/google/cloud/videointelligence/v1p1beta1/*OrBuilder</className>
+    <method>boolean contains*(*)</method>
+  </difference>
+  <difference>
+    <differenceType>7012</differenceType>
+    <className>com/google/cloud/videointelligence/v1p1beta1/*OrBuilder</className>
+    <method>boolean has*(*)</method>
+  </difference>
+</differences>
diff --git a/proto-google-cloud-video-intelligence-v1p2beta1/clirr-ignored-differences.xml b/proto-google-cloud-video-intelligence-v1p2beta1/clirr-ignored-differences.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- see http://www.mojohaus.org/clirr-maven-plugin/examples/ignored-differences.html -->
+<differences>
+  <difference>
+    <differenceType>7012</differenceType>
+    <className>com/google/cloud/videointelligence/v1p2beta1/*OrBuilder</className>
+    <method>* get*(*)</method>
+  </difference>
+  <difference>
+    <differenceType>7012</differenceType>
+    <className>com/google/cloud/videointelligence/v1p2beta1/*OrBuilder</className>
+    <method>boolean contains*(*)</method>
+  </difference>
+  <difference>
+    <differenceType>7012</differenceType>
+    <className>com/google/cloud/videointelligence/v1p2beta1/*OrBuilder</className>
+    <method>boolean has*(*)</method>
+  </difference>
+</differences>