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

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

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

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

@@ -2,6 +2,7 @@ import * as cdk from "aws-cdk-lib/core";
 import * as constructs from "constructs";
 import * as mixins from "../../mixins";
 import * as service from "aws-cdk-lib/aws-eks";
+import { aws_ec2 as ec2Refs, aws_eks as eksRefs, aws_iam as iamRefs } from "aws-cdk-lib/interfaces";
 /**
  * Creates an Amazon EKS add-on.
  *
@@ -15,7 +16,7 @@ import * as service from "aws-cdk-lib/aws-eks";
 export declare class CfnAddonPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnAddonMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::EKS::Addon`.
      *
@@ -153,7 +154,7 @@ export interface CfnAddonMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-addon.html#cfn-eks-addon-serviceaccountrolearn
      */
-    readonly serviceAccountRoleArn?: string;
+    readonly serviceAccountRoleArn?: iamRefs.IRoleRef | string;
     /**
      * The metadata that you apply to the add-on to assist with categorization and organization.
      *
@@ -188,7 +189,7 @@ export interface CfnAddonMixinProps {
 export declare class CfnClusterPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnClusterMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::EKS::Cluster`.
      *
@@ -470,7 +471,7 @@ export declare namespace CfnClusterPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-resourcesvpcconfig.html#cfn-eks-cluster-resourcesvpcconfig-securitygroupids
          */
-        readonly securityGroupIds?: Array<string>;
+        readonly securityGroupIds?: Array<ec2Refs.ISecurityGroupRef | string>;
         /**
          * Specify subnets for your Amazon EKS nodes.
          *
@@ -478,7 +479,7 @@ export declare namespace CfnClusterPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-resourcesvpcconfig.html#cfn-eks-cluster-resourcesvpcconfig-subnetids
          */
-        readonly subnetIds?: Array<string>;
+        readonly subnetIds?: Array<ec2Refs.ISubnetRef | string>;
     }
     /**
      * The access configuration for the cluster.
@@ -865,7 +866,7 @@ export interface CfnClusterMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-cluster.html#cfn-eks-cluster-rolearn
      */
-    readonly roleArn?: string;
+    readonly roleArn?: iamRefs.IRoleRef | string;
     /**
      * Indicates the current configuration of the block storage capability on your EKS Auto Mode cluster.
      *
@@ -932,7 +933,7 @@ export interface CfnClusterMixinProps {
 export declare class CfnFargateProfilePropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnFargateProfileMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::EKS::FargateProfile`.
      *
@@ -1061,7 +1062,7 @@ export interface CfnFargateProfileMixinProps {
 export declare class CfnIdentityProviderConfigPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnIdentityProviderConfigMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::EKS::IdentityProviderConfig`.
      *
@@ -1224,7 +1225,7 @@ export interface CfnIdentityProviderConfigMixinProps {
 export declare class CfnNodegroupPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnNodegroupMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::EKS::Nodegroup`.
      *
@@ -1362,7 +1363,7 @@ export declare namespace CfnNodegroupPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-nodegroup-launchtemplatespecification.html#cfn-eks-nodegroup-launchtemplatespecification-id
          */
-        readonly id?: string;
+        readonly id?: ec2Refs.ILaunchTemplateRef | string;
         /**
          * The name of the launch template.
          *
@@ -1525,7 +1526,7 @@ export interface CfnNodegroupMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-nodegroup.html#cfn-eks-nodegroup-clustername
      */
-    readonly clusterName?: string;
+    readonly clusterName?: eksRefs.IClusterRef | string;
     /**
      * The root device disk size (in GiB) for your node group instances.
      *
@@ -1588,7 +1589,7 @@ export interface CfnNodegroupMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-nodegroup.html#cfn-eks-nodegroup-noderole
      */
-    readonly nodeRole?: string;
+    readonly nodeRole?: iamRefs.IRoleRef | string;
     /**
      * The AMI version of the Amazon EKS optimized AMI to use with your node group (for example, `1.14.7- *YYYYMMDD*` ). By default, the latest available AMI version for the node group's current Kubernetes version is used. For more information, see [Amazon EKS optimized Linux AMI Versions](https://docs.aws.amazon.com/eks/latest/userguide/eks-linux-ami-versions.html) in the *Amazon EKS User Guide* .
      *
@@ -1618,7 +1619,7 @@ export interface CfnNodegroupMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-nodegroup.html#cfn-eks-nodegroup-subnets
      */
-    readonly subnets?: Array<string>;
+    readonly subnets?: Array<ec2Refs.ISubnetRef | string>;
     /**
      * Metadata that assists with categorization and organization.
      *
@@ -1667,7 +1668,7 @@ export interface CfnNodegroupMixinProps {
 export declare class CfnAccessEntryPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnAccessEntryMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::EKS::AccessEntry`.
      *
@@ -1818,7 +1819,7 @@ export interface CfnAccessEntryMixinProps {
 export declare class CfnCapabilityPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnCapabilityMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::EKS::Capability`.
      *
@@ -2081,7 +2082,7 @@ export interface CfnCapabilityMixinProps {
 export declare class CfnPodIdentityAssociationPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnPodIdentityAssociationMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::EKS::PodIdentityAssociation`.
      *

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

@@ -6,7 +6,6 @@ const JSII_RTTI_SYMBOL_1 = Symbol.for("jsii.rtti");
 /* eslint-disable @stylistic/max-len, eol-last */
 const cdk = require("aws-cdk-lib/core");
 const mixins = require("../../mixins");
-const helpers = require("../../util/property-mixins");
 const service = require("aws-cdk-lib/aws-eks");
 /**
  * Creates an Amazon EKS add-on.
@@ -19,7 +18,7 @@ const service = require("aws-cdk-lib/aws-eks");
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-addon.html
  */
 class CfnAddonPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_eks.mixins.CfnAddonPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_eks.mixins.CfnAddonPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["addonName", "addonVersion", "clusterName", "configurationValues", "namespaceConfig", "podIdentityAssociations", "preserveOnDelete", "resolveConflicts", "serviceAccountRoleArn", "tags"];
     props;
     strategy;
@@ -41,8 +40,11 @@ class CfnAddonPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnAddonMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -55,16 +57,18 @@ class CfnAddonPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnAddonPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnAddonPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnAddonPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnAddonPropsMixin = CfnAddonPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnAddonMixinProps(props) {
+    const ret = {};
+    if ((props.serviceAccountRoleArn !== undefined))
+        ret.serviceAccountRoleArn = cdk.getRefProperty(props.serviceAccountRoleArn?.roleRef, 'roleArn') ?? cdk.ensureStringOrUndefined(props.serviceAccountRoleArn, "serviceAccountRoleArn", "iam.IRoleRef | string");
+    return ret;
+}
 /**
  * Creates an Amazon EKS control plane.
  *
@@ -88,7 +92,7 @@ exports.CfnAddonPropsMixin = CfnAddonPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-cluster.html
  */
 class CfnClusterPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_eks.mixins.CfnClusterPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_eks.mixins.CfnClusterPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["accessConfig", "bootstrapSelfManagedAddons", "computeConfig", "controlPlaneScalingConfig", "deletionProtection", "encryptionConfig", "force", "kubernetesNetworkConfig", "logging", "name", "outpostConfig", "remoteNetworkConfig", "resourcesVpcConfig", "roleArn", "storageConfig", "tags", "upgradePolicy", "version", "zonalShiftConfig"];
     props;
     strategy;
@@ -110,8 +114,11 @@ class CfnClusterPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnClusterMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -124,16 +131,34 @@ class CfnClusterPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnClusterPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnClusterPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnClusterPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnClusterPropsMixin = CfnClusterPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnClusterPropsMixinResourcesVpcConfigProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        endpointPrivateAccess: (!props.endpointPrivateAccess ? undefined : props.endpointPrivateAccess),
+        endpointPublicAccess: (!props.endpointPublicAccess ? undefined : props.endpointPublicAccess),
+        publicAccessCidrs: (!props.publicAccessCidrs ? undefined : props.publicAccessCidrs),
+        securityGroupIds: (!props.securityGroupIds ? undefined : cdk.mapArrayInPlace(props.securityGroupIds, (item) => cdk.getRefProperty(item?.securityGroupRef, 'securityGroupId') ?? cdk.ensureStringOrUndefined(item, "securityGroupIds", "ec2.ISecurityGroupRef | string"))),
+        subnetIds: (!props.subnetIds ? undefined : cdk.mapArrayInPlace(props.subnetIds, (item) => cdk.getRefProperty(item?.subnetRef, 'subnetId') ?? cdk.ensureStringOrUndefined(item, "subnetIds", "ec2.ISubnetRef | string")))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnClusterMixinProps(props) {
+    const ret = {};
+    if ((props.name !== undefined))
+        ret.name = props.name;
+    if ((props.resourcesVpcConfig !== undefined))
+        ret.resourcesVpcConfig = flattenCfnClusterPropsMixinResourcesVpcConfigProperty(props.resourcesVpcConfig);
+    if ((props.roleArn !== undefined))
+        ret.roleArn = cdk.getRefProperty(props.roleArn?.roleRef, 'roleArn') ?? cdk.ensureStringOrUndefined(props.roleArn, "roleArn", "iam.IRoleRef | string");
+    return ret;
+}
 /**
  * Creates an AWS Fargate profile for your Amazon EKS cluster.
  *
@@ -155,7 +180,7 @@ exports.CfnClusterPropsMixin = CfnClusterPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-fargateprofile.html
  */
 class CfnFargateProfilePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_eks.mixins.CfnFargateProfilePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_eks.mixins.CfnFargateProfilePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["clusterName", "fargateProfileName", "podExecutionRoleArn", "selectors", "subnets", "tags"];
     props;
     strategy;
@@ -178,7 +203,7 @@ class CfnFargateProfilePropsMixin extends cdk.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
@@ -191,12 +216,7 @@ class CfnFargateProfilePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnFargateProfilePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnFargateProfilePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnFargateProfilePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -212,7 +232,7 @@ exports.CfnFargateProfilePropsMixin = CfnFargateProfilePropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-identityproviderconfig.html
  */
 class CfnIdentityProviderConfigPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_eks.mixins.CfnIdentityProviderConfigPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_eks.mixins.CfnIdentityProviderConfigPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["clusterName", "identityProviderConfigName", "oidc", "tags", "type"];
     props;
     strategy;
@@ -235,7 +255,7 @@ class CfnIdentityProviderConfigPropsMixin extends cdk.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
@@ -248,12 +268,7 @@ class CfnIdentityProviderConfigPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnIdentityProviderConfigPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnIdentityProviderConfigPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnIdentityProviderConfigPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -275,7 +290,7 @@ exports.CfnIdentityProviderConfigPropsMixin = CfnIdentityProviderConfigPropsMixi
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-nodegroup.html
  */
 class CfnNodegroupPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_eks.mixins.CfnNodegroupPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_eks.mixins.CfnNodegroupPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["amiType", "capacityType", "clusterName", "diskSize", "forceUpdateEnabled", "instanceTypes", "labels", "launchTemplate", "nodegroupName", "nodeRepairConfig", "nodeRole", "releaseVersion", "remoteAccess", "scalingConfig", "subnets", "tags", "taints", "updateConfig", "version"];
     props;
     strategy;
@@ -297,8 +312,11 @@ class CfnNodegroupPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnNodegroupMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -311,16 +329,34 @@ class CfnNodegroupPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnNodegroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnNodegroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnNodegroupPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnNodegroupPropsMixin = CfnNodegroupPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnNodegroupPropsMixinLaunchTemplateSpecificationProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        id: (!props.id ? undefined : cdk.getRefProperty(props.id?.launchTemplateRef, 'launchTemplateId') ?? cdk.ensureStringOrUndefined(props.id, "id", "ec2.ILaunchTemplateRef | string")),
+        name: (!props.name ? undefined : props.name),
+        version: (!props.version ? undefined : props.version)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnNodegroupMixinProps(props) {
+    const ret = {};
+    if ((props.clusterName !== undefined))
+        ret.clusterName = cdk.getRefProperty(props.clusterName?.clusterRef, 'clusterName') ?? cdk.ensureStringOrUndefined(props.clusterName, "clusterName", "eks.IClusterRef | string");
+    if ((props.launchTemplate !== undefined))
+        ret.launchTemplate = flattenCfnNodegroupPropsMixinLaunchTemplateSpecificationProperty(props.launchTemplate);
+    if ((props.nodeRole !== undefined))
+        ret.nodeRole = cdk.getRefProperty(props.nodeRole?.roleRef, 'roleArn') ?? cdk.ensureStringOrUndefined(props.nodeRole, "nodeRole", "iam.IRoleRef | string");
+    if ((props.subnets !== undefined))
+        ret.subnets = cdk.mapArrayInPlace(props.subnets, (item) => cdk.getRefProperty(item?.subnetRef, 'subnetId') ?? cdk.ensureStringOrUndefined(item, "subnets", "ec2.ISubnetRef | string"));
+    return ret;
+}
 /**
  * Creates an access entry.
  *
@@ -334,7 +370,7 @@ exports.CfnNodegroupPropsMixin = CfnNodegroupPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-accessentry.html
  */
 class CfnAccessEntryPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_eks.mixins.CfnAccessEntryPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_eks.mixins.CfnAccessEntryPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["accessPolicies", "clusterName", "kubernetesGroups", "principalArn", "tags", "type", "username"];
     props;
     strategy;
@@ -357,7 +393,7 @@ class CfnAccessEntryPropsMixin extends cdk.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
@@ -370,12 +406,7 @@ class CfnAccessEntryPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnAccessEntryPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnAccessEntryPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnAccessEntryPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -391,7 +422,7 @@ exports.CfnAccessEntryPropsMixin = CfnAccessEntryPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-capability.html
  */
 class CfnCapabilityPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_eks.mixins.CfnCapabilityPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_eks.mixins.CfnCapabilityPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["capabilityName", "clusterName", "configuration", "deletePropagationPolicy", "roleArn", "tags", "type"];
     props;
     strategy;
@@ -414,7 +445,7 @@ class CfnCapabilityPropsMixin extends cdk.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
@@ -427,12 +458,7 @@ class CfnCapabilityPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnCapabilityPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnCapabilityPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnCapabilityPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -446,7 +472,7 @@ exports.CfnCapabilityPropsMixin = CfnCapabilityPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-podidentityassociation.html
  */
 class CfnPodIdentityAssociationPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_eks.mixins.CfnPodIdentityAssociationPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_eks.mixins.CfnPodIdentityAssociationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["clusterName", "disableSessionTags", "namespace", "policy", "roleArn", "serviceAccount", "tags", "targetRoleArn"];
     props;
     strategy;
@@ -469,7 +495,7 @@ class CfnPodIdentityAssociationPropsMixin extends cdk.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
@@ -482,12 +508,7 @@ class CfnPodIdentityAssociationPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnPodIdentityAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnPodIdentityAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnPodIdentityAssociationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }

package/lib/services/aws-eks/logs-delivery-mixins.generated.js

@@ -15,7 +15,7 @@ const service = require("aws-cdk-lib/aws-eks");
  * @stability external
  */
 class CfnClusterAutoModeBlockStorageLogs {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_eks.mixins.CfnClusterAutoModeBlockStorageLogs", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_eks.mixins.CfnClusterAutoModeBlockStorageLogs", version: "2.242.0-alpha.0" };
     /**
      * Send logs to an S3 Bucket
      *
@@ -123,7 +123,7 @@ exports.CfnClusterAutoModeBlockStorageLogs = CfnClusterAutoModeBlockStorageLogs;
  * @stability external
  */
 class CfnClusterAutoModeComputeLogs {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_eks.mixins.CfnClusterAutoModeComputeLogs", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_eks.mixins.CfnClusterAutoModeComputeLogs", version: "2.242.0-alpha.0" };
     /**
      * Send logs to an S3 Bucket
      *
@@ -231,7 +231,7 @@ exports.CfnClusterAutoModeComputeLogs = CfnClusterAutoModeComputeLogs;
  * @stability external
  */
 class CfnClusterAutoModeIpamLogs {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_eks.mixins.CfnClusterAutoModeIpamLogs", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_eks.mixins.CfnClusterAutoModeIpamLogs", version: "2.242.0-alpha.0" };
     /**
      * Send logs to an S3 Bucket
      *
@@ -339,7 +339,7 @@ exports.CfnClusterAutoModeIpamLogs = CfnClusterAutoModeIpamLogs;
  * @stability external
  */
 class CfnClusterAutoModeLoadBalancingLogs {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_eks.mixins.CfnClusterAutoModeLoadBalancingLogs", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_eks.mixins.CfnClusterAutoModeLoadBalancingLogs", version: "2.242.0-alpha.0" };
     /**
      * Send logs to an S3 Bucket
      *
@@ -462,7 +462,7 @@ exports.CfnClusterAutoModeLoadBalancingLogs = CfnClusterAutoModeLoadBalancingLog
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-cluster.html
  */
 class CfnClusterLogsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_eks.mixins.CfnClusterLogsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_eks.mixins.CfnClusterLogsMixin", version: "2.242.0-alpha.0" };
     static AUTO_MODE_BLOCK_STORAGE_LOGS = new CfnClusterAutoModeBlockStorageLogs();
     static AUTO_MODE_COMPUTE_LOGS = new CfnClusterAutoModeComputeLogs();
     static AUTO_MODE_IPAM_LOGS = new CfnClusterAutoModeIpamLogs();
@@ -511,7 +511,7 @@ exports.CfnClusterLogsMixin = CfnClusterLogsMixin;
  * Output Format options for each destination of CfnClusterAutoModeBlockStorageLogs.
  */
 class CfnClusterAutoModeBlockStorageLogsOutputFormat {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_eks.mixins.CfnClusterAutoModeBlockStorageLogsOutputFormat", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_eks.mixins.CfnClusterAutoModeBlockStorageLogsOutputFormat", version: "2.242.0-alpha.0" };
 }
 exports.CfnClusterAutoModeBlockStorageLogsOutputFormat = CfnClusterAutoModeBlockStorageLogsOutputFormat;
 (function (CfnClusterAutoModeBlockStorageLogsOutputFormat) {
@@ -550,7 +550,7 @@ var CfnClusterAutoModeBlockStorageLogsRecordFields;
  * Output Format options for each destination of CfnClusterAutoModeComputeLogs.
  */
 class CfnClusterAutoModeComputeLogsOutputFormat {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_eks.mixins.CfnClusterAutoModeComputeLogsOutputFormat", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_eks.mixins.CfnClusterAutoModeComputeLogsOutputFormat", version: "2.242.0-alpha.0" };
 }
 exports.CfnClusterAutoModeComputeLogsOutputFormat = CfnClusterAutoModeComputeLogsOutputFormat;
 (function (CfnClusterAutoModeComputeLogsOutputFormat) {
@@ -596,7 +596,7 @@ var CfnClusterAutoModeComputeLogsRecordFields;
  * Output Format options for each destination of CfnClusterAutoModeIpamLogs.
  */
 class CfnClusterAutoModeIpamLogsOutputFormat {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_eks.mixins.CfnClusterAutoModeIpamLogsOutputFormat", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_eks.mixins.CfnClusterAutoModeIpamLogsOutputFormat", version: "2.242.0-alpha.0" };
 }
 exports.CfnClusterAutoModeIpamLogsOutputFormat = CfnClusterAutoModeIpamLogsOutputFormat;
 (function (CfnClusterAutoModeIpamLogsOutputFormat) {
@@ -638,7 +638,7 @@ var CfnClusterAutoModeIpamLogsRecordFields;
  * Output Format options for each destination of CfnClusterAutoModeLoadBalancingLogs.
  */
 class CfnClusterAutoModeLoadBalancingLogsOutputFormat {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_eks.mixins.CfnClusterAutoModeLoadBalancingLogsOutputFormat", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_eks.mixins.CfnClusterAutoModeLoadBalancingLogsOutputFormat", version: "2.242.0-alpha.0" };
 }
 exports.CfnClusterAutoModeLoadBalancingLogsOutputFormat = CfnClusterAutoModeLoadBalancingLogsOutputFormat;
 (function (CfnClusterAutoModeLoadBalancingLogsOutputFormat) {

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

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

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

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

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

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