simplify config model bump to 2.0.4

.github/workflows/release.yml

@@ -24,22 +24,21 @@ jobs:
         run: |
           dotnet test
 
-      # TODO mongo password not getting embedded properly some commands fail
+      - name: 🔏 Configure Secrets
+        uses: microsoft/variable-substitution@v1 
+        with:
+          files: '**/appsettings.json'
+        env:
+          MONGO_PASSWORD: ${{ secrets.MONGO_PASSWORD }}
 
       - name: 📦 Build
         working-directory: ./USTACLI
-        env:
-          MONGO_PASSWORD: ${{ secrets.MONGO_PASSWORD }}
         run: dotnet pack -c Release
 
       - name: 🚀 Publish to Nuget
         working-directory: ./USTACLI
-        env:
-          MONGO_PASSWORD: ${{ secrets.MONGO_PASSWORD }}
         run: dotnet nuget push ./nupkg/*.nupkg -n -k ${{ secrets.NUGET_API_KEY }} -s https://api.nuget.org/v3/index.json
 
       - name: 🚀 Publish to GitHub
         working-directory: ./USTACLI
-        env:
-          MONGO_PASSWORD: ${{ secrets.MONGO_PASSWORD }}
         run: dotnet nuget push ./nupkg/*.nupkg -n -k ${{ secrets.GITHUB_TOKEN }} -s https://nuget.pkg.github.com/lineville/index.json

USTACLI.Tests/appsettings.Test.json

@@ -28,5 +28,6 @@
     "Gender": "ntrp-rankListGender",
     "Level": "ntrp-ntrpPlayerLevel",
     "Section": "ntrp-sectionCode"
-  }
-}
+  },
+  "MONGO_PASSWORD": ""
+}

USTACLI/Program.cs

@@ -1,4 +1,6 @@
-using Spectre.Console.Cli;
+using System.Reflection;
+using Microsoft.Extensions.Configuration;
+using Spectre.Console.Cli;
 
 public class Program
 {
@@ -9,17 +11,25 @@ public static int Main(string[] args)
   {
     // Parse command line arguments
     var app = new CommandApp();
+
+    // Load appsettings.json static data
+    var assemblyFolder = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) ?? Directory.GetCurrentDirectory();
+
+    IConfiguration configuration = new ConfigurationBuilder()
+      .SetBasePath(assemblyFolder)
+      .AddJsonFile("appsettings.json", optional: false)
+      .AddEnvironmentVariables()
+      .Build();
+
     app.Configure(config =>
     {
-      config.AddCommand<GetRankingsCommand>("get");
-      config.AddCommand<ListRankingsCommand>("list");
-      config.AddCommand<SubscribeRankingsCommand>("subscribe");
-      config.AddCommand<UnsubscribeRankingsCommand>("unsubscribe");
+      config.AddCommand<GetRankingsCommand>("get").WithDescription("Get player ranking").WithData(configuration);
+      config.AddCommand<ListRankingsCommand>("list").WithDescription("List player rankings").WithData(configuration);
+      config.AddCommand<SubscribeRankingsCommand>("subscribe").WithDescription("Subscribe to player rankings").WithData(configuration);
+      config.AddCommand<UnsubscribeRankingsCommand>("unsubscribe").WithDescription("Unsubscribe from player rankings").WithData(configuration);
 
-      config.AddBranch("subscribers", subscribers =>
-      {
-        subscribers.AddCommand<ListSubscribersCommand>("list");
-      });
+      // Hidden command used by GH actions (not intended for end user usage)
+      config.AddCommand<ListSubscribersCommand>("subscribers").WithData(configuration).IsHidden();
     });
 
     return app.Run(args);

USTACLI/appsettings.json

@@ -28,5 +28,6 @@
     "Gender": "ntrp-rankListGender",
     "Level": "ntrp-ntrpPlayerLevel",
     "Section": "ntrp-sectionCode"
-  }
-}
+  },
+  "MONGO_PASSWORD": ""
+}

USTACLI/cli/GetRankingsCommand.cs

@@ -6,15 +6,12 @@
 
 public class GetRankingsCommand : Command<RankingsSettings>
 {
-  #nullable disable
+#nullable disable
   public override int Execute(CommandContext context, RankingsSettings settings)
   {
-  #nullable enable
-    // Load appsettings.json static data
-    IConfiguration configuration = new ConfigurationBuilder()
-      .SetBasePath(Directory.GetCurrentDirectory())
-      .AddJsonFile("appsettings.json", optional: false)
-      .Build();
+#nullable enable
+    var configuration = context.Data as IConfiguration
+      ?? throw new Exception("Failed to load configuration from appsettings.json");
 
     Utilities.InteractiveFallback(settings, configuration, context.Name);
 
@@ -75,7 +72,7 @@ public RankingsReport ScrapePlayerRanking(WebDriver driver, IConfiguration confi
     var timeout = configuration.GetValue<int>("PAGE_LOAD_TIMEOUT");
 
     var url = Utilities.BuildUSTARankingURL(settings, configuration, context);
-    
+
     // Navigate to the URL and wait for the page to load
     driver.Navigate().GoToUrl(url);
     var wait = new WebDriverWait(driver, TimeSpan.FromSeconds(timeout));

USTACLI/cli/ListRankingsCommand.cs

@@ -9,12 +9,8 @@ public class ListRankingsCommand : Command<RankingsSettings>
   public override int Execute(CommandContext context, RankingsSettings settings)
   {
 #nullable enable
-
-    // Load appsettings.json static data
-    IConfiguration configuration = new ConfigurationBuilder()
-      .SetBasePath(Directory.GetCurrentDirectory())
-      .AddJsonFile("appsettings.json", optional: false)
-      .Build();
+    var configuration = context.Data as IConfiguration
+      ?? throw new Exception("Failed to load configuration from appsettings.json");
 
     Utilities.InteractiveFallback(settings, configuration, context.Name);
 

USTACLI/cli/ListSubscribersCommand.cs

@@ -9,12 +9,8 @@ public class ListSubscribersCommand : Command
   public override int Execute(CommandContext context)
   {
 #nullable enable
-    // Load appsettings.json static data
-    IConfiguration configuration = new ConfigurationBuilder()
-      .SetBasePath(Directory.GetCurrentDirectory())
-      .AddJsonFile("appsettings.json", optional: false)
-      .AddEnvironmentVariables()
-      .Build();
+    var configuration = context.Data as IConfiguration
+      ?? throw new Exception("Failed to load configuration from appsettings.json");
 
     GetSubscribers(configuration).GetAwaiter().GetResult();
     return 0;

USTACLI/cli/SubscribeRankingsCommand.cs

@@ -8,12 +8,8 @@ public class SubscribeRankingsCommand : Spectre.Console.Cli.Command<RankingsSett
   public override int Execute(CommandContext context, RankingsSettings settings)
   {
 #nullable enable
-    // Load appsettings.json static data
-    IConfiguration configuration = new ConfigurationBuilder()
-      .SetBasePath(Directory.GetCurrentDirectory())
-      .AddJsonFile("appsettings.json", optional: false)
-      .AddEnvironmentVariables()
-      .Build();
+    var configuration = context.Data as IConfiguration
+      ?? throw new Exception("Failed to load configuration from appsettings.json");
 
     Utilities.InteractiveFallback(settings, configuration, context.Name);
 

USTACLI/cli/UnsubscribeRankingsCommand.cs

@@ -8,12 +8,8 @@ public class UnsubscribeRankingsCommand : Spectre.Console.Cli.Command<RankingsSe
   public override int Execute(CommandContext context, RankingsSettings settings)
   {
 #nullable enable
-    // Load appsettings.json static data
-    IConfiguration configuration = new ConfigurationBuilder()
-      .SetBasePath(Directory.GetCurrentDirectory())
-      .AddJsonFile("appsettings.json", optional: false)
-      .AddEnvironmentVariables()
-      .Build();
+    var configuration = context.Data as IConfiguration
+      ?? throw new Exception("Failed to load configuration from appsettings.json");
 
     Utilities.InteractiveFallback(settings, configuration, context.Name);
 

USTACLI/cli/Utilities.cs

@@ -2,7 +2,7 @@
 using Microsoft.Extensions.Configuration;
 using Spectre.Console;
 
-public class Utilities
+public static class Utilities
 {
 
   /// <summary>

USTACLI/usta-cli.csproj

@@ -10,7 +10,7 @@
     <ToolCommandName>usta-cli</ToolCommandName>
     <PackageOutputPath>./nupkg</PackageOutputPath>
     <PackageReadmeFile>README.md</PackageReadmeFile>
-    <PackageVersion>2.0.3</PackageVersion>
+    <PackageVersion>2.0.4</PackageVersion>
     <RepositoryUrl>https://github.com/lineville/usta-cli</RepositoryUrl> 
     <RepositoryType>git</RepositoryType> 
   </PropertyGroup>

appsettings.json

@@ -28,5 +28,6 @@
     "Gender": "ntrp-rankListGender",
     "Level": "ntrp-ntrpPlayerLevel",
     "Section": "ntrp-sectionCode"
-  }
+  },
+  "MONGO_PASSWORD": ""
 }