@beesolve/aws-accounts 1.0.4 → 1.0.6

package/dist/commands/remote.js

@@ -116,7 +116,11 @@ async function runRemoteBootstrap(input) {
     resolvedRegion,
     logger: input.logger
   });
-  const context = await readAwsContextFromFile(contextFilePath);
+  let context = null;
+  try {
+    context = await readAwsContextFromFile(contextFilePath);
+  } catch {
+  }
   const deployment = {
     profile: input.profile ?? "",
     region: resolvedRegion,
@@ -124,8 +128,11 @@ async function runRemoteBootstrap(input) {
     stateBucketName: bucketName,
     stateCacheTtlSeconds: 300
   };
-  const updatedContext = {
-    ...context,
+  const updatedContext = context != null ? { ...context, deployment } : {
+    version: "1",
+    generatedAt: (/* @__PURE__ */ new Date()).toISOString(),
+    organization: { managementAccountId: accountId, rootId: "pending", graveyardOuId: "pending" },
+    identityCenter: { instanceArn: "pending", identityStoreId: "pending" },
     deployment
   };
   const ordered = {
@@ -138,7 +145,7 @@ async function runRemoteBootstrap(input) {
   await writeFile(contextFilePath, `${JSON.stringify(ordered, null, 2)}
 `, "utf8");
   const instanceArn = updatedContext.identityCenter?.instanceArn;
-  if (instanceArn != null && instanceArn !== "") {
+  if (instanceArn != null && instanceArn !== "" && instanceArn !== "pending") {
     await ensureOrganizationManagementPermissionSet({
       ssoAdminClient: input.ssoAdminClient,
       instanceArn,
@@ -420,6 +427,31 @@ async function runRemoteInit(input) {
     writeStateCache(cachePath, response.state)
   ]);
   input.logger.log("State written to state.json and cache updated.");
+  const context = await readAwsContextFromFile(contextFilePath);
+  const graveyardOu = response.state.organization.organizationalUnits.find(
+    (ou) => ou.name === "Graveyard"
+  );
+  const updatedContext = {
+    ...context,
+    organization: {
+      managementAccountId: context.organization.managementAccountId,
+      rootId: response.state.organization.rootId,
+      graveyardOuId: graveyardOu?.id ?? context.organization.graveyardOuId
+    },
+    identityCenter: {
+      instanceArn: response.state.identityCenter.instanceArn,
+      identityStoreId: response.state.identityCenter.identityStoreId
+    }
+  };
+  const ordered = {
+    version: updatedContext.version,
+    generatedAt: (/* @__PURE__ */ new Date()).toISOString(),
+    organization: updatedContext.organization,
+    identityCenter: updatedContext.identityCenter,
+    deployment: updatedContext.deployment
+  };
+  await writeFile(contextFilePath, `${JSON.stringify(ordered, null, 2)}
+`, "utf8");
   const configWriteResult = await writeAwsConfigFromState({
     statePath,
     contextPath: contextFilePath,

package/package.json

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