Fix for stale references in DIST-S1 ISO XML #604
Conversation
See #595 (comment) Found also in CSLC-S1 and DSWx-NI
There was a problem hiding this comment.
Verified fix in the sandbox pipeline, so I think this is good to go. Just found one typo and a suggestion to simplify the regex we're using.
Also just FYI, you don't have to utilize the sandbox pipeline to run the integration test for a branch. The actual Integration Test pipeline can (and should) be used, since it will make it easier to find results from any given run (rather than having to remember and specify a specific build number)
src/opera/pge/dist_s1/dist_s1_pge.py
Outdated
| match_result = self._granule_filename_re.match(basename(geotiff_product)) | ||
|
|
||
| if match_result is None: | ||
| # This really should not happen due to bassing the _validate_outputs function but check anyway |
| r'(?P<creation_ts>(?P<cre_year>\d{4})(?P<cre_month>\d{2})(?P<cre_day>\d{2})T' | ||
| r'(?P<cre_hour>\d{2})(?P<cre_minute>\d{2})(?P<cre_second>\d{2})Z)_(?P<sensor>S1[AC]?)_' | ||
| r'(?P<spacing>30)_(?P<product_version>v\d+[.]\d+))') | ||
| _product_id_pattern = (r'(?P<id>(?P<project>OPERA)_(?P<level>L3)_(?P<product_type>DIST(-ALERT)?)-(?P<source>S1)_' |
There was a problem hiding this comment.
I just realized that we can simplify this regex a bit, since I don't think we'll have a need for granular access to the parsed timestamps, meaning we could remove the ?<acq_hour/minute/second> and ?P<cre_hour/minute/second> and just keep the full capture for ?p<acquisition_ts> and ?p<creation_ts>
There was a problem hiding this comment.
Trimmed it down quite nicely, thanks
Thanks, I mistakenly thought it was filtered to release/* branches like the release pipeline |
Description
Affected Issues
Testing