@deployfoundation/foundation-deploy 0.1.1 → 0.1.3

package/dist/bin/foundation-deploy.js

@@ -70,10 +70,16 @@ async function unpackReleaseSkills(ctx, release) {
   const key = release.manifest?.skills.key ?? skillsKey(release.version);
   const dir = mkdtempSync(join(tmpdir(), "foundation-skills-"));
   const tarball = join(dir, "skills.tar.gz");
-  const contents = join(dir, "skills");
-  mkdirSync(contents, { recursive: true });
   await awsMutate(ctx, ["s3", "cp", `s3://${release.bucket}/${key}`, tarball]);
-  await run(["tar", "-xzf", tarball, "-C", contents], { dryRun: ctx.dryRun });
+  return await extractSkillsTarball(tarball, dir, { dryRun: ctx.dryRun });
+}
+async function extractSkillsTarball(tarball, dir, opts = {}) {
+  const contents = join(dir, "skills");
+  await run(["tar", "-xzf", tarball, "-C", dir], { dryRun: opts.dryRun });
+  if (opts.dryRun !== true && !existsSync(contents))
+    throw new Error(`${tarball} has no top-level skills/ directory`);
+  if (opts.dryRun === true)
+    mkdirSync(contents, { recursive: true });
   return contents;
 }
 
@@ -416,6 +422,10 @@ async function ensureEndpoint(runner, opts) {
   return "created";
 }
 async function promoteEndpoint(runner, opts) {
+  if (opts.dryRun !== true && await endpointState(runner, opts.id, opts.name) === undefined) {
+    await ensureEndpoint(runner, opts);
+    return;
+  }
   await runner.mutate([
     "bedrock-agentcore-control",
     "update-agent-runtime-endpoint",
@@ -1831,6 +1841,15 @@ ${USAGE}`);
   }
   if (command === "slack-manifest") {
     const paths = loadInstanceContext(resolveInstanceFilePath(args, process.env));
+    if (process.env.EVENTS_REQUEST_URL === undefined)
+      console.error([
+        "warning: EVENTS_REQUEST_URL is not set, so this manifest has NO event",
+        "subscriptions, slash commands or interactivity. Applying it to an existing",
+        "app removes them. Set EVENTS_REQUEST_URL to the <Prefix>Api stack's EventsUrl",
+        "output (commands and interactivity are derived from it) unless you are",
+        "creating the app for the first time."
+      ].join(`
+`));
     console.log(JSON.stringify(slackManifestFor(paths.instance, {
       ...process.env.EVENTS_REQUEST_URL === undefined ? {} : { EVENTS_REQUEST_URL: process.env.EVENTS_REQUEST_URL },
       ...process.env.COMMANDS_REQUEST_URL === undefined ? {} : { COMMANDS_REQUEST_URL: process.env.COMMANDS_REQUEST_URL },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deployfoundation/foundation-deploy",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "Deploys one Foundation instance from a published, signed release: the CDK app and the deploy tool.",
   "license": "UNLICENSED",
   "private": false,

package/src/deploy/cli.ts

@@ -116,6 +116,20 @@ export async function main(argv: readonly string[] = process.argv.slice(2)): Pro
   // print a banner into it; every other command announces its target first.
   if (command === "slack-manifest") {
     const paths = loadInstanceContext(resolveInstanceFilePath(args, process.env));
+    // Without the request URLs the manifest omits event subscriptions, slash
+    // commands and interactivity. That is right for creating a brand-new app,
+    // and destructive for an existing one: applying it strips the app's
+    // wiring. Say so on stderr, so stdout stays a clean manifest.
+    if (process.env.EVENTS_REQUEST_URL === undefined)
+      console.error(
+        [
+          "warning: EVENTS_REQUEST_URL is not set, so this manifest has NO event",
+          "subscriptions, slash commands or interactivity. Applying it to an existing",
+          "app removes them. Set EVENTS_REQUEST_URL to the <Prefix>Api stack's EventsUrl",
+          "output (commands and interactivity are derived from it) unless you are",
+          "creating the app for the first time.",
+        ].join("\n"),
+      );
     console.log(
       JSON.stringify(
         slackManifestFor(paths.instance, {

package/src/deploy/config-sync.ts

@@ -83,11 +83,32 @@ export async function unpackReleaseSkills(
   const key = release.manifest?.skills.key ?? skillsKey(release.version);
   const dir = mkdtempSync(join(tmpdir(), "foundation-skills-"));
   const tarball = join(dir, "skills.tar.gz");
-  const contents = join(dir, "skills");
-  mkdirSync(contents, { recursive: true });
   // `awsMutate` rather than a plain read, only so a dry run prints the copy
   // instead of performing it.
   await awsMutate(ctx, ["s3", "cp", `s3://${release.bucket}/${key}`, tarball]);
-  await run(["tar", "-xzf", tarball, "-C", contents], { dryRun: ctx.dryRun });
+  return await extractSkillsTarball(tarball, dir, { dryRun: ctx.dryRun });
+}
+
+/**
+ * Unpack a release's `skills.tar.gz` and return the directory holding the
+ * skills themselves.
+ *
+ * `release-build` runs `tar -czf skills.tar.gz skills`, so the archive's top
+ * level is a `skills/` directory. It is extracted INTO `dir`, landing at
+ * `dir/skills`. v0.1.0 and v0.1.1 extracted into `dir/skills` instead, which
+ * produced `dir/skills/skills/…` and synced every product skill to
+ * `s3://…/skills/skills/`, one level below where the agent looks — so a release
+ * deploy silently shipped no product skills at all.
+ */
+export async function extractSkillsTarball(
+  tarball: string,
+  dir: string,
+  opts: { dryRun?: boolean } = {},
+): Promise<string> {
+  const contents = join(dir, "skills");
+  await run(["tar", "-xzf", tarball, "-C", dir], { dryRun: opts.dryRun });
+  if (opts.dryRun !== true && !existsSync(contents))
+    throw new Error(`${tarball} has no top-level skills/ directory`);
+  if (opts.dryRun === true) mkdirSync(contents, { recursive: true });
   return contents;
 }

package/src/deploy/endpoint.ts

@@ -140,11 +140,25 @@ export async function ensureEndpoint(
   return "created";
 }
 
-/** Point an existing endpoint at `version` and wait for it to be READY there. */
+/**
+ * Point the endpoint at `version` and wait for it to be READY there, creating
+ * it at that version when it does not exist yet.
+ *
+ * Only `setup` used to create `live`; `deploy` and `post-deploy` could only
+ * update it. An instance brought up the documented way, `foundation-deploy
+ * deploy` from npm, therefore reached promotion with no `live` to update, and
+ * the gateway's invoker, which calls `live`, had nothing to call: the first
+ * Slack message after a fresh install would have failed. Found by migrating
+ * Olivia.
+ */
 export async function promoteEndpoint(
   runner: EndpointRunner,
   opts: EndpointOptions,
 ): Promise<void> {
+  if (opts.dryRun !== true && (await endpointState(runner, opts.id, opts.name)) === undefined) {
+    await ensureEndpoint(runner, opts);
+    return;
+  }
   await runner.mutate([
     "bedrock-agentcore-control",
     "update-agent-runtime-endpoint",