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

package/lib/services/aws-efs/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-efs");
 /**
  * The `AWS::EFS::AccessPoint` resource creates an EFS access point.
@@ -21,8 +19,8 @@ const service = require("aws-cdk-lib/aws-efs");
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-efs-accesspoint.html
  */
-class CfnAccessPointPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_efs.mixins.CfnAccessPointPropsMixin", version: "2.240.0-alpha.0" };
+class CfnAccessPointPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_efs.mixins.CfnAccessPointPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["accessPointTags", "clientToken", "fileSystemId", "posixUser", "rootDirectory"];
     props;
     strategy;
@@ -44,8 +42,11 @@ class CfnAccessPointPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnAccessPointMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -58,16 +59,18 @@ class CfnAccessPointPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnAccessPointPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnAccessPointPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnAccessPointPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnAccessPointPropsMixin = CfnAccessPointPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnAccessPointMixinProps(props) {
+    const ret = {};
+    if ((props.fileSystemId !== undefined))
+        ret.fileSystemId = cdk.getRefProperty(props.fileSystemId?.fileSystemRef, 'fileSystemId') ?? cdk.ensureStringOrUndefined(props.fileSystemId, "fileSystemId", "efs.IFileSystemRef | string");
+    return ret;
+}
 /**
  * The `AWS::EFS::FileSystem` resource creates a new, empty file system in Amazon Elastic File System ( Amazon EFS ).
  *
@@ -78,8 +81,8 @@ exports.CfnAccessPointPropsMixin = CfnAccessPointPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-efs-filesystem.html
  */
-class CfnFileSystemPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_efs.mixins.CfnFileSystemPropsMixin", version: "2.240.0-alpha.0" };
+class CfnFileSystemPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_efs.mixins.CfnFileSystemPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["availabilityZoneName", "backupPolicy", "bypassPolicyLockoutSafetyCheck", "encrypted", "fileSystemPolicy", "fileSystemProtection", "fileSystemTags", "kmsKeyId", "lifecyclePolicies", "performanceMode", "provisionedThroughputInMibps", "replicationConfiguration", "throughputMode"];
     props;
     strategy;
@@ -101,8 +104,11 @@ class CfnFileSystemPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnFileSystemMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -115,16 +121,18 @@ class CfnFileSystemPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnFileSystemPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnFileSystemPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnFileSystemPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnFileSystemPropsMixin = CfnFileSystemPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnFileSystemMixinProps(props) {
+    const ret = {};
+    if ((props.kmsKeyId !== undefined))
+        ret.kmsKeyId = cdk.getRefProperty(props.kmsKeyId?.keyRef, 'keyArn') ?? cdk.ensureStringOrUndefined(props.kmsKeyId, "kmsKeyId", "kms.IKeyRef | string");
+    return ret;
+}
 /**
  * The `AWS::EFS::MountTarget` resource is an Amazon EFS resource that creates a mount target for an EFS file system.
  *
@@ -135,8 +143,8 @@ exports.CfnFileSystemPropsMixin = CfnFileSystemPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-efs-mounttarget.html
  */
-class CfnMountTargetPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_efs.mixins.CfnMountTargetPropsMixin", version: "2.240.0-alpha.0" };
+class CfnMountTargetPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_efs.mixins.CfnMountTargetPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["fileSystemId", "ipAddress", "ipAddressType", "ipv6Address", "securityGroups", "subnetId"];
     props;
     strategy;
@@ -158,8 +166,11 @@ class CfnMountTargetPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnMountTargetMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -172,13 +183,19 @@ class CfnMountTargetPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnMountTargetPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnMountTargetPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnMountTargetPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnMountTargetPropsMixin = CfnMountTargetPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnMountTargetMixinProps(props) {
+    const ret = {};
+    if ((props.fileSystemId !== undefined))
+        ret.fileSystemId = cdk.getRefProperty(props.fileSystemId?.fileSystemRef, 'fileSystemId') ?? cdk.ensureStringOrUndefined(props.fileSystemId, "fileSystemId", "efs.IFileSystemRef | string");
+    if ((props.securityGroups !== undefined))
+        ret.securityGroups = cdk.mapArrayInPlace(props.securityGroups, (item) => cdk.getRefProperty(item?.securityGroupRef, 'securityGroupId') ?? cdk.ensureStringOrUndefined(item, "securityGroups", "ec2.ISecurityGroupRef | string"));
+    if ((props.subnetId !== undefined))
+        ret.subnetId = cdk.getRefProperty(props.subnetId?.subnetRef, 'subnetId') ?? cdk.ensureStringOrUndefined(props.subnetId, "subnetId", "ec2.ISubnetRef | string");
+    return ret;
+}

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

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

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

@@ -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-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.
  *
@@ -13,10 +13,10 @@ import * as service from "aws-cdk-lib/aws-eks";
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-addon.html
  */
-export declare class CfnAddonPropsMixin extends core.Mixin implements core.IMixin {
+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`.
      *
@@ -154,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.
      *
@@ -186,10 +186,10 @@ export interface CfnAddonMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-cluster.html
  */
-export declare class CfnClusterPropsMixin extends core.Mixin implements core.IMixin {
+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`.
      *
@@ -471,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.
          *
@@ -479,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.
@@ -506,6 +506,111 @@ export declare namespace CfnClusterPropsMixin {
          */
         readonly bootstrapClusterCreatorAdminPermissions?: boolean | cdk.IResolvable;
     }
+    /**
+     * The control plane scaling tier configuration.
+     *
+     * For more information, see EKS Provisioned Control Plane in the Amazon EKS User Guide.
+     *
+     * @struct
+     * @stability external
+     * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-controlplanescalingconfig.html
+     */
+    interface ControlPlaneScalingConfigProperty {
+        /**
+         * The control plane scaling tier configuration.
+         *
+         * Available options are `standard` , `tier-xl` , `tier-2xl` , or `tier-4xl` . For more information, see EKS Provisioned Control Plane in the Amazon EKS User Guide.
+         *
+         * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-controlplanescalingconfig.html#cfn-eks-cluster-controlplanescalingconfig-tier
+         */
+        readonly tier?: string;
+    }
+    /**
+     * Indicates the current configuration of the compute capability on your EKS Auto Mode cluster.
+     *
+     * For example, if the capability is enabled or disabled. If the compute capability is enabled, EKS Auto Mode will create and delete EC2 Managed Instances in your AWS account. For more information, see EKS Auto Mode compute capability in the *Amazon EKS User Guide* .
+     *
+     * @struct
+     * @stability external
+     * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-computeconfig.html
+     */
+    interface ComputeConfigProperty {
+        /**
+         * Request to enable or disable the compute capability on your EKS Auto Mode cluster.
+         *
+         * If the compute capability is enabled, EKS Auto Mode will create and delete EC2 Managed Instances in your AWS account.
+         *
+         * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-computeconfig.html#cfn-eks-cluster-computeconfig-enabled
+         */
+        readonly enabled?: boolean | cdk.IResolvable;
+        /**
+         * Configuration for node pools that defines the compute resources for your EKS Auto Mode cluster.
+         *
+         * For more information, see EKS Auto Mode Node Pools in the *Amazon EKS User Guide* .
+         *
+         * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-computeconfig.html#cfn-eks-cluster-computeconfig-nodepools
+         */
+        readonly nodePools?: Array<string>;
+        /**
+         * The ARN of the IAM Role EKS will assign to EC2 Managed Instances in your EKS Auto Mode cluster.
+         *
+         * This value cannot be changed after the compute capability of EKS Auto Mode is enabled. For more information, see the IAM Reference in the *Amazon EKS User Guide* .
+         *
+         * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-computeconfig.html#cfn-eks-cluster-computeconfig-noderolearn
+         */
+        readonly nodeRoleArn?: string;
+    }
+    /**
+     * Request to update the configuration of the storage capability of your EKS Auto Mode cluster.
+     *
+     * For example, enable the capability. For more information, see EKS Auto Mode block storage capability in the *Amazon EKS User Guide* .
+     *
+     * @struct
+     * @stability external
+     * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-storageconfig.html
+     */
+    interface StorageConfigProperty {
+        /**
+         * Request to configure EBS Block Storage settings for your EKS Auto Mode cluster.
+         *
+         * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-storageconfig.html#cfn-eks-cluster-storageconfig-blockstorage
+         */
+        readonly blockStorage?: CfnClusterPropsMixin.BlockStorageProperty | cdk.IResolvable;
+    }
+    /**
+     * Indicates the current configuration of the block storage capability on your EKS Auto Mode cluster.
+     *
+     * For example, if the capability is enabled or disabled. If the block storage capability is enabled, EKS Auto Mode will create and delete EBS volumes in your AWS account. For more information, see EKS Auto Mode block storage capability in the *Amazon EKS User Guide* .
+     *
+     * @struct
+     * @stability external
+     * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-blockstorage.html
+     */
+    interface BlockStorageProperty {
+        /**
+         * Indicates if the block storage capability is enabled on your EKS Auto Mode cluster.
+         *
+         * If the block storage capability is enabled, EKS Auto Mode will create and delete EBS volumes in your AWS account.
+         *
+         * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-blockstorage.html#cfn-eks-cluster-blockstorage-enabled
+         */
+        readonly enabled?: boolean | cdk.IResolvable;
+    }
+    /**
+     * The configuration for zonal shift for the cluster.
+     *
+     * @struct
+     * @stability external
+     * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-zonalshiftconfig.html
+     */
+    interface ZonalShiftConfigProperty {
+        /**
+         * If zonal shift is enabled, AWS configures zonal autoshift for the cluster.
+         *
+         * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-zonalshiftconfig.html#cfn-eks-cluster-zonalshiftconfig-enabled
+         */
+        readonly enabled?: boolean | cdk.IResolvable;
+    }
     /**
      * The support policy to use for the cluster.
      *
@@ -648,111 +753,6 @@ export declare namespace CfnClusterPropsMixin {
          */
         readonly cidrs?: Array<string>;
     }
-    /**
-     * Indicates the current configuration of the compute capability on your EKS Auto Mode cluster.
-     *
-     * For example, if the capability is enabled or disabled. If the compute capability is enabled, EKS Auto Mode will create and delete EC2 Managed Instances in your AWS account. For more information, see EKS Auto Mode compute capability in the *Amazon EKS User Guide* .
-     *
-     * @struct
-     * @stability external
-     * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-computeconfig.html
-     */
-    interface ComputeConfigProperty {
-        /**
-         * Request to enable or disable the compute capability on your EKS Auto Mode cluster.
-         *
-         * If the compute capability is enabled, EKS Auto Mode will create and delete EC2 Managed Instances in your AWS account.
-         *
-         * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-computeconfig.html#cfn-eks-cluster-computeconfig-enabled
-         */
-        readonly enabled?: boolean | cdk.IResolvable;
-        /**
-         * Configuration for node pools that defines the compute resources for your EKS Auto Mode cluster.
-         *
-         * For more information, see EKS Auto Mode Node Pools in the *Amazon EKS User Guide* .
-         *
-         * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-computeconfig.html#cfn-eks-cluster-computeconfig-nodepools
-         */
-        readonly nodePools?: Array<string>;
-        /**
-         * The ARN of the IAM Role EKS will assign to EC2 Managed Instances in your EKS Auto Mode cluster.
-         *
-         * This value cannot be changed after the compute capability of EKS Auto Mode is enabled. For more information, see the IAM Reference in the *Amazon EKS User Guide* .
-         *
-         * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-computeconfig.html#cfn-eks-cluster-computeconfig-noderolearn
-         */
-        readonly nodeRoleArn?: string;
-    }
-    /**
-     * Request to update the configuration of the storage capability of your EKS Auto Mode cluster.
-     *
-     * For example, enable the capability. For more information, see EKS Auto Mode block storage capability in the *Amazon EKS User Guide* .
-     *
-     * @struct
-     * @stability external
-     * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-storageconfig.html
-     */
-    interface StorageConfigProperty {
-        /**
-         * Request to configure EBS Block Storage settings for your EKS Auto Mode cluster.
-         *
-         * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-storageconfig.html#cfn-eks-cluster-storageconfig-blockstorage
-         */
-        readonly blockStorage?: CfnClusterPropsMixin.BlockStorageProperty | cdk.IResolvable;
-    }
-    /**
-     * Indicates the current configuration of the block storage capability on your EKS Auto Mode cluster.
-     *
-     * For example, if the capability is enabled or disabled. If the block storage capability is enabled, EKS Auto Mode will create and delete EBS volumes in your AWS account. For more information, see EKS Auto Mode block storage capability in the *Amazon EKS User Guide* .
-     *
-     * @struct
-     * @stability external
-     * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-blockstorage.html
-     */
-    interface BlockStorageProperty {
-        /**
-         * Indicates if the block storage capability is enabled on your EKS Auto Mode cluster.
-         *
-         * If the block storage capability is enabled, EKS Auto Mode will create and delete EBS volumes in your AWS account.
-         *
-         * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-blockstorage.html#cfn-eks-cluster-blockstorage-enabled
-         */
-        readonly enabled?: boolean | cdk.IResolvable;
-    }
-    /**
-     * The configuration for zonal shift for the cluster.
-     *
-     * @struct
-     * @stability external
-     * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-zonalshiftconfig.html
-     */
-    interface ZonalShiftConfigProperty {
-        /**
-         * If zonal shift is enabled, AWS configures zonal autoshift for the cluster.
-         *
-         * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-zonalshiftconfig.html#cfn-eks-cluster-zonalshiftconfig-enabled
-         */
-        readonly enabled?: boolean | cdk.IResolvable;
-    }
-    /**
-     * The control plane scaling tier configuration.
-     *
-     * For more information, see EKS Provisioned Control Plane in the Amazon EKS User Guide.
-     *
-     * @struct
-     * @stability external
-     * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-controlplanescalingconfig.html
-     */
-    interface ControlPlaneScalingConfigProperty {
-        /**
-         * The control plane scaling tier configuration.
-         *
-         * Available options are `standard` , `tier-xl` , `tier-2xl` , or `tier-4xl` . For more information, see EKS Provisioned Control Plane in the Amazon EKS User Guide.
-         *
-         * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-controlplanescalingconfig.html#cfn-eks-cluster-controlplanescalingconfig-tier
-         */
-        readonly tier?: string;
-    }
 }
 /**
  * Properties for CfnClusterPropsMixin
@@ -866,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.
      *
@@ -930,10 +930,10 @@ export interface CfnClusterMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-fargateprofile.html
  */
-export declare class CfnFargateProfilePropsMixin extends core.Mixin implements core.IMixin {
+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`.
      *
@@ -1059,10 +1059,10 @@ export interface CfnFargateProfileMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-identityproviderconfig.html
  */
-export declare class CfnIdentityProviderConfigPropsMixin extends core.Mixin implements core.IMixin {
+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`.
      *
@@ -1222,10 +1222,10 @@ export interface CfnIdentityProviderConfigMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-nodegroup.html
  */
-export declare class CfnNodegroupPropsMixin extends core.Mixin implements core.IMixin {
+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`.
      *
@@ -1363,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.
          *
@@ -1526,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.
      *
@@ -1589,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* .
      *
@@ -1619,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.
      *
@@ -1665,10 +1665,10 @@ export interface CfnNodegroupMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-accessentry.html
  */
-export declare class CfnAccessEntryPropsMixin extends core.Mixin implements core.IMixin {
+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`.
      *
@@ -1816,10 +1816,10 @@ export interface CfnAccessEntryMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-capability.html
  */
-export declare class CfnCapabilityPropsMixin extends core.Mixin implements core.IMixin {
+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`.
      *
@@ -2079,10 +2079,10 @@ export interface CfnCapabilityMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-podidentityassociation.html
  */
-export declare class CfnPodIdentityAssociationPropsMixin extends core.Mixin implements core.IMixin {
+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`.
      *
@@ -2129,6 +2129,12 @@ export interface CfnPodIdentityAssociationMixinProps {
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-podidentityassociation.html#cfn-eks-podidentityassociation-namespace
      */
     readonly namespace?: string;
+    /**
+     * The policy of the pod identity association.
+     *
+     * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-podidentityassociation.html#cfn-eks-podidentityassociation-policy
+     */
+    readonly policy?: string;
     /**
      * The Amazon Resource Name (ARN) of the IAM role to associate with the service account.
      *