fix(): Review Compliance

Author: monyarm

packages/mcl/src/main.d

@@ -4,7 +4,6 @@ import std.stdio : writefln, writeln, stderr;
 import std.array : replace;
 import std.getopt : getopt;
 import std.logger : infof, errorf, LogLevel;
-import std.sumtype : SumType, match;
 import std.string : stripRight, stripLeft;
 import std.algorithm : endsWith;
 import std.format : format;
@@ -28,7 +27,7 @@ int unknown_command(UnknownCommandArgs unused)
 struct MCLArgs
 {
     @NamedArgument(["log-level"])
-    LogLevel logLevel = cast(LogLevel)-1;
+    LogLevel logLevel = LogLevel.info;
 
     SubCommand!(
         staticMap!(Parameters, SubCommandFunctions),
@@ -40,16 +39,13 @@ alias SumTypeCase(alias func) = (Parameters!func args) => func(args);
 
 mixin CLI!MCLArgs.main!((args)
 {
-    LogLevel logLevel = LogLevel.info;
-    if (args.logLevel != cast(LogLevel)-1)
-        logLevel = args.logLevel;
-    setLogLevel(logLevel);
+    setLogLevel(args.logLevel);
 
     int result = args.cmd.matchCmd!(
         staticMap!(SumTypeCase, unknown_command, SubCommandFunctions),
     );
 
-    return 0;
+    return result;
 });
 
 void setLogLevel(LogLevel l)

packages/mcl/src/src/mcl/commands/ci_matrix.d

@@ -151,11 +151,18 @@ mixin template CiMatrixBaseArgs()
 
     @(NamedArgument(["flake-pre"])
         .Placeholder("prefix")
+        .EnvFallback("FLAKE_PRE")
     )
-    string flakePre = "checks";
+    string _flakePre = "checks";
+
+    @property {
+        string flakePre() => _flakePre == "" ? "checks" : _flakePre;
+        void flakePre(string v) => cast(void)(_flakePre = v);
+    }
 
     @(NamedArgument(["flake-post"])
         .Placeholder("postfix")
+        .EnvFallback("FLAKE_POST")
     )
     string flakePost;
 
@@ -169,7 +176,9 @@ mixin template CiMatrixBaseArgs()
     )
     int maxMemory;
 
-    @(NamedArgument(["initial"])
+    @(NamedArgument(["is-initial"])
+        .Description("Is this the initial run of the CI?")
+        .EnvFallback("IS_INITIAL")
     )
     bool isInitial;
 
@@ -186,6 +195,12 @@ mixin template CiMatrixBaseArgs()
         .Required()
     )
     string cachixAuthToken;
+
+    @(NamedArgument(["precalc-matrix"])
+        .Placeholder("matrix")
+        .EnvFallback("PRECALC_MATRIX")
+    )
+    string precalcMatrix = "";
 }
 
 @(Command("ci-matrix", "ci_matrix")
@@ -200,11 +215,6 @@ struct CiMatrixArgs
 struct PrintTableArgs
 {
     mixin CiMatrixBaseArgs!();
-
-    @(NamedArgument(["precalc-matrix"])
-        .Placeholder("matrix")
-    )
-    string precalcMatrix;
 }
 
 export int ci_matrix(CiMatrixArgs args)
@@ -696,11 +706,9 @@ unittest
 void printTableForCacheStatus(T)(Package[] packages, auto ref T args)
     if (is(T == CiMatrixArgs) || is(T == PrintTableArgs) || is(T == CiArgs) || is(T == DeploySpecArgs))
 {
-    static if (is(T == PrintTableArgs)) {
-        if (args.precalcMatrix == "")
-        {
-            saveGHCIMatrix(packages, args);
-        }
+    if (args.precalcMatrix == "")
+    {
+        saveGHCIMatrix(packages, args);
     }
     saveCachixDeploySpec(packages);
     saveGHCIComment(convertNixEvalToTableSummary(packages, args.isInitial));

packages/mcl/src/src/mcl/commands/config.d

@@ -1,13 +1,14 @@
 module mcl.commands.config;
 
 import std.algorithm : canFind;
-import std.array : array;
+import std.array : array, join;
 import std.process : ProcessPipes, Redirect, wait, environment;
 import std.range : drop, front;
 import std.stdio : writeln;
 import std.string : indexOf;
+import std.conv : to;
 
-import argparse : Command, Description, SubCommand, Default, PositionalArgument, Placeholder, Optional, matchCmd;
+import argparse : Command, Description, SubCommand, Default, PositionalArgument, Placeholder, Optional, matchCmd, NamedArgument, EnvFallback;
 
 import mcl.utils.fetch : fetchJson;
 import mcl.utils.log : errorAndExit;
@@ -60,18 +61,23 @@ struct HomeArgs
     ) cmd;
 }
 
+enum HomeConfigType { desktop, server }
+
 @(Command("apply").Description("Apply user configuration"))
 struct HomeApplyArgs
 {
     @(PositionalArgument(0).Placeholder("desktop/server").Description("Type of home configuration"))
-    string type;
+    HomeConfigType type;
+
+    @(NamedArgument(["user"]).Optional().Placeholder("username").Description("Username to apply the configuration for").EnvFallback("USER"))
+    string user = "";
 }
 
 @(Command("edit").Description("Edit user configuration"))
 struct HomeEditArgs
 {
     @(PositionalArgument(0).Placeholder("desktop/server").Description("Type of home configuration"))
-    string type;
+    HomeConfigType type;
 }
 
 @(Command("start-vm").Description("Start a VM"))
@@ -143,17 +149,17 @@ int edit(string type, string path)
     }
 }
 
-int apply(string type, string value)
+int apply(string type, string[] args)
 {
-    writeln("Applying ", type, " configuration from: ", value);
-    return executeCommand("just switch-" ~ type ~ " " ~ value);
+    writeln("Applying ", type, " configuration from: ", args);
+    return executeCommand("just switch-" ~ type ~ " " ~ args.join(" "));
 }
 
 int sys(SysArgs args)
 {
     return args.cmd.matchCmd!(
-        (SysApplyArgs a) => apply("system", a.machineName),
-        (SysEditArgs a) => edit("system", a.machineName),
+        (SysApplyArgs a) => "system".apply([a.machineName]),
+        (SysEditArgs a) => "system".edit(a.machineName),
         (UnknownCommandArgs a) => unknown_command(a)
     );
 }
@@ -162,11 +168,8 @@ int home(HomeArgs args)
 {
 
     return args.cmd.matchCmd!(
-        (HomeApplyArgs a) {
-        writeln("Applying home configuration from: ", a.type);
-        return executeCommand("just switch-home " ~ a.type);
-    },
-        (HomeEditArgs a) => "user".edit(a.type),
+        (HomeApplyArgs a) => "home".apply([a.type.to!string, a.user]),
+        (HomeEditArgs a) => "user".edit(a.type.to!string),
         (UnknownCommandArgs a) => unknown_command(a)
     );
 }

packages/mcl/src/src/mcl/commands/deploy_spec.d

@@ -60,7 +60,7 @@ export int deploy_spec(DeploySpecArgs args)
     infof("%s machines will be deployed.", spec.agents.length);
 
     if (!spec.agents.length)
-        return 1;
+        return 0;
 
     spawnProcessInline([
         "cachix", "deploy", "activate", deploySpecFile, "--async"

packages/mcl/src/src/mcl/commands/host_info.d

@@ -57,9 +57,12 @@ string[string] getProcInfo(string fileOrData, bool file = true)
 struct HostInfoArgs {
     @(NamedArgument(["coda-api-token"])
         .Placeholder("token")
-        .EnvFallback("CODA_API_TOKEN")
-    )
+        .EnvFallback("CODA_API_TOKEN"))
     string codaApiToken;
+
+    @(NamedArgument(["upload-to-coda"])
+        .Description("Upload the host info to Coda"))
+    bool uploadToCoda = false;
 }
 
 export int host_info(HostInfoArgs args)
@@ -72,7 +75,7 @@ export int host_info(HostInfoArgs args)
         .toPrettyString(JSONOptions.doNotEscapeSlashes)
         .writeln();
 
-    if (!args.codaApiToken) {
+    if (args.uploadToCoda &&!args.codaApiToken) {
         writeln("No Coda API token specified -> not uploading");
         return 1;
     }
@@ -81,7 +84,7 @@ export int host_info(HostInfoArgs args)
     auto coda = CodaApiClient(args.codaApiToken);
     coda.uploadHostInfo(hostInfo);
 
-    return 1;
+    return 0;
 
 }
 

packages/mcl/src/src/mcl/commands/machine.d

@@ -35,7 +35,6 @@ struct User {
 
 struct UserInfo
 {
-    bool isNormalUser;
     string description;
     string[] extraGroups;
     string hashedPassword;
@@ -59,7 +58,6 @@ User getUser(string userName)
     auto userJson = nix.eval!JSONValue("users/" ~ userName ~ "/user-info.nix", ["--file"]);
     User user;
     user.userName = userName;
-    user.userInfo.isNormalUser = userJson["userInfo"]["isNormalUser"].boolean;
     user.userInfo.description = userJson["userInfo"]["description"].str;
     user.userInfo.extraGroups = userJson["userInfo"]["extraGroups"].array.map!(a => a.str).array;
     user.userInfo.hashedPassword = userJson["userInfo"]["hashedPassword"].str;
@@ -189,7 +187,6 @@ User createUser(CreateMachineArgs args) {
             User user;
             user.userName = args.userName != "" ? args.userName : prompt!string("Enter the new username");
             user.userInfo.description = args.description != "" ? args.description : prompt!string("Enter the user's description/full name");
-            user.userInfo.isNormalUser = args.isNormalUser || prompt!bool("Is this a normal or root user");
             user.userInfo.extraGroups = (args.extraGroups != "" ? args.extraGroups : prompt!string("Enter the user's extra groups (comma delimited)", getGroups())).split(",").map!(strip).array;
             createUserDir(user);
             return user;
@@ -400,8 +397,6 @@ struct CreateMachineArgs
     string machineName;
     @(NamedArgument(["description"]).Placeholder("description").Description("Description of the user"))
     string description;
-    @(NamedArgument(["is-normal-user"]).Placeholder("true/false").Description("Is this a normal user"))
-    bool isNormalUser;
     @(NamedArgument(["extra-groups"]).Placeholder("group1,group2").Description("Extra groups for the user"))
     string extraGroups;
     @(NamedArgument(["machine-type"]).Placeholder("desktop/server/container").Description("Type of machine"))