Skip to content

Commit 0ed5f08

Browse files
authored
chore(firestore): rename named-db to enterprise (#8083)
1 parent 816216b commit 0ed5f08

3 files changed

Lines changed: 11 additions & 11 deletions

File tree

handwritten/firestore/dev/system-test/firestore.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@ if (process.env.NODE_ENV === 'DEBUG') {
105105

106106
export function getTestDb(settings: Settings = {}): Firestore {
107107
const internalSettings: Settings = {};
108-
if (process.env.FIRESTORE_NAMED_DATABASE) {
109-
internalSettings.databaseId = process.env.FIRESTORE_NAMED_DATABASE;
108+
if (process.env.FIRESTORE_DATABASE_ID) {
109+
internalSettings.databaseId = process.env.FIRESTORE_DATABASE_ID;
110110
}
111111

112112
if (process.env.FIRESTORE_TARGET_BACKEND) {

handwritten/firestore/dev/system-test/tracing.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,8 +286,8 @@ describe.skipEnterprise('Tracing Tests', () => {
286286
};
287287

288288
// Named-database tests use an environment variable to specify the database ID. Add it to the settings.
289-
if (process.env.FIRESTORE_NAMED_DATABASE) {
290-
settings.databaseId = process.env.FIRESTORE_NAMED_DATABASE;
289+
if (process.env.FIRESTORE_DATABASE_ID) {
290+
settings.databaseId = process.env.FIRESTORE_DATABASE_ID;
291291
}
292292
// If a database ID has not been specified in the settings, check whether
293293
// it's been specified using an environment variable.

handwritten/firestore/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,16 @@
4040
"predocs": "npm run compile",
4141
"docs": "jsdoc -c .jsdoc.js",
4242
"system-test:rest": "FIRESTORE_PREFER_REST=true mocha build/system-test --timeout 1200000",
43-
"system-test:named-db:rest": "FIRESTORE_NAMED_DATABASE=test-db FIRESTORE_PREFER_REST=true mocha build/system-test --timeout 1200000",
43+
"system-test:enterprise:rest": "FIRESTORE_DATABASE_ID=test-db FIRESTORE_PREFER_REST=true mocha build/system-test --timeout 1200000",
4444
"system-test:grpc": "mocha build/system-test --timeout 1200000",
45-
"system-test:named-db:grpc": "FIRESTORE_NAMED_DATABASE=test-db mocha build/system-test --timeout 1200000",
45+
"system-test:enterprise:grpc": "FIRESTORE_DATABASE_ID=test-db mocha build/system-test --timeout 1200000",
4646
"system-test:emulator:rest": "FIRESTORE_EMULATOR_HOST=localhost:8080 FIRESTORE_PREFER_REST=true mocha build/system-test --timeout 1200000",
47-
"system-test:named-db:emulator:rest": "FIRESTORE_NAMED_DATABASE=test-db FIRESTORE_EMULATOR_HOST=localhost:8080 FIRESTORE_PREFER_REST=true mocha build/system-test --timeout 1200000",
47+
"system-test:enterprise:emulator:rest": "FIRESTORE_DATABASE_ID=test-db FIRESTORE_EMULATOR_HOST=localhost:8080 FIRESTORE_PREFER_REST=true mocha build/system-test --timeout 1200000",
4848
"system-test:emulator:grpc": "FIRESTORE_EMULATOR_HOST=localhost:8080 mocha build/system-test --timeout 1200000",
49-
"system-test:named-db:emulator:grpc": "FIRESTORE_NAMED_DATABASE=test-db FIRESTORE_EMULATOR_HOST=localhost:8080 mocha build/system-test --timeout 1200000",
50-
"system-test": "concurrently -p \"[{name}]\" -n \"grpc,rest,named-db-grpc,named-db-rest\" -c \"cyan,magenta,blue,yellow\" \"npm:system-test:grpc\" \"npm:system-test:rest\" \"npm:system-test:named-db:grpc\" \"npm:system-test:named-db:rest\"",
51-
"system-test:nightly": "FIRESTORE_TARGET_BACKEND=nightly FIRESTORE_NAMED_DATABASE=enterprise RUN_ENTERPRISE_TESTS=yes GCLOUD_PROJECT=firestore-sdk-nightly mocha build/system-test --timeout 1200000",
52-
"system-test:emulator": "concurrently -p \"[{name}]\" -n \"grpc,rest,named-db-grpc,named-db-rest\" -c \"cyan,magenta,blue,yellow\" \"npm:system-test:emulator:grpc\" \"npm:system-test:emulator:rest\" \"npm:system-test:named-db:emulator:grpc\" \"npm:system-test:named-db:emulator:rest\"",
49+
"system-test:enterprise:emulator:grpc": "FIRESTORE_DATABASE_ID=test-db FIRESTORE_EMULATOR_HOST=localhost:8080 mocha build/system-test --timeout 1200000",
50+
"system-test": "concurrently -p \"[{name}]\" -n \"grpc,rest,enterprise-grpc,enterprise-rest\" -c \"cyan,magenta,blue,yellow\" \"npm:system-test:grpc\" \"npm:system-test:rest\" \"npm:system-test:enterprise:grpc\" \"npm:system-test:enterprise:rest\"",
51+
"system-test:nightly": "FIRESTORE_TARGET_BACKEND=nightly FIRESTORE_DATABASE_ID=enterprise RUN_ENTERPRISE_TESTS=yes GCLOUD_PROJECT=firestore-sdk-nightly mocha build/system-test --timeout 1200000",
52+
"system-test:emulator": "concurrently -p \"[{name}]\" -n \"grpc,rest,enterprise-grpc,enterprise-rest\" -c \"cyan,magenta,blue,yellow\" \"npm:system-test:emulator:grpc\" \"npm:system-test:emulator:rest\" \"npm:system-test:enterprise:emulator:grpc\" \"npm:system-test:enterprise:emulator:rest\"",
5353
"presystem-test": "npm run compile",
5454
"samples-test": "npm link && cd samples/ && npm link ../ && npm test && cd ../",
5555
"conformance": "mocha build/conformance",

0 commit comments

Comments
 (0)