diff --git a/packages/@aws-cdk/mixins-preview/.gitignore b/packages/@aws-cdk/mixins-preview/.gitignore index 2cb6bf43df107..1e57b644dd4f6 100644 --- a/packages/@aws-cdk/mixins-preview/.gitignore +++ b/packages/@aws-cdk/mixins-preview/.gitignore @@ -3,8 +3,10 @@ *.d.ts node_modules *.generated.ts +rosetta/_generated.ts-fixture dist .jsii +.jsii.gz .LAST_BUILD .nyc_output diff --git a/packages/@aws-cdk/mixins-preview/.npmignore b/packages/@aws-cdk/mixins-preview/.npmignore index 3010731d3a4b6..10893e98e973a 100644 --- a/packages/@aws-cdk/mixins-preview/.npmignore +++ b/packages/@aws-cdk/mixins-preview/.npmignore @@ -13,6 +13,8 @@ dist # Include .jsii !.jsii +!.jsii.gz +!rosetta/_generated.ts-fixture *.snk diff --git a/packages/@aws-cdk/mixins-preview/README.md b/packages/@aws-cdk/mixins-preview/README.md index 583f00ce644ce..f60e0a8cde9c5 100644 --- a/packages/@aws-cdk/mixins-preview/README.md +++ b/packages/@aws-cdk/mixins-preview/README.md @@ -125,6 +125,30 @@ const bucket = new s3.CfnBucket(scope, "Bucket"); Mixins.of(bucket).apply(new EnableVersioning()); ``` +### Logs Delivery + +Configures vended logs 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 +declare const bucket: s3.Bucket; +const distribution = new cloudfront.Distribution(scope, 'Distribution', { + defaultBehavior: { + origin: origins.S3BucketOrigin.withOriginAccessControl(bucket), + }, +}); + +// Create log destination +const logGroup = new logs.LogGroup(scope, 'DeliveryLogGroup'); + +// 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/alexa-ask/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/alexa-ask/mixins.ts index 2d7e39d72e92d..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/alexa-ask/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/alexa-ask/mixins.ts @@ -1 +1 @@ -export * from './ask.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-accessanalyzer/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-accessanalyzer/mixins.ts index 6338922d67fdc..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-accessanalyzer/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-accessanalyzer/mixins.ts @@ -1 +1 @@ -export * from './accessanalyzer.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-acmpca/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-acmpca/mixins.ts index f191c370e903b..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-acmpca/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-acmpca/mixins.ts @@ -1 +1 @@ -export * from './acmpca.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-aiops/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-aiops/mixins.ts index e3350495fe95c..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-aiops/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-aiops/mixins.ts @@ -1 +1 @@ -export * from './aiops.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-amazonmq/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-amazonmq/mixins.ts index c26b75eba4f9a..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-amazonmq/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-amazonmq/mixins.ts @@ -1 +1 @@ -export * from './amazonmq.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-amplify/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-amplify/mixins.ts index 592687c936bfe..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-amplify/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-amplify/mixins.ts @@ -1 +1 @@ -export * from './amplify.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-amplifyuibuilder/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-amplifyuibuilder/mixins.ts index 518b7445e2bff..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-amplifyuibuilder/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-amplifyuibuilder/mixins.ts @@ -1 +1 @@ -export * from './amplifyuibuilder.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-apigateway/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-apigateway/mixins.ts index f7888fd3fe3b0..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-apigateway/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-apigateway/mixins.ts @@ -1 +1 @@ -export * from './apigateway.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-apigatewayv2/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-apigatewayv2/mixins.ts index a32e85da23c73..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-apigatewayv2/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-apigatewayv2/mixins.ts @@ -1 +1 @@ -export * from './apigatewayv2.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-appconfig/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-appconfig/mixins.ts index 83e6ead7a1b97..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-appconfig/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-appconfig/mixins.ts @@ -1 +1 @@ -export * from './appconfig.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-appflow/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-appflow/mixins.ts index ad36824ec9f8a..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-appflow/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-appflow/mixins.ts @@ -1 +1 @@ -export * from './appflow.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-appintegrations/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-appintegrations/mixins.ts index 55109c215e819..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-appintegrations/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-appintegrations/mixins.ts @@ -1 +1 @@ -export * from './appintegrations.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-applicationautoscaling/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-applicationautoscaling/mixins.ts index 26d9ba43412a9..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-applicationautoscaling/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-applicationautoscaling/mixins.ts @@ -1 +1 @@ -export * from './applicationautoscaling.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-applicationinsights/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-applicationinsights/mixins.ts index 35051b4ba5fa5..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-applicationinsights/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-applicationinsights/mixins.ts @@ -1 +1 @@ -export * from './applicationinsights.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-applicationsignals/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-applicationsignals/mixins.ts index 177b8e1bd0a81..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-applicationsignals/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-applicationsignals/mixins.ts @@ -1 +1 @@ -export * from './applicationsignals.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-appmesh/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-appmesh/mixins.ts index 694450489a4fd..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-appmesh/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-appmesh/mixins.ts @@ -1 +1 @@ -export * from './appmesh.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-apprunner/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-apprunner/mixins.ts index 264efce9cf0f8..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-apprunner/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-apprunner/mixins.ts @@ -1 +1 @@ -export * from './apprunner.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-appstream/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-appstream/mixins.ts index f2f402ce561de..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-appstream/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-appstream/mixins.ts @@ -1 +1 @@ -export * from './appstream.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-appsync/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-appsync/mixins.ts index 31e62705a7657..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-appsync/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-appsync/mixins.ts @@ -1 +1 @@ -export * from './appsync.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-apptest/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-apptest/mixins.ts index 049aadb2e9235..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-apptest/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-apptest/mixins.ts @@ -1 +1 @@ -export * from './apptest.generated'; +export * from './cfn-props-mixins.generated'; 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 index 309904ba2ffb9..44c216ff3f090 100644 --- 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 './aps.generated'; +export * from './cfn-props-mixins.generated'; +export * from './logs-delivery-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-arcregionswitch/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-arcregionswitch/mixins.ts index 99401686bec00..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-arcregionswitch/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-arcregionswitch/mixins.ts @@ -1 +1 @@ -export * from './arcregionswitch.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-arczonalshift/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-arczonalshift/mixins.ts index b9bf0a25be547..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-arczonalshift/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-arczonalshift/mixins.ts @@ -1 +1 @@ -export * from './arczonalshift.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-athena/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-athena/mixins.ts index 03d71032a86ee..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-athena/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-athena/mixins.ts @@ -1 +1 @@ -export * from './athena.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-auditmanager/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-auditmanager/mixins.ts index bfb9a078dc7fa..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-auditmanager/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-auditmanager/mixins.ts @@ -1 +1 @@ -export * from './auditmanager.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-autoscaling/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-autoscaling/mixins.ts index 9332b08b234c0..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-autoscaling/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-autoscaling/mixins.ts @@ -1 +1 @@ -export * from './autoscaling.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-autoscalingplans/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-autoscalingplans/mixins.ts index 73c11c0b3ff97..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-autoscalingplans/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-autoscalingplans/mixins.ts @@ -1 +1 @@ -export * from './autoscalingplans.generated'; +export * from './cfn-props-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 index 55d0767662a0e..44c216ff3f090 100644 --- 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 './b2bi.generated'; +export * from './cfn-props-mixins.generated'; +export * from './logs-delivery-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-backup/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-backup/mixins.ts index 52746a318cce3..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-backup/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-backup/mixins.ts @@ -1 +1 @@ -export * from './backup.generated'; +export * from './cfn-props-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 index f842022acdfc1..44c216ff3f090 100644 --- 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 './backupgateway.generated'; +export * from './cfn-props-mixins.generated'; +export * from './logs-delivery-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-batch/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-batch/mixins.ts index e3d2322ac2919..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-batch/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-batch/mixins.ts @@ -1 +1 @@ -export * from './batch.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-bcmdataexports/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-bcmdataexports/mixins.ts index 3681298593645..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-bcmdataexports/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-bcmdataexports/mixins.ts @@ -1 +1 @@ -export * from './bcmdataexports.generated'; +export * from './cfn-props-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 index 9c1b29bc8c59d..44c216ff3f090 100644 --- 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 './bedrock.generated'; +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 index c7eecebd38a57..44c216ff3f090 100644 --- 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 './bedrockagentcore.generated'; +export * from './cfn-props-mixins.generated'; +export * from './logs-delivery-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-billing/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-billing/mixins.ts index a47edc3c0f159..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-billing/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-billing/mixins.ts @@ -1 +1 @@ -export * from './billing.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-billingconductor/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-billingconductor/mixins.ts index f88f969e28816..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-billingconductor/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-billingconductor/mixins.ts @@ -1 +1 @@ -export * from './billingconductor.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-budgets/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-budgets/mixins.ts index b100460bebe0e..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-budgets/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-budgets/mixins.ts @@ -1 +1 @@ -export * from './budgets.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-cassandra/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-cassandra/mixins.ts index fae75c5768497..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-cassandra/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-cassandra/mixins.ts @@ -1 +1 @@ -export * from './cassandra.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-ce/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-ce/mixins.ts index ee2537252a553..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-ce/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-ce/mixins.ts @@ -1 +1 @@ -export * from './ce.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-certificatemanager/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-certificatemanager/mixins.ts index 1938376954297..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-certificatemanager/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-certificatemanager/mixins.ts @@ -1 +1 @@ -export * from './certificatemanager.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-chatbot/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-chatbot/mixins.ts index b5de399d16a4f..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-chatbot/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-chatbot/mixins.ts @@ -1 +1 @@ -export * from './chatbot.generated'; +export * from './cfn-props-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 index 9b3438607092b..44c216ff3f090 100644 --- 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 './cleanrooms.generated'; +export * from './cfn-props-mixins.generated'; +export * from './logs-delivery-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-cleanroomsml/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-cleanroomsml/mixins.ts index 87e13ef6a2a14..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-cleanroomsml/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-cleanroomsml/mixins.ts @@ -1 +1 @@ -export * from './cleanroomsml.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-cloud9/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-cloud9/mixins.ts index 17b2db3a06268..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-cloud9/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-cloud9/mixins.ts @@ -1 +1 @@ -export * from './cloud9.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-cloudformation/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-cloudformation/mixins.ts index 48c2c3df8f40e..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-cloudformation/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-cloudformation/mixins.ts @@ -1 +1 @@ -export * from './cloudformation.generated'; +export * from './cfn-props-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 index d47b4bf3bd6b9..44c216ff3f090 100644 --- 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 './cloudfront.generated'; +export * from './cfn-props-mixins.generated'; +export * from './logs-delivery-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-cloudtrail/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-cloudtrail/mixins.ts index d603dde237568..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-cloudtrail/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-cloudtrail/mixins.ts @@ -1 +1 @@ -export * from './cloudtrail.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-cloudwatch/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-cloudwatch/mixins.ts index b5e120fe2fb26..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-cloudwatch/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-cloudwatch/mixins.ts @@ -1 +1 @@ -export * from './cloudwatch.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-codeartifact/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-codeartifact/mixins.ts index 19ece3c71f7f1..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-codeartifact/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-codeartifact/mixins.ts @@ -1 +1 @@ -export * from './codeartifact.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-codebuild/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-codebuild/mixins.ts index ebcc2c31c1643..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-codebuild/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-codebuild/mixins.ts @@ -1 +1 @@ -export * from './codebuild.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-codecommit/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-codecommit/mixins.ts index d20c89dcf0a6e..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-codecommit/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-codecommit/mixins.ts @@ -1 +1 @@ -export * from './codecommit.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-codeconnections/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-codeconnections/mixins.ts index 0608d9e170a14..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-codeconnections/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-codeconnections/mixins.ts @@ -1 +1 @@ -export * from './codeconnections.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-codedeploy/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-codedeploy/mixins.ts index 5387a30c2ab80..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-codedeploy/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-codedeploy/mixins.ts @@ -1 +1 @@ -export * from './codedeploy.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-codeguruprofiler/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-codeguruprofiler/mixins.ts index 1ce17f9c2ca3c..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-codeguruprofiler/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-codeguruprofiler/mixins.ts @@ -1 +1 @@ -export * from './codeguruprofiler.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-codegurureviewer/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-codegurureviewer/mixins.ts index 966821dc23ce7..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-codegurureviewer/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-codegurureviewer/mixins.ts @@ -1 +1 @@ -export * from './codegurureviewer.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-codepipeline/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-codepipeline/mixins.ts index 7c36ac94ba239..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-codepipeline/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-codepipeline/mixins.ts @@ -1 +1 @@ -export * from './codepipeline.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-codestar/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-codestar/mixins.ts index 60925d572689d..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-codestar/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-codestar/mixins.ts @@ -1 +1 @@ -export * from './codestar.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-codestarconnections/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-codestarconnections/mixins.ts index 7ada48b2d6cf5..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-codestarconnections/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-codestarconnections/mixins.ts @@ -1 +1 @@ -export * from './codestarconnections.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-codestarnotifications/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-codestarnotifications/mixins.ts index 5bb6c637fb54f..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-codestarnotifications/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-codestarnotifications/mixins.ts @@ -1 +1 @@ -export * from './codestarnotifications.generated'; +export * from './cfn-props-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 index 77b32283c4671..44c216ff3f090 100644 --- 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 './cognito.generated'; +export * from './cfn-props-mixins.generated'; +export * from './logs-delivery-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-comprehend/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-comprehend/mixins.ts index e1a69d2cb890c..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-comprehend/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-comprehend/mixins.ts @@ -1 +1 @@ -export * from './comprehend.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-config/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-config/mixins.ts index de89a564e200d..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-config/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-config/mixins.ts @@ -1 +1 @@ -export * from './config.generated'; +export * from './cfn-props-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 index ebd03d0fcc6a6..44c216ff3f090 100644 --- 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 './connect.generated'; +export * from './cfn-props-mixins.generated'; +export * from './logs-delivery-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-connectcampaigns/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-connectcampaigns/mixins.ts index 21e2588fd4bff..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-connectcampaigns/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-connectcampaigns/mixins.ts @@ -1 +1 @@ -export * from './connectcampaigns.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-connectcampaignsv2/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-connectcampaignsv2/mixins.ts index 66097e61999a3..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-connectcampaignsv2/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-connectcampaignsv2/mixins.ts @@ -1 +1 @@ -export * from './connectcampaignsv2.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-controltower/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-controltower/mixins.ts index c5779b86938e7..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-controltower/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-controltower/mixins.ts @@ -1 +1 @@ -export * from './controltower.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-cur/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-cur/mixins.ts index 2fcc765033b04..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-cur/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-cur/mixins.ts @@ -1 +1 @@ -export * from './cur.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-customerprofiles/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-customerprofiles/mixins.ts index 23cae9c4a1c0a..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-customerprofiles/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-customerprofiles/mixins.ts @@ -1 +1 @@ -export * from './customerprofiles.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-databrew/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-databrew/mixins.ts index eb71bbd88dd14..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-databrew/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-databrew/mixins.ts @@ -1 +1 @@ -export * from './databrew.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-datapipeline/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-datapipeline/mixins.ts index 4dd3ad0083811..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-datapipeline/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-datapipeline/mixins.ts @@ -1 +1 @@ -export * from './datapipeline.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-datasync/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-datasync/mixins.ts index f338c4ab42d03..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-datasync/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-datasync/mixins.ts @@ -1 +1 @@ -export * from './datasync.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-datazone/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-datazone/mixins.ts index a1d1ada96b239..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-datazone/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-datazone/mixins.ts @@ -1 +1 @@ -export * from './datazone.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-dax/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-dax/mixins.ts index 78c49027ac50e..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-dax/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-dax/mixins.ts @@ -1 +1 @@ -export * from './dax.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-deadline/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-deadline/mixins.ts index b2627b2db4fe5..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-deadline/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-deadline/mixins.ts @@ -1 +1 @@ -export * from './deadline.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-detective/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-detective/mixins.ts index 1942d794b1ab7..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-detective/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-detective/mixins.ts @@ -1 +1 @@ -export * from './detective.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-devicefarm/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-devicefarm/mixins.ts index b257762000b52..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-devicefarm/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-devicefarm/mixins.ts @@ -1 +1 @@ -export * from './devicefarm.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-devopsguru/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-devopsguru/mixins.ts index 287d26047e1e8..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-devopsguru/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-devopsguru/mixins.ts @@ -1 +1 @@ -export * from './devopsguru.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-directoryservice/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-directoryservice/mixins.ts index 2b1b3f95cc5c7..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-directoryservice/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-directoryservice/mixins.ts @@ -1 +1 @@ -export * from './directoryservice.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-dlm/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-dlm/mixins.ts index a98c1ee513e82..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-dlm/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-dlm/mixins.ts @@ -1 +1 @@ -export * from './dlm.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-dms/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-dms/mixins.ts index 610b0e2893e47..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-dms/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-dms/mixins.ts @@ -1 +1 @@ -export * from './dms.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-docdb/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-docdb/mixins.ts index 2a39bd2da4317..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-docdb/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-docdb/mixins.ts @@ -1 +1 @@ -export * from './docdb.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-docdbelastic/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-docdbelastic/mixins.ts index 3dec9f0e8faa6..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-docdbelastic/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-docdbelastic/mixins.ts @@ -1 +1 @@ -export * from './docdbelastic.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-dsql/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-dsql/mixins.ts index 700a46482f7d6..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-dsql/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-dsql/mixins.ts @@ -1 +1 @@ -export * from './dsql.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-dynamodb/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-dynamodb/mixins.ts index 5a856d1a7620c..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-dynamodb/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-dynamodb/mixins.ts @@ -1 +1 @@ -export * from './dynamodb.generated'; +export * from './cfn-props-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 index 3e1e422fe2b28..44c216ff3f090 100644 --- 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 './ec2.generated'; +export * from './cfn-props-mixins.generated'; +export * from './logs-delivery-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-ecr/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-ecr/mixins.ts index 062f81e1d6a04..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-ecr/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-ecr/mixins.ts @@ -1 +1 @@ -export * from './ecr.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-ecs/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-ecs/mixins.ts index a273fb2bf9431..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-ecs/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-ecs/mixins.ts @@ -1 +1 @@ -export * from './ecs.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-efs/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-efs/mixins.ts index 5b7c518c3a265..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-efs/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-efs/mixins.ts @@ -1 +1 @@ -export * from './efs.generated'; +export * from './cfn-props-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 index 260898c8dd053..44c216ff3f090 100644 --- 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 './eks.generated'; +export * from './cfn-props-mixins.generated'; +export * from './logs-delivery-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-elasticache/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-elasticache/mixins.ts index a75b47e0732ae..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-elasticache/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-elasticache/mixins.ts @@ -1 +1 @@ -export * from './elasticache.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-elasticbeanstalk/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-elasticbeanstalk/mixins.ts index 0be765a91af8e..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-elasticbeanstalk/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-elasticbeanstalk/mixins.ts @@ -1 +1 @@ -export * from './elasticbeanstalk.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-elasticloadbalancing/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-elasticloadbalancing/mixins.ts index 031cca512f43b..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-elasticloadbalancing/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-elasticloadbalancing/mixins.ts @@ -1 +1 @@ -export * from './elasticloadbalancing.generated'; +export * from './cfn-props-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 index e3c880fb550a3..44c216ff3f090 100644 --- 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 './elasticloadbalancingv2.generated'; +export * from './cfn-props-mixins.generated'; +export * from './logs-delivery-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-elasticsearch/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-elasticsearch/mixins.ts index adb19aebbff60..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-elasticsearch/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-elasticsearch/mixins.ts @@ -1 +1 @@ -export * from './elasticsearch.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-emr/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-emr/mixins.ts index f1e0f410db8d0..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-emr/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-emr/mixins.ts @@ -1 +1 @@ -export * from './emr.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-emrcontainers/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-emrcontainers/mixins.ts index 43ec5e7979e1e..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-emrcontainers/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-emrcontainers/mixins.ts @@ -1 +1 @@ -export * from './emrcontainers.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-emrserverless/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-emrserverless/mixins.ts index 578970836354b..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-emrserverless/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-emrserverless/mixins.ts @@ -1 +1 @@ -export * from './emrserverless.generated'; +export * from './cfn-props-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 index 742c278a9828c..44c216ff3f090 100644 --- 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 './entityresolution.generated'; +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 index 40958b04aa549..44c216ff3f090 100644 --- 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 './events.generated'; +export * from './cfn-props-mixins.generated'; +export * from './logs-delivery-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-eventschemas/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-eventschemas/mixins.ts index 5b513db11e96a..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-eventschemas/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-eventschemas/mixins.ts @@ -1 +1 @@ -export * from './eventschemas.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-evidently/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-evidently/mixins.ts index b71fc9d726a8a..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-evidently/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-evidently/mixins.ts @@ -1 +1 @@ -export * from './evidently.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-evs/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-evs/mixins.ts index 8a0287ef8d005..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-evs/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-evs/mixins.ts @@ -1 +1 @@ -export * from './evs.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-finspace/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-finspace/mixins.ts index cf894bd1b72f3..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-finspace/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-finspace/mixins.ts @@ -1 +1 @@ -export * from './finspace.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-fis/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-fis/mixins.ts index 106ba33edc3d3..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-fis/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-fis/mixins.ts @@ -1 +1 @@ -export * from './fis.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-fms/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-fms/mixins.ts index 4a2fb7b0fd701..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-fms/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-fms/mixins.ts @@ -1 +1 @@ -export * from './fms.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-forecast/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-forecast/mixins.ts index 4fb93d1788f2d..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-forecast/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-forecast/mixins.ts @@ -1 +1 @@ -export * from './forecast.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-frauddetector/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-frauddetector/mixins.ts index 0c11af2cf0778..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-frauddetector/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-frauddetector/mixins.ts @@ -1 +1 @@ -export * from './frauddetector.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-fsx/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-fsx/mixins.ts index d40dfe12efd4d..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-fsx/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-fsx/mixins.ts @@ -1 +1 @@ -export * from './fsx.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-gamelift/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-gamelift/mixins.ts index bd51e262e72a4..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-gamelift/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-gamelift/mixins.ts @@ -1 +1 @@ -export * from './gamelift.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-gameliftstreams/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-gameliftstreams/mixins.ts index f7764f9838126..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-gameliftstreams/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-gameliftstreams/mixins.ts @@ -1 +1 @@ -export * from './gameliftstreams.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-globalaccelerator/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-globalaccelerator/mixins.ts index 356039fa13770..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-globalaccelerator/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-globalaccelerator/mixins.ts @@ -1 +1 @@ -export * from './globalaccelerator.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-glue/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-glue/mixins.ts index 7453a3026f1c6..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-glue/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-glue/mixins.ts @@ -1 +1 @@ -export * from './glue.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-grafana/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-grafana/mixins.ts index ee459d4b3d34a..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-grafana/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-grafana/mixins.ts @@ -1 +1 @@ -export * from './grafana.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-greengrass/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-greengrass/mixins.ts index 4b0342b7b7e94..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-greengrass/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-greengrass/mixins.ts @@ -1 +1 @@ -export * from './greengrass.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-greengrassv2/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-greengrassv2/mixins.ts index d0c67e266529e..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-greengrassv2/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-greengrassv2/mixins.ts @@ -1 +1 @@ -export * from './greengrassv2.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-groundstation/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-groundstation/mixins.ts index 8de9455be5399..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-groundstation/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-groundstation/mixins.ts @@ -1 +1 @@ -export * from './groundstation.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-guardduty/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-guardduty/mixins.ts index de90b493c9f64..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-guardduty/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-guardduty/mixins.ts @@ -1 +1 @@ -export * from './guardduty.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-healthimaging/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-healthimaging/mixins.ts index 8dcfa25601274..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-healthimaging/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-healthimaging/mixins.ts @@ -1 +1 @@ -export * from './healthimaging.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-healthlake/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-healthlake/mixins.ts index fcf0c957cee2b..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-healthlake/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-healthlake/mixins.ts @@ -1 +1 @@ -export * from './healthlake.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-iam/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-iam/mixins.ts index 76b61fa99ab1f..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-iam/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-iam/mixins.ts @@ -1 +1 @@ -export * from './iam.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-identitystore/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-identitystore/mixins.ts index f52a4b39cb84d..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-identitystore/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-identitystore/mixins.ts @@ -1 +1 @@ -export * from './identitystore.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-imagebuilder/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-imagebuilder/mixins.ts index a14d97c9b00a9..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-imagebuilder/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-imagebuilder/mixins.ts @@ -1 +1 @@ -export * from './imagebuilder.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-inspector/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-inspector/mixins.ts index dc769c1590df5..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-inspector/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-inspector/mixins.ts @@ -1 +1 @@ -export * from './inspector.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-inspectorv2/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-inspectorv2/mixins.ts index 00bc0e8d8997c..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-inspectorv2/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-inspectorv2/mixins.ts @@ -1 +1 @@ -export * from './inspectorv2.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-internetmonitor/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-internetmonitor/mixins.ts index 4d8c7db27e04d..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-internetmonitor/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-internetmonitor/mixins.ts @@ -1 +1 @@ -export * from './internetmonitor.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-invoicing/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-invoicing/mixins.ts index cbc87547e2295..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-invoicing/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-invoicing/mixins.ts @@ -1 +1 @@ -export * from './invoicing.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-iot/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-iot/mixins.ts index 9dd11136e273b..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-iot/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-iot/mixins.ts @@ -1 +1 @@ -export * from './iot.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-iotanalytics/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-iotanalytics/mixins.ts index e8edfc8d4c363..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-iotanalytics/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-iotanalytics/mixins.ts @@ -1 +1 @@ -export * from './iotanalytics.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-iotcoredeviceadvisor/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-iotcoredeviceadvisor/mixins.ts index 2e8a8cc1d6970..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-iotcoredeviceadvisor/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-iotcoredeviceadvisor/mixins.ts @@ -1 +1 @@ -export * from './iotcoredeviceadvisor.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-iotevents/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-iotevents/mixins.ts index 03c5bddc59431..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-iotevents/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-iotevents/mixins.ts @@ -1 +1 @@ -export * from './iotevents.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-iotfleethub/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-iotfleethub/mixins.ts index cef843edd9751..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-iotfleethub/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-iotfleethub/mixins.ts @@ -1 +1 @@ -export * from './iotfleethub.generated'; +export * from './cfn-props-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 index f14f43bb61da5..44c216ff3f090 100644 --- 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 './iotfleetwise.generated'; +export * from './cfn-props-mixins.generated'; +export * from './logs-delivery-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-iotsitewise/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-iotsitewise/mixins.ts index d2fd46b031b67..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-iotsitewise/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-iotsitewise/mixins.ts @@ -1 +1 @@ -export * from './iotsitewise.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-iotthingsgraph/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-iotthingsgraph/mixins.ts index fd657ef9d3964..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-iotthingsgraph/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-iotthingsgraph/mixins.ts @@ -1 +1 @@ -export * from './iotthingsgraph.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-iottwinmaker/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-iottwinmaker/mixins.ts index 6429ca564d717..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-iottwinmaker/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-iottwinmaker/mixins.ts @@ -1 +1 @@ -export * from './iottwinmaker.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-iotwireless/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-iotwireless/mixins.ts index 756bba6e8befd..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-iotwireless/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-iotwireless/mixins.ts @@ -1 +1 @@ -export * from './iotwireless.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-ivs/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-ivs/mixins.ts index a3212c88a1ba8..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-ivs/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-ivs/mixins.ts @@ -1 +1 @@ -export * from './ivs.generated'; +export * from './cfn-props-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 index 537f8debabd99..44c216ff3f090 100644 --- 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 './ivschat.generated'; +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 index 158ac8c8c6d81..44c216ff3f090 100644 --- 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 './kafkaconnect.generated'; +export * from './cfn-props-mixins.generated'; +export * from './logs-delivery-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-kendra/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-kendra/mixins.ts index 9969d3527fa9b..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-kendra/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-kendra/mixins.ts @@ -1 +1 @@ -export * from './kendra.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-kendraranking/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-kendraranking/mixins.ts index 66730e5339161..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-kendraranking/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-kendraranking/mixins.ts @@ -1 +1 @@ -export * from './kendraranking.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-kinesis/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-kinesis/mixins.ts index a97fd819b8bda..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-kinesis/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-kinesis/mixins.ts @@ -1 +1 @@ -export * from './kinesis.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-kinesisanalytics/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-kinesisanalytics/mixins.ts index d2802ccee5b45..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-kinesisanalytics/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-kinesisanalytics/mixins.ts @@ -1 +1 @@ -export * from './kinesisanalytics.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-kinesisanalyticsv2/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-kinesisanalyticsv2/mixins.ts index bdc9c20086e04..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-kinesisanalyticsv2/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-kinesisanalyticsv2/mixins.ts @@ -1 +1 @@ -export * from './kinesisanalyticsv2.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-kinesisfirehose/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-kinesisfirehose/mixins.ts index 5a6e8d09acee9..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-kinesisfirehose/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-kinesisfirehose/mixins.ts @@ -1 +1 @@ -export * from './kinesisfirehose.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-kinesisvideo/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-kinesisvideo/mixins.ts index 1b47bad67962c..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-kinesisvideo/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-kinesisvideo/mixins.ts @@ -1 +1 @@ -export * from './kinesisvideo.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-kms/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-kms/mixins.ts index fa6a2771f00b3..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-kms/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-kms/mixins.ts @@ -1 +1 @@ -export * from './kms.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-lakeformation/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-lakeformation/mixins.ts index 5a937af0d7a9c..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-lakeformation/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-lakeformation/mixins.ts @@ -1 +1 @@ -export * from './lakeformation.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-lambda/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-lambda/mixins.ts index bb3438d79fece..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-lambda/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-lambda/mixins.ts @@ -1 +1 @@ -export * from './lambda.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-launchwizard/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-launchwizard/mixins.ts index 07eb29c969f71..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-launchwizard/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-launchwizard/mixins.ts @@ -1 +1 @@ -export * from './launchwizard.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-lex/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-lex/mixins.ts index e2603c0376829..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-lex/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-lex/mixins.ts @@ -1 +1 @@ -export * from './lex.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-licensemanager/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-licensemanager/mixins.ts index d1ba150c2e618..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-licensemanager/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-licensemanager/mixins.ts @@ -1 +1 @@ -export * from './licensemanager.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-lightsail/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-lightsail/mixins.ts index 9d5e053b32010..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-lightsail/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-lightsail/mixins.ts @@ -1 +1 @@ -export * from './lightsail.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-location/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-location/mixins.ts index 30104dfda004c..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-location/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-location/mixins.ts @@ -1 +1 @@ -export * from './location.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-logs/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-logs/mixins.ts index fc47e4e2507aa..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-logs/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-logs/mixins.ts @@ -1 +1 @@ -export * from './logs.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-lookoutequipment/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-lookoutequipment/mixins.ts index 9f64d3cdd12a8..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-lookoutequipment/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-lookoutequipment/mixins.ts @@ -1 +1 @@ -export * from './lookoutequipment.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-lookoutmetrics/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-lookoutmetrics/mixins.ts index 153d66399a202..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-lookoutmetrics/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-lookoutmetrics/mixins.ts @@ -1 +1 @@ -export * from './lookoutmetrics.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-lookoutvision/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-lookoutvision/mixins.ts index 4139bede91b11..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-lookoutvision/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-lookoutvision/mixins.ts @@ -1 +1 @@ -export * from './lookoutvision.generated'; +export * from './cfn-props-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 index 20e42f2148faa..44c216ff3f090 100644 --- 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 './m2.generated'; +export * from './cfn-props-mixins.generated'; +export * from './logs-delivery-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-macie/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-macie/mixins.ts index 6d725060610a4..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-macie/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-macie/mixins.ts @@ -1 +1 @@ -export * from './macie.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-managedblockchain/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-managedblockchain/mixins.ts index 4791634c376f6..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-managedblockchain/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-managedblockchain/mixins.ts @@ -1 +1 @@ -export * from './managedblockchain.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-mediaconnect/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-mediaconnect/mixins.ts index ae5221eb8e980..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-mediaconnect/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-mediaconnect/mixins.ts @@ -1 +1 @@ -export * from './mediaconnect.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-mediaconvert/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-mediaconvert/mixins.ts index f036827d90f93..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-mediaconvert/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-mediaconvert/mixins.ts @@ -1 +1 @@ -export * from './mediaconvert.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-medialive/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-medialive/mixins.ts index 7697936d1432a..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-medialive/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-medialive/mixins.ts @@ -1 +1 @@ -export * from './medialive.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-mediapackage/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-mediapackage/mixins.ts index 68f26e4706966..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-mediapackage/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-mediapackage/mixins.ts @@ -1 +1 @@ -export * from './mediapackage.generated'; +export * from './cfn-props-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 index 4cb98682950ca..44c216ff3f090 100644 --- 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 './mediapackagev2.generated'; +export * from './cfn-props-mixins.generated'; +export * from './logs-delivery-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-mediastore/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-mediastore/mixins.ts index 974c1f925bbda..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-mediastore/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-mediastore/mixins.ts @@ -1 +1 @@ -export * from './mediastore.generated'; +export * from './cfn-props-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 index 6b3d033b61791..44c216ff3f090 100644 --- 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 './mediatailor.generated'; +export * from './cfn-props-mixins.generated'; +export * from './logs-delivery-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-memorydb/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-memorydb/mixins.ts index 7dabab787a802..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-memorydb/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-memorydb/mixins.ts @@ -1 +1 @@ -export * from './memorydb.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-mpa/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-mpa/mixins.ts index 945f85ec081b4..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-mpa/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-mpa/mixins.ts @@ -1 +1 @@ -export * from './mpa.generated'; +export * from './cfn-props-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 index ee352befc35db..44c216ff3f090 100644 --- 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 './msk.generated'; +export * from './cfn-props-mixins.generated'; +export * from './logs-delivery-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-mwaa/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-mwaa/mixins.ts index 72db89fbdfb02..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-mwaa/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-mwaa/mixins.ts @@ -1 +1 @@ -export * from './mwaa.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-neptune/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-neptune/mixins.ts index ed76ce0a3e688..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-neptune/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-neptune/mixins.ts @@ -1 +1 @@ -export * from './neptune.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-neptunegraph/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-neptunegraph/mixins.ts index 9116bde786f85..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-neptunegraph/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-neptunegraph/mixins.ts @@ -1 +1 @@ -export * from './neptunegraph.generated'; +export * from './cfn-props-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 index ae7cd2120c926..44c216ff3f090 100644 --- 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 './networkfirewall.generated'; +export * from './cfn-props-mixins.generated'; +export * from './logs-delivery-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-networkmanager/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-networkmanager/mixins.ts index 3b574dba5a2f4..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-networkmanager/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-networkmanager/mixins.ts @@ -1 +1 @@ -export * from './networkmanager.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-nimblestudio/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-nimblestudio/mixins.ts index 72dd20ad2e13f..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-nimblestudio/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-nimblestudio/mixins.ts @@ -1 +1 @@ -export * from './nimblestudio.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-notifications/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-notifications/mixins.ts index 3316bce8ffb47..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-notifications/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-notifications/mixins.ts @@ -1 +1 @@ -export * from './notifications.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-notificationscontacts/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-notificationscontacts/mixins.ts index 4bfd57c1659f0..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-notificationscontacts/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-notificationscontacts/mixins.ts @@ -1 +1 @@ -export * from './notificationscontacts.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-oam/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-oam/mixins.ts index 6ab6ba2f88ced..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-oam/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-oam/mixins.ts @@ -1 +1 @@ -export * from './oam.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-observabilityadmin/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-observabilityadmin/mixins.ts index 12b99fbef2cc5..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-observabilityadmin/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-observabilityadmin/mixins.ts @@ -1 +1 @@ -export * from './observabilityadmin.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-odb/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-odb/mixins.ts index a4cdd1945075a..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-odb/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-odb/mixins.ts @@ -1 +1 @@ -export * from './odb.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-omics/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-omics/mixins.ts index 75978f9f25921..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-omics/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-omics/mixins.ts @@ -1 +1 @@ -export * from './omics.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-opensearchserverless/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-opensearchserverless/mixins.ts index 6bc815596d676..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-opensearchserverless/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-opensearchserverless/mixins.ts @@ -1 +1 @@ -export * from './opensearchserverless.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-opensearchservice/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-opensearchservice/mixins.ts index 4ae13b548dc47..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-opensearchservice/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-opensearchservice/mixins.ts @@ -1 +1 @@ -export * from './opensearchservice.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-opsworks/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-opsworks/mixins.ts index 91c6bc9768ec3..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-opsworks/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-opsworks/mixins.ts @@ -1 +1 @@ -export * from './opsworks.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-opsworkscm/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-opsworkscm/mixins.ts index 238911205d35f..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-opsworkscm/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-opsworkscm/mixins.ts @@ -1 +1 @@ -export * from './opsworkscm.generated'; +export * from './cfn-props-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 index eeab04228d229..44c216ff3f090 100644 --- 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 './organizations.generated'; +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 index f631cf9a03afe..44c216ff3f090 100644 --- 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 './osis.generated'; +export * from './cfn-props-mixins.generated'; +export * from './logs-delivery-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-panorama/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-panorama/mixins.ts index 508c3298e907f..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-panorama/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-panorama/mixins.ts @@ -1 +1 @@ -export * from './panorama.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-paymentcryptography/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-paymentcryptography/mixins.ts index 3ca058967d5c9..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-paymentcryptography/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-paymentcryptography/mixins.ts @@ -1 +1 @@ -export * from './paymentcryptography.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-pcaconnectorad/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-pcaconnectorad/mixins.ts index da69c68ed949e..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-pcaconnectorad/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-pcaconnectorad/mixins.ts @@ -1 +1 @@ -export * from './pcaconnectorad.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-pcaconnectorscep/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-pcaconnectorscep/mixins.ts index 56b59c575eae5..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-pcaconnectorscep/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-pcaconnectorscep/mixins.ts @@ -1 +1 @@ -export * from './pcaconnectorscep.generated'; +export * from './cfn-props-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 index be0ea74d69fbf..44c216ff3f090 100644 --- 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 './pcs.generated'; +export * from './cfn-props-mixins.generated'; +export * from './logs-delivery-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-personalize/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-personalize/mixins.ts index e6a464b5ceedd..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-personalize/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-personalize/mixins.ts @@ -1 +1 @@ -export * from './personalize.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-pinpoint/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-pinpoint/mixins.ts index ef01795545636..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-pinpoint/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-pinpoint/mixins.ts @@ -1 +1 @@ -export * from './pinpoint.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-pinpointemail/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-pinpointemail/mixins.ts index d4a22e11ce1a1..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-pinpointemail/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-pinpointemail/mixins.ts @@ -1 +1 @@ -export * from './pinpointemail.generated'; +export * from './cfn-props-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 index 385803147cbcf..44c216ff3f090 100644 --- 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 './pipes.generated'; +export * from './cfn-props-mixins.generated'; +export * from './logs-delivery-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-proton/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-proton/mixins.ts index 50a566a6de70c..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-proton/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-proton/mixins.ts @@ -1 +1 @@ -export * from './proton.generated'; +export * from './cfn-props-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 index de225a2e11a09..44c216ff3f090 100644 --- 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 './qbusiness.generated'; +export * from './cfn-props-mixins.generated'; +export * from './logs-delivery-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-qldb/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-qldb/mixins.ts index db10893129e41..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-qldb/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-qldb/mixins.ts @@ -1 +1 @@ -export * from './qldb.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-quicksight/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-quicksight/mixins.ts index d3a04c94ff285..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-quicksight/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-quicksight/mixins.ts @@ -1 +1 @@ -export * from './quicksight.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-ram/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-ram/mixins.ts index fb0e91245c42b..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-ram/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-ram/mixins.ts @@ -1 +1 @@ -export * from './ram.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-rbin/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-rbin/mixins.ts index b37844e3042db..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-rbin/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-rbin/mixins.ts @@ -1 +1 @@ -export * from './rbin.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-rds/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-rds/mixins.ts index e95dbb073e215..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-rds/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-rds/mixins.ts @@ -1 +1 @@ -export * from './rds.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-redshift/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-redshift/mixins.ts index 2de6e0de40b22..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-redshift/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-redshift/mixins.ts @@ -1 +1 @@ -export * from './redshift.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-redshiftserverless/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-redshiftserverless/mixins.ts index d3ab0e825468e..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-redshiftserverless/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-redshiftserverless/mixins.ts @@ -1 +1 @@ -export * from './redshiftserverless.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-refactorspaces/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-refactorspaces/mixins.ts index 3457998a20ead..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-refactorspaces/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-refactorspaces/mixins.ts @@ -1 +1 @@ -export * from './refactorspaces.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-rekognition/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-rekognition/mixins.ts index c0cd7c31b6b9f..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-rekognition/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-rekognition/mixins.ts @@ -1 +1 @@ -export * from './rekognition.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-resiliencehub/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-resiliencehub/mixins.ts index 576d28f6b2ef6..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-resiliencehub/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-resiliencehub/mixins.ts @@ -1 +1 @@ -export * from './resiliencehub.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-resourceexplorer2/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-resourceexplorer2/mixins.ts index c71a9edf3800c..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-resourceexplorer2/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-resourceexplorer2/mixins.ts @@ -1 +1 @@ -export * from './resourceexplorer2.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-resourcegroups/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-resourcegroups/mixins.ts index 39a1899e8aad1..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-resourcegroups/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-resourcegroups/mixins.ts @@ -1 +1 @@ -export * from './resourcegroups.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-robomaker/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-robomaker/mixins.ts index b1041a9ee3a4d..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-robomaker/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-robomaker/mixins.ts @@ -1 +1 @@ -export * from './robomaker.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-rolesanywhere/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-rolesanywhere/mixins.ts index b61283c14c972..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-rolesanywhere/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-rolesanywhere/mixins.ts @@ -1 +1 @@ -export * from './rolesanywhere.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-route53/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-route53/mixins.ts index 31853a7539d88..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-route53/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-route53/mixins.ts @@ -1 +1 @@ -export * from './route53.generated'; +export * from './cfn-props-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 index 516a2b36b5cf2..44c216ff3f090 100644 --- 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 './route53profiles.generated'; +export * from './cfn-props-mixins.generated'; +export * from './logs-delivery-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-route53recoverycontrol/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-route53recoverycontrol/mixins.ts index 42e0bbaf49daa..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-route53recoverycontrol/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-route53recoverycontrol/mixins.ts @@ -1 +1 @@ -export * from './route53recoverycontrol.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-route53recoveryreadiness/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-route53recoveryreadiness/mixins.ts index 788093e8d9300..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-route53recoveryreadiness/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-route53recoveryreadiness/mixins.ts @@ -1 +1 @@ -export * from './route53recoveryreadiness.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-route53resolver/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-route53resolver/mixins.ts index 508279a186ad9..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-route53resolver/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-route53resolver/mixins.ts @@ -1 +1 @@ -export * from './route53resolver.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-rtbfabric/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-rtbfabric/mixins.ts index 3e33f6331f651..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-rtbfabric/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-rtbfabric/mixins.ts @@ -1 +1 @@ -export * from './rtbfabric.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-rum/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-rum/mixins.ts index 8ada98b4ec515..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-rum/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-rum/mixins.ts @@ -1 +1 @@ -export * from './rum.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-s3/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-s3/mixins.ts index eb5194a9a4b37..e55cebf1ac8f5 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-s3/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-s3/mixins.ts @@ -1,2 +1,2 @@ export * from './bucket'; -export * from './s3.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-s3express/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-s3express/mixins.ts index 39a097bee88c7..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-s3express/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-s3express/mixins.ts @@ -1 +1 @@ -export * from './s3express.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-s3objectlambda/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-s3objectlambda/mixins.ts index 19c2d73f7be8f..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-s3objectlambda/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-s3objectlambda/mixins.ts @@ -1 +1 @@ -export * from './s3objectlambda.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-s3outposts/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-s3outposts/mixins.ts index 3f9efc4d0607a..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-s3outposts/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-s3outposts/mixins.ts @@ -1 +1 @@ -export * from './s3outposts.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-s3tables/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-s3tables/mixins.ts index bb8334b9a878f..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-s3tables/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-s3tables/mixins.ts @@ -1 +1 @@ -export * from './s3tables.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-s3vectors/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-s3vectors/mixins.ts index 704fec9e9ff78..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-s3vectors/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-s3vectors/mixins.ts @@ -1 +1 @@ -export * from './s3vectors.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-sagemaker/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-sagemaker/mixins.ts index 04b2dc3a00d22..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-sagemaker/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-sagemaker/mixins.ts @@ -1 +1 @@ -export * from './sagemaker.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-sam/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-sam/mixins.ts index 185ada47b693e..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-sam/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-sam/mixins.ts @@ -1 +1 @@ -export * from './sam.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-scheduler/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-scheduler/mixins.ts index 7efa6ad19129c..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-scheduler/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-scheduler/mixins.ts @@ -1 +1 @@ -export * from './scheduler.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-sdb/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-sdb/mixins.ts index 1b370ed18b4ba..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-sdb/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-sdb/mixins.ts @@ -1 +1 @@ -export * from './sdb.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-secretsmanager/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-secretsmanager/mixins.ts index 0417f7127767e..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-secretsmanager/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-secretsmanager/mixins.ts @@ -1 +1 @@ -export * from './secretsmanager.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-securityhub/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-securityhub/mixins.ts index 4287d1e8bed1a..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-securityhub/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-securityhub/mixins.ts @@ -1 +1 @@ -export * from './securityhub.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-securitylake/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-securitylake/mixins.ts index debfb572d6626..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-securitylake/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-securitylake/mixins.ts @@ -1 +1 @@ -export * from './securitylake.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-servicecatalog/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-servicecatalog/mixins.ts index 16ec4e95146cc..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-servicecatalog/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-servicecatalog/mixins.ts @@ -1 +1 @@ -export * from './servicecatalog.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-servicecatalogappregistry/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-servicecatalogappregistry/mixins.ts index a844a7cc5f956..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-servicecatalogappregistry/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-servicecatalogappregistry/mixins.ts @@ -1 +1 @@ -export * from './servicecatalogappregistry.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-servicediscovery/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-servicediscovery/mixins.ts index 8596a905f5bbc..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-servicediscovery/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-servicediscovery/mixins.ts @@ -1 +1 @@ -export * from './servicediscovery.generated'; +export * from './cfn-props-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 index aeafcfd0e0b30..44c216ff3f090 100644 --- 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 './ses.generated'; +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 index d6b4d6ddb01de..44c216ff3f090 100644 --- 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 './shield.generated'; +export * from './cfn-props-mixins.generated'; +export * from './logs-delivery-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-signer/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-signer/mixins.ts index be837fdeadbae..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-signer/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-signer/mixins.ts @@ -1 +1 @@ -export * from './signer.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-simspaceweaver/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-simspaceweaver/mixins.ts index 6fe6f221a01d1..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-simspaceweaver/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-simspaceweaver/mixins.ts @@ -1 +1 @@ -export * from './simspaceweaver.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-smsvoice/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-smsvoice/mixins.ts index 43b5646381977..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-smsvoice/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-smsvoice/mixins.ts @@ -1 +1 @@ -export * from './smsvoice.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-sns/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-sns/mixins.ts index 5e9bf4ec3db18..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-sns/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-sns/mixins.ts @@ -1 +1 @@ -export * from './sns.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-sqs/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-sqs/mixins.ts index a1d2eb1ebd9f4..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-sqs/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-sqs/mixins.ts @@ -1 +1 @@ -export * from './sqs.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-ssm/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-ssm/mixins.ts index 2b04992486c2c..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-ssm/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-ssm/mixins.ts @@ -1 +1 @@ -export * from './ssm.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-ssmcontacts/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-ssmcontacts/mixins.ts index d70b087730016..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-ssmcontacts/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-ssmcontacts/mixins.ts @@ -1 +1 @@ -export * from './ssmcontacts.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-ssmguiconnect/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-ssmguiconnect/mixins.ts index 0fd920f381332..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-ssmguiconnect/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-ssmguiconnect/mixins.ts @@ -1 +1 @@ -export * from './ssmguiconnect.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-ssmincidents/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-ssmincidents/mixins.ts index d61865737b401..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-ssmincidents/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-ssmincidents/mixins.ts @@ -1 +1 @@ -export * from './ssmincidents.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-ssmquicksetup/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-ssmquicksetup/mixins.ts index 46bcada6ce9a9..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-ssmquicksetup/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-ssmquicksetup/mixins.ts @@ -1 +1 @@ -export * from './ssmquicksetup.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-sso/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-sso/mixins.ts index def29d390d292..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-sso/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-sso/mixins.ts @@ -1 +1 @@ -export * from './sso.generated'; +export * from './cfn-props-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 index 0e33f2985b028..44c216ff3f090 100644 --- 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 './stepfunctions.generated'; +export * from './cfn-props-mixins.generated'; +export * from './logs-delivery-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-supportapp/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-supportapp/mixins.ts index dde3c5e2215b6..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-supportapp/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-supportapp/mixins.ts @@ -1 +1 @@ -export * from './supportapp.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-synthetics/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-synthetics/mixins.ts index 89b7e18d1510f..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-synthetics/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-synthetics/mixins.ts @@ -1 +1 @@ -export * from './synthetics.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-systemsmanagersap/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-systemsmanagersap/mixins.ts index 0169815b2e9b9..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-systemsmanagersap/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-systemsmanagersap/mixins.ts @@ -1 +1 @@ -export * from './systemsmanagersap.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-timestream/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-timestream/mixins.ts index 81e6ea6113b8f..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-timestream/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-timestream/mixins.ts @@ -1 +1 @@ -export * from './timestream.generated'; +export * from './cfn-props-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 index 0bb5b1040abe1..44c216ff3f090 100644 --- 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 './transfer.generated'; +export * from './cfn-props-mixins.generated'; +export * from './logs-delivery-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-verifiedpermissions/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-verifiedpermissions/mixins.ts index 531e46d2122e1..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-verifiedpermissions/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-verifiedpermissions/mixins.ts @@ -1 +1 @@ -export * from './verifiedpermissions.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-voiceid/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-voiceid/mixins.ts index 6ebded4252bd0..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-voiceid/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-voiceid/mixins.ts @@ -1 +1 @@ -export * from './voiceid.generated'; +export * from './cfn-props-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 index 5fdb2a5c43605..44c216ff3f090 100644 --- 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 './vpclattice.generated'; +export * from './cfn-props-mixins.generated'; +export * from './logs-delivery-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-waf/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-waf/mixins.ts index 8c9362fc3a2b4..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-waf/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-waf/mixins.ts @@ -1 +1 @@ -export * from './waf.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-wafregional/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-wafregional/mixins.ts index 9fcf2192a3160..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-wafregional/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-wafregional/mixins.ts @@ -1 +1 @@ -export * from './wafregional.generated'; +export * from './cfn-props-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 index 14b3104301675..44c216ff3f090 100644 --- 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 './wafv2.generated'; +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 index 46ade5196bdcb..44c216ff3f090 100644 --- 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 './wisdom.generated'; +export * from './cfn-props-mixins.generated'; +export * from './logs-delivery-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-workspaces/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-workspaces/mixins.ts index cf71a58328f76..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-workspaces/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-workspaces/mixins.ts @@ -1 +1 @@ -export * from './workspaces.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-workspacesinstances/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-workspacesinstances/mixins.ts index 4111db783101d..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-workspacesinstances/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-workspacesinstances/mixins.ts @@ -1 +1 @@ -export * from './workspacesinstances.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-workspacesthinclient/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-workspacesthinclient/mixins.ts index 0d9630c5cdef1..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-workspacesthinclient/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-workspacesthinclient/mixins.ts @@ -1 +1 @@ -export * from './workspacesthinclient.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-workspacesweb/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-workspacesweb/mixins.ts index 41bd9175cfe24..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-workspacesweb/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-workspacesweb/mixins.ts @@ -1 +1 @@ -export * from './workspacesweb.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-xray/index.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-xray/index.ts index 3bf03c7b55acd..a3d81d506527a 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-xray/index.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-xray/index.ts @@ -1,2 +1 @@ export * as mixins from './mixins'; -export * from './policy'; diff --git a/packages/@aws-cdk/mixins-preview/lib/services/aws-xray/mixins.ts b/packages/@aws-cdk/mixins-preview/lib/services/aws-xray/mixins.ts index f59446973a836..6d0a7c5045bf1 100644 --- a/packages/@aws-cdk/mixins-preview/lib/services/aws-xray/mixins.ts +++ b/packages/@aws-cdk/mixins-preview/lib/services/aws-xray/mixins.ts @@ -1 +1 @@ -export * from './xray.generated'; +export * from './cfn-props-mixins.generated'; diff --git a/packages/@aws-cdk/mixins-preview/package.json b/packages/@aws-cdk/mixins-preview/package.json index a9fb3cb757776..8eff47983faf1 100644 --- a/packages/@aws-cdk/mixins-preview/package.json +++ b/packages/@aws-cdk/mixins-preview/package.json @@ -653,6 +653,7 @@ "announce": false }, "cdk-build": { + "compressAssembly": true, "pre": [ "./scripts/airlift-custom-resource-handlers.sh" ] diff --git a/packages/@aws-cdk/mixins-preview/rosetta/default.ts-fixture b/packages/@aws-cdk/mixins-preview/rosetta/default.ts-fixture index d69cc7826256d..277d44c605ba6 100644 --- a/packages/@aws-cdk/mixins-preview/rosetta/default.ts-fixture +++ b/packages/@aws-cdk/mixins-preview/rosetta/default.ts-fixture @@ -3,6 +3,8 @@ 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 * as origins from 'aws-cdk-lib/aws-cloudfront-origins'; 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/spec2mixins/config.ts b/packages/@aws-cdk/mixins-preview/scripts/config.ts similarity index 100% rename from packages/@aws-cdk/mixins-preview/scripts/spec2mixins/config.ts rename to packages/@aws-cdk/mixins-preview/scripts/config.ts diff --git a/packages/@aws-cdk/mixins-preview/scripts/gen.ts b/packages/@aws-cdk/mixins-preview/scripts/gen.ts index ef7083b6b3938..9b5a65036cc51 100644 --- a/packages/@aws-cdk/mixins-preview/scripts/gen.ts +++ b/packages/@aws-cdk/mixins-preview/scripts/gen.ts @@ -1,8 +1,10 @@ -import { generateAll } 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'; import type { ModuleMap, ModuleMapEntry } from '@aws-cdk/spec2cdk/lib/module-topology'; +import type { ModuleDefinition } from '@aws-cdk/pkglint'; main().catch(e => { // eslint-disable-next-line no-console @@ -15,14 +17,35 @@ async function main() { const pkgPath = path.join(__dirname, '..'); const outputPath = path.join(pkgPath, 'lib', 'services'); - const moduleMap = await generateAll({ - outputPath: outputPath, - }); + const moduleMaps = [ + await generateCfnPropsMixins({ outputPath }), + await generateLogsDeliveryMixins({ outputPath }), + ]; + + const moduleMap = mergeModuleMaps(...moduleMaps); await submodules(moduleMap, outputPath); await updateExportsAndEntryPoints(moduleMap, pkgPath); } +function mergeModuleMaps(...maps: ModuleMap[]): ModuleMap { + const merged: ModuleMap = {}; + for (const map of maps) { + for (const [name, entry] of Object.entries(map)) { + if (!merged[name]) { + merged[name] = entry; + } else { + merged[name] = { + ...entry, + files: [...new Set([...merged[name].files, ...entry.files])], + resources: { ...merged[name].resources, ...entry.resources }, + }; + } + } + } + return merged; +} + async function updateExportsAndEntryPoints(modules: ModuleMap, pkgPath: string) { const servicesIndexFilePath = path.join(pkgPath, 'lib', 'services', 'index.ts'); const serviceIndexExports = new Array(); @@ -30,26 +53,36 @@ async function updateExportsAndEntryPoints(modules: ModuleMap, pkgPath: string) const pkgJsonPath = path.join(pkgPath, 'package.json'); const pkgJson = JSON.parse((await fs.readFile(pkgJsonPath)).toString()); + // Clean up old service exports, keep only non-service exports + const newExports: Record = {}; + for (const [key, value] of Object.entries(pkgJson.exports)) { + if (!key.startsWith('./aws-') && !key.startsWith('./alexa-')) { + newExports[key] = value as string; + } + } + for (const moduleName of Object.keys(modules)) { const moduleConfig = { name: moduleName, submodule: moduleName.replace(/-/g, '_'), }; + // @aws-cdk/mixins-preview/aws_s3 => ./lib/services/aws-s3/index.js + const indexExportName = `./${moduleConfig.submodule}`; + newExports[indexExportName] = `./lib/services/${moduleConfig.name}/index.js`; + // @aws-cdk/mixins-preview/aws-s3 => `export * as aws_s3 from './aws-s3';` if (!serviceIndexExports.find(e => e.includes(moduleConfig.name))) { serviceIndexExports.push(`export * as ${moduleConfig.submodule} from './${moduleConfig.name}';`); } - // @aws-cdk/mixins-preview/aws-s3 => ./lib/services/aws-s3/index.js - pkgJson.exports[`./${moduleConfig.submodule}`] ??= `./lib/services/${moduleConfig.name}/index.js`; - - // @aws-cdk/mixins-preview/aws-s3/mixins => ./lib/services/aws-s3/mixins.js - pkgJson.exports[`./${moduleConfig.submodule}/mixins`] ??= `./lib/services/${moduleConfig.name}/mixins.js`; + // @aws-cdk/mixins-preview/aws_s3/mixins => ./lib/services/aws-s3/mixins.js + const mixinsExportName = `./${moduleConfig.submodule}/mixins`; + newExports[mixinsExportName] = `./lib/services/${moduleConfig.name}/mixins.js`; } // sort exports - pkgJson.exports = Object.fromEntries(Object.entries(pkgJson.exports).sort(([e1], [e2]) => e1.localeCompare(e2))); + pkgJson.exports = Object.fromEntries(Object.entries(newExports).sort(([e1], [e2]) => e1.localeCompare(e2))); // package.json await fs.writeFile(pkgJsonPath, JSON.stringify(pkgJson, null, 2) + '\n'); @@ -73,83 +106,87 @@ async function ensureSubmodule(submodule: ModuleMapEntry, outPath: string) { } // services//index.ts - // This index might contain hand-written exports => ensure they are preserved - { - const subModuleIndex = path.join(modulePath, 'index.ts'); - const subModuleIndexExports = new Array(); - if (existsSync(subModuleIndex)) { - subModuleIndexExports.push(...(await fs.readFile(subModuleIndex)).toString().split('\n').filter(Boolean)); - } + // These exports make submodules out of 'mixins.ts' + const subModuleIndex = path.join(modulePath, 'index.ts'); + const indexLines: string[] = []; - const mixinsExportStmt = 'export * as mixins from \'./mixins\';'; - if (!subModuleIndexExports.find(e => e.includes(mixinsExportStmt))) { - subModuleIndexExports.push(mixinsExportStmt); - } + indexLines.push('export * as mixins from \'./mixins\';'); - await fs.writeFile(subModuleIndex, subModuleIndexExports.sort().join('\n') + '\n'); - } + // This file may contain handwritten lines, preserve. + await ensureFileContains(subModuleIndex, indexLines); + await writeJsiiModuleMetadata(subModuleIndex, submodule.definition); // services//mixins.ts - // This index might contain hand-written mixins => ensure they are preserved - { - const mixinsIndex = path.join(modulePath, 'mixins.ts'); - const mixinsExports = new Array(); - if (existsSync(mixinsIndex)) { - mixinsExports.push(...(await fs.readFile(mixinsIndex)).toString().split('\n').filter(Boolean)); - } + // This file exists so people can import it directly in JavaScript with a reasonable name: + // + // ``` + // import { X } from '@aws-cdk/mixins-preview/aws-s3/mixins'; + // ``` + // 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'); + 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\';'); + } - for (const file of submodule.files) { - const f = path.relative(modulePath, path.join(outPath, file)); - const loc = `./${f.replace('.ts', '')}`; - if (!mixinsExports.find(e => e.includes(loc))) { - mixinsExports.push(`export * from '${loc}';`); - } - } + await ensureFileContains(mixinsModuleFile, mixinsIndexLines); + await writeJsiiModuleMetadata(mixinsModuleFile, submodule.definition, 'mixins'); +} - await fs.writeFile(mixinsIndex, mixinsExports.sort().join('\n') + '\n'); - } +async function writeJsiiModuleMetadata(moduleFile: string, moduleDef: ModuleDefinition, namespaceLc: string = '') { + const base = path.basename(moduleFile, '.ts'); + const rcFile = base === 'index' + ? path.join(path.dirname(moduleFile), '.jsiirc.json') + : path.join(path.dirname(moduleFile), `.${base}.jsiirc.json`); + + const namespaceUc = ucfirst(namespaceLc ?? ''); - // .jsiirc.json - { - const subModuleJsiiRc = path.join(modulePath, '.jsiirc.json'); - const jsiirc = { - targets: { - java: { - package: submodule.definition.javaPackage, - }, - dotnet: { - package: submodule.definition.dotnetPackage, - }, - python: { - module: submodule.definition.pythonModuleName, - }, - // go: { - // packageName: `mixins${submodule.definition.moduleName}`.replace(/[^a-z0-9.]/gi, ''), - // }, + const mixinsJsiirc = { + targets: { + java: { + package: join(moduleDef.javaPackage, '.', namespaceLc), }, - }; - await fs.writeFile(subModuleJsiiRc, JSON.stringify(jsiirc, null, 2) + '\n');} - - // .mixins.jsiirc.json - { - const mixinsJsiiRc = path.join(modulePath, '.mixins.jsiirc.json'); - const mixinsJsiirc = { - targets: { - java: { - package: `${submodule.definition.javaPackage}.mixins`, - }, - dotnet: { - package: `${submodule.definition.dotnetPackage}.Mixins`, - }, - python: { - module: `${submodule.definition.pythonModuleName}.mixins`, - }, - go: { - packageName: `mixins${submodule.definition.moduleName}`.replace(/[^a-z0-9.]/gi, ''), - }, + dotnet: { + package: join(moduleDef.dotnetPackage, '.', namespaceUc), }, - }; - await fs.writeFile(mixinsJsiiRc, JSON.stringify(mixinsJsiirc, null, 2) + '\n'); - } + python: { + module: join(moduleDef.pythonModuleName, '.', namespaceLc), + }, + go: { + packageName: `preview${moduleDef.moduleName}${namespaceLc}`.replace(/[^a-z0-9.]/gi, ''), + }, + }, + }; + await fs.writeFile(rcFile, JSON.stringify(mixinsJsiirc, null, 2) + '\n'); } +function ucfirst(x: string) { + return x.charAt(0).toUpperCase() + x.slice(1); +} + +function join(a: string, sep: string, b: string) { + return b ? `${a}${sep}${b}` : a; +} + +async function ensureFileContains(fileName: string, lines: string[]) { + let currentLines = new Array(); + + // This index might contain hand-written mixins => ensure they are preserved + if (existsSync(fileName)) { + // load lines from file + currentLines.push(...(await fs.readFile(fileName, 'utf-8')).split('\n') + .filter(l => !l.includes('.generated')) // remove all generated files, they are added later anyway + .filter(Boolean)); + } + + for (const line of lines) { + if (!currentLines.includes(line)) { + currentLines.push(line); + } + } + + await fs.writeFile(fileName, currentLines.sort().join('\n') + '\n'); +} diff --git a/packages/@aws-cdk/mixins-preview/scripts/spec2logs/builder.ts b/packages/@aws-cdk/mixins-preview/scripts/spec2logs/builder.ts new file mode 100644 index 0000000000000..110d2fd1d71a0 --- /dev/null +++ b/packages/@aws-cdk/mixins-preview/scripts/spec2logs/builder.ts @@ -0,0 +1,398 @@ +import type { Resource, Service, SpecDatabase } from '@aws-cdk/service-spec-types'; +import { naming, util } from '@aws-cdk/spec2cdk'; +import { CDK_CORE, CONSTRUCTS } from '@aws-cdk/spec2cdk/lib/cdk/cdk'; +import type { Method } from '@cdklabs/typewriter'; +import { Module, ExternalModule, ClassType, Stability, Type, expr, stmt, ThingSymbol, $this, CallableProxy, NewExpression, $E } from '@cdklabs/typewriter'; +import { CDK_AWS_LOGS, MIXINS_LOGS_DELIVERY, REF_INTERFACES } from './helpers'; +import type { ServiceSubmoduleProps, SelectiveImport, LocatedModule } from '@aws-cdk/spec2cdk/lib/cdk/service-submodule'; +import { BaseServiceSubmodule, relativeImportPath } from '@aws-cdk/spec2cdk/lib/cdk/service-submodule'; +import type { AddServiceProps, LibraryBuilderProps } from '@aws-cdk/spec2cdk/lib/cdk/library-builder'; +import { LibraryBuilder } from '@aws-cdk/spec2cdk/lib/cdk/library-builder'; +import { MIXINS_CORE } from '../spec2mixins/helpers'; + +// we cannot currently get an Arn for these +const EXCLUDE: string[] = [ + 'AWS::BedrockAgentCore::Runtime', + 'AWS::ElastiCache::CacheCluster', + 'AWS::Grafana::Workspace', + 'AWS::RUM::AppMonitor', + 'AWS::SageMaker::Workteam', +]; + +class LogsDeliveryBuilderServiceModule extends BaseServiceSubmodule { + public readonly constructLibModule: ExternalModule; + + public constructor(props: ServiceSubmoduleProps) { + super(props); + this.constructLibModule = new ExternalModule(`aws-cdk-lib/${props.submoduleName}`); + } +} + +export interface LogsDeliveryBuilderProps extends LibraryBuilderProps { +} + +export class LogsDeliveryBuilder extends LibraryBuilder { + private readonly filePattern: string; + + public constructor(props: LogsDeliveryBuilderProps) { + super(props); + this.filePattern = '%moduleName%/logs-delivery-mixins.generated.ts'; + } + + protected createServiceSubmodule(service: Service, submoduleName: string): LogsDeliveryBuilderServiceModule { + return new LogsDeliveryBuilderServiceModule({ + submoduleName, + service, + }); + } + + protected addResourceToSubmodule(submodule: LogsDeliveryBuilderServiceModule, resource: Resource, _props?: AddServiceProps): void { + if (resource.vendedLogs && !EXCLUDE.includes(resource.cloudFormationType)) { + const service = this.db.incoming('hasResource', resource).only().entity; + const logsModule = this.obtainLogsDeliveryModule(submodule, service); + + const vendedLogsMixin = new LogsDelivery(logsModule.module, this.db, resource, submodule.constructLibModule); + submodule.registerResource(`${resource.cloudFormationType}VendedLogs`, vendedLogsMixin.mixin); + + vendedLogsMixin.build(); + + submodule.registerSelectiveImports(...vendedLogsMixin.imports); + } + } + + private obtainLogsDeliveryModule(submodule: LogsDeliveryBuilderServiceModule, service: Service): LocatedModule { + const mod = this.createLogsDeliveryModule(submodule, service); + if (this.modules.has(mod.filePath)) { + return { + module: this.modules.get(mod.filePath)!, + filePath: mod.filePath, + }; + } + + return this.rememberModule(mod); + } + + private createLogsDeliveryModule(submodule: LogsDeliveryBuilderServiceModule, service: Service): LocatedModule { + const module = new Module(`@aws-cdk/mixins-preview/${submodule.submoduleName}/logs`); + const filePath = this.pathFor(this.filePattern, submodule.submoduleName, service); + + submodule.registerModule({ module, filePath }); + + CDK_CORE.import(module, 'cdk'); + REF_INTERFACES.import(module, 'interfaces'); + CONSTRUCTS.import(module, 'constructs'); + CDK_AWS_LOGS.import(module, 'logs'); + MIXINS_CORE.import(module, 'core', { fromLocation: relativeImportPath(filePath, '../core') }); + MIXINS_LOGS_DELIVERY.import(module, 'logsDelivery', { fromLocation: '../aws-logs/logs-delivery' }); + submodule.constructLibModule.import(module, 'service'); + + return { module, filePath }; + } +} + +class LogsDelivery { + public scope: Module; + public readonly imports = new Array(); + public readonly mixin: LogsMixin; + private readonly helpers: LogsHelper[] = []; + + constructor( + scope: Module, + public readonly db: SpecDatabase, + private readonly resource: Resource, + constructLibModule: ExternalModule, + ) { + this.scope = scope; + + for (const logType of this.resource.vendedLogs?.logTypes || []) { + const logClass = new LogsHelper(this.scope, + `${naming.classNameFromResource(this.resource)}${logType.split('_').map(word => word.charAt(0) + word.slice(1).toLowerCase()).join('')}`, + this.resource, logType, + ); + this.helpers.push(logClass); + } + + this.mixin = new LogsMixin(scope, db, resource, constructLibModule); + } + + public build() { + this.mixin.build(); + for (const helper of this.helpers) { + helper.build(this.mixin); + } + } +} + +class LogsHelper extends ClassType { + private readonly resource: Resource; + private readonly logType: string; + + constructor( + scope: Module, + name: string, + resource: Resource, + logType: string, + ) { + super(scope, { + export: true, + name: name, + docs: { + summary: `Builder for ${naming.classNameFromResource(resource)}LogsMixin to generate ${logType} for ${naming.classNameFromResource(resource)}`, + stability: Stability.External, + docTags: { + cloudformationResource: resource.cloudFormationType, + logType: logType, + }, + }, + }); + this.resource = resource; + this.logType = logType; + } + + public build(mixin: LogsMixin) { + for (const dest of this.resource.vendedLogs!.destinations) { + if ((dest === 'XRAY' && this.logType === 'TRACES') || (dest !== 'XRAY' && this.logType !== 'TRACES')) { + switch (dest) { + case 'S3': + const toS3 = this.addMethod({ + name: `to${dest}`, + returnType: mixin.type, + docs: { + summary: 'Send logs to an S3 Bucket', + }, + }); + + const paramS3 = toS3.addParameter({ + name: 'bucket', + type: REF_INTERFACES.IBucketRef, + }); + + const permissions = this.resource.vendedLogs!.permissionsVersion === 'V2' ? MIXINS_LOGS_DELIVERY.S3LogsDeliveryPermissionsVersion.V2 : MIXINS_LOGS_DELIVERY.S3LogsDeliveryPermissionsVersion.V1; + toS3.addBody(stmt.block( + stmt.ret( + mixin.newInstance(expr.str(this.logType), new NewExpression(MIXINS_LOGS_DELIVERY.S3LogsDelivery, paramS3, + expr.object({ permissionsVersion: permissions }))), + ), + )); + break; + case 'CWL': + const toCWL = this.addMethod({ + name: 'toLogGroup', + returnType: mixin.type, + docs: { + summary: 'Send logs to a CloudWatch Log Group', + }, + }); + + const paramCWL = toCWL.addParameter({ + name: 'logGroup', + type: REF_INTERFACES.ILogGroupRef, + }); + + toCWL.addBody(stmt.block( + stmt.ret( + mixin.newInstance(expr.str(this.logType), new NewExpression(MIXINS_LOGS_DELIVERY.LogGroupLogsDelivery, paramCWL)), + ), + )); + break; + case 'FH': + const toFH = this.addMethod({ + name: 'toFirehose', + returnType: mixin.type, + docs: { + summary: 'Send logs to a Firehose Delivery Stream', + }, + }); + + const paramFH = toFH.addParameter({ + name: 'deliveryStream', + type: REF_INTERFACES.IDeliveryStreamRef, + }); + + toFH.addBody(stmt.block( + stmt.ret( + mixin.newInstance(expr.str(this.logType), new NewExpression(MIXINS_LOGS_DELIVERY.FirehoseLogsDelivery, paramFH)), + ), + )); + break; + default: + const toXRAY = this.addMethod({ + name: 'toXRay', + returnType: mixin.type, + docs: { + summary: 'Send traces to X-Ray', + }, + }); + + toXRAY.addBody(stmt.block( + stmt.ret( + mixin.newInstance(expr.str(this.logType), new NewExpression(MIXINS_LOGS_DELIVERY.XRayLogsDelivery)), + ), + )); + break; + } + } + } + + mixin.addProperty({ + name: this.logType, + type: this.type, + static: true, + immutable: true, + initializer: expr.directCode(`new ${this.name}()`), + }); + } +} + +class LogsMixin extends ClassType { + public readonly imports = new Array(); + private readonly resourceType: Type; + + constructor( + scope: Module, + public readonly db: SpecDatabase, + private readonly resource: Resource, + constructLibModule: ExternalModule, + ) { + super(scope, { + export: true, + name: `${naming.classNameFromResource(resource)}LogsMixin`, + implements: [MIXINS_CORE.IMixin], + extends: MIXINS_CORE.Mixin, + docs: { + summary: `Mixin to implement vended logs for ${resource.cloudFormationType}`, + ...util.splitDocumentation(resource.documentation), + stability: Stability.External, + docTags: { + cloudformationResource: resource.cloudFormationType, + mixin: 'true', + }, + see: naming.cloudFormationDocLink({ + resourceType: resource.cloudFormationType, + }), + }, + }); + + this.resourceType = Type.fromName(constructLibModule, naming.classNameFromResource(this.resource)); + } + + /** + * Build the elements of the VendedLogsMixin Class + */ + public build() { + this.makeConstructor(); + const supports = this.makeSupportsMethod(); + this.makeApplyToMethod(supports); + } + + private makeConstructor() { + this.addProperty({ + name: 'logType', + type: Type.STRING, + protected: true, + immutable: true, + }); + + this.addProperty({ + name: 'logDelivery', + type: MIXINS_LOGS_DELIVERY.ILogsDelivery, + protected: true, + immutable: true, + }); + + const init = this.addInitializer({ + docs: { + summary: `Create a mixin to enable vended logs for \`${this.resource.cloudFormationType}\`.`, + }, + }); + + const logType = init.addParameter({ + name: 'logType', + type: Type.STRING, + documentation: 'Type of logs that are getting vended', + }); + + const delivery = init.addParameter({ + name: 'logDelivery', + type: MIXINS_LOGS_DELIVERY.ILogsDelivery, + documentation: 'Object in charge of setting up the delivery destination and delivery connection', + }); + + init.addBody( + expr.sym(new ThingSymbol('super', this.scope)).call(), + stmt.assign($this.logType, logType), + stmt.assign($this.logDelivery, delivery), + ); + } + + private makeSupportsMethod(): Method { + const method = this.addMethod({ + name: 'supports', + returnType: Type.ambient(`construct is service.${this.resourceType.symbol}`), + docs: { + summary: 'Check if this mixin supports the given construct (has vendedLogs property)', + }, + }); + + const construct = method.addParameter({ + name: 'construct', + type: CONSTRUCTS.IConstruct, + }); + + method.addBody( + stmt.ret( + expr.binOp( + CallableProxy.fromName('CfnResource.isCfnResource', CDK_CORE).invoke(construct), + '&&', + expr.eq(expr.get(construct, 'cfnResourceType'), expr.lit(this.resource.cloudFormationType)), + ), + ), + ); + + return method; + } + + private makeApplyToMethod(supports: Method) { + const method = this.addMethod({ + name: 'applyTo', + returnType: CONSTRUCTS.IConstruct, + docs: { + summary: 'Apply vended logs configuration to the construct', + }, + }); + + const resource = method.addParameter({ + name: 'resource', + type: CONSTRUCTS.IConstruct, + }); + + const sourceArn = expr.ident('sourceArn'); + const arnBuilder = $E(expr.sym(this.resourceType.symbol!)).callMethod(`arnFor${this.resource.name}`, resource); + + const prefix = `${this.resource.name}Source-`; + const newCfnDeliverySource = CDK_AWS_LOGS.CfnDeliverySource.newInstance( + resource, + expr.strConcat(expr.str('CdkSource'), CDK_CORE.uniqueId(resource)), + expr.object({ + name: expr.strConcat(expr.str(prefix), CDK_CORE.uniqueResourceName(resource, expr.object({ + maxLength: expr.binOp(expr.num(60 - (prefix.length + 1)), '-', $this.logType.prop('length')), + })), expr.str('-'), $this.logType), + resourceArn: sourceArn, + logType: $this.logType, + }), + ); + const deliverySource = expr.ident('deliverySource'); + + method.addBody( + stmt + .if_(expr.not(CallableProxy.fromMethod(supports).invoke(resource))) + .then(stmt.block(stmt.ret(resource))), + + stmt.constVar(sourceArn, arnBuilder), + stmt.constVar(deliverySource, newCfnDeliverySource), + $this.logDelivery.callMethod('bind', resource, deliverySource, sourceArn), + + stmt.ret(resource), + ); + } +} diff --git a/packages/@aws-cdk/mixins-preview/scripts/spec2logs/generate.ts b/packages/@aws-cdk/mixins-preview/scripts/spec2logs/generate.ts new file mode 100644 index 0000000000000..67a07448db6fd --- /dev/null +++ b/packages/@aws-cdk/mixins-preview/scripts/spec2logs/generate.ts @@ -0,0 +1,44 @@ +import type { GenerateModuleMap, GenerateOptions as Spec2CdkOptions } from '@aws-cdk/spec2cdk'; +import { generate, loadPatchedSpec } from '@aws-cdk/spec2cdk'; +import { LogsDeliveryBuilder } from './builder'; +import { MIXINS_PREVIEW_BASE_NAMES } from '../config'; +import { loadModuleMap, type ModuleMap } from '@aws-cdk/spec2cdk/lib/module-topology'; + +type GenerateOptions = Pick, 'outputPath' | 'clearOutput' | 'debug'>; + +export async function generateAll(options: GenerateOptions): Promise { + const db = await loadPatchedSpec(); + const services = await db.all('service'); + const moduleMap: ModuleMap = loadModuleMap({ + packageBases: MIXINS_PREVIEW_BASE_NAMES, + }); + const moduleRequests: GenerateModuleMap = {}; + + // request all known services + for (const service of services) { + if (moduleMap[service.name]) { + moduleRequests[service.name] = { + services: [{ namespace: service.cloudFormationNamespace }], + }; + } + } + + const generated = await generate(moduleRequests, { + ...options, + db, + astBuilder: LogsDeliveryBuilder, + }); + + return Object.fromEntries(Object.entries(generated.modules).map(([moduleName, moduleInfo]) => [ + moduleName, + { + files: moduleInfo.outputFiles, + name: moduleName, + resources: moduleInfo.resources, + scopes: moduleMap[moduleName]?.scopes ?? [], + definition: moduleMap[moduleName]?.definition, + targets: moduleMap[moduleName]?.targets, + }, + ])); +} + diff --git a/packages/@aws-cdk/mixins-preview/scripts/spec2logs/helpers.ts b/packages/@aws-cdk/mixins-preview/scripts/spec2logs/helpers.ts new file mode 100644 index 0000000000000..8161f8dbd2a05 --- /dev/null +++ b/packages/@aws-cdk/mixins-preview/scripts/spec2logs/helpers.ts @@ -0,0 +1,24 @@ +import { Type, ExternalModule, $T } from '@cdklabs/typewriter'; + +class MixinsLogsDelivery extends ExternalModule { + public readonly S3LogsDelivery = Type.fromName(this, 'S3LogsDelivery'); + public readonly LogGroupLogsDelivery = Type.fromName(this, 'LogGroupLogsDelivery'); + public readonly FirehoseLogsDelivery = Type.fromName(this, 'FirehoseLogsDelivery'); + public readonly XRayLogsDelivery = Type.fromName(this, 'XRayLogsDelivery'); + public readonly ILogsDelivery = Type.fromName(this, 'ILogsDelivery'); + public readonly S3LogsDeliveryPermissionsVersion = $T(Type.fromName(this, 'S3LogsDeliveryPermissionsVersion')); +} + +class CdkRefInterfaces extends ExternalModule { + public readonly IBucketRef = Type.fromName(this, 'aws_s3.IBucketRef'); + public readonly ILogGroupRef = Type.fromName(this, 'aws_logs.ILogGroupRef'); + public readonly IDeliveryStreamRef = Type.fromName(this, 'aws_kinesisfirehose.IDeliveryStreamRef'); +} + +class CdkAwsLogs extends ExternalModule { + public readonly CfnDeliverySource = Type.fromName(this, 'CfnDeliverySource'); +} + +export const MIXINS_LOGS_DELIVERY = new MixinsLogsDelivery('@aws-cdk/mixins-preview/services/aws-logs'); +export const REF_INTERFACES = new CdkRefInterfaces('aws-cdk-lib/interfaces'); +export const CDK_AWS_LOGS = new CdkAwsLogs('aws-cdk-lib/aws-logs'); diff --git a/packages/@aws-cdk/mixins-preview/scripts/spec2logs/index.ts b/packages/@aws-cdk/mixins-preview/scripts/spec2logs/index.ts new file mode 100644 index 0000000000000..15f95c8631858 --- /dev/null +++ b/packages/@aws-cdk/mixins-preview/scripts/spec2logs/index.ts @@ -0,0 +1,2 @@ +export * from './builder'; +export * from './generate'; diff --git a/packages/@aws-cdk/mixins-preview/scripts/spec2mixins/builder.ts b/packages/@aws-cdk/mixins-preview/scripts/spec2mixins/builder.ts index 6d0019ec6ea27..8f9c07bf03755 100644 --- a/packages/@aws-cdk/mixins-preview/scripts/spec2mixins/builder.ts +++ b/packages/@aws-cdk/mixins-preview/scripts/spec2mixins/builder.ts @@ -5,7 +5,7 @@ import { ResourceDecider } from '@aws-cdk/spec2cdk/lib/cdk/resource-decider'; import { TypeConverter } from '@aws-cdk/spec2cdk/lib/cdk/type-converter'; import { RelationshipDecider } from '@aws-cdk/spec2cdk/lib/cdk/relationship-decider'; import type { Method } from '@cdklabs/typewriter'; -import { ExternalModule, Module, ClassType, Stability, StructType, Type, expr, stmt, $E, $T, ThingSymbol, $this, CallableProxy } from '@cdklabs/typewriter'; +import { ExternalModule, Module, ClassType, Stability, StructType, Type, expr, stmt, $T, ThingSymbol, $this, CallableProxy } from '@cdklabs/typewriter'; import { MIXINS_COMMON, MIXINS_CORE, MIXINS_UTILS } from './helpers'; import type { AddServiceProps, LibraryBuilderProps } from '@aws-cdk/spec2cdk/lib/cdk/library-builder'; import { LibraryBuilder } from '@aws-cdk/spec2cdk/lib/cdk/library-builder'; @@ -22,7 +22,6 @@ class MixinsServiceModule extends BaseServiceSubmodule { } export interface MixinsBuilderProps extends LibraryBuilderProps { - filePattern?: string; } export class MixinsBuilder extends LibraryBuilder { @@ -30,7 +29,7 @@ export class MixinsBuilder extends LibraryBuilder { public constructor(props: MixinsBuilderProps) { super(props); - this.filePattern = props.filePattern ?? '%moduleName%/%serviceShortName%.generated.ts'; + this.filePattern = '%moduleName%/cfn-props-mixins.generated.ts'; } protected createServiceSubmodule(service: Service, submoduleName: string): MixinsServiceModule { @@ -230,9 +229,9 @@ class L1PropsMixin extends ClassType { method.addBody( stmt.ret( expr.binOp( - $E(expr.sym(CDK_CORE.CfnResource.symbol!)).isCfnResource(construct), + CallableProxy.fromName('CfnResource.isCfnResource', CDK_CORE).invoke(construct), '&&', - expr.eq($E(construct).cfnResourceType, expr.lit(this.resource.cloudFormationType)), + expr.eq(expr.get(construct, 'cfnResourceType'), expr.lit(this.resource.cloudFormationType)), ), ), ); diff --git a/packages/@aws-cdk/mixins-preview/scripts/spec2mixins/generate.ts b/packages/@aws-cdk/mixins-preview/scripts/spec2mixins/generate.ts index cd799554132fd..5d408df6cb322 100644 --- a/packages/@aws-cdk/mixins-preview/scripts/spec2mixins/generate.ts +++ b/packages/@aws-cdk/mixins-preview/scripts/spec2mixins/generate.ts @@ -1,7 +1,7 @@ import type { GenerateModuleMap, GenerateOptions as Spec2CdkOptions } from '@aws-cdk/spec2cdk'; import { generate, loadPatchedSpec } from '@aws-cdk/spec2cdk'; import { MixinsBuilder } from './builder'; -import { MIXINS_PREVIEW_BASE_NAMES } from './config'; +import { MIXINS_PREVIEW_BASE_NAMES } from '../config'; import { loadModuleMap, type ModuleMap } from '@aws-cdk/spec2cdk/lib/module-topology'; type GenerateOptions = Pick, 'outputPath' | 'clearOutput' | 'debug'>; @@ -27,9 +27,6 @@ export async function generateAll(options: GenerateOptions): Promise ...options, db, astBuilder: MixinsBuilder, - builderProps: { - filePattern: '%moduleName%/%serviceShortName%.generated.ts', - }, }); return Object.fromEntries(Object.entries(generated.modules).map(([moduleName, moduleInfo]) => [ 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 new file mode 100644 index 0000000000000..3f4c87063a6e4 --- /dev/null +++ b/packages/@aws-cdk/mixins-preview/test/codegen/__snapshots__/logs-delivery.test.ts.snap @@ -0,0 +1,142 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`Logs Delivery Mixin for a resource 1`] = ` +"/* eslint-disable prettier/prettier, @stylistic/max-len */ +import * as cdk from "aws-cdk-lib/core"; +import * as interfaces from "aws-cdk-lib/interfaces"; +import * as constructs from "constructs"; +import * as logs from "aws-cdk-lib/aws-logs"; +import * as core from "../../core"; +import * as logsDelivery from "../aws-logs/logs-delivery"; +import * as service from "aws-cdk-lib/aws-some"; + +/** + * Builder for CfnThingLogsMixin to generate APPLICATION_LOGS for CfnThing + * + * @cloudformationResource AWS::Some::Resource + * @logType APPLICATION_LOGS + * @stability external + */ +export class CfnThingApplicationLogs { + /** + * Send logs to a CloudWatch Log Group + */ + public toLogGroup(logGroup: interfaces.aws_logs.ILogGroupRef): CfnThingLogsMixin { + { + return new CfnThingLogsMixin("APPLICATION_LOGS", new logsDelivery.LogGroupLogsDelivery(logGroup)); + } + } + + /** + * Send logs to a Firehose Delivery Stream + */ + public toFirehose(deliveryStream: interfaces.aws_kinesisfirehose.IDeliveryStreamRef): CfnThingLogsMixin { + { + return new CfnThingLogsMixin("APPLICATION_LOGS", new logsDelivery.FirehoseLogsDelivery(deliveryStream)); + } + } + + /** + * Send logs to an S3 Bucket + */ + public toS3(bucket: interfaces.aws_s3.IBucketRef): CfnThingLogsMixin { + { + return new CfnThingLogsMixin("APPLICATION_LOGS", new logsDelivery.S3LogsDelivery(bucket, { + permissionsVersion: logsDelivery.S3LogsDeliveryPermissionsVersion.V2 + })); + } + } +} + +/** + * Builder for CfnThingLogsMixin to generate ACCESS_LOGS for CfnThing + * + * @cloudformationResource AWS::Some::Resource + * @logType ACCESS_LOGS + * @stability external + */ +export class CfnThingAccessLogs { + /** + * Send logs to a CloudWatch Log Group + */ + public toLogGroup(logGroup: interfaces.aws_logs.ILogGroupRef): CfnThingLogsMixin { + { + return new CfnThingLogsMixin("ACCESS_LOGS", new logsDelivery.LogGroupLogsDelivery(logGroup)); + } + } + + /** + * Send logs to a Firehose Delivery Stream + */ + public toFirehose(deliveryStream: interfaces.aws_kinesisfirehose.IDeliveryStreamRef): CfnThingLogsMixin { + { + return new CfnThingLogsMixin("ACCESS_LOGS", new logsDelivery.FirehoseLogsDelivery(deliveryStream)); + } + } + + /** + * Send logs to an S3 Bucket + */ + public toS3(bucket: interfaces.aws_s3.IBucketRef): CfnThingLogsMixin { + { + return new CfnThingLogsMixin("ACCESS_LOGS", new logsDelivery.S3LogsDelivery(bucket, { + permissionsVersion: logsDelivery.S3LogsDeliveryPermissionsVersion.V2 + })); + } + } +} + +/** + * @cloudformationResource AWS::Some::Resource + * @mixin true + * @stability external + * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-some-resource.html + */ +export class CfnThingLogsMixin extends core.Mixin implements core.IMixin { + public static readonly APPLICATION_LOGS: CfnThingApplicationLogs = new CfnThingApplicationLogs(); + + public static readonly ACCESS_LOGS: CfnThingAccessLogs = new CfnThingAccessLogs(); + + protected readonly logType: string; + + protected readonly logDelivery: logsDelivery.ILogsDelivery; + + /** + * Create a mixin to enable vended logs for \`AWS::Some::Resource\`. + * + * @param logType Type of logs that are getting vended + * @param logDelivery Object in charge of setting up the delivery destination and delivery connection + */ + public constructor(logType: string, logDelivery: logsDelivery.ILogsDelivery) { + super(); + this.logType = logType; + this.logDelivery = logDelivery; + } + + /** + * Check if this mixin supports the given construct (has vendedLogs property) + */ + public supports(construct: constructs.IConstruct): construct is service.CfnThing { + return (cdk.CfnResource.isCfnResource(construct) && (construct.cfnResourceType === "AWS::Some::Resource")); + } + + /** + * Apply vended logs configuration to the construct + */ + public applyTo(resource: constructs.IConstruct): constructs.IConstruct { + if (!this.supports(resource)) { + return resource; + } + const sourceArn = service.CfnThing.arnForThing(resource); + const deliverySource = new logs.CfnDeliverySource(resource, "CdkSource" + cdk.Names.uniqueId(resource), { + name: "ThingSource-" + cdk.Names.uniqueResourceName(resource, { + maxLength: (47 - this.logType.length) + }) + "-" + this.logType, + resourceArn: sourceArn, + logType: this.logType + }); + this.logDelivery.bind(resource, deliverySource, sourceArn); + return resource; + } +}" +`; 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 new file mode 100644 index 0000000000000..9fc889a35a846 --- /dev/null +++ b/packages/@aws-cdk/mixins-preview/test/codegen/logs-delivery.test.ts @@ -0,0 +1,63 @@ +import type { Resource, Service, SpecDatabase } from '@aws-cdk/service-spec-types'; +import { emptyDatabase } from '@aws-cdk/service-spec-types'; +import { TypeScriptRenderer } from '@cdklabs/typewriter'; +import type { MixinsBuilderProps } from '../../scripts/spec2mixins'; +import { LogsDeliveryBuilder } from '../../scripts/spec2logs'; + +const renderer = new TypeScriptRenderer(); +let db: SpecDatabase; +let service: Service; + +beforeEach(async () => { + db = emptyDatabase(); + + service = db.allocate('service', { + name: 'aws-some', + shortName: 'some', + capitalized: 'Some', + cloudFormationNamespace: 'AWS::Some', + }); +}); + +test('Logs Delivery Mixin for a resource', () => { + // GIVEN + const resource = db.allocate('resource', { + name: 'Thing', + primaryIdentifier: ['Id'], + properties: { + Id: { + type: { type: 'string' }, + documentation: 'The identifier of the resource', + }, + }, + attributes: { + SomethingArn: { + type: { type: 'string' }, + documentation: 'The arn for something', + }, + }, + cloudFormationType: 'AWS::Some::Resource', + arnTemplate: 'arn:${Partition}:some:${Region}:${Account}:resource/${ResourceId}', + vendedLogs: { + permissionsVersion: 'V2', + logTypes: ['APPLICATION_LOGS', 'ACCESS_LOGS'], + destinations: ['CWL', 'FH', 'S3'], + }, + }); + db.link('hasResource', service, resource); + + // THEN + const foundResource = db.lookup('resource', 'cloudFormationType', 'equals', 'AWS::Some::Resource').only(); + + const module = moduleForResource(foundResource, { db }); + + const rendered = renderer.render(module); + + expect(rendered).toMatchSnapshot(); +}); + +function moduleForResource(resource: Resource, props: MixinsBuilderProps) { + const ast = new LogsDeliveryBuilder(props); + const info = ast.addResource(resource); + return info.locatedModules[0].module; +} 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 new file mode 100644 index 0000000000000..c8baa20e8111e --- /dev/null +++ b/packages/@aws-cdk/mixins-preview/test/services/aws-logs/integ.delivery-mixin.js.snapshot/DeliveryTestDefaultTestDeployAssert48416031.assets.json @@ -0,0 +1,20 @@ +{ + "version": "48.0.0", + "files": { + "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": { + "displayName": "DeliveryTestDefaultTestDeployAssert48416031 Template", + "source": { + "path": "DeliveryTestDefaultTestDeployAssert48416031.template.json", + "packaging": "file" + }, + "destinations": { + "current_account-current_region-d8d86b35": { + "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", + "objectKey": "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json", + "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" + } + } + } + }, + "dockerImages": {} +} \ No newline at end of file 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 new file mode 100644 index 0000000000000..ad9d0fb73d1dd --- /dev/null +++ b/packages/@aws-cdk/mixins-preview/test/services/aws-logs/integ.delivery-mixin.js.snapshot/DeliveryTestDefaultTestDeployAssert48416031.template.json @@ -0,0 +1,36 @@ +{ + "Parameters": { + "BootstrapVersion": { + "Type": "AWS::SSM::Parameter::Value", + "Default": "/cdk-bootstrap/hnb659fds/version", + "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]" + } + }, + "Rules": { + "CheckBootstrapVersion": { + "Assertions": [ + { + "Assert": { + "Fn::Not": [ + { + "Fn::Contains": [ + [ + "1", + "2", + "3", + "4", + "5" + ], + { + "Ref": "BootstrapVersion" + } + ] + } + ] + }, + "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI." + } + ] + } + } +} \ No newline at end of file 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 new file mode 100644 index 0000000000000..58c57e672c71a --- /dev/null +++ b/packages/@aws-cdk/mixins-preview/test/services/aws-logs/integ.delivery-mixin.js.snapshot/VendedLogsMixinTest.assets.json @@ -0,0 +1,34 @@ +{ + "version": "48.0.0", + "files": { + "faa95a81ae7d7373f3e1f242268f904eb748d8d0fdd306e8a6fe515a1905a7d6": { + "displayName": "VendedLogsMixinTest/Custom::S3AutoDeleteObjectsCustomResourceProvider Code", + "source": { + "path": "asset.faa95a81ae7d7373f3e1f242268f904eb748d8d0fdd306e8a6fe515a1905a7d6", + "packaging": "zip" + }, + "destinations": { + "current_account-current_region-e31788a2": { + "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", + "objectKey": "faa95a81ae7d7373f3e1f242268f904eb748d8d0fdd306e8a6fe515a1905a7d6.zip", + "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" + } + } + }, + "490957a1747e56a1f8583d023556fd6f1c7c9fbb256cdf79688e2fd99c010579": { + "displayName": "VendedLogsMixinTest Template", + "source": { + "path": "VendedLogsMixinTest.template.json", + "packaging": "file" + }, + "destinations": { + "current_account-current_region-6371097b": { + "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", + "objectKey": "490957a1747e56a1f8583d023556fd6f1c7c9fbb256cdf79688e2fd99c010579.json", + "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" + } + } + } + }, + "dockerImages": {} +} \ No newline at end of file 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 new file mode 100644 index 0000000000000..d55ade45852af --- /dev/null +++ b/packages/@aws-cdk/mixins-preview/test/services/aws-logs/integ.delivery-mixin.js.snapshot/VendedLogsMixinTest.template.json @@ -0,0 +1,380 @@ +{ + "Resources": { + "OriginBucketCA772B8F": { + "Type": "AWS::S3::Bucket", + "Properties": { + "Tags": [ + { + "Key": "aws-cdk:auto-delete-objects", + "Value": "true" + } + ] + }, + "UpdateReplacePolicy": "Delete", + "DeletionPolicy": "Delete" + }, + "OriginBucketPolicyFD67BA59": { + "Type": "AWS::S3::BucketPolicy", + "Properties": { + "Bucket": { + "Ref": "OriginBucketCA772B8F" + }, + "PolicyDocument": { + "Statement": [ + { + "Action": [ + "s3:DeleteObject*", + "s3:GetBucket*", + "s3:List*", + "s3:PutBucketPolicy" + ], + "Effect": "Allow", + "Principal": { + "AWS": { + "Fn::GetAtt": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", + "Arn" + ] + } + }, + "Resource": [ + { + "Fn::GetAtt": [ + "OriginBucketCA772B8F", + "Arn" + ] + }, + { + "Fn::Join": [ + "", + [ + { + "Fn::GetAtt": [ + "OriginBucketCA772B8F", + "Arn" + ] + }, + "/*" + ] + ] + } + ] + }, + { + "Action": "s3:GetObject", + "Condition": { + "StringEquals": { + "AWS:SourceArn": { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":cloudfront::", + { + "Ref": "AWS::AccountId" + }, + ":distribution/", + { + "Ref": "Distribution830FAC52" + } + ] + ] + } + } + }, + "Effect": "Allow", + "Principal": { + "Service": "cloudfront.amazonaws.com" + }, + "Resource": { + "Fn::Join": [ + "", + [ + { + "Fn::GetAtt": [ + "OriginBucketCA772B8F", + "Arn" + ] + }, + "/*" + ] + ] + } + } + ], + "Version": "2012-10-17" + } + } + }, + "OriginBucketAutoDeleteObjectsCustomResource064ED07E": { + "Type": "Custom::S3AutoDeleteObjects", + "Properties": { + "ServiceToken": { + "Fn::GetAtt": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F", + "Arn" + ] + }, + "BucketName": { + "Ref": "OriginBucketCA772B8F" + } + }, + "DependsOn": [ + "OriginBucketPolicyFD67BA59" + ], + "UpdateReplacePolicy": "Delete", + "DeletionPolicy": "Delete" + }, + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092": { + "Type": "AWS::IAM::Role", + "Properties": { + "AssumeRolePolicyDocument": { + "Version": "2012-10-17", + "Statement": [ + { + "Action": "sts:AssumeRole", + "Effect": "Allow", + "Principal": { + "Service": "lambda.amazonaws.com" + } + } + ] + }, + "ManagedPolicyArns": [ + { + "Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" + } + ] + } + }, + "CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F": { + "Type": "AWS::Lambda::Function", + "Properties": { + "Code": { + "S3Bucket": { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "S3Key": "faa95a81ae7d7373f3e1f242268f904eb748d8d0fdd306e8a6fe515a1905a7d6.zip" + }, + "Timeout": 900, + "MemorySize": 128, + "Handler": "index.handler", + "Role": { + "Fn::GetAtt": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", + "Arn" + ] + }, + "Runtime": "nodejs22.x", + "Description": { + "Fn::Join": [ + "", + [ + "Lambda function for auto-deleting objects in ", + { + "Ref": "OriginBucketCA772B8F" + }, + " S3 bucket." + ] + ] + } + }, + "DependsOn": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092" + ] + }, + "DistributionOrigin1S3OriginAccessControlEB606076": { + "Type": "AWS::CloudFront::OriginAccessControl", + "Properties": { + "OriginAccessControlConfig": { + "Name": "VendedLogsMixinTestDistributOrigin1S3OriginAccessControl746C2DF7", + "OriginAccessControlOriginType": "s3", + "SigningBehavior": "always", + "SigningProtocol": "sigv4" + } + } + }, + "Distribution830FAC52": { + "Type": "AWS::CloudFront::Distribution", + "Properties": { + "DistributionConfig": { + "DefaultCacheBehavior": { + "CachePolicyId": "658327ea-f89d-4fab-a63d-7e88639e58f6", + "Compress": true, + "TargetOriginId": "VendedLogsMixinTestDistributionOrigin1622BA555", + "ViewerProtocolPolicy": "allow-all" + }, + "Enabled": true, + "HttpVersion": "http2", + "IPV6Enabled": true, + "Origins": [ + { + "DomainName": { + "Fn::GetAtt": [ + "OriginBucketCA772B8F", + "RegionalDomainName" + ] + }, + "Id": "VendedLogsMixinTestDistributionOrigin1622BA555", + "OriginAccessControlId": { + "Fn::GetAtt": [ + "DistributionOrigin1S3OriginAccessControlEB606076", + "Id" + ] + }, + "S3OriginConfig": { + "OriginAccessIdentity": "" + } + } + ] + } + } + }, + "DistributionCdkSourceVendedLogsMixinTestDistributionAD616170C405E503": { + "Type": "AWS::Logs::DeliverySource", + "Properties": { + "LogType": "CONNECTION_LOGS", + "Name": "DistributionSource-VendedLoributionAD616170-CONNECTION_LOGS", + "ResourceArn": { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":cloudfront::", + { + "Ref": "AWS::AccountId" + }, + ":distribution/", + { + "Ref": "Distribution830FAC52" + } + ] + ] + } + }, + "DependsOn": [ + "CdkLogGroupLogsDeliveryPolicyResourcePolicy4483E857" + ] + }, + "DistributionCdkLogGroupDeliveryVendedLogsMixinTestDistributionAD616170VendedLogsMixinTestDeliveryLogGroupD06F335FDest81EEE80A": { + "Type": "AWS::Logs::DeliveryDestination", + "Properties": { + "DeliveryDestinationType": "CWL", + "DestinationResourceArn": { + "Fn::GetAtt": [ + "DeliveryLogGroup2A53FD53", + "Arn" + ] + }, + "Name": "cdk-cwl-dest-VendedLogsMixinTesteryLogGroupD06F335F73D12F53" + }, + "DependsOn": [ + "CdkLogGroupLogsDeliveryPolicyResourcePolicy4483E857" + ] + }, + "DistributionCdkLogGroupDeliveryVendedLogsMixinTestDistributionAD616170VendedLogsMixinTestDeliveryLogGroupD06F335FDelivery47B2B011": { + "Type": "AWS::Logs::Delivery", + "Properties": { + "DeliveryDestinationArn": { + "Fn::GetAtt": [ + "DistributionCdkLogGroupDeliveryVendedLogsMixinTestDistributionAD616170VendedLogsMixinTestDeliveryLogGroupD06F335FDest81EEE80A", + "Arn" + ] + }, + "DeliverySourceName": { + "Ref": "DistributionCdkSourceVendedLogsMixinTestDistributionAD616170C405E503" + } + }, + "DependsOn": [ + "CdkLogGroupLogsDeliveryPolicyResourcePolicy4483E857", + "DistributionCdkLogGroupDeliveryVendedLogsMixinTestDistributionAD616170VendedLogsMixinTestDeliveryLogGroupD06F335FDest81EEE80A", + "DistributionCdkSourceVendedLogsMixinTestDistributionAD616170C405E503" + ] + }, + "DeliveryLogGroup2A53FD53": { + "Type": "AWS::Logs::LogGroup", + "Properties": { + "RetentionInDays": 731 + }, + "UpdateReplacePolicy": "Delete", + "DeletionPolicy": "Delete" + }, + "CdkLogGroupLogsDeliveryPolicyResourcePolicy4483E857": { + "Type": "AWS::Logs::ResourcePolicy", + "Properties": { + "PolicyDocument": { + "Fn::Join": [ + "", + [ + "{\"Statement\":[{\"Action\":[\"logs:CreateLogStream\",\"logs:PutLogEvents\"],\"Condition\":{\"StringEquals\":{\"aws:SourceAccount\":\"", + { + "Ref": "AWS::AccountId" + }, + "\"},\"ArnLike\":{\"aws:SourceArn\":\"arn:", + { + "Ref": "AWS::Partition" + }, + ":logs:", + { + "Ref": "AWS::Region" + }, + ":", + { + "Ref": "AWS::AccountId" + }, + ":*\"}},\"Effect\":\"Allow\",\"Principal\":{\"Service\":\"delivery.logs.amazonaws.com\"},\"Resource\":\"", + { + "Fn::GetAtt": [ + "DeliveryLogGroup2A53FD53", + "Arn" + ] + }, + ":log-stream:*\"}],\"Version\":\"2012-10-17\"}" + ] + ] + }, + "PolicyName": "VendedLogsMixinTestDistributionCdkLogGroupDeliveryVendedLogsMixinTestDistributionAD616170VendedLogsMixinTestDeliveryLogGroupD06F335F73D12F53" + } + } + }, + "Parameters": { + "BootstrapVersion": { + "Type": "AWS::SSM::Parameter::Value", + "Default": "/cdk-bootstrap/hnb659fds/version", + "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]" + } + }, + "Rules": { + "CheckBootstrapVersion": { + "Assertions": [ + { + "Assert": { + "Fn::Not": [ + { + "Fn::Contains": [ + [ + "1", + "2", + "3", + "4", + "5" + ], + { + "Ref": "BootstrapVersion" + } + ] + } + ] + }, + "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI." + } + ] + } + } +} \ No newline at end of file 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 new file mode 100644 index 0000000000000..2f92d06c13a06 --- /dev/null +++ b/packages/@aws-cdk/mixins-preview/test/services/aws-logs/integ.delivery-mixin.js.snapshot/asset.faa95a81ae7d7373f3e1f242268f904eb748d8d0fdd306e8a6fe515a1905a7d6/index.js @@ -0,0 +1 @@ +"use strict";var f=Object.create,i=Object.defineProperty,I=Object.getOwnPropertyDescriptor,C=Object.getOwnPropertyNames,w=Object.getPrototypeOf,P=Object.prototype.hasOwnProperty,A=(t,e)=>{for(var o in e)i(t,o,{get:e[o],enumerable:!0})},d=(t,e,o,r)=>{if(e&&typeof e=="object"||typeof e=="function")for(let s of C(e))!P.call(t,s)&&s!==o&&i(t,s,{get:()=>e[s],enumerable:!(r=I(e,s))||r.enumerable});return t},l=(t,e,o)=>(o=t!=null?f(w(t)):{},d(e||!t||!t.__esModule?i(o,"default",{value:t,enumerable:!0}):o,t)),B=t=>d(i({},"__esModule",{value:!0}),t),q={};A(q,{autoDeleteHandler:()=>S,handler:()=>H}),module.exports=B(q);var h=require("@aws-sdk/client-s3"),y=l(require("https")),m=l(require("url")),a={sendHttpRequest:D,log:T,includeStackTraces:!0,userHandlerIndex:"./index"},p="AWSCDK::CustomResourceProviderFramework::CREATE_FAILED",L="AWSCDK::CustomResourceProviderFramework::MISSING_PHYSICAL_ID";function R(t){return async(e,o)=>{let r={...e,ResponseURL:"..."};if(a.log(JSON.stringify(r,void 0,2)),e.RequestType==="Delete"&&e.PhysicalResourceId===p){a.log("ignoring DELETE event caused by a failed CREATE event"),await u("SUCCESS",e);return}try{let s=await t(r,o),n=k(e,s);await u("SUCCESS",n)}catch(s){let n={...e,Reason:a.includeStackTraces?s.stack:s.message};n.PhysicalResourceId||(e.RequestType==="Create"?(a.log("CREATE failed, responding with a marker physical resource id so that the subsequent DELETE will be ignored"),n.PhysicalResourceId=p):a.log(`ERROR: Malformed event. "PhysicalResourceId" is required: ${JSON.stringify(e)}`)),await u("FAILED",n)}}}function k(t,e={}){let o=e.PhysicalResourceId??t.PhysicalResourceId??t.RequestId;if(t.RequestType==="Delete"&&o!==t.PhysicalResourceId)throw new Error(`DELETE: cannot change the physical resource ID from "${t.PhysicalResourceId}" to "${e.PhysicalResourceId}" during deletion`);return{...t,...e,PhysicalResourceId:o}}async function u(t,e){let o={Status:t,Reason:e.Reason??t,StackId:e.StackId,RequestId:e.RequestId,PhysicalResourceId:e.PhysicalResourceId||L,LogicalResourceId:e.LogicalResourceId,NoEcho:e.NoEcho,Data:e.Data},r=m.parse(e.ResponseURL),s=`${r.protocol}//${r.hostname}/${r.pathname}?***`;a.log("submit response to cloudformation",s,o);let n=JSON.stringify(o),E={hostname:r.hostname,path:r.path,method:"PUT",headers:{"content-type":"","content-length":Buffer.byteLength(n,"utf8")}};await O({attempts:5,sleep:1e3},a.sendHttpRequest)(E,n)}async function D(t,e){return new Promise((o,r)=>{try{let s=y.request(t,n=>{n.resume(),!n.statusCode||n.statusCode>=400?r(new Error(`Unsuccessful HTTP response: ${n.statusCode}`)):o()});s.on("error",r),s.write(e),s.end()}catch(s){r(s)}})}function T(t,...e){console.log(t,...e)}function O(t,e){return async(...o)=>{let r=t.attempts,s=t.sleep;for(;;)try{return await e(...o)}catch(n){if(r--<=0)throw n;await b(Math.floor(Math.random()*s)),s*=2}}}async function b(t){return new Promise(e=>setTimeout(e,t))}var g="aws-cdk:auto-delete-objects",x=JSON.stringify({Version:"2012-10-17",Statement:[]}),c=new h.S3({}),H=R(S);async function S(t){switch(t.RequestType){case"Create":return;case"Update":return{PhysicalResourceId:(await F(t)).PhysicalResourceId};case"Delete":return N(t.ResourceProperties?.BucketName)}}async function F(t){let e=t,o=e.OldResourceProperties?.BucketName;return{PhysicalResourceId:e.ResourceProperties?.BucketName??o}}async function _(t){try{let e=(await c.getBucketPolicy({Bucket:t}))?.Policy??x,o=JSON.parse(e);o.Statement.push({Principal:"*",Effect:"Deny",Action:["s3:PutObject"],Resource:[`arn:aws:s3:::${t}/*`]}),await c.putBucketPolicy({Bucket:t,Policy:JSON.stringify(o)})}catch(e){if(e.name==="NoSuchBucket")throw e;console.log(`Could not set new object deny policy on bucket '${t}' prior to deletion.`)}}async function U(t){let e;do{e=await c.listObjectVersions({Bucket:t});let o=[...e.Versions??[],...e.DeleteMarkers??[]];if(o.length===0)return;let r=o.map(s=>({Key:s.Key,VersionId:s.VersionId}));await c.deleteObjects({Bucket:t,Delete:{Objects:r}})}while(e?.IsTruncated)}async function N(t){if(!t)throw new Error("No BucketName was provided.");try{if(!await W(t)){console.log(`Bucket does not have '${g}' tag, skipping cleaning.`);return}await _(t),await U(t)}catch(e){if(e.name==="NoSuchBucket"){console.log(`Bucket '${t}' does not exist.`);return}throw e}}async function W(t){return(await c.getBucketTagging({Bucket:t})).TagSet?.some(o=>o.Key===g&&o.Value==="true")} 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 new file mode 100644 index 0000000000000..523a9aac37cbf --- /dev/null +++ b/packages/@aws-cdk/mixins-preview/test/services/aws-logs/integ.delivery-mixin.js.snapshot/cdk.out @@ -0,0 +1 @@ +{"version":"48.0.0"} \ No newline at end of file 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 new file mode 100644 index 0000000000000..d3c7d75f33418 --- /dev/null +++ b/packages/@aws-cdk/mixins-preview/test/services/aws-logs/integ.delivery-mixin.js.snapshot/integ.json @@ -0,0 +1,13 @@ +{ + "version": "48.0.0", + "testCases": { + "DeliveryTest/DefaultTest": { + "stacks": [ + "VendedLogsMixinTest" + ], + "assertionStack": "DeliveryTest/DefaultTest/DeployAssert", + "assertionStackName": "DeliveryTestDefaultTestDeployAssert48416031" + } + }, + "minimumCliVersion": "2.1027.0" +} \ No newline at end of file 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 new file mode 100644 index 0000000000000..053586e75a407 --- /dev/null +++ b/packages/@aws-cdk/mixins-preview/test/services/aws-logs/integ.delivery-mixin.js.snapshot/manifest.json @@ -0,0 +1,734 @@ +{ + "version": "48.0.0", + "artifacts": { + "VendedLogsMixinTest.assets": { + "type": "cdk:asset-manifest", + "properties": { + "file": "VendedLogsMixinTest.assets.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" + } + }, + "VendedLogsMixinTest": { + "type": "aws:cloudformation:stack", + "environment": "aws://unknown-account/unknown-region", + "properties": { + "templateFile": "VendedLogsMixinTest.template.json", + "terminationProtection": false, + "validateOnSynth": false, + "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", + "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/490957a1747e56a1f8583d023556fd6f1c7c9fbb256cdf79688e2fd99c010579.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", + "additionalDependencies": [ + "VendedLogsMixinTest.assets" + ], + "lookupRole": { + "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}", + "requiresBootstrapStackVersion": 8, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" + } + }, + "dependencies": [ + "VendedLogsMixinTest.assets" + ], + "metadata": { + "/VendedLogsMixinTest/OriginBucket": [ + { + "type": "aws:cdk:analytics:construct", + "data": { + "removalPolicy": "destroy", + "autoDeleteObjects": true + } + } + ], + "/VendedLogsMixinTest/OriginBucket/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "OriginBucketCA772B8F" + } + ], + "/VendedLogsMixinTest/OriginBucket/Policy": [ + { + "type": "aws:cdk:analytics:construct", + "data": { + "bucket": "*" + } + } + ], + "/VendedLogsMixinTest/OriginBucket/Policy/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "OriginBucketPolicyFD67BA59" + } + ], + "/VendedLogsMixinTest/OriginBucket/AutoDeleteObjectsCustomResource": [ + { + "type": "aws:cdk:analytics:construct", + "data": "*" + } + ], + "/VendedLogsMixinTest/OriginBucket/AutoDeleteObjectsCustomResource/Default": [ + { + "type": "aws:cdk:logicalId", + "data": "OriginBucketAutoDeleteObjectsCustomResource064ED07E" + } + ], + "/VendedLogsMixinTest/Custom::S3AutoDeleteObjectsCustomResourceProvider": [ + { + "type": "aws:cdk:is-custom-resource-handler-customResourceProvider", + "data": true + } + ], + "/VendedLogsMixinTest/Custom::S3AutoDeleteObjectsCustomResourceProvider/Role": [ + { + "type": "aws:cdk:logicalId", + "data": "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092" + } + ], + "/VendedLogsMixinTest/Custom::S3AutoDeleteObjectsCustomResourceProvider/Handler": [ + { + "type": "aws:cdk:logicalId", + "data": "CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F" + } + ], + "/VendedLogsMixinTest/Distribution": [ + { + "type": "aws:cdk:analytics:construct", + "data": { + "defaultBehavior": { + "origin": "*" + } + } + } + ], + "/VendedLogsMixinTest/Distribution/Origin1/S3OriginAccessControl": [ + { + "type": "aws:cdk:analytics:construct", + "data": "*" + } + ], + "/VendedLogsMixinTest/Distribution/Origin1/S3OriginAccessControl/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "DistributionOrigin1S3OriginAccessControlEB606076" + } + ], + "/VendedLogsMixinTest/Distribution/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "Distribution830FAC52" + } + ], + "/VendedLogsMixinTest/Distribution/Resource/CdkSourceVendedLogsMixinTestDistributionAD616170": [ + { + "type": "aws:cdk:logicalId", + "data": "DistributionCdkSourceVendedLogsMixinTestDistributionAD616170C405E503" + } + ], + "/VendedLogsMixinTest/Distribution/Resource/CdkLogGroupDeliveryVendedLogsMixinTestDistributionAD616170VendedLogsMixinTestDeliveryLogGroupD06F335F/Dest": [ + { + "type": "aws:cdk:logicalId", + "data": "DistributionCdkLogGroupDeliveryVendedLogsMixinTestDistributionAD616170VendedLogsMixinTestDeliveryLogGroupD06F335FDest81EEE80A" + } + ], + "/VendedLogsMixinTest/Distribution/Resource/CdkLogGroupDeliveryVendedLogsMixinTestDistributionAD616170VendedLogsMixinTestDeliveryLogGroupD06F335F/Delivery": [ + { + "type": "aws:cdk:logicalId", + "data": "DistributionCdkLogGroupDeliveryVendedLogsMixinTestDistributionAD616170VendedLogsMixinTestDeliveryLogGroupD06F335FDelivery47B2B011" + } + ], + "/VendedLogsMixinTest/DeliveryLogGroup": [ + { + "type": "aws:cdk:analytics:construct", + "data": { + "removalPolicy": "destroy" + } + } + ], + "/VendedLogsMixinTest/DeliveryLogGroup/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "DeliveryLogGroup2A53FD53" + } + ], + "/VendedLogsMixinTest/CdkLogGroupLogsDeliveryPolicy": [ + { + "type": "aws:cdk:analytics:construct", + "data": {} + } + ], + "/VendedLogsMixinTest/CdkLogGroupLogsDeliveryPolicy/ResourcePolicy": [ + { + "type": "aws:cdk:logicalId", + "data": "CdkLogGroupLogsDeliveryPolicyResourcePolicy4483E857" + } + ], + "/VendedLogsMixinTest/BootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "BootstrapVersion" + } + ], + "/VendedLogsMixinTest/CheckBootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "CheckBootstrapVersion" + } + ] + }, + "displayName": "VendedLogsMixinTest" + }, + "DeliveryTestDefaultTestDeployAssert48416031.assets": { + "type": "cdk:asset-manifest", + "properties": { + "file": "DeliveryTestDefaultTestDeployAssert48416031.assets.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" + } + }, + "DeliveryTestDefaultTestDeployAssert48416031": { + "type": "aws:cloudformation:stack", + "environment": "aws://unknown-account/unknown-region", + "properties": { + "templateFile": "DeliveryTestDefaultTestDeployAssert48416031.template.json", + "terminationProtection": false, + "validateOnSynth": false, + "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", + "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", + "additionalDependencies": [ + "DeliveryTestDefaultTestDeployAssert48416031.assets" + ], + "lookupRole": { + "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}", + "requiresBootstrapStackVersion": 8, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" + } + }, + "dependencies": [ + "DeliveryTestDefaultTestDeployAssert48416031.assets" + ], + "metadata": { + "/DeliveryTest/DefaultTest/DeployAssert/BootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "BootstrapVersion" + } + ], + "/DeliveryTest/DefaultTest/DeployAssert/CheckBootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "CheckBootstrapVersion" + } + ] + }, + "displayName": "DeliveryTest/DefaultTest/DeployAssert" + }, + "Tree": { + "type": "cdk:tree", + "properties": { + "file": "tree.json" + } + }, + "aws-cdk-lib/feature-flag-report": { + "type": "cdk:feature-flag-report", + "properties": { + "module": "aws-cdk-lib", + "flags": { + "@aws-cdk/aws-signer:signingProfileNamePassedToCfn": { + "userValue": true, + "recommendedValue": true, + "explanation": "Pass signingProfileName to CfnSigningProfile" + }, + "@aws-cdk/core:newStyleStackSynthesis": { + "recommendedValue": true, + "explanation": "Switch to new stack synthesis method which enables CI/CD", + "unconfiguredBehavesLike": { + "v2": true + } + }, + "@aws-cdk/core:stackRelativeExports": { + "recommendedValue": true, + "explanation": "Name exports based on the construct paths relative to the stack, rather than the global construct path", + "unconfiguredBehavesLike": { + "v2": true + } + }, + "@aws-cdk/aws-ecs-patterns:secGroupsDisablesImplicitOpenListener": { + "userValue": true, + "recommendedValue": true, + "explanation": "Disable implicit openListener when custom security groups are provided" + }, + "@aws-cdk/aws-rds:lowercaseDbIdentifier": { + "recommendedValue": true, + "explanation": "Force lowercasing of RDS Cluster names in CDK", + "unconfiguredBehavesLike": { + "v2": true + } + }, + "@aws-cdk/aws-apigateway:usagePlanKeyOrderInsensitiveId": { + "recommendedValue": true, + "explanation": "Allow adding/removing multiple UsagePlanKeys independently", + "unconfiguredBehavesLike": { + "v2": true + } + }, + "@aws-cdk/aws-lambda:recognizeVersionProps": { + "recommendedValue": true, + "explanation": "Enable this feature flag to opt in to the updated logical id calculation for Lambda Version created using the `fn.currentVersion`.", + "unconfiguredBehavesLike": { + "v2": true + } + }, + "@aws-cdk/aws-lambda:recognizeLayerVersion": { + "userValue": true, + "recommendedValue": true, + "explanation": "Enable this feature flag to opt in to the updated logical id calculation for Lambda Version created using the `fn.currentVersion`." + }, + "@aws-cdk/aws-cloudfront:defaultSecurityPolicyTLSv1.2_2021": { + "recommendedValue": true, + "explanation": "Enable this feature flag to have cloudfront distributions use the security policy TLSv1.2_2021 by default.", + "unconfiguredBehavesLike": { + "v2": true + } + }, + "@aws-cdk/core:checkSecretUsage": { + "userValue": true, + "recommendedValue": true, + "explanation": "Enable this flag to make it impossible to accidentally use SecretValues in unsafe locations" + }, + "@aws-cdk/core:target-partitions": { + "recommendedValue": [ + "aws", + "aws-cn" + ], + "explanation": "What regions to include in lookup tables of environment agnostic stacks" + }, + "@aws-cdk-containers/ecs-service-extensions:enableDefaultLogDriver": { + "userValue": true, + "recommendedValue": true, + "explanation": "ECS extensions will automatically add an `awslogs` driver if no logging is specified" + }, + "@aws-cdk/aws-ec2:uniqueImdsv2TemplateName": { + "userValue": true, + "recommendedValue": true, + "explanation": "Enable this feature flag to have Launch Templates generated by the `InstanceRequireImdsv2Aspect` use unique names." + }, + "@aws-cdk/aws-ecs:arnFormatIncludesClusterName": { + "userValue": true, + "recommendedValue": true, + "explanation": "ARN format used by ECS. In the new ARN format, the cluster name is part of the resource ID." + }, + "@aws-cdk/aws-iam:minimizePolicies": { + "userValue": true, + "recommendedValue": true, + "explanation": "Minimize IAM policies by combining Statements" + }, + "@aws-cdk/core:validateSnapshotRemovalPolicy": { + "userValue": true, + "recommendedValue": true, + "explanation": "Error on snapshot removal policies on resources that do not support it." + }, + "@aws-cdk/aws-codepipeline:crossAccountKeyAliasStackSafeResourceName": { + "userValue": true, + "recommendedValue": true, + "explanation": "Generate key aliases that include the stack name" + }, + "@aws-cdk/aws-s3:createDefaultLoggingPolicy": { + "userValue": true, + "recommendedValue": true, + "explanation": "Enable this feature flag to create an S3 bucket policy by default in cases where an AWS service would automatically create the Policy if one does not exist." + }, + "@aws-cdk/aws-sns-subscriptions:restrictSqsDescryption": { + "userValue": true, + "recommendedValue": true, + "explanation": "Restrict KMS key policy for encrypted Queues a bit more" + }, + "@aws-cdk/aws-apigateway:disableCloudWatchRole": { + "userValue": true, + "recommendedValue": true, + "explanation": "Make default CloudWatch Role behavior safe for multiple API Gateways in one environment" + }, + "@aws-cdk/core:enablePartitionLiterals": { + "userValue": true, + "recommendedValue": true, + "explanation": "Make ARNs concrete if AWS partition is known" + }, + "@aws-cdk/aws-events:eventsTargetQueueSameAccount": { + "userValue": true, + "recommendedValue": true, + "explanation": "Event Rules may only push to encrypted SQS queues in the same account" + }, + "@aws-cdk/aws-ecs:disableExplicitDeploymentControllerForCircuitBreaker": { + "userValue": true, + "recommendedValue": true, + "explanation": "Avoid setting the \"ECS\" deployment controller when adding a circuit breaker" + }, + "@aws-cdk/aws-iam:importedRoleStackSafeDefaultPolicyName": { + "userValue": true, + "recommendedValue": true, + "explanation": "Enable this feature to create default policy names for imported roles that depend on the stack the role is in." + }, + "@aws-cdk/aws-s3:serverAccessLogsUseBucketPolicy": { + "userValue": true, + "recommendedValue": true, + "explanation": "Use S3 Bucket Policy instead of ACLs for Server Access Logging" + }, + "@aws-cdk/aws-route53-patters:useCertificate": { + "userValue": true, + "recommendedValue": true, + "explanation": "Use the official `Certificate` resource instead of `DnsValidatedCertificate`" + }, + "@aws-cdk/customresources:installLatestAwsSdkDefault": { + "userValue": false, + "recommendedValue": false, + "explanation": "Whether to install the latest SDK by default in AwsCustomResource" + }, + "@aws-cdk/aws-rds:databaseProxyUniqueResourceName": { + "userValue": true, + "recommendedValue": true, + "explanation": "Use unique resource name for Database Proxy" + }, + "@aws-cdk/aws-codedeploy:removeAlarmsFromDeploymentGroup": { + "userValue": true, + "recommendedValue": true, + "explanation": "Remove CloudWatch alarms from deployment group" + }, + "@aws-cdk/aws-apigateway:authorizerChangeDeploymentLogicalId": { + "userValue": true, + "recommendedValue": true, + "explanation": "Include authorizer configuration in the calculation of the API deployment logical ID." + }, + "@aws-cdk/aws-ec2:launchTemplateDefaultUserData": { + "userValue": true, + "recommendedValue": true, + "explanation": "Define user data for a launch template by default when a machine image is provided." + }, + "@aws-cdk/aws-secretsmanager:useAttachedSecretResourcePolicyForSecretTargetAttachments": { + "userValue": true, + "recommendedValue": true, + "explanation": "SecretTargetAttachments uses the ResourcePolicy of the attached Secret." + }, + "@aws-cdk/aws-redshift:columnId": { + "userValue": true, + "recommendedValue": true, + "explanation": "Whether to use an ID to track Redshift column changes" + }, + "@aws-cdk/aws-stepfunctions-tasks:enableEmrServicePolicyV2": { + "userValue": true, + "recommendedValue": true, + "explanation": "Enable AmazonEMRServicePolicy_v2 managed policies" + }, + "@aws-cdk/aws-ec2:restrictDefaultSecurityGroup": { + "userValue": true, + "recommendedValue": true, + "explanation": "Restrict access to the VPC default security group" + }, + "@aws-cdk/aws-apigateway:requestValidatorUniqueId": { + "userValue": true, + "recommendedValue": true, + "explanation": "Generate a unique id for each RequestValidator added to a method" + }, + "@aws-cdk/aws-kms:aliasNameRef": { + "userValue": true, + "recommendedValue": true, + "explanation": "KMS Alias name and keyArn will have implicit reference to KMS Key" + }, + "@aws-cdk/aws-kms:applyImportedAliasPermissionsToPrincipal": { + "userValue": true, + "recommendedValue": true, + "explanation": "Enable grant methods on Aliases imported by name to use kms:ResourceAliases condition" + }, + "@aws-cdk/aws-autoscaling:generateLaunchTemplateInsteadOfLaunchConfig": { + "userValue": true, + "recommendedValue": true, + "explanation": "Generate a launch template when creating an AutoScalingGroup" + }, + "@aws-cdk/core:includePrefixInUniqueNameGeneration": { + "userValue": true, + "recommendedValue": true, + "explanation": "Include the stack prefix in the stack name generation process" + }, + "@aws-cdk/aws-efs:denyAnonymousAccess": { + "userValue": true, + "recommendedValue": true, + "explanation": "EFS denies anonymous clients accesses" + }, + "@aws-cdk/aws-opensearchservice:enableOpensearchMultiAzWithStandby": { + "userValue": true, + "recommendedValue": true, + "explanation": "Enables support for Multi-AZ with Standby deployment for opensearch domains" + }, + "@aws-cdk/aws-lambda-nodejs:useLatestRuntimeVersion": { + "userValue": true, + "recommendedValue": true, + "explanation": "Enables aws-lambda-nodejs.Function to use the latest available NodeJs runtime as the default" + }, + "@aws-cdk/aws-efs:mountTargetOrderInsensitiveLogicalId": { + "userValue": true, + "recommendedValue": true, + "explanation": "When enabled, mount targets will have a stable logicalId that is linked to the associated subnet." + }, + "@aws-cdk/aws-rds:auroraClusterChangeScopeOfInstanceParameterGroupWithEachParameters": { + "userValue": true, + "recommendedValue": true, + "explanation": "When enabled, a scope of InstanceParameterGroup for AuroraClusterInstance with each parameters will change." + }, + "@aws-cdk/aws-appsync:useArnForSourceApiAssociationIdentifier": { + "userValue": true, + "recommendedValue": true, + "explanation": "When enabled, will always use the arn for identifiers for CfnSourceApiAssociation in the GraphqlApi construct rather than id." + }, + "@aws-cdk/aws-rds:preventRenderingDeprecatedCredentials": { + "userValue": true, + "recommendedValue": true, + "explanation": "When enabled, creating an RDS database cluster from a snapshot will only render credentials for snapshot credentials." + }, + "@aws-cdk/aws-codepipeline-actions:useNewDefaultBranchForCodeCommitSource": { + "userValue": true, + "recommendedValue": true, + "explanation": "When enabled, the CodeCommit source action is using the default branch name 'main'." + }, + "@aws-cdk/aws-cloudwatch-actions:changeLambdaPermissionLogicalIdForLambdaAction": { + "userValue": true, + "recommendedValue": true, + "explanation": "When enabled, the logical ID of a Lambda permission for a Lambda action includes an alarm ID." + }, + "@aws-cdk/aws-codepipeline:crossAccountKeysDefaultValueToFalse": { + "userValue": true, + "recommendedValue": true, + "explanation": "Enables Pipeline to set the default value for crossAccountKeys to false." + }, + "@aws-cdk/aws-codepipeline:defaultPipelineTypeToV2": { + "userValue": true, + "recommendedValue": true, + "explanation": "Enables Pipeline to set the default pipeline type to V2." + }, + "@aws-cdk/aws-kms:reduceCrossAccountRegionPolicyScope": { + "userValue": true, + "recommendedValue": true, + "explanation": "When enabled, IAM Policy created from KMS key grant will reduce the resource scope to this key only." + }, + "@aws-cdk/pipelines:reduceAssetRoleTrustScope": { + "recommendedValue": true, + "explanation": "Remove the root account principal from PipelineAssetsFileRole trust policy", + "unconfiguredBehavesLike": { + "v2": true + } + }, + "@aws-cdk/aws-eks:nodegroupNameAttribute": { + "userValue": true, + "recommendedValue": true, + "explanation": "When enabled, nodegroupName attribute of the provisioned EKS NodeGroup will not have the cluster name prefix." + }, + "@aws-cdk/aws-ec2:ebsDefaultGp3Volume": { + "userValue": true, + "recommendedValue": true, + "explanation": "When enabled, the default volume type of the EBS volume will be GP3" + }, + "@aws-cdk/aws-ecs:removeDefaultDeploymentAlarm": { + "userValue": true, + "recommendedValue": true, + "explanation": "When enabled, remove default deployment alarm settings" + }, + "@aws-cdk/custom-resources:logApiResponseDataPropertyTrueDefault": { + "userValue": false, + "recommendedValue": false, + "explanation": "When enabled, the custom resource used for `AwsCustomResource` will configure the `logApiResponseData` property as true by default" + }, + "@aws-cdk/aws-s3:keepNotificationInImportedBucket": { + "userValue": false, + "recommendedValue": false, + "explanation": "When enabled, Adding notifications to a bucket in the current stack will not remove notification from imported stack." + }, + "@aws-cdk/aws-stepfunctions-tasks:useNewS3UriParametersForBedrockInvokeModelTask": { + "recommendedValue": true, + "explanation": "When enabled, use new props for S3 URI field in task definition of state machine for bedrock invoke model.", + "unconfiguredBehavesLike": { + "v2": true + } + }, + "@aws-cdk/core:explicitStackTags": { + "userValue": true, + "recommendedValue": true, + "explanation": "When enabled, stack tags need to be assigned explicitly on a Stack." + }, + "@aws-cdk/aws-ecs:enableImdsBlockingDeprecatedFeature": { + "userValue": false, + "recommendedValue": false, + "explanation": "When set to true along with canContainersAccessInstanceRole=false in ECS cluster, new updated commands will be added to UserData to block container accessing IMDS. **Applicable to Linux only. IMPORTANT: See [details.](#aws-cdkaws-ecsenableImdsBlockingDeprecatedFeature)**" + }, + "@aws-cdk/aws-ecs:disableEcsImdsBlocking": { + "userValue": true, + "recommendedValue": true, + "explanation": "When set to true, CDK synth will throw exception if canContainersAccessInstanceRole is false. **IMPORTANT: See [details.](#aws-cdkaws-ecsdisableEcsImdsBlocking)**" + }, + "@aws-cdk/aws-ecs:reduceEc2FargateCloudWatchPermissions": { + "userValue": true, + "recommendedValue": true, + "explanation": "When enabled, we will only grant the necessary permissions when users specify cloudwatch log group through logConfiguration" + }, + "@aws-cdk/aws-dynamodb:resourcePolicyPerReplica": { + "userValue": true, + "recommendedValue": true, + "explanation": "When enabled will allow you to specify a resource policy per replica, and not copy the source table policy to all replicas" + }, + "@aws-cdk/aws-ec2:ec2SumTImeoutEnabled": { + "userValue": true, + "recommendedValue": true, + "explanation": "When enabled, initOptions.timeout and resourceSignalTimeout values will be summed together." + }, + "@aws-cdk/aws-appsync:appSyncGraphQLAPIScopeLambdaPermission": { + "userValue": true, + "recommendedValue": true, + "explanation": "When enabled, a Lambda authorizer Permission created when using GraphqlApi will be properly scoped with a SourceArn." + }, + "@aws-cdk/aws-rds:setCorrectValueForDatabaseInstanceReadReplicaInstanceResourceId": { + "userValue": true, + "recommendedValue": true, + "explanation": "When enabled, the value of property `instanceResourceId` in construct `DatabaseInstanceReadReplica` will be set to the correct value which is `DbiResourceId` instead of currently `DbInstanceArn`" + }, + "@aws-cdk/core:cfnIncludeRejectComplexResourceUpdateCreatePolicyIntrinsics": { + "userValue": true, + "recommendedValue": true, + "explanation": "When enabled, CFN templates added with `cfn-include` will error if the template contains Resource Update or Create policies with CFN Intrinsics that include non-primitive values." + }, + "@aws-cdk/aws-lambda-nodejs:sdkV3ExcludeSmithyPackages": { + "userValue": true, + "recommendedValue": true, + "explanation": "When enabled, both `@aws-sdk` and `@smithy` packages will be excluded from the Lambda Node.js 18.x runtime to prevent version mismatches in bundled applications." + }, + "@aws-cdk/aws-stepfunctions-tasks:fixRunEcsTaskPolicy": { + "userValue": true, + "recommendedValue": true, + "explanation": "When enabled, the resource of IAM Run Ecs policy generated by SFN EcsRunTask will reference the definition, instead of constructing ARN." + }, + "@aws-cdk/aws-ec2:bastionHostUseAmazonLinux2023ByDefault": { + "userValue": true, + "recommendedValue": true, + "explanation": "When enabled, the BastionHost construct will use the latest Amazon Linux 2023 AMI, instead of Amazon Linux 2." + }, + "@aws-cdk/core:aspectStabilization": { + "recommendedValue": true, + "explanation": "When enabled, a stabilization loop will be run when invoking Aspects during synthesis.", + "unconfiguredBehavesLike": { + "v2": true + } + }, + "@aws-cdk/aws-route53-targets:userPoolDomainNameMethodWithoutCustomResource": { + "userValue": true, + "recommendedValue": true, + "explanation": "When enabled, use a new method for DNS Name of user pool domain target without creating a custom resource." + }, + "@aws-cdk/aws-elasticloadbalancingV2:albDualstackWithoutPublicIpv4SecurityGroupRulesDefault": { + "userValue": true, + "recommendedValue": true, + "explanation": "When enabled, the default security group ingress rules will allow IPv6 ingress from anywhere" + }, + "@aws-cdk/aws-iam:oidcRejectUnauthorizedConnections": { + "userValue": true, + "recommendedValue": true, + "explanation": "When enabled, the default behaviour of OIDC provider will reject unauthorized connections" + }, + "@aws-cdk/core:enableAdditionalMetadataCollection": { + "userValue": true, + "recommendedValue": true, + "explanation": "When enabled, CDK will expand the scope of usage data collected to better inform CDK development and improve communication for security concerns and emerging issues." + }, + "@aws-cdk/aws-lambda:createNewPoliciesWithAddToRolePolicy": { + "userValue": false, + "recommendedValue": false, + "explanation": "[Deprecated] When enabled, Lambda will create new inline policies with AddToRolePolicy instead of adding to the Default Policy Statement" + }, + "@aws-cdk/aws-s3:setUniqueReplicationRoleName": { + "userValue": true, + "recommendedValue": true, + "explanation": "When enabled, CDK will automatically generate a unique role name that is used for s3 object replication." + }, + "@aws-cdk/pipelines:reduceStageRoleTrustScope": { + "recommendedValue": true, + "explanation": "Remove the root account principal from Stage addActions trust policy", + "unconfiguredBehavesLike": { + "v2": true + } + }, + "@aws-cdk/aws-events:requireEventBusPolicySid": { + "userValue": true, + "recommendedValue": true, + "explanation": "When enabled, grantPutEventsTo() will use resource policies with Statement IDs for service principals." + }, + "@aws-cdk/core:aspectPrioritiesMutating": { + "userValue": true, + "recommendedValue": true, + "explanation": "When set to true, Aspects added by the construct library on your behalf will be given a priority of MUTATING." + }, + "@aws-cdk/aws-dynamodb:retainTableReplica": { + "userValue": true, + "recommendedValue": true, + "explanation": "When enabled, table replica will be default to the removal policy of source table unless specified otherwise." + }, + "@aws-cdk/cognito:logUserPoolClientSecretValue": { + "recommendedValue": false, + "explanation": "When disabled, the value of the user pool client secret will not be logged in the custom resource lambda function logs." + }, + "@aws-cdk/pipelines:reduceCrossAccountActionRoleTrustScope": { + "recommendedValue": true, + "explanation": "When enabled, scopes down the trust policy for the cross-account action role", + "unconfiguredBehavesLike": { + "v2": true + } + }, + "@aws-cdk/aws-stepfunctions:useDistributedMapResultWriterV2": { + "userValue": true, + "recommendedValue": true, + "explanation": "When enabled, the resultWriterV2 property of DistributedMap will be used insted of resultWriter" + }, + "@aws-cdk/s3-notifications:addS3TrustKeyPolicyForSnsSubscriptions": { + "userValue": true, + "recommendedValue": true, + "explanation": "Add an S3 trust policy to a KMS key resource policy for SNS subscriptions." + }, + "@aws-cdk/aws-ec2:requirePrivateSubnetsForEgressOnlyInternetGateway": { + "userValue": true, + "recommendedValue": true, + "explanation": "When enabled, the EgressOnlyGateway resource is only created if private subnets are defined in the dual-stack VPC." + }, + "@aws-cdk/aws-ec2-alpha:useResourceIdForVpcV2Migration": { + "recommendedValue": false, + "explanation": "When enabled, use resource IDs for VPC V2 migration" + }, + "@aws-cdk/aws-s3:publicAccessBlockedByDefault": { + "userValue": true, + "recommendedValue": true, + "explanation": "When enabled, setting any combination of options for BlockPublicAccess will automatically set true for any options not defined." + }, + "@aws-cdk/aws-lambda:useCdkManagedLogGroup": { + "userValue": true, + "recommendedValue": true, + "explanation": "When enabled, CDK creates and manages loggroup for the lambda function" + }, + "@aws-cdk/aws-elasticloadbalancingv2:networkLoadBalancerWithSecurityGroupByDefault": { + "recommendedValue": true, + "explanation": "When enabled, Network Load Balancer will be created with a security group by default." + }, + "@aws-cdk/aws-stepfunctions-tasks:httpInvokeDynamicJsonPathEndpoint": { + "recommendedValue": true, + "explanation": "When enabled, allows using a dynamic apiEndpoint with JSONPath format in HttpInvoke tasks.", + "unconfiguredBehavesLike": { + "v2": true + } + }, + "@aws-cdk/aws-ecs-patterns:uniqueTargetGroupId": { + "recommendedValue": true, + "explanation": "When enabled, ECS patterns will generate unique target group IDs to prevent conflicts during load balancer replacement" + } + } + } + } + }, + "minimumCliVersion": "2.1033.0" +} \ No newline at end of file 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 new file mode 100644 index 0000000000000..90b9104e00af0 --- /dev/null +++ b/packages/@aws-cdk/mixins-preview/test/services/aws-logs/integ.delivery-mixin.js.snapshot/tree.json @@ -0,0 +1 @@ +{"version":"tree-0.1","tree":{"id":"App","path":"","constructInfo":{"fqn":"aws-cdk-lib.App","version":"0.0.0"},"children":{"VendedLogsMixinTest":{"id":"VendedLogsMixinTest","path":"VendedLogsMixinTest","constructInfo":{"fqn":"aws-cdk-lib.Stack","version":"0.0.0"},"children":{"OriginBucket":{"id":"OriginBucket","path":"VendedLogsMixinTest/OriginBucket","constructInfo":{"fqn":"aws-cdk-lib.aws_s3.Bucket","version":"0.0.0","metadata":[{"removalPolicy":"destroy","autoDeleteObjects":true}]},"children":{"Resource":{"id":"Resource","path":"VendedLogsMixinTest/OriginBucket/Resource","constructInfo":{"fqn":"aws-cdk-lib.aws_s3.CfnBucket","version":"0.0.0"},"attributes":{"aws:cdk:cloudformation:type":"AWS::S3::Bucket","aws:cdk:cloudformation:props":{"tags":[{"key":"aws-cdk:auto-delete-objects","value":"true"}]}}},"Policy":{"id":"Policy","path":"VendedLogsMixinTest/OriginBucket/Policy","constructInfo":{"fqn":"aws-cdk-lib.aws_s3.BucketPolicy","version":"0.0.0","metadata":[{"bucket":"*"}]},"children":{"Resource":{"id":"Resource","path":"VendedLogsMixinTest/OriginBucket/Policy/Resource","constructInfo":{"fqn":"aws-cdk-lib.aws_s3.CfnBucketPolicy","version":"0.0.0"},"attributes":{"aws:cdk:cloudformation:type":"AWS::S3::BucketPolicy","aws:cdk:cloudformation:props":{"bucket":{"Ref":"OriginBucketCA772B8F"},"policyDocument":{"Statement":[{"Action":["s3:DeleteObject*","s3:GetBucket*","s3:List*","s3:PutBucketPolicy"],"Effect":"Allow","Principal":{"AWS":{"Fn::GetAtt":["CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092","Arn"]}},"Resource":[{"Fn::GetAtt":["OriginBucketCA772B8F","Arn"]},{"Fn::Join":["",[{"Fn::GetAtt":["OriginBucketCA772B8F","Arn"]},"/*"]]}]},{"Action":"s3:GetObject","Condition":{"StringEquals":{"AWS:SourceArn":{"Fn::Join":["",["arn:",{"Ref":"AWS::Partition"},":cloudfront::",{"Ref":"AWS::AccountId"},":distribution/",{"Ref":"Distribution830FAC52"}]]}}},"Effect":"Allow","Principal":{"Service":"cloudfront.amazonaws.com"},"Resource":{"Fn::Join":["",[{"Fn::GetAtt":["OriginBucketCA772B8F","Arn"]},"/*"]]}}],"Version":"2012-10-17"}}}}}},"AutoDeleteObjectsCustomResource":{"id":"AutoDeleteObjectsCustomResource","path":"VendedLogsMixinTest/OriginBucket/AutoDeleteObjectsCustomResource","constructInfo":{"fqn":"aws-cdk-lib.CustomResource","version":"0.0.0","metadata":["*"]},"children":{"Default":{"id":"Default","path":"VendedLogsMixinTest/OriginBucket/AutoDeleteObjectsCustomResource/Default","constructInfo":{"fqn":"aws-cdk-lib.CfnResource","version":"0.0.0"}}}}}},"Custom::S3AutoDeleteObjectsCustomResourceProvider":{"id":"Custom::S3AutoDeleteObjectsCustomResourceProvider","path":"VendedLogsMixinTest/Custom::S3AutoDeleteObjectsCustomResourceProvider","constructInfo":{"fqn":"aws-cdk-lib.CustomResourceProviderBase","version":"0.0.0"},"children":{"Staging":{"id":"Staging","path":"VendedLogsMixinTest/Custom::S3AutoDeleteObjectsCustomResourceProvider/Staging","constructInfo":{"fqn":"aws-cdk-lib.AssetStaging","version":"0.0.0"}},"Role":{"id":"Role","path":"VendedLogsMixinTest/Custom::S3AutoDeleteObjectsCustomResourceProvider/Role","constructInfo":{"fqn":"aws-cdk-lib.CfnResource","version":"0.0.0"}},"Handler":{"id":"Handler","path":"VendedLogsMixinTest/Custom::S3AutoDeleteObjectsCustomResourceProvider/Handler","constructInfo":{"fqn":"aws-cdk-lib.CfnResource","version":"0.0.0"}}}},"Distribution":{"id":"Distribution","path":"VendedLogsMixinTest/Distribution","constructInfo":{"fqn":"aws-cdk-lib.aws_cloudfront.Distribution","version":"0.0.0","metadata":[{"defaultBehavior":{"origin":"*"}}]},"children":{"Origin1":{"id":"Origin1","path":"VendedLogsMixinTest/Distribution/Origin1","constructInfo":{"fqn":"constructs.Construct","version":"10.4.2"},"children":{"S3OriginAccessControl":{"id":"S3OriginAccessControl","path":"VendedLogsMixinTest/Distribution/Origin1/S3OriginAccessControl","constructInfo":{"fqn":"aws-cdk-lib.aws_cloudfront.S3OriginAccessControl","version":"0.0.0","metadata":["*"]},"children":{"Resource":{"id":"Resource","path":"VendedLogsMixinTest/Distribution/Origin1/S3OriginAccessControl/Resource","constructInfo":{"fqn":"aws-cdk-lib.aws_cloudfront.CfnOriginAccessControl","version":"0.0.0"},"attributes":{"aws:cdk:cloudformation:type":"AWS::CloudFront::OriginAccessControl","aws:cdk:cloudformation:props":{"originAccessControlConfig":{"name":"VendedLogsMixinTestDistributOrigin1S3OriginAccessControl746C2DF7","signingBehavior":"always","signingProtocol":"sigv4","originAccessControlOriginType":"s3"}}}}}}}},"Resource":{"id":"Resource","path":"VendedLogsMixinTest/Distribution/Resource","constructInfo":{"fqn":"aws-cdk-lib.aws_cloudfront.CfnDistribution","version":"0.0.0"},"attributes":{"aws:cdk:cloudformation:type":"AWS::CloudFront::Distribution","aws:cdk:cloudformation:props":{"distributionConfig":{"enabled":true,"origins":[{"domainName":{"Fn::GetAtt":["OriginBucketCA772B8F","RegionalDomainName"]},"id":"VendedLogsMixinTestDistributionOrigin1622BA555","s3OriginConfig":{"originAccessIdentity":""},"originAccessControlId":{"Fn::GetAtt":["DistributionOrigin1S3OriginAccessControlEB606076","Id"]}}],"defaultCacheBehavior":{"pathPattern":"*","targetOriginId":"VendedLogsMixinTestDistributionOrigin1622BA555","cachePolicyId":"658327ea-f89d-4fab-a63d-7e88639e58f6","compress":true,"viewerProtocolPolicy":"allow-all"},"httpVersion":"http2","ipv6Enabled":true}}},"children":{"CdkSourceVendedLogsMixinTestDistributionAD616170":{"id":"CdkSourceVendedLogsMixinTestDistributionAD616170","path":"VendedLogsMixinTest/Distribution/Resource/CdkSourceVendedLogsMixinTestDistributionAD616170","constructInfo":{"fqn":"aws-cdk-lib.aws_logs.CfnDeliverySource","version":"0.0.0"},"attributes":{"aws:cdk:cloudformation:type":"AWS::Logs::DeliverySource","aws:cdk:cloudformation:props":{"logType":"CONNECTION_LOGS","name":"DistributionSource-VendedLoributionAD616170-CONNECTION_LOGS","resourceArn":{"Fn::Join":["",["arn:",{"Ref":"AWS::Partition"},":cloudfront::",{"Ref":"AWS::AccountId"},":distribution/",{"Ref":"Distribution830FAC52"}]]}}}},"CdkLogGroupDeliveryVendedLogsMixinTestDistributionAD616170VendedLogsMixinTestDeliveryLogGroupD06F335F":{"id":"CdkLogGroupDeliveryVendedLogsMixinTestDistributionAD616170VendedLogsMixinTestDeliveryLogGroupD06F335F","path":"VendedLogsMixinTest/Distribution/Resource/CdkLogGroupDeliveryVendedLogsMixinTestDistributionAD616170VendedLogsMixinTestDeliveryLogGroupD06F335F","constructInfo":{"fqn":"constructs.Construct","version":"10.4.2"},"children":{"Dest":{"id":"Dest","path":"VendedLogsMixinTest/Distribution/Resource/CdkLogGroupDeliveryVendedLogsMixinTestDistributionAD616170VendedLogsMixinTestDeliveryLogGroupD06F335F/Dest","constructInfo":{"fqn":"aws-cdk-lib.aws_logs.CfnDeliveryDestination","version":"0.0.0"},"attributes":{"aws:cdk:cloudformation:type":"AWS::Logs::DeliveryDestination","aws:cdk:cloudformation:props":{"deliveryDestinationType":"CWL","destinationResourceArn":{"Fn::GetAtt":["DeliveryLogGroup2A53FD53","Arn"]},"name":"cdk-cwl-dest-VendedLogsMixinTesteryLogGroupD06F335F73D12F53"}}},"Delivery":{"id":"Delivery","path":"VendedLogsMixinTest/Distribution/Resource/CdkLogGroupDeliveryVendedLogsMixinTestDistributionAD616170VendedLogsMixinTestDeliveryLogGroupD06F335F/Delivery","constructInfo":{"fqn":"aws-cdk-lib.aws_logs.CfnDelivery","version":"0.0.0"},"attributes":{"aws:cdk:cloudformation:type":"AWS::Logs::Delivery","aws:cdk:cloudformation:props":{"deliveryDestinationArn":{"Fn::GetAtt":["DistributionCdkLogGroupDeliveryVendedLogsMixinTestDistributionAD616170VendedLogsMixinTestDeliveryLogGroupD06F335FDest81EEE80A","Arn"]},"deliverySourceName":{"Ref":"DistributionCdkSourceVendedLogsMixinTestDistributionAD616170C405E503"}}}}}}}}}},"DeliveryLogGroup":{"id":"DeliveryLogGroup","path":"VendedLogsMixinTest/DeliveryLogGroup","constructInfo":{"fqn":"aws-cdk-lib.aws_logs.LogGroup","version":"0.0.0","metadata":[{"removalPolicy":"destroy"}]},"children":{"Resource":{"id":"Resource","path":"VendedLogsMixinTest/DeliveryLogGroup/Resource","constructInfo":{"fqn":"aws-cdk-lib.aws_logs.CfnLogGroup","version":"0.0.0"},"attributes":{"aws:cdk:cloudformation:type":"AWS::Logs::LogGroup","aws:cdk:cloudformation:props":{"retentionInDays":731}}}}},"CdkLogGroupLogsDeliveryPolicy":{"id":"CdkLogGroupLogsDeliveryPolicy","path":"VendedLogsMixinTest/CdkLogGroupLogsDeliveryPolicy","constructInfo":{"fqn":"aws-cdk-lib.aws_logs.ResourcePolicy","version":"0.0.0","metadata":[{}]},"children":{"ResourcePolicy":{"id":"ResourcePolicy","path":"VendedLogsMixinTest/CdkLogGroupLogsDeliveryPolicy/ResourcePolicy","constructInfo":{"fqn":"aws-cdk-lib.aws_logs.CfnResourcePolicy","version":"0.0.0"},"attributes":{"aws:cdk:cloudformation:type":"AWS::Logs::ResourcePolicy","aws:cdk:cloudformation:props":{"policyDocument":{"Fn::Join":["",["{\"Statement\":[{\"Action\":[\"logs:CreateLogStream\",\"logs:PutLogEvents\"],\"Condition\":{\"StringEquals\":{\"aws:SourceAccount\":\"",{"Ref":"AWS::AccountId"},"\"},\"ArnLike\":{\"aws:SourceArn\":\"arn:",{"Ref":"AWS::Partition"},":logs:",{"Ref":"AWS::Region"},":",{"Ref":"AWS::AccountId"},":*\"}},\"Effect\":\"Allow\",\"Principal\":{\"Service\":\"delivery.logs.amazonaws.com\"},\"Resource\":\"",{"Fn::GetAtt":["DeliveryLogGroup2A53FD53","Arn"]},":log-stream:*\"}],\"Version\":\"2012-10-17\"}"]]},"policyName":"VendedLogsMixinTestDistributionCdkLogGroupDeliveryVendedLogsMixinTestDistributionAD616170VendedLogsMixinTestDeliveryLogGroupD06F335F73D12F53"}}}}},"BootstrapVersion":{"id":"BootstrapVersion","path":"VendedLogsMixinTest/BootstrapVersion","constructInfo":{"fqn":"aws-cdk-lib.CfnParameter","version":"0.0.0"}},"CheckBootstrapVersion":{"id":"CheckBootstrapVersion","path":"VendedLogsMixinTest/CheckBootstrapVersion","constructInfo":{"fqn":"aws-cdk-lib.CfnRule","version":"0.0.0"}}}},"DeliveryTest":{"id":"DeliveryTest","path":"DeliveryTest","constructInfo":{"fqn":"@aws-cdk/integ-tests-alpha.IntegTest","version":"0.0.0"},"children":{"DefaultTest":{"id":"DefaultTest","path":"DeliveryTest/DefaultTest","constructInfo":{"fqn":"@aws-cdk/integ-tests-alpha.IntegTestCase","version":"0.0.0"},"children":{"Default":{"id":"Default","path":"DeliveryTest/DefaultTest/Default","constructInfo":{"fqn":"constructs.Construct","version":"10.4.2"}},"DeployAssert":{"id":"DeployAssert","path":"DeliveryTest/DefaultTest/DeployAssert","constructInfo":{"fqn":"aws-cdk-lib.Stack","version":"0.0.0"},"children":{"BootstrapVersion":{"id":"BootstrapVersion","path":"DeliveryTest/DefaultTest/DeployAssert/BootstrapVersion","constructInfo":{"fqn":"aws-cdk-lib.CfnParameter","version":"0.0.0"}},"CheckBootstrapVersion":{"id":"CheckBootstrapVersion","path":"DeliveryTest/DefaultTest/DeployAssert/CheckBootstrapVersion","constructInfo":{"fqn":"aws-cdk-lib.CfnRule","version":"0.0.0"}}}}}}}},"Tree":{"id":"Tree","path":"Tree","constructInfo":{"fqn":"constructs.Construct","version":"10.4.2"}}}}} \ No newline at end of file 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 new file mode 100644 index 0000000000000..0b775d15b9cfd --- /dev/null +++ b/packages/@aws-cdk/mixins-preview/test/services/aws-logs/integ.delivery-mixin.ts @@ -0,0 +1,36 @@ +import * as cdk from 'aws-cdk-lib/core'; +import * as integ from '@aws-cdk/integ-tests-alpha'; +import * as s3 from 'aws-cdk-lib/aws-s3'; +import * as logs from 'aws-cdk-lib/aws-logs'; +import * as cloudfront from 'aws-cdk-lib/aws-cloudfront'; +import * as origins from 'aws-cdk-lib/aws-cloudfront-origins'; +import { CfnDistributionLogsMixin } from '../../../lib/services/aws-cloudfront/mixins'; +import '../../../lib/with'; + +const app = new cdk.App(); + +const stack = new cdk.Stack(app, 'VendedLogsMixinTest'); + +// Source Resource +const cloudfrontBucket = new s3.Bucket(stack, 'OriginBucket', { + removalPolicy: cdk.RemovalPolicy.DESTROY, + autoDeleteObjects: true, +}); +const distribution = new cloudfront.Distribution(stack, 'Distribution', { + defaultBehavior: { + origin: origins.S3BucketOrigin.withOriginAccessControl(cloudfrontBucket), + }, +}); + +// Destination +const logGroup = new logs.LogGroup(stack, 'DeliveryLogGroup', { + removalPolicy: cdk.RemovalPolicy.DESTROY, +}); + +// Setup delivery +distribution + .with(CfnDistributionLogsMixin.CONNECTION_LOGS.toLogGroup(logGroup)); + +new integ.IntegTest(app, 'DeliveryTest', { + testCases: [stack], +}); diff --git a/tools/@aws-cdk/spec2cdk/lib/cdk/cdk.ts b/tools/@aws-cdk/spec2cdk/lib/cdk/cdk.ts index 3a7e5448db115..b892a9229bec2 100644 --- a/tools/@aws-cdk/spec2cdk/lib/cdk/cdk.ts +++ b/tools/@aws-cdk/spec2cdk/lib/cdk/cdk.ts @@ -18,6 +18,8 @@ export class CdkCore extends ExternalModule { public readonly ITaggableV2 = Type.fromName(this, 'ITaggableV2'); public readonly IResolvable = Type.fromName(this, 'IResolvable'); public readonly Stack = Type.fromName(this, 'Stack'); + public readonly Names = $T(Type.fromName(this, 'Names')); + public readonly Arn = $T(Type.fromName(this, 'Arn')); public readonly objectToCloudFormation = makeCallableExpr(this, 'objectToCloudFormation'); public readonly eventPatternToCloudFormation = makeCallableExpr(this, 'eventPatternToCloudFormation'); @@ -64,6 +66,18 @@ export class CdkCore extends ExternalModule { public tokenAsList(arg: Expression) { return this.Token.asList(arg); } + + public uniqueId(arg: Expression) { + return this.Names.uniqueId(arg); + } + + public uniqueResourceName(...args: Expression[]) { + return this.Names.uniqueResourceName(...args); + } + + public arnFormat(...args: Expression[]) { + return this.Arn.format(...args); + } } export class Interfaces extends ExternalModule {