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

package/commands/create/libs/vars.js

@@ -126,10 +126,6 @@ module.exports.templates = [
         name: "boilerplate-laravel",
         type: "boilerplate",
     },
-    {
-        name: "boilerplate-laravel-vue",
-        type: "boilerplate",
-    },
     {
         name: "boilerplate-drupal",
         type: "boilerplate",
@@ -178,7 +174,14 @@ module.exports.templates = [
     },
 ];
 
-module.exports.secretGroups = ["app", "storage", "database", "opensearch"];
+module.exports.secretGroups = [
+    "app",
+    "storage",
+    "database",
+    "opensearch",
+    "cache",
+    "mail",
+];
 
 module.exports.frameworks = [
     {
@@ -208,18 +211,12 @@ module.exports.eb = {
     environments: {
         python: {
             shared: [],
-            low: [],
-            high: [],
         },
         php: {
             shared: [],
-            low: [],
-            high: [],
         },
         nginx: {
             shared: [],
-            low: [],
-            high: [],
         },
         httpd: {
             shared: [
@@ -229,33 +226,21 @@ module.exports.eb = {
                     Namespace: "aws:elasticbeanstalk:environment:proxy",
                 },
             ],
-            low: [],
-            high: [],
         },
         default: {
             shared: [],
-            low: [],
-            high: [],
         },
         wordpress: {
             shared: [],
-            low: [],
-            high: [],
         },
         laravel: {
             shared: [],
-            low: [],
-            high: [],
         },
         adonis: {
             shared: [],
-            low: [],
-            high: [],
         },
         drupal: {
             shared: [],
-            low: [],
-            high: [],
         },
         shared: [
             {
@@ -268,13 +253,11 @@ module.exports.eb = {
                 Value: instanceProfileName || "aws-elasticbeanstalk-ec2-role",
                 Namespace: "aws:autoscaling:launchconfiguration",
             }),
-        ],
-        low: [
-            {
-                OptionName: "EnvironmentType",
-                Value: "SingleInstance",
-                Namespace: "aws:elasticbeanstalk:environment",
-            },
+            ({ instanceType }) => ({
+                OptionName: "InstanceType",
+                Value: instanceType || "t3.small",
+                Namespace: "aws:autoscaling:launchconfiguration",
+            }),
         ],
         high: [
             {
@@ -354,6 +337,22 @@ module.exports.eb = {
 
                 return settings;
             },
+            {
+                OptionName: "ConfigDocument",
+                Value: JSON.stringify({
+                    Version: 1,
+                    CloudWatchMetrics: { Instance: {}, Environment: {} },
+                    Rules: {
+                        Environment: {
+                            Application: {
+                                ApplicationRequests4xx: { Enabled: false },
+                            },
+                            ELB: { ELBRequests4xx: { Enabled: false } },
+                        },
+                    },
+                }),
+                Namespace: "aws:elasticbeanstalk:healthreporting:system",
+            },
         ],
     },
     secretPayloads: {
@@ -368,13 +367,7 @@ module.exports.eb = {
                     MYSQL_ATTR_SSL_CA: "/opt/rds-certs/global-bundle.pem",
                 },
         },
-        low: {
-            app: {
-                DOMAIN_LINK: "<%= DOMAIN_LINK %>",
-                EMAIL_LINK: "mike.mellor@fishawack.com",
-            },
-        },
-        high: {},
+
         wordpress: {
             shared: {
                 app: {
@@ -436,11 +429,12 @@ module.exports.eb = {
                     APP_KEY: `base64:${Buffer.from(generator.generate({ length: 32, numbers: true, symbols: true })).toString("base64")}`,
                     APP_DEBUG: "false",
                     APP_URL: "https://<%= APP_DOMAIN %>",
+                    SESSION_DOMAIN: "<%= SESSION_DOMAIN %>",
+                    AWS_DEFAULT_REGION: "<%= AWS_REGION %>",
                 },
                 storage: ({ storage }) =>
                     storage && {
                         AWS_BUCKET: "<%= s3Slug %>",
-                        AWS_DEFAULT_REGION: "<%= AWS_REGION %>",
                         AWS_ACL_VISIBILITY: "private",
                         FILESYSTEM_DISK: "s3",
                         FILESYSTEM_DISK_PUBLIC: "s3-public",
@@ -449,6 +443,24 @@ module.exports.eb = {
                     opensearch && {
                         SEARCH_HOST: "<%= SEARCH_HOST %>",
                     },
+                cache: ({ cache }) =>
+                    cache && {
+                        REDIS_SCHEME: "tls",
+                        REDIS_HOST: "<%= REDIS_HOST %>",
+                        REDIS_PORT: "<%= REDIS_PORT %>",
+                        REDIS_PASSWORD: "<%= REDIS_PASSWORD %>",
+                        CACHE_STORE: "redis",
+                    },
+                mail: ({ mail }) =>
+                    mail && {
+                        MAIL_FROM_ADDRESS: "<%= MAIL_FROM_ADDRESS %>",
+                        MAIL_FROM_NAME: "<%= MAIL_FROM_NAME %>",
+                        MAIL_HOST: "email-smtp.us-east-1.amazonaws.com",
+                        MAIL_MAILER: "smtp",
+                        MAIL_PASSWORD: "<%= MAIL_PASSWORD %>",
+                        MAIL_PORT: "587",
+                        MAIL_USERNAME: "<%= MAIL_USERNAME %>",
+                    },
             },
             high: {
                 app: {
@@ -466,11 +478,11 @@ module.exports.eb = {
                     SESSION_DRIVER: "cookie",
                     PORT: "3333",
                     LOG_LEVEL: "info",
+                    AWS_DEFAULT_REGION: "<%= AWS_REGION %>",
                 },
                 storage: ({ storage }) =>
                     storage && {
                         AWS_BUCKET: "<%= s3Slug %>",
-                        AWS_DEFAULT_REGION: "<%= AWS_REGION %>",
                         AWS_ACCESS_KEY_ID: "<%= AccessKeyId %>",
                         AWS_SECRET_ACCESS_KEY: "<%= SecretAccessKey %>",
                         FILESYSTEM_DISK: "s3",
@@ -487,18 +499,17 @@ module.exports.eb = {
         },
     },
     buildSecretPayloads(config, data = {}) {
-        const { framework, availability = "low", platform, language } = config;
-        const result = { app: {}, storage: {}, database: {}, opensearch: {} };
+        const { framework, platform, language } = config;
+        const result = Object.fromEntries(
+            module.exports.secretGroups.map((g) => [g, {}]),
+        );
 
         const sources = [
             this.secretPayloads.shared,
-            this.secretPayloads[availability],
             this.secretPayloads[platform]?.shared,
-            this.secretPayloads[platform]?.[availability],
             this.secretPayloads[language]?.shared,
-            this.secretPayloads[language]?.[availability],
             this.secretPayloads[framework]?.shared,
-            this.secretPayloads[framework]?.[availability],
+            this.secretPayloads[framework]?.high,
         ];
 
         for (const source of sources) {
@@ -529,8 +540,6 @@ module.exports.eb = {
     configurations: {
         php: {
             shared: [".ebextensions/php/ini.config"],
-            low: [],
-            high: [],
         },
         nginx: {
             shared: [
@@ -538,14 +547,6 @@ module.exports.eb = {
                 ".platform/nginx/conf.d/upload_size.conf",
                 ".platform/nginx/conf.d/security_headers.conf",
                 ".platform/nginx/conf.d/elasticbeanstalk/www-to-nonwww-redirection.conf",
-            ],
-            low: [
-                ".platform/nginx/conf.d/elasticbeanstalk/http-https-redirection.conf",
-                ".platform/nginx/conf.d/ssl.conf",
-                ".ebextensions/nginx/auto-ssl.config",
-            ],
-            high: [
-                ".platform/nginx/conf.d/elasticbeanstalk/health.conf",
                 ".ebextensions/nginx/alb-health.config",
             ],
         },
@@ -553,14 +554,6 @@ module.exports.eb = {
             shared: [
                 ".platform/httpd/conf.d/virtualhost-80.conf",
                 ".platform/httpd/conf.d/elasticbeanstalk/80/www-to-nonwww-redirection.conf",
-            ],
-            low: [
-                ".platform/httpd/conf.d/elasticbeanstalk/80/http-https-redirection.conf",
-                ".platform/httpd/conf.d/virtualhost-443.conf",
-                ".platform/httpd/conf.d/elasticbeanstalk/443/ssl.conf",
-                ".ebextensions/httpd/auto-ssl.config",
-            ],
-            high: [
                 ".platform/httpd/conf.d/elasticbeanstalk/80/forward-https-proto.conf",
                 ".ebextensions/wordpress/alb-health.config",
             ],
@@ -569,8 +562,6 @@ module.exports.eb = {
             platform: "nginx",
             language: "php",
             shared: [],
-            low: [],
-            high: [],
         },
         wordpress: {
             platform: "httpd",
@@ -583,21 +574,21 @@ module.exports.eb = {
                 ".ebextensions/wordpress/environment.config",
                 ".ebextensions/wordpress/post-deploy.config",
                 ".ebextensions/wordpress/software.config",
+                ".platform/hooks/predeploy/deactivate-plugins.sh",
             ],
-            low: [".platform/hooks/predeploy/deactivate-plugins-single.sh"],
-            high: [".platform/hooks/predeploy/deactivate-plugins.sh"],
         },
         laravel: {
             platform: "nginx",
             language: "php",
             shared: [
                 ".platform/nginx/conf.d/elasticbeanstalk/laravel.conf",
+                ".ebextensions/laravel/cron.config",
                 ".ebextensions/laravel/post-deploy.config",
-                ".ebextensions/laravel/software.config",
+                ".ebextensions/laravel/queue-worker.config",
                 ".ebextensions/laravel/rds-ssl.config",
+                ".ebextensions/laravel/software.config",
+                ".platform/hooks/postdeploy/restart_queue.sh",
             ],
-            low: [],
-            high: [],
         },
         adonis: {
             platform: "nginx",
@@ -606,34 +597,27 @@ module.exports.eb = {
                 ".ebextensions/adonis/post-deploy.config",
                 ".ebextensions/adonis/software.config",
             ],
-            low: [],
-            high: [],
         },
         drupal: {
             platform: "httpd",
             language: "php",
             shared: [],
-            low: [],
-            high: [],
         },
         python: {
             platform: "nginx",
             language: "python",
             shared: [],
-            low: [],
-            high: [],
         },
-        shared: [".ebextensions/misc/setvars.config"],
-        low: [".ebextensions/misc/enable-https.config"],
-        high: [
+        shared: [
+            ".platform/hooks/prebuild/setvars.sh",
+            ".platform/confighooks/postdeploy/setvars.sh",
+            ".ebextensions/misc/asg-self-healing.config",
             ".ebextensions/misc/alb-http-to-https-redirection.config",
             ".ebextensions/misc/enable-https-lb.config",
-            ".ebextensions/misc/asg-self-healing.config",
-            ".ebextensions/misc/health-ignore-4xx.config",
         ],
     },
     merge(type, config, data = {}) {
-        const { framework, availability = "low", platform, language } = config;
+        const { framework, platform, language } = config;
 
         return JSON.parse(
             template(
@@ -641,13 +625,10 @@ module.exports.eb = {
                     []
                         .concat(
                             this[type].shared,
-                            this[type][availability],
+                            this[type].high,
                             this[type][platform]?.shared,
-                            this[type][platform]?.[availability],
                             this[type][language]?.shared,
-                            this[type][language]?.[availability],
                             this[type][framework]?.shared,
-                            this[type][framework]?.[availability],
                         )
                         .map((d) =>
                             typeof d === "function" ? d(config, data) : d,
@@ -727,3 +708,6 @@ module.exports.cloudfront = (
         },
     },
 });
+
+// AWS SDK client defaults
+module.exports.awsClientConfig = { maxAttempts: 5, retryMode: "adaptive" };

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

@@ -1,13 +1,15 @@
 const { ACMClient, ListCertificatesCommand } = require("@aws-sdk/client-acm");
 const { Spinner } = require("../../libs/utilities");
+const { awsClientConfig } = require("../../libs/vars");
+
+const getClient = () => new ACMClient(awsClientConfig);
 
 module.exports.listCertificates = async () => {
-    const client = new ACMClient({});
     const certs = [];
     let nextToken;
 
     do {
-        const res = await client.send(
+        const res = await getClient().send(
             new ListCertificatesCommand({
                 CertificateStatuses: ["ISSUED"],
                 NextToken: nextToken,

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,