aws-architect 6.6.46 → 6.6.48

package/CHANGELOG.md

@@ -5,6 +5,7 @@ This is the changelog for [AWS Architect](readme.md).
 * Add support to `deleteWebsiteVersion(version)`
 * Fix `The function must be in an Active state. The current state for function arn:aws:lambda:Function:514 is Pending`.
 * Automatically delete existing ROLLBACK_COMPLETE stacks.
+* Add Ipv6 records to the cloudformation templates.
 
 ## 6.5 ##
 * Support APIGW version 2

package/bin/template/cloudFormationHostedZoneTemplate.json

@@ -7,10 +7,6 @@
     }
   },
 
-  "Transform": [
-    "AwsArchitectMacros"
-  ],
-
   "Resources": {
     "HostedZone": {
       "Type": "AWS::Route53::HostedZone",
@@ -28,16 +24,11 @@
         "SubjectAlternativeNames": [
           { "Fn::Sub": "*.${hostedZoneName}" }
         ],
-        "ValidationMethod": "DNS"
-      }
-    },
-    "AcmCertificateValidationForHostedZone": {
-      "Type": "AwsArchitectResource::Route53DnsValidationRecord",
-      "Properties": {
-        "HostedZoneName": { "Fn::Sub": "${hostedZoneName}." },
-        "CertificateName": { "Ref": "hostedZoneName" },
-        "TTL": "300",
-        "Type": "CNAME"
+        "ValidationMethod": "DNS",
+        "DomainValidationOptions": [{
+          "DomainName": { "Ref": "hostedZoneName" },
+          "HostedZoneId": { "Ref": "HostedZone" }
+        }]
       }
     }
   }

package/bin/template/cloudFormationServerlessTemplate.json

@@ -28,14 +28,14 @@
         "FunctionName": { "Ref": "serviceName" },
         "Description": { "Ref": "serviceDescription" },
         "Handler": "index.handler",
-        "Runtime": "nodejs12.x",
+        "Runtime": "nodejs16.x",
         "TracingConfig": {
           "Mode": "PassThrough"
         },
         "Code": {
           "ZipFile": "exports.handler = async() => Promise.resolve()"
         },
-        "MemorySize": 256,
+        "MemorySize": 1769,
         "Timeout": 60,
         "Role": { "Fn::GetAtt": ["LambdaRole", "Arn"] },
         "Tags": [
@@ -119,6 +119,14 @@
       }
     },
 
+    "CloudWatchLambdaLogGroup": {
+      "Type": "AWS::Logs::LogGroup",
+      "Properties": {
+        "LogGroupName": { "Fn::Sub": "/aws/lambda/${serviceName}" },
+        "RetentionInDays": 365
+      }
+    },
+
     "ApiGatewayV2": {
       "Type": "AWS::ApiGatewayV2::Api",
       "Properties": {
@@ -324,6 +332,20 @@
       }
     },
 
+    "Route53MapToCustomDomainIpv6": {
+      "Type": "AWS::Route53::RecordSet",
+      "Properties": {
+        "AliasTarget": {
+          "DNSName": { "Fn::GetAtt": [ "ServiceDomainName", "RegionalDomainName" ] },
+          "HostedZoneId": { "Fn::GetAtt": [ "ServiceDomainName", "RegionalHostedZoneId" ] }
+        },
+        "HostedZoneName": { "Fn::Sub": "${hostedName}." },
+        "Comment": { "Fn::Sub": "Created for service ${serviceName}" },
+        "Name": { "Fn::Sub": "${dnsName}.${hostedName}." },
+        "Type": "AAAA"
+      }
+    },
+
     "Route53MapToCustomDomainTst": {
       "Type": "AWS::Route53::RecordSet",
       "Properties": {
@@ -336,6 +358,20 @@
         "Name": { "Fn::Sub": "tst-${dnsName}.${hostedName}." },
         "Type": "A"
       }
+    },
+
+    "Route53MapToCustomDomainTstIpv6": {
+      "Type": "AWS::Route53::RecordSet",
+      "Properties": {
+        "AliasTarget": {
+          "DNSName": { "Fn::GetAtt": [ "ServiceDomainNameTst", "RegionalDomainName" ] },
+          "HostedZoneId": { "Fn::GetAtt": [ "ServiceDomainNameTst", "RegionalHostedZoneId" ] }
+        },
+        "HostedZoneName": { "Fn::Sub": "${hostedName}." },
+        "Comment": { "Fn::Sub": "Created for service ${serviceName}" },
+        "Name": { "Fn::Sub": "tst-${dnsName}.${hostedName}." },
+        "Type": "AAAA"
+      }
     }
   }
 }

package/bin/template/cloudFormationWebsiteTemplate.json

@@ -164,6 +164,19 @@
       }
     },
 
+    "TestRoute53Ipv6": {
+      "Type": "AWS::Route53::RecordSet",
+      "Properties": {
+        "AliasTarget": {
+          "DNSName": { "Fn::GetAtt" : [ "CloudFrontDistribution", "DomainName" ] },
+          "HostedZoneId": "Z2FDTNDATAQYW2"
+        },
+        "HostedZoneId": { "Ref": "hostedZoneId" },
+        "Name":  { "Fn::Sub": "tst.${dnsName}." },
+        "Type": "AAAA"
+      }
+    },
+
     "ProdRoute53": {
       "Type": "AWS::Route53::RecordSet",
       "Properties": {
@@ -176,6 +189,18 @@
         "Type": "A"
       }
     },
+    "ProdRoute53Ipv6": {
+      "Type": "AWS::Route53::RecordSet",
+      "Properties": {
+        "AliasTarget": {
+          "DNSName": { "Fn::GetAtt" : [ "CloudFrontDistribution", "DomainName" ] },
+          "HostedZoneId": "Z2FDTNDATAQYW2"
+        },
+        "HostedZoneId": { "Ref": "hostedZoneId" },
+        "Name":  { "Fn::Sub": "${dnsName}." },
+        "Type": "AAAA"
+      }
+    },
 
     "WildcardProdRoute53": {
       "Type": "AWS::Route53::RecordSet",
@@ -188,6 +213,19 @@
         "Name":  { "Fn::Sub": "*.${dnsName}." },
         "Type": "A"
       }
+    },
+
+    "WildcardProdRoute53Ipv6": {
+      "Type": "AWS::Route53::RecordSet",
+      "Properties": {
+        "AliasTarget": {
+          "DNSName": { "Fn::GetAtt" : [ "CloudFrontDistribution", "DomainName" ] },
+          "HostedZoneId": "Z2FDTNDATAQYW2"
+        },
+        "HostedZoneId": { "Ref": "hostedZoneId" },
+        "Name":  { "Fn::Sub": "*.${dnsName}." },
+        "Type": "AAAA"
+      }
     }
   }
 }

package/lib/BucketManager.js

@@ -32,7 +32,7 @@ class BucketManager {
     let contentTypeMapping = Object.assign({}, contentTypeMappingConst, contentTypeMappingOverride || {});
     console.log('Deploying Website');
 
-    const uploadFile = async file => {
+    const uploadFile = async (file/*, directoryHasOtherFilesMap */) => {
       let relativePath = path.relative(path.resolve(contentPath), path.resolve(file));
       let relativePathUnixFormat = this.unixify(relativePath);
       let matchingCacheMap = Array.isArray(cacheControlRegexMap) && cacheControlRegexMap.find(m =>
@@ -68,13 +68,14 @@ class BucketManager {
           await this.putObjectIfDifferent(putObjectParams);
           console.log(`   => ${putObjectParams.Key} (Directory Handler)`);
 
-          // Then add a redirect from the base location to the "/"
+          // Then add a redirect from the base location to the "/" or if using enableIndexConversion just duplicate the file again
           if (enableIndexConversion) {
             putObjectParams.Body = fileData;
             putObjectParams.Key = `${this.unixify(path.join(version, redirectFileUrl))}`;
           } else {
             const redirectFile = await fs.readFile(path.join(__dirname, './appRedirect.html'));
-            const updatedRedirectFile = redirectFile.toString().replace('{{PATH}}', redirectFileUrl[0] === '/' ? redirectFileUrl : `/${redirectFileUrl}`);
+            let lastPartOfPath = redirectFile.toString().split('/').slice(-1)[0];
+            const updatedRedirectFile = redirectFile.toString().replace('{{PATH}}', lastPartOfPath); // redirectFileUrl[0] === '/' ? redirectFileUrl : `/${redirectFileUrl}`);
             putObjectParams.Body = Buffer.from(updatedRedirectFile);
             putObjectParams.Key = this.unixify(path.join(version, redirectFileUrl));
             putObjectParams.ContentMD5 = createHash('md5').update(updatedRedirectFile).digest('base64');
@@ -97,8 +98,13 @@ class BucketManager {
     let sortedList = list.filter(file => !file.match('index.html'));
     await Promise.all(sortedList.map(file => uploadFile(file)));
 
+    const fileCountsPerDirectoryMap = {};
+    for (const file of sortedList) {
+      const splitFile = file.split('/').slice(0, -1).join('/');
+      fileCountsPerDirectoryMap[splitFile] = true;
+    }
     let indexList = list.filter(file => file.match('index.html')).sort((a, b) => b.split('/').length - a.split('/').length);
-    await Promise.all(indexList.map(file => uploadFile(file)));
+    await Promise.all(indexList.map(file => uploadFile(file, fileCountsPerDirectoryMap)));
 
     return { Title: 'Upload Success.', Bucket: this.Bucket, Version: version };
   }

package/lib/appRedirect.html

@@ -7,7 +7,7 @@
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <meta name="theme-color" content="#2d434d">
     <title>Redirect</title>
-    <meta http-equiv="refresh" content="0; URL='{{PATH}}/'" />
+    <meta http-equiv="refresh" content="0; URL='./{{PATH}}/'" />
   </head>
 
   <body style="margin: 0; background-color: #e9eff2">

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aws-architect",
-  "version": "6.6.46",
+  "version": "6.6.48",
   "description": "AWS Architect is a node based tool to configure and deploy AWS-based microservices.",
   "main": "index.js",
   "types": "index.d.ts",