codegen for vendedlog mixin

aws-amplify-bot · mrgrain · commit 297dbd33ea70 · 2025-11-26T02:38:15.000Z
diff --git a/packages/@aws-cdk/mixins-preview/README.md b/packages/@aws-cdk/mixins-preview/README.md
@@ -125,6 +125,31 @@ const bucket = new s3.CfnBucket(scope, "Bucket");
 Mixins.of(bucket).apply(new EnableVersioning());
 ```
 
+### Logs Delivery
+
+Configures vended log delivery for supported resources to various destinations
+
+```typescript
+import '@aws-cdk/mixins-preview/with';
+import * as cloudfrontMixins from '@aws-cdk/mixins-preview/aws_cloudfront/mixins';
+
+// Create CloudFront distribution
+const distribution = new cloudfront.Distribution(scope, 'Distribution', {
+  defaultBehavior: {
+    origin: origins.S3BucketOrigin.withOriginAccessControl(bucket),
+  },
+});
+
+// Create log destination
+const logGroup = new logs.LogGroup(scope, 'DeliveryLogGroup', {
+  removalPolicy: cdk.RemovalPolicy.DESTROY,
+});
+
+// Configure log delivery using the mixin
+distribution
+  .with(cloudfrontMixins.CfnDistributionLogsMixin.CONNECTION_LOGS.toLogGroup(logGroup));
+```
+
 ### L1 Property Mixins
 
 For every CloudFormation resource, CDK Mixins automatically generates type-safe property mixins. These allow you to apply L1 properties with full TypeScript support:
diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-aps/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-aps/mixins.ts
@@ -1 +1,2 @@
 export * from './cfn-props-mixins.generated';
+export * from './logs-delivery-mixins.generated';
diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-b2bi/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-b2bi/mixins.ts
@@ -1 +1,2 @@
 export * from './cfn-props-mixins.generated';
+export * from './logs-delivery-mixins.generated';
diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-backupgateway/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-backupgateway/mixins.ts
@@ -1 +1,2 @@
 export * from './cfn-props-mixins.generated';
+export * from './logs-delivery-mixins.generated';
diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-bedrock/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-bedrock/mixins.ts
@@ -1 +1,2 @@
 export * from './cfn-props-mixins.generated';
+export * from './logs-delivery-mixins.generated';
diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-bedrockagentcore/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-bedrockagentcore/mixins.ts
@@ -1 +1,2 @@
 export * from './cfn-props-mixins.generated';
+export * from './logs-delivery-mixins.generated';
diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-cleanrooms/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-cleanrooms/mixins.ts
@@ -1 +1,2 @@
 export * from './cfn-props-mixins.generated';
+export * from './logs-delivery-mixins.generated';
diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-cloudfront/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-cloudfront/mixins.ts
@@ -1 +1,2 @@
 export * from './cfn-props-mixins.generated';
+export * from './logs-delivery-mixins.generated';
diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-cognito/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-cognito/mixins.ts
@@ -1 +1,2 @@
 export * from './cfn-props-mixins.generated';
+export * from './logs-delivery-mixins.generated';
diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-connect/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-connect/mixins.ts
@@ -1 +1,2 @@
 export * from './cfn-props-mixins.generated';
+export * from './logs-delivery-mixins.generated';
diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-ec2/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-ec2/mixins.ts
@@ -1 +1,2 @@
 export * from './cfn-props-mixins.generated';
+export * from './logs-delivery-mixins.generated';
diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-eks/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-eks/mixins.ts
@@ -1 +1,2 @@
 export * from './cfn-props-mixins.generated';
+export * from './logs-delivery-mixins.generated';
diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-elasticloadbalancingv2/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-elasticloadbalancingv2/mixins.ts
@@ -1 +1,2 @@
 export * from './cfn-props-mixins.generated';
+export * from './logs-delivery-mixins.generated';
diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-entityresolution/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-entityresolution/mixins.ts
@@ -1 +1,2 @@
 export * from './cfn-props-mixins.generated';
+export * from './logs-delivery-mixins.generated';
diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-events/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-events/mixins.ts
@@ -1 +1,2 @@
 export * from './cfn-props-mixins.generated';
+export * from './logs-delivery-mixins.generated';
diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-iotfleetwise/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-iotfleetwise/mixins.ts
@@ -1 +1,2 @@
 export * from './cfn-props-mixins.generated';
+export * from './logs-delivery-mixins.generated';
diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-ivschat/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-ivschat/mixins.ts
@@ -1 +1,2 @@
 export * from './cfn-props-mixins.generated';
+export * from './logs-delivery-mixins.generated';
diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-kafkaconnect/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-kafkaconnect/mixins.ts
@@ -1 +1,2 @@
 export * from './cfn-props-mixins.generated';
+export * from './logs-delivery-mixins.generated';
diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-m2/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-m2/mixins.ts
@@ -1 +1,2 @@
 export * from './cfn-props-mixins.generated';
+export * from './logs-delivery-mixins.generated';
diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-mediapackagev2/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-mediapackagev2/mixins.ts
@@ -1 +1,2 @@
 export * from './cfn-props-mixins.generated';
+export * from './logs-delivery-mixins.generated';
diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-mediatailor/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-mediatailor/mixins.ts
@@ -1 +1,2 @@
 export * from './cfn-props-mixins.generated';
+export * from './logs-delivery-mixins.generated';
diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-msk/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-msk/mixins.ts
@@ -1 +1,2 @@
 export * from './cfn-props-mixins.generated';
+export * from './logs-delivery-mixins.generated';
diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-networkfirewall/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-networkfirewall/mixins.ts
@@ -1 +1,2 @@
 export * from './cfn-props-mixins.generated';
+export * from './logs-delivery-mixins.generated';
diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-organizations/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-organizations/mixins.ts
@@ -1 +1,2 @@
 export * from './cfn-props-mixins.generated';
+export * from './logs-delivery-mixins.generated';
diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-osis/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-osis/mixins.ts
@@ -1 +1,2 @@
 export * from './cfn-props-mixins.generated';
+export * from './logs-delivery-mixins.generated';
diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-pcs/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-pcs/mixins.ts
@@ -1 +1,2 @@
 export * from './cfn-props-mixins.generated';
+export * from './logs-delivery-mixins.generated';
diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-pipes/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-pipes/mixins.ts
@@ -1 +1,2 @@
 export * from './cfn-props-mixins.generated';
+export * from './logs-delivery-mixins.generated';
diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-qbusiness/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-qbusiness/mixins.ts
@@ -1 +1,2 @@
 export * from './cfn-props-mixins.generated';
+export * from './logs-delivery-mixins.generated';
diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-route53profiles/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-route53profiles/mixins.ts
@@ -1 +1,2 @@
 export * from './cfn-props-mixins.generated';
+export * from './logs-delivery-mixins.generated';
diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-ses/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-ses/mixins.ts
@@ -1 +1,2 @@
 export * from './cfn-props-mixins.generated';
+export * from './logs-delivery-mixins.generated';
diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-shield/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-shield/mixins.ts
@@ -1 +1,2 @@
 export * from './cfn-props-mixins.generated';
+export * from './logs-delivery-mixins.generated';
diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-stepfunctions/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-stepfunctions/mixins.ts
@@ -1 +1,2 @@
 export * from './cfn-props-mixins.generated';
+export * from './logs-delivery-mixins.generated';
diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-transfer/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-transfer/mixins.ts
@@ -1 +1,2 @@
 export * from './cfn-props-mixins.generated';
+export * from './logs-delivery-mixins.generated';
diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-vpclattice/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-vpclattice/mixins.ts
@@ -1 +1,2 @@
 export * from './cfn-props-mixins.generated';
+export * from './logs-delivery-mixins.generated';
diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-wafv2/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-wafv2/mixins.ts
@@ -1 +1,2 @@
 export * from './cfn-props-mixins.generated';
+export * from './logs-delivery-mixins.generated';
diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-wisdom/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-wisdom/mixins.ts
@@ -1 +1,2 @@
 export * from './cfn-props-mixins.generated';
+export * from './logs-delivery-mixins.generated';
diff --git a/packages/@aws-cdk/mixins-preview/rosetta/default.ts-fixture b/packages/@aws-cdk/mixins-preview/rosetta/default.ts-fixture
@@ -3,6 +3,7 @@ import { Stack, App } from 'aws-cdk-lib/core';
 import * as s3 from 'aws-cdk-lib/aws-s3';
 import * as logs from 'aws-cdk-lib/aws-logs';
 import * as dynamodb from 'aws-cdk-lib/aws-dynamodb';
+import * as cloudfront from 'aws-cdk-lib/aws-cloudfront';
 import '@aws-cdk/mixins-preview/with';
 // for testing purposes, ensure this import works
 import { mixins as alexa_mixins } from '@aws-cdk/mixins-preview/alexa_ask';
diff --git a/packages/@aws-cdk/mixins-preview/scripts/gen.ts b/packages/@aws-cdk/mixins-preview/scripts/gen.ts
@@ -1,4 +1,5 @@
-import { generateAll as generateCfnPropsMixins } from './spec2mixins/generate';
+import { generateAll as generateCfnPropsMixins } from './spec2mixins';
+import { generateAll as generateLogsDeliveryMixins } from './spec2logs';
 import * as path from 'node:path';
 import * as fs from 'node:fs/promises';
 import { existsSync } from 'node:fs';
@@ -18,6 +19,7 @@ async function main() {
 
   const moduleMaps = [
     await generateCfnPropsMixins({ outputPath }),
+    await generateLogsDeliveryMixins({ outputPath }),
   ];
 
   const moduleMap = mergeModuleMaps(...moduleMaps);
@@ -123,7 +125,14 @@ async function ensureSubmodule(submodule: ModuleMapEntry, outPath: string) {
   // All it does is re-export the generated file. It can be manually edited so we don't
   // fully overwrite it.
   const mixinsModuleFile = path.join(modulePath, 'mixins.ts');
-  await ensureFileContains(mixinsModuleFile, ['export * from \'./cfn-props-mixins.generated\';']);
+  const mixinsIndexLines: string[] = [];
+  mixinsIndexLines.push('export * from \'./cfn-props-mixins.generated\';');
+
+  if (existsSync(path.join(modulePath, 'logs-delivery-mixins.generated.ts'))) {
+    mixinsIndexLines.push('export * from \'./logs-delivery-mixins.generated\';');
+  }
+
+  await ensureFileContains(mixinsModuleFile, mixinsIndexLines);
   await writeJsiiModuleMetadata(mixinsModuleFile, submodule.definition, 'mixins');
 }
 
diff --git a/packages/@aws-cdk/mixins-preview/scripts/spec2logs/builder.ts b/packages/@aws-cdk/mixins-preview/scripts/spec2logs/builder.ts
diff --git a/packages/@aws-cdk/mixins-preview/scripts/spec2logs/generate.ts b/packages/@aws-cdk/mixins-preview/scripts/spec2logs/generate.ts
diff --git a/packages/@aws-cdk/mixins-preview/scripts/spec2logs/helpers.ts b/packages/@aws-cdk/mixins-preview/scripts/spec2logs/helpers.ts
diff --git a/packages/@aws-cdk/mixins-preview/scripts/spec2logs/index.ts b/packages/@aws-cdk/mixins-preview/scripts/spec2logs/index.ts
diff --git a/packages/@aws-cdk/mixins-preview/scripts/spec2mixins/builder.ts b/packages/@aws-cdk/mixins-preview/scripts/spec2mixins/builder.ts
diff --git a/packages/@aws-cdk/mixins-preview/test/codegen/__snapshots__/logs-delivery.test.ts.snap b/packages/@aws-cdk/mixins-preview/test/codegen/__snapshots__/logs-delivery.test.ts.snap
diff --git a/packages/@aws-cdk/mixins-preview/test/codegen/logs-delivery.test.ts b/packages/@aws-cdk/mixins-preview/test/codegen/logs-delivery.test.ts
diff --git a/packages/@aws-cdk/mixins-preview/test/services/aws-logs/integ.delivery-mixin.js.snapshot/DeliveryTestDefaultTestDeployAssert48416031.assets.json b/packages/@aws-cdk/mixins-preview/test/services/aws-logs/integ.delivery-mixin.js.snapshot/DeliveryTestDefaultTestDeployAssert48416031.assets.json
diff --git a/packages/@aws-cdk/mixins-preview/test/services/aws-logs/integ.delivery-mixin.js.snapshot/DeliveryTestDefaultTestDeployAssert48416031.template.json b/packages/@aws-cdk/mixins-preview/test/services/aws-logs/integ.delivery-mixin.js.snapshot/DeliveryTestDefaultTestDeployAssert48416031.template.json
diff --git a/packages/@aws-cdk/mixins-preview/test/services/aws-logs/integ.delivery-mixin.js.snapshot/VendedLogsMixinTest.assets.json b/packages/@aws-cdk/mixins-preview/test/services/aws-logs/integ.delivery-mixin.js.snapshot/VendedLogsMixinTest.assets.json
diff --git a/packages/@aws-cdk/mixins-preview/test/services/aws-logs/integ.delivery-mixin.js.snapshot/VendedLogsMixinTest.template.json b/packages/@aws-cdk/mixins-preview/test/services/aws-logs/integ.delivery-mixin.js.snapshot/VendedLogsMixinTest.template.json
diff --git a/packages/@aws-cdk/mixins-preview/test/services/aws-logs/integ.delivery-mixin.js.snapshot/asset.faa95a81ae7d7373f3e1f242268f904eb748d8d0fdd306e8a6fe515a1905a7d6/index.js b/packages/@aws-cdk/mixins-preview/test/services/aws-logs/integ.delivery-mixin.js.snapshot/asset.faa95a81ae7d7373f3e1f242268f904eb748d8d0fdd306e8a6fe515a1905a7d6/index.js
diff --git a/packages/@aws-cdk/mixins-preview/test/services/aws-logs/integ.delivery-mixin.js.snapshot/cdk.out b/packages/@aws-cdk/mixins-preview/test/services/aws-logs/integ.delivery-mixin.js.snapshot/cdk.out
diff --git a/packages/@aws-cdk/mixins-preview/test/services/aws-logs/integ.delivery-mixin.js.snapshot/integ.json b/packages/@aws-cdk/mixins-preview/test/services/aws-logs/integ.delivery-mixin.js.snapshot/integ.json
diff --git a/packages/@aws-cdk/mixins-preview/test/services/aws-logs/integ.delivery-mixin.js.snapshot/manifest.json b/packages/@aws-cdk/mixins-preview/test/services/aws-logs/integ.delivery-mixin.js.snapshot/manifest.json
diff --git a/packages/@aws-cdk/mixins-preview/test/services/aws-logs/integ.delivery-mixin.js.snapshot/tree.json b/packages/@aws-cdk/mixins-preview/test/services/aws-logs/integ.delivery-mixin.js.snapshot/tree.json
diff --git a/packages/@aws-cdk/mixins-preview/test/services/aws-logs/integ.delivery-mixin.ts b/packages/@aws-cdk/mixins-preview/test/services/aws-logs/integ.delivery-mixin.ts
diff --git a/tools/@aws-cdk/spec2cdk/lib/cdk/cdk.ts b/tools/@aws-cdk/spec2cdk/lib/cdk/cdk.ts

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`	`1`	`export * from './cfn-props-mixins.generated';`
	`2`	`+export * from './logs-delivery-mixins.generated';`