cloudmason2 1.4.0 → 1.5.0

package/commands/helpers/mime.js

@@ -0,0 +1,36 @@
+const path = require('path');
+
+const TYPES = {
+    '.html': 'text/html',
+    '.css': 'text/css',
+    '.js': 'application/javascript',
+    '.mjs': 'application/javascript',
+    '.json': 'application/json',
+    '.txt': 'text/plain',
+    '.md': 'text/markdown',
+    '.csv': 'text/csv',
+    '.xml': 'application/xml',
+    '.yaml': 'text/yaml',
+    '.yml': 'text/yaml',
+    '.png': 'image/png',
+    '.jpg': 'image/jpeg',
+    '.jpeg': 'image/jpeg',
+    '.gif': 'image/gif',
+    '.svg': 'image/svg+xml',
+    '.webp': 'image/webp',
+    '.ico': 'image/x-icon',
+    '.woff': 'font/woff',
+    '.woff2': 'font/woff2',
+    '.ttf': 'font/ttf',
+    '.otf': 'font/otf',
+    '.mp4': 'video/mp4',
+    '.webm': 'video/webm',
+    '.pdf': 'application/pdf',
+    '.zip': 'application/zip',
+    '.gz': 'application/gzip'
+};
+
+// Content type from a file path or s3 key
+exports.contentType = function(p){
+    return TYPES[path.extname(p).toLowerCase()] || 'application/octet-stream';
+}

package/commands/index.html

@@ -227,6 +227,7 @@ class MasonApp extends ELMNT
             background: #ffffff;
         }
         .head:hover { background: #e8e8e8; }
+        .name { text-transform: uppercase; letter-spacing: 0.5px; }
         .count { margin-left: auto; font-size: 12px; font-weight: 400; color: #525252; }
         .chev { transition: transform 0.15s; color: #525252; }
         .open .chev { transform: rotate(180deg); }

package/commands/publish.js

@@ -3,6 +3,7 @@ const { S3Client, PutObjectCommand, GetObjectCommand } = require("@aws-sdk/clien
 const { SSMClient, GetParameterCommand } = require("@aws-sdk/client-ssm");
 const OrgConfig = require('./helpers/org_config');
 const Apps = require('./helpers/apps');
+const Mime = require('./helpers/mime');
 
 // The Marketplace Catalog API is only available in us-east-1
 const CATALOG_REGION = 'us-east-1';
@@ -53,7 +54,7 @@ exports.main = async function(args){
     const amiAlias = `resolve:ssm:/aws/service/marketplace/${manifest.productId}/${fullVersion}`;
     const upgradeText = buildUpgradeTemplate(stackText, amiAlias);
     const upgradeKey = `${appPrefix}/versions/${vFolder}/upgrade.yaml`;
-    await s3.send(new PutObjectCommand({ Bucket: bucket, Key: upgradeKey, Body: upgradeText }));
+    await s3.send(new PutObjectCommand({ Bucket: bucket, Key: upgradeKey, Body: upgradeText, ContentType: Mime.contentType(upgradeKey) }));
     console.log(`Uploaded upgrade template s3://${bucket}/${upgradeKey}`);
 
     // --- III START CHANGE SET ---

package/commands/update_app.js

@@ -5,6 +5,7 @@ const { S3Client, PutObjectCommand, GetObjectCommand } = require("@aws-sdk/clien
 const { EC2Client, DescribeRegionsCommand, DescribeImagesCommand, DeregisterImageCommand, DeleteSnapshotCommand } = require("@aws-sdk/client-ec2");
 const OrgConfig = require('./helpers/org_config');
 const Apps = require('./helpers/apps');
+const Mime = require('./helpers/mime');
 const { buildAMI } = require('./ssh_build');
 
 exports.main = async function(args){
@@ -93,7 +94,7 @@ exports.main = async function(args){
             console.log('No AmiId parameter found in stack. Template unchanged');
         }
     }
-    await s3.send(new PutObjectCommand({ Bucket: bucket, Key: stackKey, Body: finalStack }));
+    await s3.send(new PutObjectCommand({ Bucket: bucket, Key: stackKey, Body: finalStack, ContentType: Mime.contentType(stackKey) }));
     console.log(`Uploaded s3://${bucket}/${stackKey}`);
 
     // --- V UPDATE MANIFEST ---
@@ -162,7 +163,8 @@ async function uploadFile(s3, bucket, key, localPath){
     await s3.send(new PutObjectCommand({
         Bucket: bucket,
         Key: key,
-        Body: fs.createReadStream(localPath)
+        Body: fs.createReadStream(localPath),
+        ContentType: Mime.contentType(key)
     }));
 }
 

package/commands/update_assets.js

@@ -3,14 +3,7 @@ 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'
-};
+const Mime = require('./helpers/mime');
 
 // update-assets: upload a file or folder to the app's cdn folder
 exports.main = async function(args){
@@ -45,7 +38,7 @@ exports.main = async function(args){
             Bucket: bucket,
             Key: key,
             Body: fs.createReadStream(f),
-            ContentType: CONTENT_TYPES[path.extname(f).toLowerCase()] || 'application/octet-stream'
+            ContentType: Mime.contentType(f)
         }));
         console.log(`Uploaded s3://${bucket}/${key}`);
         uploaded += 1;

package/commands/update_listing.js

@@ -3,6 +3,7 @@ const path = require('path');
 const { S3Client, PutObjectCommand } = require("@aws-sdk/client-s3");
 const OrgConfig = require('./helpers/org_config');
 const Apps = require('./helpers/apps');
+const Mime = require('./helpers/mime');
 
 // Marketplace listing text files stored as top-level manifest attributes.
 // Names match the keys the AWS Marketplace Catalog API expects
@@ -107,7 +108,7 @@ async function applyAssets(s3, bucket, appPrefix, region, assetsPath, manifest){
             Bucket: bucket,
             Key: key,
             Body: fs.createReadStream(imgPath),
-            ContentType: 'image/png'
+            ContentType: Mime.contentType(img.file)
         }));
         manifest[img.attr] = `https://${bucket}.s3.${region}.amazonaws.com/${key}`;
         console.log(`Uploaded ${img.file}: ${manifest[img.attr]}`);

package/package.json

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