@go-to-k/cdkd 0.230.10 → 0.230.11

package/dist/cli.js

@@ -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.10";
+	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.10");
+	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());