From 66d95f246c246f8bb1cfddf6c5e03056b54d47bc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 10 Aug 2023 19:54:38 +0000 Subject: [PATCH 01/40] Bump asf-search from 6.0.2 to 6.6.2 Bumps [asf-search](https://github.com/asfadmin/Discovery-asf_search) from 6.0.2 to 6.6.2. - [Release notes](https://github.com/asfadmin/Discovery-asf_search/releases) - [Changelog](https://github.com/asfadmin/Discovery-asf_search/blob/master/CHANGELOG.md) - [Commits](https://github.com/asfadmin/Discovery-asf_search/compare/v6.0.2...v6.6.2) --- updated-dependencies: - dependency-name: asf-search dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements-apps-subscription-worker.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-apps-subscription-worker.txt b/requirements-apps-subscription-worker.txt index 117474a1a..08d611f92 100644 --- a/requirements-apps-subscription-worker.txt +++ b/requirements-apps-subscription-worker.txt @@ -1,3 +1,3 @@ -asf-search==6.0.2 +asf-search==6.6.2 ./lib/dynamo/ ./lib/lambda_logging/ From 355493fad929d3d0c651fac184733f8ac93353f7 Mon Sep 17 00:00:00 2001 From: Charlie Marshak Date: Tue, 15 Aug 2023 13:06:51 -0700 Subject: [PATCH 02/40] Update deploy-enterprise.yml --- .github/workflows/deploy-enterprise.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-enterprise.yml b/.github/workflows/deploy-enterprise.yml index 380fb7f34..c0287f611 100644 --- a/.github/workflows/deploy-enterprise.yml +++ b/.github/workflows/deploy-enterprise.yml @@ -51,7 +51,7 @@ jobs: domain: hyp3-tibet-jpl.asf.alaska.edu template_bucket: cf-templates-1or0efwqffkgd-us-west-2 image_tag: latest - product_lifetime_in_days: 14 + product_lifetime_in_days: 60 quota: 0 job_files: job_spec/INSAR_ISCE.yml job_spec/INSAR_ISCE_TEST.yml instance_types: c6id.xlarge,c6id.2xlarge,c6id.4xlarge,c6id.8xlarge From 45bc11df97b9a32dd4a5b921730350490aa2efd7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 18 Aug 2023 19:55:27 +0000 Subject: [PATCH 03/40] Bump setuptools from 68.0.0 to 68.1.2 Bumps [setuptools](https://github.com/pypa/setuptools) from 68.0.0 to 68.1.2. - [Release notes](https://github.com/pypa/setuptools/releases) - [Changelog](https://github.com/pypa/setuptools/blob/main/NEWS.rst) - [Commits](https://github.com/pypa/setuptools/compare/v68.0.0...v68.1.2) --- updated-dependencies: - dependency-name: setuptools dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements-all.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-all.txt b/requirements-all.txt index a8e6ab8f1..a0d69d766 100644 --- a/requirements-all.txt +++ b/requirements-all.txt @@ -16,6 +16,6 @@ flake8==6.1.0 flake8-import-order==0.18.2 flake8-blind-except==0.2.1 flake8-builtins==2.1.0 -setuptools==68.0.0 +setuptools==68.1.2 openapi-spec-validator==0.4.0 cfn-lint==0.79.7 From 8b1b6f281015e59d7d5d54e4954bcfff704cd263 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 18 Aug 2023 19:55:40 +0000 Subject: [PATCH 04/40] Bump boto3 from 1.28.26 to 1.28.30 Bumps [boto3](https://github.com/boto/boto3) from 1.28.26 to 1.28.30. - [Release notes](https://github.com/boto/boto3/releases) - [Changelog](https://github.com/boto/boto3/blob/develop/CHANGELOG.rst) - [Commits](https://github.com/boto/boto3/compare/1.28.26...1.28.30) --- updated-dependencies: - dependency-name: boto3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-all.txt | 2 +- requirements-apps-start-execution-manager.txt | 2 +- requirements-apps-start-execution-worker.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements-all.txt b/requirements-all.txt index a8e6ab8f1..47c8b6891 100644 --- a/requirements-all.txt +++ b/requirements-all.txt @@ -6,7 +6,7 @@ -r requirements-apps-start-execution-manager.txt -r requirements-apps-start-execution-worker.txt -r requirements-apps-update-db.txt -boto3==1.28.26 +boto3==1.28.30 jinja2==3.1.2 moto[dynamodb]==4.1.14 pytest==7.4.0 diff --git a/requirements-apps-start-execution-manager.txt b/requirements-apps-start-execution-manager.txt index 4257d57ca..32152121c 100644 --- a/requirements-apps-start-execution-manager.txt +++ b/requirements-apps-start-execution-manager.txt @@ -1,3 +1,3 @@ -boto3==1.28.26 +boto3==1.28.30 ./lib/dynamo/ ./lib/lambda_logging/ diff --git a/requirements-apps-start-execution-worker.txt b/requirements-apps-start-execution-worker.txt index f6830cdf9..95bc4966e 100644 --- a/requirements-apps-start-execution-worker.txt +++ b/requirements-apps-start-execution-worker.txt @@ -1,2 +1,2 @@ -boto3==1.28.26 +boto3==1.28.30 ./lib/lambda_logging/ From 4612d27496a68f1d218423962bd2e2540304b258 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Aug 2023 19:31:02 +0000 Subject: [PATCH 05/40] Bump boto3 from 1.28.30 to 1.28.31 Bumps [boto3](https://github.com/boto/boto3) from 1.28.30 to 1.28.31. - [Release notes](https://github.com/boto/boto3/releases) - [Changelog](https://github.com/boto/boto3/blob/develop/CHANGELOG.rst) - [Commits](https://github.com/boto/boto3/compare/1.28.30...1.28.31) --- updated-dependencies: - dependency-name: boto3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-all.txt | 2 +- requirements-apps-start-execution-manager.txt | 2 +- requirements-apps-start-execution-worker.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements-all.txt b/requirements-all.txt index 47c8b6891..47ae502a2 100644 --- a/requirements-all.txt +++ b/requirements-all.txt @@ -6,7 +6,7 @@ -r requirements-apps-start-execution-manager.txt -r requirements-apps-start-execution-worker.txt -r requirements-apps-update-db.txt -boto3==1.28.30 +boto3==1.28.31 jinja2==3.1.2 moto[dynamodb]==4.1.14 pytest==7.4.0 diff --git a/requirements-apps-start-execution-manager.txt b/requirements-apps-start-execution-manager.txt index 32152121c..9d5d78265 100644 --- a/requirements-apps-start-execution-manager.txt +++ b/requirements-apps-start-execution-manager.txt @@ -1,3 +1,3 @@ -boto3==1.28.30 +boto3==1.28.31 ./lib/dynamo/ ./lib/lambda_logging/ diff --git a/requirements-apps-start-execution-worker.txt b/requirements-apps-start-execution-worker.txt index 95bc4966e..4121973d5 100644 --- a/requirements-apps-start-execution-worker.txt +++ b/requirements-apps-start-execution-worker.txt @@ -1,2 +1,2 @@ -boto3==1.28.30 +boto3==1.28.31 ./lib/lambda_logging/ From f2f78d03e13c5572195fe107111409123af0c1cd Mon Sep 17 00:00:00 2001 From: Andrew Johnston Date: Mon, 21 Aug 2023 13:15:36 -0800 Subject: [PATCH 06/40] update changelog for 3.10.3 release --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 007e6dc94..4c2d61eff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ 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). +## [3.10.3] +- Increased product lifetime for hyp3-tibet-jpl deployment from 14 days to 60 days. + ## [3.10.2] ### Deprecated - The Subscriptions feature has been deprecated and will be removed as early as `2023-09-05` (September 5, 2023). From 53774393fda5dbd097dade560e8b67670d24770c Mon Sep 17 00:00:00 2001 From: Andrew Johnston Date: Mon, 21 Aug 2023 13:16:10 -0800 Subject: [PATCH 07/40] fix missing header in changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4c2d61eff..d1db2a1e6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ 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). ## [3.10.3] +### Changed - Increased product lifetime for hyp3-tibet-jpl deployment from 14 days to 60 days. ## [3.10.2] From 557371b8d0a3f98eaf0f6b8db19999b904944b17 Mon Sep 17 00:00:00 2001 From: Andrew Johnston Date: Mon, 21 Aug 2023 16:45:55 -0800 Subject: [PATCH 08/40] update hyp3-edc-uat to new earthdata cloud AMI --- .github/workflows/deploy-daac.yml | 2 +- CHANGELOG.md | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy-daac.yml b/.github/workflows/deploy-daac.yml index 49c46e5b7..0fb58eb6f 100644 --- a/.github/workflows/deploy-daac.yml +++ b/.github/workflows/deploy-daac.yml @@ -29,7 +29,7 @@ jobs: expanded_max_vcpus: 3000 required_surplus: 3000 security_environment: EDC - ami_id: image_id_ecs_amz2 + ami_id: image_id_s1_ecs_amz2 distribution_url: 'https://d3gm2hf49xd6jj.cloudfront.net' - environment: hyp3-edc-uat diff --git a/CHANGELOG.md b/CHANGELOG.md index d1db2a1e6..e5c662655 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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). +## [3.10.4] +### Changed +- The `hyp3-edc-uat` deployment now uses the latest Earthdata Cloud AMI with additional software installed. + ## [3.10.3] ### Changed - Increased product lifetime for hyp3-tibet-jpl deployment from 14 days to 60 days. From b13519b63671a0795b8505ed08462d58522660fc Mon Sep 17 00:00:00 2001 From: Andrew Johnston Date: Tue, 22 Aug 2023 10:32:56 -0800 Subject: [PATCH 09/40] update INSAR_ISCE job type for DockerizedTopsApp v0.2.4 release --- .github/workflows/deploy-enterprise.yml | 4 +-- CHANGELOG.md | 5 +++ job_spec/INSAR_ISCE.yml | 44 +++++++++++++++++++++++-- 3 files changed, 48 insertions(+), 5 deletions(-) diff --git a/.github/workflows/deploy-enterprise.yml b/.github/workflows/deploy-enterprise.yml index c0287f611..7db752b88 100644 --- a/.github/workflows/deploy-enterprise.yml +++ b/.github/workflows/deploy-enterprise.yml @@ -39,7 +39,7 @@ jobs: product_lifetime_in_days: 180 quota: 0 job_files: job_spec/INSAR_ISCE.yml job_spec/INSAR_ISCE_TEST.yml - instance_types: c6id.xlarge + instance_types: c6id.xlarge,c6id.2xlarge,c6id.4xlarge,c6id.8xlarge default_max_vcpus: 1600 expanded_max_vcpus: 1600 required_surplus: 0 @@ -69,7 +69,7 @@ jobs: product_lifetime_in_days: 14 quota: 0 job_files: job_spec/INSAR_ISCE.yml job_spec/INSAR_ISCE_TEST.yml - instance_types: c6id.xlarge + instance_types: c6id.xlarge,c6id.2xlarge,c6id.4xlarge,c6id.8xlarge default_max_vcpus: 1600 expanded_max_vcpus: 1600 required_surplus: 0 diff --git a/CHANGELOG.md b/CHANGELOG.md index e5c662655..d68f21a5d 100644 --- 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). +## [3.10.5] +### Changed +- Updated INSAR_ISCE job specification for [DockerizedTopsApp](https://github.com/ACCESS-Cloud-Based-InSAR/DockerizedTopsApp) v0.2.4 +- Added larger `c6id` instance types to hyp3-a19-jpl and hyp3-nisar-jpl deployments + ## [3.10.4] ### Changed - The `hyp3-edc-uat` deployment now uses the latest Earthdata Cloud AMI with additional software installed. diff --git a/job_spec/INSAR_ISCE.yml b/job_spec/INSAR_ISCE.yml index cf8ee7832..2e7c254c8 100644 --- a/job_spec/INSAR_ISCE.yml +++ b/job_spec/INSAR_ISCE.yml @@ -27,6 +27,28 @@ INSAR_ISCE: minLength: 67 maxLength: 67 example: S1B_IW_SLC__1SDV_20210711T014947_20210711T015013_027740_034F80_D404 + esd_coherence_threshold: + api_schema: + description: Coherence threshold value for determining which points to include when performing ESD. Must be any value between 0 and 1 (inclusive), or -1 for no ESD correction. + default: -1.0 + type: number + minimum: -1.0 + maximum: 1.0 + estimate_ionosphere_delay: + api_schema: + description: Whether to apply ionosphere correction to the ARIA-S1-GUNW as an additional layer. + default: false + type: boolean + frame_id: + api_schema: + description: Subset GUNW products to this frame. The default is `-1` with no subsetting of the products. + default: -1 + type: integer + compute_solid_earth_tide: + api_schema: + default: false + type: boolean + description: "Whether to compute a solid earth tide correction layer for ARIA-S1-GUNW products" weather_model: api_schema: description: Weather model used to generate tropospheric delay estimations @@ -34,9 +56,11 @@ INSAR_ISCE: type: string enum: - None + - ERA5 + - ERA5T + - GMAO - HRES - HRRR - - GMAO bucket_prefix: default: '""' validators: [] @@ -44,6 +68,8 @@ INSAR_ISCE: - name: '' image: ghcr.io/access-cloud-based-insar/dockerizedtopsapp command: + - ++omp-num-threads + - '4' - --bucket - '!Ref Bucket' - --bucket-prefix @@ -52,7 +78,15 @@ INSAR_ISCE: - Ref::granules - --secondary-scenes - Ref::secondary_granules - timeout: 10800 + - --esd-coherence-threshold + - Ref::esd_coherence_threshold + - --estimate-ionosphere-delay + - Ref::estimate_ionosphere_delay + - --frame-id + - Ref::frame_id + - --compute-solid-earth-tide + - Ref::compute_solid_earth_tide + timeout: 21600 vcpu: 1 memory: 7500 secrets: @@ -75,4 +109,8 @@ INSAR_ISCE: secrets: - EARTHDATA_USERNAME - EARTHDATA_PASSWORD - + - RAIDER_ECMWF_ERA5_UID + - RAIDER_ECMWF_ERA5_API_KEY + - RAIDER_HRES_EMAIL + - RAIDER_HRES_API_KEY + - RAIDER_HRES_URL From a89ec96a9a759f0d14e9147940a361fc392aa245 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 22 Aug 2023 19:21:45 +0000 Subject: [PATCH 10/40] Bump moto[dynamodb] from 4.1.14 to 4.1.15 Bumps [moto[dynamodb]](https://github.com/getmoto/moto) from 4.1.14 to 4.1.15. - [Changelog](https://github.com/getmoto/moto/blob/master/CHANGELOG.md) - [Commits](https://github.com/getmoto/moto/compare/4.1.14...4.1.15) --- updated-dependencies: - dependency-name: moto[dynamodb] dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-all.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-all.txt b/requirements-all.txt index f3824aa5d..b9e0f5340 100644 --- a/requirements-all.txt +++ b/requirements-all.txt @@ -8,7 +8,7 @@ -r requirements-apps-update-db.txt boto3==1.28.31 jinja2==3.1.2 -moto[dynamodb]==4.1.14 +moto[dynamodb]==4.1.15 pytest==7.4.0 PyYAML==6.0.1 responses==0.23.3 From a87bc351768f8da1cb81c9b5d6fb2716924a623d Mon Sep 17 00:00:00 2001 From: Andrew Johnston Date: Tue, 22 Aug 2023 16:00:00 -0800 Subject: [PATCH 11/40] fix ami id mismatch in deploy-daac.yml --- .github/workflows/deploy-daac.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy-daac.yml b/.github/workflows/deploy-daac.yml index 0fb58eb6f..95e006ff5 100644 --- a/.github/workflows/deploy-daac.yml +++ b/.github/workflows/deploy-daac.yml @@ -29,7 +29,7 @@ jobs: expanded_max_vcpus: 3000 required_surplus: 3000 security_environment: EDC - ami_id: image_id_s1_ecs_amz2 + ami_id: image_id_ecs_amz2 distribution_url: 'https://d3gm2hf49xd6jj.cloudfront.net' - environment: hyp3-edc-uat @@ -52,7 +52,7 @@ jobs: expanded_max_vcpus: 3000 required_surplus: 3000 security_environment: EDC - ami_id: image_id_ecs_amz2 + ami_id: image_id_s1_ecs_amz2 distribution_url: 'https://d1riv60tezqha9.cloudfront.net' environment: From 3881f801d57881b86335045c003fa7827744a59f Mon Sep 17 00:00:00 2001 From: jacquelynsmale Date: Wed, 23 Aug 2023 09:38:34 -0800 Subject: [PATCH 12/40] update ami for prod --- .github/workflows/deploy-daac.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-daac.yml b/.github/workflows/deploy-daac.yml index 95e006ff5..a42e4468a 100644 --- a/.github/workflows/deploy-daac.yml +++ b/.github/workflows/deploy-daac.yml @@ -29,7 +29,7 @@ jobs: expanded_max_vcpus: 3000 required_surplus: 3000 security_environment: EDC - ami_id: image_id_ecs_amz2 + ami_id: image_id_s1_ecs_amz2 distribution_url: 'https://d3gm2hf49xd6jj.cloudfront.net' - environment: hyp3-edc-uat From 8d76a052e991d140aed840e945fce48f8383d045 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Aug 2023 18:42:48 +0000 Subject: [PATCH 13/40] Bump boto3 from 1.28.31 to 1.28.32 Bumps [boto3](https://github.com/boto/boto3) from 1.28.31 to 1.28.32. - [Release notes](https://github.com/boto/boto3/releases) - [Changelog](https://github.com/boto/boto3/blob/develop/CHANGELOG.rst) - [Commits](https://github.com/boto/boto3/compare/1.28.31...1.28.32) --- updated-dependencies: - dependency-name: boto3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-all.txt | 2 +- requirements-apps-start-execution-manager.txt | 2 +- requirements-apps-start-execution-worker.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements-all.txt b/requirements-all.txt index b9e0f5340..0e3a34793 100644 --- a/requirements-all.txt +++ b/requirements-all.txt @@ -6,7 +6,7 @@ -r requirements-apps-start-execution-manager.txt -r requirements-apps-start-execution-worker.txt -r requirements-apps-update-db.txt -boto3==1.28.31 +boto3==1.28.32 jinja2==3.1.2 moto[dynamodb]==4.1.15 pytest==7.4.0 diff --git a/requirements-apps-start-execution-manager.txt b/requirements-apps-start-execution-manager.txt index 9d5d78265..cb132b532 100644 --- a/requirements-apps-start-execution-manager.txt +++ b/requirements-apps-start-execution-manager.txt @@ -1,3 +1,3 @@ -boto3==1.28.31 +boto3==1.28.32 ./lib/dynamo/ ./lib/lambda_logging/ diff --git a/requirements-apps-start-execution-worker.txt b/requirements-apps-start-execution-worker.txt index 4121973d5..8f41dce14 100644 --- a/requirements-apps-start-execution-worker.txt +++ b/requirements-apps-start-execution-worker.txt @@ -1,2 +1,2 @@ -boto3==1.28.31 +boto3==1.28.32 ./lib/lambda_logging/ From a4254742d90386692fb84c08f2c44c0f92781bd7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Aug 2023 18:43:05 +0000 Subject: [PATCH 14/40] Bump moto[dynamodb] from 4.1.15 to 4.2.0 Bumps [moto[dynamodb]](https://github.com/getmoto/moto) from 4.1.15 to 4.2.0. - [Changelog](https://github.com/getmoto/moto/blob/master/CHANGELOG.md) - [Commits](https://github.com/getmoto/moto/compare/4.1.15...4.2.0) --- updated-dependencies: - dependency-name: moto[dynamodb] dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements-all.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-all.txt b/requirements-all.txt index b9e0f5340..32c41d984 100644 --- a/requirements-all.txt +++ b/requirements-all.txt @@ -8,7 +8,7 @@ -r requirements-apps-update-db.txt boto3==1.28.31 jinja2==3.1.2 -moto[dynamodb]==4.1.15 +moto[dynamodb]==4.2.0 pytest==7.4.0 PyYAML==6.0.1 responses==0.23.3 From c96f5a00b5ba1574ae1dd1b3a312c88160f42442 Mon Sep 17 00:00:00 2001 From: jacquelynsmale Date: Wed, 23 Aug 2023 11:29:51 -0800 Subject: [PATCH 15/40] update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e5c662655..eef007c6e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [3.10.4] ### Changed -- The `hyp3-edc-uat` deployment now uses the latest Earthdata Cloud AMI with additional software installed. +- The `hyp3-edc-uat` and `hyp3-edc-prod` deployments now uses the latest Earthdata Cloud AMI with additional software installed. ## [3.10.3] ### Changed From 3a69ad8e51c454d6b079eb344416acd5bcd64856 Mon Sep 17 00:00:00 2001 From: Andrew Johnston Date: Thu, 24 Aug 2023 08:33:23 -0800 Subject: [PATCH 16/40] increase vcpu limits for hyp3-a19-jpl and hyp3-tibet-jpl --- .github/workflows/deploy-enterprise.yml | 8 ++++---- CHANGELOG.md | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy-enterprise.yml b/.github/workflows/deploy-enterprise.yml index 7db752b88..9279c1934 100644 --- a/.github/workflows/deploy-enterprise.yml +++ b/.github/workflows/deploy-enterprise.yml @@ -40,8 +40,8 @@ jobs: quota: 0 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: 1600 - expanded_max_vcpus: 1600 + default_max_vcpus: 10000 + expanded_max_vcpus: 10000 required_surplus: 0 security_environment: JPL-public ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2/recommended/image_id @@ -55,8 +55,8 @@ jobs: quota: 0 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: 1600 - expanded_max_vcpus: 1600 + default_max_vcpus: 10000 + expanded_max_vcpus: 10000 required_surplus: 0 security_environment: JPL-public ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2/recommended/image_id diff --git a/CHANGELOG.md b/CHANGELOG.md index b73bccfea..1c0a0865c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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). +## [3.10.6] +### Changed +- Increased vCPU limits for `hyp3-a19-jpl` and `hyp3-tibet-jpl` from 1,600 to 10,000. + ## [3.10.5] ### Changed - Updated INSAR_ISCE job specification for [DockerizedTopsApp](https://github.com/ACCESS-Cloud-Based-InSAR/DockerizedTopsApp) v0.2.4 From 6416205f991d07e647db4260a18eaf74d081c67f Mon Sep 17 00:00:00 2001 From: Andrew Player Date: Thu, 24 Aug 2023 13:18:01 -0500 Subject: [PATCH 17/40] burstid and polarizations checks for isce burst --- apps/api/src/hyp3_api/validation.py | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/apps/api/src/hyp3_api/validation.py b/apps/api/src/hyp3_api/validation.py index 01b087066..16531ce93 100644 --- a/apps/api/src/hyp3_api/validation.py +++ b/apps/api/src/hyp3_api/validation.py @@ -86,6 +86,24 @@ def check_dem_coverage(job, granule_metadata): raise GranuleValidationError(f'Some requested scenes do not have DEM coverage: {", ".join(bad_granules)}') +def check_same_burst_ids(job, granule_metadata): + burst_ids = [g['name'].split('_')[1] for g in granule_metadata] + ref_burst_id = burst_ids[0] + sec_burst_id = burst_ids[1] + if ref_burst_id != sec_burst_id: + raise GranuleValidationError(f'The requested scenes do not have the same burst id: {ref_burst_id} and {sec_burst_id}') + + +def check_valid_polarizations(job, granule_metadata): + polarizations = [g['name'].split('_')[4] for g in granule_metadata] + ref_polarization = polarizations[0] + sec_polarization = polarizations[1] + if ref_polarization != sec_polarization: + raise GranuleValidationError(f'The requested scenes do not have the same polarization: {ref_polarization} and {sec_polarization}') + if ref_polarization != 'VV' and ref_polarization != 'HH': + raise GranuleValidationError(f'Only VV and HH polarizations are currently supported, got: {ref_polarization}') + + def format_points(point_string): converted_to_float = [float(x) for x in point_string.split(' ')] points = [list(t) for t in zip(converted_to_float[1::2], converted_to_float[::2])] @@ -110,4 +128,4 @@ def validate_jobs(jobs): job_granule_metadata = [granule for granule in granule_metadata if granule['name'] in get_granules([job])] module = sys.modules[__name__] validator = getattr(module, validator_name) - validator(job, job_granule_metadata) + validator(job, job_granule_metadata) \ No newline at end of file From 2056d679686448a5606a7163a90d8c1ef8052c7d Mon Sep 17 00:00:00 2001 From: Andrew Player Date: Thu, 24 Aug 2023 13:18:05 -0500 Subject: [PATCH 18/40] burstid and polarizations checks for isce burst --- job_spec/INSAR_ISCE_BURST.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/job_spec/INSAR_ISCE_BURST.yml b/job_spec/INSAR_ISCE_BURST.yml index 10b69b8f4..854849278 100644 --- a/job_spec/INSAR_ISCE_BURST.yml +++ b/job_spec/INSAR_ISCE_BURST.yml @@ -36,6 +36,8 @@ INSAR_ISCE_BURST: - 5x1 validators: - check_dem_coverage + - check_valid_polarizations + - check_same_burst_ids tasks: - name: '' image: ghcr.io/asfhyp3/hyp3-isce2 From d706c35baa3ede357c84353b25bf9766a94e7730 Mon Sep 17 00:00:00 2001 From: Andrew Player Date: Thu, 24 Aug 2023 13:18:25 -0500 Subject: [PATCH 19/40] tests for burst id and polarization validation --- tests/test_api/test_validation.py | 56 +++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/tests/test_api/test_validation.py b/tests/test_api/test_validation.py index fad1887ce..54be687a2 100644 --- a/tests/test_api/test_validation.py +++ b/tests/test_api/test_validation.py @@ -142,6 +142,62 @@ def test_check_dem_coverage(): validation.check_dem_coverage(job, [neither]) +def test_check_same_burst_ids(): + valid_case = [ + { + 'name': 'S1_136231_IW2_20200604T022312_VV_7C85-BURST' + }, + { + 'name': 'S1_136231_IW2_20200616T022313_VV_5D11-BURST' + } + ] + invalid_case = [ + { + 'name': 'S1_136231_IW2_20200604T022312_VV_7C85-BURST' + }, + { + 'name': 'S1_136232_IW2_20200616T022313_HH_5D11-BURST' + } + ] + + validation.check_same_burst_ids('', valid_case) + with raises(validation.GranuleValidationError, match=r'.*do not have the same burst id.*'): + validation.check_same_burst_ids('', invalid_case) + + +def test_check_valid_polarizations(): + valid_case = [ + { + 'name': 'S1_136231_IW2_20200604T022312_VV_7C85-BURST' + }, + { + 'name': 'S1_136231_IW2_20200616T022313_VV_5D11-BURST' + } + ] + different_polarizations = [ + { + 'name': 'S1_136231_IW2_20200604T022312_VV_7C85-BURST' + }, + { + 'name': 'S1_136231_IW2_20200616T022313_HH_5D11-BURST' + } + ] + unsupported_polarizations = [ + { + 'name': 'S1_136231_IW2_20200604T022312_VH_7C85-BURST' + }, + { + 'name': 'S1_136231_IW2_20200616T022313_VH_5D11-BURST' + } + ] + + validation.check_valid_polarizations('', valid_case) + with raises(validation.GranuleValidationError, match=r'.*do not have the same polarization.*'): + validation.check_valid_polarizations('', different_polarizations) + with raises(validation.GranuleValidationError, match=r'.*Only VV and HH.*'): + validation.check_valid_polarizations('', unsupported_polarizations) + + def test_check_granules_exist(): granule_metadata = [ { From 7bf229d77b8bdcbc4ce74c737652b569915aaa1f Mon Sep 17 00:00:00 2001 From: Andrew Player Date: Thu, 24 Aug 2023 13:22:47 -0500 Subject: [PATCH 20/40] fixes for flake8 --- apps/api/src/hyp3_api/validation.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/apps/api/src/hyp3_api/validation.py b/apps/api/src/hyp3_api/validation.py index 16531ce93..41177c48c 100644 --- a/apps/api/src/hyp3_api/validation.py +++ b/apps/api/src/hyp3_api/validation.py @@ -91,7 +91,9 @@ def check_same_burst_ids(job, granule_metadata): ref_burst_id = burst_ids[0] sec_burst_id = burst_ids[1] if ref_burst_id != sec_burst_id: - raise GranuleValidationError(f'The requested scenes do not have the same burst id: {ref_burst_id} and {sec_burst_id}') + raise GranuleValidationError( + f'The requested scenes do not have the same burst id: {ref_burst_id} and {sec_burst_id}' + ) def check_valid_polarizations(job, granule_metadata): @@ -99,7 +101,9 @@ def check_valid_polarizations(job, granule_metadata): ref_polarization = polarizations[0] sec_polarization = polarizations[1] if ref_polarization != sec_polarization: - raise GranuleValidationError(f'The requested scenes do not have the same polarization: {ref_polarization} and {sec_polarization}') + raise GranuleValidationError( + f'The requested scenes do not have the same polarization: {ref_polarization} and {sec_polarization}' + ) if ref_polarization != 'VV' and ref_polarization != 'HH': raise GranuleValidationError(f'Only VV and HH polarizations are currently supported, got: {ref_polarization}') @@ -128,4 +132,4 @@ def validate_jobs(jobs): job_granule_metadata = [granule for granule in granule_metadata if granule['name'] in get_granules([job])] module = sys.modules[__name__] validator = getattr(module, validator_name) - validator(job, job_granule_metadata) \ No newline at end of file + validator(job, job_granule_metadata) From fe86abac62e4353c3a1dfc45fe83793b1edf4899 Mon Sep 17 00:00:00 2001 From: Andrew Player Date: Thu, 24 Aug 2023 13:25:42 -0500 Subject: [PATCH 21/40] updated changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e5c662655..b629fae98 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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). +## [3.10.7] +### Changed +- The `INSAR_ISCE_BURST` job type now validates that polarizations and burst ids are the same. + ## [3.10.4] ### Changed - The `hyp3-edc-uat` deployment now uses the latest Earthdata Cloud AMI with additional software installed. From 378b7cec93fb7a2b6c96110b6196d5a32213deb5 Mon Sep 17 00:00:00 2001 From: Andrew Player Date: Thu, 24 Aug 2023 13:37:00 -0500 Subject: [PATCH 22/40] Update apps/api/src/hyp3_api/validation.py Co-authored-by: Jake Herrmann --- apps/api/src/hyp3_api/validation.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/apps/api/src/hyp3_api/validation.py b/apps/api/src/hyp3_api/validation.py index 41177c48c..99bb6cf17 100644 --- a/apps/api/src/hyp3_api/validation.py +++ b/apps/api/src/hyp3_api/validation.py @@ -87,9 +87,7 @@ def check_dem_coverage(job, granule_metadata): def check_same_burst_ids(job, granule_metadata): - burst_ids = [g['name'].split('_')[1] for g in granule_metadata] - ref_burst_id = burst_ids[0] - sec_burst_id = burst_ids[1] + ref_burst_id, sec_burst_id = [granule['name'].split('_')[1] for granule in granule_metadata] if ref_burst_id != sec_burst_id: raise GranuleValidationError( f'The requested scenes do not have the same burst id: {ref_burst_id} and {sec_burst_id}' From 68875cc0ba619a4a5a76621611038e86f7956bea Mon Sep 17 00:00:00 2001 From: Andrew Player Date: Thu, 24 Aug 2023 13:37:16 -0500 Subject: [PATCH 23/40] Update apps/api/src/hyp3_api/validation.py Co-authored-by: Jake Herrmann --- apps/api/src/hyp3_api/validation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/api/src/hyp3_api/validation.py b/apps/api/src/hyp3_api/validation.py index 99bb6cf17..c679ee9c0 100644 --- a/apps/api/src/hyp3_api/validation.py +++ b/apps/api/src/hyp3_api/validation.py @@ -90,7 +90,7 @@ def check_same_burst_ids(job, granule_metadata): ref_burst_id, sec_burst_id = [granule['name'].split('_')[1] for granule in granule_metadata] if ref_burst_id != sec_burst_id: raise GranuleValidationError( - f'The requested scenes do not have the same burst id: {ref_burst_id} and {sec_burst_id}' + f'The requested scenes do not have the same burst ID: {ref_burst_id} and {sec_burst_id}' ) From c0f3418af307bfb180eabd11b6ce0e4c71e46ac0 Mon Sep 17 00:00:00 2001 From: Andrew Player Date: Thu, 24 Aug 2023 13:40:14 -0500 Subject: [PATCH 24/40] Update apps/api/src/hyp3_api/validation.py Co-authored-by: Jake Herrmann --- apps/api/src/hyp3_api/validation.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/apps/api/src/hyp3_api/validation.py b/apps/api/src/hyp3_api/validation.py index c679ee9c0..8a6b2507b 100644 --- a/apps/api/src/hyp3_api/validation.py +++ b/apps/api/src/hyp3_api/validation.py @@ -95,9 +95,7 @@ def check_same_burst_ids(job, granule_metadata): def check_valid_polarizations(job, granule_metadata): - polarizations = [g['name'].split('_')[4] for g in granule_metadata] - ref_polarization = polarizations[0] - sec_polarization = polarizations[1] + ref_polarization, sec_polarization = [granule['name'].split('_')[4] for granule in granule_metadata] if ref_polarization != sec_polarization: raise GranuleValidationError( f'The requested scenes do not have the same polarization: {ref_polarization} and {sec_polarization}' From 2e4f31134b2a3a9935d2a9657829b01f8704eea0 Mon Sep 17 00:00:00 2001 From: Andrew Player Date: Thu, 24 Aug 2023 13:40:21 -0500 Subject: [PATCH 25/40] Update tests/test_api/test_validation.py Co-authored-by: Jake Herrmann --- tests/test_api/test_validation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_api/test_validation.py b/tests/test_api/test_validation.py index 54be687a2..0b2a46531 100644 --- a/tests/test_api/test_validation.py +++ b/tests/test_api/test_validation.py @@ -161,7 +161,7 @@ def test_check_same_burst_ids(): ] validation.check_same_burst_ids('', valid_case) - with raises(validation.GranuleValidationError, match=r'.*do not have the same burst id.*'): + with raises(validation.GranuleValidationError, match=r'.*do not have the same burst ID.*'): validation.check_same_burst_ids('', invalid_case) From b2c17a686cfd58e3fd0d71c925cb8a359f0a475d Mon Sep 17 00:00:00 2001 From: Andrew Player Date: Thu, 24 Aug 2023 13:48:38 -0500 Subject: [PATCH 26/40] Update tests/test_api/test_validation.py Co-authored-by: Jake Herrmann --- tests/test_api/test_validation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_api/test_validation.py b/tests/test_api/test_validation.py index 0b2a46531..cd6dff664 100644 --- a/tests/test_api/test_validation.py +++ b/tests/test_api/test_validation.py @@ -160,7 +160,7 @@ def test_check_same_burst_ids(): } ] - validation.check_same_burst_ids('', valid_case) + validation.check_same_burst_ids(None, valid_case) with raises(validation.GranuleValidationError, match=r'.*do not have the same burst ID.*'): validation.check_same_burst_ids('', invalid_case) From 14b748b2f47f1295476630633dddebd2986f4cf5 Mon Sep 17 00:00:00 2001 From: Andrew Player Date: Thu, 24 Aug 2023 13:48:44 -0500 Subject: [PATCH 27/40] Update tests/test_api/test_validation.py Co-authored-by: Jake Herrmann --- tests/test_api/test_validation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_api/test_validation.py b/tests/test_api/test_validation.py index cd6dff664..0dbf24bbd 100644 --- a/tests/test_api/test_validation.py +++ b/tests/test_api/test_validation.py @@ -162,7 +162,7 @@ def test_check_same_burst_ids(): validation.check_same_burst_ids(None, valid_case) with raises(validation.GranuleValidationError, match=r'.*do not have the same burst ID.*'): - validation.check_same_burst_ids('', invalid_case) + validation.check_same_burst_ids(None, invalid_case) def test_check_valid_polarizations(): From ea30ed244001dd78e0d8f468a258153382a5f493 Mon Sep 17 00:00:00 2001 From: Andrew Player Date: Thu, 24 Aug 2023 13:48:52 -0500 Subject: [PATCH 28/40] Update tests/test_api/test_validation.py Co-authored-by: Jake Herrmann --- tests/test_api/test_validation.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/test_api/test_validation.py b/tests/test_api/test_validation.py index 0dbf24bbd..1349c6dfd 100644 --- a/tests/test_api/test_validation.py +++ b/tests/test_api/test_validation.py @@ -191,11 +191,11 @@ def test_check_valid_polarizations(): } ] - validation.check_valid_polarizations('', valid_case) + validation.check_valid_polarizations(None, valid_case) with raises(validation.GranuleValidationError, match=r'.*do not have the same polarization.*'): - validation.check_valid_polarizations('', different_polarizations) + validation.check_valid_polarizations(None, different_polarizations) with raises(validation.GranuleValidationError, match=r'.*Only VV and HH.*'): - validation.check_valid_polarizations('', unsupported_polarizations) + validation.check_valid_polarizations(None, unsupported_polarizations) def test_check_granules_exist(): From 6e356a8d5422c02070bb033f0e3a9e8aa055dab9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 24 Aug 2023 19:14:15 +0000 Subject: [PATCH 29/40] Bump actions/checkout from 3.5.3 to 3.6.0 Bumps [actions/checkout](https://github.com/actions/checkout) from 3.5.3 to 3.6.0. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3.5.3...v3.6.0) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/deploy-daac.yml | 2 +- .github/workflows/deploy-enterprise-test.yml | 2 +- .github/workflows/deploy-enterprise.yml | 2 +- .github/workflows/release-template-comment.yml | 2 +- .github/workflows/static-analysis.yml | 10 +++++----- .github/workflows/tests.yml | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/deploy-daac.yml b/.github/workflows/deploy-daac.yml index a42e4468a..0c96fd3d9 100644 --- a/.github/workflows/deploy-daac.yml +++ b/.github/workflows/deploy-daac.yml @@ -60,7 +60,7 @@ jobs: url: https://${{ matrix.domain }} steps: - - uses: actions/checkout@v3.5.3 + - uses: actions/checkout@v3.6.0 - uses: aws-actions/configure-aws-credentials@v2 with: diff --git a/.github/workflows/deploy-enterprise-test.yml b/.github/workflows/deploy-enterprise-test.yml index 12af19354..8bc5dc4a8 100644 --- a/.github/workflows/deploy-enterprise-test.yml +++ b/.github/workflows/deploy-enterprise-test.yml @@ -45,7 +45,7 @@ jobs: url: https://${{ matrix.domain }} steps: - - uses: actions/checkout@v3.5.3 + - uses: actions/checkout@v3.6.0 - uses: aws-actions/configure-aws-credentials@v2 with: diff --git a/.github/workflows/deploy-enterprise.yml b/.github/workflows/deploy-enterprise.yml index 9279c1934..8a7449aad 100644 --- a/.github/workflows/deploy-enterprise.yml +++ b/.github/workflows/deploy-enterprise.yml @@ -204,7 +204,7 @@ jobs: url: https://${{ matrix.domain }} steps: - - uses: actions/checkout@v3.5.3 + - uses: actions/checkout@v3.6.0 - uses: aws-actions/configure-aws-credentials@v2 with: diff --git a/.github/workflows/release-template-comment.yml b/.github/workflows/release-template-comment.yml index 67c003cd8..866ce1af4 100644 --- a/.github/workflows/release-template-comment.yml +++ b/.github/workflows/release-template-comment.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest name: Add a comment with the release template steps: - - uses: actions/checkout@v3.5.3 + - uses: actions/checkout@v3.6.0 - name: Comment PR uses: thollander/actions-comment-pull-request@v2 diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index bbb8c73cc..529f33dce 100644 --- 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/checkout@v3.5.3 + - uses: actions/checkout@v3.6.0 - uses: actions/setup-python@v4 with: python-version: 3.9 @@ -23,7 +23,7 @@ jobs: matrix: security_environment: [ASF, EDC, JPL, JPL-public] steps: - - uses: actions/checkout@v3.5.3 + - uses: actions/checkout@v3.6.0 - uses: actions/setup-python@v4 with: python-version: 3.9 @@ -37,7 +37,7 @@ jobs: openapi-spec-validator: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3.5.3 + - uses: actions/checkout@v3.6.0 - uses: actions/setup-python@v4 with: python-version: 3.9 @@ -50,7 +50,7 @@ jobs: statelint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3.5.3 + - uses: actions/checkout@v3.6.0 - uses: ruby/setup-ruby@v1 with: ruby-version: 2.7 @@ -70,7 +70,7 @@ jobs: snyk: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3.5.3 + - uses: actions/checkout@v3.6.0 - uses: snyk/actions/setup@0.4.0 - uses: actions/setup-python@v4 with: diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 1b7c1850d..917398c6a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3.5.3 + - uses: actions/checkout@v3.6.0 - uses: actions/setup-python@v4 with: From ae656f287af29de418524309e656fc63e41f34a4 Mon Sep 17 00:00:00 2001 From: Joseph H Kennedy Date: Thu, 24 Aug 2023 15:43:04 -0800 Subject: [PATCH 30/40] cutover to On Demand instances for JPL deployments --- CHANGELOG.md | 5 +++++ apps/compute-cf.yml.j2 | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 59f9fe9ae..08de50d90 100644 --- 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). +## [3.10.8] +### Changed +- HyP3 deployments at JPL now use On Demand instances instead of Spot instances to prevent `INSAR_ISCE` jobs from being interrupted. + This *should* be a temporary change. + ## [3.10.7] ### Changed - The `INSAR_ISCE_BURST` job type now validates that polarizations and burst ids are the same. diff --git a/apps/compute-cf.yml.j2 b/apps/compute-cf.yml.j2 index ae04fbb60..cd977fe97 100644 --- a/apps/compute-cf.yml.j2 +++ b/apps/compute-cf.yml.j2 @@ -68,8 +68,8 @@ Resources: ServiceRole: !GetAtt BatchServiceRole.Arn Type: MANAGED ComputeResources: - Type: SPOT - AllocationStrategy: SPOT_CAPACITY_OPTIMIZED + Type: {{ EC2 if security_environment in ('JPL', 'JPL-public') else SPOT }} + AllocationStrategy: {{ BEST_FIT_PROGRESSIVE if security_environment in ('JPL', 'JPL-public') else SPOT_CAPACITY_OPTIMIZED }} MinvCpus: 0 MaxvCpus: !Ref MaxvCpus InstanceTypes: !Ref InstanceTypes From d58899a644733a3006a1e09a60fb49dec8039fbc Mon Sep 17 00:00:00 2001 From: Joseph H Kennedy Date: Thu, 24 Aug 2023 15:45:58 -0800 Subject: [PATCH 31/40] fix jinja -- strings not vars --- apps/compute-cf.yml.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/compute-cf.yml.j2 b/apps/compute-cf.yml.j2 index cd977fe97..670ce3bd1 100644 --- a/apps/compute-cf.yml.j2 +++ b/apps/compute-cf.yml.j2 @@ -68,8 +68,8 @@ Resources: ServiceRole: !GetAtt BatchServiceRole.Arn Type: MANAGED ComputeResources: - Type: {{ EC2 if security_environment in ('JPL', 'JPL-public') else SPOT }} - AllocationStrategy: {{ BEST_FIT_PROGRESSIVE if security_environment in ('JPL', 'JPL-public') else SPOT_CAPACITY_OPTIMIZED }} + Type: {{ 'EC2' if security_environment in ('JPL', 'JPL-public') else 'SPOT' }} + AllocationStrategy: {{ 'BEST_FIT_PROGRESSIVE' if security_environment in ('JPL', 'JPL-public') else 'SPOT_CAPACITY_OPTIMIZED' }} MinvCpus: 0 MaxvCpus: !Ref MaxvCpus InstanceTypes: !Ref InstanceTypes From 22731352656afb47af5688bdb1dbf8447380a947 Mon Sep 17 00:00:00 2001 From: Joseph H Kennedy Date: Thu, 24 Aug 2023 15:51:21 -0800 Subject: [PATCH 32/40] connect type and allocation strategy together --- apps/compute-cf.yml.j2 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/apps/compute-cf.yml.j2 b/apps/compute-cf.yml.j2 index 670ce3bd1..48721a7f4 100644 --- a/apps/compute-cf.yml.j2 +++ b/apps/compute-cf.yml.j2 @@ -68,8 +68,13 @@ Resources: ServiceRole: !GetAtt BatchServiceRole.Arn Type: MANAGED ComputeResources: - Type: {{ 'EC2' if security_environment in ('JPL', 'JPL-public') else 'SPOT' }} - AllocationStrategy: {{ 'BEST_FIT_PROGRESSIVE' if security_environment in ('JPL', 'JPL-public') else 'SPOT_CAPACITY_OPTIMIZED' }} + {% if security_environment in ('JPL', 'JPL-public') %} + Type: EC2 + AllocationStrategy: BEST_FIT_PROGRESSIVE + {% else %} + Type: SPOT + AllocationStrategy: SPOT_CAPACITY_OPTIMIZED + {% endif %} MinvCpus: 0 MaxvCpus: !Ref MaxvCpus InstanceTypes: !Ref InstanceTypes From 963ce6c509d6ad1d3604523bcdfa10e552f3bc4a Mon Sep 17 00:00:00 2001 From: Jake Herrmann Date: Mon, 28 Aug 2023 11:21:53 -0800 Subject: [PATCH 33/40] Specify jwt auth public key as github secret --- .github/actions/deploy-hyp3/action.yml | 4 ++++ .github/workflows/deploy-daac.yml | 1 + .github/workflows/deploy-enterprise-test.yml | 1 + .github/workflows/deploy-enterprise.yml | 1 + CHANGELOG.md | 4 ++++ apps/main-cf.yml.j2 | 3 +-- 6 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/actions/deploy-hyp3/action.yml b/.github/actions/deploy-hyp3/action.yml index 4f7817f10..946b9faa3 100644 --- a/.github/actions/deploy-hyp3/action.yml +++ b/.github/actions/deploy-hyp3/action.yml @@ -68,6 +68,9 @@ inputs: DISTRIBUTION_URL: description: "CloudFront Distribution URL for Earthdata Cloud environments" required: true + AUTH_PUBLIC_KEY: + description: "Public key for jwt auth provider" + required: true runs: using: "composite" @@ -111,6 +114,7 @@ runs: SecretArn='${{ inputs.SECRET_ARN }}' \ ImageTag='${{ inputs.IMAGE_TAG }}' \ ProductLifetimeInDays='${{ inputs.PRODUCT_LIFETIME }}' \ + AuthPublicKey='${{ inputs.AUTH_PUBLIC_KEY }}' \ $DOMAIN_NAME \ $CERTIFICATE_ARN \ $ORIGIN_ACCESS_IDENTITY_ID \ diff --git a/.github/workflows/deploy-daac.yml b/.github/workflows/deploy-daac.yml index a42e4468a..3f86280bb 100644 --- a/.github/workflows/deploy-daac.yml +++ b/.github/workflows/deploy-daac.yml @@ -98,6 +98,7 @@ jobs: AMI_ID: ${{ matrix.ami_id }} INSTANCE_TYPES: ${{ matrix.instance_types }} DISTRIBUTION_URL: ${{ matrix.distribution_url }} + AUTH_PUBLIC_KEY: ${{ secrets.AUTH_PUBLIC_KEY }} call-bump-version-workflow: if: github.ref == 'refs/heads/main' diff --git a/.github/workflows/deploy-enterprise-test.yml b/.github/workflows/deploy-enterprise-test.yml index 12af19354..5f92b5fd9 100644 --- a/.github/workflows/deploy-enterprise-test.yml +++ b/.github/workflows/deploy-enterprise-test.yml @@ -82,3 +82,4 @@ jobs: AMI_ID: ${{ matrix.ami_id }} INSTANCE_TYPES: ${{ matrix.instance_types }} DISTRIBUTION_URL: ${{ matrix.distribution_url }} + AUTH_PUBLIC_KEY: ${{ secrets.AUTH_PUBLIC_KEY }} diff --git a/.github/workflows/deploy-enterprise.yml b/.github/workflows/deploy-enterprise.yml index 9279c1934..ba7784af8 100644 --- a/.github/workflows/deploy-enterprise.yml +++ b/.github/workflows/deploy-enterprise.yml @@ -241,3 +241,4 @@ jobs: AMI_ID: ${{ matrix.ami_id }} INSTANCE_TYPES: ${{ matrix.instance_types }} DISTRIBUTION_URL: ${{ matrix.distribution_url }} + AUTH_PUBLIC_KEY: ${{ secrets.AUTH_PUBLIC_KEY }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 08de50d90..f1e6983ee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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). +## [3.10.9] +### Changed +- The public key for the JWT auth provider is now specified as a GitHub Secret. Fixes https://github.com/ASFHyP3/hyp3/issues/1765 + ## [3.10.8] ### Changed - HyP3 deployments at JPL now use On Demand instances instead of Spot instances to prevent `INSAR_ISCE` jobs from being interrupted. diff --git a/apps/main-cf.yml.j2 b/apps/main-cf.yml.j2 index b6fc5a263..48150da3d 100644 --- a/apps/main-cf.yml.j2 +++ b/apps/main-cf.yml.j2 @@ -23,9 +23,8 @@ Parameters: Default: 14 AuthPublicKey: - Description: Public key for jwt auth provider, if using https://auth.asf.alaska.edu then keep default. + Description: Public key for jwt auth provider Type: String - Default: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCnUEi9E+KNwH2hq0OXR4YyuVPQoNy6CtxQZv3VNXE+TRkmlo7nZbZXQp3JVQAvVaq+ixwNeSvCDI979UGA+SlUpryWy+XFJNAMDlIz9kBVYkTQdT8uFA8IN/fjN1jioOfgpbDJnSaKbb1/NsiTp9cesQQB0qiW5iUsGUfi3Y2x6r446KFt9oJqDzpR2MumKwmHX8tSe1AFUQG+5P4ncoZKS/2EPwfgTuiLW5f/9Duz4vt3peA/wJzBUWd5k9pOz44e2vAbwwLym2APpa7m740Ftyo2lXAZZkejg5MUUza1das5PjN7srt7jJwkBVqd27e1eKHAM4kzAMxcny3SBW2FC6pg6q04NZmPWN6A7y7GzLYJCBuqBwu4OWEzcc4KVkFyTVV+HGUlLX9n2iM4O5RML6+qx+DuK4Ml1kvEBObJ5ce7s4XaNFcg9XmymYiRpZUQmawD1/E5D1l1JNoXNNv8VlJ21c4QYWfmHIhKUF8/dwaRxl6GYd5CrdseEMZtjss88ncmml2cm+7tcpHHJi9Q/wsvAfV7RjFV5JW1PR2UPrATUpJxL+M9dFiGd0KROpqVQ4r6OLAnQQiOrWUquw/38a6JRPW4Y8MH3+JNJMm6MdhB8lFjEKzPic5qBzLJ4yQkOo8K/k0h0K88kT39tRIKVl4Upxvw3iPoVTDGWbkK1w== douglassorensen@FBK-3CGMD6R.local\n AuthAlgorithm: Description: Algorithm for jwt auth provider, if using https://auth.asf.alaska.edu then keep default. From a93f06139bef763fd962929f03a24d333b20e401 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Aug 2023 19:43:58 +0000 Subject: [PATCH 34/40] Bump boto3 from 1.28.32 to 1.28.36 Bumps [boto3](https://github.com/boto/boto3) from 1.28.32 to 1.28.36. - [Release notes](https://github.com/boto/boto3/releases) - [Changelog](https://github.com/boto/boto3/blob/develop/CHANGELOG.rst) - [Commits](https://github.com/boto/boto3/compare/1.28.32...1.28.36) --- updated-dependencies: - dependency-name: boto3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-all.txt | 2 +- requirements-apps-start-execution-manager.txt | 2 +- requirements-apps-start-execution-worker.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements-all.txt b/requirements-all.txt index 8a688ca23..c76bdb9a8 100644 --- a/requirements-all.txt +++ b/requirements-all.txt @@ -6,7 +6,7 @@ -r requirements-apps-start-execution-manager.txt -r requirements-apps-start-execution-worker.txt -r requirements-apps-update-db.txt -boto3==1.28.32 +boto3==1.28.36 jinja2==3.1.2 moto[dynamodb]==4.2.0 pytest==7.4.0 diff --git a/requirements-apps-start-execution-manager.txt b/requirements-apps-start-execution-manager.txt index cb132b532..5e08ac027 100644 --- a/requirements-apps-start-execution-manager.txt +++ b/requirements-apps-start-execution-manager.txt @@ -1,3 +1,3 @@ -boto3==1.28.32 +boto3==1.28.36 ./lib/dynamo/ ./lib/lambda_logging/ diff --git a/requirements-apps-start-execution-worker.txt b/requirements-apps-start-execution-worker.txt index 8f41dce14..e7a048d30 100644 --- a/requirements-apps-start-execution-worker.txt +++ b/requirements-apps-start-execution-worker.txt @@ -1,2 +1,2 @@ -boto3==1.28.32 +boto3==1.28.36 ./lib/lambda_logging/ From 61a9b02d0622c76e49a6894419d0509d15d9ae54 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 29 Aug 2023 19:39:12 +0000 Subject: [PATCH 35/40] Bump ASFHyP3/actions from 0.8.1 to 0.8.2 Bumps [ASFHyP3/actions](https://github.com/asfhyp3/actions) from 0.8.1 to 0.8.2. - [Release notes](https://github.com/asfhyp3/actions/releases) - [Changelog](https://github.com/ASFHyP3/actions/blob/develop/CHANGELOG.md) - [Commits](https://github.com/asfhyp3/actions/compare/v0.8.1...v0.8.2) --- updated-dependencies: - dependency-name: ASFHyP3/actions dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/changelog.yml | 2 +- .github/workflows/create-jira-issue.yml | 2 +- .github/workflows/deploy-daac.yml | 2 +- .github/workflows/labeled-pr.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/static-analysis.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 656e4a540..e08085da6 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -13,6 +13,6 @@ on: jobs: call-changelog-check-workflow: - uses: ASFHyP3/actions/.github/workflows/reusable-changelog-check.yml@v0.8.1 + uses: ASFHyP3/actions/.github/workflows/reusable-changelog-check.yml@v0.8.2 secrets: USER_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/create-jira-issue.yml b/.github/workflows/create-jira-issue.yml index a2ee3bb1a..3615af153 100644 --- a/.github/workflows/create-jira-issue.yml +++ b/.github/workflows/create-jira-issue.yml @@ -6,7 +6,7 @@ on: jobs: call-create-jira-issue-workflow: - uses: ASFHyP3/actions/.github/workflows/reusable-create-jira-issue.yml@v0.8.1 + uses: ASFHyP3/actions/.github/workflows/reusable-create-jira-issue.yml@v0.8.2 secrets: JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }} JIRA_USER_EMAIL: ${{ secrets.JIRA_USER_EMAIL }} diff --git a/.github/workflows/deploy-daac.yml b/.github/workflows/deploy-daac.yml index 3f86280bb..bc18397af 100644 --- a/.github/workflows/deploy-daac.yml +++ b/.github/workflows/deploy-daac.yml @@ -103,6 +103,6 @@ jobs: call-bump-version-workflow: if: github.ref == 'refs/heads/main' needs: deploy - uses: ASFHyP3/actions/.github/workflows/reusable-bump-version.yml@v0.8.1 + uses: ASFHyP3/actions/.github/workflows/reusable-bump-version.yml@v0.8.2 secrets: USER_TOKEN: ${{ secrets.TOOLS_BOT_PAK }} diff --git a/.github/workflows/labeled-pr.yml b/.github/workflows/labeled-pr.yml index c00df6335..ee8a5f5ea 100644 --- a/.github/workflows/labeled-pr.yml +++ b/.github/workflows/labeled-pr.yml @@ -12,4 +12,4 @@ on: jobs: call-labeled-pr-check-workflow: - uses: ASFHyP3/actions/.github/workflows/reusable-labeled-pr-check.yml@v0.8.1 + uses: ASFHyP3/actions/.github/workflows/reusable-labeled-pr-check.yml@v0.8.2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7c1c240e6..e83e1a127 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,7 +7,7 @@ on: jobs: call-release-workflow: - uses: ASFHyP3/actions/.github/workflows/reusable-release.yml@v0.8.1 + uses: ASFHyP3/actions/.github/workflows/reusable-release.yml@v0.8.2 with: release_prefix: HyP3 secrets: diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index bbb8c73cc..122e5a90c 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -87,4 +87,4 @@ jobs: snyk iac test --severity-threshold=high call-secrets-analysis-workflow: - uses: ASFHyP3/actions/.github/workflows/reusable-secrets-analysis.yml@v0.8.1 + uses: ASFHyP3/actions/.github/workflows/reusable-secrets-analysis.yml@v0.8.2 From 8c9e77a4f8caf731ca70b60a0bbf2de651ae472e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 29 Aug 2023 22:12:16 +0000 Subject: [PATCH 36/40] Bump boto3 from 1.28.36 to 1.28.37 Bumps [boto3](https://github.com/boto/boto3) from 1.28.36 to 1.28.37. - [Release notes](https://github.com/boto/boto3/releases) - [Changelog](https://github.com/boto/boto3/blob/develop/CHANGELOG.rst) - [Commits](https://github.com/boto/boto3/compare/1.28.36...1.28.37) --- updated-dependencies: - dependency-name: boto3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-all.txt | 2 +- requirements-apps-start-execution-manager.txt | 2 +- requirements-apps-start-execution-worker.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements-all.txt b/requirements-all.txt index c76bdb9a8..6877910e1 100644 --- a/requirements-all.txt +++ b/requirements-all.txt @@ -6,7 +6,7 @@ -r requirements-apps-start-execution-manager.txt -r requirements-apps-start-execution-worker.txt -r requirements-apps-update-db.txt -boto3==1.28.36 +boto3==1.28.37 jinja2==3.1.2 moto[dynamodb]==4.2.0 pytest==7.4.0 diff --git a/requirements-apps-start-execution-manager.txt b/requirements-apps-start-execution-manager.txt index 5e08ac027..078af5628 100644 --- a/requirements-apps-start-execution-manager.txt +++ b/requirements-apps-start-execution-manager.txt @@ -1,3 +1,3 @@ -boto3==1.28.36 +boto3==1.28.37 ./lib/dynamo/ ./lib/lambda_logging/ diff --git a/requirements-apps-start-execution-worker.txt b/requirements-apps-start-execution-worker.txt index e7a048d30..d08e8095b 100644 --- a/requirements-apps-start-execution-worker.txt +++ b/requirements-apps-start-execution-worker.txt @@ -1,2 +1,2 @@ -boto3==1.28.36 +boto3==1.28.37 ./lib/lambda_logging/ From d840a0b37f1e67d203d2e63def14b50ef635bcac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 29 Aug 2023 22:14:38 +0000 Subject: [PATCH 37/40] Bump aws-actions/configure-aws-credentials from 2 to 3 Bumps [aws-actions/configure-aws-credentials](https://github.com/aws-actions/configure-aws-credentials) from 2 to 3. - [Release notes](https://github.com/aws-actions/configure-aws-credentials/releases) - [Changelog](https://github.com/aws-actions/configure-aws-credentials/blob/main/CHANGELOG.md) - [Commits](https://github.com/aws-actions/configure-aws-credentials/compare/v2...v3) --- updated-dependencies: - dependency-name: aws-actions/configure-aws-credentials dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/deploy-daac.yml | 2 +- .github/workflows/deploy-enterprise-test.yml | 2 +- .github/workflows/deploy-enterprise.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy-daac.yml b/.github/workflows/deploy-daac.yml index 8d09e5c81..91e3894b4 100644 --- a/.github/workflows/deploy-daac.yml +++ b/.github/workflows/deploy-daac.yml @@ -62,7 +62,7 @@ jobs: steps: - uses: actions/checkout@v3.6.0 - - uses: aws-actions/configure-aws-credentials@v2 + - uses: aws-actions/configure-aws-credentials@v3 with: aws-access-key-id: ${{ secrets.V2_AWS_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.V2_AWS_SECRET_ACCESS_KEY }} diff --git a/.github/workflows/deploy-enterprise-test.yml b/.github/workflows/deploy-enterprise-test.yml index e662cb6b8..dd91da8f7 100644 --- a/.github/workflows/deploy-enterprise-test.yml +++ b/.github/workflows/deploy-enterprise-test.yml @@ -47,7 +47,7 @@ jobs: steps: - uses: actions/checkout@v3.6.0 - - uses: aws-actions/configure-aws-credentials@v2 + - uses: aws-actions/configure-aws-credentials@v3 with: aws-access-key-id: ${{ secrets.V2_AWS_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.V2_AWS_SECRET_ACCESS_KEY }} diff --git a/.github/workflows/deploy-enterprise.yml b/.github/workflows/deploy-enterprise.yml index d834bff03..3aa75e1af 100644 --- a/.github/workflows/deploy-enterprise.yml +++ b/.github/workflows/deploy-enterprise.yml @@ -206,7 +206,7 @@ jobs: steps: - uses: actions/checkout@v3.6.0 - - uses: aws-actions/configure-aws-credentials@v2 + - uses: aws-actions/configure-aws-credentials@v3 with: aws-access-key-id: ${{ secrets.V2_AWS_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.V2_AWS_SECRET_ACCESS_KEY }} From d47c199d7f5d8e94174791830578757955c4a449 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 31 Aug 2023 19:21:13 +0000 Subject: [PATCH 38/40] Bump cfn-lint from 0.79.7 to 0.79.8 Bumps [cfn-lint](https://github.com/aws-cloudformation/cfn-python-lint) from 0.79.7 to 0.79.8. - [Release notes](https://github.com/aws-cloudformation/cfn-python-lint/releases) - [Changelog](https://github.com/aws-cloudformation/cfn-lint/blob/main/CHANGELOG.md) - [Commits](https://github.com/aws-cloudformation/cfn-python-lint/compare/v0.79.7...v0.79.8) --- updated-dependencies: - dependency-name: cfn-lint dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-all.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-all.txt b/requirements-all.txt index 6877910e1..8bfa39896 100644 --- a/requirements-all.txt +++ b/requirements-all.txt @@ -18,4 +18,4 @@ flake8-blind-except==0.2.1 flake8-builtins==2.1.0 setuptools==68.1.2 openapi-spec-validator==0.4.0 -cfn-lint==0.79.7 +cfn-lint==0.79.8 From 751436e5aff1ad5606c3ae9760b0f3e1d9465183 Mon Sep 17 00:00:00 2001 From: Andrew Johnston Date: Thu, 31 Aug 2023 15:25:20 -0800 Subject: [PATCH 39/40] set vcpus to zero in hyp3-tibet-jpl --- .github/workflows/deploy-enterprise.yml | 4 ++-- CHANGELOG.md | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy-enterprise.yml b/.github/workflows/deploy-enterprise.yml index d834bff03..890449846 100644 --- a/.github/workflows/deploy-enterprise.yml +++ b/.github/workflows/deploy-enterprise.yml @@ -55,8 +55,8 @@ jobs: quota: 0 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: 10000 - expanded_max_vcpus: 10000 + default_max_vcpus: 0 + expanded_max_vcpus: 0 required_surplus: 0 security_environment: JPL-public ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2/recommended/image_id diff --git a/CHANGELOG.md b/CHANGELOG.md index f1e6983ee..c9857392c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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). +## [3.10.10] +### Changed +- Reduced vCPU limits for `hyp3-tibet-jpl` to 0 from 10,000. + ## [3.10.9] ### Changed - The public key for the JWT auth provider is now specified as a GitHub Secret. Fixes https://github.com/ASFHyP3/hyp3/issues/1765 From b4fe4747881617920caa7421b40396fab34b935d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 31 Aug 2023 23:26:47 +0000 Subject: [PATCH 40/40] Bump boto3 from 1.28.37 to 1.28.39 Bumps [boto3](https://github.com/boto/boto3) from 1.28.37 to 1.28.39. - [Release notes](https://github.com/boto/boto3/releases) - [Changelog](https://github.com/boto/boto3/blob/develop/CHANGELOG.rst) - [Commits](https://github.com/boto/boto3/compare/1.28.37...1.28.39) --- updated-dependencies: - dependency-name: boto3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-all.txt | 2 +- requirements-apps-start-execution-manager.txt | 2 +- requirements-apps-start-execution-worker.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements-all.txt b/requirements-all.txt index 8bfa39896..eee215047 100644 --- a/requirements-all.txt +++ b/requirements-all.txt @@ -6,7 +6,7 @@ -r requirements-apps-start-execution-manager.txt -r requirements-apps-start-execution-worker.txt -r requirements-apps-update-db.txt -boto3==1.28.37 +boto3==1.28.39 jinja2==3.1.2 moto[dynamodb]==4.2.0 pytest==7.4.0 diff --git a/requirements-apps-start-execution-manager.txt b/requirements-apps-start-execution-manager.txt index 078af5628..cfcd43d64 100644 --- a/requirements-apps-start-execution-manager.txt +++ b/requirements-apps-start-execution-manager.txt @@ -1,3 +1,3 @@ -boto3==1.28.37 +boto3==1.28.39 ./lib/dynamo/ ./lib/lambda_logging/ diff --git a/requirements-apps-start-execution-worker.txt b/requirements-apps-start-execution-worker.txt index d08e8095b..c1a7cfb59 100644 --- a/requirements-apps-start-execution-worker.txt +++ b/requirements-apps-start-execution-worker.txt @@ -1,2 +1,2 @@ -boto3==1.28.37 +boto3==1.28.39 ./lib/lambda_logging/