sst 2.7.1 → 2.7.2

package/cli/ci-info.d.ts

@@ -0,0 +1,4 @@
+export declare function getCiInfo(): {
+    isCI: boolean;
+    name: string | null;
+};

package/cli/ci-info.js

@@ -0,0 +1,8 @@
+import ciInfo from "ci-info";
+export function getCiInfo() {
+    const isSeed = !!process.env.SEED_APP_NAME;
+    return {
+        isCI: ciInfo.isCI || isSeed,
+        name: (isSeed ? "Seed" : ciInfo.name) || null,
+    };
+}

package/cli/commands/deploy.js

@@ -17,6 +17,7 @@ export const deploy = (program) => program.command("deploy [filter]", "Deploy yo
     const { dim, blue, bold } = await import("colorette");
     const { useProject } = await import("../../project.js");
     const { loadAssembly, useAppMetadata, saveAppMetadata, Stacks } = await import("../../stacks/index.js");
+    const { getCiInfo } = await import("../ci-info.js");
     const { render } = await import("ink");
     const { DeploymentUI } = await import("../ui/deploy.js");
     const { mapValues } = await import("remeda");
@@ -40,7 +41,7 @@ export const deploy = (program) => program.command("deploy [filter]", "Deploy yo
         });
     }
     // Check app mode changed
-    if (appMetadata && appMetadata.mode !== "deploy") {
+    if (!getCiInfo().isCI && appMetadata && appMetadata.mode !== "deploy") {
         if (!(await promptChangeMode())) {
             process.exit(0);
         }

package/cli/commands/dev.js

@@ -31,6 +31,7 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
     const { useMetadata } = await import("../../stacks/metadata.js");
     const { useIOT } = await import("../../iot.js");
     const { clear } = await import("../terminal.js");
+    const { getCiInfo } = await import("../ci-info.js");
     if (args._[0] === "start") {
         console.log(yellow(`Warning: ${bold(`sst start`)} has been renamed to ${bold(`sst dev`)}`));
     }
@@ -69,12 +70,16 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
         });
         bus.subscribe("function.build.success", async (evt) => {
             const info = useFunctions().fromID(evt.properties.functionID);
+            if (!info)
+                return;
             if (info.enableLiveDev === false)
                 return;
             Colors.line(Colors.dim(Colors.prefix, "Built", info.handler));
         });
         bus.subscribe("function.build.failed", async (evt) => {
             const info = useFunctions().fromID(evt.properties.functionID);
+            if (!info)
+                return;
             if (info.enableLiveDev === false)
                 return;
             Colors.gap();
@@ -109,7 +114,6 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
     const useStackBuilder = Context.memo(async () => {
         const watcher = useWatcher();
         const project = useProject();
-        const bus = useBus();
         let lastDeployed;
         let isWorking = false;
         let isDirty = false;
@@ -276,7 +280,7 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
         });
     }
     // Check app mode changed
-    if (appMetadata && appMetadata.mode !== "dev") {
+    if (!getCiInfo().isCI && appMetadata && appMetadata.mode !== "dev") {
         if (!(await promptChangeMode())) {
             process.exit(0);
         }

package/cli/commands/diff.js

@@ -8,7 +8,6 @@ export const diff = (program) => program.command("diff", "Compare your app with
     const { useAWSClient } = await import("../../credentials.js");
     const { CloudFormationClient, GetTemplateCommand } = await import("@aws-sdk/client-cloudformation");
     const { createSpinner } = await import("../spinner.js");
-    const { green } = await import("colorette");
     const { Colors } = await import("../colors.js");
     // Build app
     const project = useProject();
@@ -23,10 +22,13 @@ export const diff = (program) => program.command("diff", "Compare your app with
     for (const stack of assembly.stacks) {
         const spinner = createSpinner(`${stack.stackName}: Checking for changes...`);
         // get old template
-        const response = await cfn.send(new GetTemplateCommand({
-            StackName: stack.stackName,
-        }));
-        const oldTemplate = JSON.parse(response.TemplateBody);
+        const oldTemplate = await getTemplate(stack.stackName);
+        if (!oldTemplate) {
+            spinner.clear();
+            Colors.line(`➜  ${Colors.dim.bold(stackNameToId(stack.stackName) + ":")} New stack`);
+            Colors.gap();
+            continue;
+        }
         // generate diff
         const { count, diff } = await Stacks.diff(stack, oldTemplate);
         spinner.clear();
@@ -58,4 +60,17 @@ export const diff = (program) => program.command("diff", "Compare your app with
         Colors.line(Colors.success(`✔`), Colors.bold(" Diff:"), changesAcc === 1 ? "1 change found in" : `${changesAcc} changes in`, changedStacks === 1 ? "1 stack" : `${changedStacks} stacks`);
     }
     process.exit(0);
+    async function getTemplate(stackName) {
+        try {
+            const response = await cfn.send(new GetTemplateCommand({ StackName: stackName }));
+            return JSON.parse(response.TemplateBody);
+        }
+        catch (e) {
+            if (e.name === "ValidationError" &&
+                e.message.includes("does not exist")) {
+                return;
+            }
+            throw e;
+        }
+    }
 });

package/cli/telemetry/environment.js

@@ -1,5 +1,5 @@
 import os from "os";
-import ciInfo from "ci-info";
+import { getCiInfo } from "../ci-info.js";
 import { useProject } from "../../project.js";
 let data;
 export function getEnvironmentData() {
@@ -7,7 +7,7 @@ export function getEnvironmentData() {
         return data;
     }
     const cpus = os.cpus() || [];
-    const isSeed = !!process.env.SEED_APP_NAME;
+    const ciInfo = getCiInfo();
     data = {
         // Software information
         systemPlatform: os.platform(),
@@ -19,8 +19,8 @@ export function getEnvironmentData() {
         cpuSpeed: cpus.length ? cpus[0].speed : null,
         memoryInMb: Math.trunc(os.totalmem() / Math.pow(1024, 2)),
         // Environment information
-        isCI: ciInfo.isCI || isSeed,
-        ciName: (isSeed ? "Seed" : ciInfo.name) || null,
+        isCI: ciInfo.isCI,
+        ciName: ciInfo.name,
         sstVersion: useProject().version,
     };
     return data;

package/cli/ui/functions.js

@@ -48,7 +48,7 @@ export function Functions() {
         const success = bus.subscribe("function.success", (evt) => {
             function print(input, diff) {
                 setTimeout(() => {
-                    console.log(Colors.primary(`  ➜ `), useFunctions().fromID(input.functionID).handler);
+                    console.log(Colors.primary(`  ➜ `), useFunctions().fromID(input.functionID)?.handler);
                     for (const log of input.logs) {
                         console.log(`     ${dim(log)}`);
                     }
@@ -78,7 +78,7 @@ export function Functions() {
         const error = bus.subscribe("function.error", (evt) => {
             function print(input, diff) {
                 setTimeout(() => {
-                    console.log(Colors.primary(`  ➜ `), useFunctions().fromID(input.functionID).handler);
+                    console.log(Colors.primary(`  ➜ `), useFunctions().fromID(input.functionID)?.handler);
                     for (const log of input.logs) {
                         console.log(`     ${dim(log)}`);
                     }
@@ -122,7 +122,7 @@ export function Functions() {
             "  ",
             React.createElement(Spinner, null),
             "  ",
-            useFunctions().fromID(evt.functionID).handler),
+            useFunctions().fromID(evt.functionID)?.handler),
         evt.logs.map((log, index) => (React.createElement(Text, { dimColor: true, key: index },
             "     ",
             log))),

package/constructs/AppSyncApi.d.ts

@@ -10,7 +10,7 @@ import { Permissions } from "./util/permission.js";
 import { Table as CDKTable } from "aws-cdk-lib/aws-dynamodb";
 import { IServerlessCluster } from "aws-cdk-lib/aws-rds";
 import { ISecret } from "aws-cdk-lib/aws-secretsmanager";
-import { AwsIamConfig, BaseDataSource, CfnDomainName, GraphqlApi, GraphqlApiProps, IGraphqlApi, Resolver, ResolverProps } from "aws-cdk-lib/aws-appsync";
+import { AwsIamConfig, BaseDataSource, GraphqlApi, GraphqlApiProps, IGraphqlApi, Resolver, ResolverProps } from "aws-cdk-lib/aws-appsync";
 import { ICertificate } from "aws-cdk-lib/aws-certificatemanager";
 import { IDomain } from "aws-cdk-lib/aws-opensearchservice";
 export interface AppSyncApiDomainProps extends appSyncApiDomain.CustomDomainProps {
@@ -403,7 +403,6 @@ export declare class AppSyncApi extends Construct implements SSTConstruct {
     };
     private readonly props;
     private _customDomainUrl?;
-    _cfnDomainName?: CfnDomainName;
     private readonly functionsByDsKey;
     private readonly dataSourcesByDsKey;
     private readonly dsKeysByResKey;

package/constructs/AppSyncApi.js

@@ -48,7 +48,6 @@ export class AppSyncApi extends Construct {
     cdk;
     props;
     _customDomainUrl;
-    _cfnDomainName;
     functionsByDsKey = {};
     dataSourcesByDsKey = {};
     dsKeysByResKey = {};
@@ -308,24 +307,15 @@ export class AppSyncApi extends Construct {
                 name: app.logicalPrefixedName(id),
                 xrayEnabled: true,
                 schema: mainSchema,
-                domainName: domainData,
+                domainName: domainData && {
+                    certificate: domainData.certificate,
+                    domainName: domainData.domainName,
+                },
                 ...graphqlApiProps,
             });
             this.cdk.certificate = domainData?.certificate;
-            // note: As of CDK 2.20.0, the "AWS::AppSync::DomainNameApiAssociation" resource
-            //       is not dependent on the "AWS::AppSync::DomainName" resource. This leads
-            //       CloudFormation deploy error if DomainNameApiAssociation is created before
-            //       DomainName is created.
-            //       https://github.com/aws/aws-cdk/issues/18395#issuecomment-1099455502
-            //       To workaround this issue, we need to add a dependency manually.
             if (domainData) {
-                this._cfnDomainName = this.cdk.graphqlApi.node.children.find((child) => child.cfnResourceType ===
-                    "AWS::AppSync::DomainName");
-                const cfnDomainNameApiAssociation = this.cdk.graphqlApi.node.children.find((child) => child.cfnResourceType ===
-                    "AWS::AppSync::DomainNameApiAssociation");
-                if (this._cfnDomainName && cfnDomainNameApiAssociation) {
-                    cfnDomainNameApiAssociation.node.addDependency(this._cfnDomainName);
-                }
+                appSyncApiDomain.cleanup(this, domainData);
             }
         }
     }

package/constructs/Function.d.ts

@@ -590,7 +590,7 @@ export declare class Function extends CDKFunction implements SSTConstruct {
     static mergeProps(baseProps?: FunctionProps, props?: FunctionProps): FunctionProps;
 }
 export declare const useFunctions: () => {
-    fromID(id: string): FunctionProps;
+    fromID(id: string): FunctionProps | undefined;
     add(name: string, props: FunctionProps): void;
     readonly all: Record<string, FunctionProps>;
 };

package/constructs/Function.js

@@ -171,7 +171,9 @@ export class Function extends CDKFunction {
                     new PolicyStatement({
                         actions: ["s3:*"],
                         effect: Effect.ALLOW,
-                        resources: [`arn:aws:s3:::${bootstrap.bucket}`],
+                        resources: [
+                            `arn:${Stack.of(this).partition}:s3:::${bootstrap.bucket}`,
+                        ],
                     }),
                 ]);
             });
@@ -499,7 +501,10 @@ export const useFunctions = createAppContext(() => {
     const functions = {};
     return {
         fromID(id) {
-            return functions[id];
+            const result = functions[id];
+            if (!result)
+                return;
+            return result;
         },
         add(name, props) {
             functions[name] = props;

package/constructs/deprecated/cross-region-helper.js

@@ -16,7 +16,7 @@ export function getOrCreateBucket(scope) {
     }
     // Create provider
     const provider = new lambda.Function(stack, providerId, {
-        code: lambda.Code.fromAsset(path.join(__dirname, "../../../support/edge-function")),
+        code: lambda.Code.fromAsset(path.join(__dirname, "../../support/edge-function")),
         handler: "s3-bucket.handler",
         runtime: lambda.Runtime.NODEJS_16_X,
         timeout: cdk.Duration.minutes(15),
@@ -48,7 +48,7 @@ export function createFunction(scope, name, role, bucketName, functionParams) {
     // Create provider if not already created
     if (!provider) {
         provider = new lambda.Function(stack, providerId, {
-            code: lambda.Code.fromAsset(path.join(__dirname, "../../../support/edge-function")),
+            code: lambda.Code.fromAsset(path.join(__dirname, "../../support/edge-function")),
             handler: "edge-lambda.handler",
             runtime: lambda.Runtime.NODEJS_16_X,
             timeout: cdk.Duration.minutes(15),
@@ -86,7 +86,7 @@ export function createVersion(scope, name, functionArn) {
     // Create provider if not already created
     if (!provider) {
         provider = new lambda.Function(stack, providerId, {
-            code: lambda.Code.fromAsset(path.join(__dirname, "../../../support/edge-function")),
+            code: lambda.Code.fromAsset(path.join(__dirname, "../../support/edge-function")),
             handler: "edge-lambda-version.handler",
             runtime: lambda.Runtime.NODEJS_16_X,
             timeout: cdk.Duration.minutes(15),

package/constructs/util/appSyncApiDomain.d.ts

@@ -1,5 +1,4 @@
 import * as route53 from "aws-cdk-lib/aws-route53";
-import * as appsync from "aws-cdk-lib/aws-appsync";
 import * as acm from "aws-cdk-lib/aws-certificatemanager";
 import { AppSyncApi } from "../AppSyncApi.js";
 export interface CustomDomainProps {
@@ -11,6 +10,11 @@ export interface CustomDomainProps {
      * The hosted zone in Route 53 that contains the domain. By default, SST will look for a hosted zone by stripping out the first part of the domainName that's passed in. So, if your domainName is api.domain.com. SST will default the hostedZone to domain.com.
      */
     hostedZone?: string;
+    /**
+     * DNS record type for the Route 53 record associated with the custom domain. Default is CNAME.
+     * @default CNAME
+     */
+    recordType?: "CNAME" | "A_AAAA";
     /**
      * Set this option if the domain is not hosted on Amazon Route 53.
      */
@@ -26,4 +30,12 @@ export interface CustomDomainProps {
         certificate?: acm.ICertificate;
     };
 }
-export declare function buildCustomDomainData(scope: AppSyncApi, customDomain: string | CustomDomainProps | undefined): appsync.DomainOptions | undefined;
+interface CustomDomainData {
+    certificate: acm.ICertificate;
+    domainName: string;
+    hostedZone?: route53.IHostedZone;
+    recordType?: CustomDomainProps["recordType"];
+}
+export declare function buildCustomDomainData(scope: AppSyncApi, customDomain: string | CustomDomainProps | undefined): CustomDomainData | undefined;
+export declare function cleanup(scope: AppSyncApi, domainData: CustomDomainData): void;
+export {};

package/constructs/util/appSyncApiDomain.js

@@ -1,5 +1,6 @@
-import { Token, Lazy } from "aws-cdk-lib";
+import { Token } from "aws-cdk-lib";
 import * as route53 from "aws-cdk-lib/aws-route53";
+import * as route53Targets from "aws-cdk-lib/aws-route53-targets";
 import * as acm from "aws-cdk-lib/aws-certificatemanager";
 export function buildCustomDomainData(scope, customDomain) {
     if (customDomain === undefined) {
@@ -18,6 +19,14 @@ export function buildCustomDomainData(scope, customDomain) {
     // customDomain.domainName not exists
     throw new Error(`Missing "domainName" in sst.AppSyncApi's customDomain setting`);
 }
+export function cleanup(scope, domainData) {
+    const cfnDomainName = getCfnDomainName(scope);
+    const cfnDomainNameApiAssociation = getCfnDomainNameApiAssociation(scope);
+    if (domainData.hostedZone) {
+        createRecords(scope, domainData.domainName, domainData.hostedZone, domainData.recordType, cfnDomainName);
+    }
+    fixDomainResourceDependencies(cfnDomainName, cfnDomainNameApiAssociation);
+}
 function buildDataForStringInput(scope, customDomain) {
     // validate: customDomain is a TOKEN string
     // ie. imported SSM value: ssm.StringParameter.valueForStringParameter()
@@ -29,10 +38,10 @@ function buildDataForStringInput(scope, customDomain) {
     const hostedZoneDomain = domainName.split(".").slice(1).join(".");
     const hostedZone = lookupHostedZone(scope, hostedZoneDomain);
     const certificate = createCertificate(scope, domainName, hostedZone);
-    createRecord(scope, hostedZone, domainName);
     return {
         certificate,
         domainName,
+        hostedZone,
     };
 }
 function buildDataForInternalDomainInput(scope, customDomain) {
@@ -69,10 +78,11 @@ function buildDataForInternalDomainInput(scope, customDomain) {
     const certificate = customDomain.cdk?.certificate
         ? customDomain.cdk.certificate
         : createCertificate(scope, domainName, hostedZone);
-    createRecord(scope, hostedZone, domainName);
     return {
         certificate,
         domainName,
+        hostedZone,
+        recordType: customDomain.recordType,
     };
 }
 function buildDataForExternalDomainInput(scope, customDomain) {
@@ -103,25 +113,60 @@ function createCertificate(scope, domainName, hostedZone) {
         validation: acm.CertificateValidation.fromDns(hostedZone),
     });
 }
-function createRecord(scope, hostedZone, domainName) {
+function createRecords(scope, domainName, hostedZone, recordType, cfnDomainName) {
     // create DNS record
-    const record = new route53.CnameRecord(scope, "CnameRecord", {
+    const aRecordProps = {
         recordName: domainName,
         zone: hostedZone,
-        domainName: Lazy.string({
-            produce() {
-                return scope._cfnDomainName.attrAppSyncDomainName;
+        target: route53.RecordTarget.fromAlias({
+            bind() {
+                return {
+                    hostedZoneId: route53Targets.CloudFrontTarget.CLOUDFRONT_ZONE_ID,
+                    dnsName: cfnDomainName.attrAppSyncDomainName,
+                };
             },
         }),
-    });
+    };
+    const records = (recordType || "CNAME") === "CNAME"
+        ? [
+            new route53.CnameRecord(scope, "CnameRecord", {
+                recordName: domainName,
+                zone: hostedZone,
+                domainName: cfnDomainName.attrAppSyncDomainName,
+            }),
+        ]
+        : [
+            new route53.ARecord(scope, "AliasRecord", aRecordProps),
+            new route53.AaaaRecord(scope, "AliasRecordAAAA", aRecordProps),
+        ];
     // note: If domainName is a TOKEN string ie. ${TOKEN..}, the route53.ARecord
     //       construct will append ".${hostedZoneName}" to the end of the domain.
     //       This is because the construct tries to check if the record name
     //       ends with the domain name. If not, it will append the domain name.
     //       So, we need remove this behavior.
     if (Token.isUnresolved(domainName)) {
-        const cfnRecord = record.node.defaultChild;
-        cfnRecord.name = domainName;
+        records.forEach((record) => {
+            const cfnRecord = record.node.defaultChild;
+            cfnRecord.name = domainName;
+        });
+    }
+}
+function getCfnDomainName(scope) {
+    return scope.cdk.graphqlApi.node.children.find((child) => child.cfnResourceType === "AWS::AppSync::DomainName");
+}
+function getCfnDomainNameApiAssociation(scope) {
+    return scope.cdk.graphqlApi.node.children.find((child) => child.cfnResourceType ===
+        "AWS::AppSync::DomainNameApiAssociation");
+}
+function fixDomainResourceDependencies(cfnDomainName, cfnDomainNameApiAssociation) {
+    // note: As of CDK 2.20.0, the "AWS::AppSync::DomainNameApiAssociation" resource
+    //       is not dependent on the "AWS::AppSync::DomainName" resource. This leads
+    //       CloudFormation deploy error if DomainNameApiAssociation is created before
+    //       DomainName is created.
+    //       https://github.com/aws/aws-cdk/issues/18395#issuecomment-1099455502
+    //       To workaround this issue, we need to add a dependency manually.
+    if (cfnDomainName && cfnDomainNameApiAssociation) {
+        cfnDomainNameApiAssociation.node.addDependency(cfnDomainName);
     }
 }
 function assertDomainNameIsLowerCase(domainName) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "sideEffects": false,
   "name": "sst",
-  "version": "2.7.1",
+  "version": "2.7.2",
   "bin": {
     "sst": "cli/sst.js"
   },

package/runtime/handlers.js

@@ -25,6 +25,11 @@ export const useRuntimeHandlers = Context.memo(() => {
         async build(functionID, mode) {
             async function task() {
                 const func = useFunctions().fromID(functionID);
+                if (!func)
+                    return {
+                        type: "error",
+                        errors: [`Function with ID "${functionID}" not found`],
+                    };
                 const handler = result.for(func.runtime);
                 const out = path.join(project.paths.artifacts, functionID);
                 await fs.rm(out, { recursive: true, force: true });
@@ -100,6 +105,8 @@ export const useFunctionBuilder = Context.memo(() => {
         },
         build: async (functionID) => {
             const result = await handlers.build(functionID, "start");
+            if (!result)
+                return;
             if (result.type === "error")
                 return;
             artifacts.set(functionID, result);

package/runtime/workers.js

@@ -13,6 +13,8 @@ export const useRuntimeWorkers = Context.memo(async () => {
         for (const [_, worker] of workers) {
             if (worker.functionID === evt.properties.functionID) {
                 const props = useFunctions().fromID(worker.functionID);
+                if (!props)
+                    return;
                 const handler = handlers.for(props.runtime);
                 await handler?.stopWorker(worker.workerID);
                 bus.publish("worker.stopped", worker);
@@ -30,6 +32,8 @@ export const useRuntimeWorkers = Context.memo(async () => {
         if (worker)
             return;
         const props = useFunctions().fromID(evt.properties.functionID);
+        if (!props)
+            return;
         const handler = handlers.for(props.runtime);
         if (!handler)
             return;