Merge branch 'main' into merge-back/2.184.0

Author: mergify[bot]

.github/workflows/issue-label-assign.yml

@@ -58,7 +58,7 @@ jobs:
 env:
  OSDS_DEVS: >
            {
-             "assignees":["ashishdhingra","khushail","hunhsieh"]
+             "assignees":["ashishdhingra","hunhsieh"]
            }
 
  AREA_AFFIXES: >

packages/@aws-cdk/aws-iot-actions-alpha/README.md

@@ -28,7 +28,7 @@ Currently supported are:
 - Capture CloudWatch metrics
 - Change state for a CloudWatch alarm
 - Put records to Kinesis Data stream
-- Put records to Kinesis Data Firehose stream
+- Put records to Amazon Data Firehose stream
 - Send messages to SQS queues
 - Publish messages on SNS topics
 - Write messages into columns of DynamoDB
@@ -232,10 +232,10 @@ const topicRule = new iot.TopicRule(this, 'TopicRule', {
 });
 ```
 
-## Put records to Kinesis Data Firehose stream
+## Put records to Amazon Data Firehose stream
 
 The code snippet below creates an AWS IoT Rule that puts records to Put records
-to Kinesis Data Firehose stream when it is triggered.
+to Amazon Data Firehose stream when it is triggered.
 
 ```ts
 import * as firehose from 'aws-cdk-lib/aws-kinesisfirehose';

packages/@aws-cdk/aws-iot-actions-alpha/lib/firehose-put-record-action.ts

@@ -30,11 +30,11 @@ export enum FirehoseRecordSeparator {
 }
 
 /**
- * Configuration properties of an action for the Kinesis Data Firehose stream.
+ * Configuration properties of an action for the Amazon Data Firehose stream.
  */
 export interface FirehosePutRecordActionProps extends CommonActionProps {
   /**
-   * Whether to deliver the Kinesis Data Firehose stream as a batch by using `PutRecordBatch`.
+   * Whether to deliver the Amazon Data Firehose stream as a batch by using `PutRecordBatch`.
    * When batchMode is true and the rule's SQL statement evaluates to an Array, each Array
    * element forms one record in the PutRecordBatch request. The resulting array can't have
    * more than 500 records.
@@ -44,23 +44,23 @@ export interface FirehosePutRecordActionProps extends CommonActionProps {
   readonly batchMode?: boolean;
 
   /**
-   * A character separator that will be used to separate records written to the Kinesis Data Firehose stream.
+   * A character separator that will be used to separate records written to the Amazon Data Firehose stream.
    *
    * @default - none -- the stream does not use a separator
    */
   readonly recordSeparator?: FirehoseRecordSeparator;
 }
 
 /**
- * The action to put the record from an MQTT message to the Kinesis Data Firehose stream.
+ * The action to put the record from an MQTT message to the Amazon Data Firehose stream.
  */
 export class FirehosePutRecordAction implements iot.IAction {
   private readonly batchMode?: boolean;
   private readonly recordSeparator?: string;
   private readonly role?: iam.IRole;
 
   /**
-   * @param stream The Kinesis Data Firehose stream to which to put records.
+   * @param stream The Amazon Data Firehose stream to which to put records.
    * @param props Optional properties to not use default
    */
   constructor(private readonly stream: firehose.IDeliveryStream, props: FirehosePutRecordActionProps = {}) {

packages/@aws-cdk/aws-msk-alpha/README.md

@@ -177,7 +177,7 @@ const cluster = new msk.Cluster(this, 'Cluster', {
 ## Logging
 
 You can deliver Apache Kafka broker logs to one or more of the following destination types:
-Amazon CloudWatch Logs, Amazon S3, Amazon Kinesis Data Firehose.
+Amazon CloudWatch Logs, Amazon S3, Amazon Data Firehose.
 
 To configure logs to be sent to an S3 bucket, provide a bucket in the `logging` config.
 

packages/@aws-cdk/aws-msk-alpha/lib/cluster.ts

@@ -275,7 +275,7 @@ export interface MonitoringConfiguration {
  */
 export interface BrokerLogging {
   /**
-   * The Kinesis Data Firehose delivery stream that is the destination for broker logs.
+   * The Amazon Data Firehose delivery stream that is the destination for broker logs.
    *
    * @default - disabled
    */

packages/@aws-cdk/aws-pipes-alpha/lib/logs.ts

@@ -1,5 +1,5 @@
-import { IDeliveryStream } from '@aws-cdk/aws-kinesisfirehose-alpha';
 import { IRole } from 'aws-cdk-lib/aws-iam';
+import { IDeliveryStream } from 'aws-cdk-lib/aws-kinesisfirehose';
 import { ILogGroup } from 'aws-cdk-lib/aws-logs';
 import { CfnPipe } from 'aws-cdk-lib/aws-pipes';
 import { IBucket } from 'aws-cdk-lib/aws-s3';
@@ -111,7 +111,7 @@ export interface LogDestinationParameters {
   readonly cloudwatchLogsLogDestination?: CfnPipe.CloudwatchLogsLogDestinationProperty;
 
   /**
-   * The Amazon Kinesis Data Firehose logging configuration settings for the pipe.
+   * The Amazon Data Firehose logging configuration settings for the pipe.
    *
    * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pipes-pipe-pipelogconfiguration.html#cfn-pipes-pipe-pipelogconfiguration-firehoselogdestination
    *

packages/@aws-cdk/aws-pipes-alpha/package.json

@@ -88,14 +88,12 @@
     "jest": "^29",
     "aws-cdk-lib": "0.0.0",
     "constructs": "^10.0.0",
-    "@aws-cdk/integ-tests-alpha": "0.0.0",
-    "@aws-cdk/aws-kinesisfirehose-alpha": "0.0.0"
+    "@aws-cdk/integ-tests-alpha": "0.0.0"
   },
   "dependencies": {},
   "peerDependencies": {
     "aws-cdk-lib": "^0.0.0",
-    "constructs": "^10.0.0",
-    "@aws-cdk/aws-kinesisfirehose-alpha": "0.0.0"
+    "constructs": "^10.0.0"
   },
   "engines": {
     "node": ">= 14.15.0"

packages/@aws-cdk/aws-pipes-alpha/test/integ.logs.ts

@@ -1,7 +1,7 @@
 import { randomUUID } from 'crypto';
-import { DeliveryStream, DestinationBindOptions, DestinationConfig, IDestination } from '@aws-cdk/aws-kinesisfirehose-alpha';
 import { ExpectedResult, IntegTest } from '@aws-cdk/integ-tests-alpha';
 import * as cdk from 'aws-cdk-lib';
+import { DeliveryStream, DestinationBindOptions, DestinationConfig, IDestination } from 'aws-cdk-lib/aws-kinesisfirehose';
 import { Construct } from 'constructs';
 import { CloudwatchLogsLogDestination, FirehoseLogDestination, IPipe, ISource, ITarget, IncludeExecutionData, InputTransformation, LogLevel, Pipe, S3LogDestination, SourceConfig, TargetConfig } from '../lib';
 import { name } from '../package.json';

packages/@aws-cdk/aws-pipes-alpha/test/logs.test.ts

@@ -1,7 +1,7 @@
-import { DeliveryStream, DestinationBindOptions, DestinationConfig, IDestination } from '@aws-cdk/aws-kinesisfirehose-alpha';
 import { App, Stack } from 'aws-cdk-lib';
 import { Template } from 'aws-cdk-lib/assertions';
 import { Role, ServicePrincipal } from 'aws-cdk-lib/aws-iam';
+import { DeliveryStream, DestinationBindOptions, DestinationConfig, IDestination } from 'aws-cdk-lib/aws-kinesisfirehose';
 import { LogGroup } from 'aws-cdk-lib/aws-logs';
 import { Bucket } from 'aws-cdk-lib/aws-s3';
 import { Construct } from 'constructs';

packages/@aws-cdk/aws-scheduler-targets-alpha/README.md

@@ -31,7 +31,7 @@ The following targets are supported:
 6. `targets.EventBridgePutEvents`: [Put Events on EventBridge](#send-events-to-an-eventbridge-event-bus)
 7. `targets.InspectorStartAssessmentRun`: [Start an Amazon Inspector assessment run](#start-an-amazon-inspector-assessment-run)
 8. `targets.KinesisStreamPutRecord`: [Put a record to an Amazon Kinesis Data Stream](#put-a-record-to-an-amazon-kinesis-data-stream)
-9. `targets.KinesisDataFirehosePutRecord`: [Put a record to a Kinesis Data Firehose](#put-a-record-to-a-kinesis-data-firehose)
+9. `targets.KinesisDataFirehosePutRecord`: [Put a record to an Amazon Data Firehose](#put-a-record-to-an-amazon-data-firehose)
 10. `targets.CodePipelineStartPipelineExecution`: [Start a CodePipeline execution](#start-a-codepipeline-execution)
 11. `targets.SageMakerStartPipelineExecution`: [Start a SageMaker pipeline execution](#start-a-sagemaker-pipeline-execution)
 12. `targets.Universal`: [Invoke a wider set of AWS API](#invoke-a-wider-set-of-aws-api)
@@ -252,9 +252,9 @@ new Schedule(this, 'Schedule', {
 });
 ```
 
-## Put a record to a Kinesis Data Firehose
+## Put a record to an Amazon Data Firehose
 
-Use the `KinesisDataFirehosePutRecord` target to put a record to a Kinesis Data Firehose delivery stream.
+Use the `KinesisDataFirehosePutRecord` target to put a record to an Amazon Data Firehose delivery stream.
 
 The code snippet below creates an event rule with a delivery stream as a target
 called every hour by EventBridge Scheduler with a custom payload.

packages/@aws-cdk/aws-scheduler-targets-alpha/lib/kinesis-data-firehose-put-record.ts

@@ -4,7 +4,7 @@ import { IDeliveryStream } from 'aws-cdk-lib/aws-kinesisfirehose';
 import { ScheduleTargetBase, ScheduleTargetBaseProps } from './target';
 
 /**
- * Use an Amazon Kinesis Data Firehose as a target for AWS EventBridge Scheduler.
+ * Use an Amazon Data Firehose as a target for AWS EventBridge Scheduler.
  */
 export class KinesisDataFirehosePutRecord extends ScheduleTargetBase implements IScheduleTarget {
   constructor(

packages/aws-cdk-lib/aws-apigateway/README.md

@@ -1400,7 +1400,7 @@ const api = new apigateway.RestApi(this, 'books', {
 
 **Note:** The delivery stream name must start with `amazon-apigateway-`.
 
-> Visit [Logging API calls to Kinesis Data Firehose](https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-logging-to-kinesis.html) for more details.
+> Visit [Logging API calls to Amazon Data Firehose](https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-logging-to-kinesis.html) for more details.
 
 ## Cross Origin Resource Sharing (CORS)
 

packages/aws-cdk-lib/aws-config/lib/rule.ts

@@ -2754,7 +2754,7 @@ export class ResourceType {
   public static readonly IAM_SAML_PROVIDER = new ResourceType('AWS::IAM::SAMLProvider');
   /** AWS IAM ServerCertificate */
   public static readonly IAM_SERVER_CERTIFICATE = new ResourceType('AWS::IAM::ServerCertificate');
-  /** Amazon Kinesis Firehose DeliveryStream */
+  /** Amazon Data Firehose DeliveryStream */
   public static readonly KINESIS_FIREHOSE_DELIVERY_STREAM = new ResourceType('AWS::KinesisFirehose::DeliveryStream');
   /** Amazon Pinpoint Campaign */
   public static readonly PINPOINT_CAMPAIGN = new ResourceType('AWS::Pinpoint::Campaign');

packages/aws-cdk-lib/aws-ec2/README.md

@@ -2202,7 +2202,7 @@ new ec2.FlowLog(this, 'FlowLogWithKeyPrefix', {
 });
 ```
 
-*Kinesis Data Firehose*
+*Amazon Data Firehose*
 
 ```ts
 import * as firehose from 'aws-cdk-lib/aws-kinesisfirehose';
@@ -2524,4 +2524,4 @@ new ec2.Instance(this, 'Instance', {
   machineImage: ec2.MachineImage.latestAmazonLinux2023(),
   instanceProfile,
 });
-```
+```

packages/aws-cdk-lib/aws-ec2/lib/vpc-flow-logs.ts

@@ -60,7 +60,7 @@ export enum FlowLogDestinationType {
   S3 = 's3',
 
   /**
-   * Send flow logs to Kinesis Data Firehose
+   * Send flow logs to Amazon Data Firehose
    */
   KINESIS_DATA_FIREHOSE = 'kinesis-data-firehose',
 }
@@ -215,9 +215,9 @@ export abstract class FlowLogDestination {
   }
 
   /**
-   * Use Kinesis Data Firehose as the destination
+   * Use Amazon Data Firehose as the destination
    *
-   * @param deliveryStreamArn the ARN of Kinesis Data Firehose delivery stream to publish logs to
+   * @param deliveryStreamArn the ARN of Amazon Data Firehose delivery stream to publish logs to
    */
   public static toKinesisDataFirehoseDestination(deliveryStreamArn: string): FlowLogDestination {
     return new KinesisDataFirehoseDestination({
@@ -272,7 +272,7 @@ export interface FlowLogDestinationConfig {
   readonly keyPrefix?: string;
 
   /**
-   * The ARN of Kinesis Data Firehose delivery stream to publish the flow logs to
+   * The ARN of Amazon Data Firehose delivery stream to publish the flow logs to
    *
    * @default - undefined
    */
@@ -849,7 +849,7 @@ export class FlowLog extends FlowLogBase {
   public readonly logGroup?: logs.ILogGroup;
 
   /**
-   * The ARN of the Kinesis Data Firehose delivery stream to publish flow logs to
+   * The ARN of the Amazon Data Firehose delivery stream to publish flow logs to
    */
   public readonly deliveryStreamArn?: string;
 

packages/aws-cdk-lib/aws-ecs/lib/base/service-managed-volume.ts

@@ -165,6 +165,10 @@ export enum FileSystemType {
    * xfs type
    */
   XFS = 'xfs',
+  /**
+   * ntfs type
+   */
+  NTFS = 'ntfs',
 }
 
 /**

packages/aws-cdk-lib/aws-eks/lib/managed-nodegroup.ts

@@ -103,6 +103,10 @@ export enum CapacityType {
    * on-demand instances
    */
   ON_DEMAND = 'ON_DEMAND',
+  /**
+   * capacity block instances
+   */
+  CAPACITY_BLOCK = 'CAPACITY_BLOCK',
 }
 
 /**

packages/aws-cdk-lib/aws-elasticsearch/README.md

@@ -234,7 +234,7 @@ const domain = new es.Domain(this, 'Domain', {
 ```
 
 For more complex use-cases, for example, to set the domain up to receive data from a
-[cross-account Kinesis Firehose](https://aws.amazon.com/premiumsupport/knowledge-center/kinesis-firehose-cross-account-streaming/) the `addAccessPolicies` helper method
+[cross-account Amazon Data Firehose](https://aws.amazon.com/premiumsupport/knowledge-center/kinesis-firehose-cross-account-streaming/) the `addAccessPolicies` helper method
 allows for policies that include the explicit domain ARN.
 
 ```ts

packages/aws-cdk-lib/aws-events-targets/lib/kinesis-firehose-stream.ts

@@ -5,7 +5,7 @@ import * as firehose from '../../aws-kinesisfirehose';
 import { IResource } from '../../core';
 
 /**
- * Customize the Firehose Stream Event Target
+ * Customize the Amazon Data Firehose Stream Event Target
  */
 export interface KinesisFirehoseStreamProps {
   /**
@@ -19,7 +19,7 @@ export interface KinesisFirehoseStreamProps {
 }
 
 /**
- * Customize the Firehose Stream Event Target
+ * Customize the Amazon Data Firehose Stream Event Target
  *
  * @deprecated Use KinesisFirehoseStreamV2
  */
@@ -48,7 +48,7 @@ export class KinesisFirehoseStream implements events.IRuleTarget {
 }
 
 /**
- * Represents a Kinesis Data Firehose delivery stream.
+ * Represents an Amazon Data Firehose delivery stream.
  */
 export interface IDeliveryStream extends IResource {
   /**
@@ -67,8 +67,8 @@ export interface IDeliveryStream extends IResource {
 }
 
 /**
- * Customize the Firehose Stream Event Target V2 to support L2 Kinesis Delivery Stream
- * instead of L1 Cfn Kinesis Delivery Stream.
+ * Customize the Amazon Data Firehose Stream Event Target V2 to support L2 Amazon Data Firehose Delivery Stream
+ * instead of L1 Cfn Firehose Delivery Stream.
  */
 export class KinesisFirehoseStreamV2 implements events.IRuleTarget {
   constructor(private readonly stream: IDeliveryStream, private readonly props: KinesisFirehoseStreamProps = {}) {

packages/aws-cdk-lib/aws-kinesisfirehose/README.md

@@ -61,7 +61,7 @@ new firehose.DeliveryStream(this, 'Delivery Stream', {
 
 ### Direct Put
 
-Data must be provided via "direct put", ie., by using a `PutRecord` or 
+Data must be provided via "direct put", ie., by using a `PutRecord` or
 `PutRecordBatch` API call. There are a number of ways of doing so, such as:
 
 - Kinesis Agent: a standalone Java application that monitors and delivers files while
@@ -80,10 +80,9 @@ Data must be provided via "direct put", ie., by using a `PutRecord` or
 
 ## Destinations
 
-Amazon Data Firehose supports multiple AWS and third-party services as destinations, including Amazon S3, Amazon Redshift, and more. You can find the full list of supported destination [here](https://docs.aws.amazon.com/firehose/latest/dev/create-destination.html). 
+Amazon Data Firehose supports multiple AWS and third-party services as destinations, including Amazon S3, Amazon Redshift, and more. You can find the full list of supported destination [here](https://docs.aws.amazon.com/firehose/latest/dev/create-destination.html).
 
-Currently in the AWS CDK, only S3 is implemented as an L2 construct destination. Other destinations can still be configured using L1 constructs. See [kinesisfirehose-destinations](https://docs.aws.amazon.com/cdk/api/latest/docs/aws-kinesisfirehose-destinations-readme.html)
-for the implementations of these destinations.
+Currently in the AWS CDK, only S3 is implemented as an L2 construct destination. Other destinations can still be configured using L1 constructs.
 
 ### S3
 
@@ -214,7 +213,7 @@ limit of records per second (indicating data is flowing into your delivery strea
 than it is configured to process).
 
 CDK provides methods for accessing delivery stream metrics with default configuration,
-such as `metricIncomingBytes`, and `metricIncomingRecords` (see [`IDeliveryStream`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-kinesisfirehose.IDeliveryStream.html)
+such as `metricIncomingBytes`, and `metricIncomingRecords` (see [`IDeliveryStream`](https://docs.aws.amazon.com/cdk/api/latest/docs/aws-cdk-lib.aws_kinesisfirehose.IDeliveryStream.html)
 for a full list). CDK also provides a generic `metric` method that can be used to produce
 metric configurations for any metric provided by Amazon Data Firehose; the configurations
 are pre-populated with the correct dimensions for the delivery stream.