chore: Revert compartment-map.json tags to conditions schema migration (

#2389) Refs: #2388 ## Description See #2388, we cannot at this time change the schema of `compartment-map.json` as I attempted in #2373 ### Security Considerations None. ### Scaling Considerations None. ### Documentation Considerations None. ### Testing Considerations None. ### Compatibility Considerations Restores backward compatibility for production systems. The file `app.agar` is a zip file generated by a previous version of the compartment mapper, used as a test fixture to verify that future versions can import ancient versions. To get tests passing in #2373, I regenerated `app.agar` and in this change, I revert it to the original schema. Having to regenerate `app.agar` is supposed to be a hint that something is broken, and I waltzed through the warnings. ### Upgrade Considerations None.
endojs · Jul 30, 2024 · 609a3bf · 609a3bf
2 parents b145fe1 + fd2a393
commit 609a3bf
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 13 deletions.
diff --git a/packages/bundle-source/cache.js b/packages/bundle-source/cache.js
@@ -52,7 +52,6 @@ export const makeBundleCache = (wr, cwd, readPowers, opts) => {
    * @param {Logger} [log]
    * @param {object} [options]
    * @param {boolean} [options.noTransforms]
-   * @param {string[]} [options.tags]
    * @param {string[]} [options.conditions]
    * @param {ModuleFormat} [options.format]
    */
@@ -154,7 +153,6 @@ export const makeBundleCache = (wr, cwd, readPowers, opts) => {
    * @param {object} [options]
    * @param {boolean} [options.noTransforms]
    * @param {ModuleFormat} [options.format]
-   * @param {string[]} [options.tags]
    * @param {string[]} [options.conditions]
    * @returns {Promise<BundleMeta>}
    */

diff --git a/packages/bundle-source/src/zip-base64.js b/packages/bundle-source/src/zip-base64.js
@@ -22,7 +22,7 @@ const readPowers = makeReadPowers({ fs, url, crypto });
  * @param {boolean} [options.dev]
  * @param {boolean} [options.cacheSourceMaps]
  * @param {boolean} [options.noTransforms]
- * @param {string[]} [options.condditions]
+ * @param {string[]} [options.conditions]
  * @param {Record<string, string>} [options.commonDependencies]
  * @param {object} [grantedPowers]
  * @param {(bytes: string | Uint8Array) => string} [grantedPowers.computeSha512]

diff --git a/packages/compartment-mapper/README.md b/packages/compartment-mapper/README.md
@@ -380,7 +380,7 @@ The compartment map shape:
 // CompartmentMap describes how to prepare compartments
 // to run an application.
 type CompartmentMap = {
-  conditions: Conditions,
+  tags: Conditions,
   entry: Entry,
   compartments: Record<CompartmentName, Compartment>,
   realms: Record<RealmName, Realm>, // TODO

diff --git a/packages/compartment-mapper/src/archive-lite.js b/packages/compartment-mapper/src/archive-lite.js
@@ -281,7 +281,9 @@ export const makeArchiveCompartmentMap = (compartmentMap, sources) => {
   const archiveSources = renameSources(sources, compartmentRenames);
 
   const archiveCompartmentMap = {
-    conditions: [],
+    // TODO migrate tags to conditions
+    // https://github.com/endojs/endo/issues/2388
+    tags: [],
     entry: {
       compartment: archiveEntryCompartmentName,
       module: entryModuleSpecifier,

diff --git a/packages/compartment-mapper/src/bundle.js b/packages/compartment-mapper/src/bundle.js
@@ -224,8 +224,8 @@ export const makeBundle = async (readPowers, moduleLocation, options) => {
   const {
     moduleTransforms,
     dev,
-    tags,
-    conditions: conditionsOption = tags,
+    tags: tagsOption,
+    conditions: conditionsOption = tagsOption,
     searchSuffixes,
     commonDependencies,
     sourceMapHook = undefined,

diff --git a/packages/compartment-mapper/src/capture-lite.js b/packages/compartment-mapper/src/capture-lite.js
@@ -227,7 +227,9 @@ const captureCompartmentMap = (compartmentMap, sources) => {
   const captureSources = renameSources(sources, compartmentRenames);
 
   const captureCompartmentMap = {
-    conditions: [],
+    // TODO graceful migration from tags to conditions
+    // https://github.com/endojs/endo/issues/2388
+    tags: [],
     entry: {
       compartment: captureEntryCompartmentName,
       module: entryModuleSpecifier,

diff --git a/packages/compartment-mapper/src/compartment-map.js b/packages/compartment-mapper/src/compartment-map.js
@@ -481,8 +481,9 @@ export const assertCompartmentMap = (
     )}`,
   );
   const {
-    tags,
-    conditions = tags,
+    // TODO migrate tags to conditions
+    // https://github.com/endojs/endo/issues/2388
+    tags: conditions,
     entry,
     compartments,
     ...extra

diff --git a/packages/compartment-mapper/src/node-modules.js b/packages/compartment-mapper/src/node-modules.js
@@ -728,7 +728,9 @@ const translateGraph = (
   }
 
   return {
-    conditions: [...conditions],
+    // TODO graceful migration from tags to conditions
+    // https://github.com/endojs/endo/issues/2388
+    tags: [...conditions],
     entry: {
       compartment: entryPackageLocation,
       module: entryModuleSpecifier,

diff --git a/packages/compartment-mapper/src/types.js b/packages/compartment-mapper/src/types.js
@@ -17,8 +17,7 @@ export {};
  * Compartments, each corresponding to Node.js style packaged modules.
  *
  * @typedef {object} CompartmentMapDescriptor
- * @property {Array<string>} [tags] is deprecated in favor of `conditions`
- * @property {Array<string>} conditions
+ * @property {Array<string>} tags
  * @property {EntryDescriptor} entry
  * @property {Record<string, CompartmentDescriptor>} compartments
  */

diff --git a/packages/compartment-mapper/test/app.agar b/packages/compartment-mapper/test/app.agar