@anthusai/papyrus 1.18.0-next.2 → 1.18.0-next.4

package/bin/papyrus-infra.mjs

@@ -85,7 +85,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", "335163751677"), region: opt("region", "us-east-1") },
+    env: { account: opt("account", process.env.CDK_DEFAULT_ACCOUNT ?? "335163751677"), region: opt("region", process.env.CDK_DEFAULT_REGION ?? "us-east-1") },
     stackName: "github-oidc-provider",
   });
   app.synth();
@@ -132,22 +132,26 @@ if (command === "deploy") {
     process.exit(0);
   }
   const outputDirectory = path.resolve(opt("out", process.env.CDK_OUTDIR ?? "cdk.out"));
-  const synthCommand = [
+  const explicitAccount = opt("account");
+  const explicitRegion = opt("region");
+  const synthesis = spawnSync(
     process.execPath,
-    path.resolve(process.argv[1]),
-    "synth",
-    "--site",
-    path.resolve(opt("site", "infra/site.json")),
-    "--out",
-    outputDirectory,
-    "--account",
-    opt("account", process.env.CDK_DEFAULT_ACCOUNT ?? "335163751677"),
-    "--region",
-    opt("region", process.env.CDK_DEFAULT_REGION ?? "us-east-1"),
-  ].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", `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 +168,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", "335163751677"), region: opt("region", "us-east-1") },
+  env: { account: opt("account", process.env.CDK_DEFAULT_ACCOUNT ?? "335163751677"), region: opt("region", process.env.CDK_DEFAULT_REGION ?? "us-east-1") },
   stackName: resolveStackName(config),
 });
 app.synth();

package/package.json

@@ -379,7 +379,7 @@
       "optional": true
     }
   },
-  "version": "1.18.0-next.2",
+  "version": "1.18.0-next.4",
   "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.2",
+  "version": "1.18.0-next.4",
   "routes": [
     {
       "file": "app/%5F_preview/[[...path]]/route.ts",

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);