Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

no longer send SNS messages reporting ingest success/failure #192

Open
wants to merge 2 commits into
base: test
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ jobs:
python -m pip install -r invoke/requirements.txt -t invoke/src/
python -m pip install -r verify/requirements.txt -t verify/src/
python -m pip install -r ingest/requirements.txt -t ingest/src/
python -m pip install -r notify/requirements.txt -t notify/src/
python -m pip install -r echo10-to-cmr/requirements.txt -t echo10-to-cmr/src/
python -m pip install -r echo10-construction/requirements.txt -t echo10-construction/src/
# crytography on AWS Lambda requires manylinux2014 per https://github.com/ASFHyP3/hyp3/issues/1190
Expand All @@ -81,8 +80,6 @@ jobs:
DistributionBaseUrl='${{ matrix.distribution_base_url }}' \
BrowseBaseUrl='${{ matrix.browse_base_url }}' \
ReformatApiUrl='${{ matrix.reformat_api_url }}' \
DefaultResponseTopicArn='${{ secrets.DEFAULT_RESPONSE_TOPIC_ARN }}' \
DefaultResponseTopicRegion='${{ secrets.DEFAULT_RESPONSE_TOPIC_REGION }}' \
SdsAccountNumber='${{ secrets.SDS_ACCOUNT_NUMBER }}' \
CmrBaseUrl='${{ matrix.cmr_base_url }}' \
LaunchpadCertificateSecretArn='${{ secrets.LAUNCHPAD_CERTIFICATE_SECRET_ARN }}' \
Expand Down
4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ data.

# Architecture

![Architecture Diagram](/doc/architecture.png)
![Architecture Diagram](doc/architecture.png)

# Components

Expand All @@ -18,7 +18,6 @@ data.
* **echo10-construction:** A Lambda function that generates an ECHO 10 XML metadata file for a particular product.
* **cmr-token** A Lambda function that generates an access token for the CMR ingest API.
* **echo10-to-cmr:** A scheduled Lambda function that submits ECHO 10 XML metadata files to CMR.
* **notify:** A Lambda function that sends ingest success/failure messages to the SNS response topic.

# Build and Deployment Instructions

Expand Down Expand Up @@ -46,7 +45,6 @@ Runtime inputs consist of the following staged files:

### Product metadata reported to CmrGranuleUrl with these Collection Ids and Granule URs:
* Sentinel-1 All Interferometric Products (BETA) \<product-name\>-All
* Success/failure message sent to DefaultResponseTopicArn

# Credits

Expand Down
34 changes: 0 additions & 34 deletions cloudformation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,30 +17,6 @@ Parameters:
ReformatApiUrl:
Type: String

DefaultResponseTopicArn:
Type: String

DefaultResponseTopicRegion:
Type: String
Default: us-east-1
AllowedValues:
- us-east-2
- us-east-1
- us-west-1
- us-west-2
- ap-south-1
- ap-northeast-2
- ap-southeast-1
- ap-southeast-2
- ap-northeast-1
- ca-central-1
- cn-north-1
- eu-central-1
- eu-west-1
- eu-west-2
- eu-west-3
- sa-east-1

SdsAccountNumber:
Type: CommaDelimitedList

Expand Down Expand Up @@ -77,7 +53,6 @@ Resources:
Parameters:
Name: !Ref AWS::StackName
VerifyLambdaArn: !GetAtt VerifyStack.Outputs.LambdaArn
NotifyLambdaArn: !GetAtt NotifyStack.Outputs.LambdaArn
IngestLambdaArn: !GetAtt IngestStack.Outputs.LambdaArn
Echo10ConstructionLambdaArn: !GetAtt Echo10ConstructionStack.Outputs.LambdaArn
TemplateURL: step-function/cloudformation.yaml
Expand Down Expand Up @@ -134,15 +109,6 @@ Resources:
CmrGranuleUrl: !Sub "${CmrBaseUrl}/ingest/providers/${CmrProvider}/granules/"
TemplateURL: echo10-to-cmr/cloudformation.yaml

NotifyStack:
Type: AWS::CloudFormation::Stack
Properties:
Parameters:
Name: !Sub "${AWS::StackName}-notify"
DefaultResponseTopicArn: !Ref DefaultResponseTopicArn
DefaultResponseTopicRegion: !Ref DefaultResponseTopicRegion
TemplateURL: notify/cloudformation.yaml

IngestStack:
Type: AWS::CloudFormation::Stack
Properties:
Expand Down
Binary file modified doc/architecture.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
97 changes: 0 additions & 97 deletions notify/cloudformation.yaml

This file was deleted.

Empty file removed notify/requirements.txt
Empty file.
64 changes: 0 additions & 64 deletions notify/src/main.py

This file was deleted.

5 changes: 0 additions & 5 deletions step-function/cloudformation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ Parameters:
IngestLambdaArn:
Type: String

NotifyLambdaArn:
Type: String

Echo10ConstructionLambdaArn:
Type: String

Expand Down Expand Up @@ -53,7 +50,6 @@ Resources:
Resource:
- !Ref VerifyLambdaArn
- !Ref IngestLambdaArn
- !Ref NotifyLambdaArn
- !Ref Echo10ConstructionLambdaArn

StepFunction:
Expand All @@ -67,4 +63,3 @@ Resources:
IngestLambdaArn: !Ref IngestLambdaArn
Echo10ConstructionLambdaArn: !Ref Echo10ConstructionLambdaArn
CmrActivity: !Ref CmrActivity
NotifyLambdaArn: !Ref NotifyLambdaArn
Loading