Skip to content

fix(mixins-preview): cannot use string literal types for S3LogsDeliveryProps.permissionsVersion #36197

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
mergify merged 1 commit into from
Nov 25, 2025
Merged

fix(mixins-preview): cannot use string literal types for S3LogsDeliveryProps.permissionsVersion #36197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 15 additions & 1 deletion packages/@aws-cdk/mixins-preview/lib/services/aws-logs/logs-delivery.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,20 @@ export interface ILogsDelivery {
bind(scope: IConstruct, deliverySource: logs.IDeliverySourceRef, sourceResourceArn: string): ILogsDeliveryConfig;
}

/**
* S3 Vended Logs Permissions version.
*/
export enum S3LogsDeliveryPermissionsVersion {
/**
* V1
*/
V1 = 'V1',
/**
* V2
*/
V2 = 'V2',
}

/**
* Props for S3LogsDelivery
*/
Expand All @@ -51,7 +65,7 @@ export interface S3LogsDeliveryProps {
*
* @default "V2
*/
readonly permissionsVersion?: 'V1' | 'V2';
readonly permissionsVersion?: S3LogsDeliveryPermissionsVersion;
}

/**
Expand Down
8 changes: 4 additions & 4 deletions packages/@aws-cdk/mixins-preview/test/services/aws-logs/logs-delivery.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { AccountRootPrincipal, Effect, PolicyDocument, PolicyStatement, Role, Se
import { DeliveryStream, S3Bucket } from 'aws-cdk-lib/aws-kinesisfirehose';
import { CfnDeliverySource, LogGroup, ResourcePolicy, RetentionDays } from 'aws-cdk-lib/aws-logs';
import { Secret } from 'aws-cdk-lib/aws-secretsmanager';
import { FirehoseLogsDelivery, LogGroupLogsDelivery, S3LogsDelivery, XRayLogsDelivery } from '../../../lib/services/aws-logs';
import { FirehoseLogsDelivery, LogGroupLogsDelivery, S3LogsDelivery, S3LogsDeliveryPermissionsVersion, XRayLogsDelivery } from '../../../lib/services/aws-logs';

// at the time of creating this test file S3 does not support Vended Logs on Buckets but this test pretends they do to make writing tests easier
describe('S3 Delivery', () => {
Expand Down Expand Up @@ -77,7 +77,7 @@ describe('S3 Delivery', () => {
});

const s3Logs1 = new S3LogsDelivery(bucket, {
permissionsVersion: 'V2',
permissionsVersion: S3LogsDeliveryPermissionsVersion.V2,
});
s3Logs1.bind(source1, deliverySource1, source1.bucketArn);

Expand All @@ -89,7 +89,7 @@ describe('S3 Delivery', () => {
test('creates policy with V1 permissions if specified', () => {
const bucket = new Bucket(stack, 'Destination');
const s3Logs = new S3LogsDelivery(bucket, {
permissionsVersion: 'V1',
permissionsVersion: S3LogsDeliveryPermissionsVersion.V1,
});
s3Logs.bind(source, deliverySource, source.bucketArn);

Expand Down Expand Up @@ -207,7 +207,7 @@ describe('S3 Delivery', () => {
test('creates policy with V2 permissions if specified', () => {
const bucket = new Bucket(stack, 'Destination');
const s3Logs = new S3LogsDelivery(bucket, {
permissionsVersion: 'V2',
permissionsVersion: S3LogsDeliveryPermissionsVersion.V2,
});
s3Logs.bind(source, deliverySource, source.bucketArn);

Expand Down
Loading