@anthusai/papyrus 1.18.0-next.3 → 1.18.0-next.5

package/bin/papyrus-infra.mjs

@@ -12,6 +12,7 @@ import fs from "node:fs";
 import { spawnSync } from "node:child_process";
 import path from "node:path";
 import { createRequire } from "node:module";
+import { resolveCdkEnvironment } from "../src/cdk-environment.mjs";
 
 const USAGE = [
   "Usage: papyrus-infra synth --site infra/site.json [--out cdk.out] [--account A] [--region R]",
@@ -26,6 +27,14 @@ const opt = (name, fallback) => {
   const i = args.indexOf(`--${name}`);
   return i >= 0 ? args[i + 1] : fallback;
 };
+const resolveEnvironmentOrExit = () => {
+  try {
+    return resolveCdkEnvironment({ explicitAccount: opt("account"), explicitRegion: opt("region") });
+  } catch (error) {
+    console.error(`papyrus-infra: ${error instanceof Error ? error.message : error}`);
+    process.exit(1);
+  }
+};
 const command = args[0];
 if (command !== "synth" && command !== "print-buildspec" && command !== "deploy" && command !== "deploy-edge") {
   console.error(USAGE);
@@ -85,7 +94,7 @@ if (accountStack !== undefined) {
   const { App } = createRequire(path.join(process.cwd(), "noop.js"))("aws-cdk-lib");
   const app = new App({ outdir: path.resolve(opt("out", "cdk.out")) });
   new GithubOidcProviderStack(app, "GithubOidcProviderStack", {
-    env: { account: opt("account", process.env.CDK_DEFAULT_ACCOUNT ?? "335163751677"), region: opt("region", process.env.CDK_DEFAULT_REGION ?? "us-east-1") },
+    env: resolveEnvironmentOrExit(),
     stackName: "github-oidc-provider",
   });
   app.synth();
@@ -134,20 +143,24 @@ if (command === "deploy") {
   const outputDirectory = path.resolve(opt("out", process.env.CDK_OUTDIR ?? "cdk.out"));
   const explicitAccount = opt("account");
   const explicitRegion = opt("region");
-  const synthCommand = [
+  const synthesis = spawnSync(
     process.execPath,
-    path.resolve(process.argv[1]),
-    "synth",
-    "--site",
-    path.resolve(opt("site", "infra/site.json")),
-    "--out",
-    outputDirectory,
-    ...(explicitAccount ? ["--account", explicitAccount] : []),
-    ...(explicitRegion ? ["--region", explicitRegion] : []),
-  ].map((part) => JSON.stringify(part)).join(" ");
+    [
+      path.resolve(process.argv[1]),
+      "synth",
+      "--site",
+      path.resolve(opt("site", "infra/site.json")),
+      "--out",
+      outputDirectory,
+      ...(explicitAccount ? ["--account", explicitAccount] : []),
+      ...(explicitRegion ? ["--region", explicitRegion] : []),
+    ],
+    { stdio: "inherit" },
+  );
+  if (synthesis.status !== 0) process.exit(synthesis.status ?? 1);
   const deployment = spawnSync(
     "npx",
-    ["--yes", "aws-cdk@2", "deploy", "--app", synthCommand, "--require-approval", "never", "--output", outputDirectory, `AmplifyAppShell-${config.siteId}`],
+    ["--yes", "aws-cdk@2", "deploy", "--app", outputDirectory, "--require-approval", "never", `AmplifyAppShell-${config.siteId}`],
     { stdio: "inherit" },
   );
   process.exit(deployment.status ?? 1);
@@ -164,7 +177,7 @@ try {
 const { App } = createRequire(path.join(process.cwd(), "noop.js"))("aws-cdk-lib");
 const app = new App({ outdir: path.resolve(opt("out", "cdk.out")) });
 new AmplifyAppShellStack(app, `AmplifyAppShell-${config.siteId}`, config, {
-  env: { account: opt("account", process.env.CDK_DEFAULT_ACCOUNT ?? "335163751677"), region: opt("region", process.env.CDK_DEFAULT_REGION ?? "us-east-1") },
+  env: resolveEnvironmentOrExit(),
   stackName: resolveStackName(config),
 });
 app.synth();

package/package.json

@@ -379,7 +379,7 @@
       "optional": true
     }
   },
-  "version": "1.18.0-next.3",
+  "version": "1.18.0-next.5",
   "dependencies": {
     "@aws-amplify/adapter-nextjs": "^1.7.3",
     "@aws-crypto/sha256-js": "5.2.0",

package/routes.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.18.0-next.3",
+  "version": "1.18.0-next.5",
   "routes": [
     {
       "file": "app/%5F_preview/[[...path]]/route.ts",

package/src/cdk-environment.mjs

@@ -0,0 +1,44 @@
+import { spawnSync } from "node:child_process";
+
+const DEFAULT_REGION = "us-east-1";
+
+export function resolveCdkRegion({ explicitRegion, environment = process.env }) {
+  return (
+    explicitRegion ||
+    environment.AWS_REGION ||
+    environment.AWS_DEFAULT_REGION ||
+    environment.CDK_DEFAULT_REGION ||
+    DEFAULT_REGION
+  );
+}
+
+function callerAccountFromAwsCli() {
+  const completed = spawnSync("aws", ["sts", "get-caller-identity", "--output", "json"], { encoding: "utf8" });
+  if (completed.error) throw new Error(`could not run the aws CLI: ${completed.error.message}`);
+  if (completed.status !== 0) throw new Error(String(completed.stderr || completed.stdout).trim() || `aws exited with status ${completed.status}`);
+  return JSON.parse(completed.stdout).Account;
+}
+
+export function resolveCdkAccount({ explicitAccount, environment = process.env, lookupCallerAccount = callerAccountFromAwsCli }) {
+  if (explicitAccount) return explicitAccount;
+  if (environment.CDK_DEFAULT_ACCOUNT) return environment.CDK_DEFAULT_ACCOUNT;
+  let account;
+  try {
+    account = lookupCallerAccount();
+  } catch (error) {
+    throw new Error(
+      `cannot determine the AWS account: pass --account, set CDK_DEFAULT_ACCOUNT, or provide credentials for "aws sts get-caller-identity" (${error instanceof Error ? error.message : error})`,
+    );
+  }
+  if (!/^\d{12}$/.test(String(account))) {
+    throw new Error(`cannot determine the AWS account: "aws sts get-caller-identity" returned ${JSON.stringify(account)}; pass --account or set CDK_DEFAULT_ACCOUNT`);
+  }
+  return String(account);
+}
+
+export function resolveCdkEnvironment({ explicitAccount, explicitRegion, environment = process.env, lookupCallerAccount }) {
+  return {
+    account: resolveCdkAccount({ explicitAccount, environment, lookupCallerAccount }),
+    region: resolveCdkRegion({ explicitRegion, environment }),
+  };
+}

package/src/edge-stack-deploy.mjs

@@ -25,15 +25,22 @@ function logicalIdsInStack(stackName, region) {
   return new Set(JSON.parse(completed.stdout).StackResourceSummaries.map((summary) => summary.LogicalResourceId));
 }
 
-function templateParameterFlags(parameterValues, templateFile) {
+function parameterNamesInStack(stackName, region) {
+  const completed = runAws(["cloudformation", "describe-stacks", "--stack-name", stackName, "--region", region, "--output", "json"], { allowFailure: true });
+  if (completed.status !== 0) return new Set();
+  const stack = JSON.parse(completed.stdout).Stacks?.[0];
+  return new Set((stack?.Parameters ?? []).map((parameter) => parameter.ParameterKey));
+}
+
+function templateParameterFlags(parameterValues, templateFile, parameterNamesInStackNow) {
   const templateText = fs.readFileSync(templateFile, "utf8");
   const parametersSection = templateText.split("\nResources:")[0].split("\nParameters:\n")[1] ?? "";
   const parameterNames = [...parametersSection.matchAll(/^  ([A-Za-z0-9]+):\s*$/gm)].map((match) => match[1]);
-  return parameterNames.map((name) =>
-    name in parameterValues
-      ? `ParameterKey=${name},ParameterValue=${parameterValues[name]}`
-      : `ParameterKey=${name},UsePreviousValue=true`,
-  );
+  return parameterNames.flatMap((name) => {
+    if (name in parameterValues) return [`ParameterKey=${name},ParameterValue=${parameterValues[name]}`];
+    if (parameterNamesInStackNow.has(name)) return [`ParameterKey=${name},UsePreviousValue=true`];
+    return [];
+  });
 }
 
 export function applyChangeSet({ stackName, region, templateFile, parameterValues, adoptions }) {
@@ -47,7 +54,7 @@ export function applyChangeSet({ stackName, region, templateFile, parameterValue
     "--template-body", `file://${path.resolve(templateFile)}`,
     "--capabilities", "CAPABILITY_IAM",
     "--region", region,
-    "--parameters", ...templateParameterFlags(parameterValues, templateFile),
+    "--parameters", ...templateParameterFlags(parameterValues, templateFile, parameterNamesInStack(stackName, region)),
   ];
   if (adoptions) createArguments.push("--resources-to-import", JSON.stringify(adoptions));
   runAws(createArguments);