Skip to content
This repository was archived by the owner on May 8, 2026. It is now read-only.

Commit d16b0eb

Browse files
committed
chore(firestore): rename nameddb to enterprise
1 parent be110ee commit d16b0eb

8 files changed

Lines changed: 12 additions & 14 deletions

File tree

.agents/skills/verify-local-changes/SKILL.md

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ When running integration tests, configure your execution using properties or env
4747
- `standard` (Default)
4848
- `enterprise`
4949
- *Note*: **Pipelines can only be run against `enterprise` editions**, while standard Queries run on both.
50-
- **`FIRESTORE_NAMED_DATABASE`**:
50+
- **`FIRESTORE_DATABASE_ID`**:
5151
- Enterprise editions usually require a named database (often `enterprise`). Adjust this flag if pointing to specific instances.
5252
- **`FIRESTORE_TARGET_BACKEND`**:
5353
- `PROD` (Default)
@@ -58,23 +58,21 @@ When running integration tests, configure your execution using properties or env
5858
1. **Identify modified integration tests** (usually Starting in `IT`).
5959
2. **Run specific integration tests only** (isolated checks run quicker):
6060
```bash
61-
mvn verify -Penable-integration-tests -DFIRESTORE_EDITION=enterprise -DFIRESTORE_NAMED_DATABASE=enterprise -Dtest=ITTest#testMethod -Dclirr.skip=true -Denforcer.skip=true -fae
61+
mvn verify -Penable-integration-tests -DFIRESTORE_EDITION=enterprise -DFIRESTORE_DATABASE_ID=enterprise -Dtest=ITTest#testMethod -Dclirr.skip=true -Denforcer.skip=true -fae
6262
```
6363
3. **Run the entire integration test suite** for the modified class if isolation tests pass:
6464
```bash
65-
mvn verify -Penable-integration-tests -DFIRESTORE_EDITION=enterprise -DFIRESTORE_NAMED_DATABASE=enterprise -Dtest=ITTest -Dclirr.skip=true -Denforcer.skip=true -fae
65+
mvn verify -Penable-integration-tests -DFIRESTORE_EDITION=enterprise -DFIRESTORE_DATABASE_ID=enterprise -Dtest=ITTest -Dclirr.skip=true -Denforcer.skip=true -fae
6666
```
6767

68-
69-
7068
---
7169

7270
## Step 3: Full Suite Regressions
7371

7472
Run the full integration regression suite once you are confident subsets pass:
7573

7674
```bash
77-
mvn verify -Penable-integration-tests -DFIRESTORE_EDITION=enterprise -DFIRESTORE_NAMED_DATABASE=enterprise -Dclirr.skip=true -Denforcer.skip=true -fae
75+
mvn verify -Penable-integration-tests -DFIRESTORE_EDITION=enterprise -DFIRESTORE_DATABASE_ID=enterprise -Dclirr.skip=true -Denforcer.skip=true -fae
7876
```
7977

8078
---
@@ -89,7 +87,7 @@ mvn verify -Penable-integration-tests -DFIRESTORE_EDITION=enterprise -DFIRESTORE
8987
If you run into issues executing tests with the commands above, **consult the Kokoro configuration files** as the ultimate source of truth:
9088

9189
- **Presubmit configurations**: See `.kokoro/presubmit/integration.cfg` (or `integration-named-db.cfg`)
92-
- **Nightly configurations**: See `.kokoro/nightly/integration.cfg`
90+
- **Nightly configurations**: See `.kokoro/nightly/integration.cfg` (or `integration-named-db.cfg`)
9391
- **Build shell scripts**: See `.kokoro/build.sh`
9492

9593
These files define the exact environment variables (e.g., specific endpoints or endpoints overrides) the CI server uses!

.kokoro/nightly/integration-named-db.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ env_vars: {
1313

1414
env_vars: {
1515
key: "INTEGRATION_TEST_ARGS"
16-
value: "-DFIRESTORE_NAMED_DATABASE=test-db -DFIRESTORE_EDITION=standard"
16+
value: "-DFIRESTORE_DATABASE_ID=test-db -DFIRESTORE_EDITION=standard"
1717
}
1818

1919
# TODO: remove this after we've migrated all tests and scripts

.kokoro/presubmit/graalvm-c.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ env_vars: {
1313

1414
env_vars: {
1515
key: "INTEGRATION_TEST_ARGS"
16-
value: "-DFIRESTORE_NAMED_DATABASE=enterprise -DFIRESTORE_EDITION=enterprise"
16+
value: "-DFIRESTORE_DATABASE_ID=enterprise -DFIRESTORE_EDITION=enterprise"
1717
}
1818

1919
# TODO: remove this after we've migrated all tests and scripts

.kokoro/presubmit/graalvm-native-c.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ env_vars: {
1313

1414
env_vars: {
1515
key: "INTEGRATION_TEST_ARGS"
16-
value: "-DFIRESTORE_NAMED_DATABASE=enterprise -DFIRESTORE_EDITION=enterprise"
16+
value: "-DFIRESTORE_DATABASE_ID=enterprise -DFIRESTORE_EDITION=enterprise"
1717
}
1818

1919
env_vars: {

.kokoro/presubmit/integration-named-db.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ env_vars: {
1313

1414
env_vars: {
1515
key: "INTEGRATION_TEST_ARGS"
16-
value: "-DFIRESTORE_NAMED_DATABASE=enterprise -DFIRESTORE_EDITION=enterprise"
16+
value: "-DFIRESTORE_DATABASE_ID=enterprise -DFIRESTORE_EDITION=enterprise"
1717
}
1818

1919
env_vars: {

google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITBaseTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ static FirestoreEdition getFirestoreEdition() {
8282
public static FirestoreOptions.Builder getOptionsBuilder() {
8383
FirestoreOptions.Builder optionsBuilder = FirestoreOptions.newBuilder();
8484

85-
String dbPropertyName = "FIRESTORE_NAMED_DATABASE";
85+
String dbPropertyName = "FIRESTORE_DATABASE_ID";
8686
String namedDb = System.getProperty(dbPropertyName);
8787
if (namedDb == null) {
8888
namedDb = System.getenv(dbPropertyName);

google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITE2ETracingTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ public void before() throws Exception {
327327
.build());
328328
}
329329

330-
String namedDb = System.getProperty("FIRESTORE_NAMED_DATABASE");
330+
String namedDb = System.getProperty("FIRESTORE_DATABASE_ID");
331331
if (namedDb != null) {
332332
logger.log(Level.INFO, "Integration test using named database " + namedDb);
333333
optionsBuilder = optionsBuilder.setDatabaseId(namedDb);

google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITTracingTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ public void before() {
135135
otelOptionsBuilder.setOpenTelemetry(openTelemetrySdk).build());
136136
}
137137

138-
String namedDb = System.getProperty("FIRESTORE_NAMED_DATABASE");
138+
String namedDb = System.getProperty("FIRESTORE_DATABASE_ID");
139139
if (namedDb != null) {
140140
logger.log(
141141
Level.INFO,

0 commit comments

Comments
 (0)