Skip to content

Commit 4bf7675

Browse files
committedJul 13, 2023
zipped-order-delivery-963: Updated delivery function in orders
1 parent 4055dbb commit 4bf7675

File tree

3 files changed

+31
-1
lines changed

3 files changed

+31
-1
lines changed
 

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ coverage.xml
2424

2525
# Editors
2626
.vscode/
27-
27+
.idea/
2828
# Docs build
2929
site

‎planet/order_request.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,10 @@ def delivery(archive_type: Optional[str] = None,
199199
if archive_type:
200200
archive_type = specs.validate_archive_type(archive_type)
201201

202+
# for missing archive options set single_archive to false
203+
if archive_filename is None and single_archive is False:
204+
single_archive = True
205+
202206
fields = ['archive_type', 'single_archive', 'archive_filename']
203207
values = [archive_type, single_archive, archive_filename]
204208

‎tests/unit/test_order_request.py

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,32 @@ def test_delivery():
160160
assert delivery_config == expected
161161

162162

163+
def test_delivery_missing_archive_details():
164+
as3_config = {
165+
'amazon_s3': {
166+
'aws_access_key_id': 'aws_access_key_id',
167+
'aws_secret_access_key': 'aws_secret_access_key',
168+
'bucket': 'bucket',
169+
'aws_region': 'aws_region'
170+
}
171+
}
172+
delivery_config = order_request.delivery('zip',
173+
False,
174+
cloud_config=as3_config)
175+
176+
expected = {
177+
'archive_type': 'zip',
178+
'single_archive': True,
179+
'amazon_s3': {
180+
'aws_access_key_id': 'aws_access_key_id',
181+
'aws_secret_access_key': 'aws_secret_access_key',
182+
'bucket': 'bucket',
183+
'aws_region': 'aws_region'
184+
}
185+
}
186+
assert delivery_config == expected
187+
188+
163189
def test_amazon_s3():
164190
as3_config = order_request.amazon_s3('aws_access_key_id',
165191
'aws_secret_access_key',

0 commit comments

Comments
 (0)