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

Author: jackiryan

CHANGELOG.md

@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 ### Added
+### Changed
+### Deprecated
+### Removed
+### Fixed
+### Security
+
+## [0.8.0]
+### Added
 - [issues/150](https://github.com/podaac/bignbit/issues/150): Added support for mixed NRT & Standard collections with configurable regex.
 ### Changed
 - [issues/173](https://github.com/podaac/bignbit/issues/173): Changed resource names (e.g. ECR repo name) to include deployment level prefixes. This allows for deploying multiple copies of bignbit to a single AWS account/venue.

bignbit/get_harmony_job_status.py

@@ -108,6 +108,10 @@ def check_harmony_job(
     harmony_client = utils.get_harmony_client(cmr_env)
     try:
         job_status = harmony_client.status(harmony_job_id)
+    except (requests.exceptions.ConnectionError, requests.exceptions.Timeout) as exc:
+        raise HarmonyTransientError(
+            f'Harmony API returned a transient error checking status of job {harmony_job_id}: {exc}'
+        ) from exc
     except requests.exceptions.HTTPError as exc:
         if exc.response is not None and exc.response.status_code >= 500:
             raise HarmonyTransientError(
@@ -120,6 +124,10 @@ def check_harmony_job(
         # Check that the harmony job returned data to confirm that the job was successful
         try:
             result_urls = list(harmony_client.result_urls(harmony_job_id, link_type=LinkType.s3))
+        except (requests.exceptions.ConnectionError, requests.exceptions.Timeout) as exc:
+            raise HarmonyTransientError(
+                f'Harmony API returned a transient error fetching result URLs for job {harmony_job_id}: {exc}'
+            ) from exc
         except requests.exceptions.HTTPError as exc:
             if exc.response is not None and exc.response.status_code >= 500:
                 raise HarmonyTransientError(

terraform/state_machine_definition.tpl

@@ -331,21 +331,14 @@
                     "Retry":[
                       {
                         "ErrorEquals":[
-                          "HarmonyJobIncompleteError"
+                          "HarmonyJobIncompleteError",
+                          "HarmonyTransientError"
                         ],
                         "IntervalSeconds":${HarmonyJobStatusIntervalSeconds},
                         "MaxAttempts":${HarmonyJobStatusMaxAttempts},
                         "BackoffRate":${HarmonyJobStatusBackoffRate},
                         "MaxDelaySeconds":${HarmonyJobStatusMaxDelaySeconds}
                       },
-                      {
-                        "ErrorEquals":[
-                          "HarmonyTransientError"
-                        ],
-                        "IntervalSeconds":2,
-                        "MaxAttempts":6,
-                        "BackoffRate":2
-                      },
                       {
                         "ErrorEquals":[
                           "Lambda.ServiceException",