fixup! Create mirror queues and bucket (#6859)

Author: nadove-ucsc

src/azul/__init__.py

@@ -285,7 +285,7 @@ def qualified_bucket_name(self,
 
     storage_term = 'storage'
 
-    mirror_term = 'datamirror'
+    mirror_term = 'mirror'
 
     current = Sentinel()
 

terraform/s3.tf.json.template.py

@@ -25,9 +25,15 @@
                 'bucket': aws.storage_bucket,
                 'force_destroy': True
             },
-            **({config.mirror_term: {
-                'bucket': aws.mirror_bucket,
-            }} if config.enable_mirroring else {})
+            **(
+                {
+                    config.mirror_term: {
+                        'bucket': aws.mirror_bucket,
+                    }
+                }
+                if config.enable_mirroring else
+                {}
+            )
         },
         'aws_s3_bucket_lifecycle_configuration': {
             config.storage_term: {

terraform/sqs.tf.json.template.py

@@ -51,24 +51,28 @@
                         'name': config.tallies_queue.to_fail.name,
                         'message_retention_seconds': 14 * 24 * 60 * 60,
                     },
-                    **({
-                           config.mirror_queue.unqual_name: {
-                               'name': config.mirror_queue.name,
-                               'fifo_queue': True,
-                               'message_retention_seconds': 7 * 24 * 60 * 60,
-                               'visibility_timeout_seconds': config.mirror_lambda_timeout() + 10,
-                               'redrive_policy': json.dumps({
-                                   'maxReceiveCount': 1,
-                                   'deadLetterTargetArn': '${aws_sqs_queue.%s.arn}'
-                                                          % config.mirror_queue.fail.unqual_name
-                               })
-                           },
-                           config.mirror_queue.fail.unqual_name: {
-                               'name': config.mirror_queue.fail.name,
-                               'fifo_queue': True,
-                               'message_retention_seconds': 14 * 24 * 60 * 60,
-                           }
-                       } if config.enable_mirroring else {})
+                    **(
+                        {
+                            config.mirror_queue.unqual_name: {
+                                'name': config.mirror_queue.name,
+                                'fifo_queue': True,
+                                'message_retention_seconds': 7 * 24 * 60 * 60,
+                                'visibility_timeout_seconds': config.mirror_lambda_timeout() + 10,
+                                'redrive_policy': json.dumps({
+                                    'maxReceiveCount': 1,
+                                    'deadLetterTargetArn': '${aws_sqs_queue.%s.arn}'
+                                                           % config.mirror_queue.to_fail.unqual_name
+                                })
+                            },
+                            config.mirror_queue.to_fail.unqual_name: {
+                                'name': config.mirror_queue.to_fail.name,
+                                'fifo_queue': True,
+                                'message_retention_seconds': 14 * 24 * 60 * 60,
+                            }
+                        }
+                        if config.enable_mirroring else
+                        {}
+                    )
                 }
             }
         ]