Merge pull request #262 from awslabs/staging

v3.0.1
awslabs · May 10, 2019 · d362bab · d362bab
2 parents 7d09ef1 + 03d605c
commit d362bab
Show file tree

Hide file tree

Showing 26 changed files with 1,430 additions and 1,127 deletions.
diff --git a/cloudformation/template.yaml b/cloudformation/template.yaml
@@ -184,7 +184,7 @@ Resources:
                       method.response.header.Access-Control-Allow-Headers: "'Content-Type,Authorization,X-Amz-Date,X-Api-Key,X-Amz-Security-Token'"
                       method.response.header.Access-Control-Allow-Origin: !If [ 'DevelopmentMode', "'*'", !If [
                         'UseCustomDomainName',
-                        !Join ['', [ "'https://", !GetAtt CustomDomainCloudfrontDistribution.DomainName, "'" ]],
+                        !Join ['', [ "'https://", !Ref CustomDomainName, "'" ]],
                         !Join ['', [ "'https://", !GetAtt DefaultCloudfrontDistribution.DomainName, "'" ]]
                       ]]
                 passthroughBehavior: when_no_match
@@ -231,7 +231,7 @@ Resources:
                       method.response.header.Access-Control-Allow-Headers: "'Content-Type,Authorization,X-Amz-Date,X-Api-Key,X-Amz-Security-Token'"
                       method.response.header.Access-Control-Allow-Origin: !If [ 'DevelopmentMode', "'*'", !If [
                         'UseCustomDomainName',
-                        !Join ['', [ "'https://", !GetAtt CustomDomainCloudfrontDistribution.DomainName, "'" ]],
+                        !Join ['', [ "'https://", !Ref CustomDomainName, "'" ]],
                         !Join ['', [ "'https://", !GetAtt DefaultCloudfrontDistribution.DomainName, "'" ]]
                       ]]
                 passthroughBehavior: when_no_match
@@ -278,7 +278,7 @@ Resources:
                       method.response.header.Access-Control-Allow-Headers: "'Content-Type,Authorization,X-Amz-Date,X-Api-Key,X-Amz-Security-Token'"
                       method.response.header.Access-Control-Allow-Origin: !If [ 'DevelopmentMode', "'*'", !If [
                         'UseCustomDomainName',
-                        !Join ['', [ "'https://", !GetAtt CustomDomainCloudfrontDistribution.DomainName, "'" ]],
+                        !Join ['', [ "'https://", !Ref CustomDomainName, "'" ]],
                         !Join ['', [ "'https://", !GetAtt DefaultCloudfrontDistribution.DomainName, "'" ]]
                       ]]
                 passthroughBehavior: when_no_match
@@ -325,7 +325,7 @@ Resources:
                       method.response.header.Access-Control-Allow-Headers: "'Content-Type,Authorization,X-Amz-Date,X-Api-Key,X-Amz-Security-Token'"
                       method.response.header.Access-Control-Allow-Origin: !If [ 'DevelopmentMode', "'*'", !If [
                         'UseCustomDomainName',
-                        !Join ['', [ "'https://", !GetAtt CustomDomainCloudfrontDistribution.DomainName, "'" ]],
+                        !Join ['', [ "'https://", !Ref CustomDomainName, "'" ]],
                         !Join ['', [ "'https://", !GetAtt DefaultCloudfrontDistribution.DomainName, "'" ]]
                       ]]
                 passthroughBehavior: when_no_match
@@ -398,7 +398,7 @@ Resources:
                       method.response.header.Access-Control-Allow-Headers: "'Content-Type,Authorization,X-Amz-Date,X-Api-Key,X-Amz-Security-Token'"
                       method.response.header.Access-Control-Allow-Origin: !If [ 'DevelopmentMode', "'*'", !If [
                         'UseCustomDomainName',
-                        !Join ['', [ "'https://", !GetAtt CustomDomainCloudfrontDistribution.DomainName, "'" ]],
+                        !Join ['', [ "'https://", !Ref CustomDomainName, "'" ]],
                         !Join ['', [ "'https://", !GetAtt DefaultCloudfrontDistribution.DomainName, "'" ]]
                       ]]
                 passthroughBehavior: when_no_match
@@ -458,7 +458,7 @@ Resources:
                       method.response.header.Access-Control-Allow-Headers: "'Content-Type,Authorization,X-Amz-Date,X-Api-Key,X-Amz-Security-Token'"
                       method.response.header.Access-Control-Allow-Origin: !If [ 'DevelopmentMode', "'*'", !If [
                         'UseCustomDomainName',
-                        !Join ['', [ "'https://", !GetAtt CustomDomainCloudfrontDistribution.DomainName, "'" ]],
+                        !Join ['', [ "'https://", !Ref CustomDomainName, "'" ]],
                         !Join ['', [ "'https://", !GetAtt DefaultCloudfrontDistribution.DomainName, "'" ]]
                       ]]
                 passthroughBehavior: when_no_match
@@ -510,7 +510,7 @@ Resources:
                       method.response.header.Access-Control-Allow-Headers: "'Content-Type,Authorization,X-Amz-Date,X-Api-Key,X-Amz-Security-Token'"
                       method.response.header.Access-Control-Allow-Origin: !If [ 'DevelopmentMode', "'*'", !If [
                         'UseCustomDomainName',
-                        !Join ['', [ "'https://", !GetAtt CustomDomainCloudfrontDistribution.DomainName, "'" ]],
+                        !Join ['', [ "'https://", !Ref CustomDomainName, "'" ]],
                         !Join ['', [ "'https://", !GetAtt DefaultCloudfrontDistribution.DomainName, "'" ]]
                       ]]
                 passthroughBehavior: when_no_match
@@ -1366,7 +1366,6 @@ Resources:
       DistributionConfig:
         Aliases:
           - !Ref CustomDomainName
-          - !Join [ '', [ 'www.', !Ref CustomDomainName ] ]
         CustomErrorResponses:
           - ErrorCode: 403
             ResponseCode: 403
@@ -1443,19 +1442,14 @@ Resources:
             # this is a "magic string" for using CFN aliases; see this link:
             # https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-aliastarget.html
             HostedZoneId: 'Z2FDTNDATAQYW2'
-        - Name: !Join [ '', [ 'www.', !Ref CustomDomainName, '.' ] ]
-          Type: A
-          AliasTarget:
-            DNSName: !Join [ '', [ !GetAtt CustomDomainCloudfrontDistribution.DomainName, '.' ] ]
-            HostedZoneId: 'Z2FDTNDATAQYW2'
 
 Outputs:
   WebsiteURL:
     Value: !If [ 'DevelopmentMode',
       !Join [ '', [ 'https://', !GetAtt DevPortalSiteS3Bucket.RegionalDomainName, '/index.html' ]],
       !If [
         'UseCustomDomainName',
-        !Join [ '', [ 'https://', !GetAtt CustomDomainCloudfrontDistribution.DomainName ]],
+        !Join [ '', [ 'https://', !Ref CustomDomainName ]],
         !Join [ '', [ 'https://', !GetAtt DefaultCloudfrontDistribution.DomainName ]]
       ]
     ]

diff --git a/dev-portal/package.json b/dev-portal/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dev-portal",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "private": true,
   "dependencies": {
     "aws-sdk": "^2.326.0",

diff --git a/lambdas/backend/node_modules/js-yaml/CHANGELOG.md b/lambdas/backend/node_modules/js-yaml/CHANGELOG.md
diff --git a/lambdas/backend/node_modules/js-yaml/README.md b/lambdas/backend/node_modules/js-yaml/README.md
diff --git a/lambdas/backend/node_modules/js-yaml/dist/js-yaml.js b/lambdas/backend/node_modules/js-yaml/dist/js-yaml.js
diff --git a/lambdas/backend/node_modules/js-yaml/dist/js-yaml.min.js b/lambdas/backend/node_modules/js-yaml/dist/js-yaml.min.js
diff --git a/lambdas/backend/node_modules/js-yaml/lib/js-yaml/dumper.js b/lambdas/backend/node_modules/js-yaml/lib/js-yaml/dumper.js
diff --git a/lambdas/backend/node_modules/js-yaml/lib/js-yaml/loader.js b/lambdas/backend/node_modules/js-yaml/lib/js-yaml/loader.js
diff --git a/lambdas/backend/node_modules/js-yaml/package.json b/lambdas/backend/node_modules/js-yaml/package.json
diff --git a/lambdas/backend/package.json b/lambdas/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless-developer-backend",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "developer portal component responsible for backend application logic",
   "main": "index.js",
   "config": {},
@@ -16,7 +16,7 @@
     "cors": "^2.8.1",
     "datauri": "^1.1.0",
     "express": "^4.14.0",
-    "js-yaml": "^3.12.0",
+    "js-yaml": "^3.13.1",
     "object-hash": "^1.3.1"
   },
   "devDependencies": {}