From 9fac20f6b147fc85a5ffc48ac922dd18e2ff4eec Mon Sep 17 00:00:00 2001
From: BenWhitehead <BenWhitehead@users.noreply.github.com>
Date: Tue, 21 Jul 2020 14:09:28 -0400
Subject: [PATCH] chore: update integration and samples credentials

---
 .kokoro/nightly/integration.cfg   | 22 +++++++++-------------
 .kokoro/nightly/samples.cfg       |  8 ++++----
 .kokoro/presubmit/integration.cfg | 12 ++++--------
 .kokoro/presubmit/samples.cfg     | 10 +++++-----
 synth.py                          |  4 +++-
 5 files changed, 25 insertions(+), 31 deletions(-)

diff --git a/.kokoro/nightly/integration.cfg b/.kokoro/nightly/integration.cfg
index ba0924a97..31f7bdd07 100644
--- a/.kokoro/nightly/integration.cfg
+++ b/.kokoro/nightly/integration.cfg
@@ -13,29 +13,25 @@ env_vars: {
 # TODO: remove this after we've migrated all tests and scripts
 env_vars: {
   key: "GCLOUD_PROJECT"
-  value: "gcloud-devel"
+  value: "java-review"
 }
 
 env_vars: {
   key: "GOOGLE_CLOUD_PROJECT"
-  value: "gcloud-devel"
+  value: "java-review"
 }
 
 env_vars: {
-  key: "ENABLE_BUILD_COP"
-  value: "true"
+  key: "GOOGLE_APPLICATION_CREDENTIALS"
+  value: "secret_manager/firestore-java-it"
 }
 
 env_vars: {
-  key: "GOOGLE_APPLICATION_CREDENTIALS"
-  value: "keystore/73713_java_it_service_account"
+  key: "SECRET_MANAGER_KEYS"
+  value: "firestore-java-it"
 }
 
-before_action {
-  fetch_keystore {
-    keystore_resource {
-      keystore_config_id: 73713
-      keyname: "java_firestore_it_service_account"
-    }
-  }
+env_vars: {
+  key: "ENABLE_BUILD_COP"
+  value: "true"
 }
diff --git a/.kokoro/nightly/samples.cfg b/.kokoro/nightly/samples.cfg
index f25429314..2f0b5978f 100644
--- a/.kokoro/nightly/samples.cfg
+++ b/.kokoro/nightly/samples.cfg
@@ -14,22 +14,22 @@ env_vars: {
 # TODO: remove this after we've migrated all tests and scripts
 env_vars: {
   key: "GCLOUD_PROJECT"
-  value: "java-docs-samples-testing"
+  value: "java-review"
 }
 
 env_vars: {
   key: "GOOGLE_CLOUD_PROJECT"
-  value: "java-docs-samples-testing"
+  value: "java-review"
 }
 
 env_vars: {
   key: "GOOGLE_APPLICATION_CREDENTIALS"
-  value: "secret_manager/java-docs-samples-service-account"
+  value: "secret_manager/firestore-java-it"
 }
 
 env_vars: {
   key: "SECRET_MANAGER_KEYS"
-  value: "java-docs-samples-service-account"
+  value: "firestore-java-it"
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/integration.cfg b/.kokoro/presubmit/integration.cfg
index b9a89b654..eaf4676f6 100644
--- a/.kokoro/presubmit/integration.cfg
+++ b/.kokoro/presubmit/integration.cfg
@@ -18,14 +18,10 @@ env_vars: {
 
 env_vars: {
     key: "GOOGLE_APPLICATION_CREDENTIALS"
-    value: "keystore/73713_java_firestore_it_service_account"
+    value: "secret_manager/firestore-java-it"
 }
 
-before_action {
-  fetch_keystore {
-    keystore_resource {
-      keystore_config_id: 73713
-      keyname: "java_firestore_it_service_account"
-    }
-  }
+env_vars: {
+    key: "SECRET_MANAGER_KEYS"
+    value: "firestore-java-it"
 }
diff --git a/.kokoro/presubmit/samples.cfg b/.kokoro/presubmit/samples.cfg
index 01e096004..93d5eadc6 100644
--- a/.kokoro/presubmit/samples.cfg
+++ b/.kokoro/presubmit/samples.cfg
@@ -14,20 +14,20 @@ env_vars: {
 # TODO: remove this after we've migrated all tests and scripts
 env_vars: {
   key: "GCLOUD_PROJECT"
-  value: "java-docs-samples-testing"
+  value: "java-docs-samples-firestore"
 }
 
 env_vars: {
   key: "GOOGLE_CLOUD_PROJECT"
-  value: "java-docs-samples-testing"
+  value: "java-docs-samples-firestore"
 }
 
 env_vars: {
   key: "GOOGLE_APPLICATION_CREDENTIALS"
-  value: "secret_manager/java-docs-samples-service-account"
+  value: "secret_manager/java-firestore-samples-secrets"
 }
 
 env_vars: {
   key: "SECRET_MANAGER_KEYS"
-  value: "java-docs-samples-service-account"
-}
\ No newline at end of file
+  value: "java-firestore-samples-secrets"
+}
diff --git a/synth.py b/synth.py
index 07e0afb3b..a4f743aa5 100644
--- a/synth.py
+++ b/synth.py
@@ -126,7 +126,9 @@ def generate_client(service, version, proto_path=None, bazel_target=None, packag
     # firestore uses a different project for its integration tests
     # due to the default project running datastore
     '.kokoro/presubmit/integration.cfg',
-    '.kokoro/nightly/integration.cfg'
+    '.kokoro/presubmit/samples.cfg',
+    '.kokoro/nightly/integration.cfg',
+    '.kokoro/nightly/samples.cfg'
 ])
 
 # Mark v1beta1 as deprecated