From 39ed08273c4f72b63e3507461cbbf3cab2fe23fc Mon Sep 17 00:00:00 2001 From: Adam Ruka Date: Mon, 15 Nov 2021 10:46:50 -0800 Subject: [PATCH] chore(iot): rename FirehoseStreamProps to FirehoseStreamActionProps (#17495) An action item from https://github.com/aws/aws-cdk/pull/17466#pullrequestreview-805079818. ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license* --- packages/@aws-cdk/aws-iot-actions/README.md | 6 ++---- .../@aws-cdk/aws-iot-actions/lib/firehose-stream-action.ts | 4 ++-- .../cloudwatch-logs-action.test.ts | 0 .../integ.cloudwatch-logs-action.expected.json | 0 .../integ.cloudwatch-logs-action.ts | 0 .../firehose-stream-action.test.ts | 0 .../integ.firehose-stream-action.expected.json | 0 .../integ.firehose-stream-action.ts | 0 .../integ.s3-put-object-action.expected.json | 0 .../{s3-put-object => s3}/integ.s3-put-object-action.ts | 0 .../test/{s3-put-object => s3}/s3-put-object-action.test.ts | 0 11 files changed, 4 insertions(+), 6 deletions(-) rename packages/@aws-cdk/aws-iot-actions/test/{cloudwatch-logs => cloudwatch}/cloudwatch-logs-action.test.ts (100%) rename packages/@aws-cdk/aws-iot-actions/test/{cloudwatch-logs => cloudwatch}/integ.cloudwatch-logs-action.expected.json (100%) rename packages/@aws-cdk/aws-iot-actions/test/{cloudwatch-logs => cloudwatch}/integ.cloudwatch-logs-action.ts (100%) rename packages/@aws-cdk/aws-iot-actions/test/{firehose-stream-action => kinesis-firehose}/firehose-stream-action.test.ts (100%) rename packages/@aws-cdk/aws-iot-actions/test/{firehose-stream-action => kinesis-firehose}/integ.firehose-stream-action.expected.json (100%) rename packages/@aws-cdk/aws-iot-actions/test/{firehose-stream-action => kinesis-firehose}/integ.firehose-stream-action.ts (100%) rename packages/@aws-cdk/aws-iot-actions/test/{s3-put-object => s3}/integ.s3-put-object-action.expected.json (100%) rename packages/@aws-cdk/aws-iot-actions/test/{s3-put-object => s3}/integ.s3-put-object-action.ts (100%) rename packages/@aws-cdk/aws-iot-actions/test/{s3-put-object => s3}/s3-put-object-action.test.ts (100%) diff --git a/packages/@aws-cdk/aws-iot-actions/README.md b/packages/@aws-cdk/aws-iot-actions/README.md index 578334b0b6b41..e02f67cee0d45 100644 --- a/packages/@aws-cdk/aws-iot-actions/README.md +++ b/packages/@aws-cdk/aws-iot-actions/README.md @@ -136,9 +136,7 @@ import * as s3 from '@aws-cdk/aws-s3'; import * as firehose from '@aws-cdk/aws-kinesisfirehose'; import * as destinations from '@aws-cdk/aws-kinesisfirehose-destinations'; -const bucket = new s3.Bucket(this, 'MyBucket', { - removalPolicy: cdk.RemovalPolicy.DESTROY, -}); +const bucket = new s3.Bucket(this, 'MyBucket'); const stream = new firehose.DeliveryStream(this, 'MyStream', { destinations: [new destinations.S3Bucket(bucket)], }); @@ -149,7 +147,7 @@ const topicRule = new iot.TopicRule(this, 'TopicRule', { new actions.FirehoseStreamAction(stream, { batchMode: true, recordSeparator: actions.FirehoseStreamRecordSeparator.NEWLINE, - }) + }), ], }); ``` diff --git a/packages/@aws-cdk/aws-iot-actions/lib/firehose-stream-action.ts b/packages/@aws-cdk/aws-iot-actions/lib/firehose-stream-action.ts index 69c8a124a3afc..c694bef7cad38 100644 --- a/packages/@aws-cdk/aws-iot-actions/lib/firehose-stream-action.ts +++ b/packages/@aws-cdk/aws-iot-actions/lib/firehose-stream-action.ts @@ -32,7 +32,7 @@ export enum FirehoseStreamRecordSeparator { /** * Configuration properties of an action for the Kinesis Data Firehose stream. */ -export interface FirehoseStreamProps extends CommonActionProps { +export interface FirehoseStreamActionProps extends CommonActionProps { /** * Whether to deliver the Kinesis 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 @@ -64,7 +64,7 @@ export class FirehoseStreamAction implements iot.IAction { * @param stream The Kinesis Data Firehose stream to which to put records. * @param props Optional properties to not use default */ - constructor(private readonly stream: firehose.IDeliveryStream, props: FirehoseStreamProps = {}) { + constructor(private readonly stream: firehose.IDeliveryStream, props: FirehoseStreamActionProps = {}) { this.batchMode = props.batchMode; this.recordSeparator = props.recordSeparator; this.role = props.role; diff --git a/packages/@aws-cdk/aws-iot-actions/test/cloudwatch-logs/cloudwatch-logs-action.test.ts b/packages/@aws-cdk/aws-iot-actions/test/cloudwatch/cloudwatch-logs-action.test.ts similarity index 100% rename from packages/@aws-cdk/aws-iot-actions/test/cloudwatch-logs/cloudwatch-logs-action.test.ts rename to packages/@aws-cdk/aws-iot-actions/test/cloudwatch/cloudwatch-logs-action.test.ts diff --git a/packages/@aws-cdk/aws-iot-actions/test/cloudwatch-logs/integ.cloudwatch-logs-action.expected.json b/packages/@aws-cdk/aws-iot-actions/test/cloudwatch/integ.cloudwatch-logs-action.expected.json similarity index 100% rename from packages/@aws-cdk/aws-iot-actions/test/cloudwatch-logs/integ.cloudwatch-logs-action.expected.json rename to packages/@aws-cdk/aws-iot-actions/test/cloudwatch/integ.cloudwatch-logs-action.expected.json diff --git a/packages/@aws-cdk/aws-iot-actions/test/cloudwatch-logs/integ.cloudwatch-logs-action.ts b/packages/@aws-cdk/aws-iot-actions/test/cloudwatch/integ.cloudwatch-logs-action.ts similarity index 100% rename from packages/@aws-cdk/aws-iot-actions/test/cloudwatch-logs/integ.cloudwatch-logs-action.ts rename to packages/@aws-cdk/aws-iot-actions/test/cloudwatch/integ.cloudwatch-logs-action.ts diff --git a/packages/@aws-cdk/aws-iot-actions/test/firehose-stream-action/firehose-stream-action.test.ts b/packages/@aws-cdk/aws-iot-actions/test/kinesis-firehose/firehose-stream-action.test.ts similarity index 100% rename from packages/@aws-cdk/aws-iot-actions/test/firehose-stream-action/firehose-stream-action.test.ts rename to packages/@aws-cdk/aws-iot-actions/test/kinesis-firehose/firehose-stream-action.test.ts diff --git a/packages/@aws-cdk/aws-iot-actions/test/firehose-stream-action/integ.firehose-stream-action.expected.json b/packages/@aws-cdk/aws-iot-actions/test/kinesis-firehose/integ.firehose-stream-action.expected.json similarity index 100% rename from packages/@aws-cdk/aws-iot-actions/test/firehose-stream-action/integ.firehose-stream-action.expected.json rename to packages/@aws-cdk/aws-iot-actions/test/kinesis-firehose/integ.firehose-stream-action.expected.json diff --git a/packages/@aws-cdk/aws-iot-actions/test/firehose-stream-action/integ.firehose-stream-action.ts b/packages/@aws-cdk/aws-iot-actions/test/kinesis-firehose/integ.firehose-stream-action.ts similarity index 100% rename from packages/@aws-cdk/aws-iot-actions/test/firehose-stream-action/integ.firehose-stream-action.ts rename to packages/@aws-cdk/aws-iot-actions/test/kinesis-firehose/integ.firehose-stream-action.ts diff --git a/packages/@aws-cdk/aws-iot-actions/test/s3-put-object/integ.s3-put-object-action.expected.json b/packages/@aws-cdk/aws-iot-actions/test/s3/integ.s3-put-object-action.expected.json similarity index 100% rename from packages/@aws-cdk/aws-iot-actions/test/s3-put-object/integ.s3-put-object-action.expected.json rename to packages/@aws-cdk/aws-iot-actions/test/s3/integ.s3-put-object-action.expected.json diff --git a/packages/@aws-cdk/aws-iot-actions/test/s3-put-object/integ.s3-put-object-action.ts b/packages/@aws-cdk/aws-iot-actions/test/s3/integ.s3-put-object-action.ts similarity index 100% rename from packages/@aws-cdk/aws-iot-actions/test/s3-put-object/integ.s3-put-object-action.ts rename to packages/@aws-cdk/aws-iot-actions/test/s3/integ.s3-put-object-action.ts diff --git a/packages/@aws-cdk/aws-iot-actions/test/s3-put-object/s3-put-object-action.test.ts b/packages/@aws-cdk/aws-iot-actions/test/s3/s3-put-object-action.test.ts similarity index 100% rename from packages/@aws-cdk/aws-iot-actions/test/s3-put-object/s3-put-object-action.test.ts rename to packages/@aws-cdk/aws-iot-actions/test/s3/s3-put-object-action.test.ts