@go-to-k/cdkd 0.51.4 → 0.51.5

package/dist/cli.js

@@ -19470,7 +19470,8 @@ import {
   ReplaceNetworkAclAssociationCommand,
   DescribeNetworkAclsCommand,
   DescribeNetworkInterfacesCommand as DescribeNetworkInterfacesCommand2,
-  DeleteNetworkInterfaceCommand as DeleteNetworkInterfaceCommand2
+  DeleteNetworkInterfaceCommand as DeleteNetworkInterfaceCommand2,
+  DescribeVolumesCommand
 } from "@aws-sdk/client-ec2";
 init_aws_clients();
 var EC2Provider = class {
@@ -21749,8 +21750,23 @@ var EC2Provider = class {
    *    always emitted (even as `[]`) so the v3 `observedProperties`
    *    baseline catches console-side rule ADDs to a templated SG.
    *  - **AWS::EC2::Instance**: `DescribeInstances` for `ImageId`,
-   *    `InstanceType`, `KeyName`, `SubnetId`. SecurityGroupIds /
-   *    BlockDeviceMappings shape-match is out of scope for v1.
+   *    `InstanceType`, `KeyName`, `SubnetId`, `SecurityGroupIds` (sorted
+   *    list of `SecurityGroups[].GroupId` for stable positional compare),
+   *    `PrivateIpAddress`, `SourceDestCheck`, `Monitoring` (mapped from
+   *    AWS `Monitoring.State` to CFn boolean), `Tenancy` (from
+   *    `Placement.Tenancy`), `IamInstanceProfile` (ARN form — v2 fallback
+   *    state holding a name will fire one-time drift, resolved via
+   *    `cdkd state refresh-observed`), `Tags` (filtered `aws:*`). For
+   *    `BlockDeviceMappings`, `DescribeInstances` only returns
+   *    `(DeviceName, Ebs.VolumeId, Ebs.DeleteOnTermination)`; cdkd
+   *    additionally calls `DescribeVolumes` on the attached volume ids to
+   *    surface `VolumeType` / `VolumeSize` / `Iops` / `Throughput` /
+   *    `Encrypted` / `KmsKeyId` / `SnapshotId`. The DescribeVolumes call
+   *    is best-effort — a permissions gap or other failure falls back to
+   *    the partial shape (DeleteOnTermination only). All arrays / scalars
+   *    that map to user-controllable CFn properties are always emitted
+   *    (even as `[]` or default scalar) so the v3 `observedProperties`
+   *    baseline catches console-side ADDs.
    *  - **AWS::EC2::NetworkAcl**: `DescribeNetworkAcls` for `VpcId`.
    *
    * Skipped (return `undefined`, falls through to the comparator's
@@ -21937,6 +21953,75 @@ var EC2Provider = class {
       result["KeyName"] = instance.KeyName;
     if (instance.SubnetId !== void 0)
       result["SubnetId"] = instance.SubnetId;
+    result["SecurityGroupIds"] = (instance.SecurityGroups ?? []).map((g) => g.GroupId).filter((id) => typeof id === "string").sort();
+    if (instance.PrivateIpAddress !== void 0) {
+      result["PrivateIpAddress"] = instance.PrivateIpAddress;
+    }
+    if (instance.SourceDestCheck !== void 0) {
+      result["SourceDestCheck"] = instance.SourceDestCheck;
+    }
+    const monitoringState = instance.Monitoring?.State;
+    result["Monitoring"] = monitoringState === "enabled" || monitoringState === "pending";
+    if (instance.Placement?.Tenancy !== void 0) {
+      result["Tenancy"] = instance.Placement.Tenancy;
+    }
+    if (instance.IamInstanceProfile?.Arn !== void 0) {
+      result["IamInstanceProfile"] = instance.IamInstanceProfile.Arn;
+    }
+    const ebsMappings = (instance.BlockDeviceMappings ?? []).filter(
+      (m) => m.Ebs?.VolumeId !== void 0
+    );
+    const volumeIds = ebsMappings.map((m) => m.Ebs.VolumeId);
+    let volumesById = /* @__PURE__ */ new Map();
+    if (volumeIds.length > 0) {
+      try {
+        const volResp = await this.ec2Client.send(
+          new DescribeVolumesCommand({ VolumeIds: volumeIds })
+        );
+        for (const v of volResp.Volumes ?? []) {
+          if (v.VolumeId !== void 0)
+            volumesById.set(v.VolumeId, v);
+        }
+      } catch (err) {
+        this.logger.debug(
+          `DescribeVolumes(${volumeIds.join(",")}) failed: ${err instanceof Error ? err.message : String(err)}`
+        );
+        volumesById = /* @__PURE__ */ new Map();
+      }
+    }
+    const blockMappings = [];
+    for (const m of instance.BlockDeviceMappings ?? []) {
+      const out = {};
+      if (m.DeviceName !== void 0)
+        out["DeviceName"] = m.DeviceName;
+      if (m.Ebs?.VolumeId !== void 0) {
+        const ebs = {};
+        if (m.Ebs.DeleteOnTermination !== void 0) {
+          ebs["DeleteOnTermination"] = m.Ebs.DeleteOnTermination;
+        }
+        const vol = volumesById.get(m.Ebs.VolumeId);
+        if (vol !== void 0) {
+          if (vol.VolumeType !== void 0)
+            ebs["VolumeType"] = vol.VolumeType;
+          if (vol.Size !== void 0)
+            ebs["VolumeSize"] = vol.Size;
+          if (vol.Iops !== void 0)
+            ebs["Iops"] = vol.Iops;
+          if (vol.Throughput !== void 0)
+            ebs["Throughput"] = vol.Throughput;
+          if (vol.Encrypted !== void 0)
+            ebs["Encrypted"] = vol.Encrypted;
+          if (vol.KmsKeyId !== void 0)
+            ebs["KmsKeyId"] = vol.KmsKeyId;
+          if (vol.SnapshotId !== void 0)
+            ebs["SnapshotId"] = vol.SnapshotId;
+        }
+        out["Ebs"] = ebs;
+      }
+      blockMappings.push(out);
+    }
+    result["BlockDeviceMappings"] = blockMappings;
+    result["Tags"] = normalizeAwsTagsToCfn(instance.Tags);
     return result;
   }
   async readNetworkAclCurrentState(physicalId) {
@@ -44710,7 +44795,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.4");
+  program.name("cdkd").description("CDK Direct - Deploy AWS CDK apps directly via SDK/Cloud Control API").version("0.51.5");
   program.addCommand(createBootstrapCommand());
   program.addCommand(createSynthCommand());
   program.addCommand(createListCommand());