feat: CDN request retry race from multiple S3 buckets (#5543)

Co-authored-by: Kamil Kisiela <[email protected]>

Author: n1ru4l

.eslintrc.cjs

@@ -17,7 +17,6 @@ const rulesToExtends = Object.fromEntries(
       'import/first',
       'no-restricted-globals',
       '@typescript-eslint/no-unused-vars',
-      'unicorn/no-useless-fallback-in-spread',
       'unicorn/no-array-push-push',
       'no-else-return',
       'no-lonely-if',

deployment/index.ts

@@ -84,6 +84,7 @@ const s3Mirror = deployS3Mirror();
 
 const cdn = deployCFCDN({
   s3,
+  s3Mirror,
   sentry,
   environment,
 });

deployment/services/cf-cdn.ts

@@ -15,10 +15,12 @@ export class CDNSecret extends ServiceSecret<{
 export function deployCFCDN({
   environment,
   s3,
+  s3Mirror,
   sentry,
 }: {
   environment: Environment;
   s3: S3;
+  s3Mirror: S3;
   sentry: Sentry;
 }) {
   const cfConfig = new pulumi.Config('cloudflareCustom');
@@ -35,6 +37,7 @@ export function deployCFCDN({
     sentryDsn: sentry.enabled && sentry.secret ? sentry.secret?.raw.dsn : '',
     release: environment.release,
     s3,
+    s3Mirror,
   });
 
   const deployedCdn = cdn.deploy();

deployment/utils/cloudflare.ts

@@ -13,6 +13,7 @@ export class CloudflareCDN {
       sentryDsn: string | pulumi.Output<string>;
       release: string;
       s3: S3;
+      s3Mirror: S3;
     },
   ) {}
 
@@ -54,6 +55,10 @@ export class CloudflareCDN {
           name: 'R2_ANALYTICS',
           dataset: `hive_ha_cdn_r2_${this.config.envName}`,
         },
+        {
+          name: 'S3_ANALYTICS',
+          dataset: `hive_ha_cdn_s3_${this.config.envName}`,
+        },
         {
           name: 'RESPONSE_ANALYTICS',
           dataset: `hive_ha_cdn_response_${this.config.envName}`,
@@ -88,6 +93,22 @@ export class CloudflareCDN {
           name: 'S3_BUCKET_NAME',
           text: this.config.s3.secret.raw.bucket,
         },
+        {
+          name: 'S3_MIRROR_ENDPOINT',
+          text: this.config.s3Mirror.secret.raw.endpoint,
+        },
+        {
+          name: 'S3_MIRROR_ACCESS_KEY_ID',
+          text: this.config.s3Mirror.secret.raw.accessKeyId,
+        },
+        {
+          name: 'S3_MIRROR_SECRET_ACCESS_KEY',
+          text: this.config.s3Mirror.secret.raw.secretAccessKey,
+        },
+        {
+          name: 'S3_MIRROR_BUCKET_NAME',
+          text: this.config.s3Mirror.secret.raw.bucket,
+        },
       ],
     });
 

packages/services/cdn-worker/package.json

@@ -29,6 +29,7 @@
     "itty-router": "4.2.2",
     "itty-router-extras": "0.4.6",
     "toucan-js": "3.4.0",
+    "undici": "6.19.8",
     "zod": "3.23.8"
   }
 }

packages/services/cdn-worker/src/analytics.ts

@@ -55,7 +55,7 @@ type Event =
       value: [string, string] | [string];
     }
   | {
-      type: 'r2';
+      type: 'r2' | 's3';
       action:
         | 'GET artifact'
         | 'GET cdn-legacy-keys'
@@ -79,6 +79,7 @@ export function createAnalytics(
     error: AnalyticsEngine;
     keyValidation: AnalyticsEngine;
     r2: AnalyticsEngine;
+    s3: AnalyticsEngine;
     response: AnalyticsEngine;
   } | null = null,
 ) {
@@ -99,7 +100,8 @@ export function createAnalytics(
             blobs: event.value,
           });
         case 'r2':
-          return engines.r2.writeDataPoint({
+        case 's3':
+          return engines[event.type].writeDataPoint({
             blobs: [event.action, event.statusCodeOrErrCode.toString(), targetId],
             doubles: [event.duration],
             indexes: [targetId.substring(0, 32)],