Skip to content

Commit

Permalink
Merge pull request #2519 from ASFHyP3/develop
Browse files Browse the repository at this point in the history
Release v9.1.0
  • Loading branch information
jtherrmann authored Dec 9, 2024
2 parents b4a9205 + fb0aadb commit 16b1b34
Show file tree
Hide file tree
Showing 9 changed files with 174 additions and 10 deletions.
80 changes: 80 additions & 0 deletions .github/workflows/deploy-opera-disp-sandbox.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
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/[email protected]

- 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 }}
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 <https://hyp3-opera-disp-sandbox.asf.alaska.edu> deployment with an `OPERA_DISP_TMS` job type for generating tilesets for the OPERA displacement tool.

## [9.0.1]

### Changed
Expand Down
79 changes: 79 additions & 0 deletions job_spec/OPERA_DISP_TMS.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
OPERA_DISP_TMS:
required_parameters:
- tile_type
- bounds
- orbit_direction
- start_date
- end_date
parameters:
tile_type:
api_schema:
description: Type of tile map to create
type: string
enum:
- displacement
- secant_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
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
10 changes: 5 additions & 5 deletions requirements-all.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@
-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.72
jinja2==3.1.4
moto[dynamodb]==5.0.21
pytest==8.3.3
moto[dynamodb]==5.0.22
pytest==8.3.4
PyYAML==6.0.2
responses==0.25.3
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.19.0
cfn-lint==1.20.1
2 changes: 1 addition & 1 deletion requirements-apps-api-binary.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
cryptography==43.0.3
cryptography==44.0.0
2 changes: 1 addition & 1 deletion requirements-apps-api.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements-apps-disable-private-dns.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
boto3==1.35.63
boto3==1.35.72
2 changes: 1 addition & 1 deletion requirements-apps-start-execution-manager.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
boto3==1.35.63
boto3==1.35.72
./lib/dynamo/
./lib/lambda_logging/
2 changes: 1 addition & 1 deletion requirements-apps-start-execution-worker.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
boto3==1.35.63
boto3==1.35.72
./lib/lambda_logging/

0 comments on commit 16b1b34

Please sign in to comment.