@go-to-k/cdkd 0.252.2 → 0.253.0

package/dist/{deploy-engine-IkhnJXWR.js → deploy-engine-CMSknHV7.js}

@@ -10766,7 +10766,8 @@ var CloudControlProvider = class {
 			this.logger.debug(`Created resource ${logicalId}, physical ID: ${progressEvent.Identifier}`);
 			const result = { physicalId: progressEvent.Identifier };
 			if (progressEvent.ResourceModel) result.attributes = this.parseResourceModel(progressEvent.ResourceModel);
-			result.attributes = await this.enrichResourceAttributes(resourceType, progressEvent.Identifier, result.attributes || {});
+			result.attributes = await this.mergeSparseModelReadback(resourceType, progressEvent.Identifier, result.attributes || {});
+			result.attributes = await this.enrichResourceAttributes(resourceType, progressEvent.Identifier, result.attributes);
 			return result;
 		} catch (error) {
 			await this.cleanupFailedCreateRemnant(error, resourceType, logicalId);
@@ -10860,7 +10861,8 @@ var CloudControlProvider = class {
 				wasReplaced: false
 			};
 			if (progressEvent.ResourceModel) result.attributes = this.parseResourceModel(progressEvent.ResourceModel);
-			result.attributes = await this.enrichResourceAttributes(resourceType, physicalId, result.attributes || {});
+			result.attributes = await this.mergeSparseModelReadback(resourceType, physicalId, result.attributes || {});
+			result.attributes = await this.enrichResourceAttributes(resourceType, physicalId, result.attributes);
 			return result;
 		} catch (error) {
 			this.handleError(error, "UPDATE", resourceType, logicalId, physicalId);
@@ -10873,7 +10875,7 @@ var CloudControlProvider = class {
 		this.logger.debug(`Deleting resource ${logicalId} (${resourceType}), physical ID: ${physicalId}`);
 		if (context?.removeProtection === true && resourceType === "AWS::AutoScaling::AutoScalingGroup") {
 			this.logger.debug(`Delegating protected AutoScalingGroup ${logicalId} delete to the SDK ASGProvider (Cloud Control cannot force-delete a protected ASG)`);
-			const { ASGProvider } = await import("./asg-provider-BzBdoSYp.js").then((n) => n.n);
+			const { ASGProvider } = await import("./asg-provider-75LZGhBd.js").then((n) => n.n);
 			await new ASGProvider().delete(logicalId, physicalId, resourceType, _properties, context);
 			return;
 		}
@@ -11190,7 +11192,7 @@ var CloudControlProvider = class {
 				break;
 			case "AWS::Backup::BackupVault":
 				if (!enriched["BackupVaultArn"]) {
-					const model = await this.readBackupResourceModel(resourceType, physicalId);
+					const model = await this.readCcResourceModel(resourceType, physicalId);
 					if (model) {
 						if (typeof model["BackupVaultArn"] === "string") enriched["BackupVaultArn"] = model["BackupVaultArn"];
 						if (!enriched["BackupVaultName"] && typeof model["BackupVaultName"] === "string") enriched["BackupVaultName"] = model["BackupVaultName"];
@@ -11201,7 +11203,7 @@ var CloudControlProvider = class {
 				break;
 			case "AWS::Backup::BackupPlan":
 				if (!enriched["BackupPlanArn"] || !enriched["VersionId"]) {
-					const model = await this.readBackupResourceModel(resourceType, physicalId);
+					const model = await this.readCcResourceModel(resourceType, physicalId);
 					if (model) {
 						if (!enriched["BackupPlanArn"] && typeof model["BackupPlanArn"] === "string") enriched["BackupPlanArn"] = model["BackupPlanArn"];
 						if (!enriched["VersionId"] && typeof model["VersionId"] === "string") enriched["VersionId"] = model["VersionId"];
@@ -11218,7 +11220,7 @@ var CloudControlProvider = class {
 						if (!enriched["SelectionId"]) enriched["SelectionId"] = physicalId.substring(0, firstUnderscore);
 						if (!enriched["BackupPlanId"]) enriched["BackupPlanId"] = physicalId.substring(firstUnderscore + 1);
 					}
-					const model = await this.readBackupResourceModel(resourceType, physicalId);
+					const model = await this.readCcResourceModel(resourceType, physicalId);
 					if (model) {
 						if (typeof model["SelectionId"] === "string") enriched["SelectionId"] = model["SelectionId"];
 						if (typeof model["BackupPlanId"] === "string") enriched["BackupPlanId"] = model["BackupPlanId"];
@@ -11226,18 +11228,98 @@ var CloudControlProvider = class {
 					}
 				}
 				break;
+			case "AWS::Pipes::Pipe":
+				if (!enriched["Arn"]) {
+					const model = await this.readCcResourceModel(resourceType, physicalId);
+					if (model) {
+						if (typeof model["Arn"] === "string") enriched["Arn"] = model["Arn"];
+						if (!enriched["CurrentState"] && typeof model["CurrentState"] === "string") enriched["CurrentState"] = model["CurrentState"];
+						if (!enriched["StateReason"] && typeof model["StateReason"] === "string") enriched["StateReason"] = model["StateReason"];
+						if (!enriched["CreationTime"] && typeof model["CreationTime"] === "string") enriched["CreationTime"] = model["CreationTime"];
+						if (!enriched["LastModifiedTime"] && typeof model["LastModifiedTime"] === "string") enriched["LastModifiedTime"] = model["LastModifiedTime"];
+						this.logger.debug(`Enriched Pipes Pipe ${physicalId} with Arn from CC GetResource`);
+					}
+				}
+				break;
+			case "AWS::S3::AccessPoint":
+				if (!enriched["Arn"] || !enriched["Alias"]) {
+					const model = await this.readCcResourceModel(resourceType, physicalId);
+					if (model) {
+						if (!enriched["Arn"] && typeof model["Arn"] === "string") enriched["Arn"] = model["Arn"];
+						if (!enriched["Alias"] && typeof model["Alias"] === "string") enriched["Alias"] = model["Alias"];
+						if (!enriched["NetworkOrigin"] && typeof model["NetworkOrigin"] === "string") enriched["NetworkOrigin"] = model["NetworkOrigin"];
+						this.logger.debug(`Enriched S3 AccessPoint ${physicalId} with Arn/Alias from CC GetResource`);
+					}
+				}
+				break;
+			case "AWS::ResourceGroups::Group":
+				if (!enriched["Arn"]) {
+					const model = await this.readCcResourceModel(resourceType, physicalId);
+					if (model) {
+						if (typeof model["Arn"] === "string") enriched["Arn"] = model["Arn"];
+						this.logger.debug(`Enriched ResourceGroups Group ${physicalId} with Arn from CC GetResource`);
+					}
+				}
+				break;
 			default: break;
 		}
 		return enriched;
 	}
 	/**
-	* Read the Cloud Control GetResource model for a pure-CC Backup resource and
-	* return its parsed property map, or `undefined` on any failure. Backup types
-	* have no SDK provider, so this generic CC read-back is the cleanest source
-	* of their readOnly attributes (ARNs, VersionId, SelectionId) that the sparse
-	* CREATE ResourceModel does not reliably surface. Best-effort: never throws.
-	*/
-	async readBackupResourceModel(resourceType, physicalId) {
+	* Generic sparse-model read-back (issue #1105). When the CREATE / UPDATE
+	* `ProgressEvent.ResourceModel` yielded a sparse attribute map, issue ONE
+	* best-effort `GetResource` read-back and merge the returned model over the
+	* parsed attributes. Closes the "pure-CC type with a sparse CREATE model →
+	* empty state attributes → `Fn::GetAtt` silently resolves to the bare
+	* physicalId" class generically instead of per-type (previously fixed
+	* type-by-type in #984 / #1103). Runs BEFORE `enrichResourceAttributes` so
+	* the per-type overlays' `if (!enriched['X'])` gating composes naturally
+	* (no second GetResource for a type the read-back already filled).
+	* Best-effort: a failed read-back leaves the attributes as-is and never
+	* fails the deploy (same never-throw contract as `readCcResourceModel`).
+	*/
+	async mergeSparseModelReadback(resourceType, physicalId, attributes) {
+		if (!this.isSparseAttributeMap(attributes, physicalId)) return attributes;
+		const model = await this.readCcResourceModel(resourceType, physicalId);
+		if (!model) return attributes;
+		this.logger.debug(`Merged CC GetResource read-back over sparse ${resourceType} attributes for ${physicalId}`);
+		return {
+			...attributes,
+			...model
+		};
+	}
+	/**
+	* Conservative sparseness predicate for `mergeSparseModelReadback`. A map
+	* is sparse when it is empty or carries nothing beyond an echo of the
+	* identifier — every value is a string equal to the physicalId or to one
+	* segment of a compound `|`-joined CC primaryIdentifier. Sparseness is
+	* empirically per-type: `AWS::ApiGatewayV2::Api` returns `ApiEndpoint` in
+	* its CREATE model (NOT sparse — no extra GetResource), while Pipes /
+	* S3 AccessPoint / ResourceGroups / Backup return nothing usable (sparse —
+	* read-back fires). Any non-identifier value (a URL, an ARN, an echoed
+	* input property, a nested object) means the model carried real
+	* information, so we skip the extra API call.
+	*/
+	isSparseAttributeMap(attributes, physicalId) {
+		const values = Object.values(attributes);
+		if (values.length === 0) return true;
+		const identifierEchoes = new Set(physicalId.split("|"));
+		identifierEchoes.add(physicalId);
+		return values.every((value) => typeof value === "string" && identifierEchoes.has(value));
+	}
+	/**
+	* Read the Cloud Control GetResource model for a pure-CC resource and
+	* return its parsed property map, or `undefined` on any failure. Types with
+	* no SDK provider always route through Cloud Control, whose async CREATE
+	* ResourceModel is sparse for several types, so this generic CC read-back is
+	* the cleanest source of their readOnly attributes (ARNs, aliases,
+	* VersionId, SelectionId) — the type's registry schema lists them under
+	* readOnlyProperties, which the CC read handler does return. Originally
+	* Backup-scoped (issue #984); generalized for Pipes / S3 AccessPoint /
+	* ResourceGroups in issue #1103, and reused by the generic sparse-model
+	* read-back (issue #1105). Best-effort: never throws.
+	*/
+	async readCcResourceModel(resourceType, physicalId) {
 		try {
 			const raw = (await this.cloudControlClient.send(new GetResourceCommand({
 				TypeName: resourceType,
@@ -17402,4 +17484,4 @@ var DeployEngine = class {
 
 //#endregion
 export { BOOTSTRAP_MARKER_PREFIX as $, StateError as $t, refStateLookupFromResource as A, AssemblyReader as At, TemplateParser as B, DependencyError as Bt, ProviderRegistry as C, warnDeprecatedNoPrefixCliFlag as Ct, isTerminationProtectionPropagationError as D, findLargeInlineResources as Dt, disableInstanceApiTermination as E, MIGRATE_TMP_PREFIX as Et, resolveExplicitPhysicalId as F, resetAwsClients as Ft, AssetPublisher as G, MissingCdkCliError as Gt, S3StateBackend as H, LocalMigrateError as Ht, assertRegionMatch as I, setAwsClients as It, buildAssetRedirectMap as J, ProvisioningError as Jt, stringifyValue as K, NestedStackChildDirectDestroyError as Kt, applyRoleArnIfSet as L, AssetError as Lt, CDK_PATH_TAG as M, resolveBucketRegion as Mt, matchesCdkPath as N, AwsClients as Nt, IntrinsicFunctionResolver as O, uploadCfnTemplate as Ot, normalizeAwsTagsToCfn as P, getAwsClients as Pt, AssetModeResolver as Q, StackTerminationProtectionError as Qt, DiffCalculator as R, CdkdError as Rt, collectInlinePolicyNamesManagedBySiblings as S, resolveUseCdkBootstrapAssets as St, CloudControlProvider as T, CFN_TEMPLATE_URL_LIMIT as Tt, rebuildClientForBucketRegion as U, LocalStartServiceError as Ut, LockManager as V, LocalInvokeBuildError as Vt, shouldRetainResource as W, LockError as Wt, loadPublishableAssetManifest as X, ResourceUpdateNotSupportedError as Xt, createAssetRedirectResolver as Y, ResourceTimeoutError as Yt, rewriteTemplateAssetReferences as Z, StackHasActiveImportsError as Zt, gray as _, resolveAutoAssetStorage as _t, withRetry as a, __exportAll as an, buildDockerImage as at, yellow as b, resolveStateBucketWithDefault as bt, IMPLICIT_DELETE_DEPENDENCIES as c, runDockerForeground as ct, MULTI_REGION_RECREATE_BLOCKED_TYPES as d, getDockerImageBySourceHash as dt, SynthesisError as en, ensureAssetStorage as et, isStatefulRecreateTargetSync as f, Synthesizer as ft, cyan as g, resolveApp as gt, bold as h, getLegacyStateBucketName as ht, withResourceDeadline as i, withErrorHandling as in, validateContainerRepoName as it, WAFv2WebACLProvider as j, clearBucketRegionCache as jt, cfnRefValueFromPhysicalId as k, expectedOwnerParam as kt, computeImplicitDeleteEdges as l, runDockerStreaming as lt, formatResourceLine as m, getDefaultStateBucketName as mt, DEFAULT_RESOURCE_WARN_AFTER_MS as n, isCdkdError as nn, parseBootstrapMarker as nt, isRetryableTransientError as o, formatDockerLoginError as ot, renderStatefulReason as p, synthesisStatusMessage as pt, WorkGraph as q, PartialFailureError as qt, DeployEngine as r, normalizeAwsError as rn, validateAssetBucketName as rt, isThrottlingError as s, getDockerCmd as st, DEFAULT_RESOURCE_TIMEOUT_MS as t, formatError as tn, getBootstrapMarkerKey as tt, extractDeploymentEventError as u, AssetManifestLoader as ut, green as v, resolveCaptureObservedState as vt, findActionableSilentDrops as w, CFN_TEMPLATE_BODY_LIMIT as wt, IAMRoleProvider as x, resolveStateBucketWithDefaultAndSource as xt, red as y, resolveSkipPrefix as yt, DagBuilder as z, ConfigError as zt };
-//# sourceMappingURL=deploy-engine-IkhnJXWR.js.map
+//# sourceMappingURL=deploy-engine-CMSknHV7.js.map