@go-to-k/cdkd 0.51.6 → 0.51.8

package/dist/cli.js

@@ -35710,22 +35710,37 @@ var FirehoseProvider = class {
    * `KinesisStreamSourceConfiguration` parent fields when present (the
    * `DescribeDeliveryStream` response splits source under `Source.KinesisStreamSourceDescription`).
    *
-   * **Destination configurations**: partial coverage. AWS returns destination
-   * config under `Destinations[0].*DestinationDescription` (note:
-   * `Description`, not `Configuration`). For S3 / ExtendedS3 destinations
-   * the top-level fields with a clean reverse-mapping are surfaced —
-   * `BucketARN`, `RoleARN`, `Prefix`, `ErrorOutputPrefix`, `BufferingHints`,
-   * `CompressionFormat`, plus `S3BackupMode` for Extended. Inner nested
-   * fields (`EncryptionConfiguration`, `CloudWatchLoggingOptions`,
-   * `ProcessingConfiguration`, `DataFormatConversionConfiguration`,
-   * `DynamicPartitioningConfiguration`, `S3BackupConfiguration`) are not
-   * re-shaped — AWS auto-defaults / extra-metadata / write-only redaction
-   * (`Password`) make the round-trip unsafe; they're declared via
-   * `getDriftUnknownPaths()` so the comparator skips them instead of firing
-   * false drift. Non-S3 destination types
+   * **Destination configurations**: full coverage for S3 / ExtendedS3.
+   * AWS returns destination config under `Destinations[0].*DestinationDescription`
+   * (note: `Description`, not `Configuration`); the SDK reuses the same
+   * type as the corresponding `*Configuration` input for the inner
+   * sub-shapes, so reverse-mapping is a `pickDefinedDeep` pass-through.
+   *
+   * Surfaced top-level fields: `BucketARN`, `RoleARN`, `Prefix`,
+   * `ErrorOutputPrefix`, `BufferingHints`, `CompressionFormat`, plus
+   * `S3BackupMode` for Extended. Surfaced inner nested fields:
+   * `EncryptionConfiguration`, `CloudWatchLoggingOptions` (both shapes);
+   * additionally for Extended `ProcessingConfiguration`,
+   * `DataFormatConversionConfiguration`, `DynamicPartitioningConfiguration`,
+   * `S3BackupConfiguration` (reverse-mapped from the AWS-side
+   * `S3BackupDescription`). Each inner subtree is always emitted (even
+   * as `{}` placeholder) so the v3 `observedProperties` baseline catches
+   * console-side ADDs to a previously-default sub-shape.
+   *
+   * Non-S3 destination types
    * (`Redshift`/`Elasticsearch`/`Amazonopensearchservice`/`Splunk`/`HttpEndpoint`/`AmazonOpenSearchServerless`)
-   * stay drift-unknown for v1 — same shape-divergence problem at scale.
-   * `DeliveryStreamEncryptionConfigurationInput` also drift-unknown.
+   * are reverse-mapped via `mapRedshiftDescriptionToCfn` /
+   * `mapHttpEndpointDescriptionToCfn` / `mapNonS3DestinationToCfn`. The
+   * SDK reuses field names between Description and Configuration for
+   * these destinations, so a `pickDefinedDeep` pass-through produces a
+   * CFn-compatible shape. AWS-managed read-only `VpcId` is stripped
+   * from `VpcConfigurationDescription`. Write-only fields AWS strips
+   * from descriptions (`RedshiftDestinationConfiguration.Password`,
+   * `HttpEndpointDestinationConfiguration.EndpointConfiguration.AccessKey`)
+   * stay drift-unknown via `getDriftUnknownPaths`.
+   * `DeliveryStreamEncryptionConfigurationInput` is also still
+   * drift-unknown (separate `Get*` call needed for the read-side
+   * `DeliveryStreamEncryptionConfiguration`).
    *
    * Tags are surfaced via a follow-up `ListTagsForDeliveryStream` call
    * with `aws:*` filtered out and always emitted as `[]` placeholder when
@@ -35767,57 +35782,37 @@ var FirehoseProvider = class {
     }
     const dest = desc.Destinations?.[0];
     if (dest?.ExtendedS3DestinationDescription) {
-      const ext = dest.ExtendedS3DestinationDescription;
-      const out = {};
-      if (ext.BucketARN !== void 0)
-        out["BucketARN"] = ext.BucketARN;
-      if (ext.RoleARN !== void 0)
-        out["RoleARN"] = ext.RoleARN;
-      if (ext.Prefix !== void 0)
-        out["Prefix"] = ext.Prefix;
-      if (ext.ErrorOutputPrefix !== void 0)
-        out["ErrorOutputPrefix"] = ext.ErrorOutputPrefix;
-      if (ext.CompressionFormat !== void 0)
-        out["CompressionFormat"] = ext.CompressionFormat;
-      if (ext.BufferingHints) {
-        const hints = {};
-        if (ext.BufferingHints.SizeInMBs !== void 0)
-          hints["SizeInMBs"] = ext.BufferingHints.SizeInMBs;
-        if (ext.BufferingHints.IntervalInSeconds !== void 0)
-          hints["IntervalInSeconds"] = ext.BufferingHints.IntervalInSeconds;
-        if (Object.keys(hints).length > 0)
-          out["BufferingHints"] = hints;
-      }
-      if (ext.S3BackupMode !== void 0)
-        out["S3BackupMode"] = ext.S3BackupMode;
-      if (Object.keys(out).length > 0) {
-        result["ExtendedS3DestinationConfiguration"] = out;
-      }
+      result["ExtendedS3DestinationConfiguration"] = mapExtendedS3DescriptionToCfn(
+        dest.ExtendedS3DestinationDescription
+      );
     } else if (dest?.S3DestinationDescription) {
-      const s3 = dest.S3DestinationDescription;
-      const out = {};
-      if (s3.BucketARN !== void 0)
-        out["BucketARN"] = s3.BucketARN;
-      if (s3.RoleARN !== void 0)
-        out["RoleARN"] = s3.RoleARN;
-      if (s3.Prefix !== void 0)
-        out["Prefix"] = s3.Prefix;
-      if (s3.ErrorOutputPrefix !== void 0)
-        out["ErrorOutputPrefix"] = s3.ErrorOutputPrefix;
-      if (s3.CompressionFormat !== void 0)
-        out["CompressionFormat"] = s3.CompressionFormat;
-      if (s3.BufferingHints) {
-        const hints = {};
-        if (s3.BufferingHints.SizeInMBs !== void 0)
-          hints["SizeInMBs"] = s3.BufferingHints.SizeInMBs;
-        if (s3.BufferingHints.IntervalInSeconds !== void 0)
-          hints["IntervalInSeconds"] = s3.BufferingHints.IntervalInSeconds;
-        if (Object.keys(hints).length > 0)
-          out["BufferingHints"] = hints;
-      }
-      if (Object.keys(out).length > 0) {
-        result["S3DestinationConfiguration"] = out;
-      }
+      result["S3DestinationConfiguration"] = mapS3DescriptionToCfn(
+        dest.S3DestinationDescription
+      );
+    } else if (dest?.RedshiftDestinationDescription) {
+      result["RedshiftDestinationConfiguration"] = mapRedshiftDescriptionToCfn(
+        dest.RedshiftDestinationDescription
+      );
+    } else if (dest?.ElasticsearchDestinationDescription) {
+      result["ElasticsearchDestinationConfiguration"] = mapNonS3DestinationToCfn(
+        dest.ElasticsearchDestinationDescription
+      );
+    } else if (dest?.AmazonopensearchserviceDestinationDescription) {
+      result["AmazonopensearchserviceDestinationConfiguration"] = mapNonS3DestinationToCfn(
+        dest.AmazonopensearchserviceDestinationDescription
+      );
+    } else if (dest?.AmazonOpenSearchServerlessDestinationDescription) {
+      result["AmazonOpenSearchServerlessDestinationConfiguration"] = mapNonS3DestinationToCfn(
+        dest.AmazonOpenSearchServerlessDestinationDescription
+      );
+    } else if (dest?.SplunkDestinationDescription) {
+      result["SplunkDestinationConfiguration"] = mapNonS3DestinationToCfn(
+        dest.SplunkDestinationDescription
+      );
+    } else if (dest?.HttpEndpointDestinationDescription) {
+      result["HttpEndpointDestinationConfiguration"] = mapHttpEndpointDescriptionToCfn(
+        dest.HttpEndpointDestinationDescription
+      );
     }
     try {
       const tagsResp = await this.getClient().send(
@@ -35842,34 +35837,28 @@ var FirehoseProvider = class {
    * docstring for the full rationale per category.
    *
    * Categories:
-   *  - Inner nested fields under S3 / ExtendedS3 destinations: shape
-   *    divergence between `Configuration` (CFn input) and `Description`
-   *    (AWS read), AWS auto-defaults, write-only fields.
-   *  - Non-S3 destination types: same shape-divergence problem at scale,
-   *    deferred to a follow-up.
+   *  - Write-only fields AWS strips from descriptions: Redshift
+   *    `Password`, HttpEndpoint `EndpointConfiguration.AccessKey`. State
+   *    that carries these fires drift on every run otherwise; declaring
+   *    them as drift-unknown is the cleanest fix.
    *  - `DeliveryStreamEncryptionConfigurationInput`: input-only shape
    *    (`KeyARN` + `KeyType`) vs. read-side `DeliveryStreamEncryptionConfiguration`
    *    (extra status / failure fields); not yet round-tripped.
+   *
+   * S3 / ExtendedS3 inner nested fields and non-S3 destination types
+   * (Redshift / Elasticsearch / Amazonopensearchservice / Splunk /
+   * HttpEndpoint / AmazonOpenSearchServerless) are now reverse-mapped
+   * via `mapS3DescriptionToCfn` / `mapExtendedS3DescriptionToCfn` /
+   * `mapNonS3DestinationToCfn` / `mapRedshiftDescriptionToCfn` /
+   * `mapHttpEndpointDescriptionToCfn` and no longer drift-unknown at the
+   * top level.
    */
   getDriftUnknownPaths() {
     return [
-      // S3 / ExtendedS3 nested fields with shape divergence
-      "S3DestinationConfiguration.EncryptionConfiguration",
-      "S3DestinationConfiguration.CloudWatchLoggingOptions",
-      "ExtendedS3DestinationConfiguration.EncryptionConfiguration",
-      "ExtendedS3DestinationConfiguration.CloudWatchLoggingOptions",
-      "ExtendedS3DestinationConfiguration.ProcessingConfiguration",
-      "ExtendedS3DestinationConfiguration.DataFormatConversionConfiguration",
-      "ExtendedS3DestinationConfiguration.DynamicPartitioningConfiguration",
-      "ExtendedS3DestinationConfiguration.S3BackupConfiguration",
-      // Non-S3 destinations (drift-unknown for v1)
-      "RedshiftDestinationConfiguration",
-      "ElasticsearchDestinationConfiguration",
-      "AmazonopensearchserviceDestinationConfiguration",
-      "SplunkDestinationConfiguration",
-      "HttpEndpointDestinationConfiguration",
-      "AmazonOpenSearchServerlessDestinationConfiguration",
-      // Encryption input shape (deferred)
+      // Write-only fields AWS does not return on read.
+      "RedshiftDestinationConfiguration.Password",
+      "HttpEndpointDestinationConfiguration.EndpointConfiguration.AccessKey",
+      // Encryption input shape (deferred — separate Get* call needed).
       "DeliveryStreamEncryptionConfigurationInput"
     ];
   }
@@ -35936,6 +35925,132 @@ var FirehoseProvider = class {
     this.logger.warn(`Firehose ${logicalId} did not reach ACTIVE after ${maxAttempts} attempts`);
   }
 };
+function pickDefinedDeep(input) {
+  if (input === void 0 || input === null)
+    return void 0;
+  if (typeof input !== "object")
+    return input;
+  if (Array.isArray(input)) {
+    return input.map((v) => pickDefinedDeep(v));
+  }
+  const out = {};
+  for (const [k, v] of Object.entries(input)) {
+    if (v === void 0)
+      continue;
+    const cleaned = pickDefinedDeep(v);
+    if (cleaned === void 0)
+      continue;
+    if (cleaned !== null && typeof cleaned === "object" && !Array.isArray(cleaned) && Object.keys(cleaned).length === 0) {
+      continue;
+    }
+    out[k] = cleaned;
+  }
+  return out;
+}
+function mapS3DescriptionToCfn(desc) {
+  const out = {};
+  if (desc["BucketARN"] !== void 0)
+    out["BucketARN"] = desc["BucketARN"];
+  if (desc["RoleARN"] !== void 0)
+    out["RoleARN"] = desc["RoleARN"];
+  if (desc["Prefix"] !== void 0)
+    out["Prefix"] = desc["Prefix"];
+  if (desc["ErrorOutputPrefix"] !== void 0) {
+    out["ErrorOutputPrefix"] = desc["ErrorOutputPrefix"];
+  }
+  if (desc["CompressionFormat"] !== void 0) {
+    out["CompressionFormat"] = desc["CompressionFormat"];
+  }
+  if (desc["BufferingHints"]) {
+    const hints = pickDefinedDeep(desc["BufferingHints"]);
+    if (hints && typeof hints === "object" && Object.keys(hints).length > 0) {
+      out["BufferingHints"] = hints;
+    }
+  }
+  out["EncryptionConfiguration"] = pickDefinedDeep(desc["EncryptionConfiguration"]) ?? {};
+  out["CloudWatchLoggingOptions"] = pickDefinedDeep(desc["CloudWatchLoggingOptions"]) ?? {};
+  return out;
+}
+function mapExtendedS3DescriptionToCfn(desc) {
+  const out = mapS3DescriptionToCfn(desc);
+  if (desc["S3BackupMode"] !== void 0)
+    out["S3BackupMode"] = desc["S3BackupMode"];
+  out["ProcessingConfiguration"] = pickDefinedDeep(desc["ProcessingConfiguration"]) ?? {};
+  out["DataFormatConversionConfiguration"] = pickDefinedDeep(desc["DataFormatConversionConfiguration"]) ?? {};
+  out["DynamicPartitioningConfiguration"] = pickDefinedDeep(desc["DynamicPartitioningConfiguration"]) ?? {};
+  if (desc["S3BackupDescription"]) {
+    out["S3BackupConfiguration"] = mapS3DescriptionToCfn(
+      desc["S3BackupDescription"]
+    );
+  } else {
+    out["S3BackupConfiguration"] = {};
+  }
+  return out;
+}
+function mapNonS3DestinationToCfn(desc) {
+  const cleaned = pickDefinedDeep(desc);
+  if (!cleaned)
+    return {};
+  if (cleaned["VpcConfigurationDescription"]) {
+    const vpc = { ...cleaned["VpcConfigurationDescription"] };
+    delete vpc["VpcId"];
+    delete cleaned["VpcConfigurationDescription"];
+    if (Object.keys(vpc).length > 0)
+      cleaned["VpcConfiguration"] = vpc;
+  }
+  return cleaned;
+}
+function mapRedshiftDescriptionToCfn(desc) {
+  const out = {};
+  for (const k of [
+    "RoleARN",
+    "ClusterJDBCURL",
+    "CopyCommand",
+    "Username",
+    "RetryOptions",
+    "ProcessingConfiguration",
+    "S3BackupMode",
+    "CloudWatchLoggingOptions",
+    "SecretsManagerConfiguration"
+  ]) {
+    const v = pickDefinedDeep(desc[k]);
+    if (v !== void 0)
+      out[k] = v;
+  }
+  if (desc["S3DestinationDescription"]) {
+    out["S3Configuration"] = mapS3DescriptionToCfn(
+      desc["S3DestinationDescription"]
+    );
+  }
+  if (desc["S3BackupDescription"]) {
+    out["S3BackupConfiguration"] = mapS3DescriptionToCfn(
+      desc["S3BackupDescription"]
+    );
+  }
+  return out;
+}
+function mapHttpEndpointDescriptionToCfn(desc) {
+  const out = {};
+  for (const k of [
+    "BufferingHints",
+    "CloudWatchLoggingOptions",
+    "RequestConfiguration",
+    "ProcessingConfiguration",
+    "RoleARN",
+    "RetryOptions",
+    "SecretsManagerConfiguration"
+  ]) {
+    const v = pickDefinedDeep(desc[k]);
+    if (v !== void 0)
+      out[k] = v;
+  }
+  if (desc["EndpointConfiguration"]) {
+    const endpoint = pickDefinedDeep(desc["EndpointConfiguration"]);
+    if (endpoint !== void 0)
+      out["EndpointConfiguration"] = endpoint;
+  }
+  return out;
+}
 
 // src/provisioning/providers/cloudtrail-provider.ts
 import {
@@ -45073,7 +45188,7 @@ function reorderArgs(argv) {
 }
 async function main() {
   const program = new Command14();
-  program.name("cdkd").description("CDK Direct - Deploy AWS CDK apps directly via SDK/Cloud Control API").version("0.51.6");
+  program.name("cdkd").description("CDK Direct - Deploy AWS CDK apps directly via SDK/Cloud Control API").version("0.51.8");
   program.addCommand(createBootstrapCommand());
   program.addCommand(createSynthCommand());
   program.addCommand(createListCommand());