cloudmason2 2.0.202609012352 → 2.1.0

package/commands/update_app.js

@@ -83,10 +83,18 @@ exports.main = async function(args){
     }
 
     // --- IV UPLOAD STACK ---
-    // Only alteration to the template: set the AmiId parameter's Default to the new AMI
+    // Two alterations to the template: the Build.App.Version mapping gets the full version so the
+    // stack can hand it to the app, and the AmiId parameter's Default is set to the new AMI
     let finalStack = stackText;
+    const buildVersion = setBuildVersion(finalStack, fullVersion);
+    finalStack = buildVersion.text;
+    if (buildVersion.updated){
+        console.log(`Set Mappings.Build.App.Version to ${fullVersion}`);
+    } else {
+        console.log('No Mappings.Build.App.Version in stack. Version not stamped');
+    }
     if (ami_id){
-        const amiDefault = setAmiDefault(stackText, ami_id);
+        const amiDefault = setAmiDefault(finalStack, ami_id);
         finalStack = amiDefault.text;
         if (amiDefault.updated){
             console.log(`Set AmiId parameter Default to ${ami_id}`);
@@ -271,6 +279,41 @@ function setAmiDefault(stackText, amiId){
     return { text: lines.join('\n'), updated: true };
 }
 
+// Set Mappings.Build.App.Version to the full version, touching nothing else in the template.
+// A mapping rather than a parameter because a stack update keeps previous parameter values
+// (launch passes UsePreviousValue, the console pre-fills them) while a mapping is always read
+// from the template being deployed. Apps read it in UserData with !FindInMap [Build, App, Version].
+// JSON templates are parsed; YAML templates get a single-line text edit.
+function setBuildVersion(stackText, version){
+    if (stackText.trim().startsWith('{')){
+        const tpl = JSON.parse(stackText);
+        if (!tpl.Mappings || !tpl.Mappings.Build || !tpl.Mappings.Build.App){ return { text: stackText, updated: false } }
+        tpl.Mappings.Build.App.Version = version;
+        return { text: JSON.stringify(tpl, null, 4), updated: true };
+    }
+
+    const lines = stackText.split(/\r?\n/);
+    // Walk Mappings -> Build -> App -> Version: each key sits inside the previous one's block,
+    // which ends at the first line indented at or above the parent key
+    let line = lines.findIndex(l=>{ return /^Mappings:\s*(#.*)?$/.test(l) });
+    if (line === -1){ return { text: stackText, updated: false } }
+    let indent = 0;
+    for (const key of ['Build', 'App', 'Version']){
+        let found = -1;
+        for (let i=line+1; i<lines.length; i++){
+            if (lines[i].trim() === '' || /^\s*#/.test(lines[i])){ continue }
+            const lineIndent = lines[i].match(/^\s*/)[0].length;
+            if (lineIndent <= indent){ break }
+            if (new RegExp(`^\\s+${key}:`).test(lines[i])){ found = i; indent = lineIndent; break }
+        }
+        if (found === -1){ return { text: stackText, updated: false } }
+        line = found;
+    }
+    // Quote the value: the timestamp segment makes it look like a number to YAML otherwise
+    lines[line] = lines[line].replace(/^(\s+Version:).*$/, `$1 '${version}'`);
+    return { text: lines.join('\n'), updated: true };
+}
+
 async function putManifest(s3, bucket, appPrefix, manifest){
     await s3.send(new PutObjectCommand({
         Bucket: bucket,

package/package.json

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