Skip to content

Commit

Permalink
Merge branch 'develop' into upgrade-openapi-after-subscriptions-removal
Browse files Browse the repository at this point in the history
  • Loading branch information
jtherrmann authored Sep 18, 2023
2 parents 54059fc + 9615f24 commit ada7fcf
Show file tree
Hide file tree
Showing 9 changed files with 25 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy-daac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
steps:
- uses: actions/[email protected]

- uses: aws-actions/configure-aws-credentials@v3
- uses: aws-actions/configure-aws-credentials@v4
with:
aws-access-key-id: ${{ secrets.V2_AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.V2_AWS_SECRET_ACCESS_KEY }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy-enterprise-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
quota: 0
deploy_ref: refs/heads/develop
job_files: >-
job_spec/AUTORIFT.yml
job_spec/AUTORIFT_ITS_LIVE.yml
job_spec/INSAR_GAMMA.yml
job_spec/INSAR_GAMMA_TEST.yml
job_spec/RTC_GAMMA.yml
Expand All @@ -47,7 +47,7 @@ jobs:
steps:
- uses: actions/[email protected]

- uses: aws-actions/configure-aws-credentials@v3
- uses: aws-actions/configure-aws-credentials@v4
with:
aws-access-key-id: ${{ secrets.V2_AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.V2_AWS_SECRET_ACCESS_KEY }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-enterprise.yml
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ jobs:
steps:
- uses: actions/[email protected]

- uses: aws-actions/configure-aws-credentials@v3
- uses: aws-actions/configure-aws-credentials@v4
with:
aws-access-key-id: ${{ secrets.V2_AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.V2_AWS_SECRET_ACCESS_KEY }}
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ 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).

## [4.1.0]
### Added
- New `parameter_file` parameter for the `AUTORIFT_ITS_LIVE` and `AUTORIFT_ITS_LIVE_TEST` job types.

## [4.0.0]
### Removed
- The Subscriptions feature has been removed.
Expand Down
7 changes: 6 additions & 1 deletion job_spec/AUTORIFT_ITS_LIVE.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ AUTORIFT:
example: LC08_L1GT_118112_20210107_20210107_02_T2
bucket_prefix:
default: '""'
parameter_file:
api_schema:
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'
validators: []
tasks:
- name: ''
Expand All @@ -43,7 +48,7 @@ AUTORIFT:
- --bucket-prefix
- Ref::bucket_prefix
- --parameter-file
- '/vsicurl/http://its-live-data.s3.amazonaws.com/autorift_parameters/v001/autorift_landice_0120m.shp'
- Ref::parameter_file
- --naming-scheme
- ITS_LIVE_PROD
- Ref::granules
Expand Down
7 changes: 6 additions & 1 deletion job_spec/AUTORIFT_ITS_LIVE_TEST.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ AUTORIFT_TEST:
example: LC08_L1GT_118112_20210107_20210107_02_T2
bucket_prefix:
default: '""'
parameter_file:
api_schema:
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'
validators: []
tasks:
- name: ''
Expand All @@ -44,7 +49,7 @@ AUTORIFT_TEST:
- --bucket-prefix
- Ref::bucket_prefix
- --parameter-file
- '/vsicurl/http://its-live-data.s3.amazonaws.com/autorift_parameters/v001/autorift_landice_0120m.shp'
- Ref::parameter_file
- --naming-scheme
- ITS_LIVE_PROD
- Ref::granules
Expand Down
6 changes: 3 additions & 3 deletions requirements-all.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
-r requirements-apps-start-execution-manager.txt
-r requirements-apps-start-execution-worker.txt
-r requirements-apps-update-db.txt
boto3==1.28.43
boto3==1.28.47
jinja2==3.1.2
moto[dynamodb]==4.2.2
pytest==7.4.2
Expand All @@ -14,6 +14,6 @@ flake8==6.1.0
flake8-import-order==0.18.2
flake8-blind-except==0.2.1
flake8-builtins==2.1.0
setuptools==68.2.0
setuptools==68.2.2
openapi-spec-validator==0.5.7
cfn-lint==0.79.9
cfn-lint==0.80.2
2 changes: 1 addition & 1 deletion requirements-apps-start-execution-manager.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
boto3==1.28.43
boto3==1.28.47
./lib/dynamo/
./lib/lambda_logging/
2 changes: 1 addition & 1 deletion requirements-apps-start-execution-worker.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
boto3==1.28.43
boto3==1.28.47
./lib/lambda_logging/

0 comments on commit ada7fcf

Please sign in to comment.