cloudmason 1.1.13 → 1.1.15

package/commands/helpers/params.js

@@ -1,4 +1,5 @@
 const { SSMClient, GetParameterCommand,PutParameterCommand,GetParametersByPathCommand,DeleteParameterCommand } = require("@aws-sdk/client-ssm");
+const { S3Client, PutObjectCommand, GetObjectCommand } = require("@aws-sdk/client-s3");
 
 // ORG PARAMS
 exports.getOrgConfig = async function(){
@@ -38,38 +39,26 @@ exports.getOrgBucket = async function(){
 exports.listApps = async function(){
     if (!process.env.orgRegion){ throw new Error('Region not set') }
 
-    const ssmClient = new SSMClient({ region: process.env.orgRegion }); // Set your preferred region
-    const pathPrefix = "/infra/apps/";
-    const parameters = [];
-    let nextToken;
-
-    do {
-        const response = await ssmClient.send(new GetParametersByPathCommand({
-            Path: pathPrefix,
-            NextToken: nextToken
-        }));
-
-        if (response.Parameters) {
-            parameters.push(...response.Parameters);
-        }
-
-        nextToken = response.NextToken;
-
-    } while (nextToken);
-    const params = parameters.map(p=>{ return JSON.parse(p.Value) })
+    const appList = await readOrgConfig();
+    const params = appList;
     return params;
 }
 
+
+
 exports.getApp = async function(appName){
     if (!process.env.orgRegion){ throw new Error('Region not set') }
-    const app = await readParam(
-        `/infra/apps/${appName.toLowerCase()}`,
-        process.env.orgRegion
-    )
-    return app ? JSON.parse(app) : null;
+    const orgApps = await readOrgConfig();
+    const app = orgApps.find(a=>{ return a.name.toLowerCase() == appName.toLowerCase() });
+    return app ? app : null;
 }
 
 exports.addApp = async function(appName,appType,stackKey,nodeV,pyV){
+    const orgApps = await readOrgConfig();
+    const existingApp = orgApps.find(a=>{ return a.name.toLowerCase() == appName.toLowerCase() });
+    if (existingApp){
+        throw new Error('App already exists' + appName)
+    }
     const appData = {
         name: appName,
         stack: appType,
@@ -81,14 +70,15 @@ exports.addApp = async function(appName,appType,stackKey,nodeV,pyV){
         },
         instances: []
     }
-    const paramPath = `/infra/apps/${appName.toLowerCase()}`;
-    await writeParam(paramPath,JSON.stringify(appData),process.env.orgRegion);
+    orgApps.push(appData);
+    await writeOrgConfig(orgApps);
 }
 
 exports.deleteApp = async function(appName){
     if (!process.env.orgRegion){ throw new Error('Region not set') }
-    const paramPath = `/infra/apps/${appName.toLowerCase()}`;
-    await deleteParam(paramPath,process.env.orgRegion);
+    const orgApps = await readOrgConfig();
+    orgApps = orgApps.filter(a=>{ return a.name.toLowerCase() !== appName.toLowerCase() });
+    await writeOrgConfig(orgApps);
     return true
 }
 
@@ -96,12 +86,11 @@ exports.deleteApp = async function(appName){
 exports.updateAppV = async function(appName,version,vParams){
     if (!process.env.orgRegion){ throw new Error('Region not set') }
     if (!vParams.baseAMI_Name || !vParams.baseAMI_Id || !vParams.updated){ throw new Error('Missing version param' + vParams)}
-    const appKey = `/infra/apps/${appName.toLowerCase()}`
-    const appStr = await readParam(appKey,process.env.orgRegion);
-    const app = JSON.parse(appStr);
 
-    app.versions[version] = vParams;
-    await writeParam(appKey,JSON.stringify(app),process.env.orgRegion);
+    const [apps,i] = await readOrgConfig(appName);
+    apps[i].versions[version] = vParams;
+
+    await writeOrgConfig(apps);
 }
 
 // INSTANCE PARAMS
@@ -118,35 +107,29 @@ exports.setOrgParams = async function(orgName,VpcId,repo){
 
 exports.addPid = async function(appName,productId){
     if (!process.env.orgRegion){ throw new Error('Region not set') }
-    const appKey = `/infra/apps/${appName.toLowerCase()}`
-    const appStr = await readParam(appKey,process.env.orgRegion);
-    const app = JSON.parse(appStr);
+    const [apps,i] = await readOrgConfig(appName);
+    apps[i].pid = productId;
 
-    app.pid = productId;
-    await writeParam(appKey,JSON.stringify(app),process.env.orgRegion);
+    await writeOrgConfig(apps);
 }
 
 
 exports.addInstance = async function(appName,instanceName,params){
     if (!process.env.orgRegion){ throw new Error('Region not set') }
-    const appKey = `/infra/apps/${appName.toLowerCase()}`
-    const appStr = await readParam(appKey,process.env.orgRegion);
-    const app = JSON.parse(appStr);
+    const [apps,i] = await readOrgConfig(appName);
 
-    const ei = app.instances.find(ins=>{ return ins.domain.toLowerCase() == instanceName.toLowerCase()});
+    const ei = apps[i].instances.find(ins=>{ return ins.domain.toLowerCase() == instanceName.toLowerCase()});
     if (ei){
         throw new Error('Instance exists')
     }
-    app.instances.push(params);
-    await writeParam(appKey,JSON.stringify(app),process.env.orgRegion)
+    apps[i].instances.push(params);
+    await writeOrgConfig(apps);
 }
 
 exports.updateInstanceV = async function(appName,instanceName,version,build,amiId,amiName){
     if (!process.env.orgRegion){ throw new Error('Region not set') }
-    const appKey = `/infra/apps/${appName.toLowerCase()}`
-    const appStr = await readParam(appKey,process.env.orgRegion);
-    const app = JSON.parse(appStr);
-    const ei = app.instances.find(ins=>{ return ins.domain.toLowerCase() == instanceName.toLowerCase()});
+    const [apps,i] = await readOrgConfig(appName);
+    const ei = apps[i].instances.find(ins=>{ return ins.domain.toLowerCase() == instanceName.toLowerCase()});
     if (!ei){ throw new Error('Instance not found') }
 
     ei.version = version;
@@ -155,37 +138,53 @@ exports.updateInstanceV = async function(appName,instanceName,version,build,amiI
     ei.amiName = amiName;
     ei.cfParams.AmiId = amiId;
 
-    await writeParam(appKey,JSON.stringify(app),process.env.orgRegion)
+    await writeOrgConfig(apps);
 }
 
-// exports.editInstance = async function(appName,instanceName,version,stack,cfParams){
-//     if (!process.env.orgRegion){ throw new Error('Region not set') }
-//     const appKey = `/infra/apps/${appName.toLowerCase()}`
-//     const appStr = await readParam(appKey,process.env.orgRegion);
-//     const app = JSON.parse(appStr);
-
-//     const ei = app.instances.find(ins=>{ return ins.domain.toLowerCase() == instanceName.toLowerCase()});
-//     if (!ei){ throw new Error('Instance not found') }
-//     ei.version = version;
-//     ei.stack = stack;
-//     ei.cfParams = cfParams;
-//     ei.lastDeployed = Date.now();
-//     await writeParam(appKey,JSON.stringify(app),process.env.orgRegion)
-// }
-
 exports.deleteInstance = async function(appName,instanceName){
     if (!process.env.orgRegion){ throw new Error('Region not set') }
-    const appKey = `/infra/apps/${appName.toLowerCase()}`
-    const appStr = await readParam(appKey,process.env.orgRegion);
-    const app = JSON.parse(appStr);
-
-    const ei = app.instances.find(ins=>{ return ins.domain.toLowerCase() == instanceName.toLowerCase()});
-    if (!ei){ throw new Error('Instance not found') }
-    app.instances = app.instances.filter(ins=>{ return ins.domain.toLowerCase() !== instanceName.toLowerCase()});
-    await writeParam(appKey,JSON.stringify(app),process.env.orgRegion)
+    const [apps,i] = await readOrgConfig(appName);
+    apps[i].instances = apps[i].instances.filter(ins=>{ return ins.domain.toLowerCase() !== instanceName.toLowerCase()});
+    
+    await writeOrgConfig(apps);
 }
 
+exports.migrate = async function(){
+    if (!process.env.orgRegion){ throw new Error('Region not set') }
+    console.log('Migrating params to s3');
+    const migrated = await readParam('/infra/migrated',process.env.orgRegion);
+    if (migrated){
+        console.log('Already migrated');
+        return;
+    }
+    const ssmClient = new SSMClient({ region: process.env.orgRegion }); // Set your preferred region
+    const pathPrefix = "/infra/apps/";
+    const parameters = [];
+    let nextToken;
+
+    do {
+        const response = await ssmClient.send(new GetParametersByPathCommand({
+            Path: pathPrefix,
+            NextToken: nextToken
+        }));
+        if (response.Parameters) {
+            parameters.push(...response.Parameters);
+        }
+
+        nextToken = response.NextToken;
 
+    } while (nextToken);
+    // const params = parameters.map(p=>{ return JSON.parse(p.Value) })
+    const newStruct = [];
+    for (let i=0; i<parameters.length; i++){
+        newStruct.push(JSON.parse(parameters[i].Value))
+    }
+
+    await writeOrgConfig(newStruct);
+    await writeParam('/infra/migrated',`${Date.now()}`, process.env.orgRegion);
+    console.log('Successfully migrated');
+    return true;
+}
 
 
 
@@ -250,4 +249,48 @@ async function deleteParam(name,region){
             throw error;
         }
     }
+}
+
+async function writeOrgConfig(data){
+    const s3Client = new S3Client({ region: process.env.orgRegion }); // Use your desired region
+
+    // Stringify the data
+    const jsonString = JSON.stringify(data);
+    const bucketName = await readParam('/infra/infraBucket',process.env.orgRegion);
+    // Set up the PutObject parameters
+    const putParams = {
+      Bucket: bucketName,
+      Key: "org_config.json",
+      Body: jsonString,
+      ContentType: "application/json",
+    };
+  
+    const result = await s3Client.send(new PutObjectCommand(putParams));
+    console.log("Successfully uploaded JSON to S3:", result);
+}
+
+async function readOrgConfig(appName=null){
+    const s3 = new S3Client({ region: process.env.orgRegion }); // Change region if needed
+    const bucketName = await readParam('/infra/infraBucket',process.env.orgRegion);
+    const { Body } = await s3.send(new GetObjectCommand({ 
+        Bucket: bucketName, 
+        Key: "org_config.json" 
+    }));
+    const dataString = await streamToString(Body);
+    const data = JSON.parse(dataString);
+    if (!appName){
+        return data;
+    } else {
+        const indx = data.findIndex(a=>{ return a.name.toLowerCase() == appName.toLowerCase() });
+        return [data,indx];
+    }
+}
+
+function streamToString(stream) {
+    return new Promise((resolve, reject) => {
+      const chunks = [];
+      stream.on("data", (chunk) => chunks.push(chunk));
+      stream.on("error", reject);
+      stream.on("end", () => resolve(Buffer.concat(chunks).toString("utf8")));
+    });
 }

package/commands/update_app.js

@@ -66,7 +66,10 @@ exports.main = async function(args){
         node: app.nodeV,
         py: app.pyV
     });
-
+    console.log('Instance Launched:',instance_id);
+    console.log('Waiting 60s');
+    await sleep(60*1000);
+    console.log('Checking Instance Status');
     await waitUntilInstanceReady(instance_id,process.env.orgRegion);
     
     // Create AMI

package/main.js

@@ -30,6 +30,13 @@ const Commands = {
             {n: 'region', desc: 'AWS Region for Core Assets. Default us-east-1', r: false}
         ]
     },
+    'migrate': {
+        desc: "Migrate to version 2",
+        exec: require('./commands/helpers/params').migrate,
+        args: [
+            {n: 't', desc: 'Architecture type: asg | static', r: false}
+        ]
+    },
     'new-app': {
         desc: 'Add a new application',
         exec: require('./commands/new_app').main,

package/package.json

@@ -1 +1 @@
-{"name":"cloudmason","version":"1.1.13","description":"","main":"main.js","scripts":{"build":"node build.js"},"bin":{"mason":"./main.js"},"repository":{"type":"git","url":"https://github.com/kai-harvey/secure-saas.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.416.0","@aws-sdk/client-iam":"^3.418.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","yaml":"^2.6.1"}}
+{"name":"cloudmason","version":"1.1.15","description":"","main":"main.js","scripts":{"build":"node build.js"},"bin":{"mason":"./main.js"},"repository":{"type":"git","url":"https://github.com/kai-harvey/secure-saas.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.416.0","@aws-sdk/client-iam":"^3.418.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","yaml":"^2.6.1"}}