@fishawack/lab-env 2.2.0 → 3.0.0

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 ## Changelog
 
+### 3.0.0 (2022-08-17)
+* [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/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/create/cmds/dekey.js

@@ -0,0 +1,75 @@
+const _ = require('../../../globals.js');
+const utilities = require('../libs/utilities');
+const inquirer = require('inquirer');
+const aws = require('../services/aws/index.js');
+const fs = require('fs');
+const os = require('os');
+
+module.exports = [
+    'dekey',
+    false,
+    yargs => {},
+    async argv => {
+        let config = JSON.parse(fs.readFileSync(`${os.homedir()}/.lab-env`, {encoding: 'utf8'}));
+        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/key.js

@@ -0,0 +1,99 @@
+const _ = require('../../../globals.js');
+const utilities = require('../libs/utilities');
+const inquirer = require('inquirer');
+const aws = require('../services/aws/index.js');
+const fs = require('fs');
+const os = require('os');
+
+module.exports = [
+    'key',
+    false,
+    yargs => {},
+    async argv => {
+        let config = JSON.parse(fs.readFileSync(`${os.homedir()}/.lab-env`, {encoding: 'utf8'}));
+        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

@@ -43,7 +43,7 @@ module.exports = [
                 type: 'list',
                 name: 'client',
                 message: 'Which AWS account should this be deployed too?',
-                choices: ['fishawack', 'abbvie', 'sanofigenzyme', 'gsk', 'janssen', 'astrazeneca', 'training'],
+                choices: aws.clients,
                 default: 'fishawack'
             },
             {
@@ -93,7 +93,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/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'];
 
 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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fishawack/lab-env",
-  "version": "2.2.0",
+  "version": "3.0.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",