From 08c720e9b465e7c678d873e26744ee26b542edf3 Mon Sep 17 00:00:00 2001 From: Jose Lorenzo Date: Fri, 29 May 2026 09:25:06 +0200 Subject: [PATCH] emulator is present consider it as not cloud environment --- .../com/google/appengine/tools/EnvironmentUtils.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/java/src/main/java/com/google/appengine/tools/EnvironmentUtils.java b/java/src/main/java/com/google/appengine/tools/EnvironmentUtils.java index 9bd262d4..95c2ef64 100644 --- a/java/src/main/java/com/google/appengine/tools/EnvironmentUtils.java +++ b/java/src/main/java/com/google/appengine/tools/EnvironmentUtils.java @@ -37,11 +37,11 @@ public static DatastoreOptions.Builder datastoreBuilderFromDatastoreOptions(Data .setHost(datastoreOptions.getHost()) .setOpenTelemetryOptions(datastoreOptions.getOpenTelemetryOptions()); - // set emulator host if needed - if (getDatastoreEmulatorHost() != null) { - builder.setHost(getDatastoreEmulatorHost()); - } if (isNotCloudEnvironment(datastoreOptions)) { + // set emulator host if needed + if (getDatastoreEmulatorHost() != null) { + builder.setHost(getDatastoreEmulatorHost()); + } // override credentials builder.setCredentials(NoCredentials.getInstance()); // set valid project id if needed @@ -65,7 +65,8 @@ public static boolean isNotCloudEnvironment() { } public static boolean isNotCloudEnvironment(String projectId) { - return projectId == null || + return getDatastoreEmulatorHost() != null && + projectId == null || LOCAL_GAE_PROJECT_ID.equals(projectId) || DEFAULT_OVERRIDE_LOCAL_GAE_PROJECT_ID.equals(projectId) || TEST_PROJECT_ID.equals(projectId);