use same s3 bucket for frontend and swagger

Author: devksingh4

Makefile

@@ -73,8 +73,6 @@ local:
 postdeploy:
 	@echo "Syncing S3 UI bucket..."
 	aws s3 sync $(dist_ui_directory_root) s3://$(ui_s3_bucket)/ --delete
-	@echo "Syncing S3 Docs bucket..."
-	aws s3 sync $(dist_docs_directory_root) s3://$(docs_s3_bucket)/ --delete
 	make invalidate_cloudfront
 
 deploy_prod: check_account_prod

cloudformation/main.yml

@@ -609,11 +609,6 @@ Resources:
     Properties:
       BucketName: !Sub ${S3BucketPrefix}-ui
 
-  AppDocsS3Bucket:
-    Type: AWS::S3::Bucket
-    Properties:
-      BucketName: !Sub ${S3BucketPrefix}-docs
-
   AppCloudfrontS3OAC:
     Type: AWS::CloudFront::OriginAccessControl
     Properties:
@@ -634,11 +629,6 @@ Resources:
             S3OriginConfig:
               OriginAccessIdentity: ''
             OriginAccessControlId: !GetAtt AppCloudfrontS3OAC.Id
-          - Id: S3DocsOrigin
-            DomainName: !GetAtt AppDocsS3Bucket.RegionalDomainName
-            S3OriginConfig:
-              OriginAccessIdentity: ''
-            OriginAccessControlId: !GetAtt AppCloudfrontS3OAC.Id
           - Id: LambdaOrigin
             DomainName: !Select [0, !Split ['/', !Select [1, !Split ['https://', !GetAtt AppLambdaUrl.FunctionUrl]]]]
             CustomOriginConfig:
@@ -711,7 +701,8 @@ Resources:
             Compress: true
           - PathPattern: "/api/documentation*"
             Compress: true
-            TargetOriginId: S3DocsOrigin
+            OriginPath: "/swagger"
+            TargetOriginId: S3WebsiteOrigin
             ViewerProtocolPolicy: redirect-to-https
             AllowedMethods:
               - GET
@@ -770,23 +761,6 @@ Resources:
               StringEquals:
                 AWS:SourceArn: !Sub "arn:aws:cloudfront::${AWS::AccountId}:distribution/${AppFrontendCloudfrontDistribution}"
 
-  AppDocsS3BucketPolicy:
-    Type: AWS::S3::BucketPolicy
-    Properties:
-      Bucket: !Ref AppDocsS3Bucket
-      PolicyDocument:
-        Version: "2012-10-17"
-        Statement:
-          - Effect: Allow
-            Principal:
-              Service: cloudfront.amazonaws.com
-            Action: s3:GetObject
-            Resource: !Sub "${AppDocsS3Bucket.Arn}/*"
-            Condition:
-              StringEquals:
-                AWS:SourceArn: !Sub "arn:aws:cloudfront::${AWS::AccountId}:distribution/${AppFrontendCloudfrontDistribution}"
-
-
   CloudfrontNoCachePolicy:
     Type: AWS::CloudFront::CachePolicy
     Properties:

src/api/createSwagger.ts

@@ -37,7 +37,7 @@ async function createSwaggerFiles() {
     console.log("App is ready. Generating specs...");
     const __filename = fileURLToPath(import.meta.url);
     const __dirname = path.dirname(__filename);
-    const outputDir = path.resolve(__dirname, "..", "..", "dist", "swagger");
+    const outputDir = path.resolve(__dirname, "..", "..", "dist_ui", "swagger");
     await mkdir(outputDir, { recursive: true });
     const jsonSpec = JSON.stringify(app.swagger(), null, 2);
     const yamlSpec = app.swagger({ yaml: true });