move worker to cwd

sst · Feb 8, 2024 · e71fb0c · e71fb0c
1 parent 6f56601
commit e71fb0c
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 3 deletions.
diff --git a/examples/test/src/index.mjs b/examples/test/src/index.mjs
@@ -3,6 +3,6 @@ import { Resource } from "sst";
 export async function handler() {
   return {
     statusCode: 200,
-    body: process.env.HELLO,
+    body: process.cwd(),
   };
 }
diff --git a/pkg/platform/src/components/helpers/aws/bootstrap.ts b/pkg/platform/src/components/helpers/aws/bootstrap.ts
@@ -29,10 +29,20 @@ export const bootstrap = {
     }
 
     const ssm = new SSMClient({
+      // credentials: {
+      //   accessKeyId: process.env.AWS_ACCESS_KEY_ID!,
+      //   sessionToken: process.env.AWS_SESSION_TOKEN!,
+      //   secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY!,
+      // },
       region,
     });
     const s3 = new S3Client({
       region,
+      // credentials: {
+      //   accessKeyId: process.env.AWS_ACCESS_KEY_ID!,
+      //   sessionToken: process.env.AWS_SESSION_TOKEN!,
+      //   secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY!,
+      // },
     });
     try {
       const bucket = (async () => {

diff --git a/pkg/project/provider/provider.go b/pkg/project/provider/provider.go
@@ -112,7 +112,7 @@ func GetSecrets(backend Backend, app, stage string) (map[string]string, error) {
 }
 
 func PutSecrets(backend Backend, app, stage string, data map[string]string) error {
-	slog.Info("putting secrets", "app", app, "stage", stage)
+	slog.Info("putting selinkscrets", "app", app, "stage", stage)
 	if data == nil || len(data) == 0 {
 		return nil
 	}

diff --git a/pkg/runtime/node.go b/pkg/runtime/node.go
@@ -145,8 +145,18 @@ func (r *NodeRuntime) Build(ctx context.Context, input *BuildInput) (*BuildOutpu
 }
 
 func (r *NodeRuntime) Run(ctx context.Context, input *RunInput) (Worker, error) {
-	cmd := exec.CommandContext(ctx, "node", ".sst/platform/dist/nodejs-runtime/index.js", filepath.Join(input.Build.Out, input.Build.Handler), input.WorkerID)
+	cmd := exec.CommandContext(
+		ctx,
+		"node",
+		filepath.Join(
+			input.Project.PathPlatformDir(),
+			"/dist/nodejs-runtime/index.js",
+		),
+		filepath.Join(input.Build.Out, input.Build.Handler),
+		input.WorkerID,
+	)
 	cmd.Env = append(input.Env, "AWS_LAMBDA_RUNTIME_API=localhost:44149/lambda/"+input.WorkerID)
+	cmd.Dir = input.Build.Out
 	cmd.Start()
 	return &NodeWorker{
 		cmd,

diff --git a/pkg/runtime/runtime.go b/pkg/runtime/runtime.go
@@ -39,6 +39,7 @@ type BuildOutput struct {
 }
 
 type RunInput struct {
+	Project    *project.Project
 	FunctionID string
 	WorkerID   string
 	Runtime    string

diff --git a/pkg/server/dev/aws/aws.go b/pkg/server/dev/aws/aws.go
@@ -191,6 +191,7 @@ func Start(
 				builds[functionID] = build
 			}
 			worker, _ := runtime.Run(ctx, &runtime.RunInput{
+				Project:    p,
 				WorkerID:   workerID,
 				Runtime:    warp.Runtime,
 				FunctionID: functionID,