@fishawack/lab-env 2.2.0 → 3.2.0

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 ## Changelog
 
+### 3.2.0 (2022-09-12)
+* [Feature] Added newly setup AWS accounts to the client prompts on `fw provision`
+* [Change] Clients now listed in alphabetical order
+* [Change] Clients list no longer loops
+
+### 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`

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/cli.js

@@ -59,7 +59,7 @@ if(!_.services && !(args[0] === 'origin' || args[0] === '--version')) process.ex
         ['build', 'config', 'down', 'mocha', 'rebuild', 'up', 'volumes', 'compose'].forEach(d => cli.command(...require(`./commands/docker/${d}.js`)));
 
         // Create commands
-        ['new', 'provision', 'deprovision', '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

@@ -1,6 +1,7 @@
 const _ = require('../../../globals.js');
 const inquirer = require('inquirer');
 const aws = require('../services/aws/index.js');
+const utilities = require('../libs/utilities');
 
 module.exports = [
     ['deprovision', 'deprov'],
@@ -14,19 +15,6 @@ module.exports = [
     },
     async argv => {
         let branch = argv.branch || _.branch;
-        
-        let answer = await inquirer.prompt([
-            {
-                type: 'confirm',
-                name: 'check',
-                message: `Deprovisioning fw-auto-${_.repo}-${branch}, are you sure you want to continue?`,
-                default: 'Y'
-            }
-        ]);
-
-        if(!answer.check){
-            process.exit(1);
-        }
 
         const answers = await inquirer.prompt([
             {
@@ -39,15 +27,28 @@ module.exports = [
                 type: 'list',
                 name: 'client',
                 message: 'Which AWS account is this deployed too?',
-                choices: ['fishawack', 'abbvie', 'sanofigenzyme', 'gsk', 'janssen', 'astrazeneca', 'training'],
+                choices: aws.clients,
                 default: 'fishawack'
             }
         ]);
 
-        try { await aws.s3.removeS3Bucket(`fw-auto-${_.repo}-${branch}`, answers.client); } catch(e) {}
+        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(`fw-auto-${_.repo}-${branch}`, 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'],
@@ -73,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);
+    }
+];

package/commands/create/cmds/provision.js

@@ -37,14 +37,15 @@ module.exports = [
                 name: 'stack',
                 message: 'What type of project are you deploying?',
                 choices: ['static'],
-                default: 'static'
+                default: 0
             },
             {
                 type: 'list',
                 name: 'client',
                 message: 'Which AWS account should this be deployed too?',
-                choices: ['fishawack', 'abbvie', 'sanofigenzyme', 'gsk', 'janssen', 'astrazeneca', 'training'],
-                default: 'fishawack'
+                choices: aws.clients.sort(),
+                default: 0,
+                loop: false
             },
             {
                 type: 'confirm',
@@ -93,7 +94,7 @@ module.exports = [
         let infastructure;
         
         try{
-            infastructure = await aws.static(`fw-auto-${_.repo}-${branch}`, answers.client, [{Key: 'repository', Value: _.repo}, {Key: 'environment', Value: branch}], credentials);
+            infastructure = await aws.static(aws.slug(_.repo, answers.client, branch), answers.client, [{Key: 'repository', Value: _.repo}, {Key: 'environment', Value: branch}], credentials);
         } catch(e){
             console.log(e.message);
             process.exit(1);

package/commands/create/libs/aws-cloudfront-auth.js

@@ -12,7 +12,7 @@ function handler(event) {
         var response = {
             statusCode: 301,
             statusDescription: 'Moved Permanently',
-            headers: { "location": { "value": `${event.request.headers.host.value.split('www.')[1]}${event.request.uri}${query}` } }
+            headers: { "location": { "value": `https://${event.request.headers.host.value.split('www.')[1]}${event.request.uri}${query}` } }
         };
 
         return response;

package/commands/create/libs/aws-cloudfront-simple.js

@@ -12,7 +12,7 @@ function handler(event) {
         var response = {
             statusCode: 301,
             statusDescription: 'Moved Permanently',
-            headers: { "location": { "value": `${event.request.headers.host.value.split('www.')[1]}${event.request.uri}${query}` } }
+            headers: { "location": { "value": `https://${event.request.headers.host.value.split('www.')[1]}${event.request.uri}${query}` } }
         };
 
         return response;

package/commands/create/libs/utilities.js

@@ -8,6 +8,8 @@ const colorize = module.exports.colorize = (str, type) => {
     switch (type) {
         case 'success':
             return chalk.green(str);
+        case 'warning':
+            return chalk.yellow(str);
         case 'error':
             return chalk.red(str);
         case 'title':

package/commands/create/services/aws/cloudfront.js

@@ -1,13 +1,10 @@
 const { CloudFrontClient, CreateDistributionWithTagsCommand, CreateCloudFrontOriginAccessIdentityCommand, DeleteDistributionCommand , DeleteCloudFrontOriginAccessIdentityCommand, GetDistributionCommand, UpdateDistributionCommand, GetCloudFrontOriginAccessIdentityCommand, CreateFunctionCommand, GetFunctionCommand, UpdateFunctionCommand, PublishFunctionCommand, DeleteFunctionCommand, DescribeFunctionCommand } = require("@aws-sdk/client-cloudfront");
 const fs = require('fs');
 const { Spinner } = require('../../libs/utilities');
+const { createClient } = require('./misc.js');
 
-let region = `us-east-1`;
-
-const client = new CloudFrontClient({ region });
-
-module.exports.createCloudFrontDistribution = async (name, account, tags = []) => {
-    process.env.AWS_PROFILE = account;
+module.exports.createCloudFrontDistribution = async (name, account, tags = [], FunctionARN = null, region = 'us-east-1') => {
+    const client = createClient(CloudFrontClient, account, region);
 
     let OAI = await Spinner.prototype.simple(`Creating CloudFront OAI`, () => {
         return client.send(
@@ -46,7 +43,16 @@ module.exports.createCloudFrontDistribution = async (name, account, tags = []) =
                                 Compress: true,
                                 TargetOriginId: `${name}.s3.${region}.amazonaws.com`,
                                 ViewerProtocolPolicy: 'redirect-to-https',
-                                CachePolicyId: '658327ea-f89d-4fab-a63d-7e88639e58f6' // Built in, Managed AWS Policy - Cache Optimized
+                                CachePolicyId: '658327ea-f89d-4fab-a63d-7e88639e58f6', // Built in, Managed AWS Policy - Cache Optimized
+                                FunctionAssociations: FunctionARN && {
+                                    Items: [
+                                        {
+                                            EventType: 'viewer-request',
+                                            FunctionARN
+                                        }
+                                    ],
+                                    Quantity: 1
+                                }
                             },
                             Origins: {
                                 Items: [
@@ -86,7 +92,7 @@ module.exports.createCloudFrontDistribution = async (name, account, tags = []) =
 }
 
 module.exports.removeCloudFrontDistribution = async (Id, account) => {
-    process.env.AWS_PROFILE = account;
+    const client = createClient(CloudFrontClient, account);
 
     let res = await Spinner.prototype.simple(`Retrieving the CloudFront distribution ${Id}`, () => {
         return client.send(
@@ -128,7 +134,7 @@ module.exports.removeCloudFrontDistribution = async (Id, account) => {
 }
 
 module.exports.waitForCloudFrontDistribution = async (Id, account) => {
-    process.env.AWS_PROFILE = account;
+    const client = createClient(CloudFrontClient, account);
 
     let status;
 
@@ -146,7 +152,7 @@ module.exports.waitForCloudFrontDistribution = async (Id, account) => {
 }
 
 module.exports.createCloudFrontFunction = async (name, account, fn, config) => {
-    process.env.AWS_PROFILE = account;
+    const client = createClient(CloudFrontClient, account);
 
     let FunctionConfig = {
         Comment: `lab-env provisioned cloudfront function for project ${name} using code snippet ${fn}.js`,
@@ -202,7 +208,7 @@ module.exports.createCloudFrontFunction = async (name, account, fn, config) => {
 }
 
 module.exports.removeCloudFrontFunction = async (name, account) => {
-    process.env.AWS_PROFILE = account;
+    const client = createClient(CloudFrontClient, account);
 
     let res = await Spinner.prototype.simple(`Retrieving CloudFront function`, () => {
         return client.send(
@@ -225,7 +231,7 @@ module.exports.removeCloudFrontFunction = async (name, account) => {
 }
 
 module.exports.setCloudFrontFunctionAssociation = async (Id, account) => {
-    process.env.AWS_PROFILE = account;
+    const client = createClient(CloudFrontClient, account);
 
     let res = await Spinner.prototype.simple(`Retrieving CloudFront distribution`, () => {
         return client.send(
@@ -264,7 +270,7 @@ module.exports.setCloudFrontFunctionAssociation = async (Id, account) => {
 };
 
 module.exports.removeCloudFrontFunctionAssociation = async (Id, account) => {
-    process.env.AWS_PROFILE = account;
+    const client = createClient(CloudFrontClient, account);
 
     let res = await Spinner.prototype.simple(`Retrieving CloudFront distribution`, () => {
         return client.send(

package/commands/create/services/aws/iam.js

@@ -0,0 +1,170 @@
+const { IAMClient, CreateUserCommand, GetUserCommand, DeleteUserCommand, AttachUserPolicyCommand, ListAttachedUserPoliciesCommand, DetachUserPolicyCommand, CreateAccessKeyCommand, DeleteAccessKeyCommand, ListAccessKeysCommand } = require("@aws-sdk/client-iam");
+const { Spinner } = require('../../libs/utilities');
+const { createClient } = require('./misc.js');
+
+module.exports.createIAMUser = async (UserName, account) => {
+    const client = createClient(IAMClient, account);
+
+    let res;
+
+    try{
+        res = await Spinner.prototype.simple(`Creating IAM user ${UserName}`, () => {
+            return client.send(
+                new CreateUserCommand({ UserName })
+            );
+        });
+    } catch(e){
+        res = await Spinner.prototype.simple(`Retrieving the already existing IAM user ${UserName}`, () => {
+            return client.send(
+                new GetUserCommand({ UserName })
+            );
+        });
+    }
+
+    return res;
+};
+
+module.exports.createFWIAMUser = async (UserName, account) => {
+    await module.exports.createIAMUser(UserName, account);
+
+    await module.exports.syncFWIAMPolicies(UserName, account);
+
+    let res = await module.exports.createAccessKeySafe(UserName, account);
+
+    return res;
+};
+
+module.exports.removeIAMUser = async (UserName, account) => {
+    const client = createClient(IAMClient, account);
+
+    let res;
+
+    try{
+        await Spinner.prototype.simple(`Checking if IAM user ${UserName} exists`, () => {
+            return client.send(
+                new GetUserCommand({ UserName })
+            );
+        });
+
+        await module.exports.removeAllIAMPolicies(UserName, account);
+
+        await module.exports.removeAllAccessKeys(UserName, account);
+
+        res = await Spinner.prototype.simple(`Removing IAM user ${UserName}`, () => {
+            return client.send(
+                new DeleteUserCommand({ UserName })
+            );
+        });
+    } catch(e){
+    }
+
+    return res;
+};
+
+module.exports.attachIAMPolicy = async (UserName, account, policy) => {
+    const client = createClient(IAMClient, account);
+
+    let res = await Spinner.prototype.simple(`Attaching IAM policy ${policy}`, () => {
+        return client.send(
+            new AttachUserPolicyCommand({ UserName, PolicyArn: policy })
+        );
+    });
+
+    return res;
+};
+
+module.exports.syncFWIAMPolicies = async (UserName, account) => {
+    await module.exports.removeAllIAMPolicies(UserName, account);
+    await module.exports.attachIAMPolicy(UserName, account, 'arn:aws:iam::aws:policy/AmazonS3FullAccess');
+    await module.exports.attachIAMPolicy(UserName, account, 'arn:aws:iam::aws:policy/CloudFrontFullAccess');
+};
+
+module.exports.removeIAMPolicy = async (UserName, account, policy) => {
+    const client = createClient(IAMClient, account);
+
+    let res = await Spinner.prototype.simple(`Detaching IAM policy ${policy}`, () => {
+        return client.send(
+            new DetachUserPolicyCommand({ UserName, PolicyArn: policy })
+        );
+    });
+
+    return res;
+};
+
+module.exports.listIAMPolicies = async (UserName, account) => {
+    const client = createClient(IAMClient, account);
+
+    let res = await Spinner.prototype.simple(`Listing IAM policies`, () => {
+        return client.send(
+            new ListAttachedUserPoliciesCommand({ UserName })
+        );
+    });
+
+    return res;
+};
+
+module.exports.removeAllIAMPolicies = async (UserName, account) => {
+    let res = await module.exports.listIAMPolicies(UserName, account);
+
+    for(let i = 0; i < res.AttachedPolicies.length; i++){
+        await module.exports.removeIAMPolicy(UserName, account, res.AttachedPolicies[i].PolicyArn);
+    }
+
+    return res;
+};
+
+module.exports.createAccessKey = async (UserName, account) => {
+    const client = createClient(IAMClient, account);
+
+    let res = await Spinner.prototype.simple(`Creating access key`, () => {
+        return client.send(
+            new CreateAccessKeyCommand({ UserName })
+        );
+    });
+
+    return res;
+};
+
+module.exports.removeAccessKey = async (UserName, account, AccessKeyId) => {
+    const client = createClient(IAMClient, account);
+
+    let res = await Spinner.prototype.simple(`Removing access key ${AccessKeyId}`, () => {
+        return client.send(
+            new DeleteAccessKeyCommand({ AccessKeyId, UserName })
+        );
+    });
+
+    return res;
+};
+
+module.exports.listAccessKeys = async (UserName, account) => {
+    const client = createClient(IAMClient, account);
+
+    let res = await Spinner.prototype.simple(`Listing access keys`, () => {
+        return client.send(
+            new ListAccessKeysCommand({ UserName })
+        );
+    });
+
+    return res;
+};
+
+module.exports.removeAllAccessKeys = async (UserName, account) => {
+    let res = await module.exports.listAccessKeys(UserName, account);
+
+    for(let i = 0; i < res.AccessKeyMetadata.length; i++){
+        await module.exports.removeAccessKey(UserName, account, res.AccessKeyMetadata[i].AccessKeyId);
+    }
+
+    return res;
+};
+
+module.exports.createAccessKeySafe = async (UserName, account) => {
+    let res = await module.exports.listAccessKeys(UserName, account);
+
+    if(!res.AccessKeyMetadata.length){
+        res = await module.exports.createAccessKey(UserName, account);
+    }
+
+    return res;
+};

package/commands/create/services/aws/index.js

@@ -1,16 +1,19 @@
 module.exports.s3 = require("./s3.js");
 module.exports.cloudfront = require("./cloudfront.js");
+module.exports.iam = require("./iam.js");
+
+module.exports.slug = (repo, client, branch) => `fw-auto-${client}-${repo}-${branch}`;
+
+module.exports.clients = ['fishawack', 'abbvie', 'sanofigenzyme', 'gsk', 'janssen', 'astrazeneca', 'ptc', 'jazz', 'pfizer', 'heron', 'novartis', 'training', 'merck', 'acadia', 'travere'];
 
 module.exports.static = async (name, account, tags = [], credentials = []) => {
     let s3 = await module.exports.s3.createS3Bucket(name, account, tags);
 
-    let cloudfront = await module.exports.cloudfront.createCloudFrontDistribution(name, account, tags);
+    let cloudfrontFunction = await module.exports.cloudfront.createCloudFrontFunction(name, account, credentials.length ? 'aws-cloudfront-auth' : 'aws-cloudfront-simple', {credentials: credentials.map(d => `Basic ${Buffer.from(`${d.username}:${d.password}`).toString('base64')}`)});
 
-    await module.exports.s3.setS3BucketPolicy(name, account, cloudfront.Distribution.DistributionConfig.Origins.Items[0].S3OriginConfig.OriginAccessIdentity.split('origin-access-identity/cloudfront/')[1]);
+    let cloudfront = await module.exports.cloudfront.createCloudFrontDistribution(name, account, tags, cloudfrontFunction.FunctionSummary.FunctionMetadata.FunctionARN);
 
-    await module.exports.cloudfront.createCloudFrontFunction(name, account, credentials.length ? 'aws-cloudfront-auth' : 'aws-cloudfront-simple', {credentials: credentials.map(d => `Basic ${Buffer.from(`${d.username}:${d.password}`).toString('base64')}`)});
-
-    await module.exports.cloudfront.setCloudFrontFunctionAssociation(cloudfront.Distribution.Id, account);
+    await module.exports.s3.setS3BucketPolicy(name, account, cloudfront.Distribution.DistributionConfig.Origins.Items[0].S3OriginConfig.OriginAccessIdentity.split('origin-access-identity/cloudfront/')[1]);
 
     let config = {
         "bucket": s3.Location,

package/commands/create/services/aws/misc.js

@@ -0,0 +1,9 @@
+module.exports.createClient = (client, account, region = 'us-east-1') => {
+    delete process.env.AWS_PROFILE;
+
+    if(account){
+        process.env.AWS_PROFILE = account;
+    }
+
+    return new client({ region });
+}

package/commands/create/services/aws/s3.js

@@ -1,12 +1,9 @@
-const { S3Client, CreateBucketCommand, DeleteBucketCommand, PutPublicAccessBlockCommand, PutBucketTaggingCommand, PutBucketPolicyCommand, PutObjectCommand, DeleteObjectCommand } = require("@aws-sdk/client-s3");
+const { S3Client, CreateBucketCommand, DeleteBucketCommand, ListBucketsCommand, PutPublicAccessBlockCommand, PutBucketTaggingCommand, PutBucketPolicyCommand, PutObjectCommand, DeleteObjectCommand } = require("@aws-sdk/client-s3");
 const { Spinner } = require('../../libs/utilities');
-
-let region = `us-east-1`;
-
-const client = new S3Client({ region });
+const { createClient } = require('./misc.js');
 
 module.exports.createS3Bucket = async (bucket, account, tags = []) => {
-    process.env.AWS_PROFILE = account;
+    const client = createClient(S3Client, account);
 
     let res = await Spinner.prototype.simple(`Creating s3 bucket ${bucket}`, () => {
         return client.send(
@@ -29,8 +26,20 @@ module.exports.createS3Bucket = async (bucket, account, tags = []) => {
     return res;
 }
 
+module.exports.listS3Buckets = async (account) => {
+    const client = createClient(S3Client, account);
+
+    let res = await Spinner.prototype.simple(`Listing s3 buckets`, () => {
+        return client.send(
+            new ListBucketsCommand({})
+        );
+    });
+
+    return res;
+}
+
 module.exports.removeS3Bucket = async (bucket, account) => {
-    process.env.AWS_PROFILE = account;
+    const client = createClient(S3Client, account);
 
     await Spinner.prototype.simple(`Removing s3 bucket ${bucket}`, () => {
         return client.send(
@@ -40,7 +49,7 @@ module.exports.removeS3Bucket = async (bucket, account) => {
 }
 
 module.exports.setS3BucketPolicy = async (bucket, account, OAI) => {
-    process.env.AWS_PROFILE = account;
+    const client = createClient(S3Client, account);
 
     let res = await Spinner.prototype.simple(`Updating s3 bucket policy`, () => {
         return client.send(
@@ -69,7 +78,7 @@ module.exports.setS3BucketPolicy = async (bucket, account, OAI) => {
 }
 
 module.exports.addFileToS3Bucket = async (bucket, account, filepath, file) => {
-    process.env.AWS_PROFILE = account;
+    const client = createClient(S3Client, account);
 
     let res = await Spinner.prototype.simple(`Adding file to s3 bucket`, () => {
         return client.send(
@@ -85,7 +94,7 @@ module.exports.addFileToS3Bucket = async (bucket, account, filepath, file) => {
 };
 
 module.exports.removeFileToS3Bucket = async (bucket, account, filepath) => {
-    process.env.AWS_PROFILE = account;
+    const client = createClient(S3Client, account);
 
     let res = await Spinner.prototype.simple(`Removing file from s3 bucket`, () => {
         return client.send(

package/commands/docker/rebuild.js

@@ -11,5 +11,5 @@ module.exports = [
                 default: ''
             });
     },
-    argv => execSync(`${_.docker} build ${argv.image} --no-cache`, _.opts)
+    argv => execSync(`${_.docker} build --no-cache ${argv.image}`, _.opts)
 ];

package/commands/execute.js

@@ -16,6 +16,15 @@ module.exports = [
                 describe: 'Run with a virtual display',
                 type: 'boolean'
             });
+
+        yargs.option('grunt', {
+                alias: 'g',
+                describe: 'Execute a grunt command',
+                type: 'boolean'
+            });
     },
-    argv => execSync(`${_.docker} ${_.run}c "${argv.d ? 'xvfb-run ' : ''}${argv.command.join(' ')}"`, _.opts)
+    argv => {
+        const prep = argv.g ? '$grunt ' : ' ';
+        execSync(`${_.docker} ${_.run}c "${argv.d ? 'xvfb-run ' : ''}${prep}${argv.command.join(prep)}"`, _.opts)
+    }
 ];

package/core/{0.1.0 → 0.2.0}/Dockerfile

@@ -37,6 +37,9 @@ RUN npm install grunt-cli -g
 # Install package.json checker
 RUN npm install check-dependencies -g
 
+# Install node_modules checker
+RUN npm install are-you-es5 -g
+
 # Install imagemagick
 RUN apt-get update && apt-get install -y imagemagick
 
@@ -105,7 +108,7 @@ RUN apt-get update
 
 # Specific chrome version
 # Check available versions here: https://www.ubuntuupdates.org/package/google_chrome/stable/main/base/google-chrome-stable
-ARG CHROME_VERSION="87.0.4280.141-1"
+ARG CHROME_VERSION="105.0.5195.102-1"
 RUN wget --no-verbose -O /tmp/chrome.deb http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${CHROME_VERSION}_amd64.deb
 RUN apt install -y /tmp/chrome.deb
 
@@ -185,10 +188,11 @@ npm(){(\n\
         sed -i \'s/watchTask: true,/watchTask: true,watchOptions: { usePolling: true },port: process.env.PORT || 3000, ui: {port: +process.env.PORT_OPT || 3001},/g\' $PWD/node_modules/@fishawack/core/_Tasks/options/browserSync.js 2>/dev/null || true\n\
         sed -i \'s/watchTask: true,/watchTask: true,watchOptions: { usePolling: true },port: process.env.PORT || 3000, ui: {port: +process.env.PORT_OPT || 3001},/g\' $PWD/node_modules/@fishawack/config-grunt/_Tasks/options/browserSync.js 2>/dev/null || true\n\
         echo "Overwrite webdriver browsers to fix them to specific browser versions"\n\
-        sed -i \'s/exports.config = {.*/exports.config = { seleniumArgs: { drivers: {chrome: { version: "87.0.4280.88" },firefox: { version: "0.28.0" }} },/\' $PWD/node_modules/@fishawack/core/wdio.conf.js 2>/dev/null || true\n\
-        sed -i \'s/exports.config = {.*/exports.config = { seleniumArgs: { drivers: {chrome: { version: "87.0.4280.88" },firefox: { version: "0.28.0" }} },/\' $PWD/node_modules/@fishawack/config-grunt/wdio.conf.js 2>/dev/null || true\n\
+        sed -i \'s/exports.config = {.*/exports.config = { seleniumArgs: { drivers: {chrome: { version: "105.0.5195.52" },firefox: { version: "0.28.0" }} },/\' $PWD/node_modules/@fishawack/core/wdio.conf.js 2>/dev/null || true\n\
+        sed -i \'s/exports.config = {.*/exports.config = { seleniumArgs: { drivers: {chrome: { version: "105.0.5195.52" },firefox: { version: "0.28.0" }} },/\' $PWD/node_modules/@fishawack/config-grunt/wdio.conf.js 2>/dev/null || true\n\
+        sed -i \'s/87.0.4280.88/105.0.5195.52/\' $PWD/node_modules/@fishawack/core/wdio.conf.js 2>/dev/null || true\n\
         sed -i \'s/puppeteer.launch({headless: true}).*/puppeteer.launch({headless: true, args: [ "--no-sandbox", "--disable-setuid-sandbox", "--disable-dev-shm-usage" ]}).then(async browser => {/\' $PWD/node_modules/sprinkle/bin/commands/screenshots.js 2>/dev/null || true\n\
-        npx --no-install selenium-standalone --singleDriverInstall=chrome install --drivers.chrome.version=87.0.4280.88 2>/dev/null || true\n\
+        npx --no-install selenium-standalone --singleDriverInstall=chrome install --drivers.chrome.version=105.0.5195.52 2>/dev/null || true\n\
         npx --no-install selenium-standalone --singleDriverInstall=firefox install --drivers.firefox.version=0.28.0 2>/dev/null || true\n\
         export OVERRIDE=true\n\
     else\n\

package/core/CHANGELOG.md

@@ -1,4 +1,8 @@
 ## Changelog
 
+### 0.2.0 (2022-09-08)
+* [Feature] are-you-es5 dependency now globally installed with npm
+* [Fix] core now points to google-chrome 105 now that 87 is no longer available to download through the image
+
 ### 0.1.0 (2022-05-27)
 * [Feature] Added aws-cli@2 to core container

package/core/package.json

@@ -1,9 +1,10 @@
 {
   "name": "core",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "lab-env docker config for the @fishawack/core npm module",
   "scripts": {
-    "postversion": "mv ./*/ ./$npm_package_version && docker build ./*/ -t fishawack/core:$npm_package_version -t fishawack/core:latest && docker push fishawack/core:$npm_package_version && docker push fishawack/core:latest && git add . && git commit -m 'Bumped core to $npm_package_version'"
+    "preversion": "docker login",
+    "postversion": "mv ./*/ ./$npm_package_version && docker build ./*/ -t fishawack/core:$npm_package_version --platform linux/amd64 -t fishawack/core:latest && docker push fishawack/core:$npm_package_version && docker push fishawack/core:latest && git add . && git commit -m 'Bumped core to $npm_package_version'"
   },
   "author": "Mike Mellor",
   "license": "ISC"

package/drupal/9/apache/apache.conf

@@ -1,3 +1,4 @@
+Mutex posixsem
 LoadModule proxy_fcgi_module modules/mod_proxy_fcgi.so
 
 <VirtualHost *:8080>

package/drupal/9/docker-compose.yml

@@ -36,7 +36,7 @@ services:
     build: 
       context: ./php/
       dockerfile: Dockerfile
-    image: lab-env/drupal/9/php:0.0.3
+    image: lab-env/drupal/9/php:0.0.4
     init: true
     working_dir: /app
     networks:

package/drupal/9/php/Dockerfile

@@ -1,4 +1,4 @@
-FROM chialab/php:7.4-fpm
+FROM chialab/php:8.1-fpm
 
 MAINTAINER Mike Mellor
 

package/globals.js

@@ -1,15 +1,19 @@
 const execSync = require('child_process').execSync;
 const path = require('path');
-const { lstatSync, readdirSync, copyFileSync, existsSync } = require('fs');
+const { lstatSync, readdirSync, copyFileSync, existsSync, readFileSync } = require('fs');
 const semver = require('semver');
 const getPort = require('get-port');
 const utilities = require('./commands/create/libs/utilities');
+const os = require('os');
+const { hideBin } = require('yargs/helpers');
+const args = hideBin(process.argv);
 
 process.env.DIRNAME = __dirname;
 
 const isDirectory = source => lstatSync(source).isDirectory();
 const getDirectories = source => readdirSync(source).map(name => path.join(source, name)).filter(isDirectory);
 
+var config;
 var repo;
 var platform;
 var pkg;
@@ -21,8 +25,24 @@ var exec;
 var running;
 var services;
 var branch;
+var diagnosis = '1.0.0';
 var opts = {encoding: 'utf8', stdio: 'inherit', shell: '/bin/bash'};
 
+try{
+    config = JSON.parse(readFileSync(`${os.homedir()}/.lab-env`, {encoding: 'utf8'}));
+} catch(e){
+    config = {};
+}
+
+if(args[0] !== 'diag' && args[0] !== 'diagnose'){
+    if(!config.diagnosis || semver.diff(config.diagnosis, diagnosis) === 'major'){
+        console.log(`${utilities.colorize(`@fishawack/lab-env`, 'title')} diagnosis is ${utilities.colorize(`outdated`, 'error')}.\n\nRun ${utilities.colorize(`fw diagnose`, 'success')} to reconfigure.`);
+        process.exit(1);
+    } else if(semver.diff(config.diagnosis, diagnosis) !== null){
+        console.log(`${utilities.colorize(`@fishawack/lab-env`, 'title')} diagnosis is ${utilities.colorize(`outdated`, 'warning')}.\n\nRun ${utilities.colorize(`fw diagnose`, 'success')} to reconfigure.`);
+    }
+}
+
 try{
     branch = process.env.BRANCH || process.env.CI_COMMIT_REF_NAME || require('git-branch').sync();
 } catch(e){
@@ -117,6 +137,8 @@ try{
 }
 
 module.exports = {
+    config,
+    diagnosis,
     services,
     platform,
     repo,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fishawack/lab-env",
-  "version": "2.2.0",
+  "version": "3.2.0",
   "description": "Docker manager for FW",
   "main": "cli.js",
   "scripts": {
@@ -23,6 +23,7 @@
   },
   "dependencies": {
     "@aws-sdk/client-cloudfront": "^3.141.0",
+    "@aws-sdk/client-iam": "^3.150.0",
     "@aws-sdk/client-s3": "^3.141.0",
     "axios": "^0.21.4",
     "chalk": "4.1.0",