Skip to content

Commit 366a734

Browse files
mergify[bot]mergify[bot]
authored
Merge branch 'master' into cf-rest-api-origin
2 parents e4521ee + 6fae606 commit 366a734

361 files changed

Lines changed: 7657 additions & 1231 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/issue-label-assign.yml‎

Lines changed: 68 additions & 68 deletions
Large diffs are not rendered by default.

‎.github/workflows/issue-reprioritization.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ jobs:
77
issue-reprioritization:
88
permissions:
99
issues: write
10+
repository-projects: write
1011
runs-on: ubuntu-latest
1112
steps:
1213
- uses: kaizencc/issue-reprioritization-manager@main
@@ -16,6 +17,7 @@ jobs:
1617
original-label: p2
1718
new-label: p1
1819
reprioritization-threshold: 20
20+
project-column-url: https://github.com/aws/aws-cdk/projects/13#column-18002436
1921
- uses: kaizencc/pr-triage-manager@main
2022
with:
2123
github-token: ${{ secrets.GITHUB_TOKEN }}

‎package.json‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,8 @@
8080
"@aws-cdk/assertions-alpha/fs-extra/**",
8181
"@aws-cdk/assertions/fs-extra",
8282
"@aws-cdk/assertions/fs-extra/**",
83-
"@aws-cdk/aws-amplify-alpha/yaml",
84-
"@aws-cdk/aws-amplify-alpha/yaml/**",
8583
"@aws-cdk/aws-iot-actions-alpha/case",
8684
"@aws-cdk/aws-iot-actions-alpha/case/**",
87-
"@aws-cdk/aws-amplify/yaml",
88-
"@aws-cdk/aws-amplify/yaml/**",
8985
"@aws-cdk/aws-codebuild/yaml",
9086
"@aws-cdk/aws-codebuild/yaml/**",
9187
"@aws-cdk/aws-codepipeline-actions/case",

‎packages/@aws-cdk/assertions/lib/helpers-internal/index.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
export * from '../match';
2+
export * from '../matcher';

‎packages/@aws-cdk/assertions/package.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@
1818
"build+extract": "yarn build && yarn rosetta:extract",
1919
"build+test+extract": "yarn build+test && yarn rosetta:extract"
2020
},
21+
"ubergen": {
22+
"exports": {
23+
"./lib/helpers-internal": "./lib/helpers-internal/index.js"
24+
}
25+
},
2126
"jsii": {
2227
"outdir": "dist",
2328
"diagnostics": {

‎packages/@aws-cdk/aws-amplify/NOTICE‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,2 @@
11
AWS Cloud Development Kit (AWS CDK)
22
Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
3-
4-
-------------------------------------------------------------------------------
5-
6-
The AWS CDK includes the following third-party software/licensing:
7-
8-
** yaml - https://www.npmjs.com/package/yaml
9-
Copyright 2018 Eemeli Aro <eemeli@gmail.com>
10-
11-
Permission to use, copy, modify, and/or distribute this software for any purpose
12-
with or without fee is hereby granted, provided that the above copyright notice
13-
and this permission notice appear in all copies.
14-
15-
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
16-
REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
17-
FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
18-
INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
19-
OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
20-
TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
21-
THIS SOFTWARE.
22-
23-
----------------

‎packages/@aws-cdk/aws-amplify/lib/app.ts‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import * as codebuild from '@aws-cdk/aws-codebuild';
22
import * as iam from '@aws-cdk/aws-iam';
33
import { IResource, Lazy, Resource, SecretValue } from '@aws-cdk/core';
44
import { Construct } from 'constructs';
5-
import * as YAML from 'yaml';
65
import { CfnApp } from './amplify.generated';
76
import { BasicAuth } from './basic-auth';
87
import { Branch, BranchOptions } from './branch';
@@ -515,11 +514,18 @@ export interface CustomResponseHeader {
515514
}
516515

517516
function renderCustomResponseHeaders(customHeaders: CustomResponseHeader[]): string {
518-
const modifiedHeaders = customHeaders.map(customHeader => ({
519-
...customHeader,
520-
headers: Object.entries(customHeader.headers).map(([key, value]) => ({ key, value })),
521-
}));
517+
const yaml = [
518+
'customHeaders:',
519+
];
520+
521+
for (const customHeader of customHeaders) {
522+
yaml.push(` - pattern: "${customHeader.pattern}"`);
523+
yaml.push(' headers:');
524+
for (const [key, value] of Object.entries(customHeader.headers)) {
525+
yaml.push(` - key: "${key}"`);
526+
yaml.push(` value: "${value}"`);
527+
}
528+
}
522529

523-
const customHeadersObject = { customHeaders: modifiedHeaders };
524-
return YAML.stringify(customHeadersObject);
530+
return `${yaml.join('\n')}\n`;
525531
}

‎packages/@aws-cdk/aws-amplify/package.json‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@
8787
"@aws-cdk/cfn2ts": "0.0.0",
8888
"@aws-cdk/pkglint": "0.0.0",
8989
"@types/jest": "^27.5.0",
90-
"@types/yaml": "1.9.6",
9190
"aws-sdk": "^2.848.0"
9291
},
9392
"dependencies": {
@@ -101,12 +100,8 @@
101100
"@aws-cdk/aws-secretsmanager": "0.0.0",
102101
"@aws-cdk/core": "0.0.0",
103102
"@aws-cdk/custom-resources": "0.0.0",
104-
"constructs": "^3.3.69",
105-
"yaml": "1.10.2"
103+
"constructs": "^3.3.69"
106104
},
107-
"bundledDependencies": [
108-
"yaml"
109-
],
110105
"peerDependencies": {
111106
"@aws-cdk/aws-codebuild": "0.0.0",
112107
"@aws-cdk/aws-codecommit": "0.0.0",

‎packages/@aws-cdk/aws-amplify/test/app.integ.snapshot/cdk-amplify-app.template.json‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,18 @@
5656
},
5757
"Username": "aws"
5858
},
59-
"CustomHeaders": "customHeaders:\n - pattern: \"*.json\"\n headers:\n - key: custom-header-name-1\n value: custom-header-value-1\n - key: custom-header-name-2\n value: custom-header-value-2\n - pattern: /path/*\n headers:\n - key: custom-header-name-1\n value: custom-header-value-2\n",
59+
"CustomHeaders": {
60+
"Fn::Join": [
61+
"",
62+
[
63+
"customHeaders:\n - pattern: \"*.json\"\n headers:\n - key: \"custom-header-name-1\"\n value: \"custom-header-value-1\"\n - key: \"custom-header-name-2\"\n value: \"custom-header-value-2\"\n - pattern: \"/path/*\"\n headers:\n - key: \"custom-header-name-1\"\n value: \"custom-header-value-2\"\n - key: \"x-aws-url-suffix\"\n value: \"this-is-the-suffix-",
64+
{
65+
"Ref": "AWS::URLSuffix"
66+
},
67+
"\"\n"
68+
]
69+
]
70+
},
6071
"CustomRules": [
6172
{
6273
"Source": "/source",

‎packages/@aws-cdk/aws-amplify/test/app.integ.snapshot/cdk.out‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"version":"17.0.0"}
1+
{"version":"19.0.0"}

0 commit comments

Comments
 (0)