fix(conform): simplifies configuration input

nix-community · Jun 1, 2022 · c981459 · c981459
1 parent ad34da4
commit c981459
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 40 deletions.
diff --git a/plugins/conform/mkConfig.nix b/plugins/conform/mkConfig.nix
@@ -5,9 +5,21 @@ let
   files = [ ./template.cue ];
   output = ".conform.yaml";
 
+  # Expand out the data
+  test = {
+    commit = { };
+    license = { };
+  };
+
+  dataFinal = {
+    policies = (optional (data ? commit) { type = "commit"; spec = data.commit; }) ++
+      (optional (data ? license) { type = "license"; spec = data.license; });
+  };
+
   # Generate the module
   result = lib.mkTemplate {
-    inherit data files output;
+    inherit files output;
+    data = dataFinal;
   };
 in
 {

diff --git a/tests/conform/default.nix b/tests/conform/default.nix
@@ -1,42 +1,33 @@
 { runTest }:
-runTest "conform.mkConfig" ./expected.yml {
-  policies = [
-    {
-      type = "commit";
-      spec = {
-        header = {
-          length = 89;
-          imperative = true;
-          case = "lower";
-          invalidLastCharacters = ".";
-        };
-        gpg = {
-          required = false;
-          identity = {
-            gitHubOrganization = "some-organization";
-          };
-        };
-        conventional = {
-          types = [
-            "type"
-          ];
-          scopes = [
-            "scope"
-          ];
-        };
+runTest "conform.mkConfig" ./expected.yml
+{
+  commit = {
+    header = {
+      length = 89;
+      imperative = true;
+      case = "lower";
+      invalidLastCharacters = ".";
+    };
+    gpg = {
+      required = false;
+      identity = {
+        gitHubOrganization = "some-organization";
       };
-    }
-
-    {
-      type = "license";
-      spec = {
-        skipPaths = [
-          ".git/"
-          "build*/"
-        ];
-        allowPrecedingComments = false;
-      };
-    }
-  ];
+    };
+    conventional = {
+      types = [
+        "type"
+      ];
+      scopes = [
+        "scope"
+      ];
+    };
+  };
+  license = {
+    skipPaths = [
+      ".git/"
+      "build*/"
+    ];
+    allowPrecedingComments = false;
+  };
 }
-