Merge pull request #2461 from ASFHyP3/develop

Release v7.12.0
ASFHyP3 · Oct 16, 2024 · 4921de2 · 4921de2
2 parents c5fc0a7 + 04733a6
commit 4921de2
Show file tree

Hide file tree

Showing 15 changed files with 21 additions and 28 deletions.
diff --git a/.github/workflows/deploy-daac.yml b/.github/workflows/deploy-daac.yml
@@ -66,7 +66,7 @@ jobs:
       url: https://${{ matrix.domain }}
 
     steps:
-      - uses: actions/[email protected].0
+      - uses: actions/[email protected].1
 
       - uses: aws-actions/configure-aws-credentials@v4
         with:

diff --git a/.github/workflows/deploy-enterprise-test.yml b/.github/workflows/deploy-enterprise-test.yml
@@ -101,7 +101,7 @@ jobs:
       url: https://${{ matrix.domain }}
 
     steps:
-      - uses: actions/[email protected].0
+      - uses: actions/[email protected].1
 
       - uses: aws-actions/configure-aws-credentials@v4
         with:

diff --git a/.github/workflows/deploy-enterprise.yml b/.github/workflows/deploy-enterprise.yml
@@ -25,7 +25,7 @@ jobs:
             job_files: >-
               job_spec/AUTORIFT_ITS_LIVE.yml
               job_spec/S1_CORRECTION_ITS_LIVE.yml
-            instance_types: r6id.xlarge,r6idn.xlarge,r5dn.xlarge,r5d.xlarge
+            instance_types: r6id.xlarge,r6id.2xlarge,r6id.4xlarge,r6id.8xlarge,r6idn.xlarge,r6idn.2xlarge,r6idn.4xlarge,r6idn.8xlarge
             default_max_vcpus: 2000  # Max: 10,406
             expanded_max_vcpus: 2000  # Max: 10,406
             required_surplus: 0
@@ -258,7 +258,7 @@ jobs:
       url: https://${{ matrix.domain }}
 
     steps:
-      - uses: actions/[email protected].0
+      - uses: actions/[email protected].1
 
       - uses: aws-actions/configure-aws-credentials@v4
         with:

diff --git a/.github/workflows/deploy-multi-burst-sandbox.yml b/.github/workflows/deploy-multi-burst-sandbox.yml
@@ -43,7 +43,7 @@ jobs:
       url: https://${{ matrix.domain }}
 
     steps:
-      - uses: actions/[email protected].0
+      - uses: actions/[email protected].1
 
       - uses: aws-actions/configure-aws-credentials@v4
         with:

diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -6,7 +6,7 @@ jobs:
   flake8:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/[email protected].0
+      - uses: actions/[email protected].1
       - uses: actions/setup-python@v5
         with:
           python-version: 3.9
@@ -23,7 +23,7 @@ jobs:
       matrix:
         security_environment: [ASF, EDC, JPL, JPL-public]
     steps:
-      - uses: actions/[email protected].0
+      - uses: actions/[email protected].1
       - uses: actions/setup-python@v5
         with:
           python-version: 3.9
@@ -37,7 +37,7 @@ jobs:
   openapi-spec-validator:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/[email protected].0
+      - uses: actions/[email protected].1
       - uses: actions/setup-python@v5
         with:
           python-version: 3.9
@@ -50,7 +50,7 @@ jobs:
   statelint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/[email protected].0
+      - uses: actions/[email protected].1
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: 2.7
@@ -70,7 +70,7 @@ jobs:
   snyk:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/[email protected].0
+      - uses: actions/[email protected].1
       - uses: snyk/actions/[email protected]
       - uses: actions/setup-python@v5
         with:

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/[email protected].0
+      - uses: actions/[email protected].1
 
       - uses: actions/setup-python@v5
         with:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [7.12.0]
+
+### Changed
+- The `hyp3-its-live` deployment now uses a greater variety of `r6id[n]` instances.
+
 ## [7.11.0]
 
 ### Added

diff --git a/apps/api/src/hyp3_api/validation.py b/apps/api/src/hyp3_api/validation.py
@@ -136,7 +136,6 @@ def get_multipolygon_from_geojson(input_file):
     return MultiPolygon(polygons)
 
 
-# TODO https://github.com/ASFHyP3/hyp3/issues/2442 remove this function after two burst types are merged
 def convert_single_burst_jobs(jobs: list[dict]) -> list[dict]:
     jobs = deepcopy(jobs)
     for job in jobs:

diff --git a/apps/set-batch-overrides/src/set_batch_overrides.py b/apps/set-batch-overrides/src/set_batch_overrides.py
@@ -65,7 +65,6 @@ def get_insar_isce_burst_memory(job_parameters: dict) -> str:
 def lambda_handler(event: dict, _) -> dict:
     job_type, job_parameters = event['job_type'], event['job_parameters']
 
-    # TODO https://github.com/ASFHyP3/hyp3/issues/2442 rename to INSAR_ISCE_BURST after the two burst types are merged
     if job_type == 'INSAR_ISCE_MULTI_BURST':
         memory = get_insar_isce_burst_memory(job_parameters)
         omp_num_threads = INSAR_ISCE_BURST_OMP_NUM_THREADS[memory]

diff --git a/requirements-all.txt b/requirements-all.txt
@@ -5,7 +5,7 @@
 -r requirements-apps-start-execution-worker.txt
 -r requirements-apps-disable-private-dns.txt
 -r requirements-apps-update-db.txt
-boto3==1.35.31
+boto3==1.35.34
 jinja2==3.1.4
 moto[dynamodb]==5.0.16
 pytest==8.3.3
@@ -17,4 +17,4 @@ flake8-blind-except==0.2.1
 flake8-builtins==2.5.0
 setuptools==75.1.0
 openapi-spec-validator==0.7.1
-cfn-lint==1.15.2
+cfn-lint==1.16.0
diff --git a/requirements-apps-disable-private-dns.txt b/requirements-apps-disable-private-dns.txt
@@ -1 +1 @@
-boto3==1.35.31
+boto3==1.35.34
diff --git a/requirements-apps-start-execution-manager.txt b/requirements-apps-start-execution-manager.txt
@@ -1,3 +1,3 @@
-boto3==1.35.31
+boto3==1.35.34
 ./lib/dynamo/
 ./lib/lambda_logging/
diff --git a/requirements-apps-start-execution-worker.txt b/requirements-apps-start-execution-worker.txt
@@ -1,2 +1,2 @@
-boto3==1.35.31
+boto3==1.35.34
 ./lib/lambda_logging/
diff --git a/tests/test_api/test_validation.py b/tests/test_api/test_validation.py
@@ -424,17 +424,13 @@ def test_validate_jobs():
             'job_parameters': {}
         },
         {
-            # TODO https://github.com/ASFHyP3/hyp3/issues/2442
-            #  rename to INSAR_ISCE_BURST after the two burst types are merged
             'job_type': 'INSAR_ISCE_MULTI_BURST',
             'job_parameters': {
                 'reference': [valid_burst_pair[0]],
                 'secondary': [valid_burst_pair[1]]
             }
         },
         {
-            # TODO https://github.com/ASFHyP3/hyp3/issues/2442
-            #  remove this test case after the two burst types are merged
             'job_type': 'INSAR_ISCE_BURST',
             'job_parameters': {
                 'granules': [valid_burst_pair[0], valid_burst_pair[1]]
@@ -467,8 +463,6 @@ def test_validate_jobs():
 
     jobs = [
         {
-            # TODO https://github.com/ASFHyP3/hyp3/issues/2442
-            #  rename to INSAR_ISCE_BURST after the two burst types are merged
             'job_type': 'INSAR_ISCE_MULTI_BURST',
             'job_parameters': {
                 'reference': [invalid_burst_pair[0]],
@@ -479,8 +473,6 @@ def test_validate_jobs():
     with raises(validation.GranuleValidationError):
         validation.validate_jobs(jobs)
 
-    # TODO https://github.com/ASFHyP3/hyp3/issues/2442
-    #  remove this test case after the two burst types are merged
     jobs = [
         {
             'job_type': 'INSAR_ISCE_BURST',

diff --git a/tests/test_set_batch_overrides.py b/tests/test_set_batch_overrides.py
@@ -16,8 +16,6 @@
 
 def mock_insar_isce_burst_job(looks: str, bursts: int) -> dict:
     return {
-        # TODO https://github.com/ASFHyP3/hyp3/issues/2442
-        #  rename to INSAR_ISCE_BURST after the two burst types are merged
         'job_type': 'INSAR_ISCE_MULTI_BURST',
         'job_parameters': {
             'looks': looks,