fix data model

Signed-off-by: Kiara Grouwstra <kiara@procolix.eu>

.forgejo/workflows/ci.yaml

@@ -1,4 +1,5 @@
 on:
+  workflow_dispatch: # allows manual triggering
   pull_request:
     types:
       - opened

deployment/check/common/data-model.nix

@@ -105,8 +105,7 @@ let
                 options.enable = lib.mkEnableOption "Hello in the shell";
               };
             implementation = cfg: {
-              input = cfg;
-              output.resources = lib.optionalAttrs cfg.enable {
+              resources = lib.optionalAttrs cfg.enable {
                 hello.login-shell.packages.hello = pkgs.hello;
               };
             };
@@ -142,8 +141,7 @@ let
                   deployment-name,
                 }:
                 {
-                  input = required-resources;
-                  output.ssh-host = {
+                  ssh-host = {
                     nixos-configuration = mkNixosConfiguration environment required-resources;
                     system = targetSystem;
                     ssh = {
@@ -166,8 +164,7 @@ let
                   ...
                 }:
                 {
-                  input = required-resources;
-                  output.nixops4 =
+                  nixops4 =
                     { providers, ... }:
                     {
                       providers = {

deployment/data-model-test.nix

@@ -98,9 +98,9 @@ in
                     {
                       options.enable = lib.mkEnableOption "Hello in the shell";
                     };
-                  implementation = cfg: {
-                    input = cfg;
-                    output.resources = lib.optionalAttrs cfg.enable {
+                  implementation =
+                    cfg: {
+                    resources = lib.optionalAttrs cfg.enable {
                       hello.login-shell.packages.hello = pkgs.hello;
                     };
                   };
@@ -110,8 +110,7 @@ in
                 {
                   resources."operator-environment".login-shell.username = "operator";
                   implementation = requests: {
-                    input = requests;
-                    output.nixops4 =
+                    nixops4 = (
                       { providers, ... }:
                       {
                         providers = {
@@ -134,7 +133,8 @@ in
                               };
                             };
                         };
-                      };
+                      }
+                    );
                   };
                 };
             };

deployment/data-model.nix

@@ -29,7 +29,7 @@ let
         lib.strings.toJSON v
     );
 
-  functionType = import ./function.nix;
+  functionType = submodule ./function.nix;
   application-resources = submodule {
     options.resources = mkOption {
       # TODO: maybe transpose, and group the resources by type instead
@@ -223,18 +223,19 @@ in
             };
             resources = mkOption {
               description = "Compute resources required by an application";
-              type = functionTo application.config.config-mapping.output-type;
+              type = application.config.config-mapping.function-type;
               readOnly = true;
-              default = input: (application.config.implementation input).output;
+              default = application.config.config-mapping.apply;
             };
-            # TODO(@fricklerhandwerk): this needs a better name, it's just the type
+            # TODO(@fricklerhandwerk): this needs a better name
             config-mapping = mkOption {
               description = "Function type for the mapping from application configuration to required resources";
-              type = submodule functionType;
+              type = functionType;
               readOnly = true;
               default = {
                 input-type = submodule application.config.module;
                 output-type = application-resources;
+                implementation = application.config.implementation;
               };
             };
           };
@@ -266,7 +267,7 @@ in
             };
             resource-mapping = mkOption {
               description = "Function type for the mapping from resources to a deployment";
-              type = submodule functionType;
+              type = functionType;
               readOnly = true;
               default = {
                 input-type = submodule {
@@ -280,6 +281,37 @@ in
                   };
                 };
                 output-type = deployment-type;
+                implementation = environment.config.implementation;
+              };
+            };
+            config-mapping = mkOption {
+              description = "Mapping from a configuration to a deployment";
+              type = functionType;
+              readOnly = true;
+              default = {
+                input-type = submodule {
+                  options = {
+                    deployment-name = mkOption {
+                      type = types.str;
+                    };
+                    configuration = mkOption {
+                      type = config.configuration;
+                    };
+                  };
+                };
+                output-type = deployment-type;
+                implementation =
+                  {
+                    deployment-name,
+                    configuration,
+                  }:
+                  # TODO: check cfg.enable.true
+                  let
+                    required-resources = lib.mapAttrs (
+                      name: application-settings: config.applications.${name}.resources application-settings
+                    ) configuration.applications;
+                  in
+                  environment.config.resource-mapping.apply { inherit required-resources deployment-name; };
               };
             };
             # TODO(@fricklerhandwerk): maybe this should be a separate thing such as `fediversity-setup`,
@@ -287,21 +319,9 @@ in
             # then the deployments can simply be the result of the function application baked into this module.
             deployment = mkOption {
               description = "Generate a deployment from a configuration, by applying an environment's resource policies to the applications' resource mappings";
-              type = functionTo (environment.config.resource-mapping.output-type);
+              type = environment.config.config-mapping.function-type;
               readOnly = true;
-              default =
-                {
-                  deployment-name,
-                  configuration,
-                }:
-                # TODO: check cfg.enable.true
-                let
-                  required-resources = lib.mapAttrs (
-                    name: application-settings: config.applications.${name}.resources application-settings
-                  ) configuration.applications;
-                in
-                (environment.config.implementation { inherit required-resources deployment-name; }).output;
-
+              default = environment.config.config-mapping.apply;
             };
           };
         })

deployment/function.nix

@@ -19,6 +19,11 @@ in
       type = optionType;
     };
     function-type = mkOption {
+      type = optionType;
+      readOnly = true;
+      default = functionTo config.output-type;
+    };
+    wrapper-type = mkOption {
       type = optionType;
       readOnly = true;
       default = functionTo (submodule {
@@ -32,5 +37,22 @@ in
         };
       });
     };
+    implementation = mkOption {
+      type = config.function-type;
+      default = _: { };
+    };
+    wrapper = mkOption {
+      type = config.wrapper-type;
+      readOnly = true;
+      default = input: fn: {
+        inherit input;
+        output = config.implementation fn.config.input;
+      };
+    };
+    apply = mkOption {
+      type = config.function-type;
+      readOnly = true;
+      default = input: (config.wrapper input).output;
+    };
   };
 }