Merge pull request #2160 from ASFHyP3/develop

Release v6.5.0

.github/workflows/deploy-daac.yml

@@ -63,7 +63,7 @@ jobs:
       url: https://${{ matrix.domain }}
 
     steps:
-      - uses: actions/[email protected].1
+      - uses: actions/[email protected].2
 
       - uses: aws-actions/configure-aws-credentials@v4
         with:

.github/workflows/deploy-enterprise-test.yml

@@ -45,7 +45,7 @@ jobs:
       url: https://${{ matrix.domain }}
 
     steps:
-      - uses: actions/[email protected].1
+      - uses: actions/[email protected].2
 
       - uses: aws-actions/configure-aws-credentials@v4
         with:

.github/workflows/deploy-enterprise.yml

@@ -44,8 +44,8 @@ jobs:
             cost_profile: DEFAULT
             job_files: job_spec/INSAR_ISCE.yml job_spec/INSAR_ISCE_TEST.yml
             instance_types: c6id.xlarge,c6id.2xlarge,c6id.4xlarge,c6id.8xlarge
-            default_max_vcpus: 1000
-            expanded_max_vcpus: 1000
+            default_max_vcpus: 4000
+            expanded_max_vcpus: 4000
             required_surplus: 0
             security_environment: JPL-public
             ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2023/recommended/image_id
@@ -228,7 +228,7 @@ jobs:
       url: https://${{ matrix.domain }}
 
     steps:
-      - uses: actions/[email protected].1
+      - uses: actions/[email protected].2
 
       - uses: aws-actions/configure-aws-credentials@v4
         with:

.github/workflows/static-analysis.yml

@@ -6,7 +6,7 @@ jobs:
   flake8:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/[email protected].1
+      - uses: actions/[email protected].2
       - 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].1
+      - uses: actions/[email protected].2
       - 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].1
+      - uses: actions/[email protected].2
       - 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].1
+      - uses: actions/[email protected].2
       - 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].1
+      - uses: actions/[email protected].2
       - uses: snyk/actions/[email protected]
       - uses: actions/setup-python@v5
         with:

.github/workflows/tests.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/[email protected].1
+      - uses: actions/[email protected].2
 
       - uses: actions/setup-python@v5
         with:

CHANGELOG.md

@@ -4,6 +4,15 @@ 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).
 
+## [6.5.0]
+
+### Added
+- A `publish_bucket` parameter to `AUTORIFT_ITS_LIVE` and `AUTORIFT_ITS_LIVE_TEST` that specifies if product should be uploaded to either the ITS_LIVE open data bucket or test bucket.
+- Access key secrets to `AUTORIFT_ITS_LIVE` and `AUTORIFT_ITS_LIVE_TEST` that allow for S3 upload of products.
+
+### Changed
+- Update throughput for ACCESS deployments by factor of 4 (from 1000 to 4000 vcpus).
+
 ## [6.4.0]
 
 ### Changed

job_spec/AUTORIFT_ITS_LIVE.yml

@@ -38,6 +38,15 @@ AUTORIFT:
         description: Shapefile for determining the correct search parameters by geographic location. Path to shapefile must be understood by GDAL.
         type: string
         default: '/vsicurl/http://its-live-data.s3.amazonaws.com/autorift_parameters/v001/autorift_landice_0120m.shp'
+    publish_bucket:
+      api_schema:
+        description: Publish the resulting product to the ITS_LIVE AWS Open Data (or test) S3 Bucket
+        default: '""'
+        type: string
+        enum:
+          - '""'
+          - "its-live-data"
+          - "its-live-data-test"
   cost_profiles:
     DEFAULT:
       cost: 1.0
@@ -52,6 +61,8 @@ AUTORIFT:
         - Ref::bucket_prefix
         - --parameter-file
         - Ref::parameter_file
+        - --publish-bucket
+        - Ref::publish_bucket
         - --naming-scheme
         - ITS_LIVE_PROD
         - Ref::granules
@@ -63,3 +74,5 @@ AUTORIFT:
         - EARTHDATA_PASSWORD
         - ESA_USERNAME
         - ESA_PASSWORD
+        - PUBLISH_ACCESS_KEY_ID
+        - PUBLISH_SECRET_ACCESS_KEY

job_spec/AUTORIFT_ITS_LIVE_TEST.yml

@@ -38,6 +38,15 @@ AUTORIFT_TEST:
         description: Shapefile for determining the correct search parameters by geographic location. Path to shapefile must be understood by GDAL.
         type: string
         default: '/vsicurl/http://its-live-data.s3.amazonaws.com/autorift_parameters/v001/autorift_landice_0120m.shp'
+    publish_bucket:
+      api_schema:
+        description: Publish the resulting product to the ITS_LIVE AWS Open Data (or test) S3 Bucket
+        default: '""'
+        type: string
+        enum:
+          - '""'
+          - "its-live-data"
+          - "its-live-data-test"
   cost_profiles:
     DEFAULT:
       cost: 1.0
@@ -53,6 +62,8 @@ AUTORIFT_TEST:
         - Ref::bucket_prefix
         - --parameter-file
         - Ref::parameter_file
+        - --publish-bucket
+        - Ref::publish_bucket
         - --naming-scheme
         - ITS_LIVE_PROD
         - Ref::granules
@@ -64,3 +75,5 @@ AUTORIFT_TEST:
         - EARTHDATA_PASSWORD
         - ESA_USERNAME
         - ESA_PASSWORD
+        - PUBLISH_ACCESS_KEY_ID
+        - PUBLISH_SECRET_ACCESS_KEY

requirements-all.txt

@@ -4,9 +4,9 @@
 -r requirements-apps-start-execution-manager.txt
 -r requirements-apps-start-execution-worker.txt
 -r requirements-apps-update-db.txt
-boto3==1.34.62
+boto3==1.34.69
 jinja2==3.1.3
-moto[dynamodb]==5.0.3.dev33
+moto[dynamodb]==5.0.3
 pytest==8.1.1
 PyYAML==6.0.1
 responses==0.25.0
@@ -16,4 +16,4 @@ flake8-blind-except==0.2.1
 flake8-builtins==2.2.0
 setuptools==69.2.0
 openapi-spec-validator==0.7.1
-cfn-lint==0.86.0
+cfn-lint==0.86.1

requirements-apps-scale-cluster.txt

@@ -1 +1 @@
-python-dateutil==2.8.2
+python-dateutil==2.9.0.post0

requirements-apps-start-execution-manager.txt

@@ -1,3 +1,3 @@
-boto3==1.34.62
+boto3==1.34.69
 ./lib/dynamo/
 ./lib/lambda_logging/

requirements-apps-start-execution-worker.txt

@@ -1,2 +1,2 @@
-boto3==1.34.62
+boto3==1.34.69
 ./lib/lambda_logging/