cloudmason2 1.2.0 → 1.3.0

package/commands/launch_app.js

@@ -1,4 +1,4 @@
-const { CloudFormationClient, CreateStackCommand, UpdateStackCommand, DescribeStacksCommand } = require('@aws-sdk/client-cloudformation');
+const { CloudFormationClient, CreateStackCommand, UpdateStackCommand, DescribeStacksCommand, GetTemplateSummaryCommand } = require('@aws-sdk/client-cloudformation');
 const { EC2Client, DescribeImagesCommand, CopyImageCommand } = require('@aws-sdk/client-ec2');
 const { S3Client } = require("@aws-sdk/client-s3");
 const OrgConfig = require('./helpers/org_config');
@@ -44,12 +44,31 @@ exports.main = async function(args){
     }
 
     // --- II DEPLOY CF STACK ---
-    // CF params: AmiId from the manifest version (unless noami) + any extra CLI args.
-    // No previous values are reused
-    const cfParams = manifest.noami ? [] : [{ ParameterKey: 'AmiId', ParameterValue: amiId }];
+    const client = new CloudFormationClient({ region: args.region });
+    const existing = await getStack(client, stackName);
+
+    // CLI-provided params: AmiId from the manifest version (unless noami) + any extra CLI args
+    const cliParams = {};
     Object.keys(args).forEach(k=>{
         if (CLI_ARGS.includes(k) || k === 'AmiId'){ return }
-        cfParams.push({ ParameterKey: k, ParameterValue: args[k] });
+        cliParams[k] = args[k];
+    });
+    if (!manifest.noami){ cliParams.AmiId = amiId }
+
+    // On update, carry forward previous stack values unless overridden on the CLI,
+    // dropping any that are no longer declared in the new template.
+    // UsePreviousValue avoids round-tripping NoEcho params (which read back masked)
+    const cfParams = [];
+    if (existing){
+        const templateKeys = await getTemplateKeys(client, targetVersion.stack_url);
+        existing.parameters.forEach(p=>{
+            if (!templateKeys.has(p.ParameterKey)){ return }
+            if (cliParams[p.ParameterKey] !== undefined){ return }
+            cfParams.push({ ParameterKey: p.ParameterKey, UsePreviousValue: true });
+        });
+    }
+    Object.keys(cliParams).forEach(k=>{
+        cfParams.push({ ParameterKey: k, ParameterValue: cliParams[k] });
     });
 
     const input = {
@@ -67,17 +86,15 @@ exports.main = async function(args){
     };
 
     // Create if the stack doesn't exist, update if it does
-    const client = new CloudFormationClient({ region: args.region });
-    const status = await stackStatus(client, stackName);
     let stackId;
-    if (status === null){
+    if (existing === null){
         console.log(`Creating stack ${stackName}`);
         input.OnFailure = 'DELETE';
         const r = await client.send(new CreateStackCommand(input));
         stackId = r.StackId;
     } else {
-        if (status.endsWith('_IN_PROGRESS')){
-            console.log(`Stack ${stackName} is ${status}. Wait for completion before relaunching`);
+        if (existing.status.endsWith('_IN_PROGRESS')){
+            console.log(`Stack ${stackName} is ${existing.status}. Wait for completion before relaunching`);
             throw new Error('Stack operation in progress');
         }
         console.log(`Updating stack ${stackName}`);
@@ -143,13 +160,18 @@ async function waitForAMI(amiId, region){
     throw new Error('AMI not available after 20 minutes. Try again in a few minutes.');
 }
 
-async function stackStatus(client, stackName){
+async function getStack(client, stackName){
     try {
         const r = await client.send(new DescribeStacksCommand({ StackName: stackName }));
-        return r.Stacks[0].StackStatus;
+        return { status: r.Stacks[0].StackStatus, parameters: r.Stacks[0].Parameters || [] };
     } catch (e){
         if (e.name === 'ValidationError'){ return null }
         throw e;
     }
 }
 
+async function getTemplateKeys(client, templateUrl){
+    const r = await client.send(new GetTemplateSummaryCommand({ TemplateURL: templateUrl }));
+    return new Set((r.Parameters || []).map(p=>{ return p.ParameterKey }));
+}
+

package/commands/update_assets.js

@@ -0,0 +1,80 @@
+const fs = require('fs');
+const path = require('path');
+const { S3Client, PutObjectCommand } = require("@aws-sdk/client-s3");
+const OrgConfig = require('./helpers/org_config');
+const Apps = require('./helpers/apps');
+
+const CONTENT_TYPES = {
+    '.html': 'text/html', '.css': 'text/css', '.js': 'application/javascript',
+    '.json': 'application/json', '.txt': 'text/plain', '.md': 'text/markdown',
+    '.png': 'image/png', '.jpg': 'image/jpeg', '.jpeg': 'image/jpeg', '.gif': 'image/gif',
+    '.svg': 'image/svg+xml', '.ico': 'image/x-icon', '.csv': 'text/csv',
+    '.yaml': 'text/yaml', '.yml': 'text/yaml', '.zip': 'application/zip', '.pdf': 'application/pdf'
+};
+
+// update-assets: upload a file or folder to the app's cdn folder
+exports.main = async function(args){
+    const cfg = OrgConfig.read();
+    if (!cfg){ throw new Error('No org config found. Run set-org') }
+    const { bucket, prefix } = parseCdn(cfg.cdn);
+    const s3 = new S3Client({ region: cfg.region });
+
+    const app = await Apps.resolveApp(s3, bucket, prefix, args.app.toLowerCase());
+    if (!app){ throw new Error('No app named ' + args.app + '. Run new-app') }
+
+    const srcPath = path.resolve(args.src);
+    if (!fs.existsSync(srcPath)){ throw new Error('Source path does not exist: ' + srcPath) }
+
+    const target = (args.t || '').replace(/^\/+|\/+$/g, '');
+    const base = target ? `${app.appPrefix}/${target}` : app.appPrefix;
+
+    const isFile = fs.statSync(srcPath).isFile();
+    const files = isFile ? [srcPath] : walkFiles(srcPath);
+    if (files.length === 0){ throw new Error('No files found at ' + srcPath) }
+
+    let uploaded = 0;
+    for (const f of files){
+        const rel = isFile ? path.basename(f) : path.relative(srcPath, f).split(path.sep).join('/');
+        const key = `${base}/${rel}`;
+        // The manifest is managed by commands only - never overwrite it with an asset
+        if (key === `${app.appPrefix}/manifest.json`){
+            console.log('Skipping manifest.json: managed by update-listing/update-app');
+            continue;
+        }
+        await s3.send(new PutObjectCommand({
+            Bucket: bucket,
+            Key: key,
+            Body: fs.createReadStream(f),
+            ContentType: CONTENT_TYPES[path.extname(f).toLowerCase()] || 'application/octet-stream'
+        }));
+        console.log(`Uploaded s3://${bucket}/${key}`);
+        uploaded += 1;
+    }
+    console.log(`${uploaded} file(s) uploaded`);
+    return true;
+}
+
+
+/////////////////////////////////////////
+////////////// FUNCS ////////////////////
+////////////////////////////////////////
+
+function parseCdn(cdn){
+    const p = cdn.trim().replace(/^s3:\/\//i, '').replace(/\/+$/, '');
+    const parts = p.split('/');
+    return { bucket: parts[0], prefix: parts.slice(1).join('/') };
+}
+
+function walkFiles(dir){
+    const files = [];
+    fs.readdirSync(dir, { withFileTypes: true }).forEach(e=>{
+        if (e.name.startsWith('.')){ return } // skip .DS_Store etc
+        const full = path.join(dir, e.name);
+        if (e.isDirectory()){
+            files.push(...walkFiles(full));
+        } else {
+            files.push(full);
+        }
+    });
+    return files;
+}

package/main.js

@@ -35,6 +35,15 @@ const Commands = {
             {n: 'ec2', desc: 'Instance type (default r8g.medium)', r: false}
         ]
     },
+    'update-assets': {
+        desc: 'Upload assets to the app cdn folder',
+        exec: require('./commands/update_assets').main,
+        args: [
+            {n: 'app', desc: 'Name of existing app', pattern: `^[A-Za-z]{2,20}$`, r: true},
+            {n: 'src', desc: 'Local file or folder to upload', r: true},
+            {n: 't', desc: 'Target path within the app folder (default: root, same structure as local)', r: false}
+        ]
+    },
     'update-app': {
         desc: 'Update application',
         exec: require('./commands/update_app').main,

package/package.json

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