Skip to content

chore(firestore): rename nameddb to enterprise #2371

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

Open
wu-hui wants to merge 4 commits into
base: main
Choose a base branch
from
Open

chore(firestore): rename nameddb to enterprise #2371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d16b0eb
chore(firestore): rename nameddb to enterprise
wu-hui Apr 20, 2026
d4867f7
chore: generate libraries at Mon Apr 20 19:53:10 UTC 2026
cloud-java-bot Apr 20, 2026
abd1fd8
Merge branch 'main' into firestore-enterprise-rename-java
wu-hui Apr 21, 2026
c62ca12
chore: generate libraries at Tue Apr 21 17:01:08 UTC 2026
cloud-java-bot Apr 21, 2026
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
12 changes: 5 additions & 7 deletions .agents/skills/verify-local-changes/SKILL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ When running integration tests, configure your execution using properties or env
- `standard` (Default)
- `enterprise`
- *Note*: **Pipelines can only be run against `enterprise` editions**, while standard Queries run on both.
- **`FIRESTORE_NAMED_DATABASE`**:
- **`FIRESTORE_DATABASE_ID`**:
- Enterprise editions usually require a named database (often `enterprise`). Adjust this flag if pointing to specific instances.
- **`FIRESTORE_TARGET_BACKEND`**:
- `PROD` (Default)
Expand All @@ -58,23 +58,21 @@ When running integration tests, configure your execution using properties or env
1. **Identify modified integration tests** (usually Starting in `IT`).
2. **Run specific integration tests only** (isolated checks run quicker):
```bash
mvn verify -Penable-integration-tests -DFIRESTORE_EDITION=enterprise -DFIRESTORE_NAMED_DATABASE=enterprise -Dtest=ITTest#testMethod -Dclirr.skip=true -Denforcer.skip=true -fae
mvn verify -Penable-integration-tests -DFIRESTORE_EDITION=enterprise -DFIRESTORE_DATABASE_ID=enterprise -Dtest=ITTest#testMethod -Dclirr.skip=true -Denforcer.skip=true -fae
```
3. **Run the entire integration test suite** for the modified class if isolation tests pass:
```bash
mvn verify -Penable-integration-tests -DFIRESTORE_EDITION=enterprise -DFIRESTORE_NAMED_DATABASE=enterprise -Dtest=ITTest -Dclirr.skip=true -Denforcer.skip=true -fae
mvn verify -Penable-integration-tests -DFIRESTORE_EDITION=enterprise -DFIRESTORE_DATABASE_ID=enterprise -Dtest=ITTest -Dclirr.skip=true -Denforcer.skip=true -fae
```



---

## Step 3: Full Suite Regressions

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

```bash
mvn verify -Penable-integration-tests -DFIRESTORE_EDITION=enterprise -DFIRESTORE_NAMED_DATABASE=enterprise -Dclirr.skip=true -Denforcer.skip=true -fae
mvn verify -Penable-integration-tests -DFIRESTORE_EDITION=enterprise -DFIRESTORE_DATABASE_ID=enterprise -Dclirr.skip=true -Denforcer.skip=true -fae
```

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

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

These files define the exact environment variables (e.g., specific endpoints or endpoints overrides) the CI server uses!
7 changes: 3 additions & 4 deletions .github/workflows/renovate_config_check.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
pull_request:
paths:
- 'renovate.json'
- '.github/workflows/renovate_config_check.yaml'

jobs:
renovate_bot_config_validation:
Expand All @@ -18,8 +19,6 @@ jobs:
with:
node-version: '22'

- name: Install Renovate and Config Validator
- name: Run Renovate Config Validator
run: |
npm install -g npm@latest
npm install --global renovate
renovate-config-validator
npx --package renovate@43.136.0 renovate-config-validator
2 changes: 1 addition & 1 deletion .kokoro/nightly/integration-named-db.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ env_vars: {

env_vars: {
key: "INTEGRATION_TEST_ARGS"
value: "-DFIRESTORE_NAMED_DATABASE=test-db -DFIRESTORE_EDITION=standard"
value: "-DFIRESTORE_DATABASE_ID=test-db -DFIRESTORE_EDITION=standard"
}

# TODO: remove this after we've migrated all tests and scripts
Expand Down
2 changes: 1 addition & 1 deletion .kokoro/presubmit/graalvm-c.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ env_vars: {

env_vars: {
key: "INTEGRATION_TEST_ARGS"
value: "-DFIRESTORE_NAMED_DATABASE=enterprise -DFIRESTORE_EDITION=enterprise"
value: "-DFIRESTORE_DATABASE_ID=enterprise -DFIRESTORE_EDITION=enterprise"
}

# TODO: remove this after we've migrated all tests and scripts
Expand Down
2 changes: 1 addition & 1 deletion .kokoro/presubmit/graalvm-native-c.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ env_vars: {

env_vars: {
key: "INTEGRATION_TEST_ARGS"
value: "-DFIRESTORE_NAMED_DATABASE=enterprise -DFIRESTORE_EDITION=enterprise"
value: "-DFIRESTORE_DATABASE_ID=enterprise -DFIRESTORE_EDITION=enterprise"
}

env_vars: {
Expand Down
2 changes: 1 addition & 1 deletion .kokoro/presubmit/integration-named-db.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ env_vars: {

env_vars: {
key: "INTEGRATION_TEST_ARGS"
value: "-DFIRESTORE_NAMED_DATABASE=enterprise -DFIRESTORE_EDITION=enterprise"
value: "-DFIRESTORE_DATABASE_ID=enterprise -DFIRESTORE_EDITION=enterprise"
}

env_vars: {
Expand Down
2 changes: 1 addition & 1 deletion google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITBaseTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ static FirestoreEdition getFirestoreEdition() {
public static FirestoreOptions.Builder getOptionsBuilder() {
FirestoreOptions.Builder optionsBuilder = FirestoreOptions.newBuilder();

String dbPropertyName = "FIRESTORE_NAMED_DATABASE";
String dbPropertyName = "FIRESTORE_DATABASE_ID";
String namedDb = System.getProperty(dbPropertyName);
if (namedDb == null) {
namedDb = System.getenv(dbPropertyName);
Expand Down
2 changes: 1 addition & 1 deletion google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITE2ETracingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ public void before() throws Exception {
.build());
}

String namedDb = System.getProperty("FIRESTORE_NAMED_DATABASE");
String namedDb = System.getProperty("FIRESTORE_DATABASE_ID");
if (namedDb != null) {
logger.log(Level.INFO, "Integration test using named database " + namedDb);
optionsBuilder = optionsBuilder.setDatabaseId(namedDb);
Expand Down
2 changes: 1 addition & 1 deletion google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITTracingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ public void before() {
otelOptionsBuilder.setOpenTelemetry(openTelemetrySdk).build());
}

String namedDb = System.getProperty("FIRESTORE_NAMED_DATABASE");
String namedDb = System.getProperty("FIRESTORE_DATABASE_ID");
if (namedDb != null) {
logger.log(
Level.INFO,
Expand Down
Loading