Skip to content

s226 - if emulator is present consider it as not cloud environment #98

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jlorper merged 1 commit into from
May 29, 2026
Merged

s226 - if emulator is present consider it as not cloud environment #98

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions java/src/main/java/com/google/appengine/tools/EnvironmentUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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);
Expand Down