@go-to-k/cdkd 0.91.5 → 0.92.0

package/README.md

@@ -453,6 +453,47 @@ Two `orphan` variants at different granularities:
 Both `cdkd destroy` (synth-driven) and `cdkd state destroy`
 (state-driven, no synth) delete AWS resources + state.
 
+## Stack-name prefix on physical names
+
+cdkd prepends the **stack name** to physical names you declare in CDK
+code: `new iam.Role(this, 'CRRole', { roleName: 'my-role' })` in stack
+`MyStack` is created in AWS as `MyStack-my-role`. The prefix protects
+cross-stack uniqueness (two stacks declaring `roleName: 'my-role'`
+otherwise collide on a single AWS account). Pre-PR this behavior was
+**inconsistent**: only IAM Role / User / Group / InstanceProfile and
+ELBv2 LoadBalancer / TargetGroup actually got the prefix; Lambda, S3,
+SNS, SQS, DynamoDB, etc. used the user's declared name as-is.
+
+`cdkd deploy --no-prefix-user-supplied-names` opts in to skipping
+the prefix on user-declared physical names, making cdkd consistent
+across all resource types. Off by default for backward compatibility.
+
+| | Default (no flag) | `--no-prefix-user-supplied-names` |
+| --- | --- | --- |
+| `new iam.Role({ roleName: 'my-role' })` | `MyStack-my-role` | `my-role` |
+| `new s3.Bucket({ bucketName: 'my-bucket' })` | `my-bucket` (already no prefix — Pattern A) | `my-bucket` (unchanged) |
+| `new iam.Role(...)` (no `roleName`) | `MyStack-CRRole-<hash>` (auto-generated, prefix kept for uniqueness) | `MyStack-CRRole-<hash>` (unchanged) |
+
+Resolution chain (highest wins): `--no-prefix-user-supplied-names`
+CLI flag → `CDKD_NO_PREFIX_USER_SUPPLIED_NAMES=true` env var →
+`cdk.json` `context.cdkd.noPrefixUserSuppliedNames: true` → default
+`false`.
+
+Affects `cdkd deploy` only. Already-deployed stacks deployed under
+the legacy prefixed-name scheme keep working — the flag only controls
+what AWS resource cdkd creates on **future** deploys. Switching the
+flag mid-flight on an existing stack would propose REPLACEMENT on
+every Pattern B resource (the existing AWS resource has the prefixed
+name; the new template intent has the un-prefixed name).
+
+Surfaced by [PR #285 `cdkd export`](https://github.com/go-to-k/cdkd/pull/285)
+where the CFn IMPORT changeset's identifier check would fail on a
+synth `RoleName: 'my-role'` vs the AWS-deployed `MyStack-my-role`;
+the export command currently overlays `ResourceIdentifier` onto
+`Properties` to bridge the gap. A future major-version PR will flip
+the default of `--no-prefix-user-supplied-names` to `true`, after
+which the overlay can be dropped.
+
 ## `--remove-protection`: one-shot bypass for protected resources
 
 CDK's `new Stack(app, 'X', { terminationProtection: true })` is honored

package/dist/cli.js

@@ -17823,10 +17823,23 @@ function withStackName(stackName, fn) {
 function getCurrentStackName() {
   return stackNameStore.getStore();
 }
+var skipPrefixStore = new AsyncLocalStorage();
+function withSkipPrefix(skip, fn) {
+  return skipPrefixStore.run(skip, fn);
+}
+function getCurrentSkipPrefix() {
+  return skipPrefixStore.getStore() ?? false;
+}
 function generateResourceName(name, options) {
-  const { maxLength, lowercase = false, allowedPattern = /[^a-zA-Z0-9-]/g } = options;
+  const {
+    maxLength,
+    lowercase = false,
+    allowedPattern = /[^a-zA-Z0-9-]/g,
+    userSupplied = false
+  } = options;
   const currentStackName = stackNameStore.getStore();
-  const fullName = currentStackName ? `${currentStackName}-${name}` : name;
+  const shouldPrefix = currentStackName && !(userSupplied && getCurrentSkipPrefix());
+  const fullName = shouldPrefix ? `${currentStackName}-${name}` : name;
   let sanitized = lowercase ? fullName.toLowerCase() : fullName;
   sanitized = sanitized.replace(allowedPattern, "-");
   sanitized = sanitized.replace(/-{2,}/g, "-").replace(/^-+|-+$/g, "");
@@ -17838,6 +17851,12 @@ function generateResourceName(name, options) {
   const prefix = sanitized.substring(0, maxPrefixLength).replace(/-+$/, "");
   return `${prefix}-${hash}`;
 }
+function generateResourceNameWithFallback(userSuppliedName, logicalId, options) {
+  if (userSuppliedName !== void 0 && userSuppliedName !== "") {
+    return generateResourceName(userSuppliedName, { ...options, userSupplied: true });
+  }
+  return generateResourceName(logicalId, { ...options, userSupplied: false });
+}
 var FALLBACK_NAME_RULES = {
   "AWS::S3::Bucket": { nameProperty: "BucketName", options: { maxLength: 63, lowercase: true } },
   "AWS::SQS::Queue": { nameProperty: "QueueName", options: { maxLength: 80 } },
@@ -23368,6 +23387,10 @@ var deployOptions = [
     "--no-capture-observed-state",
     "Skip capturing AWS-current properties after each create/update (adds a fire-and-forget readCurrentState per resource so cdkd drift can compare against the real deploy-time AWS snapshot instead of the template). On by default. Disable when deploy speed matters more than rich drift detection \u2014 falls back to comparing against template properties (the pre-v3 behavior)."
   ),
+  new Option(
+    "--no-prefix-user-supplied-names",
+    'Do NOT prepend the stack name to physical names the user explicitly supplied in their CDK code (e.g. `new iam.Role(this, "X", { roleName: "my-role" })` \u2192 AWS resource named `my-role` instead of `MyStack-my-role`). Auto-generated-name resources (where the user did not declare a physical name) keep the prefix unchanged. Off by default for backward compatibility; enable via this flag, CDKD_NO_PREFIX_USER_SUPPLIED_NAMES=true, or cdk.json context.cdkd.noPrefixUserSuppliedNames=true. Applies to `cdkd deploy` only.'
+  ),
   noWaitOption,
   aggressiveVpcParallelOption,
   new Option(
@@ -23512,6 +23535,19 @@ function resolveCaptureObservedState(cliValue) {
     return v;
   return true;
 }
+function resolveSkipPrefix(cliValue) {
+  if (cliValue === false)
+    return true;
+  const envValue = process.env["CDKD_NO_PREFIX_USER_SUPPLIED_NAMES"];
+  if (envValue === "true")
+    return true;
+  const cdkJson = loadCdkJson();
+  const cdkdContext = cdkJson?.context?.["cdkd"];
+  const v = cdkdContext?.["noPrefixUserSuppliedNames"];
+  if (typeof v === "boolean" && v === true)
+    return true;
+  return false;
+}
 function resolveStateBucketWithSource(cliBucket) {
   if (cliBucket)
     return { bucket: cliBucket, source: "cli-flag" };
@@ -27789,8 +27825,9 @@ var IAMRoleProvider = class {
    */
   async create(logicalId, resourceType, properties) {
     this.logger.debug(`Creating IAM role ${logicalId}`);
-    const roleName = generateResourceName(
-      properties["RoleName"] || logicalId,
+    const roleName = generateResourceNameWithFallback(
+      properties["RoleName"],
+      logicalId,
       { maxLength: 64 }
     );
     const assumeRolePolicyDocument = properties["AssumeRolePolicyDocument"];
@@ -27882,8 +27919,9 @@ var IAMRoleProvider = class {
    */
   async update(logicalId, physicalId, resourceType, properties, previousProperties) {
     this.logger.debug(`Updating IAM role ${logicalId}: ${physicalId}`);
-    const newRoleName = generateResourceName(
-      properties["RoleName"] || logicalId,
+    const newRoleName = generateResourceNameWithFallback(
+      properties["RoleName"],
+      logicalId,
       { maxLength: 64 }
     );
     const newPath = properties["Path"] || "/";
@@ -29004,8 +29042,9 @@ var IAMInstanceProfileProvider = class {
    */
   async create(logicalId, resourceType, properties) {
     this.logger.debug(`Creating IAM instance profile ${logicalId}`);
-    const instanceProfileName = generateResourceName(
-      properties["InstanceProfileName"] || logicalId,
+    const instanceProfileName = generateResourceNameWithFallback(
+      properties["InstanceProfileName"],
+      logicalId,
       { maxLength: 128 }
     );
     const path3 = properties["Path"] || "/";
@@ -29399,8 +29438,9 @@ var IAMUserGroupProvider = class {
   // ─── AWS::IAM::User ──────────────────────────────────────────────
   async createUser(logicalId, resourceType, properties) {
     this.logger.debug(`Creating IAM user ${logicalId}`);
-    const userName = generateResourceName(
-      properties["UserName"] || logicalId,
+    const userName = generateResourceNameWithFallback(
+      properties["UserName"],
+      logicalId,
       { maxLength: 64 }
     );
     try {
@@ -29883,8 +29923,9 @@ var IAMUserGroupProvider = class {
   // ─── AWS::IAM::Group ─────────────────────────────────────────────
   async createGroup(logicalId, resourceType, properties) {
     this.logger.debug(`Creating IAM group ${logicalId}`);
-    const groupName = generateResourceName(
-      properties["GroupName"] || logicalId,
+    const groupName = generateResourceNameWithFallback(
+      properties["GroupName"],
+      logicalId,
       { maxLength: 128 }
     );
     try {
@@ -48542,9 +48583,11 @@ var ELBv2Provider = class {
     this.logger.debug(`Creating LoadBalancer ${logicalId}`);
     try {
       const tags = this.extractTags(properties);
-      const lbName = generateResourceName(properties["Name"] || logicalId, {
-        maxLength: 32
-      });
+      const lbName = generateResourceNameWithFallback(
+        properties["Name"],
+        logicalId,
+        { maxLength: 32 }
+      );
       const response = await this.getClient().send(
         new CreateLoadBalancerCommand({
           Name: lbName,
@@ -48743,9 +48786,11 @@ var ELBv2Provider = class {
     try {
       const tags = this.extractTags(properties);
       const matcher = properties["Matcher"];
-      const tgName = generateResourceName(properties["Name"] || logicalId, {
-        maxLength: 32
-      });
+      const tgName = generateResourceNameWithFallback(
+        properties["Name"],
+        logicalId,
+        { maxLength: 32 }
+      );
       const response = await this.getClient().send(
         new CreateTargetGroupCommand({
           Name: tgName,
@@ -65438,6 +65483,12 @@ async function deployCommand(stacks, options) {
   if (!options.wait) {
     process.env["CDKD_NO_WAIT"] = "true";
   }
+  const skipPrefix = resolveSkipPrefix(options.prefixUserSuppliedNames);
+  if (skipPrefix) {
+    logger.debug(
+      "Skipping stack-name prefix on user-supplied physical names (--no-prefix-user-supplied-names / CDKD_NO_PREFIX_USER_SUPPLIED_NAMES / cdk.json context.cdkd.noPrefixUserSuppliedNames)"
+    );
+  }
   const app = resolveApp(options.app);
   if (!app) {
     throw new Error(
@@ -65597,6 +65648,9 @@ async function deployCommand(stacks, options) {
     logger.debug(`Work graph: ${summary["asset-publish"]} asset(s), ${summary["stack"]} stack(s)`);
     const bufferStackOutput = targetStacks.length > 1;
     const runStack = async (stackInfo) => {
+      return withSkipPrefix(skipPrefix, () => runStackInner(stackInfo));
+    };
+    const runStackInner = async (stackInfo) => {
       const stackRegion = stackInfo.region || baseRegion;
       logger.info(
         `
@@ -80800,7 +80854,7 @@ function reorderArgs(argv) {
 }
 async function main() {
   const program = new Command18();
-  program.name("cdkd").description("CDK Direct - Deploy AWS CDK apps directly via SDK/Cloud Control API").version("0.91.5");
+  program.name("cdkd").description("CDK Direct - Deploy AWS CDK apps directly via SDK/Cloud Control API").version("0.92.0");
   program.addCommand(createBootstrapCommand());
   program.addCommand(createSynthCommand());
   program.addCommand(createListCommand());