@aws-cdk/mixins-preview 2.240.0-alpha.0 → 2.242.0-alpha.0

package/lib/services/aws-cloud9/cfn-props-mixins.generated.js

@@ -5,9 +5,7 @@ const jsiiDeprecationWarnings = require("../../../.warnings.jsii.js");
 const JSII_RTTI_SYMBOL_1 = Symbol.for("jsii.rtti");
 /* eslint-disable @stylistic/max-len, eol-last */
 const cdk = require("aws-cdk-lib/core");
-const core = require("../../core");
 const mixins = require("../../mixins");
-const helpers = require("../../util/property-mixins");
 const service = require("aws-cdk-lib/aws-cloud9");
 /**
  * The `AWS::Cloud9::EnvironmentEC2` resource creates an Amazon EC2 development environment in AWS Cloud9 .
@@ -19,8 +17,8 @@ const service = require("aws-cdk-lib/aws-cloud9");
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloud9-environmentec2.html
  */
-class CfnEnvironmentEC2PropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloud9.mixins.CfnEnvironmentEC2PropsMixin", version: "2.240.0-alpha.0" };
+class CfnEnvironmentEC2PropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloud9.mixins.CfnEnvironmentEC2PropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["automaticStopTimeMinutes", "connectionType", "description", "imageId", "instanceType", "name", "ownerArn", "repositories", "subnetId", "tags"];
     props;
     strategy;
@@ -43,7 +41,7 @@ class CfnEnvironmentEC2PropsMixin extends core.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -56,12 +54,7 @@ class CfnEnvironmentEC2PropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnEnvironmentEC2PropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnEnvironmentEC2PropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnEnvironmentEC2PropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }

package/lib/services/aws-cloudformation/.events.jsiirc.json

@@ -0,0 +1,16 @@
+{
+  "targets": {
+    "java": {
+      "package": "software.amazon.awscdk.mixins.preview.services.cloudformation.events"
+    },
+    "dotnet": {
+      "namespace": "Amazon.CDK.Mixins.Preview.AWS.CloudFormation.Events"
+    },
+    "python": {
+      "module": "aws_cdk.mixins_preview.aws_cloudformation.events"
+    },
+    "go": {
+      "packageName": "previewawscloudformationevents"
+    }
+  }
+}

package/lib/services/aws-cloudformation/.jsiirc.json

@@ -4,8 +4,7 @@
       "package": "software.amazon.awscdk.mixins.preview.services.cloudformation"
     },
     "dotnet": {
-      "namespace": "Amazon.CDK.Mixins.Preview.AWS.CloudFormation",
-      "packageId": "Amazon.CDK.Mixins.Preview.AWS.CloudFormation"
+      "namespace": "Amazon.CDK.Mixins.Preview.AWS.CloudFormation"
     },
     "python": {
       "module": "aws_cdk.mixins_preview.aws_cloudformation"

package/lib/services/aws-cloudformation/.mixins.jsiirc.json

@@ -4,8 +4,7 @@
       "package": "software.amazon.awscdk.mixins.preview.services.cloudformation.mixins"
     },
     "dotnet": {
-      "namespace": "Amazon.CDK.Mixins.Preview.AWS.CloudFormation.Mixins",
-      "packageId": "Amazon.CDK.Mixins.Preview.AWS.CloudFormation.Mixins"
+      "namespace": "Amazon.CDK.Mixins.Preview.AWS.CloudFormation.Mixins"
     },
     "python": {
       "module": "aws_cdk.mixins_preview.aws_cloudformation.mixins"

package/lib/services/aws-cloudformation/cfn-props-mixins.generated.d.ts

@@ -1,8 +1,8 @@
 import * as cdk from "aws-cdk-lib/core";
 import * as constructs from "constructs";
-import * as core from "../../core";
 import * as mixins from "../../mixins";
 import * as service from "aws-cdk-lib/aws-cloudformation";
+import { aws_cloudformation as cloudFormationRefs, aws_iam as iamRefs } from "aws-cdk-lib/interfaces";
 /**
  * The `AWS::CloudFormation::CustomResource` resource creates a custom resource.
  *
@@ -17,10 +17,10 @@ import * as service from "aws-cdk-lib/aws-cloudformation";
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-customresource.html
  */
-export declare class CfnCustomResourcePropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnCustomResourcePropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnCustomResourceMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::CloudFormation::CustomResource`.
      *
@@ -78,10 +78,10 @@ export interface CfnCustomResourceMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-hookdefaultversion.html
  */
-export declare class CfnHookDefaultVersionPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnHookDefaultVersionPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnHookDefaultVersionMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::CloudFormation::HookDefaultVersion`.
      *
@@ -141,10 +141,10 @@ export interface CfnHookDefaultVersionMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-hooktypeconfig.html
  */
-export declare class CfnHookTypeConfigPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnHookTypeConfigPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnHookTypeConfigMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::CloudFormation::HookTypeConfig`.
      *
@@ -217,10 +217,10 @@ export interface CfnHookTypeConfigMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-hookversion.html
  */
-export declare class CfnHookVersionPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnHookVersionPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnHookVersionMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::CloudFormation::HookVersion`.
      *
@@ -319,10 +319,10 @@ export interface CfnHookVersionMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-macro.html
  */
-export declare class CfnMacroPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnMacroPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnMacroMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::CloudFormation::Macro`.
      *
@@ -396,10 +396,10 @@ export interface CfnMacroMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-moduledefaultversion.html
  */
-export declare class CfnModuleDefaultVersionPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnModuleDefaultVersionPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnModuleDefaultVersionMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::CloudFormation::ModuleDefaultVersion`.
      *
@@ -431,7 +431,7 @@ export interface CfnModuleDefaultVersionMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-moduledefaultversion.html#cfn-cloudformation-moduledefaultversion-arn
      */
-    readonly arn?: string;
+    readonly arn?: cloudFormationRefs.IModuleVersionRef | string;
     /**
      * The name of the module.
      *
@@ -463,10 +463,10 @@ export interface CfnModuleDefaultVersionMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-moduleversion.html
  */
-export declare class CfnModuleVersionPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnModuleVersionPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnModuleVersionMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::CloudFormation::ModuleVersion`.
      *
@@ -529,10 +529,10 @@ export interface CfnModuleVersionMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-publictypeversion.html
  */
-export declare class CfnPublicTypeVersionPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnPublicTypeVersionPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnPublicTypeVersionMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::CloudFormation::PublicTypeVersion`.
      *
@@ -623,10 +623,10 @@ export interface CfnPublicTypeVersionMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-publisher.html
  */
-export declare class CfnPublisherPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnPublisherPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnPublisherMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::CloudFormation::Publisher`.
      *
@@ -680,10 +680,10 @@ export interface CfnPublisherMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-resourcedefaultversion.html
  */
-export declare class CfnResourceDefaultVersionPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnResourceDefaultVersionPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnResourceDefaultVersionMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::CloudFormation::ResourceDefaultVersion`.
      *
@@ -723,7 +723,7 @@ export interface CfnResourceDefaultVersionMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-resourcedefaultversion.html#cfn-cloudformation-resourcedefaultversion-typeversionarn
      */
-    readonly typeVersionArn?: string;
+    readonly typeVersionArn?: cloudFormationRefs.IResourceVersionRef | string;
     /**
      * The ID of a specific version of the resource.
      *
@@ -753,10 +753,10 @@ export interface CfnResourceDefaultVersionMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-resourceversion.html
  */
-export declare class CfnResourceVersionPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnResourceVersionPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnResourceVersionMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::CloudFormation::ResourceVersion`.
      *
@@ -898,10 +898,10 @@ export interface CfnResourceVersionMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-stack.html
  */
-export declare class CfnStackPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnStackPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnStackMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::CloudFormation::Stack`.
      *
@@ -1024,10 +1024,10 @@ export interface CfnStackMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-stackset.html
  */
-export declare class CfnStackSetPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnStackSetPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnStackSetMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::CloudFormation::StackSet`.
      *
@@ -1311,7 +1311,7 @@ export interface CfnStackSetMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-stackset.html#cfn-cloudformation-stackset-administrationrolearn
      */
-    readonly administrationRoleArn?: string;
+    readonly administrationRoleArn?: iamRefs.IRoleRef | string;
     /**
      * Describes whether StackSets automatically deploys to AWS Organizations accounts that are added to a target organization or organizational unit (OU).
      *
@@ -1364,7 +1364,7 @@ export interface CfnStackSetMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-stackset.html#cfn-cloudformation-stackset-executionrolename
      */
-    readonly executionRoleName?: string;
+    readonly executionRoleName?: iamRefs.IRoleRef | string;
     /**
      * Describes whether StackSets performs non-conflicting operations concurrently and queues conflicting operations.
      *
@@ -1453,10 +1453,10 @@ export interface CfnStackSetMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-typeactivation.html
  */
-export declare class CfnTypeActivationPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnTypeActivationPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnTypeActivationMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::CloudFormation::TypeActivation`.
      *
@@ -1602,10 +1602,10 @@ export interface CfnTypeActivationMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-waitcondition.html
  */
-export declare class CfnWaitConditionPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnWaitConditionPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnWaitConditionMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::CloudFormation::WaitCondition`.
      *
@@ -1679,10 +1679,10 @@ export interface CfnWaitConditionMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-waitconditionhandle.html
  */
-export declare class CfnWaitConditionHandlePropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnWaitConditionHandlePropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnWaitConditionHandleMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::CloudFormation::WaitConditionHandle`.
      *
@@ -1720,10 +1720,10 @@ export interface CfnWaitConditionHandleMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-guardhook.html
  */
-export declare class CfnGuardHookPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnGuardHookPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnGuardHookMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::CloudFormation::GuardHook`.
      *
@@ -2047,10 +2047,10 @@ export interface CfnGuardHookMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-lambdahook.html
  */
-export declare class CfnLambdaHookPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnLambdaHookPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnLambdaHookMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::CloudFormation::LambdaHook`.
      *