feat(commands/get_fstab): Enhance get_fstab command with argparse integration and structured argument handling

Author: monyarm

packages/mcl/src/main.d

@@ -29,6 +29,7 @@ template genSubCommandArgs()
     const char[] genSubCommandArgs =
         "@SubCommands\n"~
         "SumType!("~
+            "get_fstab_args,"~
             "Default!unknown_command_args"~
         ") cmd;";
 }

packages/mcl/src/src/mcl/commands/get_fstab.d

@@ -6,47 +6,54 @@ import std.json : JSONValue;
 import std.format : fmt = format;
 import std.exception : enforce;
 
+import argparse;
+
 import mcl.utils.cachix : cachixNixStoreUrl, getCachixDeploymentApiUrl;
 import mcl.utils.env : optional, parseEnv;
 import mcl.utils.fetch : fetchJson;
 import mcl.utils.nix : queryStorePath, nix;
 import mcl.utils.string : camelCaseToCapitalCase;
 import mcl.utils.process : execute;
 
-export void get_fstab(string[] args)
+export int get_fstab(get_fstab_args args)
 {
-    const params = parseEnv!Params;
-    const machineStorePath = getCachixDeploymentStorePath(params);
+    args.cachixStoreUrl = cachixNixStoreUrl(args.cachixCache);
+    if (!args.cachixDeployWorkspace)
+        args.cachixDeployWorkspace = args.cachixCache;
+
+    const machineStorePath = getCachixDeploymentStorePath(args);
     const fstabStorePath = queryStorePath(
         machineStorePath,
         ["-etc", "-etc-fstab"],
-        params.cachixStoreUrl
+        args.cachixStoreUrl
     );
     nix.build(fstabStorePath);
     writeln(fstabStorePath);
+    return 0;
 }
 
-struct Params
-{
+@(Command("get-fstab").Description("Get the store path of the fstab file for a deployment"))
+export struct get_fstab_args {
+    @(NamedArgument(["cachix-auth-token"]).Required().Placeholder("XXX").Description("Auth Token for Cachix"))
     string cachixAuthToken;
+    @(NamedArgument(["cachix-cache"]).Required().Placeholder("cache").Description("Which Cachix cache to use"))
     string cachixCache;
-    @optional() string cachixStoreUrl;
-    @optional() string cachixDeployWorkspace;
-    string machineName;
-    uint deploymentId;
 
-    void setup()
-    {
+    @(NamedArgument(["cachix-store-url"]).Placeholder("https://...").Description("URL of the Cachix store"))
+    string cachixStoreUrl = "";
+    @(NamedArgument(["cachix-deploy-workspace"]).Placeholder("agent-workspace").Description("Cachix workspace to deploy to"))
+    string cachixDeployWorkspace = "";
 
-        cachixStoreUrl = cachixNixStoreUrl(cachixCache);
-        if (!cachixDeployWorkspace)
-            cachixDeployWorkspace = cachixCache;
-    }
+    @(PositionalArgument(0).Placeholder("machine-name").Description("Name of the machine"))
+    string machineName;
+    @(PositionalArgument(1).Placeholder("deployment-id").Description("ID of the deployment"))
+    uint deploymentId;
 }
 
-string getCachixDeploymentStorePath(Params p)
+
+string getCachixDeploymentStorePath(get_fstab_args args)
 {
-    const url = getCachixDeploymentApiUrl(p.cachixDeployWorkspace, p.machineName, p.deploymentId);
-    const response = fetchJson(url, p.cachixAuthToken);
+    const url = getCachixDeploymentApiUrl(args.cachixDeployWorkspace, args.machineName, args.deploymentId);
+    const response = fetchJson(url, args.cachixAuthToken);
     return response["storePath"].get!string;
 }

packages/mcl/src/src/mcl/commands/package.d

@@ -1,6 +1,6 @@
 module mcl.commands;
 
-public import mcl.commands.get_fstab : get_fstab;
+public import mcl.commands.get_fstab : get_fstab, get_fstab_args;
 public import mcl.commands.deploy_spec : deploy_spec;
 public import mcl.commands.ci_matrix : ci_matrix, print_table;
 public import mcl.commands.shard_matrix : shard_matrix;