@fishawack/lab-env 5.7.0-beta.1 → 5.7.0-beta.3

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

@@ -1,3 +1,4 @@
+const dns = require("dns").promises;
 const {
     CloudFrontClient,
     CreateDistributionWithTagsCommand,
@@ -20,7 +21,9 @@ const {
 const fs = require("fs");
 const { merge } = require("lodash");
 const { Spinner, poll } = require("../../libs/utilities");
-const { cloudfront } = require("../../libs/vars");
+const { cloudfront, awsClientConfig } = require("../../libs/vars");
+
+const getClient = () => new CloudFrontClient(awsClientConfig);
 
 module.exports.createCloudFrontDistribution = async (
     name,
@@ -29,10 +32,8 @@ module.exports.createCloudFrontDistribution = async (
     FunctionARNResponse = null,
     region = "us-east-1",
 ) => {
-    const client = new CloudFrontClient({});
-
     let OAI = await Spinner.prototype.simple(`Creating CloudFront OAI`, () => {
-        return client.send(
+        return getClient().send(
             new CreateCloudFrontOriginAccessIdentityCommand({
                 CloudFrontOriginAccessIdentityConfig: {
                     CallerReference: name,
@@ -48,7 +49,7 @@ module.exports.createCloudFrontDistribution = async (
         res = await Spinner.prototype.simple(
             `Creating CloudFront distribution with CloudFront OAI and tags`,
             () => {
-                return client.send(
+                return getClient().send(
                     new CreateDistributionWithTagsCommand({
                         DistributionConfigWithTags: {
                             ...cloudfront(
@@ -80,20 +81,29 @@ module.exports.createCloudFrontDistribution = async (
                 );
             },
         );
+
+        await Spinner.prototype.simple(
+            `Waiting for CloudFront DNS to propagate`,
+            () => {
+                return module.exports.waitForCloudFrontDNS(
+                    res.Distribution.DomainName,
+                );
+            },
+        );
     } catch (e) {
         let Id = e.message.split(" ")[e.message.split(" ").length - 1];
 
         res = await Spinner.prototype.simple(
             `Retrieving the already existing CloudFront distribution`,
             () => {
-                return client.send(new GetDistributionCommand({ Id }));
+                return getClient().send(new GetDistributionCommand({ Id }));
             },
         );
 
         res = await Spinner.prototype.simple(
             `Ensuring CloudFront functions are applied to CloudFront distribution`,
             () => {
-                return client.send(
+                return getClient().send(
                     new UpdateDistributionCommand({
                         ...merge(
                             res.Distribution,
@@ -116,12 +126,10 @@ module.exports.createCloudFrontDistribution = async (
 };
 
 module.exports.removeCloudFrontDistribution = async (Id) => {
-    const client = new CloudFrontClient({});
-
     let res = await Spinner.prototype.simple(
         `Retrieving the CloudFront distribution ${Id}`,
         () => {
-            return client.send(new GetDistributionCommand({ Id }));
+            return getClient().send(new GetDistributionCommand({ Id }));
         },
     );
 
@@ -135,7 +143,7 @@ module.exports.removeCloudFrontDistribution = async (Id) => {
     res = await Spinner.prototype.simple(
         `Disabling the CloudFront distribution`,
         () => {
-            return client.send(
+            return getClient().send(
                 new UpdateDistributionCommand({
                     DistributionConfig: res.Distribution.DistributionConfig,
                     Id,
@@ -157,7 +165,7 @@ module.exports.removeCloudFrontDistribution = async (Id) => {
     res = await Spinner.prototype.simple(
         `Deleting the CloudFront distribution`,
         () => {
-            return client.send(
+            return getClient().send(
                 new DeleteDistributionCommand({ Id, IfMatch: res.ETag }),
             );
         },
@@ -166,14 +174,14 @@ module.exports.removeCloudFrontDistribution = async (Id) => {
     res = await Spinner.prototype.simple(
         `Retrieving the CloudFront OAI`,
         () => {
-            return client.send(
+            return getClient().send(
                 new GetCloudFrontOriginAccessIdentityCommand({ Id: OAI }),
             );
         },
     );
 
     res = await Spinner.prototype.simple(`Deleting the CloudFront OAI`, () => {
-        return client.send(
+        return getClient().send(
             new DeleteCloudFrontOriginAccessIdentityCommand({
                 Id: OAI,
                 IfMatch: res.ETag,
@@ -183,17 +191,27 @@ module.exports.removeCloudFrontDistribution = async (Id) => {
 };
 
 module.exports.waitForCloudFrontDistribution = async (Id) => {
-    const client = new CloudFrontClient({});
-
     await poll(
-        async () => await client.send(new GetDistributionCommand({ Id })),
+        async () => await getClient().send(new GetDistributionCommand({ Id })),
         (res) => res.Distribution.Status !== "Deployed",
     );
 };
 
-module.exports.createCloudFrontFunction = async (name, fn, config) => {
-    const client = new CloudFrontClient({});
+module.exports.waitForCloudFrontDNS = async (domain) => {
+    await poll(
+        async () => {
+            try {
+                await dns.resolve(domain);
+                return true;
+            } catch {
+                return false;
+            }
+        },
+        (resolved) => !resolved,
+    );
+};
 
+module.exports.createCloudFrontFunction = async (name, fn, config) => {
     let FunctionConfig = {
         Comment: `${name} - ${fn}.js`,
         Runtime: `cloudfront-js-1.0`,
@@ -205,7 +223,7 @@ module.exports.createCloudFrontFunction = async (name, fn, config) => {
         res = await Spinner.prototype.simple(
             `Creating CloudFront function`,
             () => {
-                return client.send(
+                return getClient().send(
                     new CreateFunctionCommand({
                         Name: name,
                         FunctionCode: new TextEncoder().encode(" "),
@@ -218,7 +236,7 @@ module.exports.createCloudFrontFunction = async (name, fn, config) => {
         res = await Spinner.prototype.simple(
             `Retrieving the already existing CloudFront function`,
             () => {
-                return client.send(
+                return getClient().send(
                     new GetFunctionCommand({
                         Name: name,
                     }),
@@ -237,7 +255,7 @@ module.exports.createCloudFrontFunction = async (name, fn, config) => {
     res = await Spinner.prototype.simple(
         `Updating CloudFront function with ${fn}.js code`,
         () => {
-            return client.send(
+            return getClient().send(
                 new UpdateFunctionCommand({
                     Name: name,
                     FunctionCode: new TextEncoder().encode(processedFn),
@@ -251,7 +269,7 @@ module.exports.createCloudFrontFunction = async (name, fn, config) => {
     res = await Spinner.prototype.simple(
         `Publishing CloudFront function`,
         () => {
-            return client.send(
+            return getClient().send(
                 new PublishFunctionCommand({
                     Name: name,
                     IfMatch: res.ETag,
@@ -264,12 +282,10 @@ module.exports.createCloudFrontFunction = async (name, fn, config) => {
 };
 
 module.exports.removeCloudFrontFunction = async (name) => {
-    const client = new CloudFrontClient({});
-
     let res = await Spinner.prototype.simple(
         `Retrieving CloudFront function`,
         () => {
-            return client.send(
+            return getClient().send(
                 new GetFunctionCommand({
                     Name: name,
                 }),
@@ -278,7 +294,7 @@ module.exports.removeCloudFrontFunction = async (name) => {
     );
 
     res = await Spinner.prototype.simple(`Deleting CloudFront function`, () => {
-        return client.send(
+        return getClient().send(
             new DeleteFunctionCommand({
                 Name: name,
                 IfMatch: res.ETag,
@@ -290,12 +306,10 @@ module.exports.removeCloudFrontFunction = async (name) => {
 };
 
 module.exports.setCloudFrontFunctionAssociation = async (Id) => {
-    const client = new CloudFrontClient({});
-
     let res = await Spinner.prototype.simple(
         `Retrieving CloudFront distribution`,
         () => {
-            return client.send(new GetDistributionCommand({ Id }));
+            return getClient().send(new GetDistributionCommand({ Id }));
         },
     );
 
@@ -304,7 +318,7 @@ module.exports.setCloudFrontFunctionAssociation = async (Id) => {
             FunctionMetadata: { FunctionARN },
         },
     } = await Spinner.prototype.simple(`Retrieving CloudFront function`, () => {
-        return client.send(
+        return getClient().send(
             new DescribeFunctionCommand({
                 Name: res.Distribution.DistributionConfig.CallerReference,
                 Stage: "LIVE",
@@ -326,7 +340,7 @@ module.exports.setCloudFrontFunctionAssociation = async (Id) => {
     res = await Spinner.prototype.simple(
         `Adding CloudFront function to CloudFront distribution`,
         () => {
-            return client.send(
+            return getClient().send(
                 new UpdateDistributionCommand({
                     DistributionConfig: res.Distribution.DistributionConfig,
                     Id,
@@ -347,12 +361,10 @@ module.exports.setCloudFrontFunctionAssociation = async (Id) => {
 };
 
 module.exports.removeCloudFrontFunctionAssociation = async (Id) => {
-    const client = new CloudFrontClient({});
-
     let res = await Spinner.prototype.simple(
         `Retrieving CloudFront distribution`,
         () => {
-            return client.send(new GetDistributionCommand({ Id }));
+            return getClient().send(new GetDistributionCommand({ Id }));
         },
     );
 
@@ -365,7 +377,7 @@ module.exports.removeCloudFrontFunctionAssociation = async (Id) => {
     res = await Spinner.prototype.simple(
         `Removing CloudFront function from CloudFront distribution`,
         () => {
-            return client.send(
+            return getClient().send(
                 new UpdateDistributionCommand({
                     DistributionConfig: res.Distribution.DistributionConfig,
                     Id,
@@ -386,13 +398,11 @@ module.exports.removeCloudFrontFunctionAssociation = async (Id) => {
 };
 
 module.exports.listDistributions = async () => {
-    const client = new CloudFrontClient({});
-
     let distributions = [];
     let marker;
 
     do {
-        const res = await client.send(
+        const res = await getClient().send(
             new ListDistributionsCommand({
                 ...(marker ? { Marker: marker } : {}),
             }),
@@ -409,9 +419,7 @@ module.exports.listDistributions = async () => {
 };
 
 module.exports.getDistributionTags = async (arn) => {
-    const client = new CloudFrontClient({});
-
-    const res = await client.send(
+    const res = await getClient().send(
         new ListTagsForResourceCommand({ Resource: arn }),
     );
 
@@ -419,9 +427,7 @@ module.exports.getDistributionTags = async (arn) => {
 };
 
 module.exports.getLatestInvalidationDate = async (distributionId) => {
-    const client = new CloudFrontClient({});
-
-    const res = await client.send(
+    const res = await getClient().send(
         new ListInvalidationsCommand({
             DistributionId: distributionId,
             MaxItems: 1,