From 81cfcd54d90d514128c8a401a890df53871c8370 Mon Sep 17 00:00:00 2001 From: Jake Herrmann Date: Wed, 20 Nov 2024 13:18:24 -0900 Subject: [PATCH 01/37] add opera-disp-sandbox --- .../workflows/deploy-opera-disp-sandbox.yml | 80 +++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 .github/workflows/deploy-opera-disp-sandbox.yml diff --git a/.github/workflows/deploy-opera-disp-sandbox.yml b/.github/workflows/deploy-opera-disp-sandbox.yml new file mode 100644 index 000000000..7ec69e461 --- /dev/null +++ b/.github/workflows/deploy-opera-disp-sandbox.yml @@ -0,0 +1,80 @@ +name: Deploy OPERA-DISP Sandbox Stack to AWS + +on: + push: + branches: + - opera-disp-sandbox + +concurrency: ${{ github.workflow }}-${{ github.ref }} + +jobs: + deploy: + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - environment: hyp3-opera-disp-sandbox + domain: hyp3-opera-disp-sandbox.asf.alaska.edu + template_bucket: cf-templates-1hz9ldhhl4ahu-us-west-2 + image_tag: test + product_lifetime_in_days: 14 + default_credits_per_user: 0 + default_application_status: APPROVED + cost_profile: DEFAULT + deploy_ref: refs/heads/opera-disp-sandbox + job_files: >- + job_spec/INSAR_ISCE_BURST.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 + required_surplus: 0 + security_environment: ASF + ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2023/recommended/image_id + distribution_url: '' + + environment: + name: ${{ matrix.environment }} + url: https://${{ matrix.domain }} + + steps: + - uses: actions/checkout@v4.2.2 + + - 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 }} + aws-session-token: ${{ secrets.V2_AWS_SESSION_TOKEN }} + aws-region: ${{ secrets.AWS_REGION }} + + - uses: actions/setup-python@v5 + with: + python-version: 3.9 + + - uses: ./.github/actions/deploy-hyp3 + with: + TEMPLATE_BUCKET: ${{ matrix.template_bucket }} + STACK_NAME: ${{ matrix.environment }} + DOMAIN_NAME: ${{ matrix.domain }} + API_NAME: ${{ matrix.environment }} + CERTIFICATE_ARN: ${{ secrets.CERTIFICATE_ARN }} + IMAGE_TAG: ${{ matrix.image_tag }} + PRODUCT_LIFETIME: ${{ matrix.product_lifetime_in_days }} + VPC_ID: ${{ secrets.VPC_ID }} + SUBNET_IDS: ${{ secrets.SUBNET_IDS }} + SECRET_ARN: ${{ secrets.SECRET_ARN }} + CLOUDFORMATION_ROLE_ARN: ${{ secrets.CLOUDFORMATION_ROLE_ARN }} + DEFAULT_CREDITS_PER_USER: ${{ matrix.default_credits_per_user }} + DEFAULT_APPLICATION_STATUS: ${{ matrix.default_application_status }} + COST_PROFILE: ${{ matrix.cost_profile }} + JOB_FILES: ${{ matrix.job_files }} + DEFAULT_MAX_VCPUS: ${{ matrix.default_max_vcpus }} + EXPANDED_MAX_VCPUS: ${{ matrix.expanded_max_vcpus }} + MONTHLY_BUDGET: ${{ secrets.MONTHLY_BUDGET }} + REQUIRED_SURPLUS: ${{ matrix.required_surplus }} + ORIGIN_ACCESS_IDENTITY_ID: ${{ secrets.ORIGIN_ACCESS_IDENTITY_ID }} + SECURITY_ENVIRONMENT: ${{ matrix.security_environment }} + AMI_ID: ${{ matrix.ami_id }} + INSTANCE_TYPES: ${{ matrix.instance_types }} + DISTRIBUTION_URL: ${{ matrix.distribution_url }} + AUTH_PUBLIC_KEY: ${{ secrets.AUTH_PUBLIC_KEY }} From 42e0d6a008657001950d547b4a1bca414da84d6f Mon Sep 17 00:00:00 2001 From: Forrest Williams Date: Fri, 22 Nov 2024 14:28:30 -0600 Subject: [PATCH 02/37] add job spec for opera-disp-tms --- job_spec/OPERA_DISP_TMS.yml | 74 +++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 job_spec/OPERA_DISP_TMS.yml diff --git a/job_spec/OPERA_DISP_TMS.yml b/job_spec/OPERA_DISP_TMS.yml new file mode 100644 index 000000000..61e002cce --- /dev/null +++ b/job_spec/OPERA_DISP_TMS.yml @@ -0,0 +1,74 @@ +OPERA_DISP_TMS: + required_parameters: + - tile_type + - bounds + - orbit_direction + - start_date + - end_date + parameters: + tile_type: + description: Type of tile map to create + type: string + minLength: 8 + maxLength: 15 + enum: + - displacement + - secant_velocity + - velocity + example: displacement + bounds: + description: Integer bounds in format (minlon minlat maxlon maxlat) + type: array + minItems: 4 + maxItems: 4 + example: + - -121 + - 38 + - -120 + - 39 + orbit_direction: + description: Orbit direction of data + type: string + minLength: 9 + maxLength: 10 + enum: + - ascending + - descending + example: descending + start_date: + description: Start of secondary date range to generate a tile map for (%Y%m%d) + type: string + minLength: 8 + maxLength: 8 + example: 20200101 + end_date: + description: End of secondary date range to generate a tile map for (%Y%m%d) + type: string + minLength: 8 + maxLength: 8 + example: 20200814 + cost_profiles: + DEFAULT: + cost: 1.0 + validators: + - check_bounds_formatting + steps: + - name: '' + image: ghcr.io/asfhyp3/opera-disp/tms + command: + - Ref::tile_type + - Ref::bounds + - Ref::orbit_direction + - Ref::start_date + - Ref::end_date + - --bucket + - '!Ref Bucket' + - --bucket-prefix + - Ref::bucket_prefix + timeout: 10800 + compute_environment: Default + vcpu: 1 + memory: 31500 + secrets: + - EARTHDATA_USERNAME + - EARTHDATA_PASSWORD From bc34a60060b66dc963d463cc9ce2130cfed90e76 Mon Sep 17 00:00:00 2001 From: Forrest Williams Date: Fri, 22 Nov 2024 15:05:52 -0600 Subject: [PATCH 03/37] fix api schema --- job_spec/OPERA_DISP_TMS.yml | 79 ++++++++++++++++++++----------------- 1 file changed, 42 insertions(+), 37 deletions(-) diff --git a/job_spec/OPERA_DISP_TMS.yml b/job_spec/OPERA_DISP_TMS.yml index 61e002cce..bae4de3be 100644 --- a/job_spec/OPERA_DISP_TMS.yml +++ b/job_spec/OPERA_DISP_TMS.yml @@ -7,46 +7,51 @@ OPERA_DISP_TMS: - end_date parameters: tile_type: - description: Type of tile map to create - type: string - minLength: 8 - maxLength: 15 - enum: - - displacement - - secant_velocity - - velocity - example: displacement + api_schema: + description: Type of tile map to create + type: string + minLength: 8 + maxLength: 15 + enum: + - displacement + - secant_velocity + - velocity + example: displacement bounds: - description: Integer bounds in format (minlon minlat maxlon maxlat) - type: array - minItems: 4 - maxItems: 4 - example: - - -121 - - 38 - - -120 - - 39 + api_schema: + description: Integer bounds in format (minlon minlat maxlon maxlat) + type: array + minItems: 4 + maxItems: 4 + example: + - -121 + - 38 + - -120 + - 39 orbit_direction: - description: Orbit direction of data - type: string - minLength: 9 - maxLength: 10 - enum: - - ascending - - descending - example: descending + api_schema: + description: Orbit direction of data + type: string + minLength: 9 + maxLength: 10 + enum: + - ascending + - descending + example: descending start_date: - description: Start of secondary date range to generate a tile map for (%Y%m%d) - type: string - minLength: 8 - maxLength: 8 - example: 20200101 + api_schema: + description: Start of secondary date range to generate a tile map for (%Y%m%d) + type: string + minLength: 8 + maxLength: 8 + example: 20200101 end_date: - description: End of secondary date range to generate a tile map for (%Y%m%d) - type: string - minLength: 8 - maxLength: 8 - example: 20200814 + api_schema: + description: End of secondary date range to generate a tile map for (%Y%m%d) + type: string + minLength: 8 + maxLength: 8 + example: 20200814 cost_profiles: DEFAULT: cost: 1.0 @@ -54,7 +59,7 @@ OPERA_DISP_TMS: - check_bounds_formatting steps: - name: '' - image: ghcr.io/asfhyp3/opera-disp/tms + image: ghcr.io/asfhyp3/opera-disp-tms command: - Ref::tile_type - Ref::bounds From 472bad6b3531786c9023e1f1164c8845a6699a25 Mon Sep 17 00:00:00 2001 From: Forrest Williams Date: Fri, 22 Nov 2024 15:09:09 -0600 Subject: [PATCH 04/37] update changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e0bb9ef86..e4a4b1d05 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). +## [9.1.0] + +### Added +- A new `OPERA_DISP_TMS` job type + ## [9.0.1] ### Changed From 5d0f573ab89456444ae346c1dfcbef5de78d2f32 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 19:15:30 +0000 Subject: [PATCH 05/37] Bump boto3 from 1.35.63 to 1.35.68 Bumps [boto3](https://github.com/boto/boto3) from 1.35.63 to 1.35.68. - [Release notes](https://github.com/boto/boto3/releases) - [Commits](https://github.com/boto/boto3/compare/1.35.63...1.35.68) --- 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-disable-private-dns.txt | 2 +- requirements-apps-start-execution-manager.txt | 2 +- requirements-apps-start-execution-worker.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements-all.txt b/requirements-all.txt index eb75e8d0f..8b1f4327f 100644 --- 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.63 +boto3==1.35.68 jinja2==3.1.4 moto[dynamodb]==5.0.21 pytest==8.3.3 diff --git a/requirements-apps-disable-private-dns.txt b/requirements-apps-disable-private-dns.txt index 341163d40..361d8f9f0 100644 --- a/requirements-apps-disable-private-dns.txt +++ b/requirements-apps-disable-private-dns.txt @@ -1 +1 @@ -boto3==1.35.63 +boto3==1.35.68 diff --git a/requirements-apps-start-execution-manager.txt b/requirements-apps-start-execution-manager.txt index f6ecae12f..1c6812f81 100644 --- a/requirements-apps-start-execution-manager.txt +++ b/requirements-apps-start-execution-manager.txt @@ -1,3 +1,3 @@ -boto3==1.35.63 +boto3==1.35.68 ./lib/dynamo/ ./lib/lambda_logging/ diff --git a/requirements-apps-start-execution-worker.txt b/requirements-apps-start-execution-worker.txt index 60686fc66..154fc04ea 100644 --- a/requirements-apps-start-execution-worker.txt +++ b/requirements-apps-start-execution-worker.txt @@ -1,2 +1,2 @@ -boto3==1.35.63 +boto3==1.35.68 ./lib/lambda_logging/ From d401e5b327ebcad163c3c06e03a59ddb513f28fc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 19:15:38 +0000 Subject: [PATCH 06/37] Bump cfn-lint from 1.19.0 to 1.20.0 Bumps [cfn-lint](https://github.com/aws-cloudformation/cfn-lint) from 1.19.0 to 1.20.0. - [Release notes](https://github.com/aws-cloudformation/cfn-lint/releases) - [Changelog](https://github.com/aws-cloudformation/cfn-lint/blob/main/CHANGELOG.md) - [Commits](https://github.com/aws-cloudformation/cfn-lint/compare/v1.19.0...v1.20.0) --- updated-dependencies: - dependency-name: cfn-lint 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 eb75e8d0f..a185059c8 100644 --- a/requirements-all.txt +++ b/requirements-all.txt @@ -17,4 +17,4 @@ flake8-blind-except==0.2.1 flake8-builtins==2.5.0 setuptools==75.5.0 openapi-spec-validator==0.7.1 -cfn-lint==1.19.0 +cfn-lint==1.20.0 From 47db70ef9bed1c7cddaa18ab1fc4f611f27e26dd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 20:06:40 +0000 Subject: [PATCH 07/37] Bump setuptools from 75.5.0 to 75.6.0 Bumps [setuptools](https://github.com/pypa/setuptools) from 75.5.0 to 75.6.0. - [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/v75.5.0...v75.6.0) --- 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 53e67027a..f9ec9ac94 100644 --- a/requirements-all.txt +++ b/requirements-all.txt @@ -15,6 +15,6 @@ flake8==7.1.1 flake8-import-order==0.18.2 flake8-blind-except==0.2.1 flake8-builtins==2.5.0 -setuptools==75.5.0 +setuptools==75.6.0 openapi-spec-validator==0.7.1 cfn-lint==1.20.0 From a0fb2027f10413f9e55d2714425024b0d820485b Mon Sep 17 00:00:00 2001 From: Forrest Williams <31411324+forrestfwilliams@users.noreply.github.com> Date: Tue, 26 Nov 2024 08:34:20 -0600 Subject: [PATCH 08/37] Update job_spec/OPERA_DISP_TMS.yml Co-authored-by: Jake Herrmann --- job_spec/OPERA_DISP_TMS.yml | 93 +++++++++++++++++++------------------ 1 file changed, 47 insertions(+), 46 deletions(-) diff --git a/job_spec/OPERA_DISP_TMS.yml b/job_spec/OPERA_DISP_TMS.yml index bae4de3be..3cae3c478 100644 --- a/job_spec/OPERA_DISP_TMS.yml +++ b/job_spec/OPERA_DISP_TMS.yml @@ -6,52 +6,53 @@ OPERA_DISP_TMS: - start_date - end_date parameters: - tile_type: - api_schema: - description: Type of tile map to create - type: string - minLength: 8 - maxLength: 15 - enum: - - displacement - - secant_velocity - - velocity - example: displacement - bounds: - api_schema: - description: Integer bounds in format (minlon minlat maxlon maxlat) - type: array - minItems: 4 - maxItems: 4 - example: - - -121 - - 38 - - -120 - - 39 - orbit_direction: - api_schema: - description: Orbit direction of data - type: string - minLength: 9 - maxLength: 10 - enum: - - ascending - - descending - example: descending - start_date: - api_schema: - description: Start of secondary date range to generate a tile map for (%Y%m%d) - type: string - minLength: 8 - maxLength: 8 - example: 20200101 - end_date: - api_schema: - description: End of secondary date range to generate a tile map for (%Y%m%d) - type: string - minLength: 8 - maxLength: 8 - example: 20200814 + tile_type: + api_schema: + description: Type of tile map to create + type: string + enum: + - displacement + - secant_velocity + - velocity + example: displacement + bounds: + api_schema: + description: Integer bounds in EPSG:4326, formatted like (minlon minlat maxlon maxlat) + type: array + minItems: 4 + maxItems: 4 + example: + - -121 + - 38 + - -120 + - 39 + items: + type: integer + example: -121 + orbit_direction: + api_schema: + description: Orbit direction of data + type: string + enum: + - ascending + - descending + example: descending + start_date: + api_schema: + description: Start of secondary date range for which to generate a tile map (%Y%m%d) + type: string + pattern: "^\\d{8}$" + minLength: 8 + maxLength: 8 + example: 20200101 + end_date: + api_schema: + description: End of secondary date range for which to generate a tile map (%Y%m%d) + type: string + pattern: "^\\d{8}$" + minLength: 8 + maxLength: 8 + example: 20200814 cost_profiles: DEFAULT: cost: 1.0 From 5f454e134c4a439af12a86f0e39f91d99d52d1c5 Mon Sep 17 00:00:00 2001 From: Jake Herrmann Date: Tue, 26 Nov 2024 10:06:26 -0900 Subject: [PATCH 09/37] Update .github/workflows/deploy-opera-disp-sandbox.yml --- .github/workflows/deploy-opera-disp-sandbox.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-opera-disp-sandbox.yml b/.github/workflows/deploy-opera-disp-sandbox.yml index 7ec69e461..8ea0e58cb 100644 --- a/.github/workflows/deploy-opera-disp-sandbox.yml +++ b/.github/workflows/deploy-opera-disp-sandbox.yml @@ -3,7 +3,7 @@ name: Deploy OPERA-DISP Sandbox Stack to AWS on: push: branches: - - opera-disp-sandbox + - develop concurrency: ${{ github.workflow }}-${{ github.ref }} From 587398d7ac23dcef11b0a2656612064c7f08b8b6 Mon Sep 17 00:00:00 2001 From: Jake Herrmann Date: Tue, 26 Nov 2024 10:06:32 -0900 Subject: [PATCH 10/37] Update .github/workflows/deploy-opera-disp-sandbox.yml --- .github/workflows/deploy-opera-disp-sandbox.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-opera-disp-sandbox.yml b/.github/workflows/deploy-opera-disp-sandbox.yml index 8ea0e58cb..736e058b4 100644 --- a/.github/workflows/deploy-opera-disp-sandbox.yml +++ b/.github/workflows/deploy-opera-disp-sandbox.yml @@ -22,7 +22,7 @@ jobs: default_credits_per_user: 0 default_application_status: APPROVED cost_profile: DEFAULT - deploy_ref: refs/heads/opera-disp-sandbox + deploy_ref: refs/heads/develop job_files: >- job_spec/INSAR_ISCE_BURST.yml instance_types: r6id.xlarge,r6id.2xlarge,r6id.4xlarge,r6id.8xlarge,r6idn.xlarge,r6idn.2xlarge,r6idn.4xlarge,r6idn.8xlarge From a7be25ae3d70e758641e3b3245450e5c79a7a2c4 Mon Sep 17 00:00:00 2001 From: Jake Herrmann Date: Tue, 26 Nov 2024 10:06:58 -0900 Subject: [PATCH 11/37] Update .github/workflows/deploy-opera-disp-sandbox.yml --- .github/workflows/deploy-opera-disp-sandbox.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-opera-disp-sandbox.yml b/.github/workflows/deploy-opera-disp-sandbox.yml index 736e058b4..79bd24eac 100644 --- a/.github/workflows/deploy-opera-disp-sandbox.yml +++ b/.github/workflows/deploy-opera-disp-sandbox.yml @@ -24,7 +24,7 @@ jobs: cost_profile: DEFAULT deploy_ref: refs/heads/develop job_files: >- - job_spec/INSAR_ISCE_BURST.yml + job_spec/OPERA_DISP_TMS.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 From 2e98eb63636e5d3f316ec74eb38901bca6baec09 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2024 18:36:42 +0000 Subject: [PATCH 12/37] Bump pyjwt from 2.10.0 to 2.10.1 Bumps [pyjwt](https://github.com/jpadilla/pyjwt) from 2.10.0 to 2.10.1. - [Release notes](https://github.com/jpadilla/pyjwt/releases) - [Changelog](https://github.com/jpadilla/pyjwt/blob/master/CHANGELOG.rst) - [Commits](https://github.com/jpadilla/pyjwt/compare/2.10.0...2.10.1) --- updated-dependencies: - dependency-name: pyjwt dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- requirements-apps-api.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-apps-api.txt b/requirements-apps-api.txt index 93f63e77e..1fc1c300e 100644 --- a/requirements-apps-api.txt +++ b/requirements-apps-api.txt @@ -3,7 +3,7 @@ Flask-Cors==5.0.0 jsonschema==4.23.0 openapi-core==0.19.4 prance==23.6.21.0 -PyJWT==2.10.0 +PyJWT==2.10.1 requests==2.32.3 serverless_wsgi==3.0.5 shapely==2.0.6 From ba7b93540410b99afa0d66df4b5560490405b112 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2024 20:21:28 +0000 Subject: [PATCH 13/37] Bump cryptography from 43.0.3 to 44.0.0 Bumps [cryptography](https://github.com/pyca/cryptography) from 43.0.3 to 44.0.0. - [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pyca/cryptography/compare/43.0.3...44.0.0) --- updated-dependencies: - dependency-name: cryptography dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- requirements-apps-api-binary.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-apps-api-binary.txt b/requirements-apps-api-binary.txt index 75287dd9f..afd08f7b1 100644 --- a/requirements-apps-api-binary.txt +++ b/requirements-apps-api-binary.txt @@ -1 +1 @@ -cryptography==43.0.3 +cryptography==44.0.0 From 41bc7e9e9dc68a037a714f54e1b8e3825f1b1a09 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2024 20:21:46 +0000 Subject: [PATCH 14/37] Bump boto3 from 1.35.68 to 1.35.72 Bumps [boto3](https://github.com/boto/boto3) from 1.35.68 to 1.35.72. - [Release notes](https://github.com/boto/boto3/releases) - [Commits](https://github.com/boto/boto3/compare/1.35.68...1.35.72) --- 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-disable-private-dns.txt | 2 +- requirements-apps-start-execution-manager.txt | 2 +- requirements-apps-start-execution-worker.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements-all.txt b/requirements-all.txt index f9ec9ac94..6d2fdee64 100644 --- 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.68 +boto3==1.35.72 jinja2==3.1.4 moto[dynamodb]==5.0.21 pytest==8.3.3 diff --git a/requirements-apps-disable-private-dns.txt b/requirements-apps-disable-private-dns.txt index 361d8f9f0..e1e9d53d0 100644 --- a/requirements-apps-disable-private-dns.txt +++ b/requirements-apps-disable-private-dns.txt @@ -1 +1 @@ -boto3==1.35.68 +boto3==1.35.72 diff --git a/requirements-apps-start-execution-manager.txt b/requirements-apps-start-execution-manager.txt index 1c6812f81..bdf18d6a5 100644 --- a/requirements-apps-start-execution-manager.txt +++ b/requirements-apps-start-execution-manager.txt @@ -1,3 +1,3 @@ -boto3==1.35.68 +boto3==1.35.72 ./lib/dynamo/ ./lib/lambda_logging/ diff --git a/requirements-apps-start-execution-worker.txt b/requirements-apps-start-execution-worker.txt index 154fc04ea..7f387d327 100644 --- a/requirements-apps-start-execution-worker.txt +++ b/requirements-apps-start-execution-worker.txt @@ -1,2 +1,2 @@ -boto3==1.35.68 +boto3==1.35.72 ./lib/lambda_logging/ From 81aaef612abc155996687299fd0ea0428a60c239 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2024 20:21:52 +0000 Subject: [PATCH 15/37] Bump cfn-lint from 1.20.0 to 1.20.1 Bumps [cfn-lint](https://github.com/aws-cloudformation/cfn-lint) from 1.20.0 to 1.20.1. - [Release notes](https://github.com/aws-cloudformation/cfn-lint/releases) - [Changelog](https://github.com/aws-cloudformation/cfn-lint/blob/main/CHANGELOG.md) - [Commits](https://github.com/aws-cloudformation/cfn-lint/compare/v1.20.0...v1.20.1) --- 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 f9ec9ac94..58bef72f2 100644 --- a/requirements-all.txt +++ b/requirements-all.txt @@ -17,4 +17,4 @@ flake8-blind-except==0.2.1 flake8-builtins==2.5.0 setuptools==75.6.0 openapi-spec-validator==0.7.1 -cfn-lint==1.20.0 +cfn-lint==1.20.1 From 3b252fea51a2d7501db38d0b33884d4d2988cc3e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Dec 2024 01:30:15 +0000 Subject: [PATCH 16/37] Bump moto[dynamodb] from 5.0.21 to 5.0.22 Bumps [moto[dynamodb]](https://github.com/getmoto/moto) from 5.0.21 to 5.0.22. - [Release notes](https://github.com/getmoto/moto/releases) - [Changelog](https://github.com/getmoto/moto/blob/master/CHANGELOG.md) - [Commits](https://github.com/getmoto/moto/compare/5.0.21...5.0.22) --- 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 6d2fdee64..60cad6282 100644 --- a/requirements-all.txt +++ b/requirements-all.txt @@ -7,7 +7,7 @@ -r requirements-apps-update-db.txt boto3==1.35.72 jinja2==3.1.4 -moto[dynamodb]==5.0.21 +moto[dynamodb]==5.0.22 pytest==8.3.3 PyYAML==6.0.2 responses==0.25.3 From 1ebcc180246f5cf42254a95e1e81508c41fb1d52 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Dec 2024 01:33:38 +0000 Subject: [PATCH 17/37] Bump pytest from 8.3.3 to 8.3.4 Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.3.3 to 8.3.4. - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/8.3.3...8.3.4) --- updated-dependencies: - dependency-name: pytest 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 6e78733d5..6169911a0 100644 --- a/requirements-all.txt +++ b/requirements-all.txt @@ -8,7 +8,7 @@ boto3==1.35.72 jinja2==3.1.4 moto[dynamodb]==5.0.22 -pytest==8.3.3 +pytest==8.3.4 PyYAML==6.0.2 responses==0.25.3 flake8==7.1.1 From c194375db7a87a74e0a20ceaaca694726b19e85c Mon Sep 17 00:00:00 2001 From: Andrew Player Date: Tue, 3 Dec 2024 13:49:22 -0500 Subject: [PATCH 18/37] add more gpu instance types to SRG_GSLC --- job_spec/config/compute_environments.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/job_spec/config/compute_environments.yml b/job_spec/config/compute_environments.yml index 01de096b7..f24e538c3 100644 --- a/job_spec/config/compute_environments.yml +++ b/job_spec/config/compute_environments.yml @@ -5,7 +5,7 @@ compute_environments: # allocation_type # allocation_strategy SrgGslc: - instance_types: g6.2xlarge + instance_types: g6.2xlarge, g6.4xlarge, g6.8xlarge, g5.2xlarge, g5.4xlarge, g5.8xlarge, g6e.xlarge, g6e.2xlarge ami_id: ami-0729c079aae647cb3 # /aws/service/ecs/optimized-ami/amazon-linux-2/gpu/recommended/image_id AriaAutorift: instance_types: r6id.xlarge,r6id.2xlarge,r6id.4xlarge,r6id.8xlarge,r6idn.xlarge,r6idn.2xlarge,r6idn.4xlarge,r6idn.8xlarge From 5171bec866e36dcc5d5ec932af06527c4075da62 Mon Sep 17 00:00:00 2001 From: Andrew Player Date: Tue, 3 Dec 2024 13:50:38 -0500 Subject: [PATCH 19/37] updated changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e0bb9ef86..7326bb4d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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). +## [9.0.2] + +### Changed +- The `SRG_GSLC` job type can now use multiple GPU instance types from the G5, G6, and G6e instance families. + + ## [9.0.1] ### Changed From c0ec87afd210a2d057147910482359d46a632676 Mon Sep 17 00:00:00 2001 From: Andrew Player Date: Tue, 3 Dec 2024 14:09:13 -0500 Subject: [PATCH 20/37] add g4dn --- job_spec/config/compute_environments.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/job_spec/config/compute_environments.yml b/job_spec/config/compute_environments.yml index f24e538c3..645d11fbf 100644 --- a/job_spec/config/compute_environments.yml +++ b/job_spec/config/compute_environments.yml @@ -5,7 +5,7 @@ compute_environments: # allocation_type # allocation_strategy SrgGslc: - instance_types: g6.2xlarge, g6.4xlarge, g6.8xlarge, g5.2xlarge, g5.4xlarge, g5.8xlarge, g6e.xlarge, g6e.2xlarge + instance_types: g6.2xlarge, g6.4xlarge, g6.8xlarge, g5.2xlarge, g5.4xlarge, g5.8xlarge, g6e.xlarge, g6e.2xlarge, g4dn.2xlarge, g4dn.4xlarge ami_id: ami-0729c079aae647cb3 # /aws/service/ecs/optimized-ami/amazon-linux-2/gpu/recommended/image_id AriaAutorift: instance_types: r6id.xlarge,r6id.2xlarge,r6id.4xlarge,r6id.8xlarge,r6idn.xlarge,r6idn.2xlarge,r6idn.4xlarge,r6idn.8xlarge From 18c8ea367c2d3545754ceca71d24023ad53cc39d Mon Sep 17 00:00:00 2001 From: Andrew Player Date: Tue, 3 Dec 2024 14:09:50 -0500 Subject: [PATCH 21/37] update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7326bb4d8..332972fd5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [9.0.2] ### Changed -- The `SRG_GSLC` job type can now use multiple GPU instance types from the G5, G6, and G6e instance families. +- The `SrgGslc` custom compute environment now includes multiple GPU instance types from the G4dn, G5, G6, and G6e instance families. ## [9.0.1] From f584479a2acae184d04b283716cf3da955764119 Mon Sep 17 00:00:00 2001 From: Andrew Player Date: Tue, 3 Dec 2024 15:33:27 -0500 Subject: [PATCH 22/37] prune to available instances --- CHANGELOG.md | 2 +- job_spec/config/compute_environments.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 332972fd5..e3ccfcf5f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [9.0.2] ### Changed -- The `SrgGslc` custom compute environment now includes multiple GPU instance types from the G4dn, G5, G6, and G6e instance families. +- The `SrgGslc` custom compute environment now includes multiple GPU instance types from the G4dn, G5, and G6 instance families. ## [9.0.1] diff --git a/job_spec/config/compute_environments.yml b/job_spec/config/compute_environments.yml index 645d11fbf..42bc6d27a 100644 --- a/job_spec/config/compute_environments.yml +++ b/job_spec/config/compute_environments.yml @@ -5,7 +5,7 @@ compute_environments: # allocation_type # allocation_strategy SrgGslc: - instance_types: g6.2xlarge, g6.4xlarge, g6.8xlarge, g5.2xlarge, g5.4xlarge, g5.8xlarge, g6e.xlarge, g6e.2xlarge, g4dn.2xlarge, g4dn.4xlarge + instance_types: g6.2xlarge, g6.4xlarge, g5.2xlarge, g5.4xlarge, g5.8xlarge, g4dn.2xlarge ami_id: ami-0729c079aae647cb3 # /aws/service/ecs/optimized-ami/amazon-linux-2/gpu/recommended/image_id AriaAutorift: instance_types: r6id.xlarge,r6id.2xlarge,r6id.4xlarge,r6id.8xlarge,r6idn.xlarge,r6idn.2xlarge,r6idn.4xlarge,r6idn.8xlarge From d41f24bf8bd262a8191081abfeedaf6a9981f5d4 Mon Sep 17 00:00:00 2001 From: Andrew Player Date: Tue, 3 Dec 2024 15:45:59 -0500 Subject: [PATCH 23/37] no spaces --- job_spec/config/compute_environments.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/job_spec/config/compute_environments.yml b/job_spec/config/compute_environments.yml index 42bc6d27a..a580d6d3a 100644 --- a/job_spec/config/compute_environments.yml +++ b/job_spec/config/compute_environments.yml @@ -5,7 +5,7 @@ compute_environments: # allocation_type # allocation_strategy SrgGslc: - instance_types: g6.2xlarge, g6.4xlarge, g5.2xlarge, g5.4xlarge, g5.8xlarge, g4dn.2xlarge + instance_types: g6.2xlarge,g6.4xlarge,g5.2xlarge,g5.4xlarge,g5.8xlarge,g6e.xlarge,g6e.2xlarge,g4dn.2xlarge,g4dn.4xlarge ami_id: ami-0729c079aae647cb3 # /aws/service/ecs/optimized-ami/amazon-linux-2/gpu/recommended/image_id AriaAutorift: instance_types: r6id.xlarge,r6id.2xlarge,r6id.4xlarge,r6id.8xlarge,r6idn.xlarge,r6idn.2xlarge,r6idn.4xlarge,r6idn.8xlarge From 9986749e626b6a486fd7c90f901148eb24b72b2a Mon Sep 17 00:00:00 2001 From: Jake Herrmann Date: Tue, 3 Dec 2024 13:56:20 -0900 Subject: [PATCH 24/37] image tag for opera disp tms job --- job_spec/OPERA_DISP_TMS.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/job_spec/OPERA_DISP_TMS.yml b/job_spec/OPERA_DISP_TMS.yml index 3cae3c478..1de93b9ab 100644 --- a/job_spec/OPERA_DISP_TMS.yml +++ b/job_spec/OPERA_DISP_TMS.yml @@ -61,6 +61,8 @@ OPERA_DISP_TMS: steps: - name: '' image: ghcr.io/asfhyp3/opera-disp-tms + # TODO remove image_tag + image_tag: 0.3.1.dev96_g7e3c603 command: - Ref::tile_type - Ref::bounds From 76690781d4ea44db4ce0d153db7bd3bccfc44f46 Mon Sep 17 00:00:00 2001 From: Jake Herrmann Date: Tue, 3 Dec 2024 13:59:09 -0900 Subject: [PATCH 25/37] deploy from opera-disp-sandbox branch --- .github/workflows/deploy-opera-disp-sandbox.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy-opera-disp-sandbox.yml b/.github/workflows/deploy-opera-disp-sandbox.yml index 79bd24eac..5a52633b8 100644 --- a/.github/workflows/deploy-opera-disp-sandbox.yml +++ b/.github/workflows/deploy-opera-disp-sandbox.yml @@ -3,7 +3,9 @@ name: Deploy OPERA-DISP Sandbox Stack to AWS on: push: branches: - - develop + # TODO revert + #- develop + - opera-disp-sandbox concurrency: ${{ github.workflow }}-${{ github.ref }} @@ -22,7 +24,9 @@ jobs: default_credits_per_user: 0 default_application_status: APPROVED cost_profile: DEFAULT - deploy_ref: refs/heads/develop + # TODO revert + #deploy_ref: refs/heads/develop + deploy_ref: refs/heads/opera-disp-sandbox job_files: >- job_spec/OPERA_DISP_TMS.yml instance_types: r6id.xlarge,r6id.2xlarge,r6id.4xlarge,r6id.8xlarge,r6idn.xlarge,r6idn.2xlarge,r6idn.4xlarge,r6idn.8xlarge From 1ed2c50502b4ab66f09436a4fde33554c76783da Mon Sep 17 00:00:00 2001 From: Jake Herrmann Date: Tue, 3 Dec 2024 14:02:41 -0900 Subject: [PATCH 26/37] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f658da515..e3ccfcf5f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - The `SrgGslc` custom compute environment now includes multiple GPU instance types from the G4dn, G5, and G6 instance families. + ## [9.0.1] ### Changed From e4997a4e789a1cc59c3a274a573f7ce454f8c7bd Mon Sep 17 00:00:00 2001 From: Jake Herrmann Date: Tue, 3 Dec 2024 14:09:39 -0900 Subject: [PATCH 27/37] add burst job --- .github/workflows/deploy-opera-disp-sandbox.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deploy-opera-disp-sandbox.yml b/.github/workflows/deploy-opera-disp-sandbox.yml index 5a52633b8..87a8749b0 100644 --- a/.github/workflows/deploy-opera-disp-sandbox.yml +++ b/.github/workflows/deploy-opera-disp-sandbox.yml @@ -29,6 +29,7 @@ jobs: deploy_ref: refs/heads/opera-disp-sandbox job_files: >- job_spec/OPERA_DISP_TMS.yml + job_spec/INSAR_ISCE_BURST.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 From 800c6aad377eac1202eae80c6216b72fa4b98dbf Mon Sep 17 00:00:00 2001 From: Jake Herrmann Date: Tue, 3 Dec 2024 14:10:03 -0900 Subject: [PATCH 28/37] add todo --- .github/workflows/deploy-opera-disp-sandbox.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deploy-opera-disp-sandbox.yml b/.github/workflows/deploy-opera-disp-sandbox.yml index 87a8749b0..96b8b40a7 100644 --- a/.github/workflows/deploy-opera-disp-sandbox.yml +++ b/.github/workflows/deploy-opera-disp-sandbox.yml @@ -27,6 +27,7 @@ jobs: # TODO revert #deploy_ref: refs/heads/develop deploy_ref: refs/heads/opera-disp-sandbox + # TODO remove burst job job_files: >- job_spec/OPERA_DISP_TMS.yml job_spec/INSAR_ISCE_BURST.yml From 75e984a53f0693f5bdc02f735a887239f965213b Mon Sep 17 00:00:00 2001 From: Jake Herrmann Date: Tue, 3 Dec 2024 14:42:21 -0900 Subject: [PATCH 29/37] image tag --- job_spec/OPERA_DISP_TMS.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/job_spec/OPERA_DISP_TMS.yml b/job_spec/OPERA_DISP_TMS.yml index 1de93b9ab..8c5731eed 100644 --- a/job_spec/OPERA_DISP_TMS.yml +++ b/job_spec/OPERA_DISP_TMS.yml @@ -62,7 +62,7 @@ OPERA_DISP_TMS: - name: '' image: ghcr.io/asfhyp3/opera-disp-tms # TODO remove image_tag - image_tag: 0.3.1.dev96_g7e3c603 + image_tag: 0.3.1.dev97_gc49d372 command: - Ref::tile_type - Ref::bounds From 9f7620f84f36aca5fdf51f9d06447bc2cf79f064 Mon Sep 17 00:00:00 2001 From: Jake Herrmann Date: Tue, 3 Dec 2024 15:40:27 -0900 Subject: [PATCH 30/37] remove burst job from opera-disp-sandbox --- .github/workflows/deploy-opera-disp-sandbox.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/deploy-opera-disp-sandbox.yml b/.github/workflows/deploy-opera-disp-sandbox.yml index 96b8b40a7..5a52633b8 100644 --- a/.github/workflows/deploy-opera-disp-sandbox.yml +++ b/.github/workflows/deploy-opera-disp-sandbox.yml @@ -27,10 +27,8 @@ jobs: # TODO revert #deploy_ref: refs/heads/develop deploy_ref: refs/heads/opera-disp-sandbox - # TODO remove burst job job_files: >- job_spec/OPERA_DISP_TMS.yml - job_spec/INSAR_ISCE_BURST.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 From c55167e077660c8a1792bb033192c4b8982373c9 Mon Sep 17 00:00:00 2001 From: Jake Herrmann Date: Thu, 5 Dec 2024 11:46:06 -0900 Subject: [PATCH 31/37] image tag --- job_spec/OPERA_DISP_TMS.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/job_spec/OPERA_DISP_TMS.yml b/job_spec/OPERA_DISP_TMS.yml index 8c5731eed..3ed1e70a3 100644 --- a/job_spec/OPERA_DISP_TMS.yml +++ b/job_spec/OPERA_DISP_TMS.yml @@ -62,7 +62,7 @@ OPERA_DISP_TMS: - name: '' image: ghcr.io/asfhyp3/opera-disp-tms # TODO remove image_tag - image_tag: 0.3.1.dev97_gc49d372 + image_tag: 0.3.1.dev98_gc99b976 command: - Ref::tile_type - Ref::bounds From 9989c2721d4bcebe278ec1a0f2f755cf38bdcf09 Mon Sep 17 00:00:00 2001 From: Andrew Player Date: Thu, 5 Dec 2024 15:49:27 -0500 Subject: [PATCH 32/37] revert gpu instance type changes --- CHANGELOG.md | 6 ------ job_spec/config/compute_environments.yml | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e3ccfcf5f..e0bb9ef86 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,12 +4,6 @@ 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). -## [9.0.2] - -### Changed -- The `SrgGslc` custom compute environment now includes multiple GPU instance types from the G4dn, G5, and G6 instance families. - - ## [9.0.1] ### Changed diff --git a/job_spec/config/compute_environments.yml b/job_spec/config/compute_environments.yml index a580d6d3a..01de096b7 100644 --- a/job_spec/config/compute_environments.yml +++ b/job_spec/config/compute_environments.yml @@ -5,7 +5,7 @@ compute_environments: # allocation_type # allocation_strategy SrgGslc: - instance_types: g6.2xlarge,g6.4xlarge,g5.2xlarge,g5.4xlarge,g5.8xlarge,g6e.xlarge,g6e.2xlarge,g4dn.2xlarge,g4dn.4xlarge + instance_types: g6.2xlarge ami_id: ami-0729c079aae647cb3 # /aws/service/ecs/optimized-ami/amazon-linux-2/gpu/recommended/image_id AriaAutorift: instance_types: r6id.xlarge,r6id.2xlarge,r6id.4xlarge,r6id.8xlarge,r6idn.xlarge,r6idn.2xlarge,r6idn.4xlarge,r6idn.8xlarge From ca3132ff153be8873d55f8ff5d2d6c5d806dfa81 Mon Sep 17 00:00:00 2001 From: Jake Herrmann Date: Thu, 5 Dec 2024 14:29:10 -0900 Subject: [PATCH 33/37] finishing touches --- .github/workflows/deploy-opera-disp-sandbox.yml | 8 ++------ job_spec/OPERA_DISP_TMS.yml | 3 --- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/.github/workflows/deploy-opera-disp-sandbox.yml b/.github/workflows/deploy-opera-disp-sandbox.yml index 5a52633b8..79bd24eac 100644 --- a/.github/workflows/deploy-opera-disp-sandbox.yml +++ b/.github/workflows/deploy-opera-disp-sandbox.yml @@ -3,9 +3,7 @@ name: Deploy OPERA-DISP Sandbox Stack to AWS on: push: branches: - # TODO revert - #- develop - - opera-disp-sandbox + - develop concurrency: ${{ github.workflow }}-${{ github.ref }} @@ -24,9 +22,7 @@ jobs: default_credits_per_user: 0 default_application_status: APPROVED cost_profile: DEFAULT - # TODO revert - #deploy_ref: refs/heads/develop - deploy_ref: refs/heads/opera-disp-sandbox + deploy_ref: refs/heads/develop job_files: >- job_spec/OPERA_DISP_TMS.yml instance_types: r6id.xlarge,r6id.2xlarge,r6id.4xlarge,r6id.8xlarge,r6idn.xlarge,r6idn.2xlarge,r6idn.4xlarge,r6idn.8xlarge diff --git a/job_spec/OPERA_DISP_TMS.yml b/job_spec/OPERA_DISP_TMS.yml index 3ed1e70a3..6d9a64e92 100644 --- a/job_spec/OPERA_DISP_TMS.yml +++ b/job_spec/OPERA_DISP_TMS.yml @@ -13,7 +13,6 @@ OPERA_DISP_TMS: enum: - displacement - secant_velocity - - velocity example: displacement bounds: api_schema: @@ -61,8 +60,6 @@ OPERA_DISP_TMS: steps: - name: '' image: ghcr.io/asfhyp3/opera-disp-tms - # TODO remove image_tag - image_tag: 0.3.1.dev98_gc99b976 command: - Ref::tile_type - Ref::bounds From d9087d89460507b5b0cd71857894885667fe3638 Mon Sep 17 00:00:00 2001 From: Jake Herrmann Date: Thu, 5 Dec 2024 14:33:32 -0900 Subject: [PATCH 34/37] changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e0bb9ef86..b7cd5615d 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). +## [9.1.0] + +### Added +- Add a new deployment with an `OPERA_DISP_TMS` job type for generating tilesets for the OPERA displacement tool. + ## [9.0.1] ### Changed From 08cf9389d397de2c9f8573d175b3f08feb8d2dfc Mon Sep 17 00:00:00 2001 From: Jake Herrmann Date: Fri, 6 Dec 2024 10:51:32 -0900 Subject: [PATCH 35/37] image tag, deploy from opera-disp-sandbox branch --- .github/workflows/deploy-opera-disp-sandbox.yml | 8 ++++++-- job_spec/OPERA_DISP_TMS.yml | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy-opera-disp-sandbox.yml b/.github/workflows/deploy-opera-disp-sandbox.yml index 79bd24eac..5a52633b8 100644 --- a/.github/workflows/deploy-opera-disp-sandbox.yml +++ b/.github/workflows/deploy-opera-disp-sandbox.yml @@ -3,7 +3,9 @@ name: Deploy OPERA-DISP Sandbox Stack to AWS on: push: branches: - - develop + # TODO revert + #- develop + - opera-disp-sandbox concurrency: ${{ github.workflow }}-${{ github.ref }} @@ -22,7 +24,9 @@ jobs: default_credits_per_user: 0 default_application_status: APPROVED cost_profile: DEFAULT - deploy_ref: refs/heads/develop + # TODO revert + #deploy_ref: refs/heads/develop + deploy_ref: refs/heads/opera-disp-sandbox job_files: >- job_spec/OPERA_DISP_TMS.yml instance_types: r6id.xlarge,r6id.2xlarge,r6id.4xlarge,r6id.8xlarge,r6idn.xlarge,r6idn.2xlarge,r6idn.4xlarge,r6idn.8xlarge diff --git a/job_spec/OPERA_DISP_TMS.yml b/job_spec/OPERA_DISP_TMS.yml index 6d9a64e92..a0401cafb 100644 --- a/job_spec/OPERA_DISP_TMS.yml +++ b/job_spec/OPERA_DISP_TMS.yml @@ -60,6 +60,8 @@ OPERA_DISP_TMS: steps: - name: '' image: ghcr.io/asfhyp3/opera-disp-tms + # TODO remove image tag + image_tag: 0.3.1.dev99_g5192e48 command: - Ref::tile_type - Ref::bounds From 25d0d5bd8d596a0d8593e74e62859b87ebb9af2b Mon Sep 17 00:00:00 2001 From: Jake Herrmann Date: Fri, 6 Dec 2024 15:20:25 -0900 Subject: [PATCH 36/37] image tag --- job_spec/OPERA_DISP_TMS.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/job_spec/OPERA_DISP_TMS.yml b/job_spec/OPERA_DISP_TMS.yml index a0401cafb..8bd21e523 100644 --- a/job_spec/OPERA_DISP_TMS.yml +++ b/job_spec/OPERA_DISP_TMS.yml @@ -61,7 +61,7 @@ OPERA_DISP_TMS: - name: '' image: ghcr.io/asfhyp3/opera-disp-tms # TODO remove image tag - image_tag: 0.3.1.dev99_g5192e48 + image_tag: 0.3.1.dev103_g14a19a2 command: - Ref::tile_type - Ref::bounds From 3176ebb0b83fd6ca4e4ce7f68ec888c9b7acc7b8 Mon Sep 17 00:00:00 2001 From: Jake Herrmann Date: Fri, 6 Dec 2024 15:37:21 -0900 Subject: [PATCH 37/37] revert testing changes --- .github/workflows/deploy-opera-disp-sandbox.yml | 8 ++------ job_spec/OPERA_DISP_TMS.yml | 2 -- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/deploy-opera-disp-sandbox.yml b/.github/workflows/deploy-opera-disp-sandbox.yml index 5a52633b8..79bd24eac 100644 --- a/.github/workflows/deploy-opera-disp-sandbox.yml +++ b/.github/workflows/deploy-opera-disp-sandbox.yml @@ -3,9 +3,7 @@ name: Deploy OPERA-DISP Sandbox Stack to AWS on: push: branches: - # TODO revert - #- develop - - opera-disp-sandbox + - develop concurrency: ${{ github.workflow }}-${{ github.ref }} @@ -24,9 +22,7 @@ jobs: default_credits_per_user: 0 default_application_status: APPROVED cost_profile: DEFAULT - # TODO revert - #deploy_ref: refs/heads/develop - deploy_ref: refs/heads/opera-disp-sandbox + deploy_ref: refs/heads/develop job_files: >- job_spec/OPERA_DISP_TMS.yml instance_types: r6id.xlarge,r6id.2xlarge,r6id.4xlarge,r6id.8xlarge,r6idn.xlarge,r6idn.2xlarge,r6idn.4xlarge,r6idn.8xlarge diff --git a/job_spec/OPERA_DISP_TMS.yml b/job_spec/OPERA_DISP_TMS.yml index 8bd21e523..6d9a64e92 100644 --- a/job_spec/OPERA_DISP_TMS.yml +++ b/job_spec/OPERA_DISP_TMS.yml @@ -60,8 +60,6 @@ OPERA_DISP_TMS: steps: - name: '' image: ghcr.io/asfhyp3/opera-disp-tms - # TODO remove image tag - image_tag: 0.3.1.dev103_g14a19a2 command: - Ref::tile_type - Ref::bounds