googleapis · gcf-merge-on-green · Jun 14, 2021 · Jun 11, 2021 · Jun 11, 2021 · Jun 11, 2021
diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
@@ -0,0 +1,3 @@
+docker:
+  digest: sha256:689e998ca8b33117d8607b1c3df12b9cfebd68b621ba5ab6ce17be8715506203
+  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"
+
+
+deep-copy-regex:
+- source: "/google/cloud/functions/(v.*)/.*-java/proto-google-.*/src"
+  dest: "/owl-bot-staging/$1/proto-google-cloud-functions-$1/src"
+- source: "/google/cloud/functions/(v.*)/.*-java/grpc-google-.*/src"
+  dest: "/owl-bot-staging/$1/grpc-google-cloud-functions-$1/src"
+- source: "/google/cloud/functions/(v.*)/.*-java/gapic-google-.*/src"
+  dest: "/owl-bot-staging/$1/google-cloud-functions/src"
diff --git a/google-cloud-functions-bom/pom.xml b/google-cloud-functions-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,21 +64,20 @@
 
   <dependencyManagement>
     <dependencies>
-
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-functions</artifactId>
         <version>1.2.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-functions:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
-        <artifactId>proto-google-cloud-functions-v1</artifactId>
-        <version>1.2.2-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-functions-v1:current} -->
+        <artifactId>grpc-google-cloud-functions-v1</artifactId>
+        <version>1.2.2-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-functions-v1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
-        <artifactId>grpc-google-cloud-functions-v1</artifactId>
-        <version>1.2.2-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-functions-v1:current} -->
+        <artifactId>proto-google-cloud-functions-v1</artifactId>
+        <version>1.2.2-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-functions-v1:current} -->
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -94,4 +93,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
+</project>
diff --git a/google-cloud-functions/pom.xml b/google-cloud-functions/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>
@@ -111,4 +111,4 @@
         </plugin>
     </plugins>
   </build>
-</project>
+</project>
diff --git a/...s/src/main/java/com/google/cloud/functions/v1/stub/CloudFunctionsServiceStubSettings.java b/...s/src/main/java/com/google/cloud/functions/v1/stub/CloudFunctionsServiceStubSettings.java
@@ -291,6 +291,11 @@ public static String getDefaultEndpoint() {
     return "cloudfunctions.googleapis.com:443";
   }
 
+  /** Returns the default mTLS service endpoint. */
+  public static String getDefaultMtlsEndpoint() {
+    return "cloudfunctions.mtls.googleapis.com:443";
+  }
+
   /** Returns the default service scopes. */
   public static List<String> getDefaultServiceScopes() {
     return DEFAULT_SERVICE_SCOPES;
@@ -510,6 +515,8 @@ private static Builder createDefault() {
       builder.setCredentialsProvider(defaultCredentialsProviderBuilder().build());
       builder.setInternalHeaderProvider(defaultApiClientHeaderProviderBuilder().build());
       builder.setEndpoint(getDefaultEndpoint());
+      builder.setMtlsEndpoint(getDefaultMtlsEndpoint());
+      builder.setSwitchToMtlsEndpointAllowed(true);
 
       return initDefaults(builder);
     }

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
@@ -119,8 +119,8 @@
 
   <modules>
     <module>google-cloud-functions</module>
-    <module>proto-google-cloud-functions-v1</module>
     <module>grpc-google-cloud-functions-v1</module>
+    <module>proto-google-cloud-functions-v1</module>
     <module>google-cloud-functions-bom</module>
   </modules>
 
@@ -193,4 +193,4 @@
       </plugin>
     </plugins>
   </reporting>
-</project>
+</project>
diff --git a/synth.py b/synth.py
diff --git a/versions.txt b/versions.txt
@@ -2,5 +2,5 @@
 # module:released-version:current-version
 
 google-cloud-functions:1.2.1:1.2.2-SNAPSHOT
-proto-google-cloud-functions-v1:1.2.1:1.2.2-SNAPSHOT
 grpc-google-cloud-functions-v1:1.2.1:1.2.2-SNAPSHOT
+proto-google-cloud-functions-v1:1.2.1:1.2.2-SNAPSHOT