sst 2.0.37 → 2.0.39

package/cli/commands/plugins/kysely.js

@@ -85,7 +85,7 @@ export const useKyselyTypeGenerator = Context.memo(async () => {
             defaultDatabaseName: c.data.defaultDatabaseName,
             secretArn: c.data.secretArn,
         }));
-        databases.map((db) => generate(db));
+        databases.map((db) => generate(db).catch());
     });
     bus.subscribe("function.success", async (evt) => {
         if (!evt.properties.body?.results)

package/credentials.d.ts

@@ -5,8 +5,8 @@ import { RetryInputConfig } from "@aws-sdk/middleware-retry";
 import { AwsAuthInputConfig } from "@aws-sdk/middleware-signing";
 import { SdkProvider } from "aws-cdk/lib/api/aws-auth/sdk-provider.js";
 type Config = RegionInputConfig & RetryInputConfig & AwsAuthInputConfig & HostHeaderConditionConfig;
-export declare const useAWSCredentialsProvider: () => import("@aws-sdk/types").CredentialProvider;
-export declare const useAWSCredentials: () => Promise<import("@aws-sdk/types").Credentials>;
+export declare const useAWSCredentialsProvider: () => import("@aws-sdk/types").AwsCredentialIdentityProvider;
+export declare const useAWSCredentials: () => Promise<import("@aws-sdk/types").AwsCredentialIdentity>;
 export declare const useSTSIdentity: () => Promise<import("@aws-sdk/client-sts").GetCallerIdentityCommandOutput>;
 export declare function useAWSClient<C extends Client<any, any, any, any>>(client: new (config: Config) => C, force?: boolean): C;
 import { HostHeaderConditionConfig } from "aws-sdk/clients/elbv2.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sst",
-  "version": "2.0.37",
+  "version": "2.0.39",
   "bin": {
     "sst": "cli/sst.js"
   },
@@ -29,23 +29,23 @@
     "@aws-cdk/cloudformation-diff": "2.62.2",
     "@aws-cdk/cx-api": "2.62.2",
     "@aws-cdk/region-info": "2.62.2",
-    "@aws-sdk/client-api-gateway": "3.208.0",
-    "@aws-sdk/client-cloudformation": "3.208.0",
-    "@aws-sdk/client-cloudfront": "3.208.0",
-    "@aws-sdk/client-iam": "3.208.0",
-    "@aws-sdk/client-iot": "3.208.0",
-    "@aws-sdk/client-iot-data-plane": "3.208.0",
-    "@aws-sdk/client-lambda": "3.208.0",
-    "@aws-sdk/client-rds-data": "3.208.0",
-    "@aws-sdk/client-s3": "3.208.0",
-    "@aws-sdk/client-ssm": "3.208.0",
-    "@aws-sdk/client-sts": "3.208.0",
-    "@aws-sdk/config-resolver": "3.208.0",
-    "@aws-sdk/credential-providers": "3.208.0",
-    "@aws-sdk/middleware-retry": "3.208.0",
-    "@aws-sdk/middleware-signing": "3.208.0",
-    "@aws-sdk/signature-v4-crt": "^3.31.0",
-    "@aws-sdk/smithy-client": "3.208.0",
+    "@aws-sdk/client-api-gateway": "^3.208.0",
+    "@aws-sdk/client-cloudformation": "^3.279.0",
+    "@aws-sdk/client-cloudfront": "^3.279.0",
+    "@aws-sdk/client-iam": "^3.279.0",
+    "@aws-sdk/client-iot": "^3.279.0",
+    "@aws-sdk/client-iot-data-plane": "^3.279.0",
+    "@aws-sdk/client-lambda": "^3.279.0",
+    "@aws-sdk/client-rds-data": "^3.279.0",
+    "@aws-sdk/client-s3": "^3.279.0",
+    "@aws-sdk/client-ssm": "^3.279.0",
+    "@aws-sdk/client-sts": "^3.279.0",
+    "@aws-sdk/config-resolver": "^3.272.0",
+    "@aws-sdk/credential-providers": "^3.279.0",
+    "@aws-sdk/middleware-retry": "^3.272.0",
+    "@aws-sdk/middleware-signing": "^3.272.0",
+    "@aws-sdk/signature-v4-crt": "^3.272.0",
+    "@aws-sdk/smithy-client": "^3.279.0",
     "@babel/core": "^7.0.0-0",
     "@babel/generator": "^7.20.5",
     "@trpc/server": "9.16.0",
@@ -54,7 +54,7 @@
     "aws-cdk": "2.62.2",
     "aws-cdk-lib": "2.62.2",
     "aws-iot-device-sdk": "^2.2.12",
-    "aws-sdk": "2.1252.0",
+    "aws-sdk": "^2.1323.0",
     "builtin-modules": "3.2.0",
     "cdk-assets": "2.62.2",
     "chalk": "^4.1.2",
@@ -93,8 +93,8 @@
     "zip-local": "^0.3.5"
   },
   "devDependencies": {
-    "@aws-sdk/client-codebuild": "^3.257.0",
-    "@aws-sdk/types": "^3.208.0",
+    "@aws-sdk/client-codebuild": "^3.279.0",
+    "@aws-sdk/types": "^3.272.0",
     "@graphql-tools/merge": "^8.3.16",
     "@sls-next/lambda-at-edge": "^3.7.0",
     "@tsconfig/node16": "^1.0.3",

package/runtime/handlers/python.js

@@ -5,9 +5,9 @@ import { Context } from "../../context/context.js";
 import { exec, spawn } from "child_process";
 import { promisify } from "util";
 import { useRuntimeServerConfig } from "../server.js";
-import { existsAsync, findAbove, isChild } from "../../util/fs.js";
+import { findAbove, isChild } from "../../util/fs.js";
 import { Runtime } from "aws-cdk-lib/aws-lambda";
-import fs from "fs/promises";
+import { bundle } from "./pythonBundling.js";
 const execAsync = promisify(exec);
 import os from "os";
 import url from "url";
@@ -91,37 +91,50 @@ export const usePythonHandler = Context.memo(async () => {
                     type: "error",
                     errors: [`Could not find src for ${input.props.handler}`],
                 };
+            bundle({
+                installCommands: input.props.python?.installCommands,
+                entry: src,
+                runtime: RUNTIME_MAP[input.props.runtime],
+                outputPathSuffix: ".",
+                out: input.out,
+            });
+            /*
             await fs.cp(src, input.out, {
-                recursive: true,
-                filter: (src) => !src.includes(".sst"),
+              recursive: true,
+              filter: (src) => !src.includes(".sst"),
             });
+      
             if (await existsAsync(path.join(src, "Pipfile"))) {
-                await execAsync("pipenv requirements > requirements.txt", {
-                    cwd: input.out,
-                });
+              await execAsync("pipenv requirements > requirements.txt", {
+                cwd: input.out,
+              });
             }
             if (await existsAsync(path.join(src, "poetry.lock"))) {
-                await execAsync("poetry export --with-credentials --format requirements.txt --output requirements.txt", {
-                    cwd: input.out,
-                });
+              await execAsync(
+                "poetry export --with-credentials --format requirements.txt --output requirements.txt",
+                {
+                  cwd: input.out,
+                }
+              );
             }
             if (await existsAsync(path.join(src, "requirements.txt"))) {
-                await execAsync("pip install -r requirements.txt", {
-                    cwd: input.out,
-                });
+              await execAsync("pip install -r requirements.txt", {
+                cwd: input.out,
+              });
             }
+      
             if (input.props.python?.installCommands) {
-                for (const cmd of input.props.python.installCommands) {
-                    await execAsync(cmd, {
-                        cwd: input.out,
-                    });
-                }
+              for (const cmd of input.props.python.installCommands) {
+                await execAsync(cmd, {
+                  cwd: input.out,
+                });
+              }
             }
-            const result = {
+            */
+            return {
                 type: "success",
                 handler: path.relative(src, path.resolve(input.props.handler)),
             };
-            return result;
         },
     });
 });

package/{constructs/util/python/bundling.d.ts → runtime/handlers/pythonBundling.d.ts}

@@ -1,5 +1,5 @@
-import * as cdk from "aws-cdk-lib";
-import * as lambda from "aws-cdk-lib/aws-lambda";
+import { Runtime } from "aws-cdk-lib/aws-lambda";
+import { AssetHashType } from "aws-cdk-lib";
 /**
  * Dependency files to exclude from the asset hash.
  */
@@ -19,7 +19,7 @@ export interface BundlingOptions {
     /**
      * The runtime of the lambda function
      */
-    readonly runtime: lambda.Runtime;
+    readonly runtime: Runtime;
     /**
      * Output path suffix ('python' for a layer, '.' otherwise)
      */
@@ -46,7 +46,7 @@ export interface BundlingOptions {
      * default is `CUSTOM`. This means that only updates to the source will cause
      * the asset to rebuild.
      */
-    readonly assetHashType?: cdk.AssetHashType;
+    readonly assetHashType?: AssetHashType;
     /**
      * Specify a custom hash for this asset. If `assetHashType` is set it must
      * be set to `AssetHashType.CUSTOM`. For consistency, this custom hash will
@@ -67,7 +67,9 @@ export interface BundlingOptions {
 /**
  * Produce bundled Lambda asset code
  */
-export declare function bundle(options: BundlingOptions): lambda.AssetCode;
+export declare function bundle(options: BundlingOptions & {
+    out: string;
+}): void;
 /**
  * Checks to see if the `entry` directory contains a type of dependency that
  * we know how to install.

package/{constructs/util/python/bundling.js → runtime/handlers/pythonBundling.js}

@@ -4,8 +4,7 @@
 import fs from "fs";
 import url from "url";
 import path from "path";
-import * as cdk from "aws-cdk-lib";
-import * as lambda from "aws-cdk-lib/aws-lambda";
+import { AssetStaging, DockerImage, FileSystem, } from "aws-cdk-lib";
 const __dirname = path.dirname(url.fileURLToPath(import.meta.url));
 /**
  * Dependency files to exclude from the asset hash.
@@ -20,15 +19,16 @@ export const BUNDLER_DEPENDENCIES_CACHE = "/var/dependencies";
  */
 export function bundle(options) {
     const { entry, runtime, outputPathSuffix, installCommands } = options;
-    const stagedir = cdk.FileSystem.mkdtemp("python-bundling-");
+    const stagedir = FileSystem.mkdtemp("python-bundling-");
     const hasDeps = stageDependencies(entry, stagedir);
     const hasInstallCommands = stageInstallCommands(installCommands || [], stagedir);
     const depsCommand = chain([
         hasDeps || hasInstallCommands
-            ? `rsync -r ${BUNDLER_DEPENDENCIES_CACHE}/. ${cdk.AssetStaging.BUNDLING_OUTPUT_DIR}/${outputPathSuffix}`
+            ? `rsync -r ${BUNDLER_DEPENDENCIES_CACHE}/. ${AssetStaging.BUNDLING_OUTPUT_DIR}/${outputPathSuffix}`
             : "",
-        `rsync -r . ${cdk.AssetStaging.BUNDLING_OUTPUT_DIR}/${outputPathSuffix}`,
+        `rsync -r . ${AssetStaging.BUNDLING_OUTPUT_DIR}/${outputPathSuffix}`,
     ]);
+    console.log("Commands", depsCommand);
     // Determine which dockerfile to use. When dependencies are present, we use a
     // Dockerfile that can create a cacheable layer. We can't use this Dockerfile
     // if there aren't dependencies or the Dockerfile will complain about missing
@@ -39,21 +39,26 @@ export function bundle(options) {
             ? "Dockerfile.dependencies"
             : "Dockerfile";
     // copy Dockerfile to workdir
-    fs.copyFileSync(path.join(__dirname, "../../../assets/python", dockerfile), path.join(stagedir, dockerfile));
-    const image = cdk.DockerImage.fromBuild(stagedir, {
+    fs.copyFileSync(path.join(__dirname, "../../support/python-runtime", dockerfile), path.join(stagedir, dockerfile));
+    const image = DockerImage.fromBuild(stagedir, {
         buildArgs: {
             IMAGE: runtime.bundlingImage.image,
         },
         file: dockerfile,
     });
-    return lambda.Code.fromAsset(entry, {
-        assetHashType: options.assetHashType,
-        assetHash: options.assetHash,
-        exclude: DEPENDENCY_EXCLUDES,
-        bundling: {
-            image,
-            command: ["bash", "-c", depsCommand],
-        },
+    image.run({
+        command: ["bash", "-c", depsCommand],
+        workingDirectory: AssetStaging.BUNDLING_INPUT_DIR,
+        volumes: [
+            {
+                hostPath: entry,
+                containerPath: AssetStaging.BUNDLING_INPUT_DIR,
+            },
+            {
+                hostPath: options.out,
+                containerPath: AssetStaging.BUNDLING_OUTPUT_DIR,
+            },
+        ],
     });
 }
 /**