Implement executive order M-21-31 (#6070, PR #6879)

DataBiosphere · Feb 10, 2025 · 32e8167 · 32e8167
2 parents 54a2200 + 35c6fc6
commit 32e8167
Showing 1 changed file with 12 additions and 21 deletions.
diff --git a/terraform/shared/shared.tf.json.template.py b/terraform/shared/shared.tf.json.template.py
@@ -331,29 +331,20 @@ def conformance_pack(name: str) -> str:
                     }
                 }
             },
-            'logs': {
-                'bucket': '${aws_s3_bucket.logs.id}',
-                'rule': {
-                    'id': 'expire',
-                    'status': 'Enabled',
-                    'filter': {
-                    },
-                    'expiration': {
-                        'days': config.audit_log_retention_days
-                    }
-                }
-            },
-            'trail': {
-                'bucket': '${aws_s3_bucket.logs.id}',
-                'rule': {
-                    'id': 'expire',
-                    'status': 'Enabled',
-                    'filter': {
-                    },
-                    'expiration': {
-                        'days': config.audit_log_retention_days
+            **{
+                bucket: {
+                    'bucket': '${aws_s3_bucket.%s.id}' % bucket,
+                    'rule': {
+                        'id': 'expire',
+                        'status': 'Enabled',
+                        'filter': {
+                        },
+                        'expiration': {
+                            'days': config.audit_log_retention_days
+                        }
                     }
                 }
+                for bucket in ['logs', 'trail']
             }
         },
         'aws_s3_bucket_versioning': {