TCLOUD-4780: Ensure the clean up of redirects

Author: tiny-james

.github/workflows/preview_create.yml

@@ -42,9 +42,13 @@ jobs:
     - name: Build Website
       run: yarn antora ./antora-playbook.yml
 
+    - name: Rename site
+      run: |
+        mv ./build/site ./build/docs
+
     - name: Rename sitemap.xml
       run: |
-        mv ./build/site/sitemap.xml ./build/site/antora-sitemap.xml
+        mv ./build/docs/sitemap.xml ./build/docs/antora-sitemap.xml
 
     - name: configure aws credentials
       uses: aws-actions/[email protected]
@@ -55,8 +59,7 @@ jobs:
 
     - name: Upload website preview to S3 # put in the docs subfolder as we rely on that path in redirects
       run: |
-        aws s3 rm s3://tiny-cloud-antora-docs-preview/pr${PR_NUMBER}
-        aws s3 sync ./build/site s3://tiny-cloud-antora-docs-preview/pr${PR_NUMBER}/docs
+        aws s3 sync --delete ./build s3://tiny-cloud-antora-docs-preview/pr${PR_NUMBER}
 
     - name: Create redirects on S3
       run: node ./.github/workflows/scripts/generate_redirects.mjs tiny-cloud-antora-docs-preview pr${PR_NUMBER}

.github/workflows/scripts/generate_redirects.mjs

@@ -49,7 +49,7 @@ const dryRunSuccess = (cmd) => new Promise((resolve) => {
 function checkS3ObjectExists(_dryRun, _bucket, _prefix, subPath) {
   // it's too slow to talk to s3, so just check the local files we just uploaded...
   if (subPath.startsWith('docs/')) {
-    return fs.existsSync(path.join(import.meta.dirname, '../../../build/site', subPath.slice('docs/'.length)));
+    return fs.existsSync(path.join(import.meta.dirname, '../../../build', subPath));
   } else {
     return false;
   }
@@ -84,7 +84,7 @@ const copyS3ObjectWithMetadataAsync = async (dryRun, bucket, prefix, subPath, me
     'aws', 's3api', 'copy-object',
     '--bucket', bucket,
     '--copy-source', `${bucket}/${fullPath}`,
-    '--key', subPath,
+    '--key', fullPath,
     '--metadata-directive', 'REPLACE',
     '--content-type', 'text/html',
     ...metadataArgs(metadata)