Skip to content

Commit d71a02b

Browse files
mergify[bot]mergify[bot]
authored
Merge branch 'master' into conroy/cfn-parse
2 parents 6f885fe + 3665db9 commit d71a02b

75 files changed

Lines changed: 1593 additions & 1168 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-reprioritization.yml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: issue-reprioritization
2+
on:
3+
schedule:
4+
- cron: "0 0 * * 0"
5+
6+
jobs:
7+
issue-reprioritization:
8+
permissions:
9+
issues: write
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: kaizen3031593/issue-reprioritization-manager@main
13+
id: reprioritization-manager
14+
with:
15+
github-token: ${{ secrets.GITHUB_TOKEN }}
16+
original-label: p2
17+
new-label: p1
18+
reprioritization-threshold: 20
19+
- uses: kaizen3031593/pr-triage-manager@main
20+
with:
21+
github-token: ${{ secrets.GITHUB_TOKEN }}
22+
on-pulls: ${{ steps.reprioritization-manager.outputs.linked-pulls }}

‎README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,17 +79,17 @@ For a detailed walkthrough, see the [tutorial](https://docs.aws.amazon.com/cdk/l
7979
Install or update the [AWS CDK CLI] from npm (requires [Node.js ≥ 14.15.0](https://nodejs.org/download/release/latest-v14.x/)). We recommend using a version in [Active LTS](https://nodejs.org/en/about/releases/)
8080

8181
```console
82-
$ npm i -g aws-cdk
82+
npm i -g aws-cdk
8383
```
8484

8585
(See [Manual Installation](./MANUAL_INSTALLATION.md) for installing the CDK from a signed .zip file).
8686

8787
Initialize a project:
8888

8989
```console
90-
$ mkdir hello-cdk
91-
$ cd hello-cdk
92-
$ cdk init sample-app --language=typescript
90+
mkdir hello-cdk
91+
cd hello-cdk
92+
cdk init sample-app --language=typescript
9393
```
9494

9595
This creates a sample project looking like this:
@@ -113,7 +113,7 @@ export class HelloCdkStack extends cdk.Stack {
113113
Deploy this to your account:
114114

115115
```console
116-
$ cdk deploy
116+
cdk deploy
117117
```
118118

119119
Use the `cdk` command-line toolkit to interact with your project:

‎design/aws-ecs/aws-ecs-priv-registry-support.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ DockerHub images are assumed public, however DockerHub also provides private rep
1616

1717
There's also no explicit way to specify images hosted outside of DockerHub, AWS, or your local machine. Customers hosting their own registries or using another registry host, like Quay.io or JFrog Artifactory, would need to be able to specify both the image URI and the registry credentials in order to pull their images down for ECS tasks.
1818

19-
Fundamentally, specifying images hosted in DockerHub or elsewhere works the same, because when passed an image URI vs. a plain (or namespaced) image name + tag, the Docker daemon does the right thing and tries to pull the image from the specified registery.
19+
Fundamentally, specifying images hosted in DockerHub or elsewhere works the same, because when passed an image URI vs. a plain (or namespaced) image name + tag, the Docker daemon does the right thing and tries to pull the image from the specified registry.
2020

2121
Therefore, we should rename the existing `DockerHubImage` type be more generic and add the ability to optionally specify credentials.
2222

‎packages/@aws-cdk/aws-appsync/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ import * as opensearch from '@aws-cdk/aws-opensearchservice';
252252

253253
const user = new iam.User(this, 'User');
254254
const domain = new opensearch.Domain(this, 'Domain', {
255-
version: opensearch.EngineVersion.OPENSEARCH_1_1,
255+
version: opensearch.EngineVersion.OPENSEARCH_1_2,
256256
removalPolicy: RemovalPolicy.DESTROY,
257257
fineGrainedAccessControl: { masterUserArn: user.userArn },
258258
encryptionAtRest: { enabled: true },

‎packages/@aws-cdk/aws-appsync/test/integ.graphql-opensearch.expected.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"EncryptionAtRestOptions": {
4040
"Enabled": true
4141
},
42-
"EngineVersion": "OpenSearch_1.1",
42+
"EngineVersion": "OpenSearch_1.2",
4343
"LogPublishingOptions": {},
4444
"NodeToNodeEncryptionOptions": {
4545
"Enabled": true

‎packages/@aws-cdk/aws-appsync/test/integ.graphql-opensearch.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const app = new cdk.App();
88
const stack = new cdk.Stack(app, 'appsync-opensearch');
99
const user = new User(stack, 'User');
1010
const domain = new opensearch.Domain(stack, 'Domain', {
11-
version: opensearch.EngineVersion.OPENSEARCH_1_1,
11+
version: opensearch.EngineVersion.OPENSEARCH_1_2,
1212
removalPolicy: cdk.RemovalPolicy.DESTROY,
1313
fineGrainedAccessControl: {
1414
masterUserArn: user.userArn,

‎packages/@aws-cdk/aws-cloudformation/test/integ.nested-stack.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class MyNestedStack extends NestedStack {
4141

4242
if (props.subscriber) {
4343
new lambda.Function(this, 'fn', {
44-
runtime: lambda.Runtime.NODEJS_10_X,
44+
runtime: lambda.Runtime.NODEJS_14_X,
4545
code: lambda.Code.fromInline('console.error("hi")'),
4646
handler: 'index.handler',
4747
environment: {

‎packages/@aws-cdk/aws-cloudformation/test/integ.nested-stacks-assets.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class MyNestedStack extends NestedStack {
1515

1616
new lambda.Function(this, 'Handler', {
1717
code: lambda.Code.fromAsset(path.join(__dirname, 'asset-directory-fixture')),
18-
runtime: lambda.Runtime.NODEJS_10_X,
18+
runtime: lambda.Runtime.NODEJS_14_X,
1919
handler: 'index.handler',
2020
});
2121
}

‎packages/@aws-cdk/aws-codepipeline-actions/test/integ.lambda-deployed-through-codepipeline.lit.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const lambdaCode = lambda.Code.fromCfnParameters();
1414
new lambda.Function(lambdaStack, 'Lambda', {
1515
code: lambdaCode,
1616
handler: 'index.handler',
17-
runtime: lambda.Runtime.NODEJS_10_X,
17+
runtime: lambda.Runtime.NODEJS_14_X,
1818
});
1919
// other resources that your Lambda needs, added to the lambdaStack...
2020

‎packages/@aws-cdk/aws-codepipeline-actions/test/integ.lambda-pipeline.expected.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -883,7 +883,7 @@
883883
]
884884
},
885885
"Handler": "index.handler",
886-
"Runtime": "nodejs10.x"
886+
"Runtime": "nodejs14.x"
887887
},
888888
"DependsOn": [
889889
"LambdaFunServiceRoleDefaultPolicy217FED83",

0 commit comments

Comments
 (0)