Merge remote-tracking branch 'origin/main' into develop

# Conflicts: # pyproject.toml
podaac · Feb 12, 2025 · 98e62cd · 98e62cd
2 parents c392534 + 7c9a2ac
commit 98e62cd
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 ### Security
 
+## [0.2.3]
+### Added
+### Changed
+- [issues/55](https://github.com/podaac/bignbit/issues/55): Harmony client changed from per request and instead will be cached as global variable and will not validate auth credentials on initialization.
+### Deprecated
+### Removed
+### Fixed
+- [issues/54](https://github.com/podaac/bignbit/issues/54): Fixed bug where status was not being reported to Cumulus Dashboard by adding `cumulus_meta` back into the output CMA.
+### Security
+
 ## [0.2.2]
 ### Added
 ### Changed

diff --git a/bignbit/utils.py b/bignbit/utils.py
@@ -12,6 +12,9 @@
 
 ED_USER = ED_PASS = None
 EDL_USER_TOKEN = {}
+HARMONY_CLIENT: Client or None = None
+
+HARMONY_SHOULD_VALIDATE_AUTH = os.environ.get('HARMONY_SHOULD_VALIDATE_AUTH', default='False').upper() == 'TRUE'
 
 
 def get_edl_creds() -> (str, str):
@@ -267,12 +270,20 @@ def get_harmony_client(environment_str: str) -> harmony.Client:
     elif environment_str.upper() in ("OPS", "PROD"):
         harmony_environ = Environment.PROD
 
-    harmony_client = Client(
-        env=harmony_environ,
-        auth=get_edl_creds()
-    )
+    global HARMONY_CLIENT  # pylint: disable=W0603
+
+    # If we already have a client, but it's for a different environment, replace it with one configured for new environment.
+    if HARMONY_CLIENT and HARMONY_CLIENT.config.environment != harmony_environ:
+        HARMONY_CLIENT = None
+
+    if not HARMONY_CLIENT:
+        HARMONY_CLIENT = Client(
+            env=harmony_environ,
+            auth=get_edl_creds(),
+            should_validate_auth=HARMONY_SHOULD_VALIDATE_AUTH
+        )
 
-    return harmony_client
+    return HARMONY_CLIENT
 
 
 def extract_mgrs_grid_code(granule_umm_json: dict) -> str:

diff --git a/terraform/state_machine_definition.tpl b/terraform/state_machine_definition.tpl
@@ -435,6 +435,7 @@
       "Type":"Pass",
       "Next":"BuildImageSets",
       "Parameters":{
+        "cumulus_meta.$": "$.cumulus_meta",
         "meta": {
           "buckets.$": "$.meta.buckets",
           "cmr.$": "$.meta.cmr",

diff --git a/...ges/cma.uat.workflow-input.20210115090000-JPL-L4_GHRSST-SSTfnd-MUR-GLOB-v02.0-fv04.1.json b/...ges/cma.uat.workflow-input.20210115090000-JPL-L4_GHRSST-SSTfnd-MUR-GLOB-v02.0-fv04.1.json
@@ -1,4 +1,5 @@
 {
+  "cumulus_meta": {},
   "meta": {
     "provider": {},
     "stack": {},

diff --git a/...workflow-input.OPERA_L3_DSWx-HLS_T55MDS_20250124T001834Z_20250128T131415Z_L8_30_v1.0.json b/...workflow-input.OPERA_L3_DSWx-HLS_T55MDS_20250124T001834Z_20250128T131415Z_L8_30_v1.0.json
@@ -1,4 +1,5 @@
 {
+  "cumulus_meta": {},
   "meta": {
     "provider": {},
     "stack": {},

diff --git a/...workflow-input.OPERA_L3_DSWx-S1_T45QYD_20241001T121219Z_20241206T065726Z_S1A_30_v1.0.json b/...workflow-input.OPERA_L3_DSWx-S1_T45QYD_20241001T121219Z_20241206T065726Z_S1A_30_v1.0.json
@@ -1,4 +1,5 @@
 {
+  "cumulus_meta": {},
   "meta": {
     "provider": {},
     "stack": {},