From 9d531957da3f017f0702a126601eaa8afe3113d6 Mon Sep 17 00:00:00 2001
From: Cindy Peng <148148319+cindy-peng@users.noreply.github.com>
Date: Fri, 3 Jan 2025 18:16:21 -0800
Subject: [PATCH] fix: Fix emulator command arg data-dir (#1695)

The current gcloudRunner doesn't take any `--data-dir` flag due to a bug. This PR is to fix the `--data-dir` flag.
---
 .../cloud/datastore/testing/LocalDatastoreHelper.java       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java
index 32bf9611c..79d10220c 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java
@@ -163,15 +163,15 @@ private LocalDatastoreHelper(Builder builder) {
     if (!builder.storeOnDisk) {
       gcloudCommand.add("--no-store-on-disk");
     }
+    if (builder.dataDir != null) {
+      gcloudCommand.add("--data-dir=" + getGcdPath());
+    }
     GcloudEmulatorRunner gcloudRunner =
         new GcloudEmulatorRunner(gcloudCommand, VERSION_PREFIX, MIN_VERSION);
     List<String> binCommand = new ArrayList<>(Arrays.asList(binName, "start"));
     binCommand.add("--testing");
     binCommand.add(BIN_CMD_PORT_FLAG + getPort());
     binCommand.add(CONSISTENCY_FLAG + getConsistency());
-    if (builder.dataDir != null) {
-      gcloudCommand.add("--data-dir=" + getGcdPath());
-    }
     DownloadableEmulatorRunner downloadRunner =
         new DownloadableEmulatorRunner(binCommand, EMULATOR_URL, MD5_CHECKSUM, ACCESS_TOKEN);
     this.emulatorRunners = ImmutableList.of(gcloudRunner, downloadRunner);