Merge pull request #156 from NoxOrg/feature/remove-elastic-apm

- temporarily remove elastic apm
NoxOrg · Jan 10, 2024 · 895f11e · 895f11e
2 parents 184a2f7 + 99782b4
commit 895f11e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/src/Nox.Cli.Server/Program.cs b/src/Nox.Cli.Server/Program.cs
@@ -81,7 +81,7 @@
         });    
     }
 }
-app.UseAllElasticApm(builder.Configuration);
+//app.UseAllElasticApm(builder.Configuration);
 app.UseHttpsRedirection();
 app.UseRouting();
 app.UseAuthentication();

diff --git a/src/Nox.Cli.Variables/ClientVariableProvider.cs b/src/Nox.Cli.Variables/ClientVariableProvider.cs
@@ -74,14 +74,17 @@ public IDictionary<string, object> GetUnresolvedInputVariables(INoxAction action
                 {
                     unresolvedVars.TryAdd(input.Key, unresolvedString);
                 }
-            } else if (input.Value.Default is Dictionary<object, object> unresolvedObjectDictionary)
+            } else if (input.Value.Default is Dictionary<object, object?> unresolvedObjectDictionary)
             {
                 foreach (var objDictItem in unresolvedObjectDictionary)
                 {
-                    if (_variableRegex.Match(objDictItem.Value.ToString()!).Success)
+                    if (objDictItem.Value != null)
                     {
-                        unresolvedVars.TryAdd(input.Key, objDictItem.Value.ToString()!);
-                    }    
+                        if (_variableRegex.Match(objDictItem.Value!.ToString()!).Success)
+                        {
+                            unresolvedVars.TryAdd(input.Key, objDictItem.Value.ToString()!);
+                        }
+                    }
                 }
             } else if (input.Value.Default is Dictionary<string, string> unresolvedStringDictionary)
             {

diff --git a/src/Nox.Cli/Properties/launchSettings.json b/src/Nox.Cli/Properties/launchSettings.json
@@ -2,7 +2,7 @@
   "profiles": {
     "Nox.Cli": {
       "commandName": "Project",
-      "commandLineArgs": "new solution",
+      "commandLineArgs": "sync ad",
       "workingDirectory": "/home/jan/demo/CliDemo",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"