fix: Use domainName to find same origin

lalalilo · Jun 4, 2024 · 0292202 · 0292202
1 parent 9944f84
commit 0292202
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/cloudfront/index.spec.ts b/src/cloudfront/index.spec.ts
@@ -10,6 +10,7 @@ import {
 } from ".";
 import {
   cloudfront,
+  getOriginId,
   getS3DomainName,
   getS3DomainNameForBlockedBucket,
 } from "../aws-services";
@@ -391,12 +392,15 @@ describe("cloudfront", () => {
       async ({ shouldBlockBucketPublicAccess }) => {
         const domainName = "hello.lalilo.com";
         const originId = shouldBlockBucketPublicAccess
+          ? getS3DomainNameForBlockedBucket(domainName)
+          : getOriginId(domainName);
+        const originDomainName = shouldBlockBucketPublicAccess
           ? getS3DomainNameForBlockedBucket(domainName)
           : getS3DomainName(domainName);
 
         const distribution = {
           Id: "distribution-id",
-          Origins: { Items: [{ Id: originId }] },
+          Origins: { Items: [{ Id: originId, DomainName: originDomainName }] },
           DefaultCacheBehavior: {
             TargetOriginId: originId,
           },
@@ -423,7 +427,7 @@ describe("cloudfront", () => {
       const oac = { originAccessControl: { Id: "oac-id" }, ETag: "etag" };
       const distribution = {
         Id: "distribution-id",
-        Origins: { Items: [{ Id: getS3DomainName(domainName) }] },
+        Origins: { Items: [{ DomainName: getS3DomainName(domainName) }] },
         DefaultCacheBehavior: {
           TargetOriginId: getS3DomainName(domainName),
         },

diff --git a/src/cloudfront/origin-access.ts b/src/cloudfront/origin-access.ts
@@ -105,12 +105,12 @@ export const isRightOriginAlreadyAssociated = (
 ) => {
   if (shouldBlockBucketPublicAccess) {
     const isOACAlreadyAssociated = distributionConfig?.Origins.Items.find(
-      (o) => o.Id === getS3DomainNameForBlockedBucket(domainName),
+      (o) => o.DomainName === getS3DomainNameForBlockedBucket(domainName),
     );
     return isOACAlreadyAssociated;
   } else {
     const isS3WebsiteAlreadyAssociated = distributionConfig?.Origins.Items.find(
-      (o) => o.Id === getS3DomainName(domainName),
+      (o) => o.DomainName === getS3DomainName(domainName),
     );
     return isS3WebsiteAlreadyAssociated;
   }