Merge branch 'release/2.18.1'

Terradue · Dec 11, 2023 · f1606d0 · f1606d0
2 parents 8271e29 + 3ff266b
commit f1606d0
Show file tree

Hide file tree

Showing 35 changed files with 1,626 additions and 88 deletions.
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -39,10 +39,7 @@ jobs:
       # https://github.com/sigstore/cosign-installer
       - name: Install cosign
         if: github.event_name != 'pull_request'
-        uses: sigstore/cosign-installer@f3c664df7af409cb4873aa5068053ba9d61a57b6 #v2.6.0
-        with:
-          cosign-release: 'v1.13.1'
-
+        uses: sigstore/[email protected]
 
       # Workaround: https://github.com/docker/build-push-action/issues/461
       - name: Setup Docker buildx
@@ -68,9 +65,9 @@ jobs:
 
       # Build and push Docker image with Buildx (don't push on PR)
       # https://github.com/docker/build-push-action
-      - name: Build and push Docker image
+      - name: Build and Push container images
+        uses: docker/[email protected]
         id: build-and-push
-        uses: docker/build-push-action@ac9327eae2b366085ac7f6a2d02df8aa8ead720a
         with:
           context: .
           push: ${{ github.event_name != 'pull_request' }}
@@ -88,7 +85,6 @@ jobs:
       - name: Sign the published Docker image
         if: ${{ github.event_name != 'pull_request' }}
         env:
-          COSIGN_EXPERIMENTAL: "true"
-        # This step uses the identity token to provision an ephemeral certificate
-        # against the sigstore community Fulcio instance.
-        run: echo "${{ steps.meta.outputs.tags }}" | xargs -I {} cosign sign {}@${{ steps.build-and-push.outputs.digest }}
+          DIGEST: ${{ steps.build-and-push.outputs.digest }}
+          TAGS: ${{ steps.docker_meta.outputs.tags }}
+        run: cosign sign --yes "${TAGS}@${DIGEST}"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,13 +7,47 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
-## [2.18.0](https://github.com/Terradue/Stars/compare/2.17.0...2.18.0)
+## [2.18.1](https://github.com/Terradue/Stars/compare/2.18.0...2.18.1)
 
-Complex Search Support for ISupplier
+Improved SAOCOM-1 metadata extraction
+
+### Merged
+
+- Improved SAOCOM-1 metadata extraction [`#41`](https://github.com/Terradue/Stars/pull/41)
+- Minor correction for BKA (title/mission etc.) [`#40`](https://github.com/Terradue/Stars/pull/40)
+
+### Commits
+
+- Added buggy newsat test case [`09377da`](https://github.com/Terradue/Stars/commit/09377da6621bad44f74b537efaced665fdc5a376)
+- Fixed (unrelated) NewSat extractor bug [`59f00de`](https://github.com/Terradue/Stars/commit/59f00de7aa4f8e40f8d9f56cffebb4af46daf64a)
+- Changes for correct extraction of nested SAOCOM zip files [`a3c1d19`](https://github.com/Terradue/Stars/commit/a3c1d194abd85ae0fd3b507c599b314d06de086a)
+
+## [2.18.0](https://github.com/Terradue/Stars/compare/2.17.2...2.18.0) - 2023-11-06
 
 ### Merged
 
 - Complex Search Support for ISupplier [`#37`](https://github.com/Terradue/Stars/pull/37)
+
+### Commits
+
+- SUPERVISOR-72: Search expression for Opensearchable [`03fff35`](https://github.com/Terradue/Stars/commit/03fff353dfbea341c016667d596675d45e8b36dc)
+- SUPERVISOR-72: more tests [`9b08066`](https://github.com/Terradue/Stars/commit/9b08066fd08fbb68996e99cfcbaa38b26e6207ce)
+- SUPERVISOR-72: tests ok [`8dc4bb2`](https://github.com/Terradue/Stars/commit/8dc4bb268e00338f1238cd77e4ac19173bf1da3d)
+
+## [2.17.2](https://github.com/Terradue/Stars/compare/2.17.1...2.17.2) - 2023-12-07
+
+### Commits
+
+- Fixed (unrelated) NewSat extractor bug [`259fcc9`](https://github.com/Terradue/Stars/commit/259fcc9c5c1279cb7e44538c0c2416966174d0da)
+- Minor correction for BKA (title/mission etc.) [`c6574c6`](https://github.com/Terradue/Stars/commit/c6574c61b52bd59885a1359f14b1b4859c25e092)
+- Disabled S3 testcase (SciHub shutdown and quicklook unavailability) [`510c9e6`](https://github.com/Terradue/Stars/commit/510c9e62970e43c099166b18c49b6e8f652b0ed3)
+
+## [2.17.1](https://github.com/Terradue/Stars/compare/2.17.0...2.17.1) - 2023-12-04
+
+Metadata extraction for BKA (National Acedemy of Science Belarus)
+
+### Merged
+
 - Metadata extraction for BKA (National Acedemy of Science Belarus) [`#38`](https://github.com/Terradue/Stars/pull/38)
 - Fix for cloud coverage filter on Copernicus Data Space OData [`#39`](https://github.com/Terradue/Stars/pull/39)
 
@@ -1474,7 +1508,7 @@ resolves #DATAAUTHOR-226
 ### Commits
 
 - many fixes + dotnetstac 1.0.0-rc.3 [`feaa2d4`](https://github.com/Terradue/Stars/commit/feaa2d4be6a34ca55d25952816c5d8ab500f7016)
--  src/Stars.Console/Terradue.Stars.Console.csproj [`69ca416`](https://github.com/Terradue/Stars/commit/69ca416a97d6cb1d1823a474c2b35b1f5fdf1f01)
+- src/Stars.Console/Terradue.Stars.Console.csproj [`69ca416`](https://github.com/Terradue/Stars/commit/69ca416a97d6cb1d1823a474c2b35b1f5fdf1f01)
 - .net5.0 unique exe [`043600b`](https://github.com/Terradue/Stars/commit/043600b6826a0b9061c84de4f63de6719732984a)
 
 ## [0.8.4](https://github.com/Terradue/Stars/compare/0.8.3...0.8.4) - 2021-05-27
@@ -1995,7 +2029,7 @@ resolves #DATAAUTHOR-226
 ### Commits
 
 - cleaning [`e46b9a6`](https://github.com/Terradue/Stars/commit/e46b9a6f83bd4248a31e950afc097fd1fdbcc850)
--  + ":${mType}${env.VERSION_TOOL}" [`2450858`](https://github.com/Terradue/Stars/commit/245085810e0390bcce4ede09fa3fff2bf517c582)
+- + ":${mType}${env.VERSION_TOOL}" [`2450858`](https://github.com/Terradue/Stars/commit/245085810e0390bcce4ede09fa3fff2bf517c582)
 
 ## [0.1.5](https://github.com/Terradue/Stars/compare/0.1.3...0.1.5) - 2020-09-28
 

diff --git a/src/Stars.Console/Terradue.Stars.Console.csproj b/src/Stars.Console/Terradue.Stars.Console.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFrameworks>net6.0</TargetFrameworks>
-    <Version>2.18.0</Version>
+    <Version>2.18.1</Version>
     <!-- <VersionSuffix>beta.8</VersionSuffix> -->
     <Description>Stars is a CLI for working with Spatio Temporal Catalog such as STAC but not only</Description>
     <Version Condition=" '$(VersionSuffix)' != '' ">$(Version)-$(VersionSuffix)</Version>

diff --git a/...rces/BKA/L1B/MetadataExtractorsTests_4077631-0220-MUL-B-1-1-1100761-150924T044238-ID.json b/...rces/BKA/L1B/MetadataExtractorsTests_4077631-0220-MUL-B-1-1-1100761-150924T044238-ID.json
@@ -40,9 +40,9 @@
   "properties": {
     "datetime": "2015-09-24T04:43:01.0000000Z",
     "created": "2021-06-11T15:35:42.0000000Z",
-    "platform": "bka/kanopus-v",
+    "platform": "bka",
     "constellation": "bka",
-    "mission": "bka",
+    "mission": "bka/kanopus-v",
     "instruments": [
       "mss"
     ],
@@ -56,7 +56,7 @@
     ],
     "view:azimuth": 84.08,
     "processing:level": "L1B",
-    "title": "BKA/KANOPUS-V MSS L1B 2015-09-24 04:43:01",
+    "title": "BKA MSS L1B 2015-09-24 04:43:01",
     "providers": [
       {
         "name": "NAS",

diff --git a/...rces/BKA/L1B/MetadataExtractorsTests_4077631-0220-PAN-B-1-1-1100761-150924T044238-ID.json b/...rces/BKA/L1B/MetadataExtractorsTests_4077631-0220-PAN-B-1-1-1100761-150924T044238-ID.json
@@ -38,9 +38,9 @@
   "properties": {
     "datetime": "2015-09-24T04:43:02.0000000Z",
     "created": "2021-06-11T15:35:50.0000000Z",
-    "platform": "bka/kanopus-v",
+    "platform": "bka",
     "constellation": "bka",
-    "mission": "bka",
+    "mission": "bka/kanopus-v",
     "instruments": [
       "mss"
     ],
@@ -54,7 +54,7 @@
     ],
     "view:azimuth": 84.08,
     "processing:level": "L1B",
-    "title": "BKA/KANOPUS-V MSS L1B 2015-09-24 04:43:02",
+    "title": "BKA MSS L1B 2015-09-24 04:43:02",
     "providers": [
       {
         "name": "NAS",

diff --git a/...rces/BKA/L1C/MetadataExtractorsTests_4077631-0220-MUL-C-1-1-1100761-150924T044238-ID.json b/...rces/BKA/L1C/MetadataExtractorsTests_4077631-0220-MUL-C-1-1-1100761-150924T044238-ID.json
@@ -40,9 +40,9 @@
   "properties": {
     "datetime": "2015-09-24T04:43:01.0000000Z",
     "created": "2021-06-11T16:38:46.0000000Z",
-    "platform": "bka/kanopus-v",
+    "platform": "bka",
     "constellation": "bka",
-    "mission": "bka",
+    "mission": "bka/kanopus-v",
     "instruments": [
       "mss"
     ],
@@ -56,7 +56,7 @@
     ],
     "view:azimuth": 84.08,
     "processing:level": "L1C",
-    "title": "BKA/KANOPUS-V MSS L1C 2015-09-24 04:43:01",
+    "title": "BKA MSS L1C 2015-09-24 04:43:01",
     "providers": [
       {
         "name": "NAS",

diff --git a/...rces/BKA/L1C/MetadataExtractorsTests_4077631-0220-PAN-C-1-1-1100761-150924T044238-ID.json b/...rces/BKA/L1C/MetadataExtractorsTests_4077631-0220-PAN-C-1-1-1100761-150924T044238-ID.json
@@ -38,9 +38,9 @@
   "properties": {
     "datetime": "2015-09-24T04:43:02.0000000Z",
     "created": "2021-06-11T16:38:54.0000000Z",
-    "platform": "bka/kanopus-v",
+    "platform": "bka",
     "constellation": "bka",
-    "mission": "bka",
+    "mission": "bka/kanopus-v",
     "instruments": [
       "mss"
     ],
@@ -54,7 +54,7 @@
     ],
     "view:azimuth": 84.08,
     "processing:level": "L1C",
-    "title": "BKA/KANOPUS-V MSS L1C 2015-09-24 04:43:02",
+    "title": "BKA MSS L1C 2015-09-24 04:43:02",
     "providers": [
       {
         "name": "NAS",

diff --git a/...AOCOM-1/L1A/MetadataExtractorsTests_S1A_OPER_SAR_EOSSP__CORE_L1A_OLF_20211117T174240.json b/...AOCOM-1/L1A/MetadataExtractorsTests_S1A_OPER_SAR_EOSSP__CORE_L1A_OLF_20211117T174240.json
@@ -38,6 +38,8 @@
   },
   "properties": {
     "sat:orbit_state": "ascending",
+    "saocom:path": 149,
+    "saocom:row": 447,
     "proj:epsg": null,
     "proj:shape": [
       6419,
@@ -105,16 +107,16 @@
       "roles": [
         "metadata"
       ],
-      "href": "S1A_OPER_SAR_EOSSP__CORE_L1A_OLF_20211117T174240/Data/slc-acqId0000588416-a-sm5-2111181029-s5dp-hh.xml",
-      "filename": "Data/slc-acqId0000588416-a-sm5-2111181029-s5dp-hh.xml"
+      "href": "data/286806-EOL1ASARSAO1A3111864/Data/slc-acqId0000588416-a-sm5-2111181029-s5dp-hh.xml",
+      "filename": "Data/slc-acqId0000588416-a-sm5-2111181029-s5dp-hh.xml",
     },
     "amplitude-hh": {
       "type": "image/tiff; application=geotiff",
       "roles": [
         "amplitude",
         "data"
       ],
-      "href": "S1A_OPER_SAR_EOSSP__CORE_L1A_OLF_20211117T174240/Data/slc-acqId0000588416-a-sm5-2111181029-s5dp-hh",
+      "href": "data/286806-EOL1ASARSAO1A3111864/Data/slc-acqId0000588416-a-sm5-2111181029-s5dp-hh",
       "filename": "Data/slc-acqId0000588416-a-sm5-2111181029-s5dp-hh",
       "sar:polarizations": [
         "HH"
@@ -125,21 +127,21 @@
       "roles": [
         "metadata"
       ],
-      "href": "S1A_OPER_SAR_EOSSP__CORE_L1A_OLF_20211117T174240/Data/slc-acqId0000588416-a-sm5-2111181029-s5dp-hv.xml",
-      "filename": "Data/slc-acqId0000588416-a-sm5-2111181029-s5dp-hv.xml"
+      "href": "data/286806-EOL1ASARSAO1A3111864/Data/slc-acqId0000588416-a-sm5-2111181029-s5dp-hv.xml",
+      "filename": "Data/slc-acqId0000588416-a-sm5-2111181029-s5dp-hv.xml",
     },
     "amplitude-hv": {
       "type": "image/tiff; application=geotiff",
       "roles": [
         "amplitude",
         "data"
       ],
-      "href": "S1A_OPER_SAR_EOSSP__CORE_L1A_OLF_20211117T174240/Data/slc-acqId0000588416-a-sm5-2111181029-s5dp-hv",
+      "href": "data/286806-EOL1ASARSAO1A3111864/Data/slc-acqId0000588416-a-sm5-2111181029-s5dp-hv",
       "filename": "Data/slc-acqId0000588416-a-sm5-2111181029-s5dp-hv",
       "sar:polarizations": [
         "HV"
       ]
     }
   },
   "links": []
-}
+}
diff --git a/...AOCOM-1/L1C/MetadataExtractorsTests_S1A_OPER_SAR_EOSSP__CORE_L1C_OLF_20200304T225242.json b/...AOCOM-1/L1C/MetadataExtractorsTests_S1A_OPER_SAR_EOSSP__CORE_L1C_OLF_20200304T225242.json
@@ -37,17 +37,9 @@
     ]
   },
   "properties": {
-    "datetime": "2019-11-08T09:50:27.048Z",
-    "created": "2020-03-04T23:12:48Z",
-    "platform": "saocom-1a",
-    "mission": "saocom-1",
-    "instruments": [
-      "sao1a"
-    ],
-    "sensor_type": "radar",
-    "gsd": 10.0,
-    "title": "SAOCOM-1A SAO1A GEC VV/VH/HH/HV 2019-11-08 09:50:27",
     "sat:orbit_state": "descending",
+    "saocom:path": 34,
+    "saocom:row": 151,
     "proj:epsg": null,
     "proj:shape": [
       4463,
@@ -71,6 +63,16 @@
     "sar:resolution_range": 10.0,
     "sar:resolution_azimuth": 10.0,
     "processing:level": "L1C",
+    "datetime": "2019-11-08T09:50:27.048Z",
+    "created": "2020-03-04T23:12:48Z",
+    "platform": "saocom-1a",
+    "mission": "saocom-1",
+    "instruments": [
+      "sao1a"
+    ],
+    "sensor_type": "radar",
+    "gsd": 10.0,
+    "title": "SAOCOM-1A SAO1A GEC VV/VH/HH/HV 2019-11-08 09:50:27",
     "providers": [
       {
         "name": "CONAE",

diff --git a/...OCOM-1/L1D/MetadataExtractorsTests_S1A_OPER_SAR_EOSSP__CORE_L1D_OLVF_20200819T231514.json b/...OCOM-1/L1D/MetadataExtractorsTests_S1A_OPER_SAR_EOSSP__CORE_L1D_OLVF_20200819T231514.json
@@ -37,16 +37,9 @@
     ]
   },
   "properties": {
-    "datetime": "2020-08-19T21:17:26.613Z",
-    "created": "2020-08-20T01:29:31Z",
-    "platform": "saocom-1a",
-    "mission": "saocom-1",
-    "instruments": [
-      "sao1a"
-    ],
-    "sensor_type": "radar",
-    "title": "SAOCOM-1A SAO1A GTC VV/VH 2020-08-19 21:17:26",
     "sat:orbit_state": "ascending",
+    "saocom:row": 529,
+    "saocom:path": 137,
     "proj:epsg": null,
     "proj:shape": [
       9848,
@@ -68,6 +61,15 @@
     "sar:resolution_range": 50.0,
     "sar:resolution_azimuth": 50.0,
     "processing:level": "L1D",
+    "datetime": "2020-08-19T21:17:26.613Z",
+    "created": "2020-08-20T01:29:31Z",
+    "platform": "saocom-1a",
+    "mission": "saocom-1",
+    "instruments": [
+      "sao1a"
+    ],
+    "sensor_type": "radar",
+    "title": "SAOCOM-1A SAO1A GTC VV/VH 2020-08-19 21:17:26",
     "providers": [
       {
         "name": "CONAE",

diff --git a/...OCOM-1/L1D/MetadataExtractorsTests_S1A_OPER_SAR_EOSSP__CORE_L1D_OLVF_20210204T093006.json b/...OCOM-1/L1D/MetadataExtractorsTests_S1A_OPER_SAR_EOSSP__CORE_L1D_OLVF_20210204T093006.json
@@ -37,16 +37,9 @@
     ]
   },
   "properties": {
-    "datetime": "2021-02-04T04:14:38.399Z",
-    "created": "2021-02-04T10:43:10Z",
-    "platform": "saocom-1a",
-    "mission": "saocom-1",
-    "instruments": [
-      "sao1a"
-    ],
-    "sensor_type": "radar",
-    "title": "SAOCOM-1A SAO1A GTC VV/VH/HH/HV 2021-02-04 04:14:38",
     "sat:orbit_state": "ascending",
+    "saocom:row": 406,
+    "saocom:path": 209,
     "proj:epsg": null,
     "proj:shape": [
       4817,
@@ -70,6 +63,15 @@
     "sar:resolution_range": 50.0,
     "sar:resolution_azimuth": 50.0,
     "processing:level": "L1D",
+    "datetime": "2021-02-04T04:14:38.399Z",
+    "created": "2021-02-04T10:43:10Z",
+    "platform": "saocom-1a",
+    "mission": "saocom-1",
+    "instruments": [
+      "sao1a"
+    ],
+    "sensor_type": "radar",
+    "title": "SAOCOM-1A SAO1A GTC VV/VH/HH/HV 2021-02-04 04:14:38",
     "providers": [
       {
         "name": "CONAE",