@beesolve/aws-accounts 1.0.2 → 1.0.4

package/dist/commands/remote.js

@@ -1,6 +1,7 @@
 import { readFile, writeFile } from "node:fs/promises";
 import { createInterface } from "node:readline/promises";
-import { resolve } from "node:path";
+import { dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
 import * as v from "valibot";
 import {
   CreateBucketCommand,
@@ -66,7 +67,6 @@ const contextFilePath = "aws.context.json";
 const configFilePath = "aws.config.ts";
 const typesFilePath = "aws.config.types.ts";
 const cachePath = ".remote-state-cache.json";
-const lambdaZipPath = "dist-lambda/lambda.zip";
 const lambdaRoleName = "beesolve-aws-accounts-lambda-role";
 const lambdaFunctionName = "beesolve-aws-accounts";
 async function runRemoteBootstrap(input) {
@@ -273,12 +273,14 @@ async function ensureLambdaFunction(props) {
     if (existingArn === "") {
       throw new Error("Lambda function exists but ARN is empty.");
     }
+    await waitForLambdaReady(props.lambdaClient, lambdaFunctionName);
     await props.lambdaClient.send(
       new UpdateFunctionCodeCommand({
         FunctionName: lambdaFunctionName,
         ZipFile: props.lambdaZip
       })
     );
+    await waitForLambdaReady(props.lambdaClient, lambdaFunctionName);
     await props.lambdaClient.send(
       new UpdateFunctionConfigurationCommand({
         FunctionName: lambdaFunctionName,
@@ -565,6 +567,7 @@ async function runRemoteUpgrade(input) {
   const deployment = await readDeploymentFromContext();
   const lambdaZip = await readLambdaZip();
   input.logger.log(`Updating Lambda function code: ${deployment.lambdaArn}`);
+  await waitForLambdaReady(input.lambdaClient, deployment.lambdaArn);
   const updateResult = await input.lambdaClient.send(
     new UpdateFunctionCodeCommand({
       FunctionName: deployment.lambdaArn,
@@ -909,11 +912,35 @@ async function createNewPermissionSet(props) {
   return permissionSetArn;
 }
 async function readLambdaZip() {
+  const thisFile = fileURLToPath(import.meta.url);
+  const packageDir = dirname(dirname(dirname(thisFile)));
+  const zipPath = join(packageDir, "dist-lambda", "lambda.zip");
   try {
-    return await readFile(resolve(lambdaZipPath));
+    return await readFile(zipPath);
   } catch {
-    throw new Error("dist-lambda/lambda.zip not found. Run `npm run build:lambda` first.");
+    throw new Error(
+      `Lambda zip not found at ${zipPath}. The package may be corrupted \u2014 try reinstalling @beesolve/aws-accounts.`
+    );
+  }
+}
+async function waitForLambdaReady(lambdaClient, functionName) {
+  const maxAttempts = 30;
+  for (let i = 0; i < maxAttempts; i++) {
+    const response = await lambdaClient.send(
+      new GetFunctionCommand({ FunctionName: functionName })
+    );
+    const lastUpdateStatus = response.Configuration?.LastUpdateStatus;
+    if (lastUpdateStatus === "Successful" || lastUpdateStatus === void 0) {
+      return;
+    }
+    if (lastUpdateStatus === "Failed") {
+      throw new Error(
+        `Lambda function update failed: ${response.Configuration?.LastUpdateStatusReason ?? "unknown reason"}`
+      );
+    }
+    await delay(2e3);
   }
+  throw new Error("Timed out waiting for Lambda function to become ready.");
 }
 export {
   runRemoteApply,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beesolve/aws-accounts",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "AWS Organizations and IAM Identity Center management CLI",
   "main": "dist/cli.js",
   "bin": {