fix the ical domain by using a seperate distribution for API routes

Author: devksingh4

Makefile

@@ -80,9 +80,13 @@ deploy_dev: check_account_dev build
 invalidate_cloudfront:
 	@echo "Creating CloudFront invalidation..."
 	$(eval DISTRIBUTION_ID := $(shell aws cloudformation describe-stacks --stack-name $(application_key) --query "Stacks[0].Outputs[?OutputKey=='CloudfrontDistributionId'].OutputValue" --output text))
+	$(eval DISTRIBUTION_ID_2 := $(shell aws cloudformation describe-stacks --stack-name $(application_key) --query "Stacks[0].Outputs[?OutputKey=='CloudfrontSecondaryDistributionId'].OutputValue" --output text))
 	$(eval INVALIDATION_ID := $(shell aws cloudfront create-invalidation --distribution-id $(DISTRIBUTION_ID) --paths "/*" --query 'Invalidation.Id' --output text --no-cli-page))
+	$(eval INVALIDATION_ID_2 := $(shell aws cloudfront create-invalidation --distribution-id $(DISTRIBUTION_ID_2) --paths "/*" --query 'Invalidation.Id' --output text --no-cli-page))
 	@echo "Waiting on job $(INVALIDATION_ID)..."
 	aws cloudfront wait invalidation-completed --distribution-id $(DISTRIBUTION_ID) --id $(INVALIDATION_ID)
+	@echo "Waiting on job $(INVALIDATION_ID_2)..."
+	aws cloudfront wait invalidation-completed --distribution-id $(DISTRIBUTION_ID_2) --id $(INVALIDATION_ID_2)
 	@echo "CloudFront invalidation completed!"
 
 install:

cloudformation/main.yml

@@ -123,7 +123,7 @@ Resources:
         GWApiId: !Ref AppApiGateway
         GWHostedZoneId:
           !FindInMap [ApiGwConfig, !Ref RunEnvironment, HostedZoneId]
-        CloudfrontDomain: !GetAtt [AppFrontendCloudfrontDistribution, DomainName]
+        CloudfrontDomain: !GetAtt [AppIcalCloudfrontDistribution, DomainName]
 
   LinkryDomainProxy:
     Type: AWS::Serverless::Application
@@ -143,7 +143,7 @@ Resources:
         GWApiId: !Ref AppApiGateway
         GWHostedZoneId:
           !FindInMap [ApiGwConfig, !Ref RunEnvironment, HostedZoneId]
-        CloudfrontDomain: !GetAtt [AppFrontendCloudfrontDistribution, DomainName]
+        CloudfrontDomain: !GetAtt [AppIcalCloudfrontDistribution, DomainName]
 
   CoreUrlProd:
     Type: AWS::Serverless::Application
@@ -626,20 +626,6 @@ Resources:
             - ApiGwConfig
             - !Ref RunEnvironment
             - UiDomainName
-          - !Join
-            - ""
-            - - "go."
-              - !FindInMap
-                - ApiGwConfig
-                - !Ref RunEnvironment
-                - EnvDomainName
-          - !Join
-            - ""
-            - - "ical."
-              - !FindInMap
-                - ApiGwConfig
-                - !Ref RunEnvironment
-                - EnvDomainName
 
         DefaultCacheBehavior:
           TargetOriginId: S3WebsiteOrigin
@@ -767,23 +753,95 @@ Resources:
     Properties:
       FunctionName: !Ref AppFrontendEdgeLambda
 
+  AppIcalCloudfrontDistribution:
+    Type: AWS::CloudFront::Distribution
+    Properties:
+      DistributionConfig:
+        Origins:
+          - Id: ApiGatewayOrigin
+            DomainName: !Sub "${AppApiGateway}.execute-api.${AWS::Region}.amazonaws.com"
+            OriginPath: "/default"
+            CustomOriginConfig:
+              HTTPPort: 80
+              HTTPSPort: 443
+              OriginProtocolPolicy: https-only
+        Enabled: true
+        Aliases:
+          - !Join
+            - ""
+            - - "go."
+              - !FindInMap
+                - ApiGwConfig
+                - !Ref RunEnvironment
+                - EnvDomainName
+          - !Join
+            - ""
+            - - "ical."
+              - !FindInMap
+                - ApiGwConfig
+                - !Ref RunEnvironment
+                - EnvDomainName
+        DefaultCacheBehavior:
+          TargetOriginId: ApiGatewayOrigin
+          ViewerProtocolPolicy: redirect-to-https
+          AllowedMethods:
+            - GET
+            - HEAD
+            - OPTIONS
+            - PUT
+            - POST
+            - DELETE
+            - PATCH
+          CachedMethods:
+            - GET
+            - HEAD
+          ForwardedValues:
+            QueryString: false
+            Cookies:
+              Forward: none
+          CachePolicyId: !Ref CloudfrontCachePolicy
+          OriginRequestPolicyId: 216adef6-5c7f-47e4-b989-5492eafa07d3
+        ViewerCertificate:
+          AcmCertificateArn: !FindInMap
+            - ApiGwConfig
+            - !Ref RunEnvironment
+            - EnvCertificateArn
+          MinimumProtocolVersion: TLSv1.2_2021
+          SslSupportMethod: sni-only
+        HttpVersion: http2
+        PriceClass: PriceClass_100
+
+
 Outputs:
   DomainName:
     Description: Domain name that the UI is hosted at
     Value: !FindInMap
       - ApiGwConfig
       - !Ref RunEnvironment
       - UiDomainName
+
   CloudfrontCnameTarget:
     Description: CNAME record target to create for the domain name above (create the CNAME manually)
     Value:
       Fn::GetAtt:
         - AppFrontendCloudfrontDistribution
         - DomainName
+
+  CloudfrontSecondaryCnameTarget:
+    Description: CNAME record target to create for the secondary domain names (create the CNAME manually)
+    Value:
+      Fn::GetAtt:
+        - AppIcalCloudfrontDistribution
+        - DomainName
+
   CloudfrontDistributionId:
     Description: Cloudfront Distribution ID
     Value: !GetAtt AppFrontendCloudfrontDistribution.Id
 
+  CloudfrontSecondaryDistributionId:
+    Description: Cloudfront Distribution ID
+    Value: !GetAtt AppIcalCloudfrontDistribution.Id
+
   SalesEmailQueueArn:
     Description: Sales Email Queue Arn
     Value: !GetAtt AppSQSQueues.Outputs.SalesEmailQueueArn

tests/live/ical.test.ts

@@ -4,9 +4,9 @@ import { OrganizationList } from "../../src/common/orgs.js";
 import ical from "node-ical";
 const baseEndpoint = `https://core.aws.qa.acmuiuc.org`;
 
-const delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+const delay = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
 
-const fetchWithRateLimit = async (url) => {
+const fetchWithRateLimit = async (url: string) => {
   const response = await fetch(url);
   expect(response.status).toBe(200);
 
@@ -27,7 +27,7 @@ const fetchWithRateLimit = async (url) => {
   return response;
 };
 
-test("Get calendars with rate limit handling", { timeout: 30000 }, async () => {
+test("Get calendars with rate limit handling", { timeout: 45000 }, async () => {
   for (const org of OrganizationList) {
     const response = await fetchWithRateLimit(
       `${baseEndpoint}/api/v1/ical/${org}`,
@@ -40,3 +40,15 @@ test("Get calendars with rate limit handling", { timeout: 30000 }, async () => {
     expect(calendar["vcalendar"]["type"]).toEqual("VCALENDAR");
   }
 });
+
+test("Check that the ical base works", { timeout: 45000 }, async () => {
+  const response = await fetchWithRateLimit(
+    `${baseEndpoint.replace("core", "ical")}/ACM`,
+  );
+  expect(response.status).toBe(200);
+  expect(response.headers.get("Content-Disposition")).toEqual(
+    'attachment; filename="calendar.ics"',
+  );
+  const calendar = ical.sync.parseICS(await response.text());
+  expect(calendar["vcalendar"]["type"]).toEqual("VCALENDAR");
+});