Skip to content

v3.0.1 #262

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
May 10, 2019
Merged

v3.0.1 #262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7ea0e24
#255 Fix bug where wrong origin set on API CORS policy
markcarroll Apr 23, 2019
82de394
Remove WWW. from domain definition to solve CORS and Cert issues
markcarroll Apr 25, 2019
b5cba88
Merge pull request #261 from markcarroll/staging
echo-bravo-yahoo Apr 29, 2019
17e67ca
Update jest version
echo-bravo-yahoo May 9, 2019
be6a7f9
Update version stamps for v3.0.1
echo-bravo-yahoo May 9, 2019
13c850f
Update static assets for v3.0.1
echo-bravo-yahoo May 9, 2019
03d605c
Merge branch 'master' into staging
echo-bravo-yahoo May 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 8 additions & 14 deletions cloudformation/template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -1366,7 +1366,6 @@ Resources:
DistributionConfig:
Aliases:
- !Ref CustomDomainName
- !Join [ '', [ 'www.', !Ref CustomDomainName ] ]
CustomErrorResponses:
- ErrorCode: 403
ResponseCode: 403
Expand Down Expand Up @@ -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 ]]
]
]
Expand Down
2 changes: 1 addition & 1 deletion dev-portal/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "dev-portal",
"version": "3.0.0",
"version": "3.0.1",
"private": true,
"dependencies": {
"aws-sdk": "^2.326.0",
Expand Down
25 changes: 25 additions & 0 deletions lambdas/backend/node_modules/js-yaml/CHANGELOG.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion lambdas/backend/node_modules/js-yaml/README.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

55 changes: 42 additions & 13 deletions lambdas/backend/node_modules/js-yaml/dist/js-yaml.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lambdas/backend/node_modules/js-yaml/dist/js-yaml.min.js
View file
Open in desktop

Large diffs are not rendered by default.

26 changes: 14 additions & 12 deletions lambdas/backend/node_modules/js-yaml/lib/js-yaml/dumper.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 27 additions & 0 deletions lambdas/backend/node_modules/js-yaml/lib/js-yaml/loader.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 11 additions & 11 deletions lambdas/backend/node_modules/js-yaml/package.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions lambdas/backend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": {},
Expand All @@ -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": {}
Expand Down
Loading