Skip to content

feat(cloudtrail): throw ValidationErrors instead of untyped Errors #33455

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 17, 2025
Merged

feat(cloudtrail): throw ValidationErrors instead of untyped Errors #33455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
87f6fdc
feat(cloudtrail): throw `ValidationErrors` instead of untyped Errors
kaizencc Feb 14, 2025
4ce05f7
Merge branch 'main' into conroy/ct
mergify[bot] Feb 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/aws-cdk-lib/.eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ const enableNoThrowDefaultErrorIn = [
'aws-cognito',
'aws-cloudfront',
'aws-cloudfront-origins',
'aws-cloudtrail',
'aws-elasticloadbalancing',
'aws-elasticloadbalancingv2',
'aws-elasticloadbalancingv2-actions',
Expand Down
8 changes: 4 additions & 4 deletions packages/aws-cdk-lib/aws-cloudtrail/lib/cloudtrail.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import * as lambda from '../../aws-lambda';
import * as logs from '../../aws-logs';
import * as s3 from '../../aws-s3';
import * as sns from '../../aws-sns';
import { Resource, Stack } from '../../core';
import { Resource, Stack, ValidationError } from '../../core';
import { addConstructMetadata, MethodMetadata } from '../../core/lib/metadata-resource';

/**
Expand Down Expand Up @@ -322,7 +322,7 @@ export class Trail extends Resource {
this.node.addValidation({ validate: () => this.validateEventSelectors() });

if (props.kmsKey && props.encryptionKey) {
throw new Error('Both kmsKey and encryptionKey must not be specified. Use only encryptionKey');
throw new ValidationError('Both kmsKey and encryptionKey must not be specified. Use only encryptionKey', this);
}

if (props.insightTypes) {
Expand Down Expand Up @@ -384,11 +384,11 @@ export class Trail extends Resource {
@MethodMetadata()
public addEventSelector(dataResourceType: DataResourceType, dataResourceValues: string[], options: AddEventSelectorOptions = {}) {
if (dataResourceValues.length > 250) {
throw new Error('A maximum of 250 data elements can be in one event selector');
throw new ValidationError('A maximum of 250 data elements can be in one event selector', this);
}

if (this.eventSelectors.length > 5) {
throw new Error('A maximum of 5 event selectors are supported per trail.');
throw new ValidationError('A maximum of 5 event selectors are supported per trail.', this);
}

let includeAllManagementEvents;
Expand Down