sst 2.0.0-rc.9 → 2.0.1

package/constructs/Function.js

@@ -9,7 +9,6 @@ import * as ssm from "aws-cdk-lib/aws-ssm";
 import { Stack } from "./Stack.js";
 import { Job } from "./Job.js";
 import { Secret } from "./Config.js";
-import { isSSTConstruct } from "./Construct.js";
 import { toCdkSize } from "./util/size.js";
 import { toCdkDuration } from "./util/duration.js";
 import { bindEnvironment, bindPermissions } from "./util/functionBinding.js";
@@ -17,8 +16,7 @@ import { attachPermissionsToRole } from "./util/permission.js";
 import * as functionUrlCors from "./util/functionUrlCors.js";
 import url from "url";
 import { useDeferredTasks } from "./deferred_task.js";
-import { useWarning } from "./util/warning.js";
-import { useProject } from "../app.js";
+import { useProject } from "../project.js";
 import { useRuntimeHandlers } from "../runtime/handlers.js";
 import { createAppContext } from "./context.js";
 const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
@@ -77,6 +75,7 @@ export class Function extends lambda.Function {
             .forEach((per) => {
             props = Function.mergeProps(per, props);
         });
+        props.runtime = props.runtime || "nodejs16.x";
         // Set defaults
         const functionName = props.functionName &&
             (typeof props.functionName === "string"
@@ -84,7 +83,6 @@ export class Function extends lambda.Function {
                 : props.functionName({ stack, functionProps: props }));
         const handler = props.handler;
         const timeout = Function.normalizeTimeout(props.timeout);
-        const runtime = Function.normalizeRuntime(props.runtime);
         const architecture = (() => {
             if (props.architecture === "arm_64")
                 return lambda.Architecture.ARM_64;
@@ -103,9 +101,7 @@ export class Function extends lambda.Function {
             throw new Error(`No handler defined for the "${id}" Lambda function`);
         }
         // Validate input
-        const isNodeRuntime = runtime.startsWith("nodejs");
-        const isPythonRuntime = runtime.startsWith("python");
-        const isJavaRuntime = runtime.startsWith("java");
+        const isNodeRuntime = props.runtime.startsWith("nodejs");
         // Handle local development (ie. sst start)
         // - set runtime to nodejs12.x for non-Node runtimes (b/c the stub is in Node)
         // - set retry to 0. When the debugger is disconnected, the Cron construct
@@ -190,13 +186,18 @@ export class Function extends lambda.Function {
             useDeferredTasks().add(async () => {
                 // Build function
                 const result = await useRuntimeHandlers().build(this.node.addr, "deploy");
-                if (result.type === "error")
-                    throw new Error(`Failed to build function "${props.handler}"`);
+                if (result.type === "error") {
+                    throw new Error([
+                        `Failed to build function "${props.handler}"`,
+                        ...result.errors,
+                    ].join("\n"));
+                }
                 const code = lambda.AssetCode.fromAsset(result.out);
                 // Update function's code
                 const codeConfig = code.bind(this);
                 const cfnFunction = this.node.defaultChild;
-                cfnFunction.runtime = supportedRuntimes[runtime].toString();
+                cfnFunction.runtime =
+                    supportedRuntimes[props.runtime].toString();
                 /*
                 if (isJavaRuntime) {
                   const providedRuntime = (bundle as FunctionBundleJavaProps)
@@ -229,10 +230,9 @@ export class Function extends lambda.Function {
         // Add config
         this.addEnvironment("SST_APP", app.name, { removeInEdge: true });
         this.addEnvironment("SST_STAGE", app.stage, { removeInEdge: true });
-        this.addEnvironment("SST_SSM_PREFIX", useProject().ssmPrefix, {
+        this.addEnvironment("SST_SSM_PREFIX", useProject().config.ssmPrefix, {
             removeInEdge: true,
         });
-        this.addConfig(props.config || []);
         this.bind(props.bind || []);
         this.createUrl();
         this._isLiveDevEnabled = isLiveDevEnabled;
@@ -268,27 +268,6 @@ export class Function extends lambda.Function {
             ]));
         });
     }
-    /**
-     * Attaches additional configs to function.
-     *
-     * @deprecated The "config" prop is deprecated, and will be removed in SST v2. Pass Parameters and Secrets in through the "bind" prop. Read more about how to upgrade here — https://docs.serverless-stack.com/constructs/function
-     *
-     * @example
-     * ```js
-     * const STRIPE_KEY = new Config.Secret(stack, "STRIPE_KEY");
-     *
-     * // Change
-     * job.addConfig([STRIPE_KEY]);
-     *
-     * // To
-     * job.bind([STRIPE_KEY]);
-     * ```
-     */
-    addConfig(config) {
-        this.bind(config);
-        if (config.length > 0)
-            useWarning().add("config.deprecated");
-    }
     /**
      * Attaches additional permissions to function.
      *
@@ -308,20 +287,16 @@ export class Function extends lambda.Function {
                 .filter((p) => p instanceof Job)
                 .forEach((p) => this.bind([p]));
         }
-        // Warn user if SST constructs are passed into permissions
-        if (permissions !== "*" && permissions.some((p) => isSSTConstruct(p))) {
-            useWarning().add("permissions.noConstructs");
-        }
     }
     /** @internal */
     getConstructMetadata() {
-        const { config, bind } = this.props;
+        const { bind } = this.props;
         return {
             type: "Function",
             data: {
                 arn: this.functionArn,
                 localId: this.node.addr,
-                secrets: [...(config || []), ...(bind || [])]
+                secrets: (bind || [])
                     .filter((c) => c instanceof Secret)
                     .map((c) => c.name),
             },
@@ -391,13 +366,6 @@ export class Function extends lambda.Function {
         }
         return cdk.Duration.seconds(timeout || 10);
     }
-    static normalizeRuntime(runtime) {
-        runtime = runtime || "nodejs18.x";
-        if (!supportedRuntimes[runtime]) {
-            throw new Error(`The specified runtime is not supported for sst.Function. Only NodeJS, Python, Go, and .NET runtimes are currently supported.`);
-        }
-        return runtime;
-    }
     static normalizeSrcPath(srcPath) {
         return srcPath.replace(/\/+$/, "");
     }
@@ -475,9 +443,6 @@ export class Function extends lambda.Function {
         // Merge layers
         const layers = [...(baseProps?.layers || []), ...(props?.layers || [])];
         const layersProp = layers.length === 0 ? {} : { layers };
-        // Merge config
-        const config = [...(baseProps?.config || []), ...(props?.config || [])];
-        const configProp = config.length === 0 ? {} : { config };
         // Merge bind
         const bind = [...(baseProps?.bind || []), ...(props?.bind || [])];
         const bindProp = bind.length === 0 ? {} : { bind };
@@ -497,7 +462,6 @@ export class Function extends lambda.Function {
             ...(baseProps || {}),
             ...(props || {}),
             ...bindProp,
-            ...configProp,
             ...layersProp,
             ...environmentProp,
             ...permissionsProp,

package/constructs/FunctionalStack.d.ts

@@ -6,8 +6,8 @@ export declare function stack(app: App, fn: FunctionalStack<any>, props?: StackP
 export declare function use<T>(stack: FunctionalStack<T>): T;
 export declare function dependsOn(stack: FunctionalStack<any>): void;
 export declare function getStack(stack: FunctionalStack<any>): Stack;
-export declare type StackContext = {
+export type StackContext = {
     app: App;
     stack: Stack;
 };
-export declare type FunctionalStack<T> = (this: Stack, ctx: StackContext) => T | Promise<T>;
+export type FunctionalStack<T> = (this: Stack, ctx: StackContext) => T | Promise<T>;

package/constructs/Job.d.ts

@@ -1,11 +1,10 @@
 import { Construct } from "constructs";
-import { Secret, Parameter } from "./Config.js";
 import { SSTConstruct } from "./Construct.js";
 import { Function } from "./Function.js";
 import { Duration } from "./util/duration.js";
 import { Permissions } from "./util/permission.js";
 import { IVpc } from "aws-cdk-lib/aws-ec2";
-export declare type JobMemorySize = "3 GB" | "7 GB" | "15 GB" | "145 GB";
+export type JobMemorySize = "3 GB" | "7 GB" | "15 GB" | "145 GB";
 export interface JobProps {
     /**
      * Path to the entry point and handler function. Of the format:
@@ -87,27 +86,6 @@ export interface JobProps {
      * ```
      */
     bind?: SSTConstruct[];
-    /**
-     * Configure environment variables for the job
-     *
-     * @deprecated The "config" prop is deprecated, and will be removed in SST v2. Pass Parameters and Secrets in through the "bind" prop. Read more about how to upgrade here — https://docs.serverless-stack.com/constructs/function
-     *
-     * @example
-     * ```js
-     * // Change
-     * new Job(stack, "MyJob", {
-     *   handler: "src/job.handler",
-     *   config: [STRIPE_KEY, API_URL]
-     * })
-     *
-     * // To
-     * new Job(stack, "MyJob", {
-     *   handler: "src/job.handler",
-     *   bind: [STRIPE_KEY, API_URL]
-     * })
-     * ```
-     */
-    config?: (Secret | Parameter)[];
     /**
      * Attaches the given list of permissions to the job. Configuring this property is equivalent to calling `attachPermissions()` after the job is created.
      *
@@ -120,29 +98,28 @@ export interface JobProps {
      * ```
      */
     permissions?: Permissions;
-    cdk?: JobCDKProps;
-}
-export interface JobCDKProps {
-    /**
-     * Allows you to override default id for this construct.
-     */
-    id?: string;
-    /**
-     * Runs codebuild job in the specified VPC. Note this will only work once deployed.
-     *
-     * @example
-     * ```js
-     * new Job(stack, "MyJob", {
-     *   handler: "src/job.handler",
-     *   cdk: {
-     *     vpc: Vpc.fromLookup(this, "VPC", {
-     *       vpcId: "vpc-xxxxxxxxxx",
-     *     }),
-     *   }
-     * })
-     * ```
-     */
-    vpc?: IVpc;
+    cdk?: {
+        /**
+         * Allows you to override default id for this construct.
+         */
+        id?: string;
+        /**
+         * Runs codebuild job in the specified VPC. Note this will only work once deployed.
+         *
+         * @example
+         * ```js
+         * new Job(stack, "MyJob", {
+         *   handler: "src/job.handler",
+         *   cdk: {
+         *     vpc: Vpc.fromLookup(stack, "VPC", {
+         *       vpcId: "vpc-xxxxxxxxxx",
+         *     }),
+         *   }
+         * })
+         * ```
+         */
+        vpc?: IVpc;
+    };
 }
 /**
  * The `Cron` construct is a higher level CDK construct that makes it easy to create a cron job.
@@ -192,23 +169,6 @@ export declare class Job extends Construct implements SSTConstruct {
      * ```
      */
     bind(constructs: SSTConstruct[]): void;
-    /**
-     * Attaches additional configs to job.
-     *
-     * @deprecated The "config" prop is deprecated, and will be removed in SST v2. Pass Parameters and Secrets in through the "bind" prop. Read more about how to upgrade here — https://docs.serverless-stack.com/constructs/function
-     *
-     * @example
-     * ```js
-     * const STRIPE_KEY = new Config.Secret(stack, "STRIPE_KEY");
-     *
-     * // Change
-     * job.addConfig([STRIPE_KEY]);
-     *
-     * // To
-     * job.bind([STRIPE_KEY]);
-     * ```
-     */
-    addConfig(config: (Secret | Parameter)[]): void;
     /**
      * Attaches the given list of [permissions](Permissions.md) to the job. This allows the job to access other AWS resources.
      *

package/constructs/Job.js

@@ -6,13 +6,13 @@ import { Construct } from "constructs";
 import * as iam from "aws-cdk-lib/aws-iam";
 import * as lambda from "aws-cdk-lib/aws-lambda";
 import * as codebuild from "aws-cdk-lib/aws-codebuild";
-import { Function } from "./Function.js";
+import { Stack } from "./Stack.js";
+import { Function, useFunctions } from "./Function.js";
 import { toCdkDuration } from "./util/duration.js";
 import { attachPermissionsToRole } from "./util/permission.js";
 import { bindEnvironment, bindPermissions } from "./util/functionBinding.js";
 import { useDeferredTasks } from "./deferred_task.js";
-import { useWarning } from "./util/warning.js";
-import { useProject } from "../app.js";
+import { useProject } from "../project.js";
 import { useRuntimeHandlers } from "../runtime/handlers.js";
 const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
 /////////////////////
@@ -44,6 +44,10 @@ export class Job extends Construct {
         const app = this.node.root;
         this.id = id;
         this.props = props;
+        useFunctions().add(this.node.addr, {
+            ...props,
+            runtime: "nodejs16.x",
+        });
         this.localId = path.posix
             .join(scope.node.path, id)
             .replace(/\$/g, "-")
@@ -59,7 +63,6 @@ export class Job extends Construct {
             this.buildCodeBuildProjectCode();
         }
         this.attachPermissions(props.permissions || []);
-        this.addConfig(props.config || []);
         this.bind(props.bind || []);
         Object.entries(props.environment || {}).forEach(([key, value]) => {
             this.addEnvironment(key, value);
@@ -98,29 +101,6 @@ export class Job extends Construct {
         this._jobInvoker.bind(constructs);
         this.useForCodeBuild(constructs);
     }
-    /**
-     * Attaches additional configs to job.
-     *
-     * @deprecated The "config" prop is deprecated, and will be removed in SST v2. Pass Parameters and Secrets in through the "bind" prop. Read more about how to upgrade here — https://docs.serverless-stack.com/constructs/function
-     *
-     * @example
-     * ```js
-     * const STRIPE_KEY = new Config.Secret(stack, "STRIPE_KEY");
-     *
-     * // Change
-     * job.addConfig([STRIPE_KEY]);
-     *
-     * // To
-     * job.bind([STRIPE_KEY]);
-     * ```
-     */
-    addConfig(config) {
-        const app = this.node.root;
-        this.bind(config);
-        if (config.length > 0) {
-            useWarning().add("config.deprecated");
-        }
-    }
     /**
      * Attaches the given list of [permissions](Permissions.md) to the job. This allows the job to access other AWS resources.
      *
@@ -165,7 +145,7 @@ export class Job extends Construct {
             environmentVariables: {
                 SST_APP: { value: app.name },
                 SST_STAGE: { value: app.stage },
-                SST_SSM_PREFIX: { value: useProject().ssmPrefix },
+                SST_SSM_PREFIX: { value: useProject().config.ssmPrefix },
             },
             timeout: this.normalizeTimeout(this.props.timeout || "8 hours"),
             buildSpec: codebuild.BuildSpec.fromObject({
@@ -252,13 +232,13 @@ export class Job extends Construct {
                 actions: ["s3:*"],
                 effect: iam.Effect.ALLOW,
                 resources: [
-                    `arn:aws:s3:::${codeConfig.s3Location?.bucketName}/${codeConfig.s3Location?.objectKey}`,
+                    `arn:${Stack.of(this).partition}:s3:::${codeConfig.s3Location?.bucketName}/${codeConfig.s3Location?.objectKey}`,
                 ],
             }),
         ]);
     }
     createLocalInvoker() {
-        const { handler, config, environment, permissions } = this.props;
+        const { handler, permissions } = this.props;
         // Note: make the invoker function the same ID as the Job
         //       construct so users can identify the invoker function
         //       in the Console.
@@ -268,7 +248,6 @@ export class Job extends Construct {
             runtime: "nodejs16.x",
             timeout: 10,
             memorySize: 1024,
-            config,
             environment: {
                 SST_DEBUG_TYPE: "job",
             },
@@ -279,7 +258,7 @@ export class Job extends Construct {
     }
     createCodeBuildInvoker() {
         return new Function(this, this.node.id, {
-            handler: path.join(__dirname, "../dist/support/job-invoke/index.main"),
+            handler: path.join(__dirname, "../support/job-invoker/index.main"),
             runtime: "nodejs16.x",
             timeout: 10,
             memorySize: 1024,

package/constructs/Metadata.d.ts

@@ -1,42 +1,40 @@
 import { SSTConstruct } from "./Construct.js";
-declare type ExtractMetadata<T extends SSTConstruct> = ReturnType<T["getConstructMetadata"]> & {
+type ExtractMetadata<T extends SSTConstruct> = ReturnType<T["getConstructMetadata"]> & {
     id: string;
     addr: string;
     stack: string;
 };
 import type { Api } from "./Api.js";
-export declare type ApiMetadata = ExtractMetadata<Api<any>>;
-import { GraphQLApi } from "./GraphQLApi.js";
-export declare type GraphQLApiMetadata = ExtractMetadata<GraphQLApi>;
+export type ApiMetadata = ExtractMetadata<Api<any>>;
 import type { ApiGatewayV1Api } from "./ApiGatewayV1Api.js";
-export declare type ApiGatewayV1ApiMetadata = ExtractMetadata<ApiGatewayV1Api<any>>;
+export type ApiGatewayV1ApiMetadata = ExtractMetadata<ApiGatewayV1Api<any>>;
 import type { Cognito } from "./Cognito.js";
-export declare type AuthMetadata = ExtractMetadata<Cognito>;
+export type AuthMetadata = ExtractMetadata<Cognito>;
 import type { AppSyncApi } from "./AppSyncApi.js";
-export declare type AppSyncApiMetadata = ExtractMetadata<AppSyncApi>;
+export type AppSyncApiMetadata = ExtractMetadata<AppSyncApi>;
 import type { Bucket } from "./Bucket.js";
-export declare type BucketMetadata = ExtractMetadata<Bucket>;
+export type BucketMetadata = ExtractMetadata<Bucket>;
 import type { Cron } from "./Cron.js";
-export declare type CronMetadata = ExtractMetadata<Cron>;
+export type CronMetadata = ExtractMetadata<Cron>;
 import type { EventBus } from "./EventBus.js";
-export declare type EventBusMetadata = ExtractMetadata<EventBus>;
+export type EventBusMetadata = ExtractMetadata<EventBus>;
 import type { Function as Fn } from "./Function.js";
-export declare type FunctionMetadata = ExtractMetadata<Fn>;
+export type FunctionMetadata = ExtractMetadata<Fn>;
 import type { KinesisStream } from "./KinesisStream.js";
-export declare type KinesisStreamMetadata = ExtractMetadata<KinesisStream>;
+export type KinesisStreamMetadata = ExtractMetadata<KinesisStream>;
 import type { NextjsSite } from "./NextjsSite.js";
-export declare type NextjsMetadata = ExtractMetadata<NextjsSite>;
+export type NextjsMetadata = ExtractMetadata<NextjsSite>;
 import type { Queue } from "./Queue.js";
-export declare type QueueMetadata = ExtractMetadata<Queue>;
+export type QueueMetadata = ExtractMetadata<Queue>;
 import type { StaticSite } from "./StaticSite.js";
-export declare type StaticSiteMetadata = ExtractMetadata<StaticSite>;
+export type StaticSiteMetadata = ExtractMetadata<StaticSite>;
 import type { Table } from "./Table.js";
-export declare type TableMetadata = ExtractMetadata<Table>;
+export type TableMetadata = ExtractMetadata<Table>;
 import type { Topic } from "./Topic.js";
-export declare type TopicMetadata = ExtractMetadata<Topic>;
+export type TopicMetadata = ExtractMetadata<Topic>;
 import type { WebSocketApi } from "./WebSocketApi.js";
-export declare type WebSocketApiMetadata = ExtractMetadata<WebSocketApi>;
+export type WebSocketApiMetadata = ExtractMetadata<WebSocketApi>;
 import type { RDS } from "./RDS.js";
-export declare type RDSMetadata = ExtractMetadata<RDS>;
-export declare type Metadata = ApiMetadata | ApiGatewayV1ApiMetadata | AuthMetadata | AppSyncApiMetadata | BucketMetadata | CronMetadata | EventBusMetadata | FunctionMetadata | KinesisStreamMetadata | NextjsMetadata | QueueMetadata | StaticSiteMetadata | TableMetadata | TopicMetadata | WebSocketApiMetadata | GraphQLApiMetadata | RDSMetadata;
+export type RDSMetadata = ExtractMetadata<RDS>;
+export type Metadata = ApiMetadata | ApiGatewayV1ApiMetadata | AuthMetadata | AppSyncApiMetadata | BucketMetadata | CronMetadata | EventBusMetadata | FunctionMetadata | KinesisStreamMetadata | NextjsMetadata | QueueMetadata | StaticSiteMetadata | TableMetadata | TopicMetadata | WebSocketApiMetadata | RDSMetadata;
 export {};

package/constructs/NextjsSite.d.ts

@@ -2,7 +2,20 @@ import { Construct } from "constructs";
 import * as lambda from "aws-cdk-lib/aws-lambda";
 import * as cloudfront from "aws-cdk-lib/aws-cloudfront";
 import { SsrSite, SsrSiteProps } from "./SsrSite.js";
+import { Size } from "./util/size.js";
+import { Duration } from "./util/duration.js";
 export interface NextjsSiteProps extends Omit<SsrSiteProps, "edge"> {
+    imageOptimization?: {
+        /**
+         * The amount of memory in MB allocated for image optimization function.
+         * @default 1024 MB
+         * @example
+         * ```js
+         * memorySize: "512 MB",
+         * ```
+         */
+        memorySize?: number | Size;
+    };
 }
 /**
  * The `NextjsSite` construct is a higher level CDK construct that makes it easy to create a Next.js app.
@@ -16,18 +29,21 @@ export interface NextjsSiteProps extends Omit<SsrSiteProps, "edge"> {
  * ```
  */
 export declare class NextjsSite extends SsrSite {
-    constructor(scope: Construct, id: string, props: NextjsSiteProps);
+    protected props: Omit<NextjsSiteProps, "path"> & {
+        path: string;
+        timeout: number | Duration;
+        memorySize: number | Size;
+    };
+    constructor(scope: Construct, id: string, props?: NextjsSiteProps);
     protected initBuildConfig(): {
         serverBuildOutputFile: string;
         clientBuildOutputDir: string;
         clientBuildVersionedSubDir: string;
-        siteStub: string;
     };
     protected createFunctionForRegional(): lambda.Function;
+    private createImageOptimizationFunctionForRegional;
+    private createMiddlewareEdgeFunctionForRegional;
     protected createCloudFrontDistributionForRegional(): cloudfront.Distribution;
-    protected createCloudFrontDistributionForStub(): cloudfront.Distribution;
     protected createCloudFrontServerCachePolicy(): cloudfront.CachePolicy;
     protected generateBuildId(): string;
-    private createImageOptimizationFunctionForRegional;
-    private createMiddlewareEdgeFunctionForRegional;
 }