cloudmason 0.0.1 → 1.0.2

package/commands/new_app.js

@@ -1,50 +1,44 @@
-const { S3Client,PutObjectCommand } = require("@aws-sdk/client-s3");
-const fs = require('fs');
-const path = require('path')
-const Params = require('./helpers/params');
-const S3 = require('./helpers/s3');
-
-const nodeScript = `npm run start .`
-const pyScript = `py`
-
-exports.main = async function(args){
-    // Check for existing app
-    const existingApp = await Params.getApp(args.name);
-    if (existingApp){
-        console.log('Err: App already exists ' + args.name);
-        throw new Error('App exists')
-    }
-
-    // Check Lang Selection
-    if (args.py && args.node){
-        console.log('Cannot set both nodejs and python. Select one.');
-        throw new Error('Invalid language selection')
-    }
-
-    // Prep Stack
-    let bootScript = `#!/bin/bash -xe\ncd /home/ec2-user/app\n`;
-    let startScript = args.py ? pyScript : nodeScript;
-    bootScript += startScript;
-    const stackText = prepStack(args.type,bootScript)
-
-    // Upload Stack
-    console.log(`Uploading ${args.type} to ${process.env.orgBucket}`)
-    const stackKey = `apps/${args.name.toLowerCase()}/default_stack.yaml`
-    await S3.uploadInfraText(stackKey,stackText);
-
-    // Update app config
-    console.log('Adding app params');
-    const nodev = args.node || '';
-    const pyv = args.py || '';
-    await Params.addApp(args.name,args.type,stackKey,nodev,pyv);
-    console.log(`Added ${args.name} with ${args.type} stack`)
-}
-
-function prepStack(stackType,bootScript){
-    const stackPath = path.resolve(__dirname, 'helpers', 'stacks', `${stackType}.yaml`);
-    if (!fs.existsSync(stackPath)){ throw new Error('Invalid stack ' + args.type); }
-    
-    const b64Script = Buffer.from(bootScript, 'utf8').toString('base64');
-    const stackTxt = fs.readFileSync(stackPath, 'utf-8').replace(/{{user_data}}/, b64Script)
-    return stackTxt;
-}
+const fs = require('fs');
+const path = require('path')
+const Params = require('./helpers/params');
+const S3 = require('./helpers/s3');
+
+
+exports.main = async function(args){
+    // Check for existing app
+    const existingApp = await Params.getApp(args.name);
+    if (existingApp){
+        console.log('Err: App already exists ' + args.name);
+        throw new Error('App exists')
+    }
+
+    // Check Lang Selection
+    if (args.node && !/[0-9]{1,2}/.test(args.node)){
+        throw new Error('Invalid nodejs version. Use major version only (14,15,16)')
+    }
+
+    // Prep Stack
+    const stackPath = path.resolve(__dirname, 'helpers', 'stacks', `${args.type}.yaml`);
+    if (!fs.existsSync(stackPath)){ throw new Error('Invalid stack ' + args.type); }
+
+    const stackText = fs.readFileSync(stackPath, 'utf-8')
+
+    // Upload Stack
+    console.log(`Uploading ${args.type} stack to ${process.env.orgBucket}`)
+    const stackKey = `apps/${args.name.toLowerCase()}/default_stack.yaml`
+    await S3.uploadInfraText(stackKey,stackText);
+
+    // Update app config
+    console.log('Adding app params');
+    const nodev = args.node || '';
+    const pyv = args.py || '';
+    await Params.addApp(args.name,args.type,stackKey,nodev,pyv);
+    console.log(`Added ${args.name} with ${args.type} stack`);
+}
+
+
+// #!/bin/bash -x
+// echo "Running user data"
+// cd /home/ec2-user/app
+// chmod +x start.sh
+// source start.sh

package/commands/new_instance.js

@@ -1,186 +1,133 @@
-const { EC2Client, DescribeVpcsCommand, DescribeSubnetsCommand } = require("@aws-sdk/client-ec2");
-const { ACMClient, ListCertificatesCommand,RequestCertificateCommand } = require("@aws-sdk/client-acm");
-const { Route53Client, ListHostedZonesByNameCommand } = require("@aws-sdk/client-route-53");
-
-const Params = require('./helpers/params')
-
-exports.main = async function(args){
-    console.log(`Adding ${args.app} instance ${args.name} in ${args.region} @${args.domain}`)
-    // Get App
-    const existingApp = await Params.getApp(args.app);
-    if (!existingApp){
-        console.log('Err: No app named ' + args.app);
-        throw new Error('Err: No app named ' + args.app)
-    }
-    // Get Instance
-    const existingInstance = existingApp.instances.find(ins=>{ return ins.name.toLowerCase() === args.name.toLowerCase() })
-    if (existingInstance){
-        console.log('Err: Existing Intance with name ' + args.name);
-        throw new Error('Existing Instance')
-    }
-    // Get Hosted Zone
-    const rootDomain = parseDomain(args.domain);
-    const hostedZoneId = await getHostedZoneId(rootDomain);
-    if (!hostedZoneId){
-        console.log('Err: Hosted zone/domain not found ' + rootDomain);
-        throw new Error('Domain not found')
-    }
-
-    const instanceParams = {
-        name: args.name,
-        domain: args.domain,
-        region: args.region,
-        version: null,
-        cfParams: {
-            AmiId: null,
-            ACMDomainCert: null,
-            VpcId: null,
-            InstanceSubnets: [],
-            InstanceRootDomain: hostedZoneId,
-            InstanceDomain: args.domain,
-            MaxEc2Instances: args.max || 2
-        }
-    }
-
-    // Certificate
-    let cert = await getCertificate(args.domain,rootDomain,args.region);
-    if (cert === 'none'){
-        cert = await requestCert(rootDomain,args.region)
-    }
-    instanceParams.cfParams.ACMDomainCert = cert;
-
-    // Get VPC & Subnets
-    instanceParams.cfParams.VpcId = await getVPC(args.region);
-    instanceParams.cfParams.InstanceSubnets = await getSubnets(args.region)
-
-    // Update SSM
-    console.log('Updating instance params')
-    await Params.addInstance(args.app,args.name,instanceParams);
-    
-    console.log(`Added instance ${args.name}`);
-    return true;
-}
-
-//////////////////////////////////////////////////
-//////////////////////////////////////////////////
-/////////////////////////////////////////////////
-
-
-function parseDomain(domain){
-    const domainArray = domain.split('.');
-    const rootDomainName = domainArray.length === 2 ? domainArray[0] : domainArray[domainArray.length-2]
-    const rootDomain = rootDomainName + '.'+ domainArray[domainArray.length-1];
-    return rootDomain;
-}
-
-async function getCertificate(domain,rootDomain,region){
-    const acmClient = new ACMClient({ region }); // Replace with your desired region.
-
-    // Get All Certs
-    const certificates = [];
-    let params = {};
-    do {
-      // Call ListCertificatesCommand to list certificates.
-      const data = await acmClient.send(new ListCertificatesCommand(params));
-
-      // Add the listed certificates to the array.
-      certificates.push(...(data.CertificateSummaryList || []));
-
-      // If NextToken is present, set it in params for the next iteration.
-      params.NextToken = data.NextToken;
-    } while (params.NextToken);
-
-    // Find Cert
-    let arn = null;
-    const cert = certificates.find(c=>{ return c.DomainName == rootDomain && c.Status == 'ISSUED'})
-    if (cert){
-        console.log('Found certificate');
-        if (domain == rootDomain){ 
-            arn = cert.CertificateArn; 
-        } else if (cert.SubjectAlternativeNameSummaries && cert.SubjectAlternativeNameSummaries.includes(`*.${rootDomain}`)){
-            arn = cert.CertificateArn; 
-        } else {
-            console.log('Certificate does not cover subdomain ' + domain);
-            arn = 'none';
-        }
-    } else {
-        const pendingCert = certificates.find(c=>{ return c.DomainName == rootDomain && c.Status.toLowerCase().includes('validation')});
-        if (pendingCert){
-            console.log('WARNING: Cert still pending validation ' + pendingCert.Status)
-            arn = pendingCert.CertificateArn;
-        } else {
-            const invalidCert = certificates.find(c=>{ return c.DomainName == rootDomain });
-            if (invalidCert){
-                console.log('WARNING: Certificate not in valid status: ' + invalidCert.Status)
-                console.log('Use renew-certs command to renew')
-                arn = invalidCert.CertificateArn;
-            } else {
-                console.log('No certificate found for ' + domain);
-                arn = 'none';       
-            }
-        }
-    }
-
-    return arn;
-}
-
-async function requestCert(rootDomain,region){
-    console.log(`Requesting new certificate for ${rootDomain} in ${region}`)
-    const acmClient = new ACMClient({ region }); // Replace with your desired region.
-
-    const params = {
-        DomainName: rootDomain,
-        ValidationMethod: "DNS",
-        SubjectAlternativeNames: [ `*.${rootDomain}` ],
-      };
-
-    const data = await acmClient.send(new RequestCertificateCommand(params));
-    return data.CertificateArn;
-}
-
-async function getVPC(region){
-    console.log('Getting default VPC ID')
-    // Initialize an Amazon EC2 client object.
-    const ec2Client = new EC2Client({ region }); // replace with your desired region
-    const data = await ec2Client.send(new DescribeVpcsCommand({}));
-    
-    // Find the default VPC from the list of VPCs.
-    const defaultVpc = data.Vpcs.find(vpc => vpc.IsDefault);
-    
-    // Return the VPC ID if the default VPC is found.
-    return defaultVpc.VpcId;
-}
-
-async function getSubnets(region){
-    console.log('Retrieving Subnets')
-    const ec2Client = new EC2Client({ region }); 
-    const subnetsData = await ec2Client.send(new DescribeSubnetsCommand({}));
-    const subNets = subnetsData.Subnets.filter(s=>{ return s.DefaultForAz === true });
-    const subnetList = subNets.map(subnet => subnet.SubnetId  );
-    return subnetList;
-}
-
-async function getHostedZoneId(hostedZoneName){
-    hostedZoneName += '.';
-    const client = new Route53Client({ region: "us-east-1" });
-    const command = new ListHostedZonesByNameCommand({ DNSName: hostedZoneName });
-    let response;
-    try {
-        response = await client.send(command);
-    } catch(e){
-        console.log(e);
-        return false;
-    }
-    
-
-    // Check if we have the desired hosted zone in the response
-    if (response.HostedZones && response.HostedZones.length > 0) {
-        for (let zone of response.HostedZones) {
-            if (zone.Name === hostedZoneName) {
-                return zone.Id.split("/").pop(); // Extracting the ID part from the full ARN
-            }
-        }
-    } else {
-        return false;
-    }
-}
+const { EC2Client, DescribeVpcsCommand, DescribeSubnetsCommand } = require("@aws-sdk/client-ec2");
+const { Route53Client, ListHostedZonesByNameCommand } = require("@aws-sdk/client-route-53");
+
+const Params = require('./helpers/params');
+
+exports.main = async function(args){
+    console.log(`Adding ${args.app} instance ${args.domain} in ${args.region}`)
+    if (!args.max){ 
+        console.log('Using default max instance count of 2. Specify -max to override')
+        args.max = 2; 
+    } else if (args.max < 2){
+        console.log('-max must be at least 2 to allow proper rolling updates');
+        throw new Error('Invalid max instance count');
+    }
+    // Get App
+    const existingApp = await Params.getApp(args.app);
+    if (!existingApp){
+        console.log('Err: No app named ' + args.app);
+        throw new Error('Err: No app named ' + args.app)
+    }
+    // Get Instance
+    const existingInstance = existingApp.instances.find(ins=>{ return ins.domain.toLowerCase() === args.domain.toLowerCase() })
+    if (existingInstance){
+        console.log('Err: Existing Intance with name ' + args.domain);
+        throw new Error('Existing Instance')
+    }
+    // Get Hosted Zone
+    const rootDomain = parseDomain(args.domain);
+    const hostedZoneId = await getHostedZoneId(rootDomain);
+    if (!hostedZoneId){
+        console.log('Err: Hosted zone/domain not found ' + rootDomain);
+        throw new Error('Domain not found')
+    }
+
+    const instanceParams = {
+        domain: args.domain,
+        region: args.region,
+        version: null,
+        build: null,
+        amiName: null,
+        stackName: `${args.app.toUpperCase()}-i-${args.domain.replaceAll(/[^A-Za-z0-9]/ig,'-').toUpperCase()}`,
+        cfParams: {
+            AmiId: null,
+            VpcId: null,
+            InstanceSubnets: [],
+            InstanceRootDomain: hostedZoneId,
+            InstanceDomain: args.domain,
+            MaxEc2Instances: args.max || 2,
+            AdminEmail: args.admin,
+            EC2InstanceType: args.ins || 't3.small',
+            InstanceEnvironment: args.env || 'dev'
+        }
+    }
+
+    // Get VPC & Subnets
+    instanceParams.cfParams.VpcId = await getVPC(args.region);
+    instanceParams.cfParams.InstanceSubnets = await getSubnets(args.region)
+
+    // Update SSM
+    console.log('Updating instance params')
+    await Params.addInstance(args.app,args.domain,instanceParams);
+    
+    console.log(`Added instance ${args.domain}`);
+    return true;
+}
+
+//////////////////////////////////////////////////
+//////////////////////////////////////////////////
+/////////////////////////////////////////////////
+
+
+function parseDomain(domain){
+    const domainArray = domain.split('.');
+    const rootDomainName = domainArray.length === 2 ? domainArray[0] : domainArray[domainArray.length-2]
+    const rootDomain = rootDomainName + '.'+ domainArray[domainArray.length-1];
+    return rootDomain;
+}
+
+async function getVPC(region){
+    console.log('Getting default VPC ID')
+    // Initialize an Amazon EC2 client object.
+    const ec2Client = new EC2Client({ region }); // replace with your desired region
+    const data = await ec2Client.send(new DescribeVpcsCommand({}));
+    
+    // Find the default VPC from the list of VPCs.
+    const defaultVpc = data.Vpcs.find(vpc => vpc.IsDefault);
+    
+    // Return the VPC ID if the default VPC is found.
+    return defaultVpc.VpcId;
+}
+
+async function getSubnets(region){
+    console.log('Retrieving Subnets')
+    const ec2Client = new EC2Client({ region }); 
+    const subnetsData = await ec2Client.send(new DescribeSubnetsCommand({}));
+    const subNets = subnetsData.Subnets.filter(s=>{ return s.DefaultForAz === true });
+    const subnetList = subNets.map(subnet => subnet.SubnetId  );
+    return subnetList;
+}
+
+async function getHostedZoneId(hostedZoneName){
+    hostedZoneName += '.';
+    const client = new Route53Client({ region: "us-east-1" });
+    const command = new ListHostedZonesByNameCommand({ DNSName: hostedZoneName });
+    let response;
+    try {
+        response = await client.send(command);
+    } catch(e){
+        console.log(e);
+        return false;
+    }
+    
+
+    // Check if we have the desired hosted zone in the response
+    if (response.HostedZones && response.HostedZones.length > 0) {
+        for (let zone of response.HostedZones) {
+            if (zone.Name === hostedZoneName) {
+                return zone.Id.split("/").pop(); // Extracting the ID part from the full ARN
+            }
+        }
+    } else {
+        return false;
+    }
+}
+
+
+async function sleep(time){
+    return new Promise(function (resolve, reject) {
+        setTimeout(function () { resolve(true);
+        }, time);
+    });
+}
+

package/commands/reset_stack.js

@@ -1,28 +1,28 @@
-const S3 = require('./helpers/s3')
-const Params= require('./helpers/params');
-const Stacks = require('./helpers/stacks')
-
-exports.main = async function(args){
-    // Get App
-    const app = await Params.getApp(args.app);
-    if (!app){
-        console.log('Err: No app named ' + args.app);
-        throw new Error('Err: No app named ' + args.app)
-    }
-    // Get Stack
-    const stackText = Stacks.get('asg', {lang: 'node'});
-    const stackKey = `apps/${args.app.toLowerCase()}/default_stack.yaml`
-    
-    // Reset Default
-    console.log('Resetting default stack @ ', stackKey)
-    await S3.uploadInfraText(stackKey,stackText);
-
-    if (!app.versions){ return }
-    const versions = Object.keys(app.versions);
-    for (let i=0; i<versions.length; i++){
-        let k = versions[i]
-        let vStackPath = `apps/${args.app.toLowerCase()}/${k}/stack.yaml`
-        console.log('Resetting v',k, '@', vStackPath);
-        await S3.uploadInfraText(vStackPath,stackText);
-    }
+const S3 = require('./helpers/s3')
+const Params= require('./helpers/params');
+const Stacks = require('./helpers/stacks')
+
+exports.main = async function(args){
+    // Get App
+    const app = await Params.getApp(args.app);
+    if (!app){
+        console.log('Err: No app named ' + args.app);
+        throw new Error('Err: No app named ' + args.app)
+    }
+    // Get Stack
+    const stackText = Stacks.get('asg', {lang: 'node'});
+    const stackKey = `apps/${args.app.toLowerCase()}/default_stack.yaml`
+    
+    // Reset Default
+    console.log('Resetting default stack @ ', stackKey)
+    await S3.uploadInfraText(stackKey,stackText);
+
+    if (!app.versions){ return }
+    const versions = Object.keys(app.versions);
+    for (let i=0; i<versions.length; i++){
+        let k = versions[i]
+        let vStackPath = `apps/${args.app.toLowerCase()}/${k}/stack.yaml`
+        console.log('Resetting v',k, '@', vStackPath);
+        await S3.uploadInfraText(vStackPath,stackText);
+    }
 }

package/commands/starter.js

@@ -0,0 +1,21 @@
+const fs = require('fs');
+const path = require('path');
+const cp = require('child_process');
+
+exports.main = function(args){
+    // Check Args Valid
+    if (!args.type){ throw new Error('Missing type: asg or static') }
+    if (args.type === 'asg' && !args.l){ throw new Error('Missing -l language. Specify py or node') }
+    
+    // Resolve Output Path
+    const outputPath = path.resolve(args.p);
+    const starterPath = `./commands/starters/${args.type}${args.l ? `_${args.l}` : ''}`;
+
+    // Copy Directory
+    console.log(`Creating dir ${outputPath}`);
+    fs.mkdirSync(outputPath, { recursive: true });
+    console.log(`Adding starter files`);
+    fs.cpSync(starterPath, outputPath, {recursive: true,});
+    console.log('Running NPM Install');
+    cp.execSync(`npm install`, { cwd: outputPath, stdio: 'inherit' });
+}

package/commands/starters/asg_node/index.js

@@ -0,0 +1,62 @@
+const express = require('express');
+const path = require('path');
+const fs = require('fs');
+const Infra = require('./modules/appConfig.js');
+
+// Port must be 8080
+const app = express();
+const PORT = 8080;
+
+// Use JSON
+app.use(express.json());
+
+// Protect Routes
+// User info and cognito groups available in the res.local.user object
+app.use(Infra.verifyUser);
+
+// Serve static files from the 'public' directory
+app.use(express.static(path.join(__dirname, 'public')));
+
+app.get('/api/health', async (req, res) => {
+    let results = ''
+    const ddB = Infra.checkDDBConnection().then((res)=>{results += `DDB Connection OK: ${res.ok} [${res.msg}]\n` });
+    const s3 = Infra.checkS3Connection().then((res)=>{results += `S3 Connection OK: ${res.ok} [${res.msg}]\n` });
+    Promise.all([ddB,s3]).then(()=>{
+        res.send(results);
+    });
+});
+
+app.get('/config', async (req, res) => {
+    const cnf = {
+        app: process.env.$APP_ID,
+        region: process.env.$APP_REGION,
+        user: res.locals.user,
+        version: process.env.$APP_VERSION,
+        env: process.env.$APP_ENV
+    };
+    res.json(cnf);
+})
+
+app.get('/whoami', async (req, res) => {
+    const logs = [
+        `access:${req.headers['x-amzn-oidc-accesstoken']}`,
+        `oidc:${req.headers['x-amzn-oidc-data']}`,
+        `user:${req.headers['x-amzn-oidc-identity']}`
+    ];
+    console.log(logs.join('\n'));
+    res.json(res.locals.user);
+});
+
+app.get('/log', async (req, res) => {
+    console.log('log>>',req.query);
+    res.send('OK');
+});
+
+// Start Server
+Infra.setParams(__dirname).then(()=>{
+    console.log(`Starting Server for ${process.env.$APP_ID} in ${process.env.$APP_REGION}`,true);
+    app.listen(PORT, async () => {
+        console.log(`${process.env.$APP_ID} running on http://localhost:${PORT} in ${process.env.$APP_REGION}`);
+        console.log(`Boot Complete ${process.env.$APP_ID}@${process.env.$APP_REGION}:${process.env.$APP_ENV}`,true);
+    });
+});

package/commands/starters/asg_node/mason.txt

@@ -0,0 +1 @@
+us-west-2,MEANTTO-i-TEST-ELMNTS-XYZ,local