sst 2.32.0 → 2.32.1

package/constructs/AppSyncApi.d.ts

@@ -546,5 +546,6 @@ export declare class AppSyncApi extends Construct implements SSTConstruct {
     private normalizeResolverKey;
     private buildMappingTemplate;
     private buildDataSourceKey;
+    private isSameStack;
 }
 export {};

package/constructs/AppSyncApi.js

@@ -11,11 +11,12 @@ export async function weakImport(pkg) {
 const { print, buildSchema } = await weakImport("graphql");
 const { mergeTypeDefs } = await weakImport("@graphql-tools/merge");
 import { Construct } from "constructs";
+import { Stack } from "./Stack.js";
 import * as appSyncApiDomain from "./util/appSyncApiDomain.js";
 import { getFunctionRef, isCDKConstruct } from "./Construct.js";
 import { Function as Fn, } from "./Function.js";
 import { useProject } from "../project.js";
-import { GraphqlApi, MappingTemplate as CDKMappingTemplate, SchemaFile, Definition, } from "aws-cdk-lib/aws-appsync";
+import { GraphqlApi, MappingTemplate as CDKMappingTemplate, Resolver, SchemaFile, Definition, LambdaDataSource, DynamoDbDataSource, RdsDataSource, OpenSearchDataSource, HttpDataSource, NoneDataSource, } from "aws-cdk-lib/aws-appsync";
 /////////////////////
 // Construct
 /////////////////////
@@ -327,58 +328,110 @@ export class AppSyncApi extends Construct {
         // Lambda function
         if (Fn.isInlineDefinition(dsValue)) {
             lambda = Fn.fromDefinition(scope, `Lambda_${dsKey}`, dsValue, this.props.defaults?.function, `Cannot define defaults.function when a Function is passed in to the "${dsKey} data source`);
-            dataSource = this.cdk.graphqlApi.addLambdaDataSource(dsKey, lambda);
+            dataSource = this.isSameStack(scope)
+                ? this.cdk.graphqlApi.addLambdaDataSource(dsKey, lambda)
+                : new LambdaDataSource(scope, dsKey, {
+                    api: this.cdk.graphqlApi,
+                    lambdaFunction: lambda,
+                });
         }
         // DynamoDb ds
         else if (dsValue.type === "dynamodb") {
-            dataSource = this.cdk.graphqlApi.addDynamoDbDataSource(dsKey, dsValue.table
+            const dsTable = dsValue.table
                 ? dsValue.table.cdk.table
-                : dsValue.cdk?.dataSource?.table, {
+                : dsValue.cdk?.dataSource?.table;
+            const dsOptions = {
                 name: dsValue.name,
                 description: dsValue.description,
-            });
+            };
+            dataSource = this.isSameStack(scope)
+                ? this.cdk.graphqlApi.addDynamoDbDataSource(dsKey, dsTable, dsOptions)
+                : new DynamoDbDataSource(scope, dsKey, {
+                    api: this.cdk.graphqlApi,
+                    table: dsTable,
+                    ...dsOptions,
+                });
         }
         // RDS ds
         else if (dsValue.type === "rds") {
-            dataSource = this.cdk.graphqlApi.addRdsDataSource(dsKey, dsValue.rds
+            const dsCluster = dsValue.rds
                 ? dsValue.rds.cdk.cluster
-                : dsValue.cdk?.dataSource?.serverlessCluster, dsValue.rds
+                : dsValue.cdk?.dataSource?.serverlessCluster;
+            const dsSecret = dsValue.rds
                 ? dsValue.rds.cdk.cluster.secret
-                : dsValue.cdk?.dataSource?.secretStore, dsValue.rds
+                : dsValue.cdk?.dataSource?.secretStore;
+            const dsDatabaseName = dsValue.rds
                 ? dsValue.databaseName || dsValue.rds.defaultDatabaseName
-                : dsValue.cdk?.dataSource?.databaseName, {
+                : dsValue.cdk?.dataSource?.databaseName;
+            const dsOptions = {
                 name: dsValue.name,
                 description: dsValue.description,
-            });
+            };
+            dataSource = this.isSameStack(scope)
+                ? this.cdk.graphqlApi.addRdsDataSource(dsKey, dsCluster, dsSecret, dsDatabaseName, dsOptions)
+                : new RdsDataSource(scope, dsKey, {
+                    api: this.cdk.graphqlApi,
+                    serverlessCluster: dsCluster,
+                    secretStore: dsSecret,
+                    databaseName: dsDatabaseName,
+                    ...dsOptions,
+                });
         }
         // OpenSearch ds
         else if (dsValue.type === "open_search") {
-            dataSource = this.cdk.graphqlApi.addOpenSearchDataSource(dsKey, dsValue.cdk?.dataSource?.domain, {
+            const dsOptions = {
                 name: dsValue.name,
                 description: dsValue.description,
-            });
+            };
+            dataSource = this.isSameStack(scope)
+                ? this.cdk.graphqlApi.addOpenSearchDataSource(dsKey, dsValue.cdk?.dataSource?.domain, dsOptions)
+                : new OpenSearchDataSource(scope, dsKey, {
+                    api: this.cdk.graphqlApi,
+                    domain: dsValue.cdk?.dataSource?.domain,
+                    ...dsOptions,
+                });
         }
         // Http ds
         else if (dsValue.type === "http") {
-            dataSource = this.cdk.graphqlApi.addHttpDataSource(dsKey, dsValue.endpoint, {
+            const dsOptions = {
                 name: dsValue.name,
                 description: dsValue.description,
-            });
+            };
+            dataSource = this.isSameStack(scope)
+                ? this.cdk.graphqlApi.addHttpDataSource(dsKey, dsValue.endpoint, dsOptions)
+                : new HttpDataSource(scope, dsKey, {
+                    api: this.cdk.graphqlApi,
+                    endpoint: dsValue.endpoint,
+                    ...dsOptions,
+                });
         }
         // Http ds
         else if (dsValue.type === "none") {
-            dataSource = this.cdk.graphqlApi.addNoneDataSource(dsKey, {
+            const dsOptions = {
                 name: dsValue.name,
                 description: dsValue.description,
-            });
+            };
+            dataSource = this.isSameStack(scope)
+                ? this.cdk.graphqlApi.addNoneDataSource(dsKey, dsOptions)
+                : new NoneDataSource(scope, dsKey, {
+                    api: this.cdk.graphqlApi,
+                    ...dsOptions,
+                });
         }
         // Lambda ds
         else {
             lambda = Fn.fromDefinition(scope, `Lambda_${dsKey}`, dsValue.function, this.props.defaults?.function, `Cannot define defaults.function when a Function is passed in to the "${dsKey} data source`);
-            dataSource = this.cdk.graphqlApi.addLambdaDataSource(dsKey, lambda, {
+            const dsOptions = {
                 name: dsValue.name,
                 description: dsValue.description,
-            });
+            };
+            dataSource = this.isSameStack(scope)
+                ? this.cdk.graphqlApi.addLambdaDataSource(dsKey, lambda, dsOptions)
+                : new LambdaDataSource(scope, dsKey, {
+                    api: this.cdk.graphqlApi,
+                    lambdaFunction: lambda,
+                    ...dsOptions,
+                });
         }
         this.dataSourcesByDsKey[dsKey] = dataSource;
         if (lambda) {
@@ -423,7 +476,12 @@ export class AppSyncApi extends Construct {
             resValue = resValue;
             lambda = Fn.fromDefinition(scope, `Lambda_${typeName}_${fieldName}`, resValue.function, this.props.defaults?.function, `Cannot define defaults.function when a Function is passed in to the "${resKey} resolver`);
             dataSourceKey = this.buildDataSourceKey(typeName, fieldName);
-            dataSource = this.cdk.graphqlApi.addLambdaDataSource(dataSourceKey, lambda);
+            dataSource = this.isSameStack(scope)
+                ? this.cdk.graphqlApi.addLambdaDataSource(dataSourceKey, lambda)
+                : new LambdaDataSource(scope, dataSourceKey, {
+                    api: this.cdk.graphqlApi,
+                    lambdaFunction: lambda,
+                });
             resolverProps = {
                 requestMappingTemplate: this.buildMappingTemplate(resValue.requestMapping),
                 responseMappingTemplate: this.buildMappingTemplate(resValue.responseMapping),
@@ -446,7 +504,12 @@ export class AppSyncApi extends Construct {
             resValue = resValue;
             lambda = Fn.fromDefinition(scope, `Lambda_${typeName}_${fieldName}`, resValue, this.props.defaults?.function, `Cannot define defaults.function when a Function is passed in to the "${resKey} resolver`);
             dataSourceKey = this.buildDataSourceKey(typeName, fieldName);
-            dataSource = this.cdk.graphqlApi.addLambdaDataSource(dataSourceKey, lambda);
+            dataSource = this.isSameStack(scope)
+                ? this.cdk.graphqlApi.addLambdaDataSource(dataSourceKey, lambda)
+                : new LambdaDataSource(scope, dataSourceKey, {
+                    api: this.cdk.graphqlApi,
+                    lambdaFunction: lambda,
+                });
             resolverProps = {};
         }
         if (lambda) {
@@ -461,12 +524,20 @@ export class AppSyncApi extends Construct {
         ///////////////////
         // Create resolver
         ///////////////////
-        const resolver = this.cdk.graphqlApi.createResolver(`${typeName}${fieldName}Resolver`, {
-            dataSource,
-            typeName,
-            fieldName,
-            ...resolverProps,
-        });
+        const resolver = this.isSameStack(scope)
+            ? this.cdk.graphqlApi.createResolver(`${typeName}${fieldName}Resolver`, {
+                dataSource,
+                typeName,
+                fieldName,
+                ...resolverProps,
+            })
+            : new Resolver(scope, `${typeName}${fieldName}Resolver`, {
+                api: this.cdk.graphqlApi,
+                dataSource,
+                typeName,
+                fieldName,
+                ...resolverProps,
+            });
         this.resolversByResKey[resKey] = resolver;
         return lambda;
     }
@@ -492,4 +563,7 @@ export class AppSyncApi extends Construct {
     buildDataSourceKey(typeName, fieldName) {
         return `LambdaDS_${typeName}_${fieldName}`;
     }
+    isSameStack(scope) {
+        return Stack.of(this) === Stack.of(scope);
+    }
 }

package/constructs/Function.js

@@ -211,7 +211,7 @@ export class Function extends CDKFunction {
                             ...(props.container?.buildArgs
                                 ? { buildArgs: props.container.buildArgs }
                                 : {}),
-                            exclude: [".sst"],
+                            exclude: [".sst/dist", ".sst/artifacts"],
                             ignoreMode: IgnoreMode.GLOB,
                         }),
                         handler: CDKHandler.FROM_IMAGE,

package/constructs/Job.js

@@ -214,7 +214,7 @@ export class Job extends Construct {
                         : Platform.custom("linux/amd64"),
                     file: container?.file,
                     buildArgs: container?.buildArgs,
-                    exclude: [".sst"],
+                    exclude: [".sst/dist", ".sst/artifacts"],
                     ignoreMode: IgnoreMode.GLOB,
                 });
                 image.repository?.grantPull(this.job.role);

package/constructs/Service.js

@@ -644,7 +644,7 @@ export class Service extends Construct {
             platform: architecture === "arm64" ? Platform.LINUX_ARM64 : Platform.LINUX_AMD64,
             file: dockerfile,
             buildArgs: build?.buildArgs,
-            exclude: [".sst"],
+            exclude: [".sst/dist", ".sst/artifacts"],
             ignoreMode: IgnoreMode.GLOB,
         });
         const cfnTask = taskDefinition.node.defaultChild;

package/constructs/SsrSite.d.ts

@@ -1,7 +1,7 @@
 import { Construct } from "constructs";
 import { Bucket, BucketProps, IBucket } from "aws-cdk-lib/aws-s3";
 import { Function as CdkFunction, FunctionProps as CdkFunctionProps } from "aws-cdk-lib/aws-lambda";
-import { ICachePolicy, IResponseHeadersPolicy, AllowedMethods, CachePolicyProps, ErrorResponse } from "aws-cdk-lib/aws-cloudfront";
+import { ICachePolicy, IResponseHeadersPolicy, ViewerProtocolPolicy, AllowedMethods, CachePolicyProps, ErrorResponse } from "aws-cdk-lib/aws-cloudfront";
 import { Schedule } from "aws-cdk-lib/aws-events";
 import { DistributionDomainProps } from "./Distribution.js";
 import { SSTConstruct } from "./Construct.js";
@@ -361,6 +361,19 @@ export interface SsrSiteProps {
          * from the server rendering Lambda.
          */
         responseHeadersPolicy?: IResponseHeadersPolicy;
+        /**
+         * Override the CloudFront viewer protocol policy properties.
+         * @default ViewerProtocolPolicy.REDIRECT_TO_HTTPS
+         * @example
+         * ```js
+         * import { ViewerProtocolPolicy } from "aws-cdk-lib/aws-cloudfront";
+         *
+         * cdk: {
+         *   viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
+         * }
+         * ```
+         */
+        viewerProtocolPolicy?: ViewerProtocolPolicy;
         server?: Pick<CdkFunctionProps, "layers" | "vpc" | "vpcSubnets" | "securityGroups" | "allowAllOutbound" | "allowPublicSubnet" | "architecture" | "logRetention"> & Pick<FunctionProps, "copyFiles">;
     };
 }

package/constructs/SsrSite.js

@@ -308,7 +308,7 @@ export class SsrSite extends Construct {
             if (behavior.cacheType === "static") {
                 return {
                     origin,
-                    viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
+                    viewerProtocolPolicy: cdk?.viewerProtocolPolicy ?? ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
                     allowedMethods: behavior.allowedMethods ?? AllowedMethods.ALLOW_GET_HEAD_OPTIONS,
                     cachedMethods: CachedMethods.CACHE_GET_HEAD_OPTIONS,
                     compress: true,
@@ -326,7 +326,7 @@ export class SsrSite extends Construct {
             }
             else if (behavior.cacheType === "server") {
                 return {
-                    viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
+                    viewerProtocolPolicy: cdk?.viewerProtocolPolicy ?? ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
                     origin,
                     allowedMethods: behavior.allowedMethods ?? AllowedMethods.ALLOW_ALL,
                     cachedMethods: CachedMethods.CACHE_GET_HEAD_OPTIONS,

package/package.json

@@ -1,7 +1,7 @@
 {
   "sideEffects": false,
   "name": "sst",
-  "version": "2.32.0",
+  "version": "2.32.1",
   "bin": {
     "sst": "cli/sst.js"
   },
@@ -120,7 +120,7 @@
     "@types/ws": "^8.5.3",
     "@types/yargs": "^17.0.13",
     "archiver": "^5.3.1",
-    "astro-sst": "2.32.0",
+    "astro-sst": "2.32.1",
     "async": "^3.2.4",
     "tsx": "^3.12.1",
     "typescript": "^5.2.2",