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

package/lib/services/aws-organizations/events.generated.d.ts

@@ -1,6 +1,217 @@
 import * as cdk from "aws-cdk-lib/core";
 import * as service from "aws-cdk-lib/aws-organizations";
 import * as events from "aws-cdk-lib/aws-events";
+/**
+ * EventBridge event pattern for aws.organizations@AWSServiceEventViaCloudTrail
+ */
+export declare class AWSServiceEventViaCloudTrail {
+    /**
+     * EventBridge event pattern for AWS Service Event via CloudTrail
+     */
+    static awsServiceEventViaCloudTrailPattern(options?: AWSServiceEventViaCloudTrail.AWSServiceEventViaCloudTrailProps): events.EventPattern;
+}
+export declare namespace AWSServiceEventViaCloudTrail {
+    /**
+     * Props type for aws.organizations@AWSServiceEventViaCloudTrail event
+     */
+    interface AWSServiceEventViaCloudTrailProps {
+        /**
+         * serviceEventDetails property
+         *
+         * Specify an array of string values to match this event if the actual value of serviceEventDetails is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
+         *
+         * @default - Do not filter on this field
+         */
+        readonly serviceEventDetails?: AWSServiceEventViaCloudTrail.ServiceEventDetails;
+        /**
+         * userIdentity property
+         *
+         * Specify an array of string values to match this event if the actual value of userIdentity is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
+         *
+         * @default - Do not filter on this field
+         */
+        readonly userIdentity?: AWSServiceEventViaCloudTrail.UserIdentity;
+        /**
+         * eventID property
+         *
+         * Specify an array of string values to match this event if the actual value of eventID is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
+         *
+         * @default - Do not filter on this field
+         */
+        readonly eventId?: Array<string>;
+        /**
+         * awsRegion property
+         *
+         * Specify an array of string values to match this event if the actual value of awsRegion is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
+         *
+         * @default - Do not filter on this field
+         */
+        readonly awsRegion?: Array<string>;
+        /**
+         * eventVersion property
+         *
+         * Specify an array of string values to match this event if the actual value of eventVersion is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
+         *
+         * @default - Do not filter on this field
+         */
+        readonly eventVersion?: Array<string>;
+        /**
+         * sourceIPAddress property
+         *
+         * Specify an array of string values to match this event if the actual value of sourceIPAddress is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
+         *
+         * @default - Do not filter on this field
+         */
+        readonly sourceIpAddress?: Array<string>;
+        /**
+         * eventTime property
+         *
+         * Specify an array of string values to match this event if the actual value of eventTime is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
+         *
+         * @default - Do not filter on this field
+         */
+        readonly eventTime?: Array<string>;
+        /**
+         * eventSource property
+         *
+         * Specify an array of string values to match this event if the actual value of eventSource is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
+         *
+         * @default - Do not filter on this field
+         */
+        readonly eventSource?: Array<string>;
+        /**
+         * eventName property
+         *
+         * Specify an array of string values to match this event if the actual value of eventName is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
+         *
+         * @default - Do not filter on this field
+         */
+        readonly eventName?: Array<string>;
+        /**
+         * userAgent property
+         *
+         * Specify an array of string values to match this event if the actual value of userAgent is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
+         *
+         * @default - Do not filter on this field
+         */
+        readonly userAgent?: Array<string>;
+        /**
+         * readOnly property
+         *
+         * Specify an array of string values to match this event if the actual value of readOnly is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
+         *
+         * @default - Do not filter on this field
+         */
+        readonly readOnly?: Array<string>;
+        /**
+         * eventType property
+         *
+         * Specify an array of string values to match this event if the actual value of eventType is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
+         *
+         * @default - Do not filter on this field
+         */
+        readonly eventType?: Array<string>;
+        /**
+         * EventBridge event metadata
+         *
+         * @default - -
+         */
+        readonly eventMetadata?: cdk.AWSEventMetadataProps;
+    }
+    /**
+     * Type definition for ServiceEventDetails
+     *
+     * @struct
+     */
+    interface ServiceEventDetails {
+        /**
+         * createAccountStatus property
+         *
+         * Specify an array of string values to match this event if the actual value of createAccountStatus is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
+         *
+         * @default - Do not filter on this field
+         */
+        readonly createAccountStatus?: AWSServiceEventViaCloudTrail.CreateAccountStatus;
+    }
+    /**
+     * Type definition for CreateAccountStatus
+     *
+     * @struct
+     */
+    interface CreateAccountStatus {
+        /**
+         * accountId property
+         *
+         * Specify an array of string values to match this event if the actual value of accountId is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
+         *
+         * @default - Filter with the Account reference
+         */
+        readonly accountId?: Array<string>;
+        /**
+         * accountName property
+         *
+         * Specify an array of string values to match this event if the actual value of accountName is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
+         *
+         * @default - Do not filter on this field
+         */
+        readonly accountName?: Array<string>;
+        /**
+         * completedTimestamp property
+         *
+         * Specify an array of string values to match this event if the actual value of completedTimestamp is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
+         *
+         * @default - Do not filter on this field
+         */
+        readonly completedTimestamp?: Array<string>;
+        /**
+         * id property
+         *
+         * Specify an array of string values to match this event if the actual value of id is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
+         *
+         * @default - Do not filter on this field
+         */
+        readonly id?: Array<string>;
+        /**
+         * state property
+         *
+         * Specify an array of string values to match this event if the actual value of state is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
+         *
+         * @default - Do not filter on this field
+         */
+        readonly state?: Array<string>;
+        /**
+         * requestedTimestamp property
+         *
+         * Specify an array of string values to match this event if the actual value of requestedTimestamp is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
+         *
+         * @default - Do not filter on this field
+         */
+        readonly requestedTimestamp?: Array<string>;
+    }
+    /**
+     * Type definition for UserIdentity
+     *
+     * @struct
+     */
+    interface UserIdentity {
+        /**
+         * accountId property
+         *
+         * Specify an array of string values to match this event if the actual value of accountId is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
+         *
+         * @default - Do not filter on this field
+         */
+        readonly accountId?: Array<string>;
+        /**
+         * invokedBy property
+         *
+         * Specify an array of string values to match this event if the actual value of invokedBy is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
+         *
+         * @default - Do not filter on this field
+         */
+        readonly invokedBy?: Array<string>;
+    }
+}
 /**
  * EventBridge event patterns for Account
  */
@@ -17,214 +228,5 @@ export declare class AccountEvents {
     /**
      * EventBridge event pattern for Account AWS Service Event via CloudTrail
      */
-    awsServiceEventViaCloudTrailPattern(options?: AccountEvents.AWSServiceEventViaCloudTrail.AWSServiceEventViaCloudTrailProps): events.EventPattern;
-}
-export declare namespace AccountEvents {
-    /**
-     * aws.organizations@AWSServiceEventViaCloudTrail event types for Account
-     */
-    class AWSServiceEventViaCloudTrail {
-    }
-    namespace AWSServiceEventViaCloudTrail {
-        /**
-         * Props type for Account aws.organizations@AWSServiceEventViaCloudTrail event
-         */
-        interface AWSServiceEventViaCloudTrailProps {
-            /**
-             * serviceEventDetails property
-             *
-             * Specify an array of string values to match this event if the actual value of serviceEventDetails is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
-             *
-             * @default - Do not filter on this field
-             */
-            readonly serviceEventDetails?: AccountEvents.AWSServiceEventViaCloudTrail.ServiceEventDetails;
-            /**
-             * userIdentity property
-             *
-             * Specify an array of string values to match this event if the actual value of userIdentity is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
-             *
-             * @default - Do not filter on this field
-             */
-            readonly userIdentity?: AccountEvents.AWSServiceEventViaCloudTrail.UserIdentity;
-            /**
-             * eventID property
-             *
-             * Specify an array of string values to match this event if the actual value of eventID is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
-             *
-             * @default - Do not filter on this field
-             */
-            readonly eventId?: Array<string>;
-            /**
-             * awsRegion property
-             *
-             * Specify an array of string values to match this event if the actual value of awsRegion is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
-             *
-             * @default - Do not filter on this field
-             */
-            readonly awsRegion?: Array<string>;
-            /**
-             * eventVersion property
-             *
-             * Specify an array of string values to match this event if the actual value of eventVersion is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
-             *
-             * @default - Do not filter on this field
-             */
-            readonly eventVersion?: Array<string>;
-            /**
-             * sourceIPAddress property
-             *
-             * Specify an array of string values to match this event if the actual value of sourceIPAddress is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
-             *
-             * @default - Do not filter on this field
-             */
-            readonly sourceIpAddress?: Array<string>;
-            /**
-             * eventTime property
-             *
-             * Specify an array of string values to match this event if the actual value of eventTime is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
-             *
-             * @default - Do not filter on this field
-             */
-            readonly eventTime?: Array<string>;
-            /**
-             * eventSource property
-             *
-             * Specify an array of string values to match this event if the actual value of eventSource is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
-             *
-             * @default - Do not filter on this field
-             */
-            readonly eventSource?: Array<string>;
-            /**
-             * eventName property
-             *
-             * Specify an array of string values to match this event if the actual value of eventName is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
-             *
-             * @default - Do not filter on this field
-             */
-            readonly eventName?: Array<string>;
-            /**
-             * userAgent property
-             *
-             * Specify an array of string values to match this event if the actual value of userAgent is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
-             *
-             * @default - Do not filter on this field
-             */
-            readonly userAgent?: Array<string>;
-            /**
-             * readOnly property
-             *
-             * Specify an array of string values to match this event if the actual value of readOnly is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
-             *
-             * @default - Do not filter on this field
-             */
-            readonly readOnly?: Array<string>;
-            /**
-             * eventType property
-             *
-             * Specify an array of string values to match this event if the actual value of eventType is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
-             *
-             * @default - Do not filter on this field
-             */
-            readonly eventType?: Array<string>;
-            /**
-             * EventBridge event metadata
-             *
-             * @default - -
-             */
-            readonly eventMetadata?: cdk.AWSEventMetadataProps;
-        }
-        /**
-         * Type definition for ServiceEventDetails
-         *
-         * @struct
-         */
-        interface ServiceEventDetails {
-            /**
-             * createAccountStatus property
-             *
-             * Specify an array of string values to match this event if the actual value of createAccountStatus is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
-             *
-             * @default - Do not filter on this field
-             */
-            readonly createAccountStatus?: AccountEvents.AWSServiceEventViaCloudTrail.CreateAccountStatus;
-        }
-        /**
-         * Type definition for CreateAccountStatus
-         *
-         * @struct
-         */
-        interface CreateAccountStatus {
-            /**
-             * accountId property
-             *
-             * Specify an array of string values to match this event if the actual value of accountId is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
-             *
-             * @default - Filter with the Account reference
-             */
-            readonly accountId?: Array<string>;
-            /**
-             * accountName property
-             *
-             * Specify an array of string values to match this event if the actual value of accountName is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
-             *
-             * @default - Do not filter on this field
-             */
-            readonly accountName?: Array<string>;
-            /**
-             * completedTimestamp property
-             *
-             * Specify an array of string values to match this event if the actual value of completedTimestamp is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
-             *
-             * @default - Do not filter on this field
-             */
-            readonly completedTimestamp?: Array<string>;
-            /**
-             * id property
-             *
-             * Specify an array of string values to match this event if the actual value of id is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
-             *
-             * @default - Do not filter on this field
-             */
-            readonly id?: Array<string>;
-            /**
-             * state property
-             *
-             * Specify an array of string values to match this event if the actual value of state is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
-             *
-             * @default - Do not filter on this field
-             */
-            readonly state?: Array<string>;
-            /**
-             * requestedTimestamp property
-             *
-             * Specify an array of string values to match this event if the actual value of requestedTimestamp is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
-             *
-             * @default - Do not filter on this field
-             */
-            readonly requestedTimestamp?: Array<string>;
-        }
-        /**
-         * Type definition for UserIdentity
-         *
-         * @struct
-         */
-        interface UserIdentity {
-            /**
-             * accountId property
-             *
-             * Specify an array of string values to match this event if the actual value of accountId is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
-             *
-             * @default - Do not filter on this field
-             */
-            readonly accountId?: Array<string>;
-            /**
-             * invokedBy property
-             *
-             * Specify an array of string values to match this event if the actual value of invokedBy is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
-             *
-             * @default - Do not filter on this field
-             */
-            readonly invokedBy?: Array<string>;
-        }
-    }
+    awsServiceEventViaCloudTrailPattern(options?: AWSServiceEventViaCloudTrail.AWSServiceEventViaCloudTrailProps): events.EventPattern;
 }

package/lib/services/aws-organizations/events.generated.js

@@ -1,32 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AccountEvents = void 0;
+exports.AccountEvents = exports.AWSServiceEventViaCloudTrail = void 0;
 const jsiiDeprecationWarnings = require("../../../.warnings.jsii.js");
 const JSII_RTTI_SYMBOL_1 = Symbol.for("jsii.rtti");
 /**
- * EventBridge event patterns for Account
+ * EventBridge event pattern for aws.organizations@AWSServiceEventViaCloudTrail
  */
-class AccountEvents {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_organizations.events.AccountEvents", version: "2.241.0-alpha.0" };
-    /**
-     * Create AccountEvents from a Account reference
-     */
-    static fromAccount(accountRef) {
-        return new AccountEvents(accountRef);
-    }
+class AWSServiceEventViaCloudTrail {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_organizations.events.AWSServiceEventViaCloudTrail", version: "2.242.0-alpha.0" };
     /**
-     * Reference to the Account construct
-     */
-    accountRef;
-    constructor(accountRef) {
-        this.accountRef = accountRef;
-    }
-    /**
-     * EventBridge event pattern for Account AWS Service Event via CloudTrail
+     * EventBridge event pattern for AWS Service Event via CloudTrail
      */
-    awsServiceEventViaCloudTrailPattern(options) {
+    static awsServiceEventViaCloudTrailPattern(options) {
         try {
-            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_organizations_events_AccountEvents_AWSServiceEventViaCloudTrail_AWSServiceEventViaCloudTrailProps(options);
+            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_organizations_events_AWSServiceEventViaCloudTrail_AWSServiceEventViaCloudTrailProps(options);
         }
         catch (error) {
             if (process.env.JSII_DEBUG !== "1" && error.name === "DeprecationError") {
@@ -37,27 +24,18 @@ class AccountEvents {
         return {
             source: ["aws.organizations"],
             detailType: ["AWS Service Event via CloudTrail"],
-            detail: convertAWSServiceEventViaCloudTrailDetailToEventPattern(options, this.accountRef),
+            detail: convertAWSServiceEventViaCloudTrailDetailToEventPattern(options),
             version: options?.eventMetadata?.version,
             resources: options?.eventMetadata?.resources,
             region: options?.eventMetadata?.region
         };
     }
 }
-exports.AccountEvents = AccountEvents;
-(function (AccountEvents) {
-    /**
-     * aws.organizations@AWSServiceEventViaCloudTrail event types for Account
-     */
-    class AWSServiceEventViaCloudTrail {
-        static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_organizations.events.AccountEvents.AWSServiceEventViaCloudTrail", version: "2.241.0-alpha.0" };
-    }
-    AccountEvents.AWSServiceEventViaCloudTrail = AWSServiceEventViaCloudTrail;
-})(AccountEvents || (exports.AccountEvents = AccountEvents = {}));
+exports.AWSServiceEventViaCloudTrail = AWSServiceEventViaCloudTrail;
 // @ts-ignore TS6133
 function convertAWSServiceEventViaCloudTrailCreateAccountStatusToEventPattern(obj, iRef) {
     const ret = {
-        accountId: (obj?.accountId ?? [iRef.accountRef.accountId]),
+        accountId: (obj?.accountId ?? [iRef?.accountRef.accountId]),
         accountName: obj?.accountName,
         completedTimestamp: obj?.completedTimestamp,
         id: obj?.id,
@@ -127,3 +105,45 @@ function convertAWSServiceEventViaCloudTrailDetailToEventPattern(obj, iRef) {
     ;
     return ret;
 }
+/**
+ * EventBridge event patterns for Account
+ */
+class AccountEvents {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_organizations.events.AccountEvents", version: "2.242.0-alpha.0" };
+    /**
+     * Create AccountEvents from a Account reference
+     */
+    static fromAccount(accountRef) {
+        return new AccountEvents(accountRef);
+    }
+    /**
+     * Reference to the Account construct
+     */
+    accountRef;
+    constructor(accountRef) {
+        this.accountRef = accountRef;
+    }
+    /**
+     * EventBridge event pattern for Account AWS Service Event via CloudTrail
+     */
+    awsServiceEventViaCloudTrailPattern(options) {
+        try {
+            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_organizations_events_AWSServiceEventViaCloudTrail_AWSServiceEventViaCloudTrailProps(options);
+        }
+        catch (error) {
+            if (process.env.JSII_DEBUG !== "1" && error.name === "DeprecationError") {
+                Error.captureStackTrace(error, this.awsServiceEventViaCloudTrailPattern);
+            }
+            throw error;
+        }
+        return {
+            source: ["aws.organizations"],
+            detailType: ["AWS Service Event via CloudTrail"],
+            detail: convertAWSServiceEventViaCloudTrailDetailToEventPattern(options, this.accountRef),
+            version: options?.eventMetadata?.version,
+            resources: options?.eventMetadata?.resources,
+            region: options?.eventMetadata?.region
+        };
+    }
+}
+exports.AccountEvents = AccountEvents;

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

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

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

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

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

@@ -13,7 +13,7 @@ import * as service from "aws-cdk-lib/aws-osis";
 export declare class CfnPipelinePropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnPipelineMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::OSIS::Pipeline`.
      *

package/lib/services/aws-osis/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-osis");
 /**
  * The AWS::OSIS::Pipeline resource creates an Amazon OpenSearch Ingestion pipeline.
@@ -17,7 +16,7 @@ const service = require("aws-cdk-lib/aws-osis");
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-osis-pipeline.html
  */
 class CfnPipelinePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_osis.mixins.CfnPipelinePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_osis.mixins.CfnPipelinePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["bufferOptions", "encryptionAtRestOptions", "logPublishingOptions", "maxUnits", "minUnits", "pipelineConfigurationBody", "pipelineName", "pipelineRoleArn", "resourcePolicy", "tags", "vpcOptions"];
     props;
     strategy;
@@ -40,7 +39,7 @@ class CfnPipelinePropsMixin 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 CfnPipelinePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnPipelinePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnPipelinePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnPipelinePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }

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

@@ -15,7 +15,7 @@ const service = require("aws-cdk-lib/aws-osis");
  * @stability external
  */
 class CfnPipelinePipelineLogs {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_osis.mixins.CfnPipelinePipelineLogs", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_osis.mixins.CfnPipelinePipelineLogs", version: "2.242.0-alpha.0" };
     /**
      * Send logs to an S3 Bucket
      *
@@ -113,7 +113,7 @@ exports.CfnPipelinePipelineLogs = CfnPipelinePipelineLogs;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-osis-pipeline.html
  */
 class CfnPipelineLogsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_osis.mixins.CfnPipelineLogsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_osis.mixins.CfnPipelineLogsMixin", version: "2.242.0-alpha.0" };
     static PIPELINE_LOGS = new CfnPipelinePipelineLogs();
     logType;
     logDelivery;
@@ -159,7 +159,7 @@ exports.CfnPipelineLogsMixin = CfnPipelineLogsMixin;
  * Output Format options for each destination of CfnPipelinePipelineLogs.
  */
 class CfnPipelinePipelineLogsOutputFormat {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_osis.mixins.CfnPipelinePipelineLogsOutputFormat", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_osis.mixins.CfnPipelinePipelineLogsOutputFormat", version: "2.242.0-alpha.0" };
 }
 exports.CfnPipelinePipelineLogsOutputFormat = CfnPipelinePipelineLogsOutputFormat;
 (function (CfnPipelinePipelineLogsOutputFormat) {

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

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

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

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