Merge branch 'release/2.24.0'

Terradue · Jun 4, 2024 · fe1ba0d · fe1ba0d
2 parents 45b1198 + 3594f08
commit fe1ba0d
Show file tree

Hide file tree

Showing 122 changed files with 479 additions and 366 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -384,7 +384,7 @@ dotnet_diagnostic.IDE0083.severity = warning      # Use pattern matching
 dotnet_diagnostic.IDE0084.severity = warning      # Use IsNot
 dotnet_diagnostic.IDE0090.severity = warning      # Use new(...)
 dotnet_diagnostic.IDE1006.severity = warning      # Naming styles                                 Task Open()                                         Task OpenAsync()
-dotnet_diagnostic.IDE1006WithoutSuggestion.severity = suggestion
+# dotnet_diagnostic.IDE1006WithoutSuggestion.severity = suggestion
 
 
 # Microsoft.VisualStudio.Threading.Analyzers

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -944,6 +944,34 @@
             // },
             "enableStepFiltering": false
         },
+        {
+          "name": "Copy User Product Collection",
+          "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",
+              "-v",
+              "-r",
+              "4",
+              "--output",
+              "/tmp/stars",
+              "s3://dc-acceptance-catalog/users/evopm1/products/evopm1-product-test_upload-product1/evopm1-product-test_upload-product1.json"
+          ],
+          "cwd": "${workspaceFolder}/src",
+          // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
+          "console": "internalConsole",
+          "stopAtEntry": false,
+          "logging": {
+              "moduleLoad": false
+          },
+          "justMyCode": false,
+          "requireExactSource": false,
+          "enableStepFiltering": false
+        },
+
         {
             "name": ".NET Core Attach",
             "type": "coreclr",

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,7 +7,13 @@ 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.23.0](https://github.com/Terradue/Stars/compare/2.22.8...2.23.0)
+## [2.24.0](https://github.com/Terradue/Stars/compare/2.23.0...2.24.0)
+
+### Commits
+
+- Add Collection Node Copy [`7a98692`](https://github.com/Terradue/Stars/commit/7a98692a829c993d685f0e0277310900b9e438b9)
+
+## [2.23.0](https://github.com/Terradue/Stars/compare/2.22.8...2.23.0) - 2024-06-03
 
 ### Merged
 

diff --git a/src/Stars.Console.Tests/Utilities/XunitTextWriter.cs b/src/Stars.Console.Tests/Utilities/XunitTextWriter.cs
@@ -11,7 +11,7 @@ namespace Stars.Console.Tests
     public class XunitTextWriter : TextWriter
     {
         private readonly ITestOutputHelper _output;
-        private readonly StringBuilder _sb = new StringBuilder();
+        private readonly StringBuilder _sb = new();
 
         public XunitTextWriter(ITestOutputHelper output)
         {

diff --git a/src/Stars.Console/ConsoleCredentialsManager.cs b/src/Stars.Console/ConsoleCredentialsManager.cs
@@ -14,13 +14,13 @@ namespace Terradue.Stars.Console.Operations
 {
     internal class ConsoleCredentialsManager : ConfigurationCredentialsManager
     {
-        private readonly IConsole console;
-        private readonly ConsoleUserSettings consoleUserSettings;
+        private readonly IConsole _console;
+        private readonly ConsoleUserSettings _consoleUserSettings;
 
         public ConsoleCredentialsManager(IOptions<CredentialsOptions> options, IConsole console, ConsoleUserSettings consoleUserSettings, ILogger<ConsoleCredentialsManager> logger) : base(options, logger)
         {
-            this.console = console;
-            this.consoleUserSettings = consoleUserSettings;
+            _console = console;
+            _consoleUserSettings = consoleUserSettings;
         }
 
         public override NetworkCredential GetCredential(Uri uri, string authType)
@@ -39,14 +39,14 @@ public override NetworkCredential GetCredential(Uri uri, string authType)
             catch { }
             if (cred == null && authority.Length > 2 && uri.UserInfo != "preauth")
             {
-                if (!console.IsInputRedirected)
+                if (!_console.IsInputRedirected)
                 {
-                    console.WriteLine("No credentials found for {0}. Please provide one.", uriCut);
+                    _console.WriteLine("No credentials found for {0}. Please provide one.", uriCut);
                     cred = PromptCredentials(uriCut, authType);
                 }
                 if (cred != null)
                 {
-                    base.CacheCredential(uriCut, authType, cred);
+                    CacheCredential(uriCut, authType, cred);
                     PromptSaveCredentials(cred, uriCut, authType);
                 }
             }
@@ -59,8 +59,8 @@ private void PromptSaveCredentials(ICredentials cred, Uri uri, string authType)
             int i = 3;
             while ((string.IsNullOrEmpty(answer) || !"yn".Contains(answer[0])) && i > 0)
             {
-                console.Write("Save credentials in user settings? [y/N]:");
-                answer = console.In.ReadLine().ToLower();
+                _console.Write("Save credentials in user settings? [y/N]:");
+                answer = _console.In.ReadLine().ToLower();
                 i--;
             }
             if (answer == "y")
@@ -70,12 +70,12 @@ private void PromptSaveCredentials(ICredentials cred, Uri uri, string authType)
         private void SaveCredentials(ICredentials cred, Uri uri, string authType)
         {
             CredentialsConfigurationSection credConfigSection = cred.ToCredentialsConfigurationSection(uri, authType);
-            consoleUserSettings.AddOrUpdateSetting("Credentials:" + Guid.NewGuid().ToString(), credConfigSection);
+            _consoleUserSettings.AddOrUpdateSetting("Credentials:" + Guid.NewGuid().ToString(), credConfigSection);
         }
 
         private NetworkCredential PromptCredentials(Uri uri, string authType)
         {
-            if (console.IsInputRedirected) return null;
+            if (_console.IsInputRedirected) return null;
 
             string usernameLabel = "username";
             string passwordLabel = "password";
@@ -90,16 +90,16 @@ private NetworkCredential PromptCredentials(Uri uri, string authType)
             int rtry = 3;
             while (string.IsNullOrEmpty(username) && rtry > 0)
             {
-                console.Write(usernameLabel + ": ");
-                username = console.In.ReadLine();
+                _console.Write(usernameLabel + ": ");
+                username = _console.In.ReadLine();
                 rtry--;
             }
             if (string.IsNullOrEmpty(username))
             {
-                console.WriteLine("No input. Skipping");
+                _console.WriteLine("No input. Skipping");
                 return null;
             }
-            console.Write(passwordLabel + ": ");
+            _console.Write(passwordLabel + ": ");
             var pass = string.Empty;
             ConsoleKey key;
             do
@@ -118,7 +118,7 @@ private NetworkCredential PromptCredentials(Uri uri, string authType)
                     pass += keyInfo.KeyChar;
                 }
             } while (key != ConsoleKey.Enter);
-            console.WriteLine();
+            _console.WriteLine();
 
             return new NetworkCredential(username, pass);
         }

diff --git a/src/Stars.Console/ConsoleUserSettings.cs b/src/Stars.Console/ConsoleUserSettings.cs
@@ -12,7 +12,7 @@ namespace Terradue.Stars.Console
 {
     internal class ConsoleUserSettings
     {
-        private readonly string userSettingsFilePath = Path.Join(System.Environment.GetEnvironmentVariable("HOME"), ".config", "Stars", "usersettings.json");
+        private readonly string userSettingsFilePath = Path.Join(Environment.GetEnvironmentVariable("HOME"), ".config", "Stars", "usersettings.json");
         private readonly ILogger logger;
         private readonly IConfigurationRoot configuration;
 

diff --git a/src/Stars.Console/Operations/BaseOperation.cs b/src/Stars.Console/Operations/BaseOperation.cs
@@ -117,7 +117,7 @@ private ServiceCollection RegisterServices()
                 foreach (var yamlFilename in Directory.EnumerateFiles("/etc/Stars/conf.d", "*.json", SearchOption.TopDirectoryOnly))
                     builder.AddNewtonsoftJsonFile(yamlFilename);
             }
-            builder.AddNewtonsoftJsonFile(Path.Join(System.Environment.GetEnvironmentVariable("HOME"), ".config", "Stars", "usersettings.json"), optional: true)
+            builder.AddNewtonsoftJsonFile(Path.Join(Environment.GetEnvironmentVariable("HOME"), ".config", "Stars", "usersettings.json"), optional: true)
                    .AddNewtonsoftJsonFile("appsettings.json", optional: true);
 
             //only add secrets in development