chore: migrate to owlbot (#395)

googleapis · Jun 2, 2021 · 55cbf9e · 55cbf9e
1 parent 0141e15
commit 55cbf9e
Show file tree

Hide file tree

Showing 8 changed files with 80 additions and 54 deletions.
diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
@@ -0,0 +1,3 @@
+docker:
+  digest: sha256:ee698481139bf3df35cd83d2f17f9670ee914d6184f8909a81d672a6abaf0e72
+  image: gcr.io/repo-automation-bots/owlbot-java:latest
diff --git a/.github/.OwlBot.yaml b/.github/.OwlBot.yaml
@@ -0,0 +1,30 @@
+# 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/main/java/com/google/cloud/aiplatform/v1"
+- "/google-.*/src/main/java/com/google/cloud/aiplatform/v1beta1"
+
+deep-copy-regex:
+- source: "/google/cloud/aiplatform/(v.*)/.*-java/proto-google-.*/src"
+  dest: "/owl-bot-staging/$1/proto-google-cloud-aiplatform-$1/src"
+- source: "/google/cloud/aiplatform/(v.*)/.*-java/grpc-google-.*/src"
+  dest: "/owl-bot-staging/$1/grpc-google-cloud-aiplatform-$1/src"
+- source: "/google/cloud/aiplatform/(v.*)/.*-java/gapic-google-.*/src"
+  dest: "/owl-bot-staging/$1/google-cloud-aiplatform/src"
diff --git a/google-cloud-aiplatform-bom/pom.xml b/google-cloud-aiplatform-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>
@@ -64,31 +64,30 @@
 
   <dependencyManagement>
     <dependencies>
-
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-aiplatform</artifactId>
         <version>0.4.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-aiplatform:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
-        <artifactId>proto-google-cloud-aiplatform-v1beta1</artifactId>
-        <version>0.4.2-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-aiplatform-v1beta1:current} -->
+        <artifactId>grpc-google-cloud-aiplatform-v1</artifactId>
+        <version>0.4.2-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-aiplatform-v1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
-        <artifactId>proto-google-cloud-aiplatform-v1</artifactId>
-        <version>0.4.2-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-aiplatform-v1:current} -->
+        <artifactId>grpc-google-cloud-aiplatform-v1beta1</artifactId>
+        <version>0.4.2-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-aiplatform-v1beta1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
-        <artifactId>grpc-google-cloud-aiplatform-v1beta1</artifactId>
-        <version>0.4.2-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-aiplatform-v1beta1:current} -->
+        <artifactId>proto-google-cloud-aiplatform-v1</artifactId>
+        <version>0.4.2-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-aiplatform-v1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
-        <artifactId>grpc-google-cloud-aiplatform-v1</artifactId>
-        <version>0.4.2-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-aiplatform-v1:current} -->
+        <artifactId>proto-google-cloud-aiplatform-v1beta1</artifactId>
+        <version>0.4.2-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-aiplatform-v1beta1:current} -->
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -104,4 +103,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
+</project>
diff --git a/google-cloud-aiplatform/pom.xml b/google-cloud-aiplatform/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>
@@ -126,4 +126,4 @@
         </plugin>
     </plugins>
   </build>
-</project>
+</project>
diff --git a/owlbot.py b/owlbot.py
@@ -0,0 +1,30 @@
+# 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(
+    excludes=[
+        ".kokoro/build.sh",
+        ".kokoro/nightly/samples.cfg",
+        ".kokoro/presubmit/samples.cfg",
+    ]
+)
diff --git a/pom.xml b/pom.xml
@@ -121,10 +121,10 @@
 
   <modules>
     <module>google-cloud-aiplatform</module>
-    <module>proto-google-cloud-aiplatform-v1beta1</module>
-    <module>proto-google-cloud-aiplatform-v1</module>
-    <module>grpc-google-cloud-aiplatform-v1beta1</module>
     <module>grpc-google-cloud-aiplatform-v1</module>
+    <module>grpc-google-cloud-aiplatform-v1beta1</module>
+    <module>proto-google-cloud-aiplatform-v1</module>
+    <module>proto-google-cloud-aiplatform-v1beta1</module>
     <module>google-cloud-aiplatform-bom</module>
   </modules>
 

diff --git a/synth.py b/synth.py
diff --git a/versions.txt b/versions.txt
@@ -2,7 +2,7 @@
 # module:released-version:current-version
 
 google-cloud-aiplatform:0.4.1:0.4.2-SNAPSHOT
+grpc-google-cloud-aiplatform-v1:0.4.1:0.4.2-SNAPSHOT
+grpc-google-cloud-aiplatform-v1beta1:0.4.1:0.4.2-SNAPSHOT
 proto-google-cloud-aiplatform-v1:0.4.1:0.4.2-SNAPSHOT
 proto-google-cloud-aiplatform-v1beta1:0.4.1:0.4.2-SNAPSHOT
-grpc-google-cloud-aiplatform-v1:0.4.1:0.4.2-SNAPSHOT
-grpc-google-cloud-aiplatform-v1beta1:0.4.1:0.4.2-SNAPSHOT