Skip to content

Commit

Permalink
Merge branch 'main' into mrgrain/chore/remove-unsused-CDK_INTEG_MODE-…
Browse files Browse the repository at this point in the history
…hack
  • Loading branch information
mrgrain authored Dec 16, 2024
2 parents b1beae7 + a125c24 commit 02fa094
Show file tree
Hide file tree
Showing 12 changed files with 80 additions and 11 deletions.
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.1.37",
"@aws-cdk/service-spec-types": "^0.0.104",
"@aws-cdk/aws-service-spec": "^0.1.38",
"@aws-cdk/service-spec-types": "^0.0.105",
"chalk": "^4",
"diff": "^5.2.0",
"fast-deep-equal": "^3.1.3",
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": "^38.0.0",
"@aws-cdk/cloudformation-diff": "0.0.0",
"@aws-cdk/cx-api": "0.0.0",
"@aws-cdk/aws-service-spec": "^0.1.37",
"@aws-cdk/aws-service-spec": "^0.1.38",
"cdk-assets": "3.0.0-rc.32",
"@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-s3tables/.jsiirc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"targets": {
"java": {
"package": "software.amazon.awscdk.services.s3tables"
},
"dotnet": {
"package": "Amazon.CDK.AWS.S3Tables"
},
"python": {
"module": "aws_cdk.aws_s3tables"
}
}
}
39 changes: 39 additions & 0 deletions packages/aws-cdk-lib/aws-s3tables/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# AWS::S3Tables 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 s3tables from 'aws-cdk-lib/aws-s3tables';
```

<!--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 S3Tables construct libraries](https://constructs.dev/search?q=s3tables)
- 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::S3Tables resources](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/AWS_S3Tables.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::S3Tables](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/AWS_S3Tables.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-s3tables/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-s3tables/lib/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
// AWS::S3Tables Cloudformation Resources
export * from './s3tables.generated';
2 changes: 2 additions & 0 deletions packages/aws-cdk-lib/aws-secretsmanager/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,8 @@ const secret = new secretsmanager.Secret(this, 'Secret', { encryptionKey: key })
secret.grantRead(otherAccount);
```

## Rotating a Secret

### Using a Custom Lambda Function

A rotation schedule can be added to a Secret using a custom Lambda function:
Expand Down
1 change: 1 addition & 0 deletions packages/aws-cdk-lib/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,7 @@ export * as aws_s3_notifications from './aws-s3-notifications';
export * as aws_s3express from './aws-s3express';
export * as aws_s3objectlambda from './aws-s3objectlambda';
export * as aws_s3outposts from './aws-s3outposts';
export * as aws_s3tables from './aws-s3tables';
export * as aws_sagemaker from './aws-sagemaker';
export * as aws_sam from './aws-sam';
export * as aws_scheduler from './aws-scheduler';
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 @@ -136,7 +136,7 @@
"mime-types": "^2.1.35"
},
"devDependencies": {
"@aws-cdk/aws-service-spec": "^0.1.37",
"@aws-cdk/aws-service-spec": "^0.1.38",
"@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 @@ -449,6 +449,7 @@
"./aws-s3express": "./aws-s3express/index.js",
"./aws-s3objectlambda": "./aws-s3objectlambda/index.js",
"./aws-s3outposts": "./aws-s3outposts/index.js",
"./aws-s3tables": "./aws-s3tables/index.js",
"./aws-sagemaker": "./aws-sagemaker/index.js",
"./aws-sam": "./aws-sam/index.js",
"./aws-scheduler": "./aws-scheduler/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 @@ -636,6 +636,9 @@
"aws-s3outposts": [
"AWS::S3Outposts"
],
"aws-s3tables": [
"AWS::S3Tables"
],
"aws-sagemaker": [
"AWS::SageMaker"
],
Expand Down
4 changes: 2 additions & 2 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.1.37",
"@aws-cdk/aws-service-spec": "^0.1.38",
"@aws-cdk/service-spec-importers": "^0.0.58",
"@aws-cdk/service-spec-types": "^0.0.104",
"@aws-cdk/service-spec-types": "^0.0.105",
"@cdklabs/tskb": "^0.0.3",
"@cdklabs/typewriter": "^0.0.3",
"camelcase": "^6",
Expand Down
17 changes: 12 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,12 @@
resolved "https://registry.npmjs.org/@aws-cdk/asset-node-proxy-agent-v6/-/asset-node-proxy-agent-v6-2.1.0.tgz#6d3c7860354d4856a7e75375f2f0ecab313b4989"
integrity sha512-7bY3J8GCVxLupn/kNmpPc5VJz8grx+4RKfnnJiO1LG+uxkZfANZG3RMHhE+qQxxwkyQ9/MfPtTpf748UhR425A==

"@aws-cdk/aws-service-spec@^0.1.37":
version "0.1.37"
resolved "https://registry.npmjs.org/@aws-cdk/aws-service-spec/-/aws-service-spec-0.1.37.tgz#39e78a07079fc276f2f2bfdb31c3c7226939a04a"
integrity sha512-WFGAvjslG8Jdj9XmzDtV4JbsWEmLj8K9pA882mc6iNK59l4ocGt2GqS4n3JuzRdzoEpzcVYqfgrqGUuV1ez7vg==
"@aws-cdk/aws-service-spec@^0.1.38":
version "0.1.38"
resolved "https://registry.npmjs.org/@aws-cdk/aws-service-spec/-/aws-service-spec-0.1.38.tgz#76eb52f578a0a0094d33d5b310bd13a9c2755d7e"
integrity sha512-Kk1/GEIScI492f9vRIzzZDHnG/pdxAX+AZxFyjBnHa0zVCH9pXOiG5hndd4kq6sDP/ePyrKcBK4iv3nO3WVw2w==
dependencies:
"@aws-cdk/service-spec-types" "^0.0.104"
"@aws-cdk/service-spec-types" "^0.0.105"
"@cdklabs/tskb" "^0.0.3"

"@aws-cdk/cloud-assembly-schema@^38.0.0", "@aws-cdk/cloud-assembly-schema@^38.0.1":
Expand Down Expand Up @@ -129,6 +129,13 @@
dependencies:
"@cdklabs/tskb" "^0.0.3"

"@aws-cdk/service-spec-types@^0.0.105":
version "0.0.105"
resolved "https://registry.npmjs.org/@aws-cdk/service-spec-types/-/service-spec-types-0.0.105.tgz#b39898f6711068bbae016c88a5a6e7b8e1347d13"
integrity sha512-HUiKW7clPyaCRxbPmgURtK9ZXOCLarWFlsPbpMvHNbleiqjk+VB0Tgrf5LqJmBZMnKcq1Jx/cE42MiIxI/sRZA==
dependencies:
"@cdklabs/tskb" "^0.0.3"

"@aws-crypto/[email protected]":
version "5.2.0"
resolved "https://registry.npmjs.org/@aws-crypto/crc32/-/crc32-5.2.0.tgz#cfcc22570949c98c6689cfcbd2d693d36cdae2e1"
Expand Down

0 comments on commit 02fa094

Please sign in to comment.