fixed up upload CLI

Australian-Imaging-Service · Apr 8, 2024 · 29f04b0 · 29f04b0
1 parent fa4439d
commit 29f04b0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/real-tests/usyd_upload.py b/real-tests/usyd_upload.py
@@ -12,13 +12,13 @@
         "XNAT_INGEST_UPLOAD_HOST": "https://xnat.sydney.edu.au",
         "XNAT_INGEST_UPLOAD_USER": "<role-account-user>",
         "XNAT_INGEST_UPLOAD_PASS": "<role-account-pass>",
-        # "XNAT_INGEST_UPLOAD_ALWAYSINCLUDE": "medimage/dicom-series",
-        # "XNAT_INGEST_UPLOAD_STORE_CREDENTIALS": "<s3-bucket-access-key>,<s3-bucket-access-secret>",
-        # "XNAT_INGEST_UPLOAD_LOGFILE": "<somewhere-sensible>,INFO",
-        # "XNAT_INGEST_UPLOAD_DELETE": "0",
-        # "XNAT_INGEST_UPLOAD_TEMPDIR": "<somewhere-else-sensible>",
-        # "XNAT_INGEST_UPLOAD_REQUIRE_MANIFEST": "1",
-        # "XNAT_INGEST_UPLOAD_CLEANUP_OLDER_THAN": "30",
+        "XNAT_INGEST_UPLOAD_ALWAYSINCLUDE": "medimage/dicom-series",
+        "XNAT_INGEST_UPLOAD_STORE_CREDENTIALS": "<s3-bucket-access-key>,<s3-bucket-access-secret>",
+        "XNAT_INGEST_UPLOAD_LOGFILE": "<somewhere-sensible>,INFO",
+        "XNAT_INGEST_UPLOAD_DELETE": "0",
+        "XNAT_INGEST_UPLOAD_TEMPDIR": "<somewhere-else-sensible>",
+        "XNAT_INGEST_UPLOAD_REQUIRE_MANIFEST": "1",
+        "XNAT_INGEST_UPLOAD_CLEANUP_OLDER_THAN": "30",
     },
     catch_exceptions=False,
 )

diff --git a/xnat_ingest/cli/upload.py b/xnat_ingest/cli/upload.py
@@ -25,6 +25,7 @@
     set_logger_handling,
     get_checksums,
     calculate_checksums,
+    StoreCredentials,
 )
 
 
@@ -121,7 +122,7 @@
 )
 @click.option(
     "--store-credentials",
-    type=str,
+    type=StoreCredentials.cli_type,
     metavar="<access-key> <secret-key>",
     envvar="XNAT_INGEST_UPLOAD_STORE_CREDENTIALS",
     default=None,