Do not use the S3 client in the injector

Uniswap · Nov 30, 2024 · 9159e70 · 9159e70
1 parent 1d5ba89
commit 9159e70
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 16 deletions.
diff --git a/lib/handlers/hard-quote/injector.ts b/lib/handlers/hard-quote/injector.ts
@@ -42,11 +42,7 @@ export class QuoteInjector extends ApiInjector<ContainerInjected, RequestInjecte
     const orderServiceUrl = checkDefined(process.env.ORDER_SERVICE_URL, 'ORDER_SERVICE_URL is not defined');
 
     const webhookProvider = new S3WebhookConfigurationProvider(log, `${WEBHOOK_CONFIG_BUCKET}-${stage}-1`, s3Key);
-    await webhookProvider.fetchEndpoints();
-    const circuitBreakerProvider = new DynamoCircuitBreakerConfigurationProvider(
-      log,
-      webhookProvider.fillerEndpoints()
-    );
+    const circuitBreakerProvider = new DynamoCircuitBreakerConfigurationProvider(log, webhookProvider);
 
     const orderServiceProvider = new UniswapXServiceProvider(log, orderServiceUrl);
 

diff --git a/lib/handlers/quote/injector.ts b/lib/handlers/quote/injector.ts
@@ -45,11 +45,7 @@ export class QuoteInjector extends ApiInjector<ContainerInjected, RequestInjecte
     const s3Key = stage === STAGE.BETA ? BETA_S3_KEY : PRODUCTION_S3_KEY;
 
     const webhookProvider = new S3WebhookConfigurationProvider(log, `${WEBHOOK_CONFIG_BUCKET}-${stage}-1`, s3Key);
-    await webhookProvider.fetchEndpoints();
-    const circuitBreakerProvider = new DynamoCircuitBreakerConfigurationProvider(
-      log,
-      webhookProvider.fillerEndpoints()
-    );
+    const circuitBreakerProvider = new DynamoCircuitBreakerConfigurationProvider(log, webhookProvider);
 
     const complianceKey = stage === STAGE.BETA ? BETA_COMPLIANCE_S3_KEY : PROD_COMPLIANCE_S3_KEY;
     const fillerComplianceProvider = new S3FillerComplianceConfigurationProvider(

diff --git a/lib/providers/circuit-breaker/dynamo.ts b/lib/providers/circuit-breaker/dynamo.ts
@@ -4,21 +4,22 @@ import Logger from 'bunyan';
 
 import { CircuitBreakerConfigurationProvider, EndpointStatuses } from '.';
 import { BaseTimestampRepository, FillerTimestampMap, TimestampRepository } from '../../repositories';
-import { WebhookConfiguration } from '../webhook';
+import { S3WebhookConfigurationProvider, WebhookConfiguration } from '../webhook';
 
 export class DynamoCircuitBreakerConfigurationProvider implements CircuitBreakerConfigurationProvider {
   private log: Logger;
-  private fillerEndpoints: string[];
+  private webhookProvider: S3WebhookConfigurationProvider;
+  private fillerEndpoints: string[] = [];
   private lastUpdatedTimestamp: number;
   private timestampDB: BaseTimestampRepository;
   private timestamps: FillerTimestampMap = new Map();
 
   // try to refetch endpoints every 30 seconds
   private static UPDATE_PERIOD_MS = 1 * 30000;
 
-  constructor(_log: Logger, _fillerEndpoints: string[] = []) {
+  constructor(_log: Logger, _webhookProvider: S3WebhookConfigurationProvider) {
     this.log = _log.child({ quoter: 'CircuitBreakerConfigurationProvider' });
-    this.fillerEndpoints = _fillerEndpoints;
+    this.webhookProvider = _webhookProvider;
     this.lastUpdatedTimestamp = Date.now();
     const documentClient = DynamoDBDocumentClient.from(new DynamoDBClient({}), {
       marshallOptions: {
@@ -31,9 +32,17 @@ export class DynamoCircuitBreakerConfigurationProvider implements CircuitBreaker
     this.timestampDB = TimestampRepository.create(documentClient);
   }
 
+  private async getFillerEndpoints(): Promise<string[]> {
+    if (this.fillerEndpoints.length === 0) {
+      this.fillerEndpoints = this.webhookProvider.fillerEndpoints();
+      this.lastUpdatedTimestamp = Date.now();
+    }
+    return this.fillerEndpoints;
+  }
+
   async getConfigurations(): Promise<FillerTimestampMap> {
     if (
-      this.fillerEndpoints.length === 0 ||
+      (await this.getFillerEndpoints()).length === 0 ||
       Date.now() - this.lastUpdatedTimestamp > DynamoCircuitBreakerConfigurationProvider.UPDATE_PERIOD_MS
     ) {
       await this.fetchConfigurations();
@@ -44,7 +53,7 @@ export class DynamoCircuitBreakerConfigurationProvider implements CircuitBreaker
   }
 
   async fetchConfigurations(): Promise<void> {
-    this.timestamps = await this.timestampDB.getFillerTimestampsMap(this.fillerEndpoints);
+    this.timestamps = await this.timestampDB.getFillerTimestampsMap(await this.getFillerEndpoints());
   }
 
   /* add filler to `enabled` array if it's not blocked until a future timestamp;