@fishawack/lab-env 5.7.0-beta.2 → 5.7.0-beta.4

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

@@ -5,22 +5,24 @@ const {
     DescribeDomainCommand,
 } = require("@aws-sdk/client-opensearch");
 const { Spinner, poll } = require("../../libs/utilities");
+const { awsClientConfig } = require("../../libs/vars");
+
+const getClient = () => new OpenSearchClient(awsClientConfig);
 
 module.exports.createOpenSearchDomain = async (
     name,
     securityGroupId,
     privateSubnetIds,
     instanceProfileRole,
+    tags = [],
 ) => {
-    const client = new OpenSearchClient({});
-
     const accountId = instanceProfileRole.split(":")[4] || "*";
     const region = process.env.AWS_REGION;
 
     const res = await Spinner.prototype.simple(
         `Creating OpenSearch domain ${name}`,
         () => {
-            return client.send(
+            return getClient().send(
                 new CreateDomainCommand({
                     DomainName: name,
                     EngineVersion: "OpenSearch_2.19",
@@ -68,6 +70,14 @@ module.exports.createOpenSearchDomain = async (
                             },
                         ],
                     }),
+                    TagList: [
+                        { Key: "client", Value: process.env.AWS_PROFILE },
+                    ].concat(
+                        tags.map((t) => ({
+                            Key: t.Key,
+                            Value: String(t.Value),
+                        })),
+                    ),
                 }),
             );
         },
@@ -77,14 +87,12 @@ module.exports.createOpenSearchDomain = async (
 };
 
 module.exports.waitForOpenSearchDomain = async (name) => {
-    const client = new OpenSearchClient({});
-
     const res = await Spinner.prototype.simple(
         `Waiting for OpenSearch domain to become available (this may take 15-20 minutes)`,
-        () => {
+        (spinner) => {
             return poll(
                 async () => {
-                    const { DomainStatus } = await client.send(
+                    const { DomainStatus } = await getClient().send(
                         new DescribeDomainCommand({ DomainName: name }),
                     );
                     return DomainStatus;
@@ -92,6 +100,8 @@ module.exports.waitForOpenSearchDomain = async (name) => {
                 (status) =>
                     status.Processing ||
                     (!status.Endpoint && !status.Endpoints),
+                undefined,
+                spinner,
             );
         },
     );
@@ -100,12 +110,12 @@ module.exports.waitForOpenSearchDomain = async (name) => {
 };
 
 module.exports.describeOpenSearchDomain = async (name) => {
-    const client = new OpenSearchClient({});
-
     const res = await Spinner.prototype.simple(
         `Describing OpenSearch domain ${name}`,
         () => {
-            return client.send(new DescribeDomainCommand({ DomainName: name }));
+            return getClient().send(
+                new DescribeDomainCommand({ DomainName: name }),
+            );
         },
     );
 
@@ -113,23 +123,19 @@ module.exports.describeOpenSearchDomain = async (name) => {
 };
 
 module.exports.deleteOpenSearchDomain = async (name) => {
-    const client = new OpenSearchClient({});
-
     await Spinner.prototype.simple(`Deleting OpenSearch domain ${name}`, () => {
-        return client.send(new DeleteDomainCommand({ DomainName: name }));
+        return getClient().send(new DeleteDomainCommand({ DomainName: name }));
     });
 };
 
 module.exports.waitForOpenSearchDeletion = async (name) => {
-    const client = new OpenSearchClient({});
-
     await Spinner.prototype.simple(
         `Waiting for OpenSearch domain to be deleted`,
-        () => {
+        (spinner) => {
             return poll(
                 async () => {
                     try {
-                        const { DomainStatus } = await client.send(
+                        const { DomainStatus } = await getClient().send(
                             new DescribeDomainCommand({ DomainName: name }),
                         );
                         return DomainStatus;
@@ -141,6 +147,8 @@ module.exports.waitForOpenSearchDeletion = async (name) => {
                     }
                 },
                 (status) => !status.deleted,
+                undefined,
+                spinner,
             );
         },
     );

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

@@ -13,13 +13,15 @@ const {
     ModifyDBParameterGroupCommand,
 } = require("@aws-sdk/client-rds");
 const { Spinner, poll } = require("../../libs/utilities");
+const { awsClientConfig } = require("../../libs/vars");
+
+const getClient = () => new RDSClient(awsClientConfig);
 
 module.exports.ensureDBSubnetGroup = async (privateSubnetIds) => {
-    const client = new RDSClient({});
     const name = "fw-auto-private-db-subnet-group";
 
     try {
-        await client.send(
+        await getClient().send(
             new DescribeDBSubnetGroupsCommand({
                 DBSubnetGroupName: name,
             }),
@@ -33,7 +35,7 @@ module.exports.ensureDBSubnetGroup = async (privateSubnetIds) => {
     }
 
     await Spinner.prototype.simple(`Creating DB subnet group ${name}`, () => {
-        return client.send(
+        return getClient().send(
             new CreateDBSubnetGroupCommand({
                 DBSubnetGroupName: name,
                 DBSubnetGroupDescription:
@@ -53,12 +55,10 @@ module.exports.createRDSInstance = async (
     securityGroupId,
     subnetGroupName,
 ) => {
-    const client = new RDSClient({});
-
     let res = await Spinner.prototype.simple(
         `Creating RDS instance ${name}`,
         () => {
-            return client.send(
+            return getClient().send(
                 new CreateDBInstanceCommand({
                     DBInstanceIdentifier: name,
                     DBInstanceClass: "db.t3.small",
@@ -86,21 +86,21 @@ module.exports.createRDSInstance = async (
 };
 
 module.exports.waitForRDSInstance = async (name) => {
-    const client = new RDSClient({});
-
     const res = await Spinner.prototype.simple(
         `Waiting for RDS instance to become available`,
-        () => {
+        (spinner) => {
             return poll(
                 async () =>
                     (
-                        await client.send(
+                        await getClient().send(
                             new DescribeDBInstancesCommand({
                                 DBInstanceIdentifier: name,
                             }),
                         )
                     ).DBInstances[0],
                 ({ DBInstanceStatus }) => DBInstanceStatus !== "available",
+                undefined,
+                spinner,
             );
         },
     );
@@ -109,12 +109,10 @@ module.exports.waitForRDSInstance = async (name) => {
 };
 
 module.exports.describeRDSInstance = async (name) => {
-    const client = new RDSClient({});
-
     let res = await Spinner.prototype.simple(
         `Describing RDS instance ${name}`,
         () => {
-            return client.send(
+            return getClient().send(
                 new DescribeDBInstancesCommand({
                     DBInstanceIdentifier: name,
                 }),
@@ -126,10 +124,8 @@ module.exports.describeRDSInstance = async (name) => {
 };
 
 module.exports.deleteRDSInstance = async (name) => {
-    const client = new RDSClient({});
-
     await Spinner.prototype.simple(`Deleting RDS instance ${name}`, () => {
-        return client.send(
+        return getClient().send(
             new DeleteDBInstanceCommand({
                 DBInstanceIdentifier: name,
                 SkipFinalSnapshot: true,
@@ -139,15 +135,13 @@ module.exports.deleteRDSInstance = async (name) => {
 };
 
 module.exports.waitForRDSDeletion = async (name) => {
-    const client = new RDSClient({});
-
     await Spinner.prototype.simple(
         `Waiting for RDS instance to be deleted`,
-        () => {
+        (spinner) => {
             return poll(
                 async () => {
                     try {
-                        const res = await client.send(
+                        const res = await getClient().send(
                             new DescribeDBInstancesCommand({
                                 DBInstanceIdentifier: name,
                             }),
@@ -161,18 +155,18 @@ module.exports.waitForRDSDeletion = async (name) => {
                     }
                 },
                 ({ DBInstanceStatus }) => DBInstanceStatus !== "deleted",
+                undefined,
+                spinner,
             );
         },
     );
 };
 
 module.exports.listManualSnapshots = async () => {
-    const client = new RDSClient({});
-
     const res = await Spinner.prototype.simple(
         `Fetching manual RDS snapshots`,
         () => {
-            return client.send(
+            return getClient().send(
                 new DescribeDBSnapshotsCommand({
                     SnapshotType: "manual",
                 }),
@@ -195,12 +189,10 @@ module.exports.restoreRDSInstanceFromSnapshot = async (
     tags = [],
     subnetGroupName,
 ) => {
-    const client = new RDSClient({});
-
     let res = await Spinner.prototype.simple(
         `Restoring RDS instance ${name} from snapshot ${snapshotId}`,
         () => {
-            return client.send(
+            return getClient().send(
                 new RestoreDBInstanceFromDBSnapshotCommand({
                     DBInstanceIdentifier: name,
                     DBSnapshotIdentifier: snapshotId,
@@ -221,12 +213,10 @@ module.exports.restoreRDSInstanceFromSnapshot = async (
 };
 
 module.exports.modifyRDSPassword = async (name, password) => {
-    const client = new RDSClient({});
-
     await Spinner.prototype.simple(
         `Updating master password for RDS instance ${name}`,
         () => {
-            return client.send(
+            return getClient().send(
                 new ModifyDBInstanceCommand({
                     DBInstanceIdentifier: name,
                     MasterUserPassword: password,
@@ -240,10 +230,8 @@ module.exports.modifyRDSPassword = async (name, password) => {
 const SSL_PARAMETER_GROUP = "lab-env-mysql80-ssl-required";
 
 module.exports.ensureSSLParameterGroup = async () => {
-    const client = new RDSClient({});
-
     try {
-        await client.send(
+        await getClient().send(
             new DescribeDBParameterGroupsCommand({
                 DBParameterGroupName: SSL_PARAMETER_GROUP,
             }),
@@ -252,7 +240,7 @@ module.exports.ensureSSLParameterGroup = async () => {
         await Spinner.prototype.simple(
             `Creating parameter group ${SSL_PARAMETER_GROUP}`,
             () => {
-                return client.send(
+                return getClient().send(
                     new CreateDBParameterGroupCommand({
                         DBParameterGroupName: SSL_PARAMETER_GROUP,
                         DBParameterGroupFamily: "mysql8.0",
@@ -266,7 +254,7 @@ module.exports.ensureSSLParameterGroup = async () => {
         await Spinner.prototype.simple(
             `Enabling require_secure_transport on ${SSL_PARAMETER_GROUP}`,
             () => {
-                return client.send(
+                return getClient().send(
                     new ModifyDBParameterGroupCommand({
                         DBParameterGroupName: SSL_PARAMETER_GROUP,
                         Parameters: [

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

@@ -12,6 +12,9 @@ const {
     DeleteObjectsCommand,
 } = require("@aws-sdk/client-s3");
 const { Spinner } = require("../../libs/utilities");
+const { awsClientConfig } = require("../../libs/vars");
+
+const getClient = () => new S3Client(awsClientConfig);
 
 module.exports.createS3Bucket = async (
     bucket,
@@ -19,12 +22,10 @@ module.exports.createS3Bucket = async (
     blockAccess = true,
     ObjectOwnership = "BucketOwnerEnforced",
 ) => {
-    const client = new S3Client({});
-
     let res = await Spinner.prototype.simple(
         `Creating s3 bucket ${bucket}`,
         () => {
-            return client.send(
+            return getClient().send(
                 new CreateBucketCommand({ Bucket: bucket, ObjectOwnership }),
             );
         },
@@ -43,7 +44,7 @@ module.exports.createS3Bucket = async (
     await Spinner.prototype.simple(
         `Configuring public access settings for s3 bucket`,
         () => {
-            return client.send(
+            return getClient().send(
                 new PutPublicAccessBlockCommand({
                     Bucket: bucket,
                     PublicAccessBlockConfiguration: publicAccessConfig,
@@ -53,7 +54,7 @@ module.exports.createS3Bucket = async (
     );
 
     await Spinner.prototype.simple(`Adding tags to s3 bucket`, () => {
-        return client.send(
+        return getClient().send(
             new PutBucketTaggingCommand({
                 Bucket: bucket,
                 Tagging: {
@@ -69,30 +70,24 @@ module.exports.createS3Bucket = async (
 };
 
 module.exports.listS3Buckets = async () => {
-    const client = new S3Client({});
-
     let res = await Spinner.prototype.simple(`Listing s3 buckets`, () => {
-        return client.send(new ListBucketsCommand({}));
+        return getClient().send(new ListBucketsCommand({}));
     });
 
     return res;
 };
 
 module.exports.removeS3Bucket = async (bucket) => {
-    const client = new S3Client({});
-
     await Spinner.prototype.simple(`Removing s3 bucket ${bucket}`, () => {
-        return client.send(new DeleteBucketCommand({ Bucket: bucket }));
+        return getClient().send(new DeleteBucketCommand({ Bucket: bucket }));
     });
 };
 
 module.exports.setS3BucketPolicy = async (bucket, OAI) => {
-    const client = new S3Client({});
-
     let res = await Spinner.prototype.simple(
         `Updating s3 bucket policy`,
         () => {
-            return client.send(
+            return getClient().send(
                 new PutBucketPolicyCommand({
                     Bucket: bucket,
                     Policy: JSON.stringify({
@@ -122,12 +117,10 @@ module.exports.setS3BucketPolicy = async (bucket, OAI) => {
 };
 
 module.exports.setPublicReadPolicy = async (bucket, prefix) => {
-    const client = new S3Client({});
-
     let res = await Spinner.prototype.simple(
         `Setting public read policy for ${prefix}`,
         () => {
-            return client.send(
+            return getClient().send(
                 new PutBucketPolicyCommand({
                     Bucket: bucket,
                     Policy: JSON.stringify({
@@ -151,10 +144,8 @@ module.exports.setPublicReadPolicy = async (bucket, prefix) => {
 };
 
 module.exports.addFileToS3Bucket = async (bucket, filepath, file) => {
-    const client = new S3Client({});
-
     let res = await Spinner.prototype.simple(`Adding file to s3 bucket`, () => {
-        return client.send(
+        return getClient().send(
             new PutObjectCommand({
                 Bucket: bucket,
                 Body: file,
@@ -167,12 +158,10 @@ module.exports.addFileToS3Bucket = async (bucket, filepath, file) => {
 };
 
 module.exports.removeFileToS3Bucket = async (bucket, filepath) => {
-    const client = new S3Client({});
-
     let res = await Spinner.prototype.simple(
         `Removing file from s3 bucket`,
         () => {
-            return client.send(
+            return getClient().send(
                 new DeleteObjectCommand({
                     Bucket: bucket,
                     Key: filepath,
@@ -185,8 +174,6 @@ module.exports.removeFileToS3Bucket = async (bucket, filepath) => {
 };
 
 module.exports.emptyS3Bucket = async (bucket) => {
-    const client = new S3Client({});
-
     await Spinner.prototype.simple(`Emptying s3 bucket`, () => {
         // eslint-disable-next-line no-async-promise-executor
         return new Promise(async (resolve, reject) => {
@@ -194,7 +181,7 @@ module.exports.emptyS3Bucket = async (bucket) => {
                 let ContinuationToken = null;
 
                 do {
-                    let list = await client.send(
+                    let list = await getClient().send(
                         new ListObjectsV2Command({
                             Bucket: bucket,
                             ContinuationToken,
@@ -202,7 +189,7 @@ module.exports.emptyS3Bucket = async (bucket) => {
                     );
 
                     if (list.KeyCount) {
-                        let deleted = await client.send(
+                        let deleted = await getClient().send(
                             new DeleteObjectsCommand({
                                 Bucket: bucket,
                                 Delete: {

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

@@ -7,12 +7,13 @@ const {
     DeleteSecretCommand,
 } = require("@aws-sdk/client-secrets-manager");
 const { Spinner } = require("../../libs/utilities");
+const { awsClientConfig } = require("../../libs/vars");
 
-module.exports.createSecret = async (name, secretObject, tags = []) => {
-    const client = new SecretsManagerClient({});
+const getClient = () => new SecretsManagerClient(awsClientConfig);
 
+module.exports.createSecret = async (name, secretObject, tags = []) => {
     let res = await Spinner.prototype.simple(`Creating secret ${name}`, () => {
-        return client.send(
+        return getClient().send(
             new CreateSecretCommand({
                 Name: name,
                 SecretString: JSON.stringify(secretObject),
@@ -25,12 +26,10 @@ module.exports.createSecret = async (name, secretObject, tags = []) => {
 };
 
 module.exports.describeSecret = async (name) => {
-    const client = new SecretsManagerClient({});
-
     let res = await Spinner.prototype.simple(
         `Checking for existing secret ${name}`,
         () => {
-            return client.send(
+            return getClient().send(
                 new DescribeSecretCommand({
                     SecretId: name,
                 }),
@@ -42,12 +41,10 @@ module.exports.describeSecret = async (name) => {
 };
 
 module.exports.getSecretValue = async (name) => {
-    const client = new SecretsManagerClient({});
-
     let res = await Spinner.prototype.simple(
         `Retrieving secret ${name}`,
         () => {
-            return client.send(
+            return getClient().send(
                 new GetSecretValueCommand({
                     SecretId: name,
                 }),
@@ -59,10 +56,8 @@ module.exports.getSecretValue = async (name) => {
 };
 
 module.exports.updateSecretValue = async (name, secretObject) => {
-    const client = new SecretsManagerClient({});
-
     let res = await Spinner.prototype.simple(`Updating secret ${name}`, () => {
-        return client.send(
+        return getClient().send(
             new PutSecretValueCommand({
                 SecretId: name,
                 SecretString: JSON.stringify(secretObject),
@@ -74,10 +69,8 @@ module.exports.updateSecretValue = async (name, secretObject) => {
 };
 
 module.exports.deleteSecret = async (name) => {
-    const client = new SecretsManagerClient({});
-
     let res = await Spinner.prototype.simple(`Deleting secret ${name}`, () => {
-        return client.send(
+        return getClient().send(
             new DeleteSecretCommand({
                 SecretId: name,
                 ForceDeleteWithoutRecovery: true,