Skip to content

Commit

Permalink
Merge branch 'madeline-k/feat/kinesisfirehose-deliverystream' into ma…
Browse files Browse the repository at this point in the history
…deline-k/feat/kinesisfirehose-metrics
  • Loading branch information
mergify[bot] committed Jul 16, 2021
2 parents 58b3fe1 + 16a54e5 commit 7858c2f
Show file tree
Hide file tree
Showing 283 changed files with 4,054 additions and 1,156 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/yarn-upgrade.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
uses: actions/checkout@v2

- name: Set up Node
uses: actions/setup-node@v2.1.5
uses: actions/setup-node@v2.2.0
with:
node-version: 10

Expand Down
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,20 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

## [1.113.0](https://github.com/aws/aws-cdk/compare/v1.112.0...v1.113.0) (2021-07-12)


### Features

* **assets:** docker images from tar file ([#15438](https://github.com/aws/aws-cdk/issues/15438)) ([76f06fc](https://github.com/aws/aws-cdk/commit/76f06fc2ae4404242e5854d2eeaf4f11b98f98f0)), closes [#15419](https://github.com/aws/aws-cdk/issues/15419)
* **codepipeline-actions:** support combining batch build artifacts in CodeBuildAction ([#15457](https://github.com/aws/aws-cdk/issues/15457)) ([0952f1f](https://github.com/aws/aws-cdk/commit/0952f1f2045f2dbdffeb840c4737522d12ea7df6)), closes [#15455](https://github.com/aws/aws-cdk/issues/15455)
* **events:** cross-region event rules ([#14731](https://github.com/aws/aws-cdk/issues/14731)) ([c62afe9](https://github.com/aws/aws-cdk/commit/c62afe905c0414d2feb38271b0b3df4907ac3caf))


### Bug Fixes

* **aws-ecs:** token is added to Options instead of SecretOptions in SplunkLogDriver ([#15408](https://github.com/aws/aws-cdk/issues/15408)) ([23abe22](https://github.com/aws/aws-cdk/commit/23abe22a173281361855efc8671529e4bae30ae5))

## [1.112.0](https://github.com/aws/aws-cdk/compare/v1.111.0...v1.112.0) (2021-07-09)


Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
"fs-extra": "^9.1.0",
"graceful-fs": "^4.2.6",
"jest-junit": "^12.2.0",
"jsii-diff": "^1.30.0",
"jsii-pacmak": "^1.30.0",
"jsii-reflect": "^1.30.0",
"jsii-rosetta": "^1.30.0",
"jsii-diff": "^1.31.0",
"jsii-pacmak": "^1.31.0",
"jsii-reflect": "^1.31.0",
"jsii-rosetta": "^1.31.0",
"lerna": "^4.0.0",
"patch-package": "^6.4.7",
"standard-version": "^9.3.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
},
"license": "Apache-2.0",
"devDependencies": {
"@types/nodeunit": "^0.0.31",
"@types/nodeunit": "^0.0.32",
"cdk-build-tools": "0.0.0",
"cdk-integ-tools": "0.0.0",
"cfn2ts": "0.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/alexa-ask/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
},
"license": "Apache-2.0",
"devDependencies": {
"@types/jest": "^26.0.23",
"@types/jest": "^26.0.24",
"cdk-build-tools": "0.0.0",
"cfn2ts": "0.0.0",
"pkglint": "0.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/app-delivery/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
},
"devDependencies": {
"@aws-cdk/aws-s3": "0.0.0",
"@types/nodeunit": "^0.0.31",
"@types/nodeunit": "^0.0.32",
"cdk-build-tools": "0.0.0",
"cdk-integ-tools": "0.0.0",
"fast-check": "^2.17.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/assert-internal/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
},
"license": "Apache-2.0",
"devDependencies": {
"@types/jest": "^26.0.23",
"@types/jest": "^26.0.24",
"cdk-build-tools": "0.0.0",
"jest": "^26.6.3",
"pkglint": "0.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/assert/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"license": "Apache-2.0",
"devDependencies": {
"aws-cdk-migration": "0.0.0",
"@types/jest": "^26.0.23",
"@types/jest": "^26.0.24",
"cdk-build-tools": "0.0.0",
"constructs": "^3.3.69",
"jest": "^26.6.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/assertions/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
},
"license": "Apache-2.0",
"devDependencies": {
"@types/jest": "^26.0.23",
"@types/jest": "^26.0.24",
"cdk-build-tools": "0.0.0",
"@aws-cdk/cfnspec": "0.0.0",
"constructs": "^3.3.69",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/assets/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
},
"license": "Apache-2.0",
"devDependencies": {
"@types/nodeunit": "^0.0.31",
"@types/nodeunit": "^0.0.32",
"@types/sinon": "^9.0.11",
"aws-cdk": "0.0.0",
"cdk-build-tools": "0.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-accessanalyzer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
},
"license": "Apache-2.0",
"devDependencies": {
"@types/jest": "^26.0.23",
"@types/jest": "^26.0.24",
"cdk-build-tools": "0.0.0",
"cfn2ts": "0.0.0",
"pkglint": "0.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-acmpca/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
},
"license": "Apache-2.0",
"devDependencies": {
"@types/jest": "^26.0.23",
"@types/jest": "^26.0.24",
"cdk-build-tools": "0.0.0",
"cfn2ts": "0.0.0",
"pkglint": "0.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-amazonmq/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
},
"license": "Apache-2.0",
"devDependencies": {
"@types/jest": "^26.0.23",
"@types/jest": "^26.0.24",
"cdk-build-tools": "0.0.0",
"cfn2ts": "0.0.0",
"pkglint": "0.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-amplify/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
},
"license": "Apache-2.0",
"devDependencies": {
"@types/jest": "^26.0.23",
"@types/jest": "^26.0.24",
"cdk-build-tools": "0.0.0",
"cdk-integ-tools": "0.0.0",
"cfn2ts": "0.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-apigateway/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
},
"license": "Apache-2.0",
"devDependencies": {
"@types/jest": "^26.0.23",
"@types/jest": "^26.0.24",
"cdk-build-tools": "0.0.0",
"cdk-integ-tools": "0.0.0",
"cfn2ts": "0.0.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk/aws-apigatewayv2-authorizers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@
},
"license": "Apache-2.0",
"devDependencies": {
"@types/jest": "^26.0.23",
"@types/aws-lambda": "^8.10.77",
"@types/jest": "^26.0.24",
"@types/aws-lambda": "^8.10.78",
"@aws-cdk/aws-apigatewayv2-integrations": "0.0.0",
"@aws-cdk/aws-lambda": "0.0.0",
"cdk-build-tools": "0.0.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk/aws-apigatewayv2-integrations/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@
},
"license": "Apache-2.0",
"devDependencies": {
"@types/jest": "^26.0.23",
"@types/nodeunit": "^0.0.31",
"@types/jest": "^26.0.24",
"@types/nodeunit": "^0.0.32",
"cdk-build-tools": "0.0.0",
"cdk-integ-tools": "0.0.0",
"nodeunit": "^0.11.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-apigatewayv2/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
},
"license": "Apache-2.0",
"devDependencies": {
"@types/jest": "^26.0.23",
"@types/jest": "^26.0.24",
"cdk-build-tools": "0.0.0",
"cdk-integ-tools": "0.0.0",
"cfn2ts": "0.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-appconfig/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
},
"license": "Apache-2.0",
"devDependencies": {
"@types/jest": "^26.0.23",
"@types/jest": "^26.0.24",
"cdk-build-tools": "0.0.0",
"cfn2ts": "0.0.0",
"pkglint": "0.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-appflow/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
},
"license": "Apache-2.0",
"devDependencies": {
"@types/jest": "^26.0.23",
"@types/jest": "^26.0.24",
"cdk-build-tools": "0.0.0",
"cfn2ts": "0.0.0",
"pkglint": "0.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-appintegrations/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
},
"license": "Apache-2.0",
"devDependencies": {
"@types/jest": "^26.0.23",
"@types/jest": "^26.0.24",
"@aws-cdk/assert-internal": "0.0.0",
"cdk-build-tools": "0.0.0",
"cfn2ts": "0.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-applicationautoscaling/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
},
"license": "Apache-2.0",
"devDependencies": {
"@types/nodeunit": "^0.0.31",
"@types/nodeunit": "^0.0.32",
"cdk-build-tools": "0.0.0",
"cfn2ts": "0.0.0",
"fast-check": "^2.17.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-applicationinsights/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
},
"license": "Apache-2.0",
"devDependencies": {
"@types/jest": "^26.0.23",
"@types/jest": "^26.0.24",
"cdk-build-tools": "0.0.0",
"cfn2ts": "0.0.0",
"pkglint": "0.0.0",
Expand Down
52 changes: 42 additions & 10 deletions packages/@aws-cdk/aws-appmesh/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -406,6 +406,18 @@ A `route` is associated with a virtual router, and it's used to match requests f

If your `route` matches a request, you can distribute traffic to one or more target virtual nodes with relative weighting.

The _RouteSpec_ class provides an easy interface for defining new protocol specific route specs.
The `tcp()`, `http()`, `http2()`, and `grpc()` methods provide the spec necessary to define a protocol specific spec.

For HTTP based routes, the match field can be used to match on
path (prefix, exact, or regex), HTTP method, scheme, HTTP headers, and query parameters.
By default, an HTTP based route will match all requests.

For gRPC based routes, the match field can be used to match on service name, method name, and metadata.
When specifying the method name, service name must also be specified.

For example, here's how to add an HTTP route that matches based on a prefix of the URL path:

```ts
router.addRoute('route-http', {
routeSpec: appmesh.RouteSpec.http({
Expand All @@ -415,13 +427,14 @@ router.addRoute('route-http', {
},
],
match: {
prefixPath: '/path-to-app',
// Path that is passed to this method must start with '/'.
path: appmesh.HttpRoutePathMatch.startsWith('/path-to-app'),
},
}),
});
```

Add an HTTP2 route that matches based on method, scheme and header:
Add an HTTP2 route that matches based on exact path, method, scheme, headers, and query parameters:

```ts
router.addRoute('route-http2', {
Expand All @@ -432,14 +445,18 @@ router.addRoute('route-http2', {
},
],
match: {
prefixPath: '/',
path: appmesh.HttpRoutePathMatch.exactly('/exact'),
method: appmesh.HttpRouteMethod.POST,
protocol: appmesh.HttpRouteProtocol.HTTPS,
headers: [
// All specified headers must match for the route to match.
appmesh.HeaderMatch.valueIs('Content-Type', 'application/json'),
appmesh.HeaderMatch.valueIsNot('Content-Type', 'application/json'),
]
],
queryParameters: [
// All specified query parameters must match for the route to match.
appmesh.QueryParameterMatch.valueIs('query-field', 'value')
],
},
}),
});
Expand All @@ -461,7 +478,7 @@ router.addRoute('route-http', {
},
],
match: {
prefixPath: '/path-to-app',
path: appmesh.HttpRoutePathMatch.startsWith('/path-to-app'),
},
}),
});
Expand Down Expand Up @@ -511,12 +528,27 @@ router.addRoute('route-grpc-retry', {
});
```

The _RouteSpec_ class provides an easy interface for defining new protocol specific route specs.
The `tcp()`, `http()` and `http2()` methods provide the spec necessary to define a protocol specific spec.
Add an gRPC route that matches based on method name and metadata:

For HTTP based routes, the match field can be used to match on a route prefix.
By default, an HTTP based route will match on `/`. All matches must start with a leading `/`.
The timeout field can also be specified for `idle` and `perRequest` timeouts.
```ts
router.addRoute('route-grpc-retry', {
routeSpec: appmesh.RouteSpec.grpc({
weightedTargets: [{ virtualNode: node }],
match: {
// When method name is specified, service name must be also specified.
methodName: 'methodname',
serviceName: 'servicename',
metadata: [
// All specified metadata must match for the route to match.
appmesh.HeaderMatch.valueStartsWith('Content-Type', 'application/'),
appmesh.HeaderMatch.valueDoesNotStartWith('Content-Type', 'text/'),
],
},
}),
});
```

Add a gRPC route with time out:

```ts
router.addRoute('route-http', {
Expand Down
Loading

0 comments on commit 7858c2f

Please sign in to comment.