Merge branch 'main' into issue970

Author: sgillies

.gitignore

@@ -24,6 +24,5 @@ coverage.xml
 
 # Editors
 .vscode/
-
 # Docs build
 site

planet/order_request.py

@@ -196,15 +196,16 @@ def delivery(archive_type: Optional[str] = None,
     Raises:
         planet.specs.SpecificationException: If archive_type is not valid.
     """
+    config: Dict[str, Any] = {}
+
     if archive_type:
         archive_type = specs.validate_archive_type(archive_type)
 
-    config: Dict[str, Any] = {}
+        if archive_filename is None:
+            archive_filename = "{{name}}_{{order_id}}.zip"
 
-    if archive_type:
         config.update(archive_type=archive_type,
-                      archive_filename=archive_filename
-                      or '{{name}}-{{order_id}}.zip',
+                      archive_filename=archive_filename,
                       single_archive=single_archive)
 
     if cloud_config:

tests/unit/test_order_request.py

@@ -160,6 +160,32 @@ def test_delivery():
     assert delivery_config == expected
 
 
+def test_delivery_missing_archive_details():
+    as3_config = {
+        'amazon_s3': {
+            'aws_access_key_id': 'aws_access_key_id',
+            'aws_secret_access_key': 'aws_secret_access_key',
+            'bucket': 'bucket',
+            'aws_region': 'aws_region'
+        }
+    }
+    delivery_config = order_request.delivery(archive_type='zip',
+                                             cloud_config=as3_config)
+
+    expected = {
+        'archive_type': 'zip',
+        'archive_filename': "{{name}}_{{order_id}}.zip",
+        'single_archive': False,
+        'amazon_s3': {
+            'aws_access_key_id': 'aws_access_key_id',
+            'aws_secret_access_key': 'aws_secret_access_key',
+            'bucket': 'bucket',
+            'aws_region': 'aws_region'
+        }
+    }
+    assert delivery_config == expected
+
+
 def test_amazon_s3():
     as3_config = order_request.amazon_s3('aws_access_key_id',
                                          'aws_secret_access_key',