Commit 2924fa7

committed

Add singleton principle to RestService

1 parent d1e7c67 commit 2924fa7Copy full SHA for 2924fa7

File tree

4 files changed

+18

-6

lines changed

schemaregistry
- package.json
- rest-service.ts
- rules/encryption/dekregistry
  - dekregistry-client.ts
- schemaregistry-client.ts

4 files changed

+18

-6

lines changed

`‎schemaregistry/package.json‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,7 @@`
`59`	`59`	`"scripts": {`
`60`	`60`	`"lint": "make lint",`
`61`	`61`	`"test": "make test",`
	`62`	`+ "integtest": "make integtest",`
`62`	`63`	`"build": "rm -rf ./dist && tsc -p tsconfig-build.json"`
`63`	`64`	`},`
`64`	`65`	`"keywords": [`

`‎schemaregistry/rest-service.ts‎`

Lines changed: 15 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -51,14 +51,15 @@ export interface ClientConfig {`
`51`	`51`	`const toBase64 = (str: string): string => Buffer.from(str).toString('base64');`
`52`	`52`
`53`	`53`	`export class RestService {`
	`54`	`+ private static instance: RestService;`
`54`	`55`	`private client: AxiosInstance;`
`55`	`56`	`private baseURLs: string[];`
`56`	`57`	`private oauthClient?: OAuthClient;`
`57`	`58`	`private oauthBearer: boolean = false;`
`58`	`59`
`59`	`60`	`constructor(baseURLs: string[], isForward?: boolean, axiosDefaults?: CreateAxiosDefaults,`
`60`		`- basicAuthCredentials?: BasicAuthCredentials, bearerAuthCredentials?: BearerAuthCredentials,`
`61`		`- maxRetries?: number, retriesWaitMs?: number, retriesMaxWaitMs?: number) {`
	`61`	`+ basicAuthCredentials?: BasicAuthCredentials, bearerAuthCredentials?: BearerAuthCredentials,`
	`62`	`+ maxRetries?: number, retriesWaitMs?: number, retriesMaxWaitMs?: number) {`
`62`	`63`	`this.client = axios.create(axiosDefaults);`
`63`	`64`	`axiosRetry(this.client, {`
`64`	`65`	`retries: maxRetries ?? 2,`
`@@ -80,6 +81,16 @@ export class RestService {`
`80`	`81`	`this.handleBearerAuth(maxRetries ?? 2, retriesWaitMs ?? 1000, retriesMaxWaitMs ?? 20000, bearerAuthCredentials);`
`81`	`82`	`}`
`82`	`83`
	`84`	`+ static getInstance(baseURLs: string[], isForward?: boolean, axiosDefaults?: CreateAxiosDefaults,`
	`85`	`+ basicAuthCredentials?: BasicAuthCredentials, bearerAuthCredentials?: BearerAuthCredentials,`
	`86`	`+ maxRetries?: number, retriesWaitMs?: number, retriesMaxWaitMs?: number): RestService {`
	`87`	`+ if (!this.instance) {`
	`88`	`+ this.instance = new RestService(baseURLs, isForward, axiosDefaults, basicAuthCredentials, bearerAuthCredentials,`
	`89`	`+ maxRetries, retriesWaitMs, retriesMaxWaitMs);`
	`90`	`+ }`
	`91`	`+ return this.instance;`
	`92`	`+ }`
	`93`	`+`
`83`	`94`	`handleBasicAuth(basicAuthCredentials?: BasicAuthCredentials): void {`
`84`	`95`	`if (basicAuthCredentials) {`
`85`	`96`	`switch (basicAuthCredentials.credentialsSource) {`
`@@ -111,7 +122,7 @@ export class RestService {`
`111`	`122`	`}`
`112`	`123`	`}`
`113`	`124`
`114`		`- handleBearerAuth(maxRetries: number,`
	`125`	`+ handleBearerAuth(maxRetries: number,`
`115`	`126`	`retriesWaitMs: number, retriesMaxWaitMs: number, bearerAuthCredentials?: BearerAuthCredentials): void {`
`116`	`127`	`if (bearerAuthCredentials) {`
`117`	`128`	`delete this.client.defaults.auth;`
`@@ -150,7 +161,7 @@ export class RestService {`
`150`	`161`	`}`
`151`	`162`	`const issuerEndPointUrl = new URL(bearerAuthCredentials.issuerEndpointUrl!);`
`152`	`163`	`this.oauthClient = new OAuthClient(bearerAuthCredentials.clientId!, bearerAuthCredentials.clientSecret!,`
`153`		`- issuerEndPointUrl.origin, issuerEndPointUrl.pathname, bearerAuthCredentials.scope!,`
	`164`	`+ issuerEndPointUrl.origin, issuerEndPointUrl.pathname, bearerAuthCredentials.scope!,`
`154`	`165`	`maxRetries, retriesWaitMs, retriesMaxWaitMs);`
`155`	`166`	`break;`
`156`	`167`	`default:`

`‎schemaregistry/rules/encryption/dekregistry/dekregistry-client.ts‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ class DekRegistryClient implements DekClient {`
`70`	`70`	`};`
`71`	`71`
`72`	`72`
`73`		`- this.restService = newRestService(config.baseURLs, config.isForward, config.createAxiosDefaults,`
	`73`	`+ this.restService = RestService.getInstance(config.baseURLs, config.isForward, config.createAxiosDefaults,`
`74`	`74`	`config.basicAuthCredentials, config.bearerAuthCredentials,`
`75`	`75`	`config.maxRetries, config.retriesWaitMs, config.retriesMaxWaitMs);`
`76`	`76`	`this.kekCache = new LRUCache<string, Kek>(cacheOptions);`

`‎schemaregistry/schemaregistry-client.ts‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ export class SchemaRegistryClient implements Client {`
`201`	`201`	`...(config.cacheLatestTtlSecs !== undefined && { ttl: config.cacheLatestTtlSecs * 1000 })`
`202`	`202`	`};`
`203`	`203`
`204`		`- this.restService = newRestService(config.baseURLs, config.isForward, config.createAxiosDefaults,`
	`204`	`+ this.restService = RestService.getInstance(config.baseURLs, config.isForward, config.createAxiosDefaults,`
`205`	`205`	`config.basicAuthCredentials, config.bearerAuthCredentials,`
`206`	`206`	`config.maxRetries, config.retriesWaitMs, config.retriesMaxWaitMs);`
`207`	`207`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 2924fa7

File tree

4 files changed

4 files changed

`‎schemaregistry/package.json‎`

`‎schemaregistry/rest-service.ts‎`

`‎schemaregistry/rules/encryption/dekregistry/dekregistry-client.ts‎`

`‎schemaregistry/schemaregistry-client.ts‎`

0 commit comments