Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release v4.2.0 #1886

Merged
merged 34 commits into from
Oct 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
8323bef
Bump werkzeug from 2.3.7 to 3.0.0
dependabot[bot] Oct 10, 2023
f4e3d3e
Bump serverless-wsgi from 3.0.2 to 3.0.3
dependabot[bot] Oct 10, 2023
0342fc8
Add `phase_filter_parameter` for `INSAR_GAMMA`
jtherrmann Oct 12, 2023
589726f
`phase_filter_parameter` will be rounded
jtherrmann Oct 13, 2023
405df43
phase filter param of zero skips
jtherrmann Oct 13, 2023
b804bf2
revise phase filter param description
jtherrmann Oct 13, 2023
31372e6
changelog
jtherrmann Oct 13, 2023
ab48181
update description
jtherrmann Oct 13, 2023
e329c88
Merge pull request #1876 from ASFHyP3/phase-filter-param
jtherrmann Oct 13, 2023
4fe7673
don't require float format for phase filter param
jtherrmann Oct 13, 2023
3cee0e7
Merge branch 'develop' into phase-filter-param
jtherrmann Oct 13, 2023
d52ea2e
Merge pull request #1877 from ASFHyP3/phase-filter-param
jtherrmann Oct 13, 2023
1936260
Bump actions/checkout from 4.1.0 to 4.1.1
dependabot[bot] Oct 17, 2023
a2542a1
Bump boto3 from 1.28.62 to 1.28.66
dependabot[bot] Oct 19, 2023
51ea2da
Merge pull request #1881 from ASFHyP3/dependabot/pip/boto3-1.28.66
jtherrmann Oct 19, 2023
c0a534b
Merge branch 'develop' into dependabot/github_actions/actions/checkou…
jtherrmann Oct 19, 2023
f2e67e6
Merge pull request #1873 from ASFHyP3/dependabot/pip/serverless-wsgi-…
jtherrmann Oct 19, 2023
3e5933f
Merge pull request #1879 from ASFHyP3/dependabot/github_actions/actio…
jtherrmann Oct 19, 2023
302a9ed
Merge branch 'develop' into dependabot/pip/werkzeug-3.0.0
jtherrmann Oct 19, 2023
a627f17
Use keyword arguments for `set_cookie`
jtherrmann Oct 19, 2023
d2969de
Merge pull request #1872 from ASFHyP3/dependabot/pip/werkzeug-3.0.0
jtherrmann Oct 19, 2023
7801f58
Improve `phase_filter_parameter` description
jtherrmann Oct 20, 2023
f4cc93c
Bump moto[dynamodb] from 4.2.5 to 4.2.6
dependabot[bot] Oct 20, 2023
586565f
Bump shapely from 2.0.1 to 2.0.2
dependabot[bot] Oct 20, 2023
9a1c710
Bump boto3 from 1.28.66 to 1.28.67
dependabot[bot] Oct 20, 2023
9bae44d
Merge pull request #1884 from ASFHyP3/dependabot/pip/shapely-2.0.2
jtherrmann Oct 20, 2023
e4398be
Merge pull request #1885 from ASFHyP3/dependabot/pip/boto3-1.28.67
jtherrmann Oct 20, 2023
9e2745d
Merge pull request #1883 from ASFHyP3/dependabot/pip/moto-dynamodb--4…
jtherrmann Oct 20, 2023
fbeb52f
Merge branch 'develop' into update-filter-param-description
jtherrmann Oct 20, 2023
fcf44b3
Merge pull request #1882 from ASFHyP3/update-filter-param-description
jtherrmann Oct 20, 2023
1c5d5fa
Remove the `INSAR_GAMMA_TEST` job type
jtherrmann Oct 23, 2023
401f4e8
Merge pull request #1889 from ASFHyP3/delete-insar-gamma-test
jtherrmann Oct 23, 2023
3ee12f9
Improve `phase_filter_parameter` description
jtherrmann Oct 23, 2023
78fb77b
Merge pull request #1890 from ASFHyP3/phase-filter-description
jtherrmann Oct 23, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/deploy-daac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,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:
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/deploy-enterprise-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ jobs:
job_files: >-
job_spec/AUTORIFT_ITS_LIVE.yml
job_spec/INSAR_GAMMA.yml
job_spec/INSAR_GAMMA_TEST.yml
job_spec/RTC_GAMMA.yml
job_spec/INSAR_ISCE_TEST.yml
job_spec/INSAR_ISCE_BURST.yml
Expand All @@ -45,7 +44,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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy-enterprise.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ jobs:
image_tag: latest
product_lifetime_in_days: 365000
quota: 0
job_files: job_spec/INSAR_GAMMA.yml job_spec/INSAR_GAMMA_TEST.yml
job_files: job_spec/INSAR_GAMMA.yml
instance_types: r6id.xlarge,r6id.2xlarge,r6id.4xlarge,r6id.8xlarge,r6idn.xlarge,r6idn.2xlarge,r6idn.4xlarge,r6idn.8xlarge
default_max_vcpus: 640
expanded_max_vcpus: 640
Expand Down Expand Up @@ -204,7 +204,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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-template-comment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
name: Add a comment with the release template
steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].1

- name: Comment PR
uses: thollander/actions-comment-pull-request@v2
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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@v4
with:
python-version: 3.9
Expand All @@ -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@v4
with:
python-version: 3.9
Expand All @@ -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@v4
with:
python-version: 3.9
Expand All @@ -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
Expand All @@ -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@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].1

- uses: actions/setup-python@v4
with:
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ 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.2.0]
### Added
- Added `phase_filter_parameter` for `INSAR_GAMMA` job type.
### Removed
- Removed the `INSAR_GAMMA_TEST` job type from the `hyp3-avo` and `hyp3-enterprise-test` deployments, now that the `phase_filter_parameter` option is available for the `INSAR_GAMMA` job type.

## [4.1.2]
### Changed
- AWS Batch jobs are now retried twice, once after 10 minutes and once after 60 minutes, to reduce the number of jobs that fail due to transient errors, such as Earthdata Login and Sentinel-1 distribution outages.
Expand Down
9 changes: 9 additions & 0 deletions job_spec/INSAR_GAMMA.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,13 @@ INSAR_GAMMA:
enum:
- 20x4
- 10x2
phase_filter_parameter:
api_schema:
description: Adaptive phase filter parameter. Useful values fall in the range 0.2 to 1. Larger values result in stronger filtering. If zero, adaptive phase filter will be skipped.
type: number
minimum: 0.0
maximum: 1.0
default: 0.6
validators:
- check_dem_coverage
tasks:
Expand Down Expand Up @@ -93,6 +100,8 @@ INSAR_GAMMA:
- Ref::apply_water_mask
- --looks
- Ref::looks
- --phase-filter-parameter
- Ref::phase_filter_parameter
- Ref::granules
timeout: 10800
vcpu: 1
Expand Down
113 changes: 0 additions & 113 deletions job_spec/INSAR_GAMMA_TEST.yml

This file was deleted.

4 changes: 2 additions & 2 deletions requirements-all.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.28.62
boto3==1.28.67
jinja2==3.1.2
moto[dynamodb]==4.2.5
moto[dynamodb]==4.2.6
pytest==7.4.2
PyYAML==6.0.1
responses==0.23.3
Expand Down
6 changes: 3 additions & 3 deletions requirements-apps-api.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ openapi-core==0.14.5
prance==23.6.21.0
PyJWT==2.8.0
requests==2.31.0
serverless_wsgi==3.0.2
shapely==2.0.1
serverless_wsgi==3.0.3
shapely==2.0.2
strict-rfc3339==0.7
Werkzeug==2.3.7
Werkzeug==3.0.0
./lib/dynamo/
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.62
boto3==1.28.67
./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.62
boto3==1.28.67
./lib/lambda_logging/
6 changes: 5 additions & 1 deletion tests/test_api/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,11 @@ def client():


def login(client, username=DEFAULT_USERNAME):
client.set_cookie('localhost', AUTH_COOKIE, auth.get_mock_jwt_cookie(username, lifetime_in_seconds=10_000))
client.set_cookie(
domain='localhost',
key=AUTH_COOKIE,
value=auth.get_mock_jwt_cookie(username, lifetime_in_seconds=10_000)
)


def make_job(granules=None, name='someName', job_type='RTC_GAMMA', parameters=None):
Expand Down
12 changes: 10 additions & 2 deletions tests/test_api/test_api_spec.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,22 @@ def test_not_logged_in(client):

def test_invalid_cookie(client):
for uri in ENDPOINTS:
client.set_cookie('localhost', AUTH_COOKIE, 'garbage I say!!! GARGBAGE!!!')
client.set_cookie(
domain='localhost',
key=AUTH_COOKIE,
value='garbage I say!!! GARGBAGE!!!'
)
response = client.get(uri)
assert response.status_code == HTTPStatus.UNAUTHORIZED


def test_expired_cookie(client):
for uri in ENDPOINTS:
client.set_cookie('localhost', AUTH_COOKIE, auth.get_mock_jwt_cookie('user', lifetime_in_seconds=-1))
client.set_cookie(
domain='localhost',
key=AUTH_COOKIE,
value=auth.get_mock_jwt_cookie('user', lifetime_in_seconds=-1)
)
response = client.get(uri)
assert response.status_code == HTTPStatus.UNAUTHORIZED

Expand Down
Loading