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

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

@@ -13,7 +13,7 @@ import * as service from "aws-cdk-lib/aws-lightsail";
 export declare class CfnAlarmPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnAlarmMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Lightsail::Alarm`.
      *
@@ -129,7 +129,7 @@ export interface CfnAlarmMixinProps {
 export declare class CfnBucketPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnBucketMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Lightsail::Bucket`.
      *
@@ -256,7 +256,7 @@ export interface CfnBucketMixinProps {
 export declare class CfnCertificatePropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnCertificateMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Lightsail::Certificate`.
      *
@@ -323,7 +323,7 @@ export interface CfnCertificateMixinProps {
 export declare class CfnContainerPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnContainerMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Lightsail::Container`.
      *
@@ -683,7 +683,7 @@ export interface CfnContainerMixinProps {
 export declare class CfnDatabasePropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnDatabaseMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Lightsail::Database`.
      *
@@ -939,7 +939,7 @@ export interface CfnDatabaseMixinProps {
 export declare class CfnDiskPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnDiskMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Lightsail::Disk`.
      *
@@ -1097,7 +1097,7 @@ export interface CfnDiskMixinProps {
 export declare class CfnDistributionPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnDistributionMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Lightsail::Distribution`.
      *
@@ -1477,7 +1477,7 @@ export interface CfnDistributionMixinProps {
 export declare class CfnInstancePropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnInstanceMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Lightsail::Instance`.
      *
@@ -1929,7 +1929,7 @@ export interface CfnInstanceMixinProps {
 export declare class CfnLoadBalancerPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnLoadBalancerMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Lightsail::LoadBalancer`.
      *
@@ -2034,7 +2034,7 @@ export interface CfnLoadBalancerMixinProps {
 export declare class CfnLoadBalancerTlsCertificatePropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnLoadBalancerTlsCertificateMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Lightsail::LoadBalancerTlsCertificate`.
      *
@@ -2111,7 +2111,7 @@ export interface CfnLoadBalancerTlsCertificateMixinProps {
 export declare class CfnStaticIpPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnStaticIpMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Lightsail::StaticIp`.
      *
@@ -2160,7 +2160,7 @@ export interface CfnStaticIpMixinProps {
 export declare class CfnDatabaseSnapshotPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnDatabaseSnapshotMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Lightsail::DatabaseSnapshot`.
      *
@@ -2238,7 +2238,7 @@ export interface CfnDatabaseSnapshotMixinProps {
 export declare class CfnDiskSnapshotPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnDiskSnapshotMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Lightsail::DiskSnapshot`.
      *
@@ -2318,7 +2318,7 @@ export interface CfnDiskSnapshotMixinProps {
 export declare class CfnDomainPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnDomainMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Lightsail::Domain`.
      *
@@ -2452,7 +2452,7 @@ export interface CfnDomainMixinProps {
 export declare class CfnInstanceSnapshotPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnInstanceSnapshotMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Lightsail::InstanceSnapshot`.
      *

package/lib/services/aws-lightsail/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-lightsail");
 /**
  * The `AWS::Lightsail::Alarm` resource specifies an alarm that can be used to monitor a single metric for one of your Lightsail resources.
@@ -17,7 +16,7 @@ const service = require("aws-cdk-lib/aws-lightsail");
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-alarm.html
  */
 class CfnAlarmPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_lightsail.mixins.CfnAlarmPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_lightsail.mixins.CfnAlarmPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["alarmName", "comparisonOperator", "contactProtocols", "datapointsToAlarm", "evaluationPeriods", "metricName", "monitoredResourceName", "notificationEnabled", "notificationTriggers", "threshold", "treatMissingData"];
     props;
     strategy;
@@ -40,7 +39,7 @@ class CfnAlarmPropsMixin 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
@@ -53,12 +52,7 @@ class CfnAlarmPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnAlarmPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnAlarmPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnAlarmPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -72,7 +66,7 @@ exports.CfnAlarmPropsMixin = CfnAlarmPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-bucket.html
  */
 class CfnBucketPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_lightsail.mixins.CfnBucketPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_lightsail.mixins.CfnBucketPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["accessRules", "bucketName", "bundleId", "objectVersioning", "readOnlyAccessAccounts", "resourcesReceivingAccess", "tags"];
     props;
     strategy;
@@ -95,7 +89,7 @@ class CfnBucketPropsMixin 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
@@ -108,12 +102,7 @@ class CfnBucketPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnBucketPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnBucketPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnBucketPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -129,7 +118,7 @@ exports.CfnBucketPropsMixin = CfnBucketPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-certificate.html
  */
 class CfnCertificatePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_lightsail.mixins.CfnCertificatePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_lightsail.mixins.CfnCertificatePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["certificateName", "domainName", "subjectAlternativeNames", "tags"];
     props;
     strategy;
@@ -152,7 +141,7 @@ class CfnCertificatePropsMixin 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
@@ -165,12 +154,7 @@ class CfnCertificatePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnCertificatePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnCertificatePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnCertificatePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -186,7 +170,7 @@ exports.CfnCertificatePropsMixin = CfnCertificatePropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-container.html
  */
 class CfnContainerPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_lightsail.mixins.CfnContainerPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_lightsail.mixins.CfnContainerPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["containerServiceDeployment", "isDisabled", "power", "privateRegistryAccess", "publicDomainNames", "scale", "serviceName", "tags"];
     props;
     strategy;
@@ -209,7 +193,7 @@ class CfnContainerPropsMixin 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
@@ -222,12 +206,7 @@ class CfnContainerPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnContainerPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnContainerPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnContainerPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -241,7 +220,7 @@ exports.CfnContainerPropsMixin = CfnContainerPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-database.html
  */
 class CfnDatabasePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_lightsail.mixins.CfnDatabasePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_lightsail.mixins.CfnDatabasePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["availabilityZone", "backupRetention", "caCertificateIdentifier", "masterDatabaseName", "masterUsername", "masterUserPassword", "preferredBackupWindow", "preferredMaintenanceWindow", "publiclyAccessible", "relationalDatabaseBlueprintId", "relationalDatabaseBundleId", "relationalDatabaseName", "relationalDatabaseParameters", "rotateMasterUserPassword", "tags"];
     props;
     strategy;
@@ -264,7 +243,7 @@ class CfnDatabasePropsMixin 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
@@ -277,12 +256,7 @@ class CfnDatabasePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDatabasePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDatabasePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDatabasePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -296,7 +270,7 @@ exports.CfnDatabasePropsMixin = CfnDatabasePropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-disk.html
  */
 class CfnDiskPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_lightsail.mixins.CfnDiskPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_lightsail.mixins.CfnDiskPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["addOns", "availabilityZone", "diskName", "location", "sizeInGb", "tags"];
     props;
     strategy;
@@ -319,7 +293,7 @@ class CfnDiskPropsMixin 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
@@ -332,12 +306,7 @@ class CfnDiskPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDiskPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDiskPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDiskPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -355,7 +324,7 @@ exports.CfnDiskPropsMixin = CfnDiskPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-distribution.html
  */
 class CfnDistributionPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_lightsail.mixins.CfnDistributionPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_lightsail.mixins.CfnDistributionPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["bundleId", "cacheBehaviors", "cacheBehaviorSettings", "certificateName", "defaultCacheBehavior", "distributionName", "ipAddressType", "isEnabled", "origin", "tags"];
     props;
     strategy;
@@ -378,7 +347,7 @@ class CfnDistributionPropsMixin 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
@@ -391,12 +360,7 @@ class CfnDistributionPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDistributionPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDistributionPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDistributionPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -410,7 +374,7 @@ exports.CfnDistributionPropsMixin = CfnDistributionPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-instance.html
  */
 class CfnInstancePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_lightsail.mixins.CfnInstancePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_lightsail.mixins.CfnInstancePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["addOns", "availabilityZone", "blueprintId", "bundleId", "hardware", "instanceName", "keyPairName", "location", "networking", "state", "tags", "userData"];
     props;
     strategy;
@@ -433,7 +397,7 @@ class CfnInstancePropsMixin 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
@@ -446,12 +410,7 @@ class CfnInstancePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnInstancePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnInstancePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnInstancePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -467,7 +426,7 @@ exports.CfnInstancePropsMixin = CfnInstancePropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-loadbalancer.html
  */
 class CfnLoadBalancerPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_lightsail.mixins.CfnLoadBalancerPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_lightsail.mixins.CfnLoadBalancerPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["attachedInstances", "healthCheckPath", "instancePort", "ipAddressType", "loadBalancerName", "sessionStickinessEnabled", "sessionStickinessLbCookieDurationSeconds", "tags", "tlsPolicyName"];
     props;
     strategy;
@@ -490,7 +449,7 @@ class CfnLoadBalancerPropsMixin 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
@@ -503,12 +462,7 @@ class CfnLoadBalancerPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnLoadBalancerPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnLoadBalancerPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnLoadBalancerPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -522,7 +476,7 @@ exports.CfnLoadBalancerPropsMixin = CfnLoadBalancerPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-loadbalancertlscertificate.html
  */
 class CfnLoadBalancerTlsCertificatePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_lightsail.mixins.CfnLoadBalancerTlsCertificatePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_lightsail.mixins.CfnLoadBalancerTlsCertificatePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["certificateAlternativeNames", "certificateDomainName", "certificateName", "httpsRedirectionEnabled", "isAttached", "loadBalancerName"];
     props;
     strategy;
@@ -545,7 +499,7 @@ class CfnLoadBalancerTlsCertificatePropsMixin 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
@@ -558,12 +512,7 @@ class CfnLoadBalancerTlsCertificatePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnLoadBalancerTlsCertificatePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnLoadBalancerTlsCertificatePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnLoadBalancerTlsCertificatePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -577,7 +526,7 @@ exports.CfnLoadBalancerTlsCertificatePropsMixin = CfnLoadBalancerTlsCertificateP
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-staticip.html
  */
 class CfnStaticIpPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_lightsail.mixins.CfnStaticIpPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_lightsail.mixins.CfnStaticIpPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["attachedTo", "staticIpName"];
     props;
     strategy;
@@ -600,7 +549,7 @@ class CfnStaticIpPropsMixin 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
@@ -613,12 +562,7 @@ class CfnStaticIpPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnStaticIpPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnStaticIpPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnStaticIpPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -632,7 +576,7 @@ exports.CfnStaticIpPropsMixin = CfnStaticIpPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-databasesnapshot.html
  */
 class CfnDatabaseSnapshotPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_lightsail.mixins.CfnDatabaseSnapshotPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_lightsail.mixins.CfnDatabaseSnapshotPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["relationalDatabaseName", "relationalDatabaseSnapshotName", "tags"];
     props;
     strategy;
@@ -655,7 +599,7 @@ class CfnDatabaseSnapshotPropsMixin 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
@@ -668,12 +612,7 @@ class CfnDatabaseSnapshotPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDatabaseSnapshotPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDatabaseSnapshotPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDatabaseSnapshotPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -687,7 +626,7 @@ exports.CfnDatabaseSnapshotPropsMixin = CfnDatabaseSnapshotPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-disksnapshot.html
  */
 class CfnDiskSnapshotPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_lightsail.mixins.CfnDiskSnapshotPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_lightsail.mixins.CfnDiskSnapshotPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["diskName", "diskSnapshotName", "tags"];
     props;
     strategy;
@@ -710,7 +649,7 @@ class CfnDiskSnapshotPropsMixin 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
@@ -723,12 +662,7 @@ class CfnDiskSnapshotPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDiskSnapshotPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDiskSnapshotPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDiskSnapshotPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -742,7 +676,7 @@ exports.CfnDiskSnapshotPropsMixin = CfnDiskSnapshotPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-domain.html
  */
 class CfnDomainPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_lightsail.mixins.CfnDomainPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_lightsail.mixins.CfnDomainPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["domainEntries", "domainName", "tags"];
     props;
     strategy;
@@ -765,7 +699,7 @@ class CfnDomainPropsMixin 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
@@ -778,12 +712,7 @@ class CfnDomainPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDomainPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDomainPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDomainPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -797,7 +726,7 @@ exports.CfnDomainPropsMixin = CfnDomainPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-instancesnapshot.html
  */
 class CfnInstanceSnapshotPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_lightsail.mixins.CfnInstanceSnapshotPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_lightsail.mixins.CfnInstanceSnapshotPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["instanceName", "instanceSnapshotName", "tags"];
     props;
     strategy;
@@ -820,7 +749,7 @@ class CfnInstanceSnapshotPropsMixin 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
@@ -833,12 +762,7 @@ class CfnInstanceSnapshotPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnInstanceSnapshotPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnInstanceSnapshotPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnInstanceSnapshotPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }

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

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

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

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