fix: backporting uncommited changes

Author: liddellj

awsRegionUrls.json

@@ -0,0 +1,22 @@
+{
+  "us-east-2": "s3-website.us-east-2.amazonaws.com",
+  "us-east-1": "s3-website-us-east-1.amazonaws.com",
+  "us-west-1": "s3-website-us-west-1.amazonaws.com",
+  "us-west-2": "s3-website-us-west-2.amazonaws.com",
+  "ap-east-1": "s3-website.ap-east-1.amazonaws.com",
+  "ap-south-1": "s3-website.ap-south-1.amazonaws.com",
+  "ap-northeast-3": "s3-website.ap-northeast-3.amazonaws.com",
+  "ap-northeast-2": "s3-website.ap-northeast-2.amazonaws.com",
+  "ap-southeast-1": "s3-website-ap-southeast-1.amazonaws.com",
+  "ap-southeast-2": "s3-website-ap-southeast-2.amazonaws.com",
+  "ap-northeast-1": "s3-website-ap-northeast-1.amazonaws.com",
+  "ca-central-1": "s3-website.ca-central-1.amazonaws.com",
+  "cn-northwest-1": "s3-website.cn-northwest-1.amazonaws.com.cn",
+  "eu-central-1": "s3-website.eu-central-1.amazonaws.com",
+  "eu-west-1": "s3-website-eu-west-1.amazonaws.com",
+  "eu-west-2": "s3-website.eu-west-2.amazonaws.com",
+  "eu-west-3": "s3-website.eu-west-3.amazonaws.com",
+  "eu-north-1": "s3-website.eu-north-1.amazonaws.com",
+  "sa-east-1": "s3-website-sa-east-1.amazonaws.com",
+  "me-south-1": "s3-website.me-south-1.amazonaws.com"
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ublend-npm/serverless-website-component",
-  "version": "0.0.12",
+  "version": "0.0.15",
   "main": "./serverless.js",
   "publishConfig": {
     "access": "public"
@@ -14,7 +14,7 @@
   "dependencies": {
     "@serverless/aws-s3": "^2.0.0",
     "@serverless/core": "^1.0.0",
-    "@serverless/domain": "^2.0.0",
+    "@ublend-npm/serverless-compoonent-domain": "^0.0.8",
     "aws-sdk": "2.1259.0"
   },
   "devDependencies": {

serverless.js

@@ -9,13 +9,13 @@ const {
   configureDomainForBucket,
   configureBucketForRedirect
 } = require('./utils')
+const regionUrls = require('./awsRegionUrls')
 
 /*
  * Website
  */
 
 class Website extends Component {
-
   /**
    * Types
    */
@@ -102,7 +102,7 @@ class Website extends Component {
 
     this.state.bucketName = inputs.bucketName
     this.state.region = inputs.region
-    this.state.url = `http://${bucketOutputs.name}.s3-website-${inputs.region}.amazonaws.com`
+    this.state.url = `http://${bucketOutputs.name}.${regionUrls[inputs.region]}`
     await this.save()
 
     const outputs = {
@@ -112,20 +112,37 @@ class Website extends Component {
 
     // Configure custom domain, if specified
     if (inputs.domain) {
-      const domain = await this.load('@serverless/domain')
+      const domain = await this.load('@ublend-npm/serverless-compoonent-domain')
       const subdomain = inputs.domain.split('.')[0]
       const secondLevelDomain = inputs.domain.replace(`${subdomain}.`, '')
 
       const domainInputs = {
+        region: this.state.region,
         domain: secondLevelDomain,
         subdomains: {}
       }
 
+      // eslint-disable-next-line prefer-destructuring
+      let cloudFront = inputs.cloudFront
+      const { institution } = inputs
+      if (inputs.securityHeaders) {
+        cloudFront = {
+          ...cloudFront,
+          customLambdaAssociations: [
+            {
+              functionName: `${institution}-security-headers-injector-prod-injectSecurityHeaders`,
+              type: 'origin-response'
+            }
+          ]
+        }
+      }
+
       domainInputs.subdomains[subdomain] = {
         url: this.state.url,
         bucketName: this.state.bucketName,
-        cloudFront: inputs.cloudFront
+        cloudFront
       }
+
       const domainOutputs = await domain(domainInputs)
 
       outputs.domain = domainOutputs.domains[0]
@@ -153,7 +170,7 @@ class Website extends Component {
     // Remove custom domain, if specified
     if (this.state.domain) {
       this.context.debug(`Removing custom domain.`)
-      const domain = await this.load('@serverless/domain')
+      const domain = await this.load('@ublend-npm/serverless-compoonent-domain')
       await domain.remove()
     }