@awsless/cli 0.0.46-next.0 → 0.0.46-next.1

package/dist/bin.js

@@ -1418,6 +1418,9 @@ var activateDeployment = async (props) => {
   });
   return id;
 };
+var promoteAppDeployment = (props) => {
+  return activateDeployment({ ...props, rejectStale: true });
+};
 var rollbackAppDeployment = (props) => {
   return withAppReleaseLock(props.appConfig, () => activateDeployment(props));
 };
@@ -2153,6 +2156,7 @@ var RouterDefaultSchema = z20.record(
   z20.object({
     domain: ResourceIdSchema.describe("The domain id to link your Router.").optional(),
     subDomain: z20.string().optional(),
+    redirectWww: z20.boolean().default(false).describe("Redirect all www subdomain requests to your root domain."),
     waf: WafSettingsSchema.optional(),
     geoRestrictions: z20.array(z20.string().length(2).toUpperCase()).default([]).describe("Specifies a blacklist of countries that should be blocked."),
     errors: z20.object({
@@ -2241,6 +2245,21 @@ var RouterDefaultSchema = z20.record(
     }).optional().describe(
       "Specifies the cookies, headers, and query values that CloudFront includes in the cache key."
     )
+  }).superRefine((props, ctx) => {
+    if (props.redirectWww && !props.domain) {
+      ctx.addIssue({
+        code: z20.ZodIssueCode.custom,
+        path: ["redirectWww"],
+        message: "The redirectWww option requires a domain to be set."
+      });
+    }
+    if (props.redirectWww && props.subDomain) {
+      ctx.addIssue({
+        code: z20.ZodIssueCode.custom,
+        path: ["redirectWww"],
+        message: `The redirectWww option can't be combined with a subDomain, because the domain certificate only covers single level subdomains.`
+      });
+    }
   })
 ).optional().describe(`Define the global Router. Backed by AWS CloudFront.`);
 
@@ -4329,6 +4348,7 @@ var cacheFeature = defineFeature({
         {
           name,
           engine: "valkey",
+          networkType: "dual_stack",
           dailySnapshotTime: "02:00",
           majorEngineVersion: "8",
           snapshotRetentionLimit: props.snapshotRetentionLimit,
@@ -4354,7 +4374,9 @@ var cacheFeature = defineFeature({
         },
         {
           retainOnDelete: ctx.appConfig.removal === "retain",
-          import: ctx.import ? name : void 0
+          import: ctx.import ? name : void 0,
+          // The network type can only be set at creation time.
+          replaceOnChanges: ["networkType"]
         }
       );
       const masterHost = cache.endpoint.pipe((v) => v.at(0).address);
@@ -5893,12 +5915,15 @@ var pubsubFeature = defineFeature({
         {
           name: cacheName,
           engine: "valkey",
+          networkType: "dual_stack",
           majorEngineVersion: "8",
           securityGroupIds: [cacheSecurityGroup.id],
           subnetIds: ctx.shared.get("vpc", "private-subnets")
         },
         {
-          import: ctx.import ? cacheName : void 0
+          import: ctx.import ? cacheName : void 0,
+          // The network type can only be set at creation time.
+          replaceOnChanges: ["networkType"]
         }
       );
       const redisHost = cache.endpoint.pipe((v) => v.at(0).address);
@@ -6484,7 +6509,7 @@ var searchFeature = defineFeature({
         {
           domainName: name,
           engineVersion: `OpenSearch_${props.version}`,
-          ipAddressType: "ipv4",
+          ipAddressType: "dualstack",
           clusterConfig: {
             instanceType: `${props.type}.search`,
             instanceCount: props.count
@@ -6539,7 +6564,7 @@ var searchFeature = defineFeature({
           import: ctx.import ? name : void 0
         }
       );
-      ctx.addEnv(`SEARCH_${constantCase8(ctx.stack.name)}_${constantCase8(id)}_DOMAIN`, openSearch.endpoint);
+      ctx.addEnv(`SEARCH_${constantCase8(ctx.stack.name)}_${constantCase8(id)}_DOMAIN`, openSearch.endpointV2);
       ctx.addStackPermission({
         actions: ["es:ESHttp*"],
         resources: [
@@ -9083,6 +9108,7 @@ var getViewerRequestFunctionCode = (props) => {
   return CODE(
     [
       props.blockDirectAccess ? BLOCK_DIRECT_ACCESS_TO_CLOUDFRONT : "",
+      props.redirectWww ? REDIRECT_WWW : "",
       props.passwordAuth ?? props.basicAuth ? AUTH_WRAPPER(
         [
           //
@@ -9101,6 +9127,38 @@ if (headers.host && headers.host.value.includes('cloudfront.net')) {
 		statusDescription: 'Forbidden'
 	};
 }`;
+var REDIRECT_WWW = `
+if (headers.host && headers.host.value.startsWith('www.')) {
+	let location = 'https://' + headers.host.value.slice(4) + request.uri;
+	const query = [];
+
+	for(const key in request.querystring) {
+		const item = request.querystring[key];
+
+		if(item.multiValue) {
+			for(const i in item.multiValue) {
+				query.push(key + '=' + item.multiValue[i].value);
+			}
+		} else if(item.value === '') {
+			query.push(key);
+		} else {
+			query.push(key + '=' + item.value);
+		}
+	}
+
+	if(query.length > 0) {
+		location += '?' + query.join('&');
+	}
+
+	return {
+		statusCode: 301,
+		statusDescription: 'Moved Permanently',
+		headers: {
+			'location': { value: location },
+			'strict-transport-security': { value: 'max-age=31536000; includeSubdomains; preload' }
+		}
+	};
+}`;
 var BASIC_AUTH_CHECK = (username, password) => `
 authMethods.push('Basic realm="Protected"');
 
@@ -9416,6 +9474,7 @@ var routerFeature = defineFeature({
         code: getViewerRequestFunctionCode({
           router: id,
           blockDirectAccess: !!props.domain,
+          redirectWww: !!props.domain && props.redirectWww,
           basicAuth: props.basicAuth,
           passwordAuth: props.passwordAuth
         }),
@@ -9746,6 +9805,7 @@ var routerFeature = defineFeature({
           },
           comment: `${name} preview`,
           enabled: true,
+          isIpv6Enabled: true,
           waitForDeployment: true,
           origin: [
             {
@@ -9864,29 +9924,50 @@ var routerFeature = defineFeature({
       distributionIds.push(distribution.id);
       if (props.domain) {
         const domainName = formatFullDomainName(ctx.appConfig, props.domain, props.subDomain);
+        const wwwDomainName = props.redirectWww ? `www.${domainName}` : void 0;
         const certificateArn = ctx.shared.entry("domain", `global-certificate-arn`, props.domain);
         const zoneId = ctx.shared.entry("domain", "zone-id", props.domain);
         const connectionGroup = new aws30.cloudfront.ConnectionGroup(group, "connection-group", {
-          name
+          name,
+          ipv6Enabled: true
         });
         new aws30.cloudfront.DistributionTenant(group, `tenant`, {
           name,
           enabled: true,
           distributionId: distribution.id,
           connectionGroupId: connectionGroup.id,
-          domain: [{ domain: domainName }],
+          domain: [
+            //
+            { domain: domainName },
+            ...wwwDomainName ? [{ domain: wwwDomainName }] : []
+          ],
           customizations: [{ certificate: [{ arn: certificateArn }] }]
         });
-        new aws30.route53.Record(group, `record`, {
-          zoneId,
-          type: "A",
-          name: domainName,
-          alias: {
-            name: connectionGroup.routingEndpoint,
-            zoneId: "Z2FDTNDATAQYW2",
-            evaluateTargetHealth: false
-          }
-        });
+        for (const [recordId, recordName] of [
+          ["record", domainName],
+          ...wwwDomainName ? [["www-record", wwwDomainName]] : []
+        ]) {
+          new aws30.route53.Record(group, recordId, {
+            zoneId,
+            type: "A",
+            name: recordName,
+            alias: {
+              name: connectionGroup.routingEndpoint,
+              zoneId: "Z2FDTNDATAQYW2",
+              evaluateTargetHealth: false
+            }
+          });
+          new aws30.route53.Record(group, `${recordId}-ipv6`, {
+            zoneId,
+            type: "AAAA",
+            name: recordName,
+            alias: {
+              name: connectionGroup.routingEndpoint,
+              zoneId: "Z2FDTNDATAQYW2",
+              evaluateTargetHealth: false
+            }
+          });
+        }
         ctx.bind(`ROUTER_${constantCase15(id)}_ENDPOINT`, domainName);
       }
     }
@@ -11391,6 +11472,10 @@ var deploy = (program2) => {
               appConfig,
               id: deployment.id
             });
+            await promoteAppDeployment({
+              appConfig,
+              id: deployment.id
+            });
             return deployments3;
           } finally {
             await release();

package/dist/build-json-schema.js

@@ -560,6 +560,7 @@ var RouterDefaultSchema = z16.record(
   z16.object({
     domain: ResourceIdSchema.describe("The domain id to link your Router.").optional(),
     subDomain: z16.string().optional(),
+    redirectWww: z16.boolean().default(false).describe("Redirect all www subdomain requests to your root domain."),
     waf: WafSettingsSchema.optional(),
     geoRestrictions: z16.array(z16.string().length(2).toUpperCase()).default([]).describe("Specifies a blacklist of countries that should be blocked."),
     errors: z16.object({
@@ -648,6 +649,21 @@ var RouterDefaultSchema = z16.record(
     }).optional().describe(
       "Specifies the cookies, headers, and query values that CloudFront includes in the cache key."
     )
+  }).superRefine((props, ctx) => {
+    if (props.redirectWww && !props.domain) {
+      ctx.addIssue({
+        code: z16.ZodIssueCode.custom,
+        path: ["redirectWww"],
+        message: "The redirectWww option requires a domain to be set."
+      });
+    }
+    if (props.redirectWww && props.subDomain) {
+      ctx.addIssue({
+        code: z16.ZodIssueCode.custom,
+        path: ["redirectWww"],
+        message: `The redirectWww option can't be combined with a subDomain, because the domain certificate only covers single level subdomains.`
+      });
+    }
   })
 ).optional().describe(`Define the global Router. Backed by AWS CloudFront.`);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awsless/cli",
-  "version": "0.0.46-next.0",
+  "version": "0.0.46-next.1",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
@@ -82,24 +82,24 @@
     "zip-a-folder": "^3.1.6",
     "zod": "^3.24.2",
     "zod-to-json-schema": "^3.24.3",
-    "@awsless/cloudwatch": "^0.0.1",
     "@awsless/big-float": "^0.1.7",
+    "@awsless/clui": "^0.0.8",
+    "@awsless/cloudwatch": "^0.0.1",
     "@awsless/duration": "^0.0.4",
     "@awsless/dynamodb": "^0.3.21",
     "@awsless/iot": "^0.0.5",
     "@awsless/json": "^0.0.11",
     "@awsless/lambda": "^0.0.44",
-    "@awsless/redis": "^0.1.13",
-    "@awsless/scheduler": "^0.0.4",
     "@awsless/s3": "^0.0.21",
+    "@awsless/redis": "^0.1.13",
     "@awsless/size": "^0.0.2",
     "@awsless/sns": "^0.0.10",
+    "@awsless/sqs": "^0.0.24",
     "@awsless/ts-file-cache": "^0.0.16",
-    "@awsless/clui": "^0.0.8",
+    "@awsless/weak-cache": "^0.0.1",
     "@awsless/validate": "^0.1.7",
     "awsless": "^0.0.15-next.0",
-    "@awsless/weak-cache": "^0.0.1",
-    "@awsless/sqs": "^0.0.24"
+    "@awsless/scheduler": "^0.0.4"
   },
   "devDependencies": {
     "@hono/node-server": "1.19.9",