Merge pull request #902 from GoogleCloudPlatform/kokoro

Increase Kokoro testing reliability

.kokoro/tests/run_tests.sh

@@ -45,7 +45,7 @@ export GOOGLE_APPLICATION_CREDENTIALS=${KOKORO_GFILE_DIR}/service-acct.json
 export GOOGLE_CLOUD_PROJECT=java-docs-samples-testing
 export PATH=/google-cloud-sdk/bin:$PATH
 source ${KOKORO_GFILE_DIR}/aws-secrets.sh
-
+source ${KOKORO_GFILE_DIR}/dlp_secrets.txt
 echo "******** Environment *********"
 env
 echo "******** mvn & Java *********"
@@ -71,75 +71,3 @@ mvn -B --fail-at-end clean verify -Dfile.encoding="UTF-16" \
         -Dbigtable.instanceID=instance | \
      grep -E -v "(^\[INFO\] Download|^\[INFO\].*skipping)"
 
-echo "******** Deploy to prod *******"
-cd appengine-java8
-
-for app in "bigtable" "cloudsql" "datastore" "spanner" \
-      "urlfetch"
-do
-  (cd "${app}"
-      sed --in-place='.xx' "s/<\/runtime>/<\/runtime><service>${app}<\/service>/" \
-          src/main/webapp/WEB-INF/appengine-web.xml
-      mvn -B --fail-at-end -q appengine:deploy -Dapp.deploy.version="1" \
-          -Dapp.stage.quickstart=true -Dapp.deploy.force=true -Dapp.deploy.promote=true \
-          -Dapp.deploy.project="${GOOGLE_CLOUD_PROJECT}" -DskipTests=true
-      mv src/main/webapp/WEB-INF/appengine-web.xml.xx src/main/webapp/WEB-INF/appengine-web.xml)
-done
-
-echo "******* Test prod Deployed Apps ********"
-export URL="dot-${GOOGLE_CLOUD_PROJECT}.appspot.com"
-
-# TestIt "helloworld" "" "Hello App Engine -- Java 8!"
-
-
-## Run tests using App Engine local devserver.
-# test_localhost() {
-#   git clone https://github.com/GoogleCloudPlatform/java-repo-tools.git
-#
-#   devserver_tests=(
-#       appengine/helloworld
-#       appengine/datastore/indexes
-#       appengine/datastore/indexes-exploding
-#       appengine/datastore/indexes-perfect
-#   )
-#   for testdir in "${devserver_tests[@]}" ; do
-#     if [ -z "$common_dir" ] || [[ $testdir = $common_dir* ]]; then
-#       ./java-repo-tools/scripts/test-localhost.sh appengine "${testdir}"
-#     fi
-#   done
-
-  # newplugin_std_tests=(
-  #     appengine/helloworld-new-plugins
-  # )
-  # for testdir in "${newplugin_std_tests[@]}" ; do
-  #   ./java-repo-tools/scripts/test-localhost.sh standard_mvn "${testdir}"
-  #   ./java-repo-tools/scripts/test-localhost.sh standard_gradle "${testdir}"
-  # done
-}
-test_localhost
-
-
-
-# (
-# # Stop echoing commands, so we don't leak secret env vars
-# #   -Pselenium | \ # LV3 20170616 turn off selenium for now.
-# set +x
-# mvn --batch-mode clean verify \
-#   -Dbookshelf.clientID="${OAUTH2_CLIENT_ID}" \
-#   -Dbookshelf.clientSecret="${OAUTH2_CLIENT_SECRET}" \
-#   -Dbookshelf.bucket="${GCS_BUCKET envvar is unset}" \
-#   | \
-#   grep -E -v "(^\[INFO\] Download|^\[INFO\].*skipping)"
-# )
-#
-# Test running samples on localhost.
-# git clone https://github.com/GoogleCloudPlatform/java-repo-tools.git
-# ./java-repo-tools/scripts/test-localhost.sh jetty helloworld-jsp -- -DskipTests=true
-# ./java-repo-tools/scripts/test-localhost.sh jetty helloworld-servlet -- -DskipTests=true
-# ./java-repo-tools/scripts/test-localhost.sh jetty helloworld-compat -- -DskipTests=true
-# ./java-repo-tools/scripts/test-localhost.sh spring-boot helloworld-springboot -- -DskipTests=true
-
-# Check that all shell scripts in this repo (including this one) pass the
-# Shell Check linter.
-cd ..
-shellcheck ./**/*.sh

kms/src/main/java/com/example/Snippets.java

@@ -522,14 +522,18 @@ public static void listCryptoKeys(String projectId, String locationId, String ke
         "projects/%s/locations/%s/keyRings/%s",
         projectId, locationId, keyRingId);
 
-    ListCryptoKeysResponse cryptoKeys = kms.projects().locations().keyRings()
-        .cryptoKeys()
-        .list(keyRingPath)
-        .execute();
-
-    for (CryptoKey key : cryptoKeys.getCryptoKeys()) {
-      System.out.println(key);
-    }
+    ListCryptoKeysResponse cryptoKeys = null;
+    do { // Print every page of keys
+      cryptoKeys = kms.projects().locations().keyRings()
+          .cryptoKeys()
+          .list(keyRingPath)
+          .setPageToken(cryptoKeys != null ? cryptoKeys.getNextPageToken() : null)
+          .execute();
+
+      for (CryptoKey key : cryptoKeys.getCryptoKeys()) {
+        System.out.println(key);
+      }
+    } while(cryptoKeys.getNextPageToken() != null);
   }
 
   /**
@@ -546,6 +550,7 @@ public static void listCryptoKeyVersions(
         "projects/%s/locations/%s/keyRings/%s/cryptoKeys/%s",
         projectId, locationId, keyRingId, cryptoKeyId);
 
+
     ListCryptoKeyVersionsResponse versions = kms.projects().locations().keyRings().cryptoKeys()
         .cryptoKeyVersions()
         .list(cryptoKeys)

translate/src/test/java/com/example/cloud/translate/samples/TranslateTextTest.java

@@ -94,7 +94,9 @@ public class TranslateTextTest {
     // Assert
     String got = bout.toString();
     for (String language : languages) {
-      assertThat(got).contains(language);
+      bout.reset();
+      out.print(language);
+      assertThat(got).contains(bout.toString());
     }
   }