quick and dirty support for a deployPrefix

Related issue: gatsby-uc#24
Phlur · Jul 11, 2019 · 6de9804 · 6de9804
1 parent 670fb43
commit 6de9804
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/bin.ts b/src/bin.ts
@@ -74,14 +74,15 @@ const getParams = (path: string, params: Params): Partial<S3.Types.PutObjectRequ
     return returned;
 };
 
-const listAllObjects = async (s3: S3, bucketName: string): Promise<ObjectList> => {
+const listAllObjects = async (s3: S3, bucketName: string, deployPrefix: string): Promise<ObjectList> => {
     const list: ObjectList = [];
 
     let token: NextToken | undefined;
     do {
         const response = await s3.listObjectsV2({
             Bucket: bucketName,
             ContinuationToken: token,
+            Prefix: deployPrefix
         }).promise();
 
         if (response.Contents) {
@@ -192,7 +193,7 @@ const deploy = async ({ yes, bucket }: { yes: boolean, bucket: string }) => {
 
         spinner.text = 'Listing objects...';
         spinner.color = 'green';
-        const objects = await listAllObjects(s3, config.bucketName);
+        const objects = await listAllObjects(s3, config.bucketName, config.deployPrefix);
 
         spinner.color = 'cyan';
         spinner.text = 'Syncing...';
@@ -206,6 +207,9 @@ const deploy = async ({ yes, bucket }: { yes: boolean, bucket: string }) => {
             }
             uploadQueue.push(asyncify(async () => {
                 const key = createSafeS3Key(relative(publicDir, path));
+                if (config.deployPrefix) {
+                    key = config.deployPrefix + "/" + key;
+                }
                 const readStream = fs.createReadStream(path);
                 const hashStream = readStream.pipe(createHash('md5').setEncoding('hex'));
                 const data = await streamToPromise(hashStream);
@@ -257,6 +261,10 @@ const deploy = async ({ yes, bucket }: { yes: boolean, bucket: string }) => {
                     key = join(key, 'index.html');
                 }
                 key = createSafeS3Key(key);
+                if (config.deployPrefix) {
+                    key = config.deployPrefix + "/" + key;
+                }
+
 
                 const tag = `"${createHash('md5').update(redirectLocation).digest('hex')}"`;
                 const object = objects.find(currObj => currObj.Key === key && currObj.ETag === tag);