Merge branch 'release/2.19.5'

Terradue · Feb 26, 2024 · 4012452 · 4012452
2 parents 24826c5 + 9dfb5dd
commit 4012452
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 9 deletions.
diff --git 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/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
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFrameworks>net6.0</TargetFrameworks>
-    <Version>2.19.4</Version>
+    <Version>2.19.5</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/src/Stars.Data/Terradue.Stars.Data.csproj b/src/Stars.Data/Terradue.Stars.Data.csproj
@@ -4,7 +4,7 @@
         <ProjectName>Terradue.Stars.Data</ProjectName>
         <Title>Terradue.Stars.Data</Title>
         <Description>Collection of data Plugins for Terradue.Stars</Description>
-        <Version>2.19.4</Version>
+        <Version>2.19.5</Version>
         <!-- <VersionSuffix>beta.8</VersionSuffix> -->
         <Version Condition=" '$(VersionSuffix)' != '' ">$(Version)-$(VersionSuffix)</Version>
         <NoWarn>NU1603</NoWarn>

diff --git 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;
+            }
         }
     }
 }
diff --git a/src/Stars.Services/Terradue.Stars.Services.csproj b/src/Stars.Services/Terradue.Stars.Services.csproj
@@ -3,7 +3,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <Title>Terradue.Stars</Title>
     <Description>Stars is a set of services for working with Spatio Temporal Catalog such as STAC but not only</Description>
-    <Version>2.19.4</Version>
+    <Version>2.19.5</Version>
     <!-- <VersionSuffix>beta.8</VersionSuffix> -->
     <Version Condition=" '$(VersionSuffix)' != '' ">$(Version)-$(VersionSuffix)</Version>
     <AssemblyName>Terradue.Stars.Services</AssemblyName>