Skip to content

Commit

Permalink
Merge branch 'release/2.16.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
floeschau committed Sep 26, 2023
2 parents 749a76e + 7e744e8 commit a9a6a6b
Show file tree
Hide file tree
Showing 339 changed files with 26,787 additions and 3,817 deletions.
14 changes: 14 additions & 0 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# [Choice] .NET version: 6.0, 3.1, 6.0-bullseye, 3.1-bullseye, 6.0-focal, 3.1-focal
ARG VARIANT=6.0-bullseye
FROM mcr.microsoft.com/vscode/devcontainers/dotnet:0-${VARIANT}

# [Choice] Node.js version: none, lts/*, 18, 16, 14
ARG NODE_VERSION="none"
RUN if [ "${NODE_VERSION}" != "none" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi

# [Optional] Uncomment this section to install additional OS packages.
# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
# && apt-get -y install --no-install-recommends <your-package-list-here>

# [Optional] Uncomment this line to install global node packages.
# RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g <your-package-here>" 2>&1
56 changes: 56 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
{
"name": "C# (.NET)",
"build": {
"dockerfile": "Dockerfile",
"args": {
// Update 'VARIANT' to pick a .NET Core version: 3.1, 6.0
// Append -bullseye or -focal to pin to an OS version.
"VARIANT": "6.0-bullseye",
// Options
"NODE_VERSION": "lts/*"
}
},

// Configure tool-specific properties.
"customizations": {
// Configure properties specific to VS Code.
"vscode": {
// Add the IDs of extensions you want installed when the container is created.
"extensions": [
"ms-dotnettools.csharp"
]
}
},

// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [5000, 5001],

// [Optional] To reuse of your local HTTPS dev cert:
//
// 1. Export it locally using this command:
// * Windows PowerShell:
// dotnet dev-certs https --trust; dotnet dev-certs https -ep "$env:USERPROFILE/.aspnet/https/aspnetapp.pfx" -p "SecurePwdGoesHere"
// * macOS/Linux terminal:
// dotnet dev-certs https --trust; dotnet dev-certs https -ep "${HOME}/.aspnet/https/aspnetapp.pfx" -p "SecurePwdGoesHere"
//
// 2. Uncomment these 'remoteEnv' lines:
// "remoteEnv": {
// "ASPNETCORE_Kestrel__Certificates__Default__Password": "SecurePwdGoesHere",
// "ASPNETCORE_Kestrel__Certificates__Default__Path": "/home/vscode/.aspnet/https/aspnetapp.pfx",
// },
//
// 3. Do one of the following depending on your scenario:
// * When using GitHub Codespaces and/or Remote - Containers:
// 1. Start the container
// 2. Drag ~/.aspnet/https/aspnetapp.pfx into the root of the file explorer
// 3. Open a terminal in VS Code and run "mkdir -p /home/vscode/.aspnet/https && mv aspnetapp.pfx /home/vscode/.aspnet/https"
//
// * If only using Remote - Containers with a local container, uncomment this line instead:
// "mounts": [ "source=${env:HOME}${env:USERPROFILE}/.aspnet/https,target=/home/vscode/.aspnet/https,type=bind" ],

// Use 'postCreateCommand' to run commands after the container is created.
// "postCreateCommand": "dotnet restore src/Stars.Console/",

// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
"remoteUser": "vscode"
}
2 changes: 2 additions & 0 deletions .github/workflows/dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ jobs:
uses: actions/setup-dotnet@v3
with:
global-json-file: global.json
- name: Install dependencies (hdf5)
run: sudo apt install hdf5-tools -y
- name: Restore dependencies
run: dotnet restore src/
- name: Build
Expand Down
36 changes: 35 additions & 1 deletion .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -726,6 +726,40 @@
"moduleLoad": false
}
},
{
"name": "Copy from ASF",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
// If you have changed target frameworks, make sure to update the program path.
"program": "${workspaceFolder}/src/Stars.Console/bin/Debug/net6.0/Stars.dll",
"args": [
"copy",
"https://catalog.terradue.com/sentinel1/search?uid=S1A_IW_SLC__1SDV_20211227T163210_20211227T163237_041197_04E53D_3B0C",
"-v",
"-r",
"4",
"-si",
"ASF",
"--empty",
"--stop-on-error",
"--output",
"/tmp/stars"
],
"cwd": "${workspaceFolder}/src",
"env": {
// "AWS__Profile": "scw",
// "AWS__ServiceURL": "https://s3.pl-waw.scw.cloud",
// "AWS__Region": "pl-waw",
// "AWS__AuthenticationRegion": "pl-waw",
},
// For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
"console": "internalConsole",
"stopAtEntry": false,
"logging": {
"moduleLoad": false
}
},
{
"name": "Copy from creodias",
"type": "coreclr",
Expand Down Expand Up @@ -769,7 +803,7 @@
// "--nocopy-cog",
"--output",
"/tmp/stars",
"https://earth-search.s3.us-west-2.amazonaws.com/sentinel-s2-l1c/10/T/FK/2021/7/S2B_10TFK_20210713_0_L1C/S2B_10TFK_20210713_0_L1C.json"
"https://earth-search.aws.element84.com/v1/collections/sentinel-2-l2a/items/S2A_17UNQ_20230511_0_L2A"
],
"cwd": "${workspaceFolder}/src",
// For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
Expand Down
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@
],
"omnisharp.disableMSBuildDiagnosticWarning": true,
"dotnet-test-explorer.testProjectPath": "**/*Tests.@(csproj|vbproj|fsproj)",
"jira-plugin.workingProject": "DATAAUTHOR"
"jira-plugin.workingProject": "DATAAUTHOR",
"dotnet.defaultSolution": "src/Terradue.Stars.sln"
}
169 changes: 168 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,174 @@ 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.12.0](https://github.com/Terradue/Stars/compare/2.11.3...2.12.0)
## [2.16.2](https://github.com/Terradue/Stars/compare/2.16.1...2.16.2)

### Commits

- fix null content [`f6953f4`](https://github.com/Terradue/Stars/commit/f6953f4a2f9816562898668871179c58cb6d7e52)

## [2.16.1](https://github.com/Terradue/Stars/compare/2.16.0...2.16.1) - 2023-09-22

### Commits

- fix null offering [`14546eb`](https://github.com/Terradue/Stars/commit/14546ebac49862d146307a28b1c2ee1be64fbf63)

## [2.16.0](https://github.com/Terradue/Stars/compare/2.15.5...2.16.0) - 2023-09-22

### Merged

- Image overlay offering for collection atom publication [`#29`](https://github.com/Terradue/Stars/pull/29)

### Commits

- offering link mapper support [`d6ed64d`](https://github.com/Terradue/Stars/commit/d6ed64db2e450031b3c0f542881b9d03897dd275)

## [2.15.5](https://github.com/Terradue/Stars/compare/2.15.4...2.15.5) - 2023-09-01

### Commits

- Fix nre fox DataHub when only icon [`5004100`](https://github.com/Terradue/Stars/commit/500410096624d77312501e471cb5937761cede49)

## [2.15.4](https://github.com/Terradue/Stars/compare/2.15.3...2.15.4) - 2023-08-29

### Merged

- Feature/esacpe 1597 [`#28`](https://github.com/Terradue/Stars/pull/28)

### Commits

- ESACPE-1597 added new PNEO test case with JP2 files [`a8c4743`](https://github.com/Terradue/Stars/commit/a8c474345fc6baf34387b53502329a009b3c9f58)
- ESACPE-1597 PNEO minor issues fix [`a7d40a4`](https://github.com/Terradue/Stars/commit/a7d40a4b589c8bd15aeccf49af88e8e2e4b19197)
- PNEO band asset name fix [`b461984`](https://github.com/Terradue/Stars/commit/b461984ab6253dfb067fb1561bf12e5b3db0d9b1)

## [2.15.3](https://github.com/Terradue/Stars/compare/2.15.2...2.15.3) - 2023-08-28

### Merged

- CBERS-4/4A raster band offset value [`#27`](https://github.com/Terradue/Stars/pull/27)

### Commits

- CBERS raster band offset [`5cbf020`](https://github.com/Terradue/Stars/commit/5cbf020e1bd349fd6e66b0826615bff37e62090c)

## [2.15.2](https://github.com/Terradue/Stars/compare/2.15.1...2.15.2) - 2023-08-28

### Merged

- CBERS compose fix [`#26`](https://github.com/Terradue/Stars/pull/26)
- Pleiades NEO harvesting support [`#22`](https://github.com/Terradue/Stars/pull/22)

### Commits

- PLEIADES-NEO unit-test reference input data upload (.TIF created @zero-bytes with touch command) [`51e6868`](https://github.com/Terradue/Stars/commit/51e686843f399d41af8494406ce37f64f1702e8e)
- ESACPE-1597 #comment Pleiades NEO support for PMS-FS and MS-FS spectralProcessing [`6f0d97a`](https://github.com/Terradue/Stars/commit/6f0d97adb44ddbbfa21a260697adbee1e16e81da)
- base Schema file to modify according to the xml DIM files diff [`b77eb27`](https://github.com/Terradue/Stars/commit/b77eb2795a7a303bb4b29fd4d8ba1d5af0b92e67)

## [2.15.1](https://github.com/Terradue/Stars/compare/2.15.0...2.15.1) - 2023-08-25

### Merged

- Additional changes for CBERS-4/4A [`#24`](https://github.com/Terradue/Stars/pull/24)

### Commits

- Additional changes for CBERS-4/4A (raster:bands/scale etc.) [`e24c5d8`](https://github.com/Terradue/Stars/commit/e24c5d80a574ce98941724b325608d61c8be4865)
- Corrections for geometry [`d84bcf9`](https://github.com/Terradue/Stars/commit/d84bcf904de43c77ebf72a5538b843360c2dbb99)

## [2.15.0](https://github.com/Terradue/Stars/compare/2.14.6...2.15.0) - 2023-08-21

### Merged

- Feature/esacpe 1586 [`#23`](https://github.com/Terradue/Stars/pull/23)
- Adjusted filenames for zipped assets to produce correct directory structure (SAOCOM) [`#21`](https://github.com/Terradue/Stars/pull/21)

### Commits

- Changes for CBERS-4/CBERS-4A (including unit test updates) [`cdb23d9`](https://github.com/Terradue/Stars/commit/cdb23d974f6be96997cc2e580a84c04e1381ac2d)
- support for CBERS products with csv metadata files [`764d8c4`](https://github.com/Terradue/Stars/commit/764d8c4905ecdff58e5aefcecf4736521fde8465)
- CBERS-4 new test cases with csv metadata files added [`10be1e1`](https://github.com/Terradue/Stars/commit/10be1e1e155ffcfb46d74e95791a8dd31e249f29)

## [2.14.5](https://github.com/Terradue/Stars/compare/2.14.4...2.14.5) - 2023-07-26

### Merged

- Sentinel-2 metadata extractor with eo:cloud_cover property [`#20`](https://github.com/Terradue/Stars/pull/20)
- Revert PR #10 and improved error handling [`#19`](https://github.com/Terradue/Stars/pull/19)

### Commits

- Changes for Sentinel-2 cloud cover STAC property [`bbd59c0`](https://github.com/Terradue/Stars/commit/bbd59c05b2073b0afd9afe77c33d5dfe6346acd5)
- Renamed file [`6ccb4b8`](https://github.com/Terradue/Stars/commit/6ccb4b8d1ab187136d6a5cf80954bde06b878b15)

## [2.14.4](https://github.com/Terradue/Stars/compare/2.14.3...2.14.4) - 2023-07-25

### Commits

- Revert PR #10 and improved error handling [`5dc7f4b`](https://github.com/Terradue/Stars/commit/5dc7f4bb14a87c0a760e4028e0dd95697482d7b0)
- Specific checks for stop on error [`999a5e9`](https://github.com/Terradue/Stars/commit/999a5e957d402457549f2e62081eac42d02acbf2)

## [2.14.3](https://github.com/Terradue/Stars/compare/2.14.2...2.14.3) - 2023-07-20

### Merged

- [ATOM translator] cloud cover from STAC [`#18`](https://github.com/Terradue/Stars/pull/18)

### Commits

- Test Added [`5214a13`](https://github.com/Terradue/Stars/commit/5214a13b1a36175a332c93ebce6ce51a69620fa2)
- fixed tests [`932560b`](https://github.com/Terradue/Stars/commit/932560b5b0ba0bf3292cc780895e395a4cc6523b)

## [2.14.2](https://github.com/Terradue/Stars/compare/2.14.1...2.14.2) - 2023-07-19

### Commits

- better error handling [`937ebe6`](https://github.com/Terradue/Stars/commit/937ebe6c5526dd84d1a0635c52f688047ad08477)

## [2.14.1](https://github.com/Terradue/Stars/compare/2.14.0...2.14.1) - 2023-07-19

### Commits

- mission to parent identifier [`85108d8`](https://github.com/Terradue/Stars/commit/85108d8b9784f0ce5b5d537f674938ac36419e82)

## [2.14.0](https://github.com/Terradue/Stars/compare/2.13.0...2.14.0) - 2023-07-19

### Merged

- SAOCOM metadata extraction from nested ZIP file [`#17`](https://github.com/Terradue/Stars/pull/17)

### Commits

- better tests [`d8d9373`](https://github.com/Terradue/Stars/commit/d8d9373e11e4467369a29b8c81c4454fa3a2be76)
- Added SAOCOM test case for nested ZIP (not currently working) [`89902d1`](https://github.com/Terradue/Stars/commit/89902d1f39866272b4948797d66d481b1189d863)
- SAOCOM metadata extraction from nested ZIP [`e65f862`](https://github.com/Terradue/Stars/commit/e65f862e032ac83dc6c2a41cd70d23ca8b661bfd)

## [2.13.0](https://github.com/Terradue/Stars/compare/2.12.1...2.13.0) - 2023-07-12

### Merged

- Skip S3 access for public buckets [`#16`](https://github.com/Terradue/Stars/pull/16)
- Bump System.Linq.Dynamic.Core from 1.2.9 to 1.3.0 in /src/Stars.Services [`#14`](https://github.com/Terradue/Stars/pull/14)
- Fix for Copernicus Data Space (OData API) downloads [`#15`](https://github.com/Terradue/Stars/pull/15)

### Commits

- saocom publication test [`edc33a9`](https://github.com/Terradue/Stars/commit/edc33a9e65931b00d5f85bfaf0c48e3288482ca1)
- Skip S3 in case of http 200 [`4ce53c6`](https://github.com/Terradue/Stars/commit/4ce53c60e79069e5f3bb3f03613472b09a9b59d5)
- Fix for failing downloads from Copernicus Data Space (DAS) [`35694ac`](https://github.com/Terradue/Stars/commit/35694ac643735582cf7ed46df6da3ec41916cff5)

## [2.12.1](https://github.com/Terradue/Stars/compare/2.12.0...2.12.1) - 2023-06-19

### Merged

- COSMO SkyMed HDF5 functionality [`#13`](https://github.com/Terradue/Stars/pull/13)

### Commits

- Updated test case settings [`9dca5f6`](https://github.com/Terradue/Stars/commit/9dca5f6d896ead52006e602596584f1f6af9b699)
- Version 2.12.1 [`c916b25`](https://github.com/Terradue/Stars/commit/c916b2546b343597a46222207ccd0311ea8b99e0)
- Removed CSK test cases from automatic execution again (not testable on GitHub due to use of h5dump command) [`fa779d7`](https://github.com/Terradue/Stars/commit/fa779d78f0d04f7bf6db64cd960fb7b72fd1db20)

## [2.12.0](https://github.com/Terradue/Stars/compare/2.11.3...2.12.0) - 2023-06-12

### Merged

Expand Down
17 changes: 13 additions & 4 deletions src/Stars.Console/Operations/CopyOperation.cs
Original file line number Diff line number Diff line change
Expand Up @@ -265,8 +265,17 @@ private async Task<object> CopyNodeAsync(IResource node, IRouter router, object
}
AssetChecks assetChecks = GetAssetChecks();
AssetImportReport deliveryReport = await assetService.ImportAssetsAsync(supplierNode as IAssetsContainer, destination, assetFilters, assetChecks, ct);
if (StopOnError && deliveryReport.AssetsExceptions.Count > 0)
throw new AggregateException(deliveryReport.AssetsExceptions.Values);

// Process cases that must raise an exception
if (StopOnError)
{
// exception in delivery report
if (deliveryReport.AssetsExceptions.Count > 0)
throw new AggregateException(deliveryReport.AssetsExceptions.Values);
// no delivery but exception in quotation
if (deliveryReport.AssetsExceptions.Count == 0 && deliveryReport.Quotation.AssetsExceptions != null)
throw new AggregateException(deliveryReport.Quotation.AssetsExceptions.Values);
}

if (deliveryReport.ImportedAssets.Count() > 0)
stacItemNode.StacItem.MergeAssets(deliveryReport, !KeepOriginalAssets);
Expand Down Expand Up @@ -315,9 +324,9 @@ private async Task<object> CopyNodeAsync(IResource node, IRouter router, object

private AssetChecks GetAssetChecks()
{
if ( NoHtmlAsset )
if (NoHtmlAsset)
return AssetChecks.NoHtml;

return AssetChecks.None;
}

Expand Down
2 changes: 1 addition & 1 deletion src/Stars.Console/Terradue.Stars.Console.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net6.0</TargetFrameworks>
<Version>2.12.2</Version>
<Version>2.16.3</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>
Expand Down
Loading

0 comments on commit a9a6a6b

Please sign in to comment.