chore: update common templates (#197)

* changes without context

        autosynth cannot find the source of changes triggered by earlier changes in this
        repository, or by version upgrades to tools such as linters.

* ci(java): switch to secret manager from keystore

* ci(java): switch to secret manager from keystore, use java-docs-samples user for samples tests

* fix: we don't need to supply a service account

Source-Author: Jeff Ching <[email protected]>
Source-Date: Mon Jun 15 11:45:21 2020 -0700
Source-Repo: googleapis/synthtool
Source-Sha: d1addcdf80aa9ddef8c932c89c919024bbad7af3
Source-Link: googleapis/synthtool@d1addcd

* samples(java): fix bad character in samples.cfg from copy/paste

Somehow an invisible character was copy/pasted into the file and Kokoro
cannot parse the file.

Source-Author: Jeff Ching <[email protected]>
Source-Date: Mon Jun 15 15:42:10 2020 -0700
Source-Repo: googleapis/synthtool
Source-Sha: 6d3eed67a45fd58f9c7bfa173c32e4fd4fed058f
Source-Link: googleapis/synthtool@6d3eed6

* ci(java): switch integration test secrets to secret manager

Source-Author: Jeff Ching <[email protected]>
Source-Date: Tue Jun 16 09:26:06 2020 -0700
Source-Repo: googleapis/synthtool
Source-Sha: 6eb80fa9f96433af8dbeb1c8323aa80cda49b374
Source-Link: googleapis/synthtool@6eb80fa

* ci(java): fix typo in java integration test secret name

Source-Author: BenWhitehead <[email protected]>
Source-Date: Tue Jun 16 13:32:19 2020 -0400
Source-Repo: googleapis/synthtool
Source-Sha: c4f3059c27591eb24d6942a0e357ec94c80459f2
Source-Link: googleapis/synthtool@c4f3059

* ci(java): run dependency test on Java 8 and 11

* ci(java): run dependency test on Java 8 and 11

* docs: clarify stripping module

Source-Author: Knut Olav Løite <[email protected]>
Source-Date: Fri Jun 19 20:06:35 2020 +0200
Source-Repo: googleapis/synthtool
Source-Sha: 84f8ec7ff1885e00582b32a21cd21a481d25e591
Source-Link: googleapis/synthtool@84f8ec7

* Revert "ci(java): run dependency test on Java 8 and 11 (#633)"

This reverts commit 84f8ec7ff1885e00582b32a21cd21a481d25e591.

It broke the tests:
https://source.cloud.google.com/results/invocations/5c6ddabc-c5c9-43da-b82b-0d7313fbcbeb

Source-Author: Jeffrey Rennie <[email protected]>
Source-Date: Fri Jun 19 13:13:20 2020 -0700
Source-Repo: googleapis/synthtool
Source-Sha: 3e6fed750653a8f41a5efeca0bc16b756a9532bb
Source-Link: googleapis/synthtool@3e6fed7

* ci(java): run dependency test on Java 8 and 11

Redo fix in #633 with proper jinja templating format

Source-Author: Jeff Ching <[email protected]>
Source-Date: Fri Jun 19 16:52:15 2020 -0700
Source-Repo: googleapis/synthtool
Source-Sha: 4f2c9f752a94042472fc03c5bd9e06e89817d2bd
Source-Link: googleapis/synthtool@4f2c9f7

Author: yoshi-automation

.github/workflows/ci.yaml

@@ -36,11 +36,14 @@ jobs:
         JOB_TYPE: test
   dependencies:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java: [8, 11]
     steps:
     - uses: actions/checkout@v2
     - uses: actions/setup-java@v1
       with:
-        java-version: 8
+        java-version: ${{matrix.java}}
     - run: java -version
     - run: .kokoro/dependencies.sh
   linkage-monitor:

.kokoro/build.sh

@@ -39,7 +39,7 @@ retry_with_backoff 3 10 \
 
 # if GOOGLE_APPLICATION_CREDIENTIALS is specified as a relative path prepend Kokoro root directory onto it
 if [[ ! -z "${GOOGLE_APPLICATION_CREDENTIALS}" && "${GOOGLE_APPLICATION_CREDENTIALS}" != /* ]]; then
-    export GOOGLE_APPLICATION_CREDENTIALS=$(realpath ${KOKORO_ROOT}/src/${GOOGLE_APPLICATION_CREDENTIALS})
+    export GOOGLE_APPLICATION_CREDENTIALS=$(realpath ${KOKORO_GFILE_DIR}/${GOOGLE_APPLICATION_CREDENTIALS})
 fi
 
 RETURN_CODE=0

.kokoro/dependencies.sh

@@ -41,8 +41,10 @@ echo "****************** DEPENDENCY LIST COMPLETENESS CHECK *******************"
 ## Run dependency list completeness check
 function completenessCheck() {
   # Output dep list with compile scope generated using the original pom
+  # Running mvn dependency:list on Java versions that support modules will also include the module of the dependency.
+  # This is stripped from the output as it is not present in the flattened pom.
   msg "Generating dependency list using original pom..."
-  mvn dependency:list -f pom.xml -Dsort=true | grep '\[INFO]    .*:.*:.*:.*:.*' | grep -v ':test$' >.org-list.txt
+  mvn dependency:list -f pom.xml -Dsort=true | grep '\[INFO]    .*:.*:.*:.*:.*' | sed -e s/\\s--\\smodule.*// | 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..."

.kokoro/nightly/integration.cfg

@@ -28,14 +28,10 @@ env_vars: {
 
 env_vars: {
   key: "GOOGLE_APPLICATION_CREDENTIALS"
-  value: "keystore/73713_java_it_service_account"
+  value: "secret_manager/java-it-service-account"
 }
 
-before_action {
-  fetch_keystore {
-    keystore_resource {
-      keystore_config_id: 73713
-      keyname: "java_it_service_account"
-    }
-  }
+env_vars: {
+  key: "SECRET_MANAGER_KEYS"
+  value: "java-it-service-account"
 }

.kokoro/nightly/samples.cfg

@@ -24,19 +24,15 @@ env_vars: {
 
 env_vars: {
   key: "GOOGLE_APPLICATION_CREDENTIALS"
-  value: "keystore/73713_java_it_service_account"
+  value: "secret_manager/java-docs-samples-service-account"
 }
 
 env_vars: {
-  key: "ENABLE_BUILD_COP"
-  value: "true"
+  key: "SECRET_MANAGER_KEYS"
+  value: "java-docs-samples-service-account"
 }
 
-before_action {
-  fetch_keystore {
-    keystore_resource {
-      keystore_config_id: 73713
-      keyname: "java_it_service_account"
-    }
-  }
+env_vars: {
+  key: "ENABLE_BUILD_COP"
+  value: "true"
 }

.kokoro/populate-secrets.sh

@@ -0,0 +1,43 @@
+#!/bin/bash
+# Copyright 2020 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.
+
+set -eo pipefail
+
+function now { date +"%Y-%m-%d %H:%M:%S" | tr -d '\n' ;}
+function msg { println "$*" >&2 ;}
+function println { printf '%s\n' "$(now) $*" ;}
+
+
+# Populates requested secrets set in SECRET_MANAGER_KEYS from service account:
+# kokoro-trampoline@cloud-devrel-kokoro-resources.iam.gserviceaccount.com
+SECRET_LOCATION="${KOKORO_GFILE_DIR}/secret_manager"
+msg "Creating folder on disk for secrets: ${SECRET_LOCATION}"
+mkdir -p ${SECRET_LOCATION}
+for key in $(echo ${SECRET_MANAGER_KEYS} | sed "s/,/ /g")
+do
+  msg "Retrieving secret ${key}"
+  docker run --entrypoint=gcloud \
+    --volume=${KOKORO_GFILE_DIR}:${KOKORO_GFILE_DIR} \
+    gcr.io/google.com/cloudsdktool/cloud-sdk \
+    secrets versions access latest \
+    --project cloud-devrel-kokoro-resources \
+    --secret ${key} > \
+    "${SECRET_LOCATION}/${key}"
+  if [[ $? == 0 ]]; then
+    msg "Secret written to ${SECRET_LOCATION}/${key}"
+  else
+    msg "Error retrieving secret ${key}"
+  fi
+done

.kokoro/presubmit/integration.cfg

@@ -24,14 +24,10 @@ env_vars: {
 
 env_vars: {
   key: "GOOGLE_APPLICATION_CREDENTIALS"
-  value: "keystore/73713_java_it_service_account"
+  value: "secret_manager/java-it-service-account"
 }
 
-before_action {
-  fetch_keystore {
-    keystore_resource {
-      keystore_config_id: 73713
-      keyname: "java_it_service_account"
-    }
-  }
+env_vars: {
+  key: "SECRET_MANAGER_KEYS"
+  value: "java-it-service-account"
 }

.kokoro/presubmit/samples.cfg

@@ -24,14 +24,10 @@ env_vars: {
 
 env_vars: {
   key: "GOOGLE_APPLICATION_CREDENTIALS"
-  value: "keystore/73713_java_it_service_account"
+  value: "secret_manager/java-docs-samples-service-account"
 }
 
-before_action {
-  fetch_keystore {
-    keystore_resource {
-      keystore_config_id: 73713
-      keyname: "java_it_service_account"
-    }
-  }
-}
+env_vars: {
+  key: "SECRET_MANAGER_KEYS"
+  value: "java-docs-samples-service-account"
+}

.kokoro/trampoline.sh

@@ -21,4 +21,6 @@ function cleanup() {
     echo "cleanup";
 }
 trap cleanup EXIT
+
+$(dirname $0)/populate-secrets.sh # Secret Manager secrets.
 python3 "${KOKORO_GFILE_DIR}/trampoline_v1.py"

synth.metadata

@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "fc0fce9d9ae75b536754b2d0f49408205d4c7a53"
+        "sha": "4f2c9f752a94042472fc03c5bd9e06e89817d2bd"
       }
     }
   ],