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

package/lib/services/aws-secretsmanager/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-secretsmanager";
+import { aws_kms as kmsRefs, aws_secretsmanager as secretsManagerRefs } from "aws-cdk-lib/interfaces";
 /**
  * Attaches a resource-based permission policy to a secret.
  *
@@ -17,7 +18,7 @@ import * as service from "aws-cdk-lib/aws-secretsmanager";
 export declare class CfnResourcePolicyPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnResourcePolicyMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::SecretsManager::ResourcePolicy`.
      *
@@ -65,7 +66,7 @@ export interface CfnResourcePolicyMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-resourcepolicy.html#cfn-secretsmanager-resourcepolicy-secretid
      */
-    readonly secretId?: string;
+    readonly secretId?: secretsManagerRefs.ISecretRef | string;
 }
 /**
  * Configure the rotation schedule and Lambda rotation function for a secret. For more information, see [How rotation works](https://docs.aws.amazon.com/secretsmanager/latest/userguide/rotate-secrets_how.html) .
@@ -93,7 +94,7 @@ export interface CfnResourcePolicyMixinProps {
 export declare class CfnRotationSchedulePropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnRotationScheduleMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::SecretsManager::RotationSchedule`.
      *
@@ -418,7 +419,7 @@ export interface CfnRotationScheduleMixinProps {
 export declare class CfnSecretPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnSecretMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::SecretsManager::Secret`.
      *
@@ -588,7 +589,7 @@ export interface CfnSecretMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-secret.html#cfn-secretsmanager-secret-kmskeyid
      */
-    readonly kmsKeyId?: string;
+    readonly kmsKeyId?: kmsRefs.IKeyRef | string;
     /**
      * The name of the new secret.
      *
@@ -670,7 +671,7 @@ export interface CfnSecretMixinProps {
 export declare class CfnSecretTargetAttachmentPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnSecretTargetAttachmentMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::SecretsManager::SecretTargetAttachment`.
      *

package/lib/services/aws-secretsmanager/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-secretsmanager");
 /**
  * Attaches a resource-based permission policy to a secret.
@@ -21,7 +20,7 @@ const service = require("aws-cdk-lib/aws-secretsmanager");
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-resourcepolicy.html
  */
 class CfnResourcePolicyPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_secretsmanager.mixins.CfnResourcePolicyPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_secretsmanager.mixins.CfnResourcePolicyPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["blockPublicPolicy", "resourcePolicy", "secretId"];
     props;
     strategy;
@@ -43,8 +42,11 @@ class CfnResourcePolicyPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnResourcePolicyMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -57,16 +59,18 @@ class CfnResourcePolicyPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnResourcePolicyPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnResourcePolicyPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnResourcePolicyPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnResourcePolicyPropsMixin = CfnResourcePolicyPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnResourcePolicyMixinProps(props) {
+    const ret = {};
+    if ((props.secretId !== undefined))
+        ret.secretId = cdk.getRefProperty(props.secretId?.secretRef, 'secretId') ?? cdk.ensureStringOrUndefined(props.secretId, "secretId", "secretsmanager.ISecretRef | string");
+    return ret;
+}
 /**
  * Configure the rotation schedule and Lambda rotation function for a secret. For more information, see [How rotation works](https://docs.aws.amazon.com/secretsmanager/latest/userguide/rotate-secrets_how.html) .
  *
@@ -91,7 +95,7 @@ exports.CfnResourcePolicyPropsMixin = CfnResourcePolicyPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-rotationschedule.html
  */
 class CfnRotationSchedulePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_secretsmanager.mixins.CfnRotationSchedulePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_secretsmanager.mixins.CfnRotationSchedulePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["externalSecretRotationMetadata", "externalSecretRotationRoleArn", "hostedRotationLambda", "rotateImmediatelyOnUpdate", "rotationLambdaArn", "rotationRules", "secretId"];
     props;
     strategy;
@@ -114,7 +118,7 @@ class CfnRotationSchedulePropsMixin 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
@@ -127,12 +131,7 @@ class CfnRotationSchedulePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnRotationSchedulePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnRotationSchedulePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnRotationSchedulePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -158,7 +157,7 @@ exports.CfnRotationSchedulePropsMixin = CfnRotationSchedulePropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-secret.html
  */
 class CfnSecretPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_secretsmanager.mixins.CfnSecretPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_secretsmanager.mixins.CfnSecretPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["description", "generateSecretString", "kmsKeyId", "name", "replicaRegions", "secretString", "tags", "type"];
     props;
     strategy;
@@ -180,8 +179,11 @@ class CfnSecretPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnSecretMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -194,16 +196,18 @@ class CfnSecretPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnSecretPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnSecretPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnSecretPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnSecretPropsMixin = CfnSecretPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnSecretMixinProps(props) {
+    const ret = {};
+    if ((props.kmsKeyId !== undefined))
+        ret.kmsKeyId = cdk.getRefProperty(props.kmsKeyId?.keyRef, 'keyArn') ?? cdk.getRefProperty(props.kmsKeyId?.keyRef, 'keyId') ?? cdk.ensureStringOrUndefined(props.kmsKeyId, "kmsKeyId", "kms.IKeyRef | string");
+    return ret;
+}
 /**
  * The `AWS::SecretsManager::SecretTargetAttachment` resource completes the final link between a Secrets Manager secret and the associated database by adding the database connection information to the secret JSON.
  *
@@ -223,7 +227,7 @@ exports.CfnSecretPropsMixin = CfnSecretPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-secrettargetattachment.html
  */
 class CfnSecretTargetAttachmentPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_secretsmanager.mixins.CfnSecretTargetAttachmentPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_secretsmanager.mixins.CfnSecretTargetAttachmentPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["secretId", "targetId", "targetType"];
     props;
     strategy;
@@ -246,7 +250,7 @@ class CfnSecretTargetAttachmentPropsMixin 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
@@ -259,12 +263,7 @@ class CfnSecretTargetAttachmentPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnSecretTargetAttachmentPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnSecretTargetAttachmentPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnSecretTargetAttachmentPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }

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

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

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

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

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

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

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

@@ -15,7 +15,7 @@ import * as service from "aws-cdk-lib/aws-securityhub";
 export declare class CfnAutomationRulePropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnAutomationRuleMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::SecurityHub::AutomationRule`.
      *
@@ -813,7 +813,7 @@ export interface CfnAutomationRuleMixinProps {
 export declare class CfnHubPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnHubMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::SecurityHub::Hub`.
      *
@@ -896,7 +896,7 @@ export interface CfnHubMixinProps {
 export declare class CfnStandardPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnStandardMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::SecurityHub::Standard`.
      *
@@ -976,7 +976,7 @@ export interface CfnStandardMixinProps {
 export declare class CfnAggregatorV2PropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnAggregatorV2MixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::SecurityHub::AggregatorV2`.
      *
@@ -1031,7 +1031,7 @@ export interface CfnAggregatorV2MixinProps {
 export declare class CfnAutomationRuleV2PropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnAutomationRuleV2MixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::SecurityHub::AutomationRuleV2`.
      *
@@ -1568,7 +1568,7 @@ export interface CfnAutomationRuleV2MixinProps {
 export declare class CfnConfigurationPolicyPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnConfigurationPolicyMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::SecurityHub::ConfigurationPolicy`.
      *
@@ -1831,7 +1831,7 @@ export interface CfnConfigurationPolicyMixinProps {
 export declare class CfnConnectorV2PropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnConnectorV2MixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::SecurityHub::ConnectorV2`.
      *
@@ -1965,7 +1965,7 @@ export interface CfnConnectorV2MixinProps {
 export declare class CfnDelegatedAdminPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnDelegatedAdminMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::SecurityHub::DelegatedAdmin`.
      *
@@ -2014,7 +2014,7 @@ export interface CfnDelegatedAdminMixinProps {
 export declare class CfnFindingAggregatorPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnFindingAggregatorMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::SecurityHub::FindingAggregator`.
      *
@@ -2075,7 +2075,7 @@ export interface CfnFindingAggregatorMixinProps {
 export declare class CfnHubV2PropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnHubV2MixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::SecurityHub::HubV2`.
      *
@@ -2122,7 +2122,7 @@ export interface CfnHubV2MixinProps {
 export declare class CfnInsightPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnInsightMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::SecurityHub::Insight`.
      *
@@ -3141,7 +3141,7 @@ export interface CfnInsightMixinProps {
 export declare class CfnOrganizationConfigurationPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnOrganizationConfigurationMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::SecurityHub::OrganizationConfiguration`.
      *
@@ -3212,7 +3212,7 @@ export interface CfnOrganizationConfigurationMixinProps {
 export declare class CfnPolicyAssociationPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnPolicyAssociationMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::SecurityHub::PolicyAssociation`.
      *
@@ -3275,7 +3275,7 @@ export interface CfnPolicyAssociationMixinProps {
 export declare class CfnProductSubscriptionPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnProductSubscriptionMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::SecurityHub::ProductSubscription`.
      *
@@ -3322,7 +3322,7 @@ export interface CfnProductSubscriptionMixinProps {
 export declare class CfnSecurityControlPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnSecurityControlMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::SecurityHub::SecurityControl`.
      *