cloudmason 1.0.3 → 1.0.5

package/README.md

@@ -9,6 +9,11 @@ Can be used as a command line tool, or in a CI/CD pipeline.
 - [Important Notes](##important)
 - [Commands](##commands)
 
+## Installation
+
+Be sure to use the -g flag to install globally.
+
+``npm install -g cloudmason``
 
 
 ## Quick Start
@@ -18,12 +23,15 @@ Get an Ec2 nodejs app up and running in 4 commands.
 1. **Prereqs**
       1. Open an AWS account
       2. Download and set up the AWS CLI (or just set your AWS credentials with enviroment variables)
-      3. Buy a domain to deploy apps to
-      4. Run the following command to set up your org: 
-         - `init-org -name MyOrg -region us-east-1`
+      3. Ensure you have a domain to deploy apps to
+      4. Make sure you have nodejs version 18+ installed
+      5. Install the cloudmason CLI
+            - `npm install -g cloudmason`
+      6. Run the following command to set up your org: 
+            - `mason init-org -name MyOrg -region us-east-1`
 2. **Set up a Local App Template**
       1. Get a sample nodejs app template: 
-         - `mason starter -p ./myDesktop/MyFirstApp -type asg`
+            - `mason starter -p ./myDesktop/MyFirstApp -type asg -l node`
 3. **Add an App**
 ```
 mason new-app -name MyFirstApp -type asg
@@ -31,12 +39,12 @@ mason new-instance -app MyFirstApp -domain myfirstapp.com -region us-east-2 -adm
 mason update-app -app MyFirstApp -v 1.0 -path ./myDesktop/HelloWorld
 mason list-apps
 ```
-4.  **Launch it**
+1.  **Launch it**
 ```
 mason launch -app MyFirstApp -v 1.0 -domain myfirstapp.com
 mason inspect -app MyFirstApp -domain myfirstapp.com -boot
 ```
-5. **Review It**
+1. **Review It**
       1. Visit the domain you specified. You'll see a login page.
       2. Check the email address you specified for a temp password. Use it to log in.
       3. After logging in, you'll see a "Hello World" page.
@@ -44,8 +52,9 @@ mason inspect -app MyFirstApp -domain myfirstapp.com -boot
 #### All Together
 
 ```
-init-org -name MyOrg -region us-east-1
-mason starter -p ./myDesktop/MyFirstApp -type asg
+npm install -g cloudmason
+mason init-org -name MyOrg -region us-east-1
+mason starter -p ./myDesktop/MyFirstApp -type asg -l node
 mason new-app -name MyFirstApp -type asg
 mason new-instance -app MyFirstApp -domain myfirstapp.com -region us-east-2 -admin me@gmail.com
 mason update-app -app MyFirstApp -v 1.0 -path ./myDesktop/MyFirstApp

package/commands/helpers/cf.js

@@ -32,7 +32,6 @@ exports.deployOrgStack = async function(region,params){
         return result.StackId;
     } catch (e){
         if (/AlreadyExistsException/.test(e)){
-            console.log('Stack exists ' + stackName);
             return false;
         } else {
             throw new Error(e.message)

package/commands/init_org.js

@@ -28,21 +28,20 @@ exports.main = async function(args){
     return true;
 }
 
+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)
+    return true;
+}
+
 
 /////////////////////////////////////////
 ////////////// FUNCS ////////////////////
 ////////////////////////////////////////
 
-async function bucketExists(bucketName,region){
-    const client = new S3Client({region});
-    try {
-        await client.send(new HeadBucketCommand({ Bucket: bucketName }));
-        return true;
-    } catch (e){
-        return false;
-    }
-}
-
 async function getDefaultVPC(region){
     const ec2Client = new EC2Client({ region }); 
     const response = await ec2Client.send(new DescribeVpcsCommand({ Filters: [{ Name: "isDefault", Values: ["true"] }] }));

package/commands/starter.js

@@ -9,7 +9,9 @@ exports.main = function(args){
     
     // Resolve Output Path
     const outputPath = path.resolve(args.p);
-    const starterPath = `./commands/starters/${args.type}${args.l ? `_${args.l}` : ''}`;
+    const starterRelPath = `starters/${args.type}${args.l ? `_${args.l}` : ''}`;
+    const starterPath = path.join(__dirname, starterRelPath);
+
 
     // Copy Directory
     console.log(`Creating dir ${outputPath}`);

package/main.js

@@ -14,6 +14,14 @@ const Commands = {
             {n: 'region', desc: 'AWS Region for Core Assets. Default us-east-1', r: false}
         ]
     },
+    'set-org': {
+        desc: "Set an exsiting organization",
+        exec: require('./commands/init_org').setOrg,
+        args: [
+            {n: 'name', desc: 'Unique org Name. Letters only', r: true, pattern: `[A-Za-z]{2,20}`},
+            {n: 'region', desc: 'AWS Region for Core Assets. Default us-east-1', r: false}
+        ]
+    },
     'new-app': {
         desc: 'Add a new application',
         exec: require('./commands/new_app').main,
@@ -128,6 +136,8 @@ const Commands = {
 }
 
 async function main(){
+    const nodeVersion = checkNodeVersion();
+
     const orgExists = await readOrgInfo();
     if (orgExists){
         console.log(`>>>> ${process.env.orgName} <<<<`);
@@ -186,6 +196,14 @@ async function main(){
 /////////////////////////////////
 ////////////////////////////////
 
+function checkNodeVersion() {
+    const requiredVersion = 16;
+    const currentVersion = process.version.split('.')[0].replace('v', '');
+
+    if (parseInt(currentVersion) < requiredVersion) {
+        throw new Error(`Node.js version is less than ${requiredVersion}. Current version: ${process.version}`);
+    }
+}
 
 async function readOrgInfo(){
     const orgPath = path.resolve(__dirname,'org.txt');

package/package.json

@@ -1 +1 @@
-{"name":"cloudmason","version":"1.0.3","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-route-53":"^3.425.0","@aws-sdk/client-s3":"^3.418.0","@aws-sdk/client-ssm":"^3.421.0","adm-zip":"^0.5.10"}}
+{"name":"cloudmason","version":"1.0.5","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-route-53":"^3.425.0","@aws-sdk/client-s3":"^3.418.0","@aws-sdk/client-ssm":"^3.421.0","adm-zip":"^0.5.10"}}