@deployfoundation/foundation-deploy 0.1.1 → 0.1.2

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

package/package.json

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

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