Skip to content

Commit

Permalink
Merge branch 'main' into bedrock-3-5-haiku
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] authored Nov 5, 2024
2 parents 1d2a021 + 1466f93 commit cc3c2dd
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 59 deletions.
58 changes: 0 additions & 58 deletions .github/workflows/repo-metrics-weekly.yml

This file was deleted.

2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-kinesisfirehose-alpha/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ encryption with AWS Key Management Service (AWS KMS) for encrypting delivered da
Amazon S3. You can choose to not encrypt the data or to encrypt with a key from the list
of AWS KMS keys that you own. For more information,
see [Protecting Data Using Server-Side Encryption with AWS KMS–Managed Keys (SSE-KMS)](https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingKMSEncryption.html).
Data is not encrypted by default.
By default, encryption isn’t directly enabled on the delivery stream; instead, it uses the default encryption settings of the destination S3 bucket.

```ts
declare const bucket: s3.Bucket;
Expand Down

0 comments on commit cc3c2dd

Please sign in to comment.