Merge pull request #257 from NoxOrg/feature/force-argument

- implemented argument variable provider

src/Dockerfile

@@ -3,8 +3,8 @@ WORKDIR /app
 EXPOSE 80
 EXPOSE 443
 
-RUN apt-get -y update
-RUN apt-get install -y libsecret-1-0
+#RUN apt-get -y update
+#RUN apt-get install -y libsecret-1-0
 
 FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 WORKDIR /src

src/Nox.Cli.Plugins/Nox.Cli.Plugin.AzDevOps/AzDevopsAuthorizeEnvironmentPipeline_v1.cs

@@ -63,7 +63,6 @@ public NoxActionMetaData Discover()
 
     public Task BeginAsync(IDictionary<string,object> inputs)
     {
-        var connection = inputs.Value<VssConnection>("connection");
         _server = inputs.Value<string>("server");
         _pat = inputs.Value<string>("personal-access-token");
         _projectId = inputs.Value<Guid>("project-id");

src/Nox.Cli.Plugins/Nox.Cli.Plugin.File/Helpers/CopyHelper.cs

@@ -11,7 +11,8 @@ public static bool CopyFile(string sourcePath, string targetPath, bool isOverwri
                 var createDate = System.IO.File.GetCreationTime(targetPath);
                 System.IO.File.Delete(targetPath);    
                 System.IO.File.Copy(sourcePath, targetPath);
-                System.IO.File.SetCreationTime(targetPath, createDate);        
+                System.IO.File.SetCreationTime(targetPath, createDate);
+                return true;
             }
 
             return false;

src/Nox.Cli.Server/Nox.Cli.Server.csproj

@@ -74,5 +74,6 @@
     <Content Include="..\.dockerignore">
       <Link>.dockerignore</Link>
     </Content>
+    <Content Include=".config\dotnet-tools.json" />
   </ItemGroup>
 </Project>

src/Nox.Cli.Server/appsettings.Production.json

@@ -6,5 +6,22 @@
             "Microsoft": "Debug",
             "Microsoft.AspNetCore": "Debug"
         }
+    },
+    "AzureAd": {
+        "Instance": "https://login.microsoftonline.com/",
+        "TenantId": "88155c28-f750-4013-91d3-8347ddb3daa7",
+        "ClientId": "750b96e1-e772-48f8-b6b3-84bac1961d9b",
+        "Scopes": "access_as_user"
+    },
+    "ServerSecretResolver": {
+        "TenantId": "88155c28-f750-4013-91d3-8347ddb3daa7",
+        "ClientId": "750b96e1-e772-48f8-b6b3-84bac1961d9b",
+        "ClientSecret": "DoM8Q~xfHyKasa~MHTuPGXoPZbYj.B1pIWOvzc7K"
+    },
+    "NoxScriptsUrl": "https://noxorg.dev",
+    "ElasticApm": {
+        "ServerUrl": "http://localhost:8200",
+        "SecretToken": "",
+        "TransactionSampleRate": "1.0"
     }
 }

src/Nox.Cli.Variables/ArgumentVariableResolver.cs

@@ -1,6 +1,29 @@
+using Spectre.Console.Cli;
+
 namespace Nox.Cli.Variables;
 
-public class ArgumentVariableResolver
+public static class ArgumentVariableResolver
 {
+    public static void ResolveNoxArgumentVariables(this IDictionary<string, object?> variables, IRemainingArguments arguments)
+    {
+        var keys = variables
+            .Where(kv => kv.Value == null)
+            .Select(kv => kv.Key)
+            .Where(e => e.StartsWith("args.", StringComparison.OrdinalIgnoreCase))
+            .Select(e => e[5..])
+            .ToArray();
+
+
+
+        foreach (var key in keys)
+        {
+            var value = ResolveArgumentValue(key, arguments);
+            variables[$"args.{key}"] = value;
+        }
+    }
 
+    private static bool ResolveArgumentValue(string argument, IRemainingArguments arguments)
+    {
+        return arguments.Parsed.Any(a => a.Key == "--" + argument);
+    }
 }

src/Nox.Cli.Variables/ClientVariableProvider.cs

@@ -6,25 +6,28 @@
 using Nox.Cli.Configuration;
 using Nox.Cli.Variables.Secrets;
 using Nox.Solution;
+using Spectre.Console.Cli;
 using YamlDotNet.Serialization;
 using YamlDotNet.Serialization.NamingConventions;
 
 namespace Nox.Cli.Variables;
 
 public class ClientVariableProvider: IClientVariableProvider
 {
-    private readonly Regex _variableRegex = new(@"\$\{\{\s*(?<variable>\b(vars|solution|steps|server|env|runner|cache)[\w\.\-_:]+)\s*\}\}", RegexOptions.Compiled | RegexOptions.IgnoreCase, TimeSpan.FromSeconds(1));
+    private readonly Regex _variableRegex = new(@"\$\{\{\s*(?<variable>\b(vars|solution|steps|server|env|runner|cache|args)[\w\.\-_:]+)\s*\}\}", RegexOptions.Compiled | RegexOptions.IgnoreCase, TimeSpan.FromSeconds(1));
 
     private readonly Dictionary<string, object?> _variables;
     private readonly IOrgSecretResolver _orgSecretResolver;
     private NoxSolution? _projectConfig;
     private readonly INoxCliCache? _cache;
     private readonly ILocalTaskExecutorConfiguration? _lteConfig;
     private readonly List<string> _serverVariables;
+    private readonly IRemainingArguments _arguments;
 
     public ClientVariableProvider(
         WorkflowConfiguration workflow, 
         IOrgSecretResolver orgSecretResolver,
+        IRemainingArguments arguments,
         NoxSolution? projectConfig = null,
         ILocalTaskExecutorConfiguration? lteConfig = null,
         INoxCliCache? cache = null)
@@ -35,6 +38,7 @@ public ClientVariableProvider(
         _projectConfig = projectConfig;
         _lteConfig = lteConfig;
         _cache = cache;
+        _arguments = arguments;
         Initialize(workflow);
     }
 
@@ -146,6 +150,7 @@ public void SetProjectConfiguration(NoxSolution projectConfig)
     public async Task ResolveAll()
     {
         _variables.ResolveRunnerVariables();
+        _variables.ResolveNoxArgumentVariables(_arguments);
         await ResolveForServer();
     }
 

src/Nox.Cli/Actions/NoxWorkflowContext.cs

@@ -10,6 +10,7 @@
 using Nox.Cli.Variables.Secrets;
 using Nox.Secrets.Abstractions;
 using Nox.Solution;
+using Spectre.Console.Cli;
 using Environment = System.Environment;
 
 namespace Nox.Cli.Actions;
@@ -45,11 +46,12 @@ public NoxWorkflowContext(
         IOrgSecretResolver orgSecretResolver,
         INoxCliCacheManager cacheManager,
         ILocalTaskExecutorConfiguration? lteConfig,
-        INoxSecretsResolver? secretsResolver)
+        INoxSecretsResolver? secretsResolver,
+        IRemainingArguments arguments)
     {
         WorkflowId = Guid.NewGuid();
         _workflow = workflow;
-        _varProvider = new ClientVariableProvider(workflow, orgSecretResolver, projectConfig, lteConfig, cacheManager.Cache);
+        _varProvider = new ClientVariableProvider(workflow, orgSecretResolver, arguments, projectConfig, lteConfig, cacheManager.Cache);
         _cacheManager = cacheManager;
         _secretsResolver = secretsResolver;
         _jobs = ParseWorkflow();

src/Nox.Cli/Actions/NoxWorkflowExecutor.cs

@@ -59,7 +59,7 @@ public async Task<bool> Execute(WorkflowConfiguration workflow, IRemainingArgume
 
         var workflowCtx = _console.Status()
             .Spinner(Spinner.Known.Clock)
-            .Start("Verifying the workflow script...", _ => new NoxWorkflowContext(workflow, _noxConfig, _orgSecretResolver, _cacheManager, _lteConfig, _noxSecretsResolver));
+            .Start("Verifying the workflow script...", _ => new NoxWorkflowContext(workflow, _noxConfig, _orgSecretResolver, _cacheManager, _lteConfig, _noxSecretsResolver, arguments));
 
         while (workflowCtx.CurrentJob != null)
         {
@@ -454,7 +454,6 @@ private async Task<bool> ProcessForEachJob(NoxWorkflowContext context, bool forc
         }
         return true;
     }
-
 }
 
 

src/Nox.Cli/Properties/launchSettings.json

@@ -2,7 +2,7 @@
   "profiles": {
     "Nox.Cli": {
       "commandName": "Project",
-      "commandLineArgs": "new dop",
+      "commandLineArgs": "sync ado",
       "workingDirectory": "/home/jan/demo/CliDemo",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"

tests/Plugin.Core.Tests/SnakeNameTests.cs

@@ -29,7 +29,7 @@ public async Task Can_Convert_To_Snake_Name(string sourceValue, string expectedV
         var cacheMan = Mock.Of<INoxCliCacheManager>();
         var lteConfig = Mock.Of<LocalTaskExecutorConfiguration>();
         var secretsResolver = Mock.Of<INoxSecretsResolver>();
-        var ctx = new NoxWorkflowContext(wfConfig, sln, orgResolver, cacheMan, lteConfig, secretsResolver);
+        var ctx = new NoxWorkflowContext(wfConfig, sln, orgResolver, cacheMan, lteConfig, secretsResolver, null!);
         var result = await plugin.ProcessAsync(ctx);
         Assert.Single(result);
         Assert.Equal(expectedValue, result["result"]);

tests/Plugin.File.Tests/CopyFileTests.cs

@@ -33,7 +33,7 @@ public async Task Can_copy_a_File_if_destination_folder_does_not_exist()
         var cacheMan = Mock.Of<INoxCliCacheManager>();
         var lteConfig = Mock.Of<LocalTaskExecutorConfiguration>();
         var secretsResolver = Mock.Of<INoxSecretsResolver>();
-        var ctx = new NoxWorkflowContext(wfConfig, sln, orgResolver, cacheMan, lteConfig, secretsResolver);
+        var ctx = new NoxWorkflowContext(wfConfig, sln, orgResolver, cacheMan, lteConfig, secretsResolver, null!);
         await plugin.ProcessAsync(ctx);
         Assert.True(System.IO.File.Exists(Path.Combine(path, "new-target/Sample.txt")));
     }
@@ -60,7 +60,7 @@ public async Task Must_not_copy_if_destination_folder_exists_and_overwrite_not_s
         var cacheMan = Mock.Of<INoxCliCacheManager>();
         var lteConfig = Mock.Of<LocalTaskExecutorConfiguration>();
         var secretsResolver = Mock.Of<INoxSecretsResolver>();
-        var ctx = new NoxWorkflowContext(wfConfig, sln, orgResolver, cacheMan, lteConfig, secretsResolver);
+        var ctx = new NoxWorkflowContext(wfConfig, sln, orgResolver, cacheMan, lteConfig, secretsResolver, null!);
         await plugin.ProcessAsync(ctx);
         await plugin.EndAsync();
         Assert.True(System.IO.File.Exists(Path.Combine(path, "new-target/Sample.txt")));
@@ -91,7 +91,7 @@ public async Task Can_copy_a_File_if_destination_folder_exists_and_overwrite_spe
         var cacheMan = Mock.Of<INoxCliCacheManager>();
         var lteConfig = Mock.Of<LocalTaskExecutorConfiguration>();
         var secretsResolver = Mock.Of<INoxSecretsResolver>();
-        var ctx = new NoxWorkflowContext(wfConfig, sln, orgResolver, cacheMan, lteConfig, secretsResolver);
+        var ctx = new NoxWorkflowContext(wfConfig, sln, orgResolver, cacheMan, lteConfig, secretsResolver, null!);
         await plugin.ProcessAsync(ctx);
         await plugin.EndAsync();
         Assert.True(System.IO.File.Exists(Path.Combine(path, "new-target/Sample.txt")));

tests/Plugin.File.Tests/CopyFolderTests.cs

@@ -34,7 +34,7 @@ public async Task Can_copy_a_File_if_destination_folder_does_not_exist()
         var cacheMan = Mock.Of<INoxCliCacheManager>();
         var lteConfig = Mock.Of<LocalTaskExecutorConfiguration>();
         var secretsResolver = Mock.Of<INoxSecretsResolver>();
-        var ctx = new NoxWorkflowContext(wfConfig, sln, orgResolver, cacheMan, lteConfig, secretsResolver);
+        var ctx = new NoxWorkflowContext(wfConfig, sln, orgResolver, cacheMan, lteConfig, secretsResolver, null!);
         await plugin.ProcessAsync(ctx);
         Assert.True(System.IO.File.Exists(Path.Combine(path, "target/Sample.txt")));
         Assert.True(System.IO.File.Exists(Path.Combine(path, "target/child/Sample.txt")));

tests/Plugin.File.Tests/FileRenameTests.cs

@@ -34,7 +34,7 @@ public async Task Can_Rename_a_File()
         var cacheMan = Mock.Of<INoxCliCacheManager>();
         var lteConfig = Mock.Of<LocalTaskExecutorConfiguration>();
         var secretsResolver = Mock.Of<INoxSecretsResolver>();
-        var ctx = new NoxWorkflowContext(wfConfig, sln, orgResolver, cacheMan, lteConfig, secretsResolver);
+        var ctx = new NoxWorkflowContext(wfConfig, sln, orgResolver, cacheMan, lteConfig, secretsResolver, null!);
         await plugin.ProcessAsync(ctx);
         Assert.True(System.IO.File.Exists(Path.Combine(path, "Sample-After.txt")));
         Assert.False(System.IO.File.Exists(Path.Combine(path, "Sample-Before.txt")));

tests/Plugin.File.Tests/FolderRenameTests.cs

@@ -44,7 +44,7 @@ public async Task Can_Rename_a_Folder()
         var cacheMan = Mock.Of<INoxCliCacheManager>();
         var lteConfig = Mock.Of<LocalTaskExecutorConfiguration>();
         var secretsResolver = Mock.Of<INoxSecretsResolver>();
-        var ctx = new NoxWorkflowContext(wfConfig, sln, orgResolver, cacheMan, lteConfig, secretsResolver);
+        var ctx = new NoxWorkflowContext(wfConfig, sln, orgResolver, cacheMan, lteConfig, secretsResolver, null!);
         await plugin.ProcessAsync(ctx);
         Assert.True(System.IO.Directory.Exists(Path.Combine(path, "Sample-After")));
         Assert.False(System.IO.Directory.Exists(Path.Combine(path, "Sample-Before")));

tests/Plugin.Git.Tests/InitTests.cs

@@ -32,7 +32,7 @@ public async Task Can_initialize_a_local_git_repo()
         var cacheMan = Mock.Of<INoxCliCacheManager>();
         var lteConfig = Mock.Of<LocalTaskExecutorConfiguration>();
         var secretsResolver = Mock.Of<INoxSecretsResolver>();
-        var ctx = new NoxWorkflowContext(wfConfig, sln, orgResolver, cacheMan, lteConfig, secretsResolver);
+        var ctx = new NoxWorkflowContext(wfConfig, sln, orgResolver, cacheMan, lteConfig, secretsResolver, null!);
         ctx.SetCurrentActionForTests();
         await plugin.ProcessAsync(ctx);
         Assert.Equal(ActionState.Success, ctx.CurrentAction!.State);
@@ -59,7 +59,7 @@ public async Task Must_get_warning_if_initializing_more_than_once()
         var cacheMan = Mock.Of<INoxCliCacheManager>();
         var lteConfig = Mock.Of<LocalTaskExecutorConfiguration>();
         var secretsResolver = Mock.Of<INoxSecretsResolver>();
-        var ctx = new NoxWorkflowContext(wfConfig, sln, orgResolver, cacheMan, lteConfig, secretsResolver);
+        var ctx = new NoxWorkflowContext(wfConfig, sln, orgResolver, cacheMan, lteConfig, secretsResolver, null!);
         ctx.SetCurrentActionForTests();
         await plugin.ProcessAsync(ctx);
         Assert.Equal(ActionState.Success, ctx.CurrentAction!.State);
@@ -90,7 +90,7 @@ public async Task Must_not_get_warning_if_initializing_more_than_once_and_suppre
         var cacheMan = Mock.Of<INoxCliCacheManager>();
         var lteConfig = Mock.Of<LocalTaskExecutorConfiguration>();
         var secretsResolver = Mock.Of<INoxSecretsResolver>();
-        var ctx = new NoxWorkflowContext(wfConfig, sln, orgResolver, cacheMan, lteConfig, secretsResolver);
+        var ctx = new NoxWorkflowContext(wfConfig, sln, orgResolver, cacheMan, lteConfig, secretsResolver, null!);
         ctx.SetCurrentActionForTests();
         await plugin.ProcessAsync(ctx);
         Assert.Equal(ActionState.Success, ctx.CurrentAction!.State);

tests/Plugin.Powershell.Tests/PwshTests.cs

@@ -28,7 +28,7 @@ public async Task Can_copy_a_File_if_destination_folder_does_not_exist()
         var cacheMan = Mock.Of<INoxCliCacheManager>();
         var lteConfig = Mock.Of<LocalTaskExecutorConfiguration>();
         var secretsResolver = Mock.Of<INoxSecretsResolver>();
-        var ctx = new NoxWorkflowContext(wfConfig, sln, orgResolver, cacheMan, lteConfig, secretsResolver);
+        var ctx = new NoxWorkflowContext(wfConfig, sln, orgResolver, cacheMan, lteConfig, secretsResolver, null!);
         await plugin.ProcessAsync(ctx);
         Assert.True(Directory.Exists(".git"));
         FileHelpers.PurgeFolderRecursive(".git", false);