Merge pull request #446 from asfadmin/test

Release v2.0.0

.github/workflows/changelog.yml

@@ -14,6 +14,6 @@ on:
 jobs:
   call-changelog-check-workflow:
     # Docs: https://github.com/ASFHyP3/actions
-    uses: ASFHyP3/actions/.github/workflows/reusable-changelog-check.yml@v0.9.0
+    uses: ASFHyP3/actions/.github/workflows/reusable-changelog-check.yml@v0.11.0
     secrets:
       USER_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/deploy.yml

@@ -17,7 +17,6 @@ jobs:
             public_bucket: grfn-public-prod
             distribution_base_url: https://grfn.asf.alaska.edu/door/download
             browse_base_url: https://grfn-public-prod.asf.alaska.edu
-            reformat_api_url: https://services.asf.alaska.edu/geospatial/reformat
             cmr_base_url: https://cmr.earthdata.nasa.gov
             cmr_provider: ASF
             deploy_ref: refs/heads/prod
@@ -27,7 +26,6 @@ jobs:
             public_bucket: grfn-public-test
             distribution_base_url: https://grfn-test.asf.alaska.edu/door/download
             browse_base_url: https://grfn-public-test.asf.alaska.edu
-            reformat_api_url: https://services-test.asf.alaska.edu/geospatial/reformat
             cmr_base_url: https://cmr.uat.earthdata.nasa.gov
             cmr_provider: ASF
             deploy_ref: refs/heads/test
@@ -57,8 +55,8 @@ jobs:
           python -m pip install -r requirements-verify.txt -t verify/src/
           python -m pip install -r requirements-ingest.txt -t ingest/src/
           python -m pip install -r requirements-notify.txt -t notify/src/
-          python -m pip install -r requirements-echo10-to-cmr.txt -t echo10-to-cmr/src/
-          python -m pip install -r requirements-echo10-construction.txt -t echo10-construction/src/
+          python -m pip install -r requirements-metadata-to-cmr.txt -t metadata-to-cmr/src/
+          python -m pip install -r requirements-metadata-construction.txt -t metadata-construction/src/
           # crytography on AWS Lambda requires manylinux2014 per https://github.com/ASFHyP3/hyp3/issues/1190
           python -m pip install -r requirements-cmr-token.txt --platform manylinux2014_x86_64 --only-binary=:all: -t cmr-token/src/
       - name: package and deploy
@@ -80,7 +78,6 @@ jobs:
                 PublicBucket='${{ matrix.public_bucket }}' \
                 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 }}' \

.github/workflows/labeled-pr.yml

@@ -13,4 +13,4 @@ on:
 jobs:
   call-labeled-pr-check-workflow:
     # Docs: https://github.com/ASFHyP3/actions
-    uses: ASFHyP3/actions/.github/workflows/reusable-labeled-pr-check.yml@v0.9.0
+    uses: ASFHyP3/actions/.github/workflows/reusable-labeled-pr-check.yml@v0.11.0

.github/workflows/release-checklist-comment.yml

@@ -10,7 +10,7 @@ on:
 jobs:
   call-release-workflow:
     # Docs: https://github.com/ASFHyP3/actions
-    uses: ASFHyP3/actions/.github/workflows/reusable-release-checklist-comment.yml@v0.9.0
+    uses: ASFHyP3/actions/.github/workflows/reusable-release-checklist-comment.yml@v0.11.0
     permissions:
       pull-requests: write
     secrets:

.github/workflows/release.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   call-release-workflow:
-    uses: ASFHyP3/actions/.github/workflows/reusable-release.yml@v0.9.0
+    uses: ASFHyP3/actions/.github/workflows/reusable-release.yml@v0.11.0
     with:
       release_prefix: GRFN Ingest
       release_branch: prod

.github/workflows/static_analysis.yml

@@ -17,7 +17,7 @@ jobs:
       - run: |
           python -m pip install --upgrade pip
           python -m pip install flake8 flake8-import-order flake8-builtins  # FIXME add flake8-blind-except
-      - run: flake8 --max-line-length=120 --import-order-style=pycharm --statistics --application-import-names echo10_construction verify
+      - run: flake8 --max-line-length=120 --import-order-style=pycharm --statistics --application-import-names metadata_construction verify
 
   cfn-lint:
     runs-on: ubuntu-latest

.github/workflows/tag-version.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   call-bump-version-workflow:
     # Docs: https://github.com/ASFHyP3/actions
-    uses: ASFHyP3/actions/.github/workflows/reusable-bump-version.yml@v0.9.0
+    uses: ASFHyP3/actions/.github/workflows/reusable-bump-version.yml@v0.11.0
     with:
       user: tools-bot
       email: [email protected]

CHANGELOG.md

@@ -6,6 +6,18 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [PEP 440](https://www.python.org/dev/peps/pep-0440/)
 and uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.0.0]
+This release supports publishing v3 GUNW products to production CMR. CMR metadata has been significantly revised to reflect the current state of these products, align with other recently developed ASF CMR collections, and better support ASF search tooling.
+
+### Changed
+- Granules are now published to the `ARIA_S1_GUNW` collection in CMR instead of the `SENTINEL-1_INTERFEROGRAMS` collection.
+- Granules are now published using the UMM-G json metadata format instead of the ECHO 10 xml format.
+- Granule metadata content has been significantly revised.
+- `perpendicular_baseline`, `temporal_baseline_days`, and `frame_number` are now required fields in the SDS metadata file instead of being optional.
+### Removed
+- Ingest of v2 GUNW products is no longer supported.
+- Virtual geotiff products are no longer published to CMR.
+
 ## [1.2.1]
 ### Changed
 - Upgraded Python and GitHub Action dependencies.

Makefile

@@ -1,6 +1,6 @@
-ECHO10_CONSTRUCTION = ${PWD}/echo10-construction/src/
+METADATA_CONSTRUCTION = ${PWD}/metadata-construction/src/
 VERIFY = ${PWD}/verify/src/
-export PYTHONPATH = ${ECHO10_CONSTRUCTION}:${VERIFY}
+export PYTHONPATH = ${METADATA_CONSTRUCTION}:${VERIFY}
 export CONFIG = "{}"
 
 test_file ?= tests/

README.md

@@ -15,9 +15,9 @@ data.
 * **step-function:** A step function defining the workflow to ingest a single GRFN data product.
 * **verify:** A Lambda function that validates the received message as well as the files and metadata in the source S3 bucket.
 * **ingest:** A Lambda function that copies product files from the source S3 bucket to the output S3 buckets.
-* **echo10-construction:** A Lambda function that generates an ECHO 10 XML metadata file for a particular product.
+* **metadata-construction:** A Lambda function that generates a CMR-compliant 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.
+* **metadata-to-cmr:** A scheduled Lambda function that submits metadata files to CMR.
 * **notify:** A Lambda function that sends ingest success/failure messages to the SNS response topic.
 
 # Top Level Inputs and Outputs

cloudformation.yaml

@@ -14,9 +14,6 @@ Parameters:
   BrowseBaseUrl:
     Type: String
 
-  ReformatApiUrl:
-    Type: String
-
   DefaultResponseTopicArn:
     Type: String
 
@@ -79,7 +76,7 @@ Resources:
         VerifyLambdaArn: !GetAtt VerifyStack.Outputs.LambdaArn
         NotifyLambdaArn: !GetAtt NotifyStack.Outputs.LambdaArn
         IngestLambdaArn: !GetAtt IngestStack.Outputs.LambdaArn
-        Echo10ConstructionLambdaArn: !GetAtt Echo10ConstructionStack.Outputs.LambdaArn
+        MetadataConstructionLambdaArn: !GetAtt MetadataConstructionStack.Outputs.LambdaArn
       TemplateURL: step-function/cloudformation.yaml
 
   InvokeStack:
@@ -99,18 +96,17 @@ Resources:
         Name: !Sub "${AWS::StackName}-verify"
       TemplateURL: verify/cloudformation.yaml
 
-  Echo10ConstructionStack:
+  MetadataConstructionStack:
     Type: AWS::CloudFormation::Stack
     Properties:
       Parameters:
-        Name: !Sub "${AWS::StackName}-echo10-construction"
+        Name: !Sub "${AWS::StackName}-metadata-construction"
         PrivateBucket: !Ref PrivateBucket
         PublicBucket: !Ref PublicBucket
         AuxBucket: !Ref AuxBucket
         DistributionBaseUrl: !Ref DistributionBaseUrl
         BrowseBaseUrl: !Ref BrowseBaseUrl
-        ReformatApiUrl: !Ref ReformatApiUrl
-      TemplateURL: echo10-construction/cloudformation.yaml
+      TemplateURL: metadata-construction/cloudformation.yaml
 
   CmrTokenStack:
     Type: AWS::CloudFormation::Stack
@@ -122,17 +118,17 @@ Resources:
         CertificateSecretArn: !Ref LaunchpadCertificateSecretArn
       TemplateURL: cmr-token/cloudformation.yaml
 
-  Echo10ToCmrStack:
+  MetadataToCmrStack:
     Type: AWS::CloudFormation::Stack
     Properties:
       Parameters:
-        Name: !Sub "${AWS::StackName}-echo10-to-cmr"
+        Name: !Sub "${AWS::StackName}-metadata-to-cmr"
         ActivityArn: !GetAtt StepFunctionStack.Outputs.CmrActivityArn
         AuxBucket: !Ref AuxBucket
         CachedCmrTokenKey: !Ref CachedCmrTokenKey
         CmrTokenLambda: !GetAtt CmrTokenStack.Outputs.LambdaName
         CmrGranuleUrl: !Sub "${CmrBaseUrl}/ingest/providers/${CmrProvider}/granules/"
-      TemplateURL: echo10-to-cmr/cloudformation.yaml
+      TemplateURL: metadata-to-cmr/cloudformation.yaml
 
   NotifyStack:
     Type: AWS::CloudFormation::Stack