From 5a42ea8cbb32032b58e239d91703f86df21d972e Mon Sep 17 00:00:00 2001 From: Emmanuel Mathot Date: Mon, 26 Feb 2024 08:47:50 +0100 Subject: [PATCH 1/2] fix for empty serviceUrl in AmazonCustomS3Config.cs --- .vscode/launch.json | 2 +- src/Stars.Services/Resources/AmazonCustomS3Config.cs | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index cf984ae4..844db564 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -829,7 +829,7 @@ "-nohtml", "--output", "/tmp/stars", - "https://catalog.terradue.com/landsat8/search?format=atom&uid=LC09_L1TP_163003_20220926_20220926_02_T1" + "https://catalog.terradue.com/landsat-9/search?format=atom&uid=LC09_L1TP_001085_20240205_20240205_02_T1" ], "cwd": "${workspaceFolder}/src", // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console diff --git a/src/Stars.Services/Resources/AmazonCustomS3Config.cs b/src/Stars.Services/Resources/AmazonCustomS3Config.cs index c8596a59..afe2acad 100644 --- a/src/Stars.Services/Resources/AmazonCustomS3Config.cs +++ b/src/Stars.Services/Resources/AmazonCustomS3Config.cs @@ -3,14 +3,14 @@ namespace Terradue.Stars.Services.Resources { - internal class AmazonCustomS3Config: AmazonS3Config + internal class AmazonCustomS3Config : AmazonS3Config { private string _region; private string _serviceURL; public override string DetermineServiceURL() { - if ( !string.IsNullOrEmpty(_serviceURL) ) + if (!string.IsNullOrEmpty(_serviceURL)) { return _serviceURL; } @@ -26,7 +26,10 @@ internal void ForceCustomRegion(string region) internal void SetServiceURL(string serviceURL) { _serviceURL = serviceURL; - this.ServiceURL = _serviceURL; + if (!string.IsNullOrEmpty(_serviceURL)) + { + this.ServiceURL = _serviceURL; + } } } } \ No newline at end of file From 9dfb5dd5df6b05edc68dd372696dc49129fc91cb Mon Sep 17 00:00:00 2001 From: Emmanuel Mathot Date: Mon, 26 Feb 2024 08:48:54 +0100 Subject: [PATCH 2/2] Update version numbers to 2.19.5 --- CHANGELOG.md | 9 +++++++-- src/Stars.Console/Terradue.Stars.Console.csproj | 2 +- src/Stars.Data/Terradue.Stars.Data.csproj | 2 +- src/Stars.Services/Terradue.Stars.Services.csproj | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 54aea559..064e091f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,12 +7,17 @@ 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.19.4](https://github.com/Terradue/Stars/compare/2.19.3...2.19.4) +## [2.19.5](https://github.com/Terradue/Stars/compare/2.19.4...2.19.5) -***Add SessionToken property to S3Options +### Commits + +- fix for empty serviceUrl in AmazonCustomS3Config.cs [`5a42ea8`](https://github.com/Terradue/Stars/commit/5a42ea8cbb32032b58e239d91703f86df21d972e) + +## [2.19.4](https://github.com/Terradue/Stars/compare/2.19.3...2.19.4) - 2024-02-20 ### Commits +- Update version numbers to 2.19.4 [`770bc57`](https://github.com/Terradue/Stars/commit/770bc5730f260056bff5c3e8f100e16d69a5f590) - Fix GetWebIdentityCredentialsAsync parameter name in IS3ClientFactory [`d7ab7f5`](https://github.com/Terradue/Stars/commit/d7ab7f56d7b1da1f9f324dcc17aa46c3041cd001) - Fix S3ClientFactory to handle session tokens*** [`a153fff`](https://github.com/Terradue/Stars/commit/a153fffae307684bc281c45187a59f4e21c80a8f) diff --git a/src/Stars.Console/Terradue.Stars.Console.csproj b/src/Stars.Console/Terradue.Stars.Console.csproj index 1f5195e3..f2fbc7b0 100644 --- a/src/Stars.Console/Terradue.Stars.Console.csproj +++ b/src/Stars.Console/Terradue.Stars.Console.csproj @@ -2,7 +2,7 @@ Exe net6.0 - 2.19.4 + 2.19.5 Stars is a CLI for working with Spatio Temporal Catalog such as STAC but not only $(Version)-$(VersionSuffix) diff --git a/src/Stars.Data/Terradue.Stars.Data.csproj b/src/Stars.Data/Terradue.Stars.Data.csproj index 5731fd7f..fe029016 100644 --- a/src/Stars.Data/Terradue.Stars.Data.csproj +++ b/src/Stars.Data/Terradue.Stars.Data.csproj @@ -4,7 +4,7 @@ Terradue.Stars.Data Terradue.Stars.Data Collection of data Plugins for Terradue.Stars - 2.19.4 + 2.19.5 $(Version)-$(VersionSuffix) NU1603 diff --git a/src/Stars.Services/Terradue.Stars.Services.csproj b/src/Stars.Services/Terradue.Stars.Services.csproj index 9d027ef2..04fc3140 100644 --- a/src/Stars.Services/Terradue.Stars.Services.csproj +++ b/src/Stars.Services/Terradue.Stars.Services.csproj @@ -3,7 +3,7 @@ netstandard2.0 Terradue.Stars Stars is a set of services for working with Spatio Temporal Catalog such as STAC but not only - 2.19.4 + 2.19.5 $(Version)-$(VersionSuffix) Terradue.Stars.Services