effortless-aws 0.14.2 → 0.14.3

package/dist/cli/index.js

@@ -72271,46 +72271,68 @@ var ensureDistribution = (input) => Effect_exports.gen(function* () {
     };
   }
   yield* Effect_exports.logDebug("Creating CloudFront distribution (first deploy may take 5-15 minutes)...");
+  const distConfig = {
+    CallerReference: `${project2}-${stage}-${handlerName}-${Date.now()}`,
+    Comment: comment,
+    Origins: {
+      Quantity: 1,
+      Items: [
+        {
+          Id: originId,
+          DomainName: originDomain,
+          OriginAccessControlId: oacId,
+          S3OriginConfig: { OriginAccessIdentity: "" }
+        }
+      ]
+    },
+    DefaultCacheBehavior: {
+      TargetOriginId: originId,
+      ViewerProtocolPolicy: "redirect-to-https",
+      AllowedMethods: {
+        Quantity: 2,
+        Items: ["GET", "HEAD"],
+        CachedMethods: { Quantity: 2, Items: ["GET", "HEAD"] }
+      },
+      Compress: true,
+      CachePolicyId: CACHING_OPTIMIZED_POLICY_ID,
+      FunctionAssociations: functionAssociations,
+      LambdaFunctionAssociations: lambdaFunctionAssociations
+    },
+    Aliases: aliasesConfig,
+    ...viewerCertificate ? { ViewerCertificate: viewerCertificate } : {},
+    DefaultRootObject: index,
+    Enabled: true,
+    CustomErrorResponses: customErrorResponses,
+    PriceClass: "PriceClass_All",
+    HttpVersion: "http2and3"
+  };
   const createResult = yield* cloudfront_exports.make("create_distribution_with_tags", {
     DistributionConfigWithTags: {
-      DistributionConfig: {
-        CallerReference: `${project2}-${stage}-${handlerName}-${Date.now()}`,
-        Comment: comment,
-        Origins: {
-          Quantity: 1,
-          Items: [
-            {
-              Id: originId,
-              DomainName: originDomain,
-              OriginAccessControlId: oacId,
-              S3OriginConfig: { OriginAccessIdentity: "" }
-            }
-          ]
-        },
-        DefaultCacheBehavior: {
-          TargetOriginId: originId,
-          ViewerProtocolPolicy: "redirect-to-https",
-          AllowedMethods: {
-            Quantity: 2,
-            Items: ["GET", "HEAD"],
-            CachedMethods: { Quantity: 2, Items: ["GET", "HEAD"] }
-          },
-          Compress: true,
-          CachePolicyId: CACHING_OPTIMIZED_POLICY_ID,
-          FunctionAssociations: functionAssociations,
-          LambdaFunctionAssociations: lambdaFunctionAssociations
-        },
-        Aliases: aliasesConfig,
-        ...viewerCertificate ? { ViewerCertificate: viewerCertificate } : {},
-        DefaultRootObject: index,
-        Enabled: true,
-        CustomErrorResponses: customErrorResponses,
-        PriceClass: "PriceClass_All",
-        HttpVersion: "http2and3"
-      },
+      DistributionConfig: distConfig,
       Tags: { Items: toAwsTagList(tags2) }
     }
-  });
+  }).pipe(
+    // If CNAME is claimed by another distribution (e.g. DNS still points elsewhere),
+    // retry without aliases so the deploy doesn't fail
+    Effect_exports.catchIf(
+      (e) => e._tag === "CloudFrontError" && e.is("CNAMEAlreadyExists"),
+      () => Effect_exports.gen(function* () {
+        const cnameList = aliases?.join(", ") ?? "";
+        yield* Effect_exports.logWarning(
+          `Domain ${cnameList} is still associated with another CloudFront distribution (DNS points elsewhere). Creating distribution without custom domain. Update your DNS records and redeploy to attach the domain.`
+        );
+        return yield* cloudfront_exports.make("create_distribution_with_tags", {
+          DistributionConfigWithTags: {
+            DistributionConfig: {
+              ...distConfig,
+              Aliases: { Quantity: 0, Items: [] }
+            },
+            Tags: { Items: toAwsTagList(tags2) }
+          }
+        });
+      })
+    )
+  );
   const dist = createResult.Distribution;
   return {
     distributionId: dist.Id,
@@ -72320,24 +72342,30 @@ var ensureDistribution = (input) => Effect_exports.gen(function* () {
 });
 var findDistributionByTags = (project2, stage, handlerName) => Effect_exports.gen(function* () {
   const resources = yield* getResourcesByTags(project2, stage);
-  const dist = resources.find((r) => {
+  const candidates = resources.filter((r) => {
     const isDistribution = r.ResourceARN?.includes(":distribution/");
     const handlerTag = r.Tags?.find((t) => t.Key === "effortless:handler");
     return isDistribution && handlerTag?.Value === handlerName;
   });
-  if (!dist?.ResourceARN) return void 0;
-  const distributionId = dist.ResourceARN.split("/").pop();
-  const result = yield* cloudfront_exports.make("get_distribution", { Id: distributionId }).pipe(
-    Effect_exports.catchIf(
-      (e) => e._tag === "CloudFrontError" && e.is("NoSuchDistribution"),
-      () => Effect_exports.succeed(void 0)
-    )
-  );
-  if (!result) return void 0;
-  return {
-    Id: distributionId,
-    DomainName: result.Distribution.DomainName
-  };
+  for (const dist of candidates) {
+    const distributionId = dist.ResourceARN.split("/").pop();
+    const result = yield* cloudfront_exports.make("get_distribution", { Id: distributionId }).pipe(
+      Effect_exports.catchIf(
+        (e) => e._tag === "CloudFrontError" && e.is("NoSuchDistribution"),
+        () => {
+          Effect_exports.logDebug(`Distribution ${distributionId} no longer exists (stale tag), skipping`);
+          return Effect_exports.succeed(void 0);
+        }
+      )
+    );
+    if (result) {
+      return {
+        Id: distributionId,
+        DomainName: result.Distribution.DomainName
+      };
+    }
+  }
+  return void 0;
 });
 var invalidateDistribution = (distributionId) => Effect_exports.gen(function* () {
   yield* Effect_exports.logDebug(`Invalidating CloudFront distribution: ${distributionId}`);