Skip to content

Commit

Permalink
Merge branch 'main' into aws-sns_modify-integ-test
Browse files Browse the repository at this point in the history
  • Loading branch information
xazhao authored Apr 1, 2024
2 parents 3476666 + 99e9589 commit 650d73a
Show file tree
Hide file tree
Showing 15 changed files with 90 additions and 37 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/repo-metrics-monthly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
echo "last_month=$first_day..$last_day" >> "$GITHUB_ENV"
- name: Report on issues
uses: github/issue-metrics@v2
uses: github/issue-metrics@v3
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SEARCH_QUERY: 'repo:aws/aws-cdk is:issue created:${{ env.last_month }} -reason:"not planned"'
Expand All @@ -44,7 +44,7 @@ jobs:
assignees: evgenyka

- name: Report on PRs
uses: github/issue-metrics@v2
uses: github/issue-metrics@v3
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SEARCH_QUERY: 'repo:aws/aws-cdk is:pr created:${{ env.last_month }} -is:draft'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/repo-metrics-weekly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
echo "last_week=$PREVIOUS_MONDAY..$CURRENT_SUNDAY" >> "$GITHUB_ENV"
- name: Report on issues
uses: github/issue-metrics@v2
uses: github/issue-metrics@v3
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SEARCH_QUERY: 'repo:aws/aws-cdk is:issue created:${{ env.last_week }} -reason:"not planned"'
Expand All @@ -44,7 +44,7 @@ jobs:
assignees: paulhcsun

- name: Report on PRs
uses: github/issue-metrics@v2
uses: github/issue-metrics@v3
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SEARCH_QUERY: 'repo:aws/aws-cdk is:pr created:${{ env.last_week }} -is:draft'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/request-cli-integ-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
persist-credentials: false
- name: Find changed cli files
id: changed-cli-files
uses: tj-actions/changed-files@20576b4b9ed46d41e2d45a2256e5e2316dde6834
uses: tj-actions/changed-files@2d756ea4c53f7f6b397767d8723b3a10a9f35bf2
with:
base_sha: ${{ github.event.pull_request.base.sha }}
files_yaml: |
Expand Down
8 changes: 4 additions & 4 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,20 @@ Shout out to our top contributors!
- [otaviomacedo](https://github.com/otaviomacedo)
- [mrgrain](https://github.com/mrgrain)
- [madeline-k](https://github.com/madeline-k)
- [NetaNir](https://github.com/NetaNir)
- [comcalvi](https://github.com/comcalvi)
- [NetaNir](https://github.com/NetaNir)
- [robertd](https://github.com/robertd)
- [pahud](https://github.com/pahud)
- [MrArnoldPalmer](https://github.com/MrArnoldPalmer)
- [TheRealAmazonKendra](https://github.com/TheRealAmazonKendra)
- [MrArnoldPalmer](https://github.com/MrArnoldPalmer)
- [lpizzinidev](https://github.com/lpizzinidev)
- [peterwoodworth](https://github.com/peterwoodworth)
- [go-to-k](https://github.com/go-to-k)
- [colifran](https://github.com/colifran)
- [nija-at](https://github.com/nija-at)
- [hoegertn](https://github.com/hoegertn)
- [msambol](https://github.com/msambol)
- [watany-dev](https://github.com/watany-dev)
- [jumic](https://github.com/jumic)


_Last updated: Fri, 01 Mar 24 00:09:32 +0000_
_Last updated: Mon, 01 Apr 24 00:09:41 +0000_
4 changes: 2 additions & 2 deletions packages/@aws-cdk/cloudformation-diff/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
},
"license": "Apache-2.0",
"dependencies": {
"@aws-cdk/aws-service-spec": "^0.0.60",
"@aws-cdk/service-spec-types": "^0.0.60",
"@aws-cdk/aws-service-spec": "^0.0.61",
"@aws-cdk/service-spec-types": "^0.0.61",
"aws-sdk": "2.1586.0",
"chalk": "^4",
"diff": "^5.2.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/integ-runner/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
"@aws-cdk/cloud-assembly-schema": "0.0.0",
"@aws-cdk/cloudformation-diff": "0.0.0",
"@aws-cdk/cx-api": "0.0.0",
"@aws-cdk/aws-service-spec": "^0.0.60",
"@aws-cdk/aws-service-spec": "^0.0.61",
"cdk-assets": "0.0.0",
"@aws-cdk/cdk-cli-wrapper": "0.0.0",
"aws-cdk": "0.0.0",
Expand Down
13 changes: 13 additions & 0 deletions packages/aws-cdk-lib/aws-securitylake/.jsiirc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"targets": {
"java": {
"package": "software.amazon.awscdk.services.securitylake"
},
"dotnet": {
"package": "Amazon.CDK.AWS.SecurityLake"
},
"python": {
"module": "aws_cdk.aws_securitylake"
}
}
}
39 changes: 39 additions & 0 deletions packages/aws-cdk-lib/aws-securitylake/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# AWS::SecurityLake Construct Library
<!--BEGIN STABILITY BANNER-->

---

![cfn-resources: Stable](https://img.shields.io/badge/cfn--resources-stable-success.svg?style=for-the-badge)

> All classes with the `Cfn` prefix in this module ([CFN Resources]) are always stable and safe to use.
>
> [CFN Resources]: https://docs.aws.amazon.com/cdk/latest/guide/constructs.html#constructs_lib
---

<!--END STABILITY BANNER-->

This module is part of the [AWS Cloud Development Kit](https://github.com/aws/aws-cdk) project.

```ts nofixture
import * as securitylake from 'aws-cdk-lib/aws-securitylake';
```

<!--BEGIN CFNONLY DISCLAIMER-->

There are no official hand-written ([L2](https://docs.aws.amazon.com/cdk/latest/guide/constructs.html#constructs_lib)) constructs for this service yet. Here are some suggestions on how to proceed:

- Search [Construct Hub for SecurityLake construct libraries](https://constructs.dev/search?q=securitylake)
- Use the automatically generated [L1](https://docs.aws.amazon.com/cdk/latest/guide/constructs.html#constructs_l1_using) constructs, in the same way you would use [the CloudFormation AWS::SecurityLake resources](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/AWS_SecurityLake.html) directly.


<!--BEGIN CFNONLY DISCLAIMER-->

There are no hand-written ([L2](https://docs.aws.amazon.com/cdk/latest/guide/constructs.html#constructs_lib)) constructs for this service yet.
However, you can still use the automatically generated [L1](https://docs.aws.amazon.com/cdk/latest/guide/constructs.html#constructs_l1_using) constructs, and use this service exactly as you would using CloudFormation directly.

For more information on the resources and properties available for this service, see the [CloudFormation documentation for AWS::SecurityLake](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/AWS_SecurityLake.html).

(Read the [CDK Contributing Guide](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md) and submit an RFC if you are interested in contributing to this construct library.)

<!--END CFNONLY DISCLAIMER-->
1 change: 1 addition & 0 deletions packages/aws-cdk-lib/aws-securitylake/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './lib';
2 changes: 2 additions & 0 deletions packages/aws-cdk-lib/aws-securitylake/lib/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
// AWS::SecurityLake Cloudformation Resources
export * from './securitylake.generated';
1 change: 1 addition & 0 deletions packages/aws-cdk-lib/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,7 @@ export * as aws_scheduler from './aws-scheduler';
export * as aws_sdb from './aws-sdb';
export * as aws_secretsmanager from './aws-secretsmanager';
export * as aws_securityhub from './aws-securityhub';
export * as aws_securitylake from './aws-securitylake';
export * as aws_servicecatalog from './aws-servicecatalog';
export * as aws_servicecatalogappregistry from './aws-servicecatalogappregistry';
export * as aws_servicediscovery from './aws-servicediscovery';
Expand Down
3 changes: 2 additions & 1 deletion packages/aws-cdk-lib/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@
"mime-types": "^2.1.35"
},
"devDependencies": {
"@aws-cdk/aws-service-spec": "^0.0.60",
"@aws-cdk/aws-service-spec": "^0.0.61",
"@aws-cdk/cdk-build-tools": "0.0.0",
"@aws-cdk/custom-resource-handlers": "0.0.0",
"@aws-cdk/pkglint": "0.0.0",
Expand Down Expand Up @@ -442,6 +442,7 @@
"./aws-sdb": "./aws-sdb/index.js",
"./aws-secretsmanager": "./aws-secretsmanager/index.js",
"./aws-securityhub": "./aws-securityhub/index.js",
"./aws-securitylake": "./aws-securitylake/index.js",
"./aws-servicecatalog": "./aws-servicecatalog/index.js",
"./aws-servicecatalogappregistry": "./aws-servicecatalogappregistry/index.js",
"./aws-servicediscovery": "./aws-servicediscovery/index.js",
Expand Down
3 changes: 3 additions & 0 deletions packages/aws-cdk-lib/scripts/scope-map.json
Original file line number Diff line number Diff line change
Expand Up @@ -609,6 +609,9 @@
"aws-securityhub": [
"AWS::SecurityHub"
],
"aws-securitylake": [
"AWS::SecurityLake"
],
"aws-servicecatalog": [
"AWS::ServiceCatalog"
],
Expand Down
6 changes: 3 additions & 3 deletions tools/@aws-cdk/spec2cdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
},
"license": "Apache-2.0",
"dependencies": {
"@aws-cdk/aws-service-spec": "^0.0.60",
"@aws-cdk/service-spec-importers": "^0.0.27",
"@aws-cdk/service-spec-types": "^0.0.60",
"@aws-cdk/aws-service-spec": "^0.0.61",
"@aws-cdk/service-spec-importers": "^0.0.28",
"@aws-cdk/service-spec-types": "^0.0.61",
"@cdklabs/tskb": "^0.0.3",
"@cdklabs/typewriter": "^0.0.3",
"camelcase": "^6",
Expand Down
35 changes: 14 additions & 21 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,12 @@
resolved "https://registry.npmjs.org/@aws-cdk/asset-node-proxy-agent-v6/-/asset-node-proxy-agent-v6-2.0.1.tgz#6dc9b7cdb22ff622a7176141197962360c33e9ac"
integrity sha512-DDt4SLdLOwWCjGtltH4VCST7hpOI5DzieuhGZsBpZ+AgJdSI2GCjklCXm0GCTwJG/SolkL5dtQXyUKgg9luBDg==

"@aws-cdk/aws-service-spec@^0.0.60":
version "0.0.60"
resolved "https://registry.npmjs.org/@aws-cdk/aws-service-spec/-/aws-service-spec-0.0.60.tgz#6ed18a6f9cd8bce649a49f26ecf5e3c7a1360cf0"
integrity sha512-HyIQGKkPz3olFP5JKXxxVomTZFcpwRvDQ5e+deJ2srTS4EpUTFs8jB/Etw4gNvv0ka0y6Vv3dZ4Tvz6EhZ9t3A==
"@aws-cdk/aws-service-spec@^0.0.61":
version "0.0.61"
resolved "https://registry.npmjs.org/@aws-cdk/aws-service-spec/-/aws-service-spec-0.0.61.tgz#afb49a8fb0a8907e08337a7d3d07d16847da7d84"
integrity sha512-otxvSzkPCuZuGddWFHXFdEsjasTpQciGRjfPWmtt+iwu48rJe40zQtpyXZm72SJ25JBXFDHNnrYcALT4NzIQMQ==
dependencies:
"@aws-cdk/service-spec-types" "^0.0.60"
"@aws-cdk/service-spec-types" "^0.0.61"
"@cdklabs/tskb" "^0.0.3"

"@aws-cdk/lambda-layer-kubectl-v24@^2.0.242":
Expand All @@ -74,12 +74,12 @@
resolved "https://registry.npmjs.org/@aws-cdk/lambda-layer-kubectl-v29/-/lambda-layer-kubectl-v29-2.0.0.tgz#1c078fffa2c701c691aeb3e599e91cd3c1017e74"
integrity sha512-X6RKZPcPGkYSp9/AhiNtEL7Vz2I77qCdbr5XGtqFeIyw/620Qo2ZIRFr2AjWfGEj81gvcwUbVW5lZ6+EqqyqlA==

"@aws-cdk/service-spec-importers@^0.0.27":
version "0.0.27"
resolved "https://registry.npmjs.org/@aws-cdk/service-spec-importers/-/service-spec-importers-0.0.27.tgz#a8ce7bb76eebf5027671bcecf03fa8739d01385e"
integrity sha512-YR5Fo/SJwJyG1i271GnJEvaq3mWw4Eg9PuKQkSIyACn1Jb/k4vVMxAz6Y3j50Wp9H3nq7Ux+cbezHcJTFVd7nw==
"@aws-cdk/service-spec-importers@^0.0.28":
version "0.0.28"
resolved "https://registry.npmjs.org/@aws-cdk/service-spec-importers/-/service-spec-importers-0.0.28.tgz#97ad3077ac3f2b6e31ca54e2da6f8aa4c1f0765b"
integrity sha512-x6WDd5xsgBJHRxVMmeO6ivSovGdDG5CtEPAf2rAPp+dd56NCe6N3/A4x2SzmejvUTOWBQrxcXqHsKaW8YRGvAg==
dependencies:
"@aws-cdk/service-spec-types" "^0.0.57"
"@aws-cdk/service-spec-types" "^0.0.61"
"@cdklabs/tskb" "^0.0.3"
ajv "^6"
canonicalize "^2.0.0"
Expand All @@ -90,17 +90,10 @@
glob "^8"
sort-json "^2.0.1"

"@aws-cdk/service-spec-types@^0.0.57":
version "0.0.57"
resolved "https://registry.npmjs.org/@aws-cdk/service-spec-types/-/service-spec-types-0.0.57.tgz#b3d3e498a93957c57aa48b6edcd3d122e2145ad2"
integrity sha512-IPB4sgE+05DQXt6UqWSutEyeBCFPm6mSxBiw7/neXHSBLu/FcxXDy+C80nyTcuSW1WJbkNomjV4b3hkp47VPAg==
dependencies:
"@cdklabs/tskb" "^0.0.3"

"@aws-cdk/service-spec-types@^0.0.60":
version "0.0.60"
resolved "https://registry.npmjs.org/@aws-cdk/service-spec-types/-/service-spec-types-0.0.60.tgz#497a45d223f9a5e8dcfc90c614271c54a92588a9"
integrity sha512-yXjN5vP1DmB7XJ4SmAvbvSusEklM9xe8e7QcETbokn3ghr0HHXjUkkzdVWaySr5EBBg92ANBG5dP/WZV2vHo/Q==
"@aws-cdk/service-spec-types@^0.0.61":
version "0.0.61"
resolved "https://registry.npmjs.org/@aws-cdk/service-spec-types/-/service-spec-types-0.0.61.tgz#6ff36bf633483567c738b5a873dff01cea4fe3c7"
integrity sha512-ZeVY22xFHHJQBJsawF+eg9BrlQSgYa9CYw1qusV1jfeduoCbHqWoFVQsnrAGJ1Y50AX4QfMR7GinxlvPCR2Iqw==
dependencies:
"@cdklabs/tskb" "^0.0.3"

Expand Down

0 comments on commit 650d73a

Please sign in to comment.