@go-to-k/cdkd 0.230.9 → 0.230.11

package/dist/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { A as withErrorHandling, B as generateResourceName, C as StackHasActiveImportsError, F as getLiveRenderer, H as withSkipPrefix, I as PATTERN_B_NAME_OPTIONS, L as PATTERN_B_NAME_PROPERTIES, M as getLogger, P as runStackBuffered, R as PATTERN_B_RESOURCE_TYPES, S as ResourceUpdateNotSupportedError, U as withStackName, V as generateResourceNameWithFallback, _ as MissingCdkCliError, a as assertRegionMatch, b as ProvisioningError, f as LocalInvokeBuildError$1, i as resolveExplicitPhysicalId, k as normalizeAwsError, l as CdkdError, m as LocalStartServiceError, n as matchesCdkPath, o as disableInstanceApiTermination, p as LocalMigrateError, r as normalizeAwsTagsToCfn, s as isTerminationProtectionPropagationError, t as CDK_PATH_TAG, v as NestedStackChildDirectDestroyError, w as StackTerminationProtectionError, x as ResourceTimeoutError, y as PartialFailureError } from "./import-helpers-DayvBD4T.js";
 import { a as setAwsClients, i as resetAwsClients, r as getAwsClients, t as AwsClients } from "./aws-clients-pjPwZz1r.js";
-import { $ as CFN_TEMPLATE_BODY_LIMIT, A as LockManager, B as runDockerForeground, C as findActionableSilentDrops, D as DiffCalculator, E as applyRoleArnIfSet, F as stringifyValue, G as getDefaultStateBucketName, H as AssetManifestLoader, I as WorkGraph, J as resolveCaptureObservedState, K as getLegacyStateBucketName, L as buildDockerImage, M as rebuildClientForBucketRegion, N as shouldRetainResource, O as DagBuilder, P as AssetPublisher, Q as warnDeprecatedNoPrefixCliFlag, R as formatDockerLoginError, S as ProviderRegistry, T as IntrinsicFunctionResolver, U as getDockerImageBySourceHash, V as runDockerStreaming, W as Synthesizer, X as resolveStateBucketWithDefault, Y as resolveSkipPrefix, Z as resolveStateBucketWithDefaultAndSource, _ as green, a as withRetry, b as IAMRoleProvider, c as computeImplicitDeleteEdges, d as isStatefulRecreateTargetSync, et as CFN_TEMPLATE_URL_LIMIT, f as renderStatefulReason, g as gray, h as cyan, i as withResourceDeadline, it as AssemblyReader, j as S3StateBackend, k as TemplateParser, l as extractDeploymentEventError, m as bold, n as DEFAULT_RESOURCE_WARN_AFTER_MS, nt as findLargeInlineResources, o as isRetryableTransientError, ot as resolveBucketRegion, p as formatResourceLine, q as resolveApp, r as DeployEngine, rt as uploadCfnTemplate, s as IMPLICIT_DELETE_DEPENDENCIES, t as DEFAULT_RESOURCE_TIMEOUT_MS, tt as MIGRATE_TMP_PREFIX, u as MULTI_REGION_RECREATE_BLOCKED_TYPES, v as red, w as CloudControlProvider, x as collectInlinePolicyNamesManagedBySiblings, y as yellow, z as getDockerCmd } from "./deploy-engine-CT3wqDMn.js";
+import { $ as CFN_TEMPLATE_BODY_LIMIT, A as LockManager, B as runDockerForeground, C as findActionableSilentDrops, D as DiffCalculator, E as applyRoleArnIfSet, F as stringifyValue, G as getDefaultStateBucketName, H as AssetManifestLoader, I as WorkGraph, J as resolveCaptureObservedState, K as getLegacyStateBucketName, L as buildDockerImage, M as rebuildClientForBucketRegion, N as shouldRetainResource, O as DagBuilder, P as AssetPublisher, Q as warnDeprecatedNoPrefixCliFlag, R as formatDockerLoginError, S as ProviderRegistry, T as IntrinsicFunctionResolver, U as getDockerImageBySourceHash, V as runDockerStreaming, W as Synthesizer, X as resolveStateBucketWithDefault, Y as resolveSkipPrefix, Z as resolveStateBucketWithDefaultAndSource, _ as green, a as withRetry, b as IAMRoleProvider, c as computeImplicitDeleteEdges, d as isStatefulRecreateTargetSync, et as CFN_TEMPLATE_URL_LIMIT, f as renderStatefulReason, g as gray, h as cyan, i as withResourceDeadline, it as AssemblyReader, j as S3StateBackend, k as TemplateParser, l as extractDeploymentEventError, m as bold, n as DEFAULT_RESOURCE_WARN_AFTER_MS, nt as findLargeInlineResources, o as isRetryableTransientError, ot as resolveBucketRegion, p as formatResourceLine, q as resolveApp, r as DeployEngine, rt as uploadCfnTemplate, s as IMPLICIT_DELETE_DEPENDENCIES, t as DEFAULT_RESOURCE_TIMEOUT_MS, tt as MIGRATE_TMP_PREFIX, u as MULTI_REGION_RECREATE_BLOCKED_TYPES, v as red, w as CloudControlProvider, x as collectInlinePolicyNamesManagedBySiblings, y as yellow, z as getDockerCmd } from "./deploy-engine-CTBYZV_W.js";
 import { t as ASGProvider } from "./asg-provider-Dgj3loIG.js";
 import { AsyncLocalStorage } from "node:async_hooks";
 import { randomBytes, randomUUID } from "node:crypto";
@@ -1445,7 +1445,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.230.9";
+	return "0.230.11";
 }
 /**
 * Generate a time-sortable unique run id, e.g.
@@ -4580,11 +4580,26 @@ var S3BucketProvider = class {
 	* - CFn Transition.TransitionDate -> SDK Transition.Date
 	*/
 	async applyLifecycleConfiguration(bucketName, lifecycleConfig) {
+		const gatherScope = (rule) => {
+			const filter = rule["Filter"];
+			return {
+				prefix: filter?.["Prefix"] ?? rule["Prefix"],
+				tagFilters: filter?.["TagFilters"],
+				sizeGt: filter?.["ObjectSizeGreaterThan"] ?? rule["ObjectSizeGreaterThan"],
+				sizeLt: filter?.["ObjectSizeLessThan"] ?? rule["ObjectSizeLessThan"]
+			};
+		};
+		const isPlainPrefixOnly = (rule) => {
+			if (rule["Filter"] !== void 0) return false;
+			const s = gatherScope(rule);
+			return s.prefix !== void 0 && (s.tagFilters === void 0 || s.tagFilters.length === 0) && s.sizeGt === void 0 && s.sizeLt === void 0;
+		};
+		const useFilterForm = !lifecycleConfig.Rules.every(isPlainPrefixOnly);
 		const rules = lifecycleConfig.Rules.map((rule) => {
 			const sdkRule = {
 				ID: rule["Id"],
 				Status: rule["Status"] || "Enabled",
-				Prefix: rule["Prefix"]
+				Prefix: useFilterForm ? void 0 : rule["Prefix"]
 			};
 			const expiration = rule["ExpirationInDays"] || rule["ExpirationDate"] || rule["Expiration"];
 			if (typeof expiration === "number") sdkRule.Expiration = { Days: expiration };
@@ -4616,23 +4631,18 @@ var S3BucketProvider = class {
 			}));
 			const abort = rule["AbortIncompleteMultipartUpload"];
 			if (abort) sdkRule.AbortIncompleteMultipartUpload = { DaysAfterInitiation: abort["DaysAfterInitiation"] };
-			const filter = rule["Filter"];
-			if (filter) {
-				const tagFilters = filter["TagFilters"];
-				const prefix = filter["Prefix"];
-				const sizeGt = filter["ObjectSizeGreaterThan"];
-				const sizeLt = filter["ObjectSizeLessThan"];
-				if ((tagFilters && tagFilters.length > 0 ? 1 : 0) + (prefix !== void 0 ? 1 : 0) + (sizeGt !== void 0 ? 1 : 0) + (sizeLt !== void 0 ? 1 : 0) > 1) sdkRule.Filter = { And: {
-					Prefix: prefix,
-					Tags: tagFilters,
-					ObjectSizeGreaterThan: sizeGt,
-					ObjectSizeLessThan: sizeLt
-				} };
-				else if (tagFilters && tagFilters.length > 0) sdkRule.Filter = { Tag: tagFilters[0] };
-				else if (prefix !== void 0) sdkRule.Filter = { Prefix: prefix };
-				else if (sizeGt !== void 0) sdkRule.Filter = { ObjectSizeGreaterThan: sizeGt };
-				else if (sizeLt !== void 0) sdkRule.Filter = { ObjectSizeLessThan: sizeLt };
-			} else if (sdkRule.Prefix === void 0) sdkRule.Filter = { Prefix: "" };
+			const { prefix, tagFilters, sizeGt, sizeLt } = gatherScope(rule);
+			const hasTags = tagFilters !== void 0 && tagFilters.length > 0;
+			if ((hasTags ? 1 : 0) + (prefix !== void 0 ? 1 : 0) + (sizeGt !== void 0 ? 1 : 0) + (sizeLt !== void 0 ? 1 : 0) > 1) sdkRule.Filter = { And: {
+				Prefix: prefix,
+				Tags: hasTags ? tagFilters : void 0,
+				ObjectSizeGreaterThan: sizeGt,
+				ObjectSizeLessThan: sizeLt
+			} };
+			else if (hasTags) sdkRule.Filter = { Tag: tagFilters[0] };
+			else if (sizeGt !== void 0) sdkRule.Filter = { ObjectSizeGreaterThan: sizeGt };
+			else if (sizeLt !== void 0) sdkRule.Filter = { ObjectSizeLessThan: sizeLt };
+			else if (useFilterForm) sdkRule.Filter = { Prefix: prefix ?? "" };
 			return sdkRule;
 		});
 		await this.s3Client.send(new PutBucketLifecycleConfigurationCommand({
@@ -5007,6 +5017,7 @@ var S3BucketProvider = class {
 						} };
 						else if (prefix) sdkRule["Filter"] = { Prefix: prefix };
 						else if (tagFilter) sdkRule["Filter"] = { Tag: tagFilter };
+						else sdkRule["Filter"] = {};
 					} else if (rule["Prefix"] !== void 0) sdkRule["Prefix"] = rule["Prefix"];
 					if (rule["DeleteMarkerReplication"]) sdkRule["DeleteMarkerReplication"] = { Status: rule["DeleteMarkerReplication"]["Status"] };
 					return sdkRule;
@@ -55354,7 +55365,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.230.9");
+	program.name("cdkd").description("CDK Direct - Deploy AWS CDK apps directly via SDK/Cloud Control API").version("0.230.11");
 	program.addCommand(createBootstrapCommand());
 	program.addCommand(createSynthCommand());
 	program.addCommand(createListCommand());