fix: firestore projectId is hardcoded in the tests (GoogleCloudPlatform#2884)

dmitry-fa · kurtisvg · web-flow · commit 94061b123f80 · 2020-05-18T17:28:01.000-07:00
* fix: firestore projectId is hardcoded in the tests

* fix: firestore projectId is hardcoded in the tests

* fix: firestore projectId is hardcoded in the tests

* fix: firestore projectId is hardcoded in the tests

* fix: firestore projectId is hardcoded in the tests

* fix: firestore projectId is hardcoded in the tests

* Add firestore secrets.

* Reorder imports.

Co-authored-by: kurtisvg &lt;31518063+kurtisvg@users.noreply.github.com&gt;
diff --git a/.kokoro/tests/run_tests.sh b/.kokoro/tests/run_tests.sh
@@ -73,8 +73,11 @@ if [[ "$SCRIPT_DEBUG" != "true" ]]; then
     source "${KOKORO_GFILE_DIR}/automl_secrets.txt"
     # shellcheck source=src/functions_secrets.txt
     source "${KOKORO_GFILE_DIR}/functions_secrets.txt"
+    # spellcheck source=src/firestore_secrets.txt
+    source "${KOKORO_GFILE_DIR}/firestore_secrets.txt"
     # spellcheck source=src/cts_v4_secrets.txt
     source "${KOKORO_GFILE_DIR}/cts_v4_secrets.txt"
+
     # Activate service account
     gcloud auth activate-service-account \
         --key-file="$GOOGLE_APPLICATION_CREDENTIALS" \
diff --git a/firestore/README.md b/firestore/README.md
@@ -45,6 +45,8 @@ the Firestore [documentation](https://cloud.google.com/firestore/docs).
 
 ## Tests
 Run all tests:
+
+Set the `FIRESTORE_PROJECT_ID` environment variable and run the command:
 ```
    mvn clean verify
 ```
diff --git a/firestore/src/test/java/com/example/firestore/BaseIntegrationTest.java b/firestore/src/test/java/com/example/firestore/BaseIntegrationTest.java
@@ -16,6 +16,8 @@
 
 package com.example.firestore;
 
+import static org.junit.Assert.assertNotNull;
+
 import com.example.firestore.snippets.ManageDataSnippetsIT;
 import com.example.firestore.snippets.model.City;
 import com.google.api.core.ApiFuture;
@@ -32,11 +34,20 @@
  */
 public class BaseIntegrationTest {
 
-  protected static String projectId = "java-docs-samples-firestore";
+  protected static String projectId;
   protected static Firestore db;
 
+  private static String getEnvVar(String varName) {
+    String value = System.getenv(varName);
+    assertNotNull(
+            String.format("Environment variable '%s' must be set to perform these tests.", varName),
+            value);
+    return value;
+  }
+
   @BeforeClass
   public static void baseSetup() throws Exception {
+    projectId = getEnvVar("FIRESTORE_PROJECT_ID");
     FirestoreOptions firestoreOptions = FirestoreOptions.getDefaultInstance().toBuilder()
         .setProjectId(projectId)
         .build();
