cloudmason 2.7.49 → 2.7.51

package/commands/helpers/org_config.js

@@ -0,0 +1,26 @@
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
+
+const CONFIG_DIR = path.join(os.homedir(), '.cloudmason');
+const CONFIG_PATH = path.join(CONFIG_DIR, 'config.json');
+const LEGACY_PATH = path.resolve(__dirname, '..', '..', 'org.txt');
+
+exports.read = function () {
+    if (fs.existsSync(CONFIG_PATH)) {
+        return JSON.parse(fs.readFileSync(CONFIG_PATH, 'utf-8'));
+    }
+    if (fs.existsSync(LEGACY_PATH)) {
+        const [name, region] = fs.readFileSync(LEGACY_PATH, 'utf-8').split(',');
+        const cfg = { name, region };
+        exports.write(cfg);
+        try { fs.unlinkSync(LEGACY_PATH); } catch (_) {}
+        return cfg;
+    }
+    return null;
+};
+
+exports.write = function (cfg) {
+    if (!fs.existsSync(CONFIG_DIR)) fs.mkdirSync(CONFIG_DIR, { recursive: true });
+    fs.writeFileSync(CONFIG_PATH, JSON.stringify(cfg, null, 2), 'utf-8');
+};

package/commands/init_org.js

@@ -1,10 +1,9 @@
-const fs = require('fs');
-const path = require('path');
 const { S3Client,HeadBucketCommand } = require("@aws-sdk/client-s3");
 const { EC2Client, DescribeVpcsCommand } = require("@aws-sdk/client-ec2");
 
 const CF = require('./helpers/cf');
 const Params = require('./helpers/params');
+const OrgConfig = require('./helpers/org_config');
 
 exports.main = async function(args){
     console.log(`Setting up ${args.name}@ in ${args.region} with repo ${args.repo}`)
@@ -23,11 +22,8 @@ exports.main = async function(args){
         throw new Error('Org already exists')
     }
 
-    // Set org.txt
-    const orgPath = path.resolve(__dirname,'..','org.txt');
-    const orgData = `${args.name},${args.region}`;
-    fs.writeFileSync(orgPath,orgData,'utf-8')
-    console.log('Set up org:',orgData)
+    OrgConfig.write({ name: args.name, region: args.region });
+    console.log('Set up org:', args.name, args.region)
     return true;
 }
 
@@ -48,11 +44,8 @@ exports.updateOrgStack = async function(args){
 }
 
 exports.setOrg = async function(args){
-    // Set org.txt
-    const orgPath = path.resolve(__dirname,'..','org.txt');
-    const orgData = `${args.name},${args.region}`;
-    fs.writeFileSync(orgPath,orgData,'utf-8')
-    console.log('Set org:',orgData)
+    OrgConfig.write({ name: args.name, region: args.region });
+    console.log('Set org:', args.name, args.region)
     return true;
 }
 

package/commands/publish.js

@@ -1,9 +1,37 @@
 const { MarketplaceCatalogClient, StartChangeSetCommand, DescribeChangeSetCommand } = require("@aws-sdk/client-marketplace-catalog");
 const { EC2Client, DescribeImagesCommand } = require("@aws-sdk/client-ec2");
+const { S3Client, GetObjectCommand } = require("@aws-sdk/client-s3");
 const fs = require('fs');
 const path = require('path');
 const Params = require('./helpers/params');
 
+// Parse path-style, virtual-hosted, or s3:// URLs into {bucket, key, region}
+function parseS3Url(url){
+    if (!url){ throw new Error('Missing S3 URL'); }
+    let m;
+    if ((m = url.match(/^s3:\/\/([^/]+)\/(.+)$/)))                                 { return { bucket: m[1], key: m[2], region: null }; }
+    if ((m = url.match(/^https:\/\/s3\.([^.]+)\.amazonaws\.com\/([^/]+)\/(.+)$/))) { return { bucket: m[2], key: m[3], region: m[1] }; }
+    if ((m = url.match(/^https:\/\/s3\.amazonaws\.com\/([^/]+)\/(.+)$/)))          { return { bucket: m[1], key: m[2], region: null }; }
+    if ((m = url.match(/^https:\/\/([^.]+)\.s3\.([^.]+)\.amazonaws\.com\/(.+)$/))) { return { bucket: m[1], key: m[3], region: m[2] }; }
+    if ((m = url.match(/^https:\/\/([^.]+)\.s3\.amazonaws\.com\/(.+)$/)))          { return { bucket: m[1], key: m[2], region: null }; }
+    throw new Error('Unrecognized S3 URL format: ' + url);
+}
+
+// AWS Marketplace requires virtual-hosted-style URLs for Template/ArchitectureDiagram
+function toVirtualHostedUrl(url){
+    const { bucket, key, region } = parseS3Url(url);
+    return region
+        ? `https://${bucket}.s3.${region}.amazonaws.com/${key}`
+        : `https://${bucket}.s3.amazonaws.com/${key}`;
+}
+
+async function readS3Text(url){
+    const { bucket, key, region } = parseS3Url(url);
+    const client = new S3Client({ region: region || process.env.orgRegion });
+    const resp = await client.send(new GetObjectCommand({ Bucket: bucket, Key: key }));
+    return await resp.Body.transformToString();
+}
+
 exports.add_listing = async function(args){
     console.log('Adding Listing>>', args.app, args.pid);
     await Params.addPid(args.app,args.pid.trim());
@@ -28,24 +56,43 @@ exports.main = async function(args){
     }
     pubArgs.amiId = instanceVersion.baseAMI_Id;
     pubArgs.arch = instanceVersion.arch || 'x86_64';
-    console.log('Publishing AMI:\n\t',Object.entries(pubArgs).map(([k,v])=>{return `${k}:${v}`}).join('\n\t'));
-    console.log('----------')
+    if (args.cft){
+        pubArgs.cftS3Url = instanceVersion.stackURL;
+        if (!pubArgs.cftS3Url){
+            console.log('ERR: No stack URL found for version',pubArgs.version);
+            throw new Error('No stack URL found for version:' + pubArgs.version);
+        }
+        const missing = ['short','long','diagram'].filter(k => !args[k]);
+        if (missing.length){
+            throw new Error('Missing required CFT args: ' + missing.map(k=>'-'+k).join(', '));
+        }
+        pubArgs.shortDescS3Url   = args.short;
+        pubArgs.longDescS3Url    = args.long;
+        pubArgs.archDiagramS3Url = args.diagram;
+        console.log('Publishing AMI + CFT:\n\t',Object.entries(pubArgs).map(([k,v])=>{return `${k}:${v}`}).join('\n\t'));
+        await exports.updateAmiCft(pubArgs);
+    } else {
+        if (!args.stack){
+            throw new Error('Missing required arg -stack for AMI-only publish');
+        }
+        console.log('Publishing AMI:\n\t',Object.entries(pubArgs).map(([k,v])=>{return `${k}:${v}`}).join('\n\t'));
+        await updateAmiVersion(pubArgs);
 
-    // -- Publish AMI to Marketplace
-    await updateAmiVersion(pubArgs);
+        // -- Get Marketplace AMI IDs
+        // AmiAlias: '/aws/service/marketplace/prod-shmtmk4gqrfge/1.2'
+        const amiAlias = `/aws/service/marketplace/${pubArgs.productId}/${pubArgs.version}`;
+        console.log('AMI Alias:',amiAlias);
+        let stackTxt = fs.readFileSync(path.resolve(args.stack),'utf8');
+        // stackTxt = stackTxt.replace(`ImageId: !Ref AmiId`,`ImageId: resolve:ssm:${amiAlias}`);
+        stackTxt = stackTxt.replace(/^#-Strip.+#-Strip/ms,'');
 
-    // -- Get Marketplace AMI IDs
-    // AmiAlias: '/aws/service/marketplace/prod-shmtmk4gqrfge/1.2'
-    const amiAlias = `/aws/service/marketplace/${pubArgs.productId}/${pubArgs.version}`;
-    console.log('AMI Alias:',amiAlias);
-    let stackTxt = fs.readFileSync(path.resolve(args.stack),'utf8');
-    // stackTxt = stackTxt.replace(`ImageId: !Ref AmiId`,`ImageId: resolve:ssm:${amiAlias}`);
-    stackTxt = stackTxt.replace(/^#-Strip.+#-Strip/ms,'');
+        // -- Update CF Template with AMI IDs
+        // const newFileName = path.resolve(args.out);
+        // console.log('Updating Template:',newFileName);
+        // fs.writeFileSync(newFileName,stackTxt);
+    }
 
-    // -- Update CF Template with AMI IDs
-    const newFileName = path.resolve(args.out);
-    console.log('Updating Template:',newFileName);
-    fs.writeFileSync(newFileName,stackTxt);
+    console.log('----------')
 
     // -- Suggest next step
     console.log('\nTo wait for this version to be publicly available in marketplace, run:');
@@ -156,53 +203,102 @@ const updateAmiVersion = async ({productId, amiId, version, changeDescription, a
 };
 
 
-// Get AMI Ids Function
-const getRegions = async (productId) => {
-  const client = new MarketplaceCatalogClient({ region: process.env.orgRegion }); // Update region if needed
+// Update AMI + CloudFormation Template Function
 
+exports.updateAmiCft = async ({productId, amiId, version, changeDescription, arch, cftS3Url, shortDescS3Url, longDescS3Url, archDiagramS3Url}) => {
+    const client = new MarketplaceCatalogClient({ region: process.env.orgRegion });
+    console.log('Updating AMI+CFT version:', productId, amiId, version, changeDescription, cftS3Url);
 
-    const command = new DescribeEntityCommand({
-      Catalog: "AWSMarketplace",
-      EntityId: productId,
-    });
-    const response = await client.send(command);
-    console.log('dd',response.DetailsDocument);
-    console.log('v',response.DetailsDocument.Versions[1].DeliveryOptions[0].AmiAlias);
-    return response.DetailsDocument.RegionAvailability.Regions;
-    // console.log("Regions:", response.DetailsDocument.Description.RegionAvailability.Regions);
-    // console.log("Version:", response.DetailsDocument.Description.RegionAvailability.Regions);
-    // Extract AMI details by region
-}
-
-// List by Mktplc Listing
-const getAMIs = async (region,productName,productCode) => {
-    const ec2Client = new EC2Client({ region });
+    const shortDescription = await readS3Text(shortDescS3Url);
+    const longDescription  = await readS3Text(longDescS3Url);
+    const templateUrl      = toVirtualHostedUrl(cftS3Url);
+    const diagramUrl       = toVirtualHostedUrl(archDiagramS3Url);
 
     try {
-        const command = new DescribeImagesCommand({
-            Filters: [
-                {
-                    Name: "name",
-                    Values: [
-                        `${productName}-*-${productCode}` // Adjust the filter to match your product naming pattern
-                    ]
-                }
-            ]
+      const changeSet = {
+        Catalog: "AWSMarketplace",
+        Intent: "APPLY",
+        ChangeSet: [
+          {
+            ChangeType: "AddDeliveryOptions",
+            Entity: {
+              Type: "AmiProduct@1.0",
+              Identifier: productId,
+            },
+            Details: JSON.stringify({
+                Version: {
+                    VersionTitle: version,
+                    ReleaseNotes: changeDescription,
+                },
+                DeliveryOptions: [
+                    {
+                        DeliveryOptionTitle: "AMI with CloudFormation Template",
+                        Details: {
+                            "DeploymentTemplateDeliveryOptionDetails": {
+                                "ShortDescription": shortDescription,
+                                "LongDescription": longDescription,
+                                "UsageInstructions": "Visit Theorim.ai/install for installation instructions",
+                                "RecommendedInstanceType": arch === 'arm' ? "r8g.medium" : "m6a.large",
+                                "ArchitectureDiagram": diagramUrl,
+                                "Template": templateUrl,
+                                "TemplateSources": [
+                                    {
+                                        "ParameterName": "AmiId",
+                                        "AmiSource": {
+                                            "AmiId": amiId,
+                                            "AccessRoleArn": "arn:aws:iam::590183947985:role/Theorim_MarketPlaceRole",
+                                            "UserName": "ec2-user",
+                                            "OperatingSystemName": "AMAZONLINUX",
+                                            "OperatingSystemVersion": arch === 'arm'
+                                                ? "Amazon Linux 2023 arm64 HVM"
+                                                : "Amazon Linux 2 AMI 2.0.20220207.1 x86_64 HVM gp2"
+                                        }
+                                    }
+                                ]
+                            }
+                        }
+                    }
+                ]
+            }),
+          },
+        ],
+      };
+
+      const startChangeSetCommand = new StartChangeSetCommand(changeSet);
+      const startResponse = await client.send(startChangeSetCommand);
+      console.log("Change set started:", startResponse);
+
+      const changeSetId = startResponse.ChangeSetId;
+
+      let status = "IN_PROGRESS";
+      while (status === "IN_PROGRESS") {
+        await new Promise(resolve => setTimeout(resolve, 5000));
+
+        const describeChangeSetCommand = new DescribeChangeSetCommand({
+          Catalog: "AWSMarketplace",
+          ChangeSetId: changeSetId,
         });
+        const describeResponse = await client.send(describeChangeSetCommand);
 
-        const response = await ec2Client.send(command);
+        status = describeResponse.Status;
+        console.log("Change set status:", status);
 
-        console.log(`Found ${response.Images.length} AMIs for product: ${productName} in region: ${region}`);
-        for (const ami of response.Images) {
-            console.log('ami',ami);
+        if (status === "SUCCEEDED") {
+          console.log("Change set succeeded:", describeResponse);
+          break;
+        } else if (status === "FAILED") {
+          console.error("Change set failed:", describeResponse);
+          throw new Error("Change set failed");
         }
+      }
 
-        return response.Images;
     } catch (error) {
-        console.error(`Error fetching AMIs for product: ${productName} in region: ${region}`, error);
-        throw error;
+      console.error("Error updating AMI+CFT version:", error);
+      throw error;
     }
-}
+};
+
+
 
 
 

package/main.js

@@ -1,9 +1,7 @@
 #!/usr/bin/env node
 
-const path = require('path')
-const fs = require('fs')
-
 const Params = require('./commands/helpers/params');
+const OrgConfig = require('./commands/helpers/org_config');
 
 const Commands = {
     'init-org': {
@@ -115,8 +113,12 @@ const Commands = {
             {n: 'app', desc: 'Name of existing app', pattern: `[A-Za-z]{2,20}`, r: true},
             {n: 'desc', desc: 'Description of Changes', r: true},
             {n: 'v', desc: 'Version to launch', pattern: `[0-9]{1,20}`, r: true},
-            {n: 'stack', desc: 'Path of stack.yaml', r: true},
-            {n: 'out', desc: 'Output path of marketplace stack', r: true}
+            {n: 'stack', desc: 'Path of stack.yaml (required for AMI-only publish)', r: false},
+            {n: 'out', desc: 'Output path of marketplace stack (AMI-only publish)', r: false},
+            {n: 'cft', desc: 'Publish as AMI + CloudFormation Template delivery', r: false},
+            {n: 'short', desc: 'S3 URL of short-description text file (required when -cft is set)', r: false},
+            {n: 'long', desc: 'S3 URL of long-description text file (required when -cft is set)', r: false},
+            {n: 'diagram', desc: 'S3 URL of architecture diagram image (required when -cft is set)', r: false}
         ]
     },
     'await-ami': {
@@ -257,16 +259,12 @@ function checkNodeVersion() {
 }
 
 async function readOrgInfo(){
-    const orgPath = path.resolve(__dirname,'org.txt');
-    if (fs.existsSync(orgPath)){
-        const orgInfo = fs.readFileSync(orgPath,'utf-8').split(',');
-        process.env.orgName = orgInfo[0];
-        process.env.orgRegion = orgInfo[1];
-        process.env.orgBucket = await Params.getOrgBucket();
-        return true;
-    } else {
-        return false;
-    }
+    const cfg = OrgConfig.read();
+    if (!cfg) return false;
+    process.env.orgName = cfg.name;
+    process.env.orgRegion = cfg.region;
+    process.env.orgBucket = await Params.getOrgBucket();
+    return true;
 }
 
 function parseArgs(){

package/org.txt

@@ -0,0 +1 @@
+theorim,us-east-1

package/package.json

@@ -1 +1 @@
-{"name":"cloudmason","version":"2.7.49","description":"","main":"main.js","scripts":{"build":"node build.js"},"bin":{"mason":"./main.js"},"repository":{"type":"git","url":"https://github.com/kai-harvey/cloudmason.git"},"author":"Kai Harvey","license":"ISC","dependencies":{"@aws-sdk/client-acm":"^3.418.0","@aws-sdk/client-auto-scaling":"^3.470.0","@aws-sdk/client-cloudformation":"^3.418.0","@aws-sdk/client-ec2":"^3.864.0","@aws-sdk/client-iam":"^3.864.0","@aws-sdk/client-marketplace-catalog":"^3.716.0","@aws-sdk/client-route-53":"^3.425.0","@aws-sdk/client-s3":"^3.418.0","@aws-sdk/client-ssm":"^3.421.0","adm-zip":"^0.5.10","ssh2":"^1.16.0","yaml":"^2.6.1"}}
+{"name":"cloudmason","version":"2.7.51","description":"","main":"main.js","scripts":{"build":"node build.js"},"bin":{"mason":"./main.js"},"repository":{"type":"git","url":"https://github.com/kai-harvey/cloudmason.git"},"author":"Kai Harvey","license":"ISC","dependencies":{"@aws-sdk/client-acm":"^3.418.0","@aws-sdk/client-auto-scaling":"^3.470.0","@aws-sdk/client-cloudformation":"^3.418.0","@aws-sdk/client-ec2":"^3.864.0","@aws-sdk/client-iam":"^3.864.0","@aws-sdk/client-marketplace-catalog":"^3.716.0","@aws-sdk/client-route-53":"^3.425.0","@aws-sdk/client-s3":"^3.418.0","@aws-sdk/client-ssm":"^3.421.0","adm-zip":"^0.5.10","ssh2":"^1.16.0","yaml":"^2.6.1"}}