-
Notifications
You must be signed in to change notification settings - Fork 10
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #841 from ASFHyP3/develop
Release 2.9.0
- Loading branch information
Showing
15 changed files
with
334 additions
and
82 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| name: Deploy Enterprise Stacks to AWS | ||
|
|
||
| on: | ||
| push: | ||
| branches: | ||
| - main | ||
|
|
||
| jobs: | ||
| deploy: | ||
| runs-on: ubuntu-latest | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| include: | ||
| - environment: hyp3-its-live | ||
| domain: hyp3-its-live.asf.alaska.edu | ||
| template_bucket: cf-templates-3o5lnspmwmzg-us-west-2 | ||
| image_tag: latest | ||
| product_lifetime_in_days: 180 | ||
| quota: 0 | ||
| job_files: job_spec/AUTORIFT_ITS_LIVE.yml | ||
| default_max_vcpus: 2640 | ||
| expanded_max_vcpus: 2640 | ||
| required_surplus: 0 | ||
| security_environment: JPL | ||
| ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2/recommended/image_id | ||
|
|
||
| - environment: hyp3-autorift-eu | ||
| domain: hyp3-autorift-eu.asf.alaska.edu | ||
| template_bucket: cf-templates-autorift-eu-central-1 | ||
| image_tag: latest | ||
| product_lifetime_in_days: 180 | ||
| quota: 0 | ||
| job_files: job_spec/AUTORIFT_ITS_LIVE_EU.yml | ||
| default_max_vcpus: 1600 | ||
| expanded_max_vcpus: 1600 | ||
| required_surplus: 0 | ||
| security_environment: ASF | ||
| ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2/recommended/image_id | ||
|
|
||
| - environment: hyp3-isce | ||
| domain: hyp3-isce.asf.alaska.edu | ||
| template_bucket: cf-templates-t790khv4btdq-us-west-2 | ||
| image_tag: latest | ||
| product_lifetime_in_days: 180 | ||
| quota: 0 | ||
| job_files: job_spec/INSAR_ISCE.yml job_spec/INSAR_ISCE_TEST.yml | ||
| default_max_vcpus: 1600 | ||
| expanded_max_vcpus: 1600 | ||
| required_surplus: 0 | ||
| security_environment: ASF | ||
| ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2/recommended/image_id | ||
|
|
||
| - environment: hyp3-tibet | ||
| domain: hyp3-tibet.asf.alaska.edu | ||
| template_bucket: cf-templates-ejaipnrxq7xg-us-west-2 | ||
| image_tag: latest | ||
| product_lifetime_in_days: 180 | ||
| quota: 0 | ||
| job_files: job_spec/INSAR_ISCE.yml job_spec/INSAR_ISCE_TEST.yml | ||
| default_max_vcpus: 1600 | ||
| expanded_max_vcpus: 1600 | ||
| required_surplus: 0 | ||
| security_environment: ASF | ||
| ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2/recommended/image_id | ||
|
|
||
| environment: | ||
| name: ${{ matrix.environment }} | ||
| url: https://${{ matrix.domain }} | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v2 | ||
|
|
||
| - uses: aws-actions/configure-aws-credentials@v1 | ||
| 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@v1 | ||
| with: | ||
| python-version: 3.8 | ||
|
|
||
| - uses: ./.github/actions/deploy-hyp3 | ||
| with: | ||
| TEMPLATE_BUCKET: ${{ matrix.template_bucket }} | ||
| STACK_NAME: ${{ matrix.environment }} | ||
| DOMAIN_NAME: ${{ matrix.domain }} | ||
| 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 }} | ||
| EDL_USERNAME: ${{ secrets.EDL_USERNAME }} | ||
| EDL_PASSWORD: ${{ secrets.EDL_PASSWORD }} | ||
| CLOUDFORMATION_ROLE_ARN: ${{ secrets.CLOUDFORMATION_ROLE_ARN }} | ||
| MONTHLY_JOB_QUOTA_PER_USER: ${{ matrix.quota }} | ||
| JOB_FILES: ${{ matrix.job_files }} | ||
| BANNED_CIDR_BLOCKS: ${{ secrets.BANNED_CIDR_BLOCKS }} | ||
| DEFAULT_MAX_VCPUS: ${{ matrix.default_max_vcpus }} | ||
| EXPANDED_MAX_VCPUS: ${{ matrix.expanded_max_vcpus }} | ||
| MONTHLY_COMPUTE_BUDGET: ${{ secrets.MONTHLY_COMPUTE_BUDGET }} | ||
| REQUIRED_SURPLUS: ${{ matrix.required_surplus }} | ||
| PERMISSIONS_BOUNDARY_ARN: ${{ secrets.PERMISSIONS_BOUNDARY_ARN }} | ||
| SECURITY_ENVIRONMENT: ${{ matrix.security_environment }} | ||
| AMI_ID: ${{ matrix.ami_id }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
83 changes: 83 additions & 0 deletions
83
apps/check-processing-time/check-processing-time-cf.yml.j2
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| AWSTemplateFormatVersion: 2010-09-09 | ||
|
|
||
| Parameters: | ||
|
|
||
| PermissionsBoundaryPolicyArn: | ||
| Type: String | ||
|
|
||
| SecurityGroupId: | ||
| Type: String | ||
|
|
||
| SubnetIds: | ||
| Type: CommaDelimitedList | ||
|
|
||
| Conditions: | ||
|
|
||
| UsePermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundaryPolicyArn, ""]] | ||
|
|
||
| LambdasInVpc: !Not [!Equals [!Ref SecurityGroupId, ""]] | ||
|
|
||
| Outputs: | ||
|
|
||
| LambdaArn: | ||
| Value: !GetAtt Lambda.Arn | ||
|
|
||
| Resources: | ||
|
|
||
| LogGroup: | ||
| Type: AWS::Logs::LogGroup | ||
| Properties: | ||
| LogGroupName: !Sub "/aws/lambda/${Lambda}" | ||
| RetentionInDays: 90 | ||
|
|
||
| Role: | ||
| Type: {{ 'Custom::JplRole' if security_environment == 'JPL' else 'AWS::IAM::Role' }} | ||
| Properties: | ||
| {% if security_environment == 'JPL' %} | ||
| ServiceToken: !ImportValue Custom::JplRole::ServiceToken | ||
| Path: /account-managed/hyp3/ | ||
| {% endif %} | ||
| AssumeRolePolicyDocument: | ||
| Version: 2012-10-17 | ||
| Statement: | ||
| Action: sts:AssumeRole | ||
| Principal: | ||
| Service: lambda.amazonaws.com | ||
| Effect: Allow | ||
| PermissionsBoundary: !If [UsePermissionsBoundary, !Ref PermissionsBoundaryPolicyArn, !Ref AWS::NoValue] | ||
| ManagedPolicyArns: | ||
| - !If [LambdasInVpc, arn:aws:iam::aws:policy/service-role/AWSLambdaVPCAccessExecutionRole, !Ref AWS::NoValue] | ||
| - !Ref Policy | ||
|
|
||
| Policy: | ||
| Type: {{ 'Custom::JplPolicy' if security_environment == 'JPL' else 'AWS::IAM::ManagedPolicy' }} | ||
| Properties: | ||
| {% if security_environment == 'JPL' %} | ||
| ServiceToken: !ImportValue Custom::JplPolicy::ServiceToken | ||
| Path: /account-managed/hyp3/ | ||
| {% endif %} | ||
| PolicyDocument: | ||
| Version: 2012-10-17 | ||
| Statement: | ||
| - Effect: Allow | ||
| Action: | ||
| - logs:CreateLogStream | ||
| - logs:PutLogEvents | ||
| Resource: !Sub "arn:aws:logs:${AWS::Region}:${AWS::AccountId}:log-group:/aws/lambda/*" | ||
|
|
||
| Lambda: | ||
| Type: AWS::Lambda::Function | ||
| Properties: | ||
| Code: src/ | ||
| Handler: check_processing_time.lambda_handler | ||
| MemorySize: 128 | ||
| Role: !GetAtt Role.Arn | ||
| Runtime: python3.8 | ||
| Timeout: 30 | ||
| VpcConfig: | ||
| !If | ||
| - LambdasInVpc | ||
| - SecurityGroupIds: | ||
| - !Ref SecurityGroupId | ||
| SubnetIds: !Ref SubnetIds | ||
| - !Ref AWS::NoValue |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| import json | ||
|
|
||
|
|
||
| def get_time_from_attempts(attempts): | ||
| attempts.sort(key=lambda attempt: attempt['StartedAt']) | ||
| final_attempt = attempts[-1] | ||
| return (final_attempt['StoppedAt'] - final_attempt['StartedAt']) / 1000 | ||
|
|
||
|
|
||
| def lambda_handler(event, context): | ||
| results = event['processing_results'] | ||
| if 'Attempts' in results: | ||
| attempts = results['Attempts'] | ||
| else: | ||
| attempts = json.loads(results['Cause'])['Attempts'] | ||
| return get_time_from_attempts(attempts) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,7 +7,6 @@ Parameters: | |
|
|
||
| PermissionsBoundaryPolicyArn: | ||
| Type: String | ||
| Default: "" | ||
|
|
||
| SecurityGroupId: | ||
| Type: String | ||
|
|
||
Oops, something went wrong.