chore: update common templates (#116)

* ci: add dependency list completeness check (#490)

Source-Author: Stephanie Wang <stephaniewang526@users.noreply.github.com>
Source-Date: Mon Apr 13 18:30:27 2020 -0400
Source-Repo: googleapis/synthtool
Source-Sha: 3df869dd6eb546ef13beeb7a9efa6ee0226afafd
Source-Link: googleapis/synthtool@3df869d

* build(java): set GOOGLE_CLOUD_PROJECT env for samples/integration tests (#484)

* build(java): set GOOGLE_CLOUD_PROJECT env variable for samples/integration tests

* ci: use java-docs-samples-testing for sample tests

Source-Author: Jeff Ching <chingor@google.com>
Source-Date: Mon Apr 13 16:24:21 2020 -0700
Source-Repo: googleapis/synthtool
Source-Sha: 52638600f387deb98efb5f9c85fec39e82aa9052
Source-Link: googleapis/synthtool@5263860

Co-authored-by: Jeff Ching <chingor@google.com>

.kokoro/common.sh

@@ -52,3 +52,8 @@ function retry_with_backoff {
 
     return $exit_code
 }
+
+## Helper functionss
+function now() { date +"%Y-%m-%d %H:%M:%S" | tr -d '\n'; }
+function msg() { println "$*" >&2; }
+function println() { printf '%s\n' "$(now) $*"; }

.kokoro/dependencies.sh

@@ -36,3 +36,51 @@ retry_with_backoff 3 10 \
     -Dclirr.skip=true
 
 mvn -B dependency:analyze -DfailOnWarning=true
+
+echo "****************** DEPENDENCY LIST COMPLETENESS CHECK *******************"
+## Run dependency list completeness check
+function completenessCheck() {
+  # Output dep list with compile scope generated using the original pom
+  msg "Generating dependency list using original pom..."
+  mvn dependency:list -f pom.xml -Dsort=true | grep '\[INFO]    .*:.*:.*:.*:.*' | grep -v ':test$' >.org-list.txt
+
+  # Output dep list generated using the flattened pom (test scope deps are ommitted)
+  msg "Generating dependency list using flattened pom..."
+  mvn dependency:list -f .flattened-pom.xml -Dsort=true | grep '\[INFO]    .*:.*:.*:.*:.*' >.new-list.txt
+
+  # Compare two dependency lists
+  msg "Comparing dependency lists..."
+  diff .org-list.txt .new-list.txt >.diff.txt
+  if [[ $? == 0 ]]
+    then
+      msg "Success. No diff!"
+  else
+    msg "Diff found. See below: "
+    msg "You can also check .diff.txt file located in $1."
+    cat .diff.txt
+    return 1
+  fi
+}
+
+# Allow failures to continue running the script
+set +e
+
+error_count=0
+for path in $(find -name ".flattened-pom.xml")
+do
+  # Check flattened pom in each dir that contains it for completeness
+  dir=$(dirname "$path")
+  pushd "$dir"
+  completenessCheck "$dir"
+  error_count=$(($error_count + $?))
+  popd
+done
+
+if [[ $error_count == 0 ]]
+then
+  msg "All checks passed."
+  exit 0
+else
+  msg "Errors found. See log statements above."
+  exit 1
+fi

.kokoro/nightly/samples.cfg

@@ -11,9 +11,15 @@ env_vars: {
   value: "samples"
 }
 
+# TODO: remove this after we've migrated all tests and scripts
 env_vars: {
   key: "GCLOUD_PROJECT"
-  value: "gcloud-devel"
+  value: "java-docs-samples-testing"
+}
+
+env_vars: {
+  key: "GOOGLE_CLOUD_PROJECT"
+  value: "java-docs-samples-testing"
 }
 
 env_vars: {

.kokoro/presubmit/samples.cfg

@@ -11,14 +11,20 @@ env_vars: {
   value: "samples"
 }
 
+# TODO: remove this after we've migrated all tests and scripts
 env_vars: {
-    key: "GCLOUD_PROJECT"
-    value: "gcloud-devel"
+  key: "GCLOUD_PROJECT"
+  value: "java-docs-samples-testing"
 }
 
 env_vars: {
-    key: "GOOGLE_APPLICATION_CREDENTIALS"
-    value: "keystore/73713_java_it_service_account"
+  key: "GOOGLE_CLOUD_PROJECT"
+  value: "java-docs-samples-testing"
+}
+
+env_vars: {
+  key: "GOOGLE_APPLICATION_CREDENTIALS"
+  value: "keystore/73713_java_it_service_account"
 }
 
 before_action {

synth.metadata

@@ -27,7 +27,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "7f8e62aa3edd225f76347a16f92e400661fdfb52"
+        "sha": "52638600f387deb98efb5f9c85fec39e82aa9052"
       }
     }
   ],