effortless-aws 0.14.0 → 0.14.2

package/dist/cli/index.js

@@ -70916,13 +70916,20 @@ var makeTags = (ctx, type2) => ({
 var toAwsTagList = (tags2) => Object.entries(tags2).map(([Key2, Value]) => ({ Key: Key2, Value }));
 var resolveStage = (input) => input ?? process.env.EFFORTLESS_STAGE ?? "dev";
 var getResourcesByTags = (project2, stage) => Effect_exports.gen(function* () {
-  const result = yield* resource_groups_tagging_api_exports.make("get_resources", {
-    TagFilters: [
-      { Key: "effortless:project", Values: [project2] },
-      { Key: "effortless:stage", Values: [stage] }
-    ]
-  });
-  return result.ResourceTagMappingList ?? [];
+  const all13 = [];
+  let token;
+  do {
+    const result = yield* resource_groups_tagging_api_exports.make("get_resources", {
+      TagFilters: [
+        { Key: "effortless:project", Values: [project2] },
+        { Key: "effortless:stage", Values: [stage] }
+      ],
+      ...token ? { PaginationToken: token } : {}
+    });
+    all13.push(...result.ResourceTagMappingList ?? []);
+    token = result.PaginationToken;
+  } while (token);
+  return all13;
 });
 var getAllResourcesByTags = (project2, stage, region) => Effect_exports.gen(function* () {
   const tagFilters = [
@@ -70931,13 +70938,19 @@ var getAllResourcesByTags = (project2, stage, region) => Effect_exports.gen(func
   ];
   const regional = yield* getResourcesByTags(project2, stage);
   if (region === "us-east-1") return regional;
-  const globalResult = yield* resource_groups_tagging_api_exports.make("get_resources", {
-    TagFilters: tagFilters
-  }).pipe(
-    Effect_exports.provide(resource_groups_tagging_api_exports.ResourceGroupsTaggingAPIClient.Default({ region: "us-east-1" })),
-    Effect_exports.catchAll(() => Effect_exports.succeed({ ResourceTagMappingList: [] }))
-  );
-  const global = globalResult.ResourceTagMappingList ?? [];
+  const global = [];
+  let globalToken;
+  do {
+    const globalResult = yield* resource_groups_tagging_api_exports.make("get_resources", {
+      TagFilters: tagFilters,
+      ...globalToken ? { PaginationToken: globalToken } : {}
+    }).pipe(
+      Effect_exports.provide(resource_groups_tagging_api_exports.ResourceGroupsTaggingAPIClient.Default({ region: "us-east-1" })),
+      Effect_exports.catchAll(() => Effect_exports.succeed({ ResourceTagMappingList: [], PaginationToken: void 0 }))
+    );
+    global.push(...globalResult.ResourceTagMappingList ?? []);
+    globalToken = globalResult.PaginationToken;
+  } while (globalToken);
   const seen = new Set(regional.map((r) => r.ResourceARN));
   return [...regional, ...global.filter((r) => !seen.has(r.ResourceARN))];
 });
@@ -72314,7 +72327,13 @@ var findDistributionByTags = (project2, stage, handlerName) => Effect_exports.ge
   });
   if (!dist?.ResourceARN) return void 0;
   const distributionId = dist.ResourceARN.split("/").pop();
-  const result = yield* cloudfront_exports.make("get_distribution", { Id: distributionId });
+  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
@@ -73363,17 +73382,22 @@ var deployStaticSite = (input) => Effect_exports.gen(function* () {
   if (domain) {
     const certResult = yield* findCertificate(domain);
     acmCertificateArn = certResult.certificateArn;
-    const wwwCandidate = `www.${domain}`;
-    const certCoversWww = certResult.coveredDomains.includes(wwwCandidate) || certResult.coveredDomains.includes(`*.${domain}`);
-    if (certCoversWww) {
-      aliases = [domain, wwwCandidate];
-      wwwDomain = wwwCandidate;
-      yield* Effect_exports.logDebug(`ACM certificate covers ${wwwCandidate}, enabling www \u2192 non-www redirect`);
+    const isRootDomain = domain.split(".").length === 2;
+    if (isRootDomain) {
+      const wwwCandidate = `www.${domain}`;
+      const certCoversWww = certResult.coveredDomains.includes(wwwCandidate) || certResult.coveredDomains.includes(`*.${domain}`);
+      if (certCoversWww) {
+        aliases = [domain, wwwCandidate];
+        wwwDomain = wwwCandidate;
+        yield* Effect_exports.logDebug(`ACM certificate covers ${wwwCandidate}, enabling www \u2192 non-www redirect`);
+      } else {
+        aliases = [domain];
+        yield* Effect_exports.logWarning(
+          `ACM certificate does not cover ${wwwCandidate}. For SEO, add ${wwwCandidate} to your ACM certificate in us-east-1 to enable www \u2192 non-www redirect.`
+        );
+      }
     } else {
       aliases = [domain];
-      yield* Effect_exports.logWarning(
-        `ACM certificate does not cover ${wwwCandidate}. For SEO, add ${wwwCandidate} to your ACM certificate in us-east-1 to enable www \u2192 non-www redirect.`
-      );
     }
   }
   const isSpa = config2.spa ?? false;