Merge pull request #1026 from ASFHyP3/extend_s2_name

Revise max S2 filename length to 25
ASFHyP3 · May 19, 2022 · 41721c3 · 41721c3
2 parents 9574a96 + f8ddcc2
commit 41721c3
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,9 @@ 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).
 
+## [2.17.3]
+### Fixed
+AUTORIFT jobs can now be submitted for Sentinel-2 scenes with 25-character Earth Search names. Fixes [#1022](https://github.com/ASFHyP3/hyp3/issues/1022).
 
 ## [2.17.2]
 ### Fixed

diff --git a/job_spec/AUTORIFT.yml b/job_spec/AUTORIFT.yml
@@ -30,7 +30,7 @@ AUTORIFT:
               type: string
               pattern: "^S2[AB]_.*_L1C"
               minLength: 23
-              maxLength: 24
+              maxLength: 25
               example: S2A_22WEB_20200627_0_L1C
             - description: The name of the Landsat 8 or 9 Collection 2 granule to process
               type: string

diff --git a/job_spec/AUTORIFT_ITS_LIVE.yml b/job_spec/AUTORIFT_ITS_LIVE.yml
@@ -30,7 +30,7 @@ AUTORIFT:
               type: string
               pattern: "^S2[AB]_.*_L1C"
               minLength: 23
-              maxLength: 24
+              maxLength: 25
               example: S2A_22WEB_20200627_0_L1C
             - description: The name of the Landsat 8 or 9 Collection 2 granule to process
               type: string

diff --git a/tests/test_api/test_submit_job.py b/tests/test_api/test_submit_job.py
@@ -262,6 +262,7 @@ def test_submit_good_autorift_granule_names(client, tables):
         'S2A_MSIL1C_20200627T150921_N0209_R025_T22WEB_20200627T170912',
         'S2A_1UCR_20210124_0_L1C',
         'S2B_22WEB_20200612_0_L1C',
+        'S2A_22XEQ_20190610_10_L1C',
         'LC08_L1TP_009011_20200820_20200905_02_T1',
         'LO08_L1GT_043001_20201106_20201110_02_T2',
         'LC09_L1GT_215109_20220125_20220125_02_T2',
@@ -299,6 +300,12 @@ def test_submit_bad_autorift_granule_names(client):
         # bad L8 sensor mode
         'LT08_L1GT_041001_20200125_20200925_02_T2',
         'LT09_L1GT_215109_20220125_20220125_02_T2',
+        # S2 name too long
+        'S2B_22XEQ_20190610_11_XL1C',
+        'S2A_22XEQ_20190610_10_XL1C',
+        # S2 name too short
+        'S2B_22XEQ_20190610_L1C',
+        'S2A_22XEQ_20190610_L1C',
     ]
     for granule in bad_granule_names:
         batch = [