Merge pull request #514 from asfadmin/test

Release v2.0.1
asfadmin · Jun 27, 2024 · c73773a · c73773a
2 parents 7e918f2 + fa37732
commit c73773a
Show file tree

Hide file tree

Showing 26 changed files with 59 additions and 40 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -5,15 +5,15 @@
 
 version: 2
 updates:
-  - package-ecosystem: "pip"
-    directory: "/"
+  - package-ecosystem: pip
+    directory: /
     schedule:
-      interval: "daily"
+      interval: weekly
     labels:
-      - "bumpless"
-  - package-ecosystem: "github-actions"
-    directory: "/"
+      - bumpless
+  - package-ecosystem: github-actions
+    directory: /
     schedule:
-      interval: "daily"
+      interval: weekly
     labels:
-      - "bumpless"
+      - bumpless
diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
@@ -14,6 +14,4 @@ on:
 jobs:
   call-changelog-check-workflow:
     # Docs: https://github.com/ASFHyP3/actions
-    uses: ASFHyP3/actions/.github/workflows/[email protected]
-    secrets:
-      USER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    uses: ASFHyP3/actions/.github/workflows/[email protected]
diff --git a/.github/workflows/create-jira-issue.yml b/.github/workflows/create-jira-issue.yml
@@ -0,0 +1,15 @@
+name: Create Jira issue
+
+on:
+  issues:
+    types: [labeled]
+
+jobs:
+  call-create-jira-issue-workflow:
+    uses: ASFHyP3/actions/.github/workflows/[email protected]
+    secrets:
+      JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }}
+      JIRA_USER_EMAIL: ${{ secrets.JIRA_USER_EMAIL }}
+      JIRA_API_TOKEN: ${{ secrets.JIRA_API_TOKEN }}
+      JIRA_PROJECT: ${{ secrets.JIRA_PROJECT }}
+      JIRA_FIELDS: ${{ secrets.JIRA_FIELDS }}
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -6,6 +6,8 @@ on:
       - prod
       - test
 
+concurrency: ${{ github.workflow }}-${{ github.ref }}
+
 jobs:
   deploy:
     runs-on: ubuntu-latest
@@ -44,7 +46,7 @@ jobs:
 
       - uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version: 3.12
 
       - name: install dependencies
         if: github.ref == matrix.deploy_ref

diff --git a/.github/workflows/labeled-pr.yml b/.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/[email protected].0
+    uses: ASFHyP3/actions/.github/workflows/[email protected].1
diff --git a/.github/workflows/release-checklist-comment.yml b/.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/[email protected].0
+    uses: ASFHyP3/actions/.github/workflows/[email protected].1
     permissions:
       pull-requests: write
     secrets:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   call-release-workflow:
-    uses: ASFHyP3/actions/.github/workflows/[email protected].0
+    uses: ASFHyP3/actions/.github/workflows/[email protected].1
     with:
       release_prefix: GRFN Ingest
       release_branch: prod

diff --git a/.github/workflows/static_analysis.yml b/.github/workflows/static_analysis.yml
@@ -12,7 +12,7 @@ jobs:
 
       - uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version: 3.12
 
       - run: |
           python -m pip install --upgrade pip

diff --git a/.github/workflows/tag-version.yml b/.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/[email protected].0
+    uses: ASFHyP3/actions/.github/workflows/[email protected].1
     with:
       user: tools-bot
       email: [email protected]

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ 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.1]
+### Changed
+- Upgraded all Lambda functions to Python 3.12
+
 ## [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.
 

diff --git a/cmr-token/cloudformation.yaml b/cmr-token/cloudformation.yaml
@@ -68,5 +68,5 @@ Resources:
       Handler: cmr_token.lambda_handler
       MemorySize: 128
       Role: !GetAtt Role.Arn
-      Runtime: python3.8
+      Runtime: python3.12
       Timeout: 60
diff --git a/environment.yml b/environment.yml
@@ -2,7 +2,7 @@ name: grfn-ingest
 channels:
   - conda-forge
 dependencies:
-  - python=3.8
+  - python=3.12
   - pip
   - pip:
     - pytest

diff --git a/ingest/cloudformation.yaml b/ingest/cloudformation.yaml
@@ -78,5 +78,5 @@ Resources:
       Handler: ingest.lambda_handler
       MemorySize: 128
       Role: !GetAtt Role.Arn
-      Runtime: python3.8
+      Runtime: python3.12
       Timeout: 180
diff --git a/invoke/cloudformation.yaml b/invoke/cloudformation.yaml
@@ -74,7 +74,7 @@ Resources:
       Handler: invoke.lambda_handler
       MemorySize: 128
       Role: !GetAtt Role.Arn
-      Runtime: python3.8
+      Runtime: python3.12
       Timeout: 120
 
   Schedule:

diff --git a/metadata-construction/cloudformation.yaml b/metadata-construction/cloudformation.yaml
@@ -82,5 +82,5 @@ Resources:
       Handler: metadata_construction.lambda_handler
       MemorySize: 128
       Role: !GetAtt Role.Arn
-      Runtime: python3.8
+      Runtime: python3.12
       Timeout: 60
diff --git a/metadata-to-cmr/cloudformation.yaml b/metadata-to-cmr/cloudformation.yaml
@@ -95,7 +95,7 @@ Resources:
       Handler: daemon.lambda_handler
       MemorySize: 128
       Role: !GetAtt Role.Arn
-      Runtime: python3.8
+      Runtime: python3.12
       Timeout: 900
 
   Schedule:

diff --git a/notify/cloudformation.yaml b/notify/cloudformation.yaml
@@ -93,5 +93,5 @@ Resources:
       Handler: notify.lambda_handler
       MemorySize: 128
       Role: !GetAtt Role.Arn
-      Runtime: python3.8
+      Runtime: python3.12
       Timeout: 60
diff --git a/requirements-cmr-token.txt b/requirements-cmr-token.txt
@@ -1,2 +1,2 @@
-boto3==1.34.70
-requests-pkcs12==1.24
+boto3==1.34.131
+requests-pkcs12==1.25
diff --git a/requirements-ingest.txt b/requirements-ingest.txt
@@ -1 +1 @@
-boto3==1.34.70
+boto3==1.34.131
diff --git a/requirements-invoke.txt b/requirements-invoke.txt
@@ -1 +1 @@
-boto3==1.34.70
+boto3==1.34.131
diff --git a/requirements-metadata-construction.txt b/requirements-metadata-construction.txt
@@ -1 +1 @@
-boto3==1.34.70
+boto3==1.34.131
diff --git a/requirements-metadata-to-cmr.txt b/requirements-metadata-to-cmr.txt
@@ -1,2 +1,2 @@
-boto3==1.34.70
-requests==2.31.0
+boto3==1.34.131
+requests==2.32.3
diff --git a/requirements-notify.txt b/requirements-notify.txt
@@ -1 +1 @@
-boto3==1.34.70
+boto3==1.34.131
diff --git a/requirements-verify.txt b/requirements-verify.txt
@@ -1,2 +1,2 @@
-boto3==1.34.70
-jsonschema==4.21.1
+boto3==1.34.131
+jsonschema==4.22.0
diff --git a/tests/example-message.json b/tests/example-message.json
@@ -1,20 +1,20 @@
 {
-  "ProductName": "S1-GUNW-A-R-014-tops-20230116_20220214-153036-00038E_00022N-PP-3708-v2_0_6",
+  "ProductName": "S1-GUNW-A-R-106-tops-20240517_20230429-002707-00093W_00001S-PP-67fa-v3_0_1",
   "DeliveryTime": "2023-04-19T20:06:35.712653",
   "ResponseTopic": {
     "Region": "us-east-1",
     "Arn": "arn:aws:sns:us-east-1:406893895021:hyp3-ingest-responses"
   },
   "Browse": {
     "Bucket": "grfn-test-data",
-    "Key": "S1-GUNW-A-R-014-tops-20230116_20220214-153036-00038E_00022N-PP-3708-v2_0_6.png"
+    "Key": "S1-GUNW-A-R-106-tops-20240517_20230429-002707-00093W_00001S-PP-67fa-v3_0_1.png"
   },
   "Metadata": {
     "Bucket": "grfn-test-data",
-    "Key": "S1-GUNW-A-R-014-tops-20230116_20220214-153036-00038E_00022N-PP-3708-v2_0_6.json"
+    "Key": "S1-GUNW-A-R-106-tops-20240517_20230429-002707-00093W_00001S-PP-67fa-v3_0_1.json"
   },
   "Product": {
     "Bucket": "grfn-test-data",
-    "Key": "S1-GUNW-A-R-014-tops-20230116_20220214-153036-00038E_00022N-PP-3708-v2_0_6.nc"
+    "Key": "S1-GUNW-A-R-106-tops-20240517_20230429-002707-00093W_00001S-PP-67fa-v3_0_1.nc"
   }
-}
+}
diff --git a/verify/cloudformation.yaml b/verify/cloudformation.yaml
@@ -54,5 +54,5 @@ Resources:
       Handler: verify.lambda_handler
       MemorySize: 128
       Role: !GetAtt Role.Arn
-      Runtime: python3.8
+      Runtime: python3.12
       Timeout: 90