docs(compute-samples): added snippets and tests for Windows instance

.github/sync-repo-settings.yaml

@@ -7,6 +7,7 @@ branchProtectionRules:
   requiredStatusCheckContexts:
     - 'Kokoro CI - Java 11'
     - 'Kokoro CI - Java 8'
+    - 'Kokoro CI - Java 17'
     - 'Kokoro CI - Lint'
     - 'cla/google'
   requiredApprovingReviewCount: 1

.kokoro/java17/common.cfg

@@ -0,0 +1,45 @@
+# Copyright 2022 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.
+
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Build timeout of 5 hours
+timeout_mins: 360
+
+# Download trampoline resources.
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
+
+# Use the trampoline script to run in docker.
+build_file: "java-docs-samples/.kokoro/trampoline.sh"
+
+action {
+  define_artifacts {
+    regex: "**/*sponge_log.xml"
+  }
+}
+
+# Set the JAVA VERSION env var.
+env_vars: {
+    key: "JAVA_VERSION"
+    value: "1.8,11,17"
+}
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+    key: "TRAMPOLINE_IMAGE"
+    value: "gcr.io/cloud-devrel-kokoro-resources/java17"
+}
+
+# Access btlr binaries used in the tests
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/btlr"

.kokoro/java17/continuous.cfg

@@ -0,0 +1,27 @@
+# Copyright 2022 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.
+
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Tell trampoline which tests to run.
+env_vars: {
+    key: "TRAMPOLINE_BUILD_FILE"
+    value: "github/java-docs-samples/.kokoro/tests/run_tests.sh"
+}
+
+# Only diff from previous commit
+env_vars: {
+    key: "GIT_DIFF"
+    value: "HEAD~.. ."
+}

.kokoro/java17/periodic.cfg

@@ -0,0 +1,22 @@
+# Copyright 2022 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.
+
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Tell the trampoline which build file to use.
+env_vars: {
+    key: "TRAMPOLINE_BUILD_FILE"
+    value: "github/java-docs-samples/.kokoro/tests/run_tests.sh"
+}
+

.kokoro/java17/presubmit.cfg

@@ -0,0 +1,26 @@
+# Copyright 2022 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.
+
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Tell the trampoline which build file to use.
+env_vars: {
+    key: "TRAMPOLINE_BUILD_FILE"
+    value: "github/java-docs-samples/.kokoro/tests/run_tests.sh"
+}
+# Only diff from main
+env_vars: {
+    key: "GIT_DIFF"
+    value: "origin/main... ."
+}

.kokoro/tests/run_test_java.sh

@@ -18,7 +18,7 @@ SCRIPT_DIR="$(dirname $0)/"
 
 # Fail the tests if no Java version was found.
 POM_JAVA=$(grep -oP '(?<=<maven.compiler.target>).*?(?=</maven.compiler.target>)' pom.xml)
-ALLOWED_VERSIONS=("1.8" "11")
+ALLOWED_VERSIONS=("1.8" "11" "17")
 # shellcheck disable=SC2199
 # shellcheck disable=SC2076
 if [[ "$POM_JAVA" = "" ]] || [[ !  "${ALLOWED_VERSIONS[@]}" =~ "${POM_JAVA}" ]]; then

.kokoro/tests/run_tests.sh

@@ -45,6 +45,8 @@ if [[ "$SCRIPT_DEBUG" != "true" ]]; then
     # Update `gcloud` and log versioning for debugging
     apt update && apt -y upgrade google-cloud-sdk
 
+    echo "********** GIT INFO ***********"
+    git version
     echo "********** GCLOUD INFO ***********"
     gcloud -v
     echo "********** MAVEN INFO  ***********"
@@ -115,6 +117,8 @@ fi
 echo -e "\n******************** TESTING PROJECTS ********************"
 test_prog="$PWD/.kokoro/tests/run_test_java.sh"
 
+git config --global --add safe.directory $PWD
+
 # Use btlr to run all the tests in each folder 
 echo "btlr" "${btlr_args[@]}" -- "${test_prog}"
 btlr "${btlr_args[@]}" -- "${test_prog}"

README.md

@@ -12,6 +12,10 @@ This repository holds sample code written in Java that demonstrates the
 Some samples have accompanying guides on <cloud.google.com>. See respective
 README files for details.
 
+## Google Cloud Samples
+
+To browse ready to use code samples check [Google Cloud Samples](https://cloud.google.com/docs/samples?l=java).
+
 ## Set Up
 
 1. [Set up your Java Development Environment](https://cloud.google.com/java/docs/setup)

appengine-java11-bundled-services/README.md

@@ -39,20 +39,29 @@ access control, billing, and services.
 
 ## Development differences between App Engine Java8 and Java11 Bundled Services
 
-The only difference between a Java8 application and a Java11 application is in the `appengine-web.xml` file
+The only differences between a Java8 application and a Java11 application are the addition of the bundled services JAR, and an added line in the `appengine-web.xml` file
 where you need to define the Java11 runtime and declare you need the App Engine APIs:
 
+In `appengine-web.xml`:
 ```XML
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
     <runtime>java11</runtime>
     <app-engine-apis>true</app-engine-apis>
 </appengine-web-app>
 ```
 
-While the Java11 runtime is in Beta, in order to deploy the application, you can use the `beta` value for the `gcloudMode` Cloud SDK parameter like:
+In your `pom.xml`'s `<dependencies>`:
+```XML
+<dependency>
+    <groupId>com.google.appengine</groupId>
+    <artifactId>appengine-api-1.0-sdk</artifactId>
+    <version>2.0.4</version> <!-- or later-->
+</dependency>
+```
+
 
 ```shell
- mvn appengine:deploy -Dapp.deploy.gcloudMode=beta
+ mvn appengine:deploy
 ```
 
 
@@ -72,17 +81,17 @@ This sample demonstrates how to use the App Engine Datastore APIs in a Java11 we
 
 You can execute the following steps to transform the java8 appengine-web.xml file to a java11 appengine-web.xml file:
 
-     ```shell
-	 git clone https://github.com/GoogleCloudPlatform/java-docs-samples.git
-	 cd java-docs-samples
-	 cp -pr appengine-java8 /tmp/java11-samples
-	 cd /tmp/java11-samples
-	 # On Linux:
-	 shopt -s globstar dotglob
-     for f in **/appengine-web.xml; do sed -i 's.<runtime>java8</runtime>.<runtime>java11</runtime><app-engine-apis>true</app-engine-apis>.' ${f}; done 
-	 # on MacOS
-     for f in **/appengine-web.xml; do sed -i'' -e 's.<runtime>java8</runtime>.<runtime>java11</runtime><app-engine-apis>true</app-engine-apis>.' ${f}; done
-	 ```
+```shell
+git clone https://github.com/GoogleCloudPlatform/java-docs-samples.git
+cd java-docs-samples
+cp -pr appengine-java8 /tmp/java11-samples
+cd /tmp/java11-samples
+# On Linux:
+shopt -s globstar dotglob
+for f in **/appengine-web.xml; do sed -i 's.<runtime>java8</runtime>.<runtime>java11</runtime><app-engine-apis>true</app-engine-apis>.' ${f}; done 
+# on MacOS
+for f in **/appengine-web.xml; do sed -i'' -e 's.<runtime>java8</runtime>.<runtime>java11</runtime><app-engine-apis>true</app-engine-apis>.' ${f}; done
+ ```
 
 You will see in the `tmp/java11` directory all the correct code samples to compile and deploy to the Java11 AppEngine runtime, with bundled services.
 Just follow the same documentation as the [Java8 samples][java8-samples].

appengine-java11-bundled-services/datastore/README.md

@@ -39,10 +39,7 @@ To see the results of the sample application, open
 
 ## Deploying
 
-In the following command, replace YOUR-PROJECT-ID with your
-[Google Cloud Project ID](https://developers.google.com/console/help/new/#projectnumber)
-and SOME-VERSION with a valid version number.
-
 ```sh
 mvn clean package appengine:deploy
+mvn appengine:deployIndex
 ```

appengine-java11-bundled-services/datastore/pom.xml

@@ -126,10 +126,15 @@
     <!-- for hot reload of the web application -->
     <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>3.3.2</version>
+      </plugin>
       <plugin>
         <groupId>com.google.cloud.tools</groupId>
         <artifactId>appengine-maven-plugin</artifactId>
-        <version>2.4.1</version>
+        <version>2.4.2</version>
         <configuration>
           <projectId>GCLOUD_CONFIG</projectId>
           <version>GCLOUD_CONFIG</version>

appengine-java11/cloudsql/pom.xml

@@ -73,13 +73,13 @@
     <dependency>
       <groupId>mysql</groupId>
       <artifactId>mysql-connector-java</artifactId>
-      <version>8.0.28</version>
+      <version>8.0.29</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.google.cloud.sql</groupId>
       <artifactId>mysql-socket-factory-connector-j-8</artifactId>
-      <version>1.5.0</version>
+      <version>1.6.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -92,7 +92,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>4.4.0</version>
+      <version>4.5.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -156,7 +156,7 @@
       <plugin>
         <groupId>com.google.cloud.tools</groupId>
         <artifactId>appengine-maven-plugin</artifactId>
-        <version>2.4.1</version>
+        <version>2.4.2</version>
         <configuration>
           <projectId>GCLOUD_CONFIG</projectId>
           <version>cloudsql</version>

appengine-java11/gaeinfo/pom.xml

@@ -84,7 +84,7 @@ Copyright 2019 Google LLC
       <plugin>
         <groupId>com.google.cloud.tools</groupId>
         <artifactId>appengine-maven-plugin</artifactId>
-        <version>2.4.1</version>
+        <version>2.4.2</version>
         <configuration>
           <projectId>GCLOUD_CONFIG</projectId>
           <version>gaeinfo</version>

appengine-java11/guestbook-cloud-firestore/pom.xml

@@ -91,10 +91,15 @@
   <build>
     <finalName>guestbook</finalName>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>3.3.2</version>
+      </plugin>
       <plugin>
         <groupId>com.google.cloud.tools</groupId>
         <artifactId>appengine-maven-plugin</artifactId>
-        <version>2.4.1</version>
+        <version>2.4.2</version>
         <configuration>
           <projectId>GCLOUD_CONFIG</projectId>
           <version>guestbook</version>

appengine-java11/helloworld-servlet/pom.xml

@@ -67,10 +67,15 @@ limitations under the License.
   <build>
     <finalName>helloworld</finalName>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>3.3.2</version>
+      </plugin>
       <plugin>
         <groupId>com.google.cloud.tools</groupId>
         <artifactId>appengine-maven-plugin</artifactId>
-        <version>2.4.1</version>
+        <version>2.4.2</version>
         <configuration>
           <projectId>GCLOUD_CONFIG</projectId>
           <version>helloworld</version>

appengine-java11/http-server/pom.xml

@@ -38,7 +38,7 @@
       <plugin>
         <groupId>com.google.cloud.tools</groupId>
         <artifactId>appengine-maven-plugin</artifactId>
-        <version>2.4.1</version>
+        <version>2.4.2</version>
         <configuration>
           <projectId>GCLOUD_CONFIG</projectId>
           <version>http-server</version>

appengine-java11/kotlin-ktor/app.yaml

@@ -13,4 +13,3 @@
 # limitations under the License.
 
 runtime: java11
-entrypoint: 'java -jar target/kotlin-ktor-0.0.1-jar-with-dependencies.jar'