Skip to content

Commit

Permalink
Remove the Discovery Endpoint in the routerliciousTestDriver.ts (#9999)
Browse files Browse the repository at this point in the history
* FRS-Echo-Openapis-POC

* Update openapi.json

* Update openapi.json

* Upload openapi.yaml

* Update openapi.json

* Update openapi.json

* Update openapi.json

* Update openapi.json

* Remove openapi

* Add the driver side change

* Add the typeValidation for driver

* Make enableDiscovery and noCacheManger as optional

* Add the undefined check for session

* Add isCreateContainer flag

* Add the "!"

* Refactor the urlUtils.ts

* Refactor the url methods

* Resolve url comments

* Change the urls, and add comments

* Add the "="

* Merge ISession interfaces for client and server

* Remove in document metadata

* Revert the change to fix the e2e test

* Revert changes in routerliciousTestDriver.ts
  • Loading branch information
tianzhu007 authored Apr 21, 2022
1 parent 621717f commit 14454f9
Showing 1 changed file with 2 additions and 16 deletions.
18 changes: 2 additions & 16 deletions packages/test/test-drivers/src/routerliciousTestDriver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,26 +31,13 @@ const dockerConfig = (driverPolicies?: IRouterliciousDriverPolicies) => ({
});

function getConfig(
discoveryEndpoint?: string,
fluidHost?: string,
tenantId?: string,
tenantSecret?: string,
driverPolicies?: IRouterliciousDriverPolicies) {
assert(fluidHost, "Missing Fluid host");
assert(tenantId, "Missing tenantId");
assert(tenantSecret, "Missing tenant secret");
if (discoveryEndpoint !== undefined) {
return {
serviceEndpoint: {
hostUrl: "",
ordererUrl: discoveryEndpoint,
deltaStorageUrl: "https://dummy-historian",
},
tenantId,
tenantSecret,
driverPolicies,
};
}
assert(fluidHost, "Missing Fluid host");
return {
serviceEndpoint: {
hostUrl: fluidHost,
Expand All @@ -64,11 +51,10 @@ function getConfig(
}

function getLegacyConfigFromEnv() {
const discoveryEndpoint = process.env.fluid__webpack__discoveryEndpoint;
const fluidHost = process.env.fluid__webpack__fluidHost;
const tenantSecret = process.env.fluid__webpack__tenantSecret;
const tenantId = process.env.fluid__webpack__tenantId ?? "fluid";
return getConfig(discoveryEndpoint, fluidHost, tenantId, tenantSecret);
return getConfig(fluidHost, tenantId, tenantSecret);
}

function getEndpointConfigFromEnv(r11sEndpointName: string) {
Expand Down

0 comments on commit 14454f9

Please sign in to comment.