@go-to-k/cdkd 0.254.0 → 0.254.1

package/dist/cli.js

@@ -1888,7 +1888,7 @@ const FLUSH_INTERVAL_MS = 2e3;
 const FLUSH_EVENT_THRESHOLD = 50;
 /** Build-time cdkd version, with a dev fallback for non-built contexts. */
 function getCdkdVersion() {
-	return "0.254.0";
+	return "0.254.1";
 }
 /**
 * Generate a time-sortable unique run id, e.g.
@@ -35042,7 +35042,10 @@ var FSxFileSystemProvider = class {
 			diff: {},
 			hasMutableDiff: false
 		};
-		const storageCapacityChanged = changed("StorageCapacity");
+		const resolvedStorageCapacity = toNumber$3(properties["StorageCapacity"]);
+		const storageCapacityIsPlaceholder = resolvedStorageCapacity !== void 0 && resolvedStorageCapacity <= 0;
+		if (storageCapacityIsPlaceholder && changed("StorageCapacity")) this.logger.debug(`Suppressing non-positive StorageCapacity (${resolvedStorageCapacity}) for FSx FileSystem ${logicalId}: this is the readCurrentState placeholder for a capacity-less file system (Lustre Intelligent-Tiering), not a desired value.`);
+		const storageCapacityChanged = changed("StorageCapacity") && !storageCapacityIsPlaceholder;
 		const storageTypeChanged = changed("StorageType");
 		const typeVersionChanged = changed("FileSystemTypeVersion");
 		const networkTypeChanged = changed("NetworkType");
@@ -35430,6 +35433,40 @@ var FSxFileSystemProvider = class {
 			default: return;
 		}
 	}
+	/** Map the read-side `LustreConfiguration` back to CFn input shape. */
+	readLustreConfiguration(lustre) {
+		const config = {};
+		putIfDefined(config, "WeeklyMaintenanceStartTime", lustre.WeeklyMaintenanceStartTime);
+		putIfDefined(config, "DeploymentType", lustre.DeploymentType);
+		putIfDefined(config, "PerUnitStorageThroughput", lustre.PerUnitStorageThroughput);
+		putIfDefined(config, "DailyAutomaticBackupStartTime", lustre.DailyAutomaticBackupStartTime);
+		putIfDefined(config, "AutomaticBackupRetentionDays", lustre.AutomaticBackupRetentionDays);
+		putIfDefined(config, "CopyTagsToBackups", lustre.CopyTagsToBackups);
+		putIfDefined(config, "DriveCacheType", lustre.DriveCacheType);
+		putIfDefined(config, "DataCompressionType", lustre.DataCompressionType);
+		putIfDefined(config, "EfaEnabled", lustre.EfaEnabled);
+		putIfDefined(config, "ThroughputCapacity", lustre.ThroughputCapacity);
+		if (lustre.MetadataConfiguration) {
+			const metadata = {};
+			putIfDefined(metadata, "Mode", lustre.MetadataConfiguration.Mode);
+			putIfDefined(metadata, "Iops", lustre.MetadataConfiguration.Iops);
+			if (Object.keys(metadata).length > 0) config["MetadataConfiguration"] = metadata;
+		}
+		if (lustre.DataReadCacheConfiguration) {
+			const readCache = {};
+			putIfDefined(readCache, "SizingMode", lustre.DataReadCacheConfiguration.SizingMode);
+			putIfDefined(readCache, "SizeGiB", lustre.DataReadCacheConfiguration.SizeGiB);
+			if (Object.keys(readCache).length > 0) config["DataReadCacheConfiguration"] = readCache;
+		}
+		const dataRepo = lustre.DataRepositoryConfiguration;
+		if (dataRepo) {
+			putIfDefined(config, "ImportPath", dataRepo.ImportPath);
+			putIfDefined(config, "ExportPath", dataRepo.ExportPath);
+			putIfDefined(config, "AutoImportPolicy", dataRepo.AutoImportPolicy);
+			putIfDefined(config, "ImportedFileChunkSize", dataRepo.ImportedFileChunkSize);
+		}
+		return config;
+	}
 	/** Map the read-side `WindowsConfiguration` back to CFn input shape. */
 	readWindowsConfiguration(windows) {
 		const config = {};
@@ -35587,8 +35624,14 @@ var FSxFileSystemProvider = class {
 	* mapped back from the nested `DataRepositoryConfiguration` the API
 	* returns. The Windows / ONTAP / OpenZFS variant blocks are reverse-mapped
 	* by their respective `read*Configuration` helpers; the few inputs AWS
-	* never returns stay listed in {@link getDriftUnknownPaths}. At most one
-	* variant block is ever present (they key off `FileSystemType`).
+	* never returns stay listed in {@link getDriftUnknownPaths}.
+	*
+	* Emission follows `docs/provider-development.md` §3b: every top-level
+	* property `update()` can mutate is emitted unconditionally with a
+	* placeholder, registry-createOnly properties keep their guard, and the
+	* `<Variant>Configuration` blocks take the Class 1 type-discriminator
+	* carve-out — exactly the ONE block matching `FileSystemType` is emitted
+	* (at most one is ever legal on AWS), never the other three.
 	* Returns `undefined` when the file system is gone.
 	*/
 	async readCurrentState(physicalId, _logicalId, resourceType) {
@@ -35603,59 +35646,31 @@ var FSxFileSystemProvider = class {
 		if (!fs) return void 0;
 		const result = {};
 		putIfDefined(result, "FileSystemType", fs.FileSystemType);
-		putIfDefined(result, "StorageCapacity", fs.StorageCapacity);
-		putIfDefined(result, "StorageType", fs.StorageType);
 		putIfDefined(result, "SubnetIds", fs.SubnetIds ? [...fs.SubnetIds] : void 0);
 		putIfDefined(result, "KmsKeyId", fs.KmsKeyId);
-		putIfDefined(result, "FileSystemTypeVersion", fs.FileSystemTypeVersion);
-		putIfDefined(result, "NetworkType", fs.NetworkType);
-		const lustre = fs.LustreConfiguration;
-		if (lustre) {
-			const config = {};
-			putIfDefined(config, "WeeklyMaintenanceStartTime", lustre.WeeklyMaintenanceStartTime);
-			putIfDefined(config, "DeploymentType", lustre.DeploymentType);
-			putIfDefined(config, "PerUnitStorageThroughput", lustre.PerUnitStorageThroughput);
-			putIfDefined(config, "DailyAutomaticBackupStartTime", lustre.DailyAutomaticBackupStartTime);
-			putIfDefined(config, "AutomaticBackupRetentionDays", lustre.AutomaticBackupRetentionDays);
-			putIfDefined(config, "CopyTagsToBackups", lustre.CopyTagsToBackups);
-			putIfDefined(config, "DriveCacheType", lustre.DriveCacheType);
-			putIfDefined(config, "DataCompressionType", lustre.DataCompressionType);
-			putIfDefined(config, "EfaEnabled", lustre.EfaEnabled);
-			putIfDefined(config, "ThroughputCapacity", lustre.ThroughputCapacity);
-			if (lustre.MetadataConfiguration) {
-				const metadata = {};
-				putIfDefined(metadata, "Mode", lustre.MetadataConfiguration.Mode);
-				putIfDefined(metadata, "Iops", lustre.MetadataConfiguration.Iops);
-				if (Object.keys(metadata).length > 0) config["MetadataConfiguration"] = metadata;
-			}
-			if (lustre.DataReadCacheConfiguration) {
-				const readCache = {};
-				putIfDefined(readCache, "SizingMode", lustre.DataReadCacheConfiguration.SizingMode);
-				putIfDefined(readCache, "SizeGiB", lustre.DataReadCacheConfiguration.SizeGiB);
-				if (Object.keys(readCache).length > 0) config["DataReadCacheConfiguration"] = readCache;
-			}
-			const dataRepo = lustre.DataRepositoryConfiguration;
-			if (dataRepo) {
-				putIfDefined(config, "ImportPath", dataRepo.ImportPath);
-				putIfDefined(config, "ExportPath", dataRepo.ExportPath);
-				putIfDefined(config, "AutoImportPolicy", dataRepo.AutoImportPolicy);
-				putIfDefined(config, "ImportedFileChunkSize", dataRepo.ImportedFileChunkSize);
-			}
-			if (Object.keys(config).length > 0) result["LustreConfiguration"] = config;
-		}
-		if (fs.WindowsConfiguration) {
-			const config = this.readWindowsConfiguration(fs.WindowsConfiguration);
-			if (Object.keys(config).length > 0) result["WindowsConfiguration"] = config;
-		}
-		if (fs.OntapConfiguration) {
-			const config = this.readOntapConfiguration(fs.OntapConfiguration);
-			if (Object.keys(config).length > 0) result["OntapConfiguration"] = config;
-		}
-		if (fs.OpenZFSConfiguration) {
-			const config = this.readOpenZFSConfiguration(fs.OpenZFSConfiguration);
-			if (Object.keys(config).length > 0) result["OpenZFSConfiguration"] = config;
-		}
+		result["StorageCapacity"] = fs.StorageCapacity ?? 0;
+		result["StorageType"] = fs.StorageType ?? "SSD";
+		result["FileSystemTypeVersion"] = fs.FileSystemTypeVersion ?? "";
+		result["NetworkType"] = fs.NetworkType ?? "IPV4";
 		result["Tags"] = normalizeAwsTagsToCfn(fs.Tags);
+		const variantKey = fs.FileSystemType ? VARIANT_CONFIG_KEY[fs.FileSystemType] : void 0;
+		switch (variantKey) {
+			case "LustreConfiguration":
+				result[variantKey] = this.readLustreConfiguration(fs.LustreConfiguration ?? {});
+				break;
+			case "WindowsConfiguration":
+				result[variantKey] = this.readWindowsConfiguration(fs.WindowsConfiguration ?? {});
+				break;
+			case "OntapConfiguration":
+				result[variantKey] = this.readOntapConfiguration(fs.OntapConfiguration ?? {});
+				break;
+			case "OpenZFSConfiguration":
+				result[variantKey] = this.readOpenZFSConfiguration(fs.OpenZFSConfiguration ?? {});
+				break;
+			default:
+				this.logger.warn(`FSx FileSystem ${physicalId} has FileSystemType '${fs.FileSystemType ?? "(unset)"}', which cdkd does not recognize (expected one of ${Object.keys(VARIANT_CONFIG_KEY).join(" / ")}). Its variant configuration is NOT included in the drift snapshot, so drift in that block cannot be detected. Please report this at https://github.com/go-to-k/cdkd/issues`);
+				break;
+		}
 		return result;
 	}
 	/**
@@ -62069,6 +62084,47 @@ function createMigrateCommand() {
 	return new Command("migrate").description("Adopt a plain (non-CDK) CloudFormation stack into a cdkd-managed CDK app. Generates new CDK code via upstream `cdk migrate`, builds a logical-ID mapping between the source CFn template and the synth template, writes cdkd state, and (optionally) retires the source CFn stack. AWS resources are never modified.").argument("[stack]", "Source CFn stack name. Alias for --from-cfn-stack.").addOption(new Option("--from-cfn-stack <name>", "Source CloudFormation stack name to adopt. Required (or pass positionally).")).addOption(new Option("--output-dir <dir>", "Directory to write the generated CDK app to. Defaults to <cwd>/<CfnStackName>.")).addOption(new Option("--language <choice>", "Generated code language. v1: typescript only.").choices(["typescript"]).default("typescript")).addOption(new Option("--region <region>", "AWS region. Defaults to AWS_REGION env / profile.")).addOption(new Option("--account <id>", "AWS account ID. Auto-detected via STS when omitted.")).addOption(new Option("--retire-cfn-stack", "After cdkd state is written, inject DeletionPolicy=Retain on every resource in the source CFn stack and DeleteStack. AWS resources stay; the CFn stack record is gone. Off by default.").default(false)).addOption(new Option("--filter <key=value>", "Pass-through to `cdk migrate --filter` for resource subsetting. Repeatable.").argParser((value, previous) => [...previous ?? [], value]).default([])).addOption(new Option("--skip-install", "Skip `npm install` after codegen.").default(false)).addOption(new Option("--skip-synth", "Skip `cdk synth` (does NOT write cdkd state). Mutually exclusive with --retire-cfn-stack.").default(false)).addOption(new Option("--dry-run", "Print the import plan without writing state or retiring the CFn stack. Mutually exclusive with --retire-cfn-stack.").default(false)).addOption(new Option("-y, --yes", "Auto-confirm the import + retirement prompts.").default(false)).addOption(new Option("--cdk-bin <path>", "Override the `cdk` binary path.")).addOption(new Option("--resource-mapping <file>", `Path to a JSON file of {sourceLogicalId: synthLogicalId} overrides. Same shape as the auto-written ${RESOURCE_MAPPING_FILENAME}.`)).addOption(new Option("--state-bucket <name>", "cdkd state bucket. Defaults to cdkd-state-<accountId>.")).addOption(new Option("--state-prefix <prefix>", "cdkd state prefix inside the bucket.").default("cdkd")).addOption(new Option("--profile <name>", "AWS profile name.")).addOption(new Option("--role-arn <arn>", "IAM role to assume before any AWS call.")).addOption(new Option("--verbose", "Enable debug-level logging.").default(false)).action(withErrorHandling(migrateCommandAction));
 }
 
+//#endregion
+//#region src/cli/program.ts
+/**
+* Builds the full `cdkd` command tree.
+*
+* Lives in its own module rather than in `index.ts` because importing
+* `index.ts` runs `main()` as a side effect — the same reason
+* `pipe-close-handler.ts` was split out. Tooling can import this one safely.
+*
+* The consumer that motivated the split is
+* `scripts/check-integ-cli-flags.ts`, which validates every CLI invocation in
+* the integ fixtures against the option set of the subcommand that actually
+* declares the flag. Reading the real tree matters: `--help` omits hidden
+* options, and `src/cli/options.ts` is a flat global list with no command
+* attachment — so a flag declared there but never attached to a given
+* subcommand (the `cdkd import --region` case, which silently meant an entire
+* fixture's import round-trip never ran) is invisible to both.
+*/
+function buildProgram() {
+	const program = new Command();
+	program.name("cdkd").description("CDK Direct - Deploy AWS CDK apps directly via SDK/Cloud Control API").version("0.254.1");
+	program.addCommand(createBootstrapCommand());
+	program.addCommand(createSynthCommand());
+	program.addCommand(createListCommand());
+	program.addCommand(createDeployCommand());
+	program.addCommand(createDiffCommand());
+	program.addCommand(createDriftCommand());
+	program.addCommand(createDestroyCommand());
+	program.addCommand(createEventsCommand());
+	program.addCommand(createGcCommand());
+	program.addCommand(createOrphanCommand());
+	program.addCommand(createImportCommand());
+	program.addCommand(createPublishAssetsCommand());
+	program.addCommand(createForceUnlockCommand());
+	program.addCommand(createStateCommand());
+	program.addCommand(createLocalCommand());
+	program.addCommand(createExportCommand());
+	program.addCommand(createMigrateCommand());
+	return program;
+}
+
 //#endregion
 //#region src/cli/pipe-close-handler.ts
 /**
@@ -62137,25 +62193,7 @@ function reorderArgs(argv) {
 */
 async function main() {
 	installPipeCloseHandler();
-	const program = new Command();
-	program.name("cdkd").description("CDK Direct - Deploy AWS CDK apps directly via SDK/Cloud Control API").version("0.254.0");
-	program.addCommand(createBootstrapCommand());
-	program.addCommand(createSynthCommand());
-	program.addCommand(createListCommand());
-	program.addCommand(createDeployCommand());
-	program.addCommand(createDiffCommand());
-	program.addCommand(createDriftCommand());
-	program.addCommand(createDestroyCommand());
-	program.addCommand(createEventsCommand());
-	program.addCommand(createGcCommand());
-	program.addCommand(createOrphanCommand());
-	program.addCommand(createImportCommand());
-	program.addCommand(createPublishAssetsCommand());
-	program.addCommand(createForceUnlockCommand());
-	program.addCommand(createStateCommand());
-	program.addCommand(createLocalCommand());
-	program.addCommand(createExportCommand());
-	program.addCommand(createMigrateCommand());
+	const program = buildProgram();
 	const args = reorderArgs(process.argv);
 	await program.parseAsync(args);
 }