Skip to content

chore: Unit Client updates #112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 33 commits into from
Jun 3, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
b0801de
feat: add AUDIT log level for upload
wphyojpl Oct 14, 2024
00d6bde
chore: update outdated tests
wphyojpl Oct 14, 2024
327ef8d
Merge branch 'develop' of github.com:unity-sds/mdps-ds-lib into develop
wphyojpl Oct 21, 2024
6fd6910
chore: merge from develop
wphyojpl Oct 21, 2024
f77e47e
Merge branch 'develop' of github.com:unity-sds/mdps-ds-lib into develop
wphyojpl Oct 21, 2024
a51314b
fix: allow empty str as RESULT_PATH_PREFIX & replace w/ default val
wphyojpl Oct 21, 2024
2d72378
Merge branch 'develop' of github.com:unity-sds/mdps-ds-lib into develop
wphyojpl Oct 28, 2024
0c31b5f
Merge branch 'develop' of github.community-sds/mdps-ds-lib into develop
wphyojpl Oct 28, 2024
5701e60
Merge branch 'develop' of github.com:unity-sds/mdps-ds-lib into develop
wphyojpl Nov 7, 2024
b429a12
erge branch 'develop' of github.com:unity-sds/mdps-ds-lib into develop
wphyojpl Nov 7, 2024
87e82ae
Merge branch 'develop' of github.com:unity-sds/mdps-ds-lib into develop
wphyojpl Nov 26, 2024
b730339
Merge branch 'develop' of github.com:unity-sds/mdps-ds-lib into develop
wphyojpl Nov 26, 2024
a6d89f6
Merge branch 'develop' of github.com:unity-sds/mdps-ds-lib into develop
wphyojpl Dec 4, 2024
87a2858
Merge branch 'develop' of github.com:unity-sds/mdps-ds-lib into develop
wphyojpl Dec 9, 2024
efb0d8c
Merge branch 'develop' of github.com:unity-sds/mdps-ds-lib into develop
wphyojpl Dec 9, 2024
b908552
Merge branch 'develop' of github.com:unity-sds/mdps-ds-lib into develop
wphyojpl Dec 16, 2024
b66e867
Merge branch 'develop' of github.com:unity-sds/mdps-ds-lib into develop
wphyojpl Dec 16, 2024
51c9a9e
Merge branch 'develop' of github.com:unity-sds/mdps-ds-lib into develop
wphyojpl Dec 16, 2024
1ca94c8
Merge branch 'develop' of github.com:unity-sds/mdps-ds-lib into develop
wphyojpl Jan 8, 2025
9b6dc8d
Merge branch 'develop' of github.com:unity-sds/mdps-ds-lib into develop
wphyojpl Jan 9, 2025
919b679
Merge branch 'develop' of github.com:unity-sds/mdps-ds-lib into develop
wphyojpl Feb 10, 2025
6d95543
Merge branch 'develop' of github.com:unity-sds/mdps-ds-lib into develop
wphyojpl Feb 12, 2025
44697a5
Merge branch 'develop' of github.com:unity-sds/mdps-ds-lib into develop
wphyojpl Mar 18, 2025
75a0436
Merge branch 'develop' of github.com:unity-sds/mdps-ds-lib into develop
wphyojpl Mar 24, 2025
9e35099
Merge branch 'develop' of github.com:unity-sds/mdps-ds-lib into develop
wphyojpl Mar 24, 2025
494505d
fix: allowing optional original stac item
wphyojpl Apr 7, 2025
d8a0ff4
Merge branch 'develop' of github.com:unity-sds/mdps-ds-lib into develop
wphyojpl Apr 7, 2025
65be24b
Merge branch 'develop' of github.com:unity-sds/mdps-ds-lib into develop
wphyojpl Apr 7, 2025
8610202
Merge branch 'develop' of github.com:unity-sds/mdps-ds-lib into develop
wphyojpl Apr 22, 2025
a314344
Merge branch 'develop' of github.com:unity-sds/mdps-ds-lib into develop
wphyojpl Apr 29, 2025
9588b56
Merge branch 'develop' of github.com:unity-sds/mdps-ds-lib into develop
wphyojpl May 19, 2025
3f80164
Merge branch 'develop' of github.com:unity-sds/mdps-ds-lib into develop
wphyojpl Jun 2, 2025
54a1c81
feat: add archive method
wphyojpl Jun 2, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: allow empty str as RESULT_PATH_PREFIX & replace w/ default val
  • Loading branch information
wphyojpl committed Oct 21, 2024
commit a51314b0f34e70a66368f45d04bcc582c76fda57
2 changes: 2 additions & 0 deletions mdps_ds_lib/stage_in_out/upload_granules_abstract.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ def _set_props_from_env(self):
self._collection_id = os.environ.get(self.COLLECTION_ID_KEY)
self._staging_bucket = os.environ.get(self.STAGING_BUCKET_KEY)
self._result_path_prefix = os.environ.get(self.RESULT_PATH_PREFIX, self.DEFAULT_RESULT_PATH_PREFIX)
if self._result_path_prefix is None or self._result_path_prefix.strip() == '':
self._result_path_prefix = self.DEFAULT_RESULT_PATH_PREFIX
self._result_path_prefix = self._result_path_prefix[:-1] if self._result_path_prefix.endswith('/') else self._result_path_prefix
self._result_path_prefix = self._result_path_prefix[1:] if self._result_path_prefix.startswith('/') else self._result_path_prefix

Expand Down
7 changes: 4 additions & 3 deletions tests/integration_tests/test_docker_stage_out.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import logging

logging.basicConfig(level=20, format="%(asctime)s [%(levelname)s] [%(name)s::%(lineno)d] %(message)s")

from datetime import datetime
Expand Down Expand Up @@ -30,7 +31,7 @@ def setUp(self) -> None:
self.tenant = 'UDS_MY_LOCAL_ARCHIVE_TEST' # 'uds_local_test' # 'uds_sandbox'
self.tenant_venue = 'DEV' # 'DEV1' # 'dev'
self.collection_name = 'UDS_UNIT_COLLECTION' # 'uds_collection' # 'sbx_collection'
self.collection_version = '24.08.29.09.00'.replace('.', '') # '2402011200'
self.collection_version = '24.10.21.12.00'.replace('.', '') # '2402011200'

def not_in_used_test_03_upload(self):
os.environ[Constants.USERNAME] = '/unity/uds/user/wphyo/username'
Expand Down Expand Up @@ -791,7 +792,7 @@ def test_03_03_upload_auxiliary_files(self):
os.environ['COLLECTION_ID'] = temp_collection_id
os.environ['STAGING_BUCKET'] = 'uds-sbx-cumulus-staging'
os.environ['VERIFY_SSL'] = 'FALSE'
os.environ['RESULT_PATH_PREFIX'] = 'stage_out'
os.environ['RESULT_PATH_PREFIX'] = ''
os.environ['PARALLEL_COUNT'] = '1'

if len(argv) > 1:
Expand Down Expand Up @@ -882,7 +883,7 @@ def test_03_03_upload_auxiliary_files(self):
"""
s3 = AwsS3()
s3_keys = [k for k in s3.get_child_s3_files(os.environ['STAGING_BUCKET'],
f"{os.environ['RESULT_PATH_PREFIX']}/successful_features_{starting_time}",
f"stage_out/successful_features_{starting_time}",
)]
s3_keys = sorted(s3_keys)
print(f's3_keys: {s3_keys}')
Expand Down