carlin 0.22.1 → 0.22.4

package/dist/deploy/cicd/lambdas/imageUpdaterSchedule.handler.js

@@ -2,10 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.imageUpdaterScheduleHandler = void 0;
 const executeTasks_1 = require("./executeTasks");
+/**
+ * Update CI/CD resources with the newest carlin and repository image.
+ */
 const imageUpdaterScheduleHandler = async () => {
     const cicdConfig = process.env.CICD_CONFIG;
     if (!cicdConfig) {
-        console.log('No CICD config found.');
         return;
     }
     const commands = [
@@ -20,7 +22,7 @@ const imageUpdaterScheduleHandler = async () => {
         'cat carlin.json',
         `carlin deploy cicd -c carlin.json`,
     ];
-    const response = await (0, executeTasks_1.executeTasks)({
+    await (0, executeTasks_1.executeTasks)({
         commands,
         cpu: '512',
         memory: '2048',
@@ -31,6 +33,5 @@ const imageUpdaterScheduleHandler = async () => {
             },
         ],
     });
-    console.log(JSON.stringify(response, null, 2));
 };
 exports.imageUpdaterScheduleHandler = imageUpdaterScheduleHandler;

package/dist/deploy/cicd/lambdas/pipelines.handler.js

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pipelinesHandler = exports.getJobDetails = exports.getJobDetailsFilename = void 0;
 const tslib_1 = require("tslib");
-const adm_zip_1 = tslib_1.__importDefault(require("adm-zip"));
-const aws_sdk_1 = require("aws-sdk");
 const fs = tslib_1.__importStar(require("fs"));
+const aws_sdk_1 = require("aws-sdk");
 const pipelines_1 = require("../pipelines");
 const executeTasks_1 = require("./executeTasks");
 const putApprovalResultManualTask_1 = require("./putApprovalResultManualTask");
+const adm_zip_1 = tslib_1.__importDefault(require("adm-zip"));
 const codepipeline = new aws_sdk_1.CodePipeline();
 const getUserParameters = (event) => {
     const [pipeline, stage] = event['CodePipeline.job'].data.actionConfiguration.configuration.UserParameters.split('&');

package/dist/deploy/cicd/pipelines.js

@@ -12,7 +12,7 @@ const getPrCommands = ({ branch }) => [
      * Update to the most recent main branch to Lerna performs the diff properly.
      */
     'git pull origin main',
-    `git checkout ${branch} || echo 'branch not found, probably deleted'; exit 0`,
+    `git checkout ${branch} || (echo 'branch not found, probably deleted'; exit 0)`,
     `git pull origin ${branch}`,
     'git rev-parse HEAD',
     'git status',
@@ -45,7 +45,8 @@ const getMainCommands = () => [
     /**
      * Reporting `MainTagFound` before exiting the process. This command blocks
      * the process if tag was found. If we don't do this, the loop would never
-     * end.
+     * end because `main` command can create a tag, that would trigger this
+     * pipeline again.
      */
     'if git describe --exact-match; then echo "Tag found" && carlin cicd-ecs-task-report --status=MainTagFound && exit 0; fi',
     'yarn',

package/dist/deploy/staticApp/staticApp.template.js

@@ -6,15 +6,14 @@ const getOriginShieldRegion_1 = require("./getOriginShieldRegion");
 const PACKAGE_VERSION = (0, utils_1.getPackageVersion)();
 const STATIC_APP_BUCKET_LOGICAL_ID = 'StaticBucket';
 const CLOUDFRONT_DISTRIBUTION_ID = 'CloudFrontDistributionId';
-const CLOUDFRONT_DISTRIBUTION_ORIGIN_ACCESS_IDENTITY_LOGICAL_ID = 'CloudFrontDistributionOriginAccessIdentity';
 exports.CLOUDFRONT_DISTRIBUTION_LOGICAL_ID = 'CloudFrontDistribution';
 exports.ROUTE_53_RECORD_SET_GROUP_LOGICAL_ID = 'Route53RecordSetGroup';
 /**
- * Name: Managed-CachingOptimized
- * ID: 658327ea-f89d-4fab-a63d-7e88639e58f6
+ * Name: Managed-CachingDisabled
+ * ID: 4135ea2d-6df8-44a3-9df3-4b5a84be39ad
  * https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/using-managed-cache-policies.html
  */
-const CACHE_POLICY_ID = '658327ea-f89d-4fab-a63d-7e88639e58f6';
+const CACHE_POLICY_ID = '4135ea2d-6df8-44a3-9df3-4b5a84be39ad';
 /**
  * Name: Managed-CORS-S3Origin
  * ID: 88a5eaf4-2fd4-4709-b370-b4c650ea3fcf
@@ -27,7 +26,7 @@ const ORIGIN_REQUEST_POLICY_ID = '88a5eaf4-2fd4-4709-b370-b4c650ea3fcf';
  * https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/using-managed-response-headers-policies.html
  */
 const ORIGIN_RESPONSE_POLICY_ID = 'eaab4381-ed33-4a86-88ca-d9558dc6cd63';
-const getBaseTemplate = ({ cloudfront, spa, }) => {
+const getBaseTemplate = ({ spa, }) => {
     return {
         AWSTemplateFormatVersion: '2010-09-09',
         Resources: {
@@ -47,7 +46,7 @@ const getBaseTemplate = ({ cloudfront, spa, }) => {
                     },
                     WebsiteConfiguration: {
                         IndexDocument: `index.html`,
-                        ErrorDocument: `${spa ? 'index' : '404'}.html`,
+                        ErrorDocument: spa ? 'index.html' : '404/index.html',
                     },
                 },
             },
@@ -60,6 +59,7 @@ const getBaseTemplate = ({ cloudfront, spa, }) => {
                             {
                                 Action: ['s3:GetObject'],
                                 Effect: 'Allow',
+                                Principal: '*',
                                 Resource: {
                                     'Fn::Join': [
                                         '',
@@ -70,23 +70,6 @@ const getBaseTemplate = ({ cloudfront, spa, }) => {
                                         ],
                                     ],
                                 },
-                                Principal: cloudfront
-                                    ? /**
-                                       * https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/private-content-restricting-access-to-s3.html
-                                       */
-                                        {
-                                            AWS: {
-                                                'Fn::Sub': [
-                                                    'arn:aws:iam::cloudfront:user/CloudFront Origin Access Identity ${OAI}',
-                                                    {
-                                                        OAI: {
-                                                            Ref: CLOUDFRONT_DISTRIBUTION_ORIGIN_ACCESS_IDENTITY_LOGICAL_ID,
-                                                        },
-                                                    },
-                                                ],
-                                            },
-                                        }
-                                    : '*',
                             },
                         ],
                     },
@@ -106,19 +89,6 @@ const getBaseTemplate = ({ cloudfront, spa, }) => {
 const getCloudFrontTemplate = ({ acm, aliases = [], cloudfront, spa, hostedZoneName, region, }) => {
     const template = { ...getBaseTemplate({ cloudfront, spa }) };
     const cloudFrontResources = {
-        [CLOUDFRONT_DISTRIBUTION_ORIGIN_ACCESS_IDENTITY_LOGICAL_ID]: {
-            Type: 'AWS::CloudFront::CloudFrontOriginAccessIdentity',
-            Properties: {
-                CloudFrontOriginAccessIdentityConfig: {
-                    Comment: {
-                        'Fn::Sub': [
-                            'CloudFront Distribution Origin Access Identity for ${Project} project.',
-                            { Project: { Ref: 'Project' } },
-                        ],
-                    },
-                },
-            },
-        },
         [exports.CLOUDFRONT_DISTRIBUTION_LOGICAL_ID]: {
             Type: 'AWS::CloudFront::Distribution',
             Properties: {
@@ -142,17 +112,17 @@ const getCloudFrontTemplate = ({ acm, aliases = [], cloudfront, spa, hostedZoneN
                             ErrorCachingMinTTL: 0,
                             ErrorCode: errorCode,
                             ResponseCode: 404,
-                            ResponsePagePath: '/404.html',
+                            ResponsePagePath: '/404',
                         };
                     }),
                     DefaultCacheBehavior: {
                         AllowedMethods: ['GET', 'HEAD', 'OPTIONS'],
                         Compress: true,
+                        CachedMethods: ['GET', 'HEAD', 'OPTIONS'],
                         /**
                          * Caching OPTIONS. Related to OriginRequestPolicyId property.
                          * https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/header-caching.html#header-caching-web-cors
                          */
-                        CachedMethods: ['GET', 'HEAD', 'OPTIONS'],
                         OriginRequestPolicyId: ORIGIN_REQUEST_POLICY_ID,
                         /**
                          * CachePolicyId property:
@@ -163,20 +133,34 @@ const getCloudFrontTemplate = ({ acm, aliases = [], cloudfront, spa, hostedZoneN
                         TargetOriginId: { Ref: STATIC_APP_BUCKET_LOGICAL_ID },
                         ViewerProtocolPolicy: 'redirect-to-https',
                     },
-                    DefaultRootObject: 'index.html',
+                    DefaultRootObject: spa ? 'index.html' : undefined,
                     Enabled: true,
                     HttpVersion: 'http2',
                     Origins: [
                         {
+                            CustomOriginConfig: {
+                                OriginProtocolPolicy: 'http-only',
+                            },
                             /**
-                             * Amazon S3 bucket – awsexamplebucket.s3.us-west-2.amazonaws.com
-                             * https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/distribution-web-values-specify.html#DownloadDistValuesDomainName
+                             * https://github.com/aws/aws-cdk/issues/1882#issuecomment-629141467
                              */
                             DomainName: {
-                                'Fn::GetAtt': `${STATIC_APP_BUCKET_LOGICAL_ID}.RegionalDomainName`,
+                                'Fn::Select': [
+                                    1,
+                                    {
+                                        'Fn::Split': [
+                                            '//',
+                                            {
+                                                'Fn::GetAtt': [
+                                                    STATIC_APP_BUCKET_LOGICAL_ID,
+                                                    'WebsiteURL',
+                                                ],
+                                            },
+                                        ],
+                                    },
+                                ],
                             },
                             Id: { Ref: STATIC_APP_BUCKET_LOGICAL_ID },
-                            OriginPath: `/${PACKAGE_VERSION}`,
                             /**
                              * https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/origin-shield.html#choose-origin-shield-region
                              */
@@ -186,20 +170,6 @@ const getCloudFrontTemplate = ({ acm, aliases = [], cloudfront, spa, hostedZoneN
                                     OriginShieldRegion: (0, getOriginShieldRegion_1.getOriginShieldRegion)(region),
                                 },
                             }),
-                            S3OriginConfig: {
-                                OriginAccessIdentity: {
-                                    'Fn::Join': [
-                                        '/',
-                                        [
-                                            'origin-access-identity',
-                                            'cloudfront',
-                                            {
-                                                Ref: CLOUDFRONT_DISTRIBUTION_ORIGIN_ACCESS_IDENTITY_LOGICAL_ID,
-                                            },
-                                        ],
-                                    ],
-                                },
-                            },
                         },
                     ],
                 },

package/dist/deploy/staticApp/uploadBuiltAppToS3.js

@@ -3,9 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.uploadBuiltAppToS3 = void 0;
 const findDefaultBuildFolder_1 = require("./findDefaultBuildFolder");
 const s3_1 = require("../s3");
-const utils_1 = require("../../utils");
-const uploadBuiltAppToS3 = async ({ buildFolder: directory, bucket, cloudfront, }) => {
-    const version = cloudfront ? (0, utils_1.getPackageVersion)() : undefined;
+const uploadBuiltAppToS3 = async ({ buildFolder: directory, bucket, }) => {
     /**
      * Only empty directory if the number of the files inside $directory.
      * If the number of files is zero, uploadDirectoryToS3 will thrown.
@@ -13,19 +11,15 @@ const uploadBuiltAppToS3 = async ({ buildFolder: directory, bucket, cloudfront,
     if (directory) {
         const files = await (0, s3_1.getAllFilesInsideADirectory)({ directory });
         if (files.length > 0) {
-            await (0, s3_1.emptyS3Directory)({ bucket, directory: version });
+            await (0, s3_1.emptyS3Directory)({ bucket });
         }
-        await (0, s3_1.uploadDirectoryToS3)({ bucket, bucketKey: version, directory });
+        await (0, s3_1.uploadDirectoryToS3)({ bucket, directory });
         return;
     }
     const defaultDirectory = await (0, findDefaultBuildFolder_1.findDefaultBuildFolder)();
     if (defaultDirectory) {
-        await (0, s3_1.emptyS3Directory)({ bucket, directory: version });
-        await (0, s3_1.uploadDirectoryToS3)({
-            bucket,
-            bucketKey: version,
-            directory: defaultDirectory,
-        });
+        await (0, s3_1.emptyS3Directory)({ bucket });
+        await (0, s3_1.uploadDirectoryToS3)({ bucket, directory: defaultDirectory });
         return;
     }
     throw new Error(`build-folder option wasn't provided and files weren't found in ${findDefaultBuildFolder_1.defaultBuildFolders.join(', ')} directories.`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "carlin",
-  "version": "0.22.1",
+  "version": "0.22.4",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -47,6 +47,7 @@
     "prettier": "^2.6.2",
     "semver": "^7.3.7",
     "simple-git": "^3.7.1",
+    "ts-node": "^10.8.1",
     "uglify-js": "^3.15.4",
     "yargs": "^17.4.1"
   },