Skip to content

Commit 43f223d

Browse files
stephenarosajstephenarosaj
committed
convert autopush resources to prod
1 parent cf72f38 commit 43f223d

File tree

4 files changed

+10
-39
lines changed

4 files changed

+10
-39
lines changed

‎src/data-connect/data-connect-api-client-internal.ts‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,13 @@ import { ConnectorConfig, ExecuteGraphqlResponse, GraphqlOptions, RefOptions } f
2727

2828
const API_VERSION = 'v1';
2929

30-
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
31-
// TODO: CHANGE THIS BACK TO PROD - AUTOPUSH IS ONLY USED FOR LOCAL TESTING BEFORE CHANGES PROPAGATE TO PROD
32-
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
3330
/** The Firebase Data Connect backend service URL format. */
3431
const FIREBASE_DATA_CONNECT_SERVICES_URL_FORMAT =
35-
'https://autopush-firebasedataconnect.sandbox.googleapis.com/{version}/projects/{projectId}/locations/{locationId}/services/{serviceId}:{endpointId}';
32+
'https://firebasedataconnect.googleapis.com/{version}/projects/{projectId}/locations/{locationId}/services/{serviceId}:{endpointId}';
3633

3734
/** The Firebase Data Connect backend connector URL format. */
3835
const FIREBASE_DATA_CONNECT_CONNECTORS_URL_FORMAT =
39-
'https://autopush-firebasedataconnect.sandbox.googleapis.com/{version}/projects/{projectId}/locations/{locationId}/services/{serviceId}/connectors/{connectorId}:{endpointId}';
36+
'https://firebasedataconnect.googleapis.com/{version}/projects/{projectId}/locations/{locationId}/services/{serviceId}/connectors/{connectorId}:{endpointId}';
4037

4138
/** Firebase Data Connect service URL format when using the Data Connect emulator. */
4239
const FIREBASE_DATA_CONNECT_EMULATOR_SERVICES_URL_FORMAT =

‎test/integration/data-connect.spec.ts‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,7 @@ interface DeleteResponse {
114114
}
115115

116116
const connectorConfig: ConnectorConfig = {
117-
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
118-
// TODO: CHANGE THIS BACK TO us-west2 - us-central1 IS ONLY USED FOR LOCAL TESTING BEFORE CHANGES PROPAGATE TO PROD
119-
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
120-
location: 'us-central1',
117+
location: 'us-west2',
121118
serviceId: 'my-service',
122119
connector: 'my-connector'
123120
};

‎test/integration/dataconnect/dataconnect/dataconnect.yaml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,13 @@
11
specVersion: "v1"
22
serviceId: "my-service"
3-
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
4-
# TODO: CHANGE THIS BACK TO us-west2 - us-central1 IS ONLY USED FOR LOCAL TESTING BEFORE CHANGES PROPAGATE TO PROD
5-
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
6-
location: "us-central1"
3+
location: "us-west2"
74
schema:
85
source: "./schema"
96
datasource:
107
postgresql:
118
database: "my-database"
129
cloudSql:
13-
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
14-
# TODO: CHANGE THIS BACK TO my-instance - my-instance-autopush IS ONLY USED FOR LOCAL TESTING BEFORE CHANGES PROPAGATE TO PROD
15-
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
16-
instanceId: "my-instance-autopush"
10+
instanceId: "my-instance"
1711
# schemaValidation: "STRICT" # STRICT mode makes Postgres schema match Data Connect exactly.
1812
# schemaValidation: "COMPATIBLE" # COMPATIBLE mode makes Postgres schema compatible with Data Connect.
1913
connectorDirs: ["./my-connector"]

‎test/unit/data-connect/data-connect-api-client-internal.spec.ts‎

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -211,10 +211,7 @@ describe('DataConnectApiClient', () => {
211211
expect(resp.data.users).to.deep.equal(TEST_RESPONSE.data.users);
212212
expect(stub).to.have.been.calledOnce.and.calledWith({
213213
method: 'POST',
214-
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
215-
// TODO: CHANGE THIS BACK TO PROD - AUTOPUSH IS ONLY USED FOR LOCAL TESTING BEFORE CHANGES PROPAGATE TO PROD
216-
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
217-
url: `https://autopush-firebasedataconnect.sandbox.googleapis.com/v1/projects/test-project/locations/${connectorConfig.location}/services/${connectorConfig.serviceId}:executeGraphql`,
214+
url: `https://firebasedataconnect.googleapis.com/v1/projects/test-project/locations/${connectorConfig.location}/services/${connectorConfig.serviceId}:executeGraphql`,
218215
headers: EXPECTED_HEADERS,
219216
data: { query: 'query' }
220217
});
@@ -329,10 +326,7 @@ describe('DataConnectApiClient', () => {
329326
expect(resp.data.users).to.deep.equal(TEST_RESPONSE.data.users);
330327
expect(stub).to.have.been.calledOnce.and.calledWith({
331328
method: 'POST',
332-
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
333-
// TODO: CHANGE THIS BACK TO PROD - AUTOPUSH IS ONLY USED FOR LOCAL TESTING BEFORE CHANGES PROPAGATE TO PROD
334-
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
335-
url: `https://autopush-firebasedataconnect.sandbox.googleapis.com/v1/projects/test-project/locations/${connectorConfig.location}/services/${connectorConfig.serviceId}/connectors/${connectorConfig.connector}:impersonateQuery`,
329+
url: `https://firebasedataconnect.googleapis.com/v1/projects/test-project/locations/${connectorConfig.location}/services/${connectorConfig.serviceId}/connectors/${connectorConfig.connector}:impersonateQuery`,
336330
headers: EXPECTED_HEADERS,
337331
data: {
338332
operationName: 'unauthenticated query',
@@ -356,10 +350,7 @@ describe('DataConnectApiClient', () => {
356350
expect(resp.data.users).to.deep.equal(TEST_RESPONSE.data.users);
357351
expect(stub).to.have.been.calledOnce.and.calledWith({
358352
method: 'POST',
359-
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
360-
// TODO: CHANGE THIS BACK TO PROD - AUTOPUSH IS ONLY USED FOR LOCAL TESTING BEFORE CHANGES PROPAGATE TO PROD
361-
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
362-
url: `https://autopush-firebasedataconnect.sandbox.googleapis.com/v1/projects/test-project/locations/${connectorConfig.location}/services/${connectorConfig.serviceId}/connectors/${connectorConfig.connector}:impersonateQuery`,
353+
url: `https://firebasedataconnect.googleapis.com/v1/projects/test-project/locations/${connectorConfig.location}/services/${connectorConfig.serviceId}/connectors/${connectorConfig.connector}:impersonateQuery`,
363354
headers: EXPECTED_HEADERS,
364355
data: {
365356
operationName: 'authenticated query',
@@ -479,11 +470,7 @@ describe('DataConnectApiClient', () => {
479470
expect(resp.data.users).to.deep.equal(TEST_RESPONSE.data.users);
480471
expect(stub).to.have.been.calledOnce.and.calledWith({
481472
method: 'POST',
482-
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
483-
// eslint-disable-next-line max-len
484-
// TODO: CHANGE THIS BACK TO PROD - AUTOPUSH IS ONLY USED FOR LOCAL TESTING BEFORE CHANGES PROPAGATE TO PROD
485-
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
486-
url: `https://autopush-firebasedataconnect.sandbox.googleapis.com/v1/projects/test-project/locations/${connectorConfig.location}/services/${connectorConfig.serviceId}/connectors/${connectorConfig.connector}:impersonateMutation`,
473+
url: `https://firebasedataconnect.googleapis.com/v1/projects/test-project/locations/${connectorConfig.location}/services/${connectorConfig.serviceId}/connectors/${connectorConfig.connector}:impersonateMutation`,
487474
headers: EXPECTED_HEADERS,
488475
data: {
489476
operationName: 'unauthenticated mutation',
@@ -503,11 +490,7 @@ describe('DataConnectApiClient', () => {
503490
expect(resp.data.users).to.deep.equal(TEST_RESPONSE.data.users);
504491
expect(stub).to.have.been.calledOnce.and.calledWith({
505492
method: 'POST',
506-
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
507-
// eslint-disable-next-line max-len
508-
// TODO: CHANGE THIS BACK TO PROD - AUTOPUSH IS ONLY USED FOR LOCAL TESTING BEFORE CHANGES PROPAGATE TO PROD
509-
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
510-
url: `https://autopush-firebasedataconnect.sandbox.googleapis.com/v1/projects/test-project/locations/${connectorConfig.location}/services/${connectorConfig.serviceId}/connectors/${connectorConfig.connector}:impersonateMutation`,
493+
url: `https://firebasedataconnect.googleapis.com/v1/projects/test-project/locations/${connectorConfig.location}/services/${connectorConfig.serviceId}/connectors/${connectorConfig.connector}:impersonateMutation`,
511494
headers: EXPECTED_HEADERS,
512495
data: {
513496
operationName: 'authenticated mutation',

0 commit comments

Comments
 (0)