Skip to content

Commit eb338ee

Browse files
jasonboscojasonbosco
authored
Merge pull request #118 from typesense/117-fix-locations-error
Add separate `FIRESTORE_DATABASE_REGION`, different from the Firebase function `LOCATION`
2 parents 6c8944b + dcf29e3 commit eb338ee

7 files changed

+122
-9
lines changed

‎extension.yaml

+116-9
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ resources:
2828
timeoutSeconds: 540
2929
eventTrigger:
3030
eventType: google.cloud.firestore.document.v1.written
31-
triggerRegion: ${LOCATION}
31+
triggerRegion: ${FIRESTORE_DATABASE_REGION}
3232
eventFilters:
3333
- attribute: database
3434
value: ${DATABASE}
@@ -50,7 +50,7 @@ resources:
5050
availableMemory: 2048M
5151
eventTrigger:
5252
eventType: google.cloud.firestore.document.v1.written
53-
triggerRegion: ${LOCATION}
53+
triggerRegion: ${FIRESTORE_DATABASE_REGION}
5454
eventFilters:
5555
- attribute: database
5656
value: ${DATABASE}
@@ -69,6 +69,120 @@ externalServices:
6969
PricingUri: https://typesense.org/downloads
7070

7171
params:
72+
- param: FIRESTORE_DATABASE_REGION
73+
label: Firestore Database region
74+
description: >-
75+
The region where your Firestore database is located.
76+
type: select
77+
options:
78+
# Multi-region locations
79+
- label: nam5 (US multi-region)
80+
value: nam5
81+
- label: eur3 (Europe multi-region)
82+
value: eur3
83+
# North America
84+
- label: us-central1 (Iowa)
85+
value: us-central1
86+
- label: us-west1 (Oregon)
87+
value: us-west1
88+
- label: us-west2 (Los Angeles)
89+
value: us-west2
90+
- label: us-west3 (Salt Lake City)
91+
value: us-west3
92+
- label: us-west4 (Las Vegas)
93+
value: us-west4
94+
- label: us-east1 (South Carolina)
95+
value: us-east1
96+
- label: us-east4 (Northern Virginia)
97+
value: us-east4
98+
- label: us-east5 (Columbus)
99+
value: us-east5
100+
- label: us-south1 (Dallas)
101+
value: us-south1
102+
- label: northamerica-northeast1 (Montreal)
103+
value: northamerica-northeast1
104+
- label: northamerica-northeast2 (Toronto)
105+
value: northamerica-northeast2
106+
- label: northamerica-south1 (Queretaro)
107+
value: northamerica-south1
108+
# South America
109+
- label: southamerica-east1 (São Paulo)
110+
value: southamerica-east1
111+
- label: southamerica-west1 (Santiago)
112+
value: southamerica-west1
113+
# Europe
114+
- label: europe-west1 (Belgium)
115+
value: europe-west1
116+
- label: europe-west2 (London)
117+
value: europe-west2
118+
- label: europe-west3 (Frankfurt)
119+
value: europe-west3
120+
- label: europe-west4 (Netherlands)
121+
value: europe-west4
122+
- label: europe-west6 (Zürich)
123+
value: europe-west6
124+
- label: europe-west8 (Milan)
125+
value: europe-west8
126+
- label: europe-west9 (Paris)
127+
value: europe-west9
128+
- label: europe-west10 (Berlin)
129+
value: europe-west10
130+
- label: europe-west12 (Turin)
131+
value: europe-west12
132+
- label: europe-central2 (Warsaw)
133+
value: europe-central2
134+
- label: europe-north1 (Finland)
135+
value: europe-north1
136+
- label: europe-north2 (Stockholm)
137+
value: europe-north2
138+
- label: europe-southwest1 (Madrid)
139+
value: europe-southwest1
140+
# Middle East
141+
- label: me-central1 (Doha)
142+
value: me-central1
143+
- label: me-central2 (Dammam)
144+
value: me-central2
145+
- label: me-west1 (Tel Aviv)
146+
value: me-west1
147+
# Asia
148+
- label: asia-east1 (Taiwan)
149+
value: asia-east1
150+
- label: asia-east2 (Hong Kong)
151+
value: asia-east2
152+
- label: asia-northeast1 (Tokyo)
153+
value: asia-northeast1
154+
- label: asia-northeast2 (Osaka)
155+
value: asia-northeast2
156+
- label: asia-northeast3 (Seoul)
157+
value: asia-northeast3
158+
- label: asia-south1 (Mumbai)
159+
value: asia-south1
160+
- label: asia-south2 (Delhi)
161+
value: asia-south2
162+
- label: asia-southeast1 (Singapore)
163+
value: asia-southeast1
164+
- label: asia-southeast2 (Jakarta)
165+
value: asia-southeast2
166+
# Australia
167+
- label: australia-southeast1 (Sydney)
168+
value: australia-southeast1
169+
- label: australia-southeast2 (Melbourne)
170+
value: australia-southeast2
171+
# Africa
172+
- label: africa-south1 (Johannesburg)
173+
value: africa-south1
174+
default: nam5
175+
required: true
176+
immutable: true
177+
178+
- param: DATABASE
179+
label: Firestore Database
180+
description: >-
181+
The Firestore database to use. Use "(default)" for the default database.
182+
example: "(default)"
183+
default: "(default)"
184+
required: false
185+
72186
- param: FIRESTORE_COLLECTION_PATH
73187
label: Firestore Collection Path
74188
description: >-
@@ -121,13 +235,6 @@ params:
121235
value: true
122236
default: false
123237
required: false
124-
- param: DATABASE
125-
label: Firestore Database
126-
description: >-
127-
The Firestore database to use. Use "(default)" for the default database.
128-
example: "(default)"
129-
default: "(default)"
130-
required: false
131238
- param: LOG_TYPESENSE_INSERTS
132239
label: Log Typesense Inserts for Debugging
133240
description: >-

‎extensions/firestore-typesense-search.env.local

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
LOCATION=us-central1
2+
FIRESTORE_DATABASE_REGION=nam5
23
FIRESTORE_COLLECTION_PATH=books
34
FIRESTORE_COLLECTION_FIELDS=author,title,rating,isAvailable,location,createdAt,nested_field,tags,nullField,ref
45
FLATTEN_NESTED_DOCUMENTS=false

‎extensions/test-params-flatten-nested-false.local.env

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
LOCATION=us-central1
2+
FIRESTORE_DATABASE_REGION=nam5
23
FIRESTORE_COLLECTION_PATH=books
34
FIRESTORE_COLLECTION_FIELDS=author,title,rating,isAvailable,location,createdAt,nested_field,tags,nullField,ref
45
FLATTEN_NESTED_DOCUMENTS=false

‎extensions/test-params-flatten-nested-true.local.env

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
LOCATION=us-central1
2+
FIRESTORE_DATABASE_REGION=nam5
23
FIRESTORE_COLLECTION_PATH=books
34
FIRESTORE_COLLECTION_FIELDS=author,title,rating,isAvailable,location,createdAt,nested_field,tags,nullField,ref
45
FLATTEN_NESTED_DOCUMENTS=true

‎extensions/test-params-subcategory-flatten-nested-false.local.env

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
LOCATION=us-central1
2+
FIRESTORE_DATABASE_REGION=nam5
23
FIRESTORE_COLLECTION_PATH=users/{personId}/books
34
TEST_FIRESTORE_PARENT_COLLECTION_PATH=users
45
TEST_FIRESTORE_PARENT_ID=123

‎extensions/test-params.example.env

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
LOCATION=us-central1
2+
FIRESTORE_DATABASE_REGION=nam5
23
FIRESTORE_COLLECTION_PATH=books
34
FIRESTORE_COLLECTION_FIELDS=author,title
45
FLATTEN_NESTED_DOCUMENTS=true

‎test/writeLogging.spec.js

+1
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ describe("indexOnWriteLogging - when shouldLogTypesenseInserts is true", () => {
8585
testEnvironment = new TestEnvironment({
8686
dotenvConfig: `
8787
LOCATION=us-central1
88+
FIRESTORE_DATABASE_REGION=nam5
8889
FIRESTORE_COLLECTION_PATH=books
8990
FIRESTORE_COLLECTION_FIELDS=author,title,rating,isAvailable,location,createdAt,nested_field,tags,nullField,ref
9091
FLATTEN_NESTED_DOCUMENTS=true

0 commit comments

Comments
 (0)