@fishawack/lab-env 5.1.0 → 5.2.0-beta.2

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

@@ -18,17 +18,15 @@ const fs = require("fs");
 const { merge } = require("lodash");
 const { Spinner, poll } = require("../../libs/utilities");
 const { cloudfront } = require("../../libs/vars");
-const { createClient } = require("./misc.js");
 
 module.exports.createCloudFrontDistribution = async (
     name,
-    account,
     tags = [],
     FunctionARNRequest = null,
     FunctionARNResponse = null,
     region = "us-east-1",
 ) => {
-    const client = createClient(CloudFrontClient, account, region);
+    const client = new CloudFrontClient({});
 
     let OAI = await Spinner.prototype.simple(`Creating CloudFront OAI`, () => {
         return client.send(
@@ -59,7 +57,10 @@ module.exports.createCloudFrontDistribution = async (
                             ),
                             Tags: {
                                 Items: [
-                                    { Key: "client", Value: account },
+                                    {
+                                        Key: "client",
+                                        Value: process.env.AWS_PROFILE,
+                                    },
                                 ].concat(tags),
                             },
                         },
@@ -73,7 +74,6 @@ module.exports.createCloudFrontDistribution = async (
             () => {
                 return module.exports.waitForCloudFrontDistribution(
                     res.Distribution.Id,
-                    account,
                 );
             },
         );
@@ -112,8 +112,8 @@ module.exports.createCloudFrontDistribution = async (
     return res;
 };
 
-module.exports.removeCloudFrontDistribution = async (Id, account) => {
-    const client = createClient(CloudFrontClient, account);
+module.exports.removeCloudFrontDistribution = async (Id) => {
+    const client = new CloudFrontClient({});
 
     let res = await Spinner.prototype.simple(
         `Retrieving the CloudFront distribution ${Id}`,
@@ -147,7 +147,6 @@ module.exports.removeCloudFrontDistribution = async (Id, account) => {
         () => {
             return module.exports.waitForCloudFrontDistribution(
                 res.Distribution.Id,
-                account,
             );
         },
     );
@@ -180,8 +179,8 @@ module.exports.removeCloudFrontDistribution = async (Id, account) => {
     });
 };
 
-module.exports.waitForCloudFrontDistribution = async (Id, account) => {
-    const client = createClient(CloudFrontClient, account);
+module.exports.waitForCloudFrontDistribution = async (Id) => {
+    const client = new CloudFrontClient({});
 
     await poll(
         async () => await client.send(new GetDistributionCommand({ Id })),
@@ -189,8 +188,8 @@ module.exports.waitForCloudFrontDistribution = async (Id, account) => {
     );
 };
 
-module.exports.createCloudFrontFunction = async (name, account, fn, config) => {
-    const client = createClient(CloudFrontClient, account);
+module.exports.createCloudFrontFunction = async (name, fn, config) => {
+    const client = new CloudFrontClient({});
 
     let FunctionConfig = {
         Comment: `lab-env provisioned cloudfront function for project ${name} using code snippet ${fn}.js`,
@@ -261,8 +260,8 @@ module.exports.createCloudFrontFunction = async (name, account, fn, config) => {
     return res;
 };
 
-module.exports.removeCloudFrontFunction = async (name, account) => {
-    const client = createClient(CloudFrontClient, account);
+module.exports.removeCloudFrontFunction = async (name) => {
+    const client = new CloudFrontClient({});
 
     let res = await Spinner.prototype.simple(
         `Retrieving CloudFront function`,
@@ -287,8 +286,8 @@ module.exports.removeCloudFrontFunction = async (name, account) => {
     return res;
 };
 
-module.exports.setCloudFrontFunctionAssociation = async (Id, account) => {
-    const client = createClient(CloudFrontClient, account);
+module.exports.setCloudFrontFunctionAssociation = async (Id) => {
+    const client = new CloudFrontClient({});
 
     let res = await Spinner.prototype.simple(
         `Retrieving CloudFront distribution`,
@@ -339,14 +338,13 @@ module.exports.setCloudFrontFunctionAssociation = async (Id, account) => {
         () => {
             return module.exports.waitForCloudFrontDistribution(
                 res.Distribution.Id,
-                account,
             );
         },
     );
 };
 
-module.exports.removeCloudFrontFunctionAssociation = async (Id, account) => {
-    const client = createClient(CloudFrontClient, account);
+module.exports.removeCloudFrontFunctionAssociation = async (Id) => {
+    const client = new CloudFrontClient({});
 
     let res = await Spinner.prototype.simple(
         `Retrieving CloudFront distribution`,
@@ -379,7 +377,6 @@ module.exports.removeCloudFrontFunctionAssociation = async (Id, account) => {
         () => {
             return module.exports.waitForCloudFrontDistribution(
                 res.Distribution.Id,
-                account,
             );
         },
     );

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

@@ -1,9 +1,8 @@
 const { EC2Client, DescribeKeyPairsCommand } = require("@aws-sdk/client-ec2");
 const { Spinner } = require("../../libs/utilities");
-const { createClient } = require("./misc.js");
 
-module.exports.getKeyPair = async (KeyName, account) => {
-    const client = createClient(EC2Client, account);
+module.exports.getKeyPair = async (KeyName) => {
+    const client = new EC2Client({});
 
     let res = await Spinner.prototype.simple(
         `Retrieving the KeyPair ${KeyName}`,

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

@@ -11,10 +11,9 @@ const {
 } = require("@aws-sdk/client-elastic-beanstalk");
 const { Spinner, poll } = require("../../libs/utilities");
 const { eb } = require("../../libs/vars");
-const { createClient } = require("./misc.js");
 
-module.exports.createElasticBeanstalkApplication = async (name, account) => {
-    const client = createClient(ElasticBeanstalkClient, account);
+module.exports.createElasticBeanstalkApplication = async (name) => {
+    const client = new ElasticBeanstalkClient({});
 
     let res = await Spinner.prototype.simple(
         `Creating elasticbeanstalk application ${name}`,
@@ -30,14 +29,13 @@ module.exports.createElasticBeanstalkApplication = async (name, account) => {
 
 module.exports.createElasticBeanstalkEnvironment = async (
     name,
-    account,
     { language },
     ApplicationName,
     OptionSettings,
     CNAMEPrefix,
     tags = [],
 ) => {
-    const client = createClient(ElasticBeanstalkClient, account);
+    const client = new ElasticBeanstalkClient({});
 
     const solutions = await Spinner.prototype.simple(
         `Retrieving available solution stacks`,
@@ -70,7 +68,9 @@ module.exports.createElasticBeanstalkEnvironment = async (
                     SolutionStackName,
                     OptionSettings,
                     CNAMEPrefix,
-                    Tags: [{ Key: "client", Value: account }].concat(tags),
+                    Tags: [
+                        { Key: "client", Value: process.env.AWS_PROFILE },
+                    ].concat(tags),
                 }),
             );
         },
@@ -81,7 +81,6 @@ module.exports.createElasticBeanstalkEnvironment = async (
         () => {
             return module.exports.waitForElasticBeanstalkEnvironment(
                 name,
-                account,
                 "Ready",
                 "Terminated",
             );
@@ -93,11 +92,10 @@ module.exports.createElasticBeanstalkEnvironment = async (
 
 module.exports.waitForElasticBeanstalkEnvironment = async (
     name,
-    account,
     waitFor = "Ready",
     failIf,
 ) => {
-    const client = createClient(ElasticBeanstalkClient, account);
+    const client = new ElasticBeanstalkClient({});
 
     const res = await poll(
         async () =>
@@ -115,8 +113,8 @@ module.exports.waitForElasticBeanstalkEnvironment = async (
     return res;
 };
 
-module.exports.removeElasticBeanstalkApplication = async (name, account) => {
-    const client = createClient(ElasticBeanstalkClient, account);
+module.exports.removeElasticBeanstalkApplication = async (name) => {
+    const client = new ElasticBeanstalkClient({});
 
     await Spinner.prototype.simple(
         `Removing elasticbeanstalk application ${name}`,
@@ -128,8 +126,8 @@ module.exports.removeElasticBeanstalkApplication = async (name, account) => {
     );
 };
 
-module.exports.removeElasticBeanstalkEnvironment = async (name, account) => {
-    const client = createClient(ElasticBeanstalkClient, account);
+module.exports.removeElasticBeanstalkEnvironment = async (name) => {
+    const client = new ElasticBeanstalkClient({});
 
     await Spinner.prototype.simple(
         `Removing elasticbeanstalk environment ${name}`,
@@ -145,7 +143,6 @@ module.exports.removeElasticBeanstalkEnvironment = async (name, account) => {
         () => {
             return module.exports.waitForElasticBeanstalkEnvironment(
                 name,
-                account,
                 "Terminated",
             );
         },

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

@@ -17,10 +17,9 @@ const {
     PutRolePolicyCommand,
 } = require("@aws-sdk/client-iam");
 const { Spinner } = require("../../libs/utilities");
-const { createClient } = require("./misc.js");
 
-module.exports.createIAMUser = async (UserName, account, tags = []) => {
-    const client = createClient(IAMClient, account);
+module.exports.createIAMUser = async (UserName, tags = []) => {
+    const client = new IAMClient({});
 
     let res;
 
@@ -31,7 +30,9 @@ module.exports.createIAMUser = async (UserName, account, tags = []) => {
                 return client.send(
                     new CreateUserCommand({
                         UserName,
-                        Tags: [{ Key: "client", Value: account }].concat(tags),
+                        Tags: [
+                            { Key: "client", Value: process.env.AWS_PROFILE },
+                        ].concat(tags),
                     }),
                 );
             },
@@ -48,18 +49,18 @@ module.exports.createIAMUser = async (UserName, account, tags = []) => {
     return res;
 };
 
-module.exports.createFWIAMUser = async (UserName, account, permissions) => {
-    await module.exports.createIAMUser(UserName, account);
+module.exports.createFWIAMUser = async (UserName, permissions) => {
+    await module.exports.createIAMUser(UserName);
 
-    await module.exports.syncFWIAMPolicies(UserName, account, permissions);
+    await module.exports.syncFWIAMPolicies(UserName, permissions);
 
-    let res = await module.exports.createAccessKeySafe(UserName, account);
+    let res = await module.exports.createAccessKeySafe(UserName);
 
     return res;
 };
 
-module.exports.removeIAMUser = async (UserName, account) => {
-    const client = createClient(IAMClient, account);
+module.exports.removeIAMUser = async (UserName) => {
+    const client = new IAMClient({});
 
     let res;
 
@@ -71,9 +72,9 @@ module.exports.removeIAMUser = async (UserName, account) => {
             },
         );
 
-        await module.exports.removeAllIAMPolicies(UserName, account);
+        await module.exports.removeAllIAMPolicies(UserName);
 
-        await module.exports.removeAllAccessKeys(UserName, account);
+        await module.exports.removeAllAccessKeys(UserName);
 
         res = await Spinner.prototype.simple(
             `Removing IAM user ${UserName}`,
@@ -88,8 +89,8 @@ module.exports.removeIAMUser = async (UserName, account) => {
     return res;
 };
 
-module.exports.attachIAMPolicy = async (UserName, account, policy) => {
-    const client = createClient(IAMClient, account);
+module.exports.attachIAMPolicy = async (UserName, policy) => {
+    const client = new IAMClient({});
 
     let res = await Spinner.prototype.simple(
         `Attaching IAM policy ${policy}`,
@@ -105,10 +106,9 @@ module.exports.attachIAMPolicy = async (UserName, account, policy) => {
 
 module.exports.syncFWIAMPolicies = async (
     UserName,
-    account,
     permissions = ["auto-content", "deploy-static"],
 ) => {
-    await module.exports.removeAllIAMPolicies(UserName, account);
+    await module.exports.removeAllIAMPolicies(UserName);
 
     if (
         permissions.includes("auto-content") ||
@@ -116,7 +116,6 @@ module.exports.syncFWIAMPolicies = async (
     ) {
         await module.exports.attachIAMPolicy(
             UserName,
-            account,
             "arn:aws:iam::aws:policy/AmazonS3FullAccess",
         );
     }
@@ -124,7 +123,6 @@ module.exports.syncFWIAMPolicies = async (
     if (permissions.includes("deploy-static")) {
         await module.exports.attachIAMPolicy(
             UserName,
-            account,
             "arn:aws:iam::aws:policy/CloudFrontFullAccess",
         );
     }
@@ -132,13 +130,11 @@ module.exports.syncFWIAMPolicies = async (
     if (permissions.includes("deploy-fullstack")) {
         await module.exports.attachIAMPolicy(
             UserName,
-            account,
             "arn:aws:iam::aws:policy/AdministratorAccess-AWSElasticBeanstalk",
         );
 
         await module.exports.attachIAMPolicy(
             UserName,
-            account,
             "arn:aws:iam::aws:policy/AmazonOpenSearchServiceFullAccess",
         );
     }
@@ -146,14 +142,13 @@ module.exports.syncFWIAMPolicies = async (
     if (permissions.includes("manage-users")) {
         await module.exports.attachIAMPolicy(
             UserName,
-            account,
             "arn:aws:iam::aws:policy/IAMFullAccess",
         );
     }
 };
 
-module.exports.removeIAMPolicy = async (UserName, account, policy) => {
-    const client = createClient(IAMClient, account);
+module.exports.removeIAMPolicy = async (UserName, policy) => {
+    const client = new IAMClient({});
 
     let res = await Spinner.prototype.simple(
         `Detaching IAM policy ${policy}`,
@@ -167,8 +162,8 @@ module.exports.removeIAMPolicy = async (UserName, account, policy) => {
     return res;
 };
 
-module.exports.listIAMPolicies = async (UserName, account) => {
-    const client = createClient(IAMClient, account);
+module.exports.listIAMPolicies = async (UserName) => {
+    const client = new IAMClient({});
 
     let res = await Spinner.prototype.simple(`Listing IAM policies`, () => {
         return client.send(new ListAttachedUserPoliciesCommand({ UserName }));
@@ -177,13 +172,12 @@ module.exports.listIAMPolicies = async (UserName, account) => {
     return res;
 };
 
-module.exports.removeAllIAMPolicies = async (UserName, account) => {
-    let res = await module.exports.listIAMPolicies(UserName, account);
+module.exports.removeAllIAMPolicies = async (UserName) => {
+    let res = await module.exports.listIAMPolicies(UserName);
 
     for (let i = 0; i < res.AttachedPolicies.length; i++) {
         await module.exports.removeIAMPolicy(
             UserName,
-            account,
             res.AttachedPolicies[i].PolicyArn,
         );
     }
@@ -191,8 +185,8 @@ module.exports.removeAllIAMPolicies = async (UserName, account) => {
     return res;
 };
 
-module.exports.createAccessKey = async (UserName, account) => {
-    const client = createClient(IAMClient, account);
+module.exports.createAccessKey = async (UserName) => {
+    const client = new IAMClient({});
 
     let res = await Spinner.prototype.simple(`Creating access key`, () => {
         return client.send(new CreateAccessKeyCommand({ UserName }));
@@ -201,8 +195,8 @@ module.exports.createAccessKey = async (UserName, account) => {
     return res;
 };
 
-module.exports.removeAccessKey = async (UserName, account, AccessKeyId) => {
-    const client = createClient(IAMClient, account);
+module.exports.removeAccessKey = async (UserName, AccessKeyId) => {
+    const client = new IAMClient({});
 
     let res = await Spinner.prototype.simple(
         `Removing access key ${AccessKeyId}`,
@@ -216,8 +210,8 @@ module.exports.removeAccessKey = async (UserName, account, AccessKeyId) => {
     return res;
 };
 
-module.exports.listAccessKeys = async (UserName, account) => {
-    const client = createClient(IAMClient, account);
+module.exports.listAccessKeys = async (UserName) => {
+    const client = new IAMClient({});
 
     let res = await Spinner.prototype.simple(`Listing access keys`, () => {
         return client.send(new ListAccessKeysCommand({ UserName }));
@@ -226,13 +220,12 @@ module.exports.listAccessKeys = async (UserName, account) => {
     return res;
 };
 
-module.exports.removeAllAccessKeys = async (UserName, account) => {
-    let res = await module.exports.listAccessKeys(UserName, account);
+module.exports.removeAllAccessKeys = async (UserName) => {
+    let res = await module.exports.listAccessKeys(UserName);
 
     for (let i = 0; i < res.AccessKeyMetadata.length; i++) {
         await module.exports.removeAccessKey(
             UserName,
-            account,
             res.AccessKeyMetadata[i].AccessKeyId,
         );
     }
@@ -240,18 +233,18 @@ module.exports.removeAllAccessKeys = async (UserName, account) => {
     return res;
 };
 
-module.exports.createAccessKeySafe = async (UserName, account) => {
-    let res = await module.exports.listAccessKeys(UserName, account);
+module.exports.createAccessKeySafe = async (UserName) => {
+    let res = await module.exports.listAccessKeys(UserName);
 
     if (!res.AccessKeyMetadata.length) {
-        res = await module.exports.createAccessKey(UserName, account);
+        res = await module.exports.createAccessKey(UserName);
     }
 
     return res;
 };
 
-module.exports.getRole = async (RoleName, account) => {
-    const client = createClient(IAMClient, account);
+module.exports.getRole = async (RoleName) => {
+    const client = new IAMClient({});
 
     let res = await Spinner.prototype.simple(
         `Retrieving the role ${RoleName}`,
@@ -263,12 +256,8 @@ module.exports.getRole = async (RoleName, account) => {
     return res;
 };
 
-module.exports.createRole = async (
-    RoleName,
-    account,
-    AssumeRolePolicyDocument,
-) => {
-    const client = createClient(IAMClient, account);
+module.exports.createRole = async (RoleName, AssumeRolePolicyDocument) => {
+    const client = new IAMClient({});
 
     let res = await Spinner.prototype.simple(
         `Creating the role ${RoleName}`,
@@ -282,8 +271,8 @@ module.exports.createRole = async (
     return res;
 };
 
-module.exports.createInstanceProfile = async (InstanceProfileName, account) => {
-    const client = createClient(IAMClient, account);
+module.exports.createInstanceProfile = async (InstanceProfileName) => {
+    const client = new IAMClient({});
 
     let res = await Spinner.prototype.simple(
         `Creating the instance profile ${InstanceProfileName}`,
@@ -300,9 +289,8 @@ module.exports.createInstanceProfile = async (InstanceProfileName, account) => {
 module.exports.attachRoleToInstanceProfile = async (
     RoleName,
     InstanceProfileName,
-    account,
 ) => {
-    const client = createClient(IAMClient, account);
+    const client = new IAMClient({});
 
     let res = await Spinner.prototype.simple(
         `Attaching role ${RoleName} to the instance profile ${InstanceProfileName}`,
@@ -319,8 +307,8 @@ module.exports.attachRoleToInstanceProfile = async (
     return res;
 };
 
-module.exports.attachRolePolicy = async (RoleName, account, PolicyArn) => {
-    const client = createClient(IAMClient, account);
+module.exports.attachRolePolicy = async (RoleName, PolicyArn) => {
+    const client = new IAMClient({});
 
     let res = await Spinner.prototype.simple(
         `Attaching Role policy ${PolicyArn}`,
@@ -336,11 +324,10 @@ module.exports.attachRolePolicy = async (RoleName, account, PolicyArn) => {
 
 module.exports.attachInlineRolePolicy = async (
     RoleName,
-    account,
     PolicyName,
     PolicyDocument,
 ) => {
-    const client = createClient(IAMClient, account);
+    const client = new IAMClient({});
 
     let res = await Spinner.prototype.simple(
         `Attaching Inline Role policy ${PolicyName}`,
@@ -358,15 +345,14 @@ module.exports.attachInlineRolePolicy = async (
     return res;
 };
 
-module.exports.ensureEBInstanceProfileExists = async (account) => {
+module.exports.ensureEBInstanceProfileExists = async () => {
     const role = "aws-elasticbeanstalk-ec2-role";
 
     try {
-        await module.exports.getRole(role, account);
+        await module.exports.getRole(role);
     } catch {
         await module.exports.createRole(
             role,
-            account,
             JSON.stringify({
                 Version: "2012-10-17",
                 Statement: [
@@ -381,28 +367,24 @@ module.exports.ensureEBInstanceProfileExists = async (account) => {
             }),
         );
 
-        await module.exports.createInstanceProfile(role, account);
-        await module.exports.attachRoleToInstanceProfile(role, role, account);
+        await module.exports.createInstanceProfile(role);
+        await module.exports.attachRoleToInstanceProfile(role, role);
     }
 
     await module.exports.attachRolePolicy(
         role,
-        account,
         "arn:aws:iam::aws:policy/AWSElasticBeanstalkWebTier",
     );
     await module.exports.attachRolePolicy(
         role,
-        account,
         "arn:aws:iam::aws:policy/AWSElasticBeanstalkWorkerTier",
     );
     await module.exports.attachRolePolicy(
         role,
-        account,
         "arn:aws:iam::aws:policy/AWSElasticBeanstalkMulticontainerDocker",
     );
     await module.exports.attachInlineRolePolicy(
         role,
-        account,
         "lab-env-elasticbeanstalk-describe-env",
         JSON.stringify({
             Version: "2012-10-17",
@@ -421,3 +403,79 @@ module.exports.ensureEBInstanceProfileExists = async (account) => {
         }),
     );
 };
+
+module.exports.ensureEBManagedUpdateProfileExists = async () => {
+    const role = "lab-env-aws-elasticbeanstalk-service-role";
+
+    try {
+        await module.exports.getRole(role);
+    } catch {
+        await module.exports.createRole(
+            role,
+            JSON.stringify({
+                Version: "2012-10-17",
+                Statement: [
+                    {
+                        Sid: "ElasticBeanstalkAssumeRole",
+                        Effect: "Allow",
+                        Principal: {
+                            Service: "elasticbeanstalk.amazonaws.com",
+                        },
+                        Action: "sts:AssumeRole",
+                        Condition: {
+                            StringEquals: {
+                                "sts:ExternalId": "elasticbeanstalk",
+                            },
+                        },
+                    },
+                    {
+                        Sid: "ElasticBeanstalkManagedUpdatesAssumeRole",
+                        Effect: "Allow",
+                        Principal: {
+                            Service:
+                                "managedupdates.elasticbeanstalk.amazonaws.com",
+                        },
+                        Action: "sts:AssumeRole",
+                    },
+                ],
+            }),
+        );
+
+        await module.exports.createInstanceProfile(role);
+        await module.exports.attachRoleToInstanceProfile(role, role);
+    }
+
+    await module.exports.attachRolePolicy(
+        role,
+        "arn:aws:iam::aws:policy/service-role/AWSElasticBeanstalkEnhancedHealth",
+    );
+
+    await module.exports.attachRolePolicy(
+        role,
+        "arn:aws:iam::aws:policy/AWSElasticBeanstalkManagedUpdatesCustomerRolePolicy",
+    );
+
+    await module.exports.attachInlineRolePolicy(
+        role,
+        "lab-env-elasticbeanstalk-custom-managed-updates-permissions",
+        JSON.stringify({
+            Version: "2012-10-17",
+            Statement: [
+                {
+                    Sid: "VisualEditor0",
+                    Effect: "Allow",
+                    Action: [
+                        "es:DescribeDomain",
+                        "es:DescribeElasticsearchDomain",
+                        "es:ListTags",
+                        "cloudwatch:PutMetricAlarm",
+                        "cloudwatch:DeleteAlarms",
+                        "cloudwatch:DescribeAlarms",
+                        "cloudwatch:PutMetricData",
+                    ],
+                    Resource: "*",
+                },
+            ],
+        }),
+    );
+};