Skip to content

Commit c609753

Browse files
authored
Merge branch 'main' into melasmar/iot1click3
2 parents 5fa1f56 + 8ff930a commit c609753

File tree

11 files changed

+11
-22
lines changed

11 files changed

+11
-22
lines changed

packages/@aws-cdk/aws-glue-alpha/lib/job-executable.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@ export interface JobExecutableConfig {
474474
readonly script: Code;
475475

476476
/**
477-
* The Scala class that serves as the entry point for the job. This applies only if your the job langauage is Scala.
477+
* The Scala class that serves as the entry point for the job. This applies only if your the job language is Scala.
478478
* Equivalent to a job parameter `--class`.
479479
*
480480
* @default - no scala className specified

packages/@aws-cdk/aws-glue-alpha/lib/job.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ export interface SparkUILoggingLocation {
427427
*/
428428
export interface ContinuousLoggingProps {
429429
/**
430-
* Enable continouous logging.
430+
* Enable continuous logging.
431431
*/
432432
readonly enabled: boolean;
433433

packages/@aws-cdk/aws-glue-alpha/lib/schema.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export interface Column {
1313
readonly type: Type;
1414

1515
/**
16-
* Coment describing the column.
16+
* Comment describing the column.
1717
*
1818
* @default none
1919
*/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export enum FirehoseRecordSeparator {
2424
WINDOWS_NEWLINE = '\r\n',
2525

2626
/**
27-
* Separate by a commma
27+
* Separate by a comma
2828
*/
2929
COMMA = ',',
3030
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export interface KinesisPutRecordActionProps extends CommonActionProps {
1414
*
1515
* @see https://docs.aws.amazon.com/iot/latest/developerguide/iot-substitution-templates.html
1616
*
17-
* You can use the expression '${newuuid()}' if your payload does not have a high cardinarity property.
17+
* You can use the expression '${newuuid()}' if your payload does not have a high cardinality property.
1818
* If you use empty string, this action use no partition key and all records will put same one shard.
1919
*
2020
* @see https://docs.aws.amazon.com/kinesis/latest/APIReference/API_PutRecord.html#API_PutRecord_RequestParameters

packages/@aws-cdk/aws-iot-actions-alpha/lib/step-functions-state-machine-action.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export class StepFunctionsStateMachineAction implements iot.IAction {
2828
private readonly role?: iam.IRole;
2929

3030
/**
31-
* @param stateMachine The Step Functions Start Machine which shoud be executed.
31+
* @param stateMachine The Step Functions Start Machine which should be executed.
3232
* @param props Optional properties to not use default
3333
*/
3434
constructor(private readonly stateMachine: stepfunctions.IStateMachine, props?: StepFunctionsStateMachineActionProps) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ test('can set batchMode', () => {
9090
});
9191
});
9292

93-
test('can set separotor', () => {
93+
test('can set separator', () => {
9494
// GIVEN
9595
const stack = new cdk.Stack();
9696
const topicRule = new iot.TopicRule(stack, 'MyTopicRule', {

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

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -485,17 +485,6 @@ export class Cluster extends ClusterBase {
485485
);
486486
}
487487

488-
if (
489-
!core.Token.isUnresolved(props.clusterName) &&
490-
!/^[a-zA-Z0-9]+$/.test(props.clusterName) &&
491-
props.clusterName.length > 64
492-
) {
493-
throw Error(
494-
'The cluster name must only contain alphanumeric characters and have a maximum length of 64 characters.' +
495-
`got: '${props.clusterName}. length: ${props.clusterName.length}'`,
496-
);
497-
}
498-
499488
if (
500489
props.clientAuthentication?.saslProps?.iam &&
501490
props.clientAuthentication?.saslProps?.scram

packages/aws-cdk-lib/aws-lambda-event-sources/lib/kafka.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export interface KafkaEventSourceProps extends BaseStreamEventSourceProps {
2424
*/
2525
readonly secret?: secretsmanager.ISecret;
2626
/**
27-
* The identifier for the Kafka consumer group to join. The consumer group ID must be unique among all your Kafka event sources. After creating a Kafka event source mapping with the consumer group ID specified, you cannot update this value. The value must have a lenght between 1 and 200 and full the pattern '[a-zA-Z0-9-\/*:_+=.@-]*'.
27+
* The identifier for the Kafka consumer group to join. The consumer group ID must be unique among all your Kafka event sources. After creating a Kafka event source mapping with the consumer group ID specified, you cannot update this value. The value must have a length between 1 and 200 and full the pattern '[a-zA-Z0-9-\/*:_+=.@-]*'.
2828
* @see https://docs.aws.amazon.com/lambda/latest/dg/with-msk.html#services-msk-consumer-group-id
2929
*
3030
* @default - none

packages/aws-cdk-lib/aws-lambda-nodejs/test/util.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,14 +123,14 @@ describe('exec', () => {
123123
test('non zero status', () => {
124124
const spawnSyncMock = jest.spyOn(child_process, 'spawnSync').mockReturnValue({
125125
status: 999,
126-
stderr: Buffer.from('error occured'),
126+
stderr: Buffer.from('error occurred'),
127127
stdout: Buffer.from('stdout'),
128128
pid: 123,
129129
output: ['stdout', 'stderr'],
130130
signal: null,
131131
});
132132

133-
expect(() => exec('cmd', ['arg1', 'arg2'])).toThrow('error occured');
133+
expect(() => exec('cmd', ['arg1', 'arg2'])).toThrow('error occurred');
134134

135135
spawnSyncMock.mockRestore();
136136
});

0 commit comments

Comments
 (0)