Merge branch 'kats/s3'

Author: harmony7

src/models/config/s3-storage-config.ts

@@ -11,12 +11,14 @@ export type S3StorageConfig = {
   region: string,
   bucket: string,
   endpoint?: string,
+  fastlyBackendName?: string,
 };
 
 export function getS3StorageConfigFromRc(rc: StaticPublishS3Storage): S3StorageConfig {
   return {
     region: rc.s3.region,
     bucket: rc.s3.bucket,
     endpoint: rc.s3.endpoint,
+    fastlyBackendName: rc.s3.fastlyBackendName,
   };
 }

src/models/config/static-publish-rc.ts

@@ -71,6 +71,7 @@ export type StaticPublishPartialS3Storage = {
     region: string,
     bucket: string,
     endpoint?: string,
+    fastlyBackendName?: string,
   },
 };
 
@@ -90,6 +91,10 @@ export function isS3StorageConfigRc(rc: unknown): rc is StaticPublishS3Storage {
           !('endpoint' in rc.s3) ||
           rc.s3.endpoint === undefined ||
           typeof rc.s3.endpoint === 'string'
+        ) && (
+          !('fastlyBackendName' in rc.s3) ||
+          rc.s3.fastlyBackendName === undefined ||
+          typeof rc.s3.fastlyBackendName === 'string'
         )
       ) {
         return true;

src/server/storage/s3-storage-provider.ts

@@ -43,7 +43,10 @@ export const buildStoreProvider: StorageProviderBuilder = (config: StaticPublish
   return new S3StorageProvider(
     s3StorageConfig.region,
     s3StorageConfig.bucket,
-    s3StorageConfig.endpoint,
+    {
+      s3Endpoint: s3StorageConfig.endpoint,
+      s3FastlyBackendName: s3StorageConfig.fastlyBackendName,
+    },
   );
 };
 
@@ -93,27 +96,35 @@ export function setAwsCredentialsBuilder(awsCredentialsBuilder: AwsCredentialsBu
   _awsCredentialsBuilder = awsCredentialsBuilder;
 }
 
+export type S3StorageProviderParams = {
+  s3Endpoint?: string,
+  s3FastlyBackendName?: string,
+};
+
 export class S3StorageProvider implements StorageProvider {
   constructor(
     s3Region: string,
     s3Bucket: string,
-    s3Endpoint?: string,
+    params?: S3StorageProviderParams,
   ) {
     this.s3Region = s3Region;
     this.s3Bucket = s3Bucket;
-    this.s3Endpoint = s3Endpoint;
+    this.s3Endpoint = params?.s3Endpoint;
+    this.s3FastlyBackendName = params?.s3FastlyBackendName;
   }
 
   private readonly s3Region: string;
   private readonly s3Bucket: string;
   private readonly s3Endpoint?: string;
+  private readonly s3FastlyBackendName?: string;
 
   private s3Client?: S3Client;
   async getS3Client() {
     if (this.s3Client != null) {
       return this.s3Client;
     }
     const awsCredentials = await _awsCredentialsBuilder();
+    const s3FastlyBackendName = this.s3FastlyBackendName ?? "aws";
     this.s3Client = new S3Client({
       region: this.s3Region,
       endpoint: this.s3Endpoint,
@@ -124,7 +135,7 @@ export class S3StorageProvider implements StorageProvider {
       },
       maxAttempts: 1,
       requestHandler: new FetchHttpHandler({
-        requestInit() { return { backend: "aws" } }
+        requestInit() { return { backend: s3FastlyBackendName } }
       }),
     });
     return this.s3Client;