cloudmason2 2.0.0 → 2.0.202609012352

package/commands/index.html

@@ -185,10 +185,14 @@ class MasonApp extends ELMNT
 
     static VersionRow(v){
         const mm = v.version.split('.').slice(0, 2).join('.');
+        // Buyers upgrade with upgrade.yaml. Older manifests predate upgrade_url,
+        // so fall back to deriving it from stack_url (publish guarantees it exists
+        // for every published version)
+        const url = v.upgrade_url || (v.stack_url || '').replace(/stack\.yaml$/, 'upgrade.yaml');
         return `<div class="row">
             <span class="ver">v${mm}<span class="full">${v.version}</span></span>
             <span class="date">${MasonApp.#FormatDate(v.publish_date)}</span>
-            <button class="copy" data-url="${v.stack_url || ''}" aria-label="Copy Cloudformation Stack URL">
+            <button class="copy" data-url="${url}" aria-label="Copy Cloudformation Stack URL">
                 <svg class="ic-copy" viewBox="0 0 32 32" width="16" height="16" fill="currentColor" aria-hidden="true"><path d="M28,10V28H10V10H28m0-2H10a2,2,0,0,0-2,2V28a2,2,0,0,0,2,2H28a2,2,0,0,0,2-2V10a2,2,0,0,0-2-2Z"/><path d="M4,18H2V4A2,2,0,0,1,4,2H18V4H4Z"/></svg>
                 <svg class="ic-check" viewBox="0 0 32 32" width="16" height="16" fill="currentColor" aria-hidden="true"><path d="M13 24l-9-9 1.41-1.41L13 21.17 26.59 7.59 28 9 13 24z"/></svg>
             </button>

package/commands/publish.js

@@ -31,6 +31,38 @@ exports.main = async function(args){
     const fullVersion = version.version;
     const vFolder = fullVersion.split('.').slice(0, 2).join('.'); // storage folder is major.minor
 
+    // --- REPAIR MODE ---
+    // -repair [true|false]: rebuild upgrade.yaml from the current stack and set the
+    // manifest published flag (default true), without contacting the marketplace
+    if (args.repair !== undefined){
+        if (args.repair !== null && args.repair !== 'true' && args.repair !== 'false'){
+            throw new Error('-repair accepts true or false');
+        }
+        const publishedValue = args.repair !== 'false';
+        if (!manifest.productId){ throw new Error('Missing productId in manifest. Run update-listing -pid') }
+
+        const rStackKey = `${appPrefix}/versions/${vFolder}/stack.yaml`;
+        const rStackText = await getFileText(s3, bucket, rStackKey);
+        if (rStackText === null){ throw new Error('No stack found for v' + fullVersion) }
+        const rAlias = `resolve:ssm:/aws/service/marketplace/${manifest.productId}/${fullVersion.toLowerCase()}`;
+        const rUpgradeKey = `${appPrefix}/versions/${vFolder}/upgrade.yaml`;
+        await s3.send(new PutObjectCommand({
+            Bucket: bucket,
+            Key: rUpgradeKey,
+            Body: buildUpgradeTemplate(rStackText, rAlias),
+            ContentType: Mime.contentType(rUpgradeKey)
+        }));
+        console.log(`Rebuilt upgrade template s3://${bucket}/${rUpgradeKey}`);
+
+        version.published = publishedValue;
+        version.upgrade_url = `https://${bucket}.s3.${cfg.region}.amazonaws.com/${rUpgradeKey}`;
+        if (publishedValue && !version.publish_date){ version.publish_date = new Date().toISOString() }
+        await putManifest(s3, bucket, appPrefix, manifest);
+        console.log(`Set published: ${publishedValue} for v${fullVersion}`);
+        return true;
+    }
+    if (!args.desc){ throw new Error('Missing required arg desc') }
+
     // --- I CHECK REQUIRED FIELDS ---
     const role = await getMarketplaceRole(bucket);
     if (!role){ throw new Error('No marketplace access role found for this CDN. Run create-cdn first') }
@@ -116,6 +148,7 @@ exports.main = async function(args){
     if (version.published !== true){
         version.published = true;
         version.publish_date = new Date().toISOString();
+        version.upgrade_url = `https://${bucket}.s3.${cfg.region}.amazonaws.com/${upgradeKey}`;
         await putManifest(s3, bucket, appPrefix, manifest);
         console.log(`Marked v${version.version} published in manifest`);
     } else {

package/main.js

@@ -85,9 +85,10 @@ const Commands = {
         exec: require('./commands/publish').main,
         args: [
             {n: 'app', desc: 'Name of existing app', pattern: `^[A-Za-z]{2,20}$`, r: true},
-            {n: 'desc', desc: 'Description of Changes', r: true},
+            {n: 'desc', desc: 'Description of Changes (required except with -repair)', r: false},
             {n: 'v', desc: 'Version to launch', pattern: `[0-9]{1,20}`, r: true},
-            {n: 'await', desc: 'Wait for marketplace processing to complete (up to 90m)', r: false}
+            {n: 'await', desc: 'Wait for marketplace processing to complete (up to 90m)', r: false},
+            {n: 'repair', desc: 'Rebuild upgrade.yaml and set published true/false (default true) without contacting the marketplace', pattern: `^true$|^false$`, r: false}
         ]
     },
     /////

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudmason2",
-  "version": "2.0.0",
+  "version": "2.0.202609012352",
   "description": "",
   "main": "main.js",
   "files": [