Skip to content

Commit b83b6da

Browse files
committed
address prod url comments
1 parent 4e5fbcb commit b83b6da

File tree

2 files changed

+21
-5
lines changed

2 files changed

+21
-5
lines changed

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

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,26 @@ import * as validator from '../utils/validator';
2626
import { ConnectorConfig, ExecuteGraphqlResponse, GraphqlOptions, OperationOptions } from './data-connect-api';
2727

2828
const API_VERSION = 'v1';
29+
const FIREBASE_DATA_CONNECT_PROD_URL = 'https://firebasedataconnect.googleapis.com';
2930

3031
/** The Firebase Data Connect backend service URL format. */
3132
const FIREBASE_DATA_CONNECT_SERVICES_URL_FORMAT =
32-
'https://firebasedataconnect.googleapis.com/{version}/projects/{projectId}/locations/{locationId}/services/{serviceId}:{endpointId}';
33+
FIREBASE_DATA_CONNECT_PROD_URL +
34+
'/{version}' +
35+
'/projects/{projectId}' +
36+
'/locations/{locationId}' +
37+
'/services/{serviceId}' +
38+
':{endpointId}';
3339

3440
/** The Firebase Data Connect backend connector URL format. */
3541
const FIREBASE_DATA_CONNECT_CONNECTORS_URL_FORMAT =
36-
'https://firebasedataconnect.googleapis.com/{version}/projects/{projectId}/locations/{locationId}/services/{serviceId}/connectors/{connectorId}:{endpointId}';
42+
FIREBASE_DATA_CONNECT_PROD_URL +
43+
'/{version}' +
44+
'/projects/{projectId}' +
45+
'/locations/{locationId}' +
46+
'/services/{serviceId}' +
47+
'/connectors/{connectorId}' +
48+
':{endpointId}';
3749

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

test/unit/data-connect/validate-admin-args.spec.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import {
2323
DATA_CONNECT_ERROR_CODE_MAPPING,
2424
FirebaseDataConnectError
2525
} from '../../../src/data-connect/data-connect-api-client-internal';
26-
import firebase from '@firebase/app-compat';
26+
import firebase, { FirebaseApp } from '@firebase/app-compat';
2727
import { projectId } from '../../resources/mocks';
2828
import { apiKey } from '../../integration/setup';
2929

@@ -32,13 +32,17 @@ interface IdVars {
3232
}
3333

3434
describe('validateAdminArgs()', () => {
35+
let app: FirebaseApp;
3536
beforeEach(() => {
36-
// eslint-disable-next-line @typescript-eslint/no-unused-vars
37-
const app = firebase.initializeApp({
37+
app = firebase.initializeApp({
3838
apiKey,
3939
authDomain: projectId + '.firebaseapp.com',
4040
});
4141
});
42+
43+
afterEach(() => {
44+
app.delete();
45+
});
4246

4347
const connectorConfig: ConnectorConfig = {
4448
location: 'us-west2',

0 commit comments

Comments
 (0)