Transition to 'testcontainers' for Firestore tests

- Fixes for ADC/creds in CI
- Initialize against container and test

Author: Sam Gammon

Makefile

@@ -139,8 +139,8 @@ endif
 
 # Flag: `DEV`
 ifeq ($(DEV),yes)
-BASE_ARGS += --config=devkey --test_output=errors
-BAZELISK_PREAMBLE = GOOGLE_APPLICATION_CREDENTIALS=$(BUILDKEY_PLAINTEXT)
+BASE_ARGS += --test_output=errors
+#BAZELISK_PREAMBLE = GOOGLE_APPLICATION_CREDENTIALS=$(BUILDKEY_PLAINTEXT)
 endif
 
 # Flag: `STRICT`.

java/gust/backend/driver/firestore/FirestoreDriver.java

@@ -73,7 +73,7 @@
  */
 @Immutable
 @ThreadSafe
-@SuppressWarnings("UnstableApiUsage")
+@SuppressWarnings({"UnstableApiUsage", "OptionalUsedAsFieldOrParameterType"})
 public final class FirestoreDriver<Key extends Message, Model extends Message>
   implements DatabaseDriver<Key, Model, DocumentSnapshot, CollapsedMessage> {
   /** Private log pipe. */

javatests/gust/backend/driver/firestore/BUILD.bazel

@@ -34,9 +34,10 @@ _COMMON_DEPS = [
     maven("com.google.truth:truth"),
     maven("com.google.truth.extensions:truth-java8-extension"),
     maven("com.google.truth.extensions:truth-proto-extension"),
-    maven("com.testcontainers:testcontainers"),
-    maven("com.testcontainers:junit-jupiter"),
-    maven("com.testcontainers:gcloud"),
+    maven("com.google.cloud:google-cloud-firestore"),
+    maven("org.testcontainers:testcontainers"),
+    maven("org.testcontainers:junit-jupiter"),
+    maven("org.testcontainers:gcloud"),
 ]
 
 

javatests/gust/backend/driver/firestore/FirestoreAdapterTest.java

@@ -13,13 +13,22 @@
 package gust.backend.driver.firestore;
 
 
+import com.google.api.gax.core.NoCredentialsProvider;
+import com.google.cloud.NoCredentials;
+import com.google.cloud.firestore.FirestoreOptions;
+import com.google.cloud.firestore.v1.stub.FirestoreStubSettings;
+import com.google.cloud.grpc.GrpcTransportOptions;
 import com.google.common.util.concurrent.ListeningScheduledExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;
 import gust.backend.model.GenericPersistenceAdapterTest;
 import gust.backend.model.PersonRecord.Person;
 import gust.backend.model.PersonRecord.PersonKey;
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.testcontainers.containers.FirestoreEmulatorContainer;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+import org.testcontainers.utility.DockerImageName;
 
 import javax.annotation.Nonnull;
 import java.util.concurrent.Executors;
@@ -29,18 +38,44 @@
 
 
 /** Tests for the {@link FirestoreAdapter}. */
+@Testcontainers
 @SuppressWarnings("UnstableApiUsage")
 public final class FirestoreAdapterTest extends GenericPersistenceAdapterTest<FirestoreAdapter<PersonKey, Person>> {
   private static ListeningScheduledExecutorService executorService;
   private static FirestoreAdapter<PersonKey, Person> personAdapter;
+  private static final String firestoreVersion = System.getProperty(
+          "e2e.firestoreVersion", "349.0.0-emulators");
 
-  @BeforeAll
-  static void initExecutor() {
+  @Container
+  public FirestoreEmulatorContainer firestore = new FirestoreEmulatorContainer(
+    DockerImageName.parse("gcr.io/google.com/cloudsdktool/cloud-sdk:" + firestoreVersion)
+  ).withNetworkAliases("firestore");
+
+  @BeforeEach
+  void initExecutor() {
     executorService = MoreExecutors.listeningDecorator(Executors.newScheduledThreadPool(3));
+    var creds = NoCredentialsProvider.create();
+
+    var stubSettings = FirestoreStubSettings.newBuilder()
+      .setEndpoint(firestore.getEmulatorEndpoint())
+      .setCredentialsProvider(creds);
+
     personAdapter = FirestoreAdapter.acquire(
+        FirestoreOptions.newBuilder()
+          .setProjectId("test-project")
+          .setHost(firestore.getEmulatorEndpoint())
+          .setEmulatorHost(firestore.getEmulatorEndpoint())
+          .setCredentials(NoCredentials.getInstance())
+          .setCredentialsProvider(NoCredentialsProvider.create()),
+        stubSettings.getTransportChannelProvider()
+            .withEndpoint(firestore.getEmulatorEndpoint())
+            .withCredentials(NoCredentials.getInstance()),
+        stubSettings.getCredentialsProvider(),
+        GrpcTransportOptions.newBuilder().build(),
+        executorService,
         PersonKey.getDefaultInstance(),
-        Person.getDefaultInstance(),
-        executorService);
+        Person.getDefaultInstance()
+    );
   }
 
   @AfterAll
@@ -60,10 +95,6 @@ static void shutdownExecutor() throws InterruptedException {
   /** {@inheritDoc} */
   @Override
   protected void acquireDriver() {
-    FirestoreAdapter<PersonKey, Person> personAdapter = FirestoreAdapter.acquire(
-        PersonKey.getDefaultInstance(),
-        Person.getDefaultInstance(),
-        executorService);
     assertNotNull(personAdapter, "should not get `null` for adapter acquire");
   }
 }

tools/bazel.rc

@@ -30,8 +30,8 @@ build --nojava_header_compilation
 build:dev --define=project=elide-ai
 build:dev --define=todolist_release_tag=latest
 build:adc --google_default_credentials=true
-build:devkey --google_credentials=crypto/build-key.json
-test:devkey --action_env=GOOGLE_APPLICATION_CREDENTIALS
+#build:devkey --google_credentials=crypto/build-key.json
+#test:devkey --action_env=GOOGLE_APPLICATION_CREDENTIALS
 
 build --watchfs
 build --symlink_prefix=dist/
@@ -165,7 +165,7 @@ build:remote --remote_timeout=3600
 build:remote --google_default_credentials=true
 
 test --instrumentation_filter=//java/...
-test --test_env=GOOGLE_APPLICATION_CREDENTIALS
+#test --test_env=GOOGLE_APPLICATION_CREDENTIALS
 coverage --instrumentation_filter=//java/...
 
 coverage --collect_code_coverage