Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/server_arguments.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@ import parseDuration from "parse-duration";

export const ENV_FT_SERVER_ENDPOINT_NAME = "FT_SERVER_ENDPOINT";
export const ENV_REFRESH_INTERVAL_NAME = "FT_CLIENT_REFRESH_INTERVAL";
export const ENV_FT_TOKEN = "FT_TOKEN";
const DEFAULT_REFRESH_INTERVAL = 10000; //10 sec

export interface ServerArgs {
ftServerEndPoint: string;
ftServerInterval: number;
ftServerToken: string | undefined;
}

// get featureToggle server url and client refresh interval from environment variables
Expand All @@ -31,5 +33,6 @@ export function getServerArgs(): ServerArgs {
log(`[ERROR] client refresh interval not set or in incorrect pattern, using the default interval: ${DEFAULT_REFRESH_INTERVAL}`);
}
log(`client refresh interval is: ${interval}`);
return { ftServerEndPoint: endpoint, ftServerInterval: interval };

return { ftServerEndPoint: endpoint, ftServerInterval: interval, ftServerToken: process.env[ENV_FT_TOKEN] };
}
11 changes: 8 additions & 3 deletions src/unleash_client_wrapper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { initialize, Unleash, Strategy } from "unleash-client";
import { log } from "./logger";
import { ServerArgs } from "./server_arguments";
import to from "await-to-js";
import { UnleashConfig } from "unleash-client/lib/unleash";

async function getUnleashClientRegisteredPromise(client: Unleash): Promise<void> {
return new Promise((resolve, reject) => {
Expand Down Expand Up @@ -29,13 +30,17 @@ async function getUnleashClientReadyPromise(client: Unleash): Promise<void> {

export async function initializeUnleashClient(extensionName: string, serverArgs: ServerArgs, customStrategies: Strategy[]): Promise<Unleash> {
//create a new unleash client
const unleashClient = initialize({
const options: UnleashConfig = {
appName: extensionName,
refreshInterval: serverArgs.ftServerInterval,
url: serverArgs.ftServerEndPoint,
strategies: customStrategies,
//customHeaders: {"authorization" : ""},
});
};

if (serverArgs.ftServerToken) {
options.customHeaders = { authorization: serverArgs.ftServerToken };
}
const unleashClient = initialize(options);

const readyPromise = getUnleashClientReadyPromise(unleashClient);
const registeredPromise = getUnleashClientRegisteredPromise(unleashClient);
Expand Down
14 changes: 14 additions & 0 deletions test/server_arguments.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,25 @@ describe("Server arguments tests", () => {
sinon.stub(process, "env").value({
FT_SERVER_ENDPOINT: "testurl",
FT_CLIENT_REFRESH_INTERVAL: "60s",
FT_TOKEN: "testToken",
});
const testServerArgs: ServerUtil.ServerArgs = ServerUtil.getServerArgs();

expect(testServerArgs.ftServerEndPoint).to.eql("testurl/api/");
expect(testServerArgs.ftServerInterval).to.eql(60000);
expect(testServerArgs.ftServerToken).to.be.eq("testToken");
});

it("Test getServerArgs - positive flow - no FT_TOKEN", () => {
sinon.stub(process, "env").value({
FT_SERVER_ENDPOINT: "testurl",
FT_CLIENT_REFRESH_INTERVAL: "60s",
});
const testServerArgs: ServerUtil.ServerArgs = ServerUtil.getServerArgs();

expect(testServerArgs.ftServerEndPoint).to.eql("testurl/api/");
expect(testServerArgs.ftServerInterval).to.eql(60000);
expect(testServerArgs.ftServerToken).to.be.undefined;
});

it("Test getServerArgs - positive flow - endpoint with trailing slash", () => {
Expand Down