From 7eb669b9ae0d121a18fae7c08f92953e5eb820fe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Dec 2024 19:58:10 +0000 Subject: [PATCH 1/6] Bump cfn-lint from 1.22.2 to 1.22.3 Bumps [cfn-lint](https://github.com/aws-cloudformation/cfn-lint) from 1.22.2 to 1.22.3. - [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.22.2...v1.22.3) --- 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 4157a6928..067e6e43b 100644 --- a/requirements-all.txt +++ b/requirements-all.txt @@ -14,4 +14,4 @@ responses==0.25.3 ruff setuptools==75.6.0 openapi-spec-validator==0.7.1 -cfn-lint==1.22.2 +cfn-lint==1.22.3 From a648a4407003e49d598dcf3d921f4fa14981faec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Dec 2024 19:58:15 +0000 Subject: [PATCH 2/6] Bump boto3 from 1.35.82 to 1.35.90 Bumps [boto3](https://github.com/boto/boto3) from 1.35.82 to 1.35.90. - [Release notes](https://github.com/boto/boto3/releases) - [Commits](https://github.com/boto/boto3/compare/1.35.82...1.35.90) --- 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 4157a6928..e94641a3e 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.82 +boto3==1.35.90 jinja2==3.1.4 moto[dynamodb]==5.0.23 pytest==8.3.4 diff --git a/requirements-apps-disable-private-dns.txt b/requirements-apps-disable-private-dns.txt index a9b864a67..0e8753fd6 100644 --- a/requirements-apps-disable-private-dns.txt +++ b/requirements-apps-disable-private-dns.txt @@ -1 +1 @@ -boto3==1.35.82 +boto3==1.35.90 diff --git a/requirements-apps-start-execution-manager.txt b/requirements-apps-start-execution-manager.txt index 5d6283f02..573e05a55 100644 --- a/requirements-apps-start-execution-manager.txt +++ b/requirements-apps-start-execution-manager.txt @@ -1,3 +1,3 @@ -boto3==1.35.82 +boto3==1.35.90 ./lib/dynamo/ ./lib/lambda_logging/ diff --git a/requirements-apps-start-execution-worker.txt b/requirements-apps-start-execution-worker.txt index d1eaa6e9d..abf4ffd08 100644 --- a/requirements-apps-start-execution-worker.txt +++ b/requirements-apps-start-execution-worker.txt @@ -1,2 +1,2 @@ -boto3==1.35.82 +boto3==1.35.90 ./lib/lambda_logging/ From 4c78da63cbf9ee298fb18f72e34a2f387709fe91 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 Jan 2025 23:47:23 +0000 Subject: [PATCH 3/6] Bump jinja2 from 3.1.4 to 3.1.5 Bumps [jinja2](https://github.com/pallets/jinja) from 3.1.4 to 3.1.5. - [Release notes](https://github.com/pallets/jinja/releases) - [Changelog](https://github.com/pallets/jinja/blob/main/CHANGES.rst) - [Commits](https://github.com/pallets/jinja/compare/3.1.4...3.1.5) --- updated-dependencies: - dependency-name: jinja2 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 e94641a3e..8e2a41bc0 100644 --- a/requirements-all.txt +++ b/requirements-all.txt @@ -6,7 +6,7 @@ -r requirements-apps-disable-private-dns.txt -r requirements-apps-update-db.txt boto3==1.35.90 -jinja2==3.1.4 +jinja2==3.1.5 moto[dynamodb]==5.0.23 pytest==8.3.4 PyYAML==6.0.2 From 44b12a0a4bda21f1cd17993e9dd8e69262c7d3b5 Mon Sep 17 00:00:00 2001 From: Andrew Johnston Date: Mon, 6 Jan 2025 15:20:11 -0900 Subject: [PATCH 4/6] make opera-disp-tms jobs available in edc-uat instead of standalone sandbox --- .github/workflows/deploy-daac.yml | 1 + .../workflows/deploy-opera-disp-sandbox.yml | 80 ------------------- 2 files changed, 1 insertion(+), 80 deletions(-) delete mode 100644 .github/workflows/deploy-opera-disp-sandbox.yml diff --git a/.github/workflows/deploy-daac.yml b/.github/workflows/deploy-daac.yml index e8b17d463..8cad31f7c 100644 --- a/.github/workflows/deploy-daac.yml +++ b/.github/workflows/deploy-daac.yml @@ -53,6 +53,7 @@ jobs: job_spec/INSAR_GAMMA.yml job_spec/RTC_GAMMA.yml 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: 1500 expanded_max_vcpus: 3000 diff --git a/.github/workflows/deploy-opera-disp-sandbox.yml b/.github/workflows/deploy-opera-disp-sandbox.yml deleted file mode 100644 index 79bd24eac..000000000 --- a/.github/workflows/deploy-opera-disp-sandbox.yml +++ /dev/null @@ -1,80 +0,0 @@ -name: Deploy OPERA-DISP Sandbox Stack to AWS - -on: - push: - branches: - - develop - -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/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 - 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 0257560016aecba63aed4349c48b9840164f1571 Mon Sep 17 00:00:00 2001 From: Andrew Johnston Date: Mon, 6 Jan 2025 15:22:14 -0900 Subject: [PATCH 5/6] update changelog --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 90b50dc9b..e74012291 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,14 @@ 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.2] + +### Added +- OPERA_DISP_TMS job type is now available in EDC UAT deployment + +### Removed +- hyp3-opera-disp-sandbox deployment + ## [9.1.1] ### Changed From b64cd280242aa3a792821e093cfbdcc81be12042 Mon Sep 17 00:00:00 2001 From: Andrew Johnston Date: Tue, 7 Jan 2025 09:35:02 -0900 Subject: [PATCH 6/6] add credit cost for opera-disp-tms jobs in edc --- 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 6d9a64e92..40294504c 100644 --- a/job_spec/OPERA_DISP_TMS.yml +++ b/job_spec/OPERA_DISP_TMS.yml @@ -53,6 +53,8 @@ OPERA_DISP_TMS: maxLength: 8 example: 20200814 cost_profiles: + EDC: + cost: 1.0 DEFAULT: cost: 1.0 validators: