@fishawack/lab-env 2.1.0 → 3.1.0

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 ## Changelog
 
+### 3.1.0 (2022-09-08)
+* [Feature] exec command now has the -g flag to prepend the full grunt path
+* [Feature] Diagnosis now has a version number that will prompt for re-run when needed
+* [Change] Bumped core `0.1.0` to `0.2.0`
+* [Bug] rebuild now passes flags after the service
+* [Bug] Specify platform in core build command
+* [Bug] Login to docker during docker before versioning and building images
+* [Misc] Tests now use cli path
+
+### 3.0.0 (2022-09-05)
+* [Feature] Added newly setup AWS accounts to the client prompts on `fw provision`
+* [Feature] Added key/dekey commands
+* [Change] Provisioned environment variables now append client to uniqueify the services created
+* [Change] `fw provision` no longer does two polls to cloudfront to speed up the process
+* [Change] Drupal now defaults to 8.1 php
+* [Bug] Added protocol to www in cloudfront function to ensure redirect works correctly
+* [Bug] Added posiexem to fix M1 chip issue on drupal
+
+### 2.2.0 (2022-08-10)
+* [Feature] Can now skip diagnose in `fw diagnose`
+* [Feature] Can now provision AWS environments using `fw provision`
+* [Change] Now requires node > 16
+* [Change] Auditted npm dependencies
+* [Misc] Added test coverage for new AWS service
+
 ### 2.1.0 (2022-05-27)
 * [Change] Bumped core `0.0.21` to `0.1.0`
 

package/_Test/_helpers/globals.js

@@ -0,0 +1,10 @@
+const fs = require('fs');
+const os = require('os');
+const host = "ftp-fishawack.egnyte.com";
+const creds = JSON.parse(fs.readFileSync(`${os.homedir()}/targets/.ftppass`))[host];
+
+module.exports = {
+    opts: {encoding: 'utf8', stdio: process.argv.includes('--publish') ? 'pipe' : 'inherit'},
+    host,
+    creds
+};

package/_Test/boilerplate-craftcms.js

@@ -12,17 +12,17 @@ describe('deploy', () => {
 
         execSync(`git -C _Test/_fixtures clone git@bitbucket.org:fishawackdigital/${repo}`, {encoding: 'utf8', stdio: 'inherit'});
 
-        execSync('fw setup', opts);
+        execSync('node ../../../cli.js setup', opts);
 
-        execSync('fw prod', opts);
+        execSync('node ../../../cli.js prod', opts);
     });
     
     it(`All ${repo} tests should pass`, async () => {
-        expect(execSync('fw test', opts)).to.not.equal(Error);
+        expect(execSync('node ../../../cli.js test', opts)).to.not.equal(Error);
     });
 
     after(() => {
-        execSync('fw nuke', opts)
+        execSync('node ../../../cli.js nuke', opts)
 
         execSync(`rm -rf _Test/_fixtures/${repo}`, {encoding: 'utf8', stdio: 'inherit'});
     });

package/_Test/boilerplate-drupal.js

@@ -12,17 +12,17 @@ describe('deploy', () => {
 
         execSync(`git -C _Test/_fixtures clone git@bitbucket.org:fishawackdigital/${repo}`, {encoding: 'utf8', stdio: 'inherit'});
 
-        execSync('fw setup', opts);
+        execSync('node ../../../cli.js setup', opts);
 
-        execSync('fw prod', opts);
+        execSync('node ../../../cli.js prod', opts);
     });
     
     it(`All ${repo} tests should pass`, async () => {
-        expect(execSync('fw test', opts)).to.not.equal(Error);
+        expect(execSync('node ../../../cli.js test', opts)).to.not.equal(Error);
     });
 
     after(() => {
-        execSync('fw nuke', opts)
+        execSync('node ../../../cli.js nuke', opts)
 
         execSync(`rm -rf _Test/_fixtures/${repo}`, {encoding: 'utf8', stdio: 'inherit'});
     });

package/_Test/boilerplate-laravel.js

@@ -12,17 +12,17 @@ describe('deploy', () => {
 
         execSync(`git -C _Test/_fixtures clone git@bitbucket.org:fishawackdigital/${repo}`, {encoding: 'utf8', stdio: 'inherit'});
 
-        execSync('fw setup', opts);
+        execSync('node ../../../cli.js setup', opts);
 
-        execSync('fw prod', opts);
+        execSync('node ../../../cli.js prod', opts);
     });
     
     it(`All ${repo} tests should pass`, async () => {
-        expect(execSync('fw test', opts)).to.not.equal(Error);
+        expect(execSync('node ../../../cli.js test', opts)).to.not.equal(Error);
     });
 
     after(() => {
-        execSync('fw nuke', opts)
+        execSync('node ../../../cli.js nuke', opts)
 
         execSync(`rm -rf _Test/_fixtures/${repo}`, {encoding: 'utf8', stdio: 'inherit'});
     });

package/_Test/boilerplate-wordpress.js

@@ -12,17 +12,17 @@ describe('deploy', () => {
 
         execSync(`git -C _Test/_fixtures clone git@bitbucket.org:fishawackdigital/${repo}`, {encoding: 'utf8', stdio: 'inherit'});
 
-        execSync('fw setup', opts);
+        execSync('node ../../../cli.js setup', opts);
 
-        execSync('fw prod', opts);
+        execSync('node ../../../cli.js prod', opts);
     });
     
     it(`All ${repo} tests should pass`, async () => {
-        expect(execSync('fw test', opts)).to.not.equal(Error);
+        expect(execSync('node ../../../cli.js test', opts)).to.not.equal(Error);
     });
 
     after(() => {
-        execSync('fw nuke', opts)
+        execSync('node ../../../cli.js nuke', opts)
 
         execSync(`rm -rf _Test/_fixtures/${repo}`, {encoding: 'utf8', stdio: 'inherit'});
     });

package/_Test/boilerplate.js

@@ -12,17 +12,17 @@ describe('deploy', () => {
 
         execSync(`git -C _Test/_fixtures clone git@bitbucket.org:fishawackdigital/${repo}`, {encoding: 'utf8', stdio: 'inherit'});
 
-        execSync('fw setup', opts);
+        execSync('node ../../../cli.js setup', opts);
 
-        execSync('fw prod', opts);
+        execSync('node ../../../cli.js prod', opts);
     });
     
     it(`All ${repo} tests should pass`, async () => {
-        expect(execSync('fw test', opts)).to.not.equal(Error);
+        expect(execSync('node ../../../cli.js test', opts)).to.not.equal(Error);
     });
 
     after(() => {
-        execSync('fw nuke', opts)
+        execSync('node ../../../cli.js nuke', opts)
 
         execSync(`rm -rf _Test/_fixtures/${repo}`, {encoding: 'utf8', stdio: 'inherit'});
     });

package/_Test/check.js

@@ -0,0 +1,29 @@
+'use strict';
+
+const repo = `newrepo`;
+const opts = {encoding: 'utf8', stdio: 'inherit', cwd: `_Test/_fixtures/${repo}`};
+
+const expect = require('chai').expect;
+const execSync = require('child_process').execSync;
+
+describe('check', () => {
+    before(function(){
+        execSync(`mkdir _Test/_fixtures/${repo} && cd _Test/_fixtures/${repo} && npm init -y`, {encoding: 'utf8', stdio: 'inherit'});
+
+        execSync('node ../../../cli.js install lodash@4.17.15 query-string@7.1.1', opts);
+    });
+    
+    it(`Should flag query-string as non es5 dependency`, () => {
+        expect(execSync('node ../../../cli.js check', {cwd: `_Test/_fixtures/${repo}`}).toString()).to.contain('query-string');
+    });
+
+    it(`Should not flag lodash as es5 dependency`, () => {
+        expect(execSync('node ../../../cli.js check', {cwd: `_Test/_fixtures/${repo}`}).toString()).to.not.contain('lodash');
+    });
+
+    after(() => {
+        execSync('node ../../../cli.js nuke', opts)
+
+        execSync(`rm -rf _Test/_fixtures/${repo}`, {encoding: 'utf8', stdio: 'inherit'});
+    });
+});

package/_Test/key.js

@@ -0,0 +1,33 @@
+'use strict';
+
+const expect = require('chai').expect;
+const aws = require("../commands/create/services/aws/index.js");
+
+describe('key', async () => {
+    let account = 'fishawack';
+
+    before(async () => {
+        let res = await aws.iam.createFWIAMUser('fw-test-user', account);
+
+        // Wait for key as AWS doesn't provide a way to wait for it to becom eactive
+        await new Promise(resolve => setTimeout(() => resolve(), 10000));
+
+        process.env.AWS_ACCESS_KEY_ID = res.AccessKey.AccessKeyId;
+        process.env.AWS_SECRET_ACCESS_KEY = res.AccessKey.SecretAccessKey;
+    });
+    
+    it('Should be able to access AWS service', async () => {
+        let res;
+
+        try{ res = await aws.s3.listS3Buckets(); } catch(e){ console.log(e.message); }
+
+        expect(res).to.not.be.undefined;
+    });
+
+    after(async () => {
+        delete process.env.AWS_ACCESS_KEY_ID;
+        delete process.env.AWS_SECRET_ACCESS_KEY;
+
+        await aws.iam.removeIAMUser('fw-test-user', account);
+    });
+});

package/_Test/provision.js

@@ -0,0 +1,33 @@
+'use strict';
+
+const expect = require('chai').expect;
+const aws = require("../commands/create/services/aws/index.js");
+var fetch;
+
+describe('provision', async () => {
+    let config;
+    let repo = 'lab-env-test-suite';
+    let account = 'fishawack';
+
+    before(async () => {
+        fetch = (await import('node-fetch')).default;
+
+        config = await aws.static(repo, account);
+
+        await aws.s3.addFileToS3Bucket(repo, account, 'index.html', new TextEncoder().encode("test"));
+    });
+
+    it('Should provision s3 bucket', async () => {
+        expect((await fetch(config.url)).status).to.be.equal(200);
+    });
+
+    after(async () => {
+        await aws.s3.removeFileToS3Bucket(repo, account, 'index.html');
+
+        await aws.s3.removeS3Bucket(repo, account);
+        
+        await aws.cloudfront.removeCloudFrontDistribution(config.cloudfront, account);
+
+        await aws.cloudfront.removeCloudFrontFunction(repo, account);
+    });
+});

package/cli.js

@@ -4,10 +4,6 @@ process.env.CWD = process.cwd();
 
 const _ = require('./globals.js');
 
-const updateNotifier = require('update-notifier');
-const pkg = require('./package.json');
-updateNotifier({pkg, updateCheckInterval: 0}).notify();
-
 const execSync = require('child_process').execSync;
 
 const yargs = require('yargs/yargs');
@@ -16,9 +12,13 @@ const { hideBin } = require('yargs/helpers');
 const args = hideBin(process.argv);
 
 // Stop here if docker process not running and command isn't version or origin which don't require docker
-if(!_.services && !(args[0] === 'origin' || args[0] === '--version')) return;
+if(!_.services && !(args[0] === 'origin' || args[0] === '--version')) process.exit();
 
 (async () => {
+    const updateNotifier = (await import('update-notifier')).default;
+    const pkg = require('./package.json');
+    updateNotifier({pkg, updateCheckInterval: 0}).notify();
+
     process.env.REPO = _.repo;
     
     await _.ports.set();
@@ -59,7 +59,7 @@ if(!_.services && !(args[0] === 'origin' || args[0] === '--version')) return;
         ['build', 'config', 'down', 'mocha', 'rebuild', 'up', 'volumes', 'compose'].forEach(d => cli.command(...require(`./commands/docker/${d}.js`)));
 
         // Create commands
-        ['new', 'diagnose', 'delete'].forEach(d => cli.command(...require(`./commands/create/cmds/${d}.js`)));
+        ['new', 'provision', 'deprovision', 'diagnose', 'delete', 'key', 'dekey'].forEach(d => cli.command(...require(`./commands/create/cmds/${d}.js`)));
 
         cli.demandCommand(1, '')
             .wrap(null)

package/commands/check.js

@@ -13,7 +13,7 @@ module.exports = [
             });
     },
     argv => {
-        execSync(`${_.docker} ${_.run}c "check-dependencies ${argv.v ? '' : '&>/dev/null'} && echo -e '\\033[0;32mNpm deps OK\\033[0m' || { echo -e '\\033[0;31mNpm deps missing or outdated\\033[0m'; }"`, _.opts);
+        execSync(`${_.docker} ${_.run}c "check-dependencies ${argv.v ? '' : '&>/dev/null'} && echo -e '\\033[0;32mNpm deps OK\\033[0m' || { echo -e '\\033[0;31mNpm deps missing or outdated\\033[0m'; } && are-you-es5 check . && echo -e '\\033[0;32mNpm-ES5 compatibility OK\\033[0m' || { echo -e '\\033[0;31mNpm-ES5 incompatibilities detected\\033[0m'; }"`, _.opts);
 
         if(_.platform === "laravel" || _.platform === "drupal" || _.platform === "craftcms"){
             execSync(`${_.docker} ${_.method} php bash -lc "composer install --dry-run ${argv.v ? '' : '2>&1'} | grep -q 'Nothing to install, update or remove' && echo -e '\\033[0;32mComposer deps OK\\033[0m' || echo -e '\\033[0;31mComposer deps missing or outdated\\033[0m'"`, _.opts);

package/commands/create/cmds/dekey.js

@@ -0,0 +1,72 @@
+const _ = require('../../../globals.js');
+const utilities = require('../libs/utilities');
+const inquirer = require('inquirer');
+const aws = require('../services/aws/index.js');
+
+module.exports = [
+    'dekey',
+    false,
+    yargs => {},
+    async argv => {
+        let users = [];
+        let clients =  [];
+
+        let answer = await inquirer.prompt([
+            {
+                type: 'confirm',
+                name: 'check',
+                message: `Remove keys for all users`,
+                default: 'Y'
+            }
+        ]);
+
+        if(answer.check){
+            users = _.config.users.map(d => d.username);
+        } else {
+            answer = await inquirer.prompt([
+                {
+                    type: 'checkbox',
+                    name: 'users',
+                    message: 'Select users',
+                    choices: _.config.users.map(d => d.username)
+                }
+            ]);   
+
+            users = answer.users;
+        }
+
+        answer = await inquirer.prompt([
+            {
+                type: 'confirm',
+                name: 'check',
+                message: `Remove keys for all clients`,
+                default: 'Y'
+            }
+        ]);
+
+        if(answer.check){
+            clients = aws.clients;
+        } else {
+            answer = await inquirer.prompt([
+                {
+                    type: 'checkbox',
+                    name: 'clients',
+                    message: 'Select clients',
+                    choices: aws.clients
+                }
+            ]);   
+
+            clients = answer.clients;
+        }
+
+        for(let i = 0; i < clients.length; i++){
+            let client = clients[i];
+
+            for(let j = 0; j < users.length; j++){
+                let user = users[j];
+
+                await aws.iam.removeIAMUser(`fw-automation-${user}`, client);
+            }
+        }
+    }
+];

package/commands/create/cmds/deprovision.js

@@ -0,0 +1,54 @@
+const _ = require('../../../globals.js');
+const inquirer = require('inquirer');
+const aws = require('../services/aws/index.js');
+const utilities = require('../libs/utilities');
+
+module.exports = [
+    ['deprovision', 'deprov'],
+    false,
+    yargs => {
+        yargs.option('branch', {
+            alias: 'b',
+            describe: 'Branch to configure',
+            type: 'string'
+        });
+    },
+    async argv => {
+        let branch = argv.branch || _.branch;
+
+        const answers = await inquirer.prompt([
+            {
+                type: 'input',
+                name: 'id',
+                message: 'What is the Id of the CloudFront distribution?',
+                validate: (input) => !!input.length
+            },
+            {
+                type: 'list',
+                name: 'client',
+                message: 'Which AWS account is this deployed too?',
+                choices: aws.clients,
+                default: 'fishawack'
+            }
+        ]);
+
+        let answer = await inquirer.prompt([
+            {
+                type: 'confirm',
+                name: 'check',
+                message: `Deprovisioning ${utilities.colorize(aws.slug(_.repo, answers.client, branch), 'error')} from ${utilities.colorize(answers.client, 'error')} AWS account, are you sure you want to continue?`,
+                default: false
+            }
+        ]);
+
+        if(!answer.check){
+            process.exit(1);
+        }
+
+        try { await aws.s3.removeS3Bucket(aws.slug(_.repo, answers.client, branch), answers.client); } catch(e) {}
+        
+        try { await aws.cloudfront.removeCloudFrontDistribution(answers.id, answers.client); } catch(e) {}
+
+        try { await aws.cloudfront.removeCloudFrontFunction(aws.slug(_.repo, answers.client, branch), answers.client); } catch(e) {}
+    }
+];

package/commands/create/cmds/diagnose.js

@@ -4,6 +4,10 @@ const egnyte = require("../services/egnyte");
 const gitlab = require("../services/gitlab");
 const guide = require("../services/guide");
 const test = require("../services/test");
+const _ = require('../../../globals.js');
+const path = require('path');
+const {writeFileSync} = require('fs');
+const os = require('os');
 
 module.exports = [
     ['diagnose', 'diag'],
@@ -57,9 +61,11 @@ module.exports = [
                 while(!await test.bitbucket() || !await bitbucket.check()){
                     await guide.bitbucket();
                 }
-    
-                while(!await test.gitlab() || !await gitlab.check()){
-                    await guide.gitlab();
+                
+                if(!await guide.gitlabSkip()) {
+                    while(!await test.gitlab() || !await gitlab.check()){
+                        await guide.gitlab();
+                    }
                 }
     
                 const userRepoName = vars.misc.bitbucket.username.split('@')[0].replace(/\./, '-');
@@ -71,6 +77,12 @@ module.exports = [
     
                 await bitbucket.remove(userRepoName);
             }
+            
+            // Update diagnosis version in ~/.lab-env config file
+            if(_.config.diagnosis !== _.diagnosis){
+                _.config.diagnosis = _.diagnosis;
+                writeFileSync(path.join(os.homedir(), '', '.lab-env'), JSON.stringify(_.config, null, 4));
+            }
         } catch(e){
             if(e.message){
                 console.log(`\nError: ${e.message}`);

package/commands/create/cmds/key.js

@@ -0,0 +1,96 @@
+const _ = require('../../../globals.js');
+const utilities = require('../libs/utilities');
+const inquirer = require('inquirer');
+const aws = require('../services/aws/index.js');
+
+module.exports = [
+    'key',
+    false,
+    yargs => {},
+    async argv => {
+        let users = [];
+        let clients =  [];
+
+        let answer = await inquirer.prompt([
+            {
+                type: 'confirm',
+                name: 'check',
+                message: `Set keys for all users`,
+                default: 'Y'
+            }
+        ]);
+
+        if(answer.check){
+            users = _.config.users.map(d => d.username);
+        } else {
+            answer = await inquirer.prompt([
+                {
+                    type: 'checkbox',
+                    name: 'users',
+                    message: 'Select users',
+                    choices: _.config.users.map(d => d.username)
+                }
+            ]);   
+
+            users = answer.users;
+        }
+
+        answer = await inquirer.prompt([
+            {
+                type: 'confirm',
+                name: 'check',
+                message: `Set keys for all clients`,
+                default: 'Y'
+            }
+        ]);
+
+        if(answer.check){
+            clients = aws.clients;
+        } else {
+            answer = await inquirer.prompt([
+                {
+                    type: 'checkbox',
+                    name: 'clients',
+                    message: 'Select clients',
+                    choices: aws.clients
+                }
+            ]);   
+
+            clients = answer.clients;
+        }
+
+        let credentials = {};
+
+        for(let i = 0; i < clients.length; i++){
+            let client = clients[i];
+
+            for(let j = 0; j < users.length; j++){
+                let user = users[j];
+
+                if(!credentials[user]){
+                    credentials[user] = {};
+                }
+
+                let res = await aws.iam.createFWIAMUser(`fw-automation-${user}`, client);
+
+                credentials[user][client] = {
+                    key: res.AccessKey && res.AccessKey.AccessKeyId || res.AccessKeyMetadata[0].AccessKeyId,
+                    secret: res.AccessKey && res.AccessKey.SecretAccessKey || '** secret **'
+                }
+            }
+        }
+
+        let output = '';
+
+        for(var user in credentials){
+            output += utilities.colorize(`\n${user}\n`, 'title');
+            for(var client in credentials[user]){
+                output += `\n[${client}]\n`;
+                output += `aws_access_key_id = ${credentials[user][client].key}\n`;
+                output += `aws_secret_access_key = ${credentials[user][client].secret}\n`;
+            }
+        }
+
+        console.log(output);
+    }
+];