aws-architect 6.6.49 → 6.7.51

package/CHANGELOG.md

@@ -1,6 +1,8 @@
 # Change log
 This is the changelog for [AWS Architect](readme.md).
 
+## 6.7 ##
+* Fix handlers for /route and /route/ so that the index.html is always duplicated.
 ## 6.6 ##
 * 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`.

package/index.d.ts

@@ -55,7 +55,6 @@ interface RegexOption {
 interface WebsiteDeploymentOptions {
   cacheControlRegexMap?: RegexOption[];
   contentTypeMappingOverride?: object;
-  enableIndexConversion?: Boolean;
 }
 
 declare class AwsArchitect {

package/index.js

@@ -226,7 +226,7 @@ AwsArchitect.prototype.publishWebsite = AwsArchitect.prototype.PublishWebsite =
   if (!this.BucketManager.Bucket) { throw new Error('Bucket in content options has not been defined.'); }
   if (!this.ContentOptions.contentDirectory) { throw new Error('Content directory is not defined.'); }
 
-  return this.BucketManager.Deploy(this.ContentOptions.contentDirectory, version, options.cacheControlRegexMap || [], options.contentTypeMappingOverride, options.enableIndexConversion);
+  return this.BucketManager.Deploy(this.ContentOptions.contentDirectory, version, options.cacheControlRegexMap || [], options.contentTypeMappingOverride);
 };
 
 AwsArchitect.prototype.deleteWebsiteVersion = function(version) {

package/lib/BucketManager.js

@@ -27,7 +27,7 @@ class BucketManager {
     }));
   }
 
-  async Deploy(contentPath, rawVersion, cacheControlRegexMap = [], contentTypeMappingOverride = {}, enableIndexConversion) {
+  async Deploy(contentPath, rawVersion, cacheControlRegexMap = [], contentTypeMappingOverride = {}) {
     const version = rawVersion || '';
     let contentTypeMapping = Object.assign({}, contentTypeMappingConst, contentTypeMappingOverride || {});
     console.log('Deploying Website');
@@ -62,27 +62,17 @@ class BucketManager {
         const unixifiedIndexFilePath = this.unixify(relativePath);
         if (unixifiedIndexFilePath.match(/\/index.html$/)) {
           // First duplicate the file at the "/" location
+          // Then add a redirect from the base location to the "/" by duplicating the file again, this way `/route`, `/route/`, and `/route/index.html` all point to `/route/index.html`
           const redirectFileUrl = unixifiedIndexFilePath.replace(/\/index.html$/, '');
           putObjectParams.Body = fileData;
           putObjectParams.Key = `${this.unixify(path.join(version, redirectFileUrl))}/`;
           await this.putObjectIfDifferent(putObjectParams);
-          console.log(`   => ${putObjectParams.Key} (Directory Handler)`);
-
-          // 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'));
-            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');
-            putObjectParams.Metadata.Hash = createHash('md5').update(fileData).digest('base64');
-          }
+          console.log(`   => ${putObjectParams.Key} (Handler with: /)`);
+
+          putObjectParams.Body = fileData;
+          putObjectParams.Key = `${this.unixify(path.join(version, redirectFileUrl))}`;
           await this.putObjectIfDifferent(putObjectParams);
-          console.log(`   => ${putObjectParams.Key} (Redirect)`);
+          console.log(`   => ${putObjectParams.Key} (Handler without: /)`);
         }
       } catch (failure) {
         throw { File: file, Error: failure.stack || failure.toString(), Detail: failure };

package/package.json

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

package/lib/appRedirect.html

@@ -1,16 +0,0 @@
-<!doctype html>
-<html lang="en">
-
-  <head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1">
-    <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}}/'" />
-  </head>
-
-  <body style="margin: 0; background-color: #e9eff2">
-  </body>
-
-</html>