Ministack: Free, open-source local AWS emulator - 60+ services, Terraform compatible, real databases. Free forever. MIT licensed.
Python awsaws-emulatoraws-localaws-sdkdevtoolsdockerdynamodbec2emulatorlambdalocalstacklocalstack-alternativeministackmock-awsopen-sourcepythons3sqsterraform
fix(s3): keep NewerNoncurrentVersions in lifecycle configuration round-trip (#1331)
António Salgadof4068867bdad
diff --git a/ministack/services/s3.py b/ministack/services/s3.pyindex fea59ea0..f3a3f1cd 100644--- a/ministack/services/s3.py+++ b/ministack/services/s3.py@@ -1339,6 +1339,8 @@ def _get_bucket_lifecycle(name: str):xml += "<NoncurrentVersionTransition>"if "NoncurrentDays" in t:xml += f"<NoncurrentDays>{t['NoncurrentDays']}</NoncurrentDays>"+ if "NewerNoncurrentVersions" in t:+ xml += f"<NewerNoncurrentVersions>{t['NewerNoncurrentVersions']}</NewerNoncurrentVersions>"xml += f"<StorageClass>{t.get('StorageClass', 'STANDARD_IA')}</StorageClass>"xml += "</NoncurrentVersionTransition>"if "Expiration" in rule:@@ -1356,6 +1358,8 @@ def _get_bucket_lifecycle(name: str):xml += "<NoncurrentVersionExpiration>"if "NoncurrentDays" in nve:xml += f"<NoncurrentDays>{nve['NoncurrentDays']}</NoncurrentDays>"+ if "NewerNoncurrentVersions" in nve:+ xml += f"<NewerNoncurrentVersions>{nve['NewerNoncurrentVersions']}</NewerNoncurrentVersions>"xml += "</NoncurrentVersionExpiration>"if rule.get("AbortIncompleteMultipartUpload"):aimu = rule["AbortIncompleteMultipartUpload"]@@ -1457,6 +1461,9 @@ def _put_bucket_lifecycle(name: str, body: bytes):days = _lc_text(t, "NoncurrentDays")if days:td["NoncurrentDays"] = int(days)+ newer = _lc_text(t, "NewerNoncurrentVersions")+ if newer:+ td["NewerNoncurrentVersions"] = int(newer)td["StorageClass"] = _lc_text(t, "StorageClass") or "STANDARD_IA"nv_transitions.append(td)if nv_transitions:@@ -1482,6 +1489,9 @@ def _put_bucket_lifecycle(name: str, body: bytes):days = _lc_text(nve_el, "NoncurrentDays")if days:nve["NoncurrentDays"] = int(days)+ newer = _lc_text(nve_el, "NewerNoncurrentVersions")+ if newer:+ nve["NewerNoncurrentVersions"] = int(newer)rule["NoncurrentVersionExpiration"] = nve# AbortIncompleteMultipartUploadaimu_el = _lc_find(rule_el, "AbortIncompleteMultipartUpload")diff --git a/tests/test_s3.py b/tests/test_s3.pyindex c2f32914..bbf2b04d 100644--- a/tests/test_s3.py+++ b/tests/test_s3.py@@ -3315,6 +3315,59 @@ def test_s3_lifecycle_noncurrent_version(s3):assert rule["NoncurrentVersionExpiration"]["NoncurrentDays"] == 30+def test_s3_lifecycle_newer_noncurrent_versions_round_trip(s3):+ """NewerNoncurrentVersions must survive the PUT/GET round-trip.++ terraform-provider-aws waits after creating a lifecycle configuration until GET+ returns rules equal to what it sent. A dropped field never converges, so the+ create fails with 'timeout while waiting for state to become true' after 3m.+ """+ bucket = "intg-s3-lc-newer-noncurrent"+ s3.create_bucket(Bucket=bucket)+ s3.put_bucket_lifecycle_configuration(+ Bucket=bucket,+ LifecycleConfiguration={+ "Rules": [{+ "ID": "noncurrent-cleanup",+ "Status": "Enabled",+ "Filter": {"Prefix": "integration-tests"},+ "NoncurrentVersionExpiration": {+ "NoncurrentDays": 2,+ "NewerNoncurrentVersions": 5,+ },+ }]+ },+ )+ rule = s3.get_bucket_lifecycle_configuration(Bucket=bucket)["Rules"][0]+ assert rule["NoncurrentVersionExpiration"]["NoncurrentDays"] == 2+ assert rule["NoncurrentVersionExpiration"]["NewerNoncurrentVersions"] == 5+++def test_s3_lifecycle_noncurrent_version_transition_newer_versions(s3):+ """NewerNoncurrentVersions on a NoncurrentVersionTransition also round-trips."""+ bucket = "intg-s3-lc-nvt-newer"+ s3.create_bucket(Bucket=bucket)+ s3.put_bucket_lifecycle_configuration(+ Bucket=bucket,+ LifecycleConfiguration={+ "Rules": [{+ "ID": "noncurrent-archive",+ "Status": "Enabled",+ "Filter": {"Prefix": ""},+ "NoncurrentVersionTransitions": [{+ "NoncurrentDays": 7,+ "NewerNoncurrentVersions": 3,+ "StorageClass": "GLACIER",+ }],+ }]+ },+ )+ transition = s3.get_bucket_lifecycle_configuration(Bucket=bucket)["Rules"][0]["NoncurrentVersionTransitions"][0]+ assert transition["NoncurrentDays"] == 7+ assert transition["NewerNoncurrentVersions"] == 3+ assert transition["StorageClass"] == "GLACIER"++def test_s3_lifecycle_multiple_rules(s3):"""Multiple lifecycle rules survive PUT/GET round-trip."""bucket = "intg-s3-lc-multi"