fix nixops4 for adjusted arguments

this is a cop-out possible until
fricklerhandwerk/Fediversity#15.
after that, this will require actually figuring out how to get `options`
for `deployment.nix` - which may need `evalModules` with
`data-model.nix`.

.forgejo/workflows/ci.yaml

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

deployment/check/common/data-model.nix

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

deployment/data-model-test.nix

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

deployment/data-model.nix

@@ -29,7 +29,7 @@ let
         lib.strings.toJSON v
     );
 
-  functionType = submodule ./function.nix;
+  functionType = import ./function.nix;
   application-resources = submodule {
     options.resources = mkOption {
       # TODO: maybe transpose, and group the resources by type instead
@@ -223,19 +223,18 @@ in
             };
             resources = mkOption {
               description = "Compute resources required by an application";
-              type = application.config.config-mapping.function-type;
+              type = functionTo application.config.config-mapping.output-type;
               readOnly = true;
-              default = application.config.config-mapping.apply;
+              default = input: (application.config.implementation input).output;
             };
-            # TODO(@fricklerhandwerk): this needs a better name
+            # TODO(@fricklerhandwerk): this needs a better name, it's just the type
             config-mapping = mkOption {
               description = "Function type for the mapping from application configuration to required resources";
-              type = functionType;
+              type = submodule functionType;
               readOnly = true;
               default = {
                 input-type = submodule application.config.module;
                 output-type = application-resources;
-                implementation = application.config.implementation;
               };
             };
           };
@@ -267,7 +266,7 @@ in
             };
             resource-mapping = mkOption {
               description = "Function type for the mapping from resources to a deployment";
-              type = functionType;
+              type = submodule functionType;
               readOnly = true;
               default = {
                 input-type = submodule {
@@ -281,26 +280,16 @@ in
                   };
                 };
                 output-type = deployment-type;
-                implementation = environment.config.implementation;
               };
             };
-            config-mapping = mkOption {
+            # TODO(@fricklerhandwerk): maybe this should be a separate thing such as `fediversity-setup`,
-              description = "Mapping from a configuration to a deployment";
+            # which makes explicit which applications and environments are available.
-              type = functionType;
+            # 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);
               readOnly = true;
-              default = {
+              default =
-                input-type = submodule {
-                  options = {
-                    deployment-name = mkOption {
-                      type = types.str;
-                    };
-                    configuration = mkOption {
-                      type = config.configuration;
-                    };
-                  };
-                };
-                output-type = deployment-type;
-                implementation =
                 {
                   deployment-name,
                   configuration,
@@ -311,17 +300,8 @@ in
                     name: application-settings: config.applications.${name}.resources application-settings
                   ) configuration.applications;
                 in
-                  environment.config.resource-mapping.apply { inherit required-resources deployment-name; };
+                (environment.config.implementation { inherit required-resources deployment-name; }).output;
-              };
+
-            };
-            # TODO(@fricklerhandwerk): maybe this should be a separate thing such as `fediversity-setup`,
-            # which makes explicit which applications and environments are available.
-            # 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 = environment.config.config-mapping.function-type;
-              readOnly = true;
-              default = environment.config.config-mapping.apply;
             };
           };
         })

deployment/function.nix

@@ -19,11 +19,6 @@ 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 {
@@ -37,22 +32,5 @@ 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;
-    };
   };
 }