[HACK] unwire deployment resource-mapping output-type, fixes error: Expected a module, but found a value of type "option-type"

add comment explaining our nixops4 type problem

default.nix

@@ -9,10 +9,9 @@ let
     git-hooks
     gitignore
     ;
-  inherit (import sources.flake-inputs) import-flake;
-  inputs = (import-flake { src = ./.; }).inputs;
   inherit (pkgs) lib;
   inherit (import sources.flake-inputs) import-flake;
+  inputs = (import-flake { src = ./.; }).inputs;
   inherit ((import-flake { src = ./.; }).inputs) nixops4;
   panel = import ./panel { inherit sources system; };
   pre-commit-check =

deployment/data-model-test.nix

@@ -1,21 +1,18 @@
 let
   inherit (import ../default.nix { }) pkgs inputs;
   inherit (pkgs) lib;
-  inherit (lib) mkOption;
+  inherit (lib) mkOption types;
   eval =
     module:
     (lib.evalModules {
       specialArgs = {
         inherit inputs;
-        # to be passed to nixops4Deployment
-        resourceProviderSystem = builtins.currentSystem;
       };
       modules = [
         module
         ./data-model.nix
       ];
     }).config;
-  nixops4Deployment = inputs.nixops4.modules.nixops4Deployment.default;
 in
 {
   test-eval = {
@@ -118,39 +115,44 @@ in
                         enable = lib.mkEnableOption "Hello in the shell";
                       };
                     };
-                  implementation =
+                  resources =
                     cfg:
                     lib.optionalAttrs cfg.enable {
                       dummy.login-shell.packages.hello = pkgs.hello;
                     };
                 };
               environments.single-nixos-vm =
-                { config, ... }:
+                { ... }:
                 {
                   _class = "fediversity-environment";
                   resources.shell.login-shell.username = "operator";
                   implementation =
-                    requests:
+                    _requests:
                     { providers, ... }:
                     {
                       _class = "nixops4Deployment";
                       providers = {
                         inherit (inputs.nixops4.modules.nixops4Provider) local;
                       };
+                      # this seems checked according to {providers,resources,resource}.nix,
+                      # values will not eagerly get checked, matching `providers.nix`'s `lazyAttrsOf`,
+                      # whereas allowed keys seem to match those defined in `resource.nix`.
+                      # the content of `resources.the-machine` however, follows `nixops4-nixos`,
+                      # which is not allowed through our `type` yet.
                       resources.the-machine = {
                         _class = "nixops4Resource";
                         type = providers.local.exec;
                         imports = [
                           inputs.nixops4-nixos.modules.nixops4Resource.nixos
                         ];
-                        nixos.module =
+                        # nixos.module =
-                          { ... }:
+                        #   { ... }:
-                          {
+                        #   {
-                            _class = "nixos";
+                        #     _class = "nixos";
-                            users.users = config.resources.shell.login-shell.apply (
+                        #     users.users = config.resources.shell.login-shell.apply (
-                              lib.filterAttrs (_name: value: value ? login-shell) requests
+                        #       lib.filterAttrs (_name: value: value ? login-shell) requests
-                            );
+                        #     );
-                          };
+                        #   };
                       };
                     };
                 };
@@ -165,14 +167,11 @@ in
                   applications.hello.enable = true;
                 };
               };
-            };
+              example-deployment = mkOption {
-            environments.single-nixos-vm = {
+                type = types.raw;
-
+                readOnly = true;
-            };
+                default = config.environments.single-nixos-vm.deployment config.example-configuration;
-            configurations.example = {
+              };
-              enable = true;
-              applications.hello.enable = true;
-              # default = config.environments.single-nixos-vm.deployment config.example-configuration;
             };
           }
         );
@@ -180,14 +179,15 @@ in
       {
         inherit (fediversity)
           example-configuration
-          example-deployment
           ;
+        has-deployment = lib.isAttrs fediversity.example-deployment.resources.the-machine;
       };
     expected = {
       example-configuration = {
         enable = true;
         applications.hello.enable = true;
       };
+      has-deployment = true;
     };
   };
 }

deployment/data-model.nix

@@ -1,7 +1,6 @@
 {
   lib,
   config,
-  inputs,
   ...
 }:
 let
@@ -13,22 +12,44 @@ let
     submoduleWith
     optionType
     functionTo
+    raw
     ;
 
   functionType = import ./function.nix;
-  application-requirements = {
+
-    _class = "fediversity-application-requirements";
+  configuration = mkOption {
-    options.resources = mkOption {
+    description = "Configuration type declaring options to be set by operators";
-      # TODO: maybe transpose, and group the resources by type instead
+    type = optionType;
-      type = attrsOf (
+    readOnly = true;
-        attrTag (lib.mapAttrs (_name: resource: mkOption { type = resource.request; }) config.resources)
+    default = submoduleWith {
-      );
+      class = "fediversity-configuration";
+      modules = [
+        {
+          options = {
+            enable = lib.mkEnableOption {
+              description = "your Fediversity configuration";
+            };
+            applications = lib.mapAttrs (
+              _name: application:
+              mkOption {
+                description = application.description;
+                type = submoduleWith {
+                  class = "fediversity-application-config";
+                  modules = [ application.module ];
+                };
+                default = { };
+              }
+            ) config.applications;
+          };
+        }
+      ];
     };
   };
 in
 {
   _class = "fediversity-settings";
   options = {
+    inherit configuration;
     resources = mkOption {
       description = "Collection of deployment resources that can be required by applications and policed by hosting providers";
       type = attrsOf (submoduleWith {
@@ -70,7 +91,7 @@ in
       type = attrsOf (submoduleWith {
         class = "fediversity-application";
         modules = [
-          (application: {
+          {
             options = {
               description = mkOption {
                 description = "Description to be shown in the application overview";
@@ -80,53 +101,20 @@ in
                 description = "Operator-facing configuration options for the application";
                 type = deferredModuleWith { staticModules = [ { _class = "fediversity-application-config"; } ]; };
               };
-              implementation = mkOption {
-                description = "Mapping of application configuration to deployment resources, a description of what an application needs to run";
-                type = application.config.config-mapping.function-type;
-              };
               resources = mkOption {
-                description = "Compute resources required by an application";
+                description = "Mapping of application configuration to deployment resources, a description of what an application needs to run";
-                type = functionTo application.config.config-mapping.output-type;
+                # TODO: maybe transpose, and group the resources by type instead
-                readOnly = true;
+                type = functionTo (
-                default = input: (application.config.implementation input).output;
+                  attrsOf (
-              };
+                    attrTag (lib.mapAttrs (_name: resource: mkOption { type = resource.request; }) config.resources)
-              config-mapping = mkOption {
+                  )
-                description = "Function type for the mapping from application configuration to required resources";
+                );
-                type = submoduleWith {
-                  class = "module-function";
-                  modules = [ functionType ];
-                };
-                readOnly = true;
-                default = {
-                  input-type = application.config.module;
-                  output-type = application-requirements;
-                };
               };
             };
-          })
+          }
         ];
       });
     };
-    configuration = mkOption {
-      description = "Configuration type declaring options to be set by operators";
-      type = optionType;
-      readOnly = true;
-      default = submodule {
-        options = {
-          enable = lib.mkEnableOption {
-            description = "your Fediversity configuration";
-          };
-          applications = lib.mapAttrs (
-            _name: application:
-            mkOption {
-              description = application.description;
-              type = submodule application.module;
-              default = { };
-            }
-          ) config.applications;
-        };
-      };
-    };
     environments = mkOption {
       description = "Run-time environments for Fediversity applications to be deployed to";
       type = attrsOf (submoduleWith {
@@ -157,7 +145,7 @@ in
               };
               implementation = mkOption {
                 description = "Mapping of resources required by applications to available resources; the result can be deployed";
-                type = environment.config.resource-mapping.function-type;
+                type = functionTo raw;
               };
               resource-mapping = mkOption {
                 description = "Function type for the mapping from resources to a (NixOps4) deployment";
@@ -167,16 +155,13 @@ in
                 };
                 readOnly = true;
                 default = {
-                  input-type = application-requirements;
+                  input-type = configuration;
-                  output-type = nixops4Deployment;
+                  output-type = raw;
                 };
               };
               deployment = mkOption {
                 description = "Generate a deployment from a configuration";
-                type = functionTo (submoduleWith {
+                type = functionTo raw;
-                  class = "nixops4Deployment";
-                  modules = [ environment.config.resource-mapping.output-type ];
-                });
                 readOnly = true;
                 default =
                   cfg:
@@ -186,7 +171,7 @@ in
                       name: application-settings: config.applications.${name}.resources application-settings
                     ) cfg.applications;
                   in
-                  (environment.config.implementation required-resources).output;
+                  (environment.config.implementation required-resources);
 
               };
             };
@@ -194,33 +179,5 @@ in
         ];
       });
     };
-    configuration = mkOption {
-      description = "Configuration type declaring options to be set by operators";
-      type = optionType;
-      readOnly = true;
-      default = submoduleWith {
-        class = "fediversity-configuration";
-        modules = [
-          {
-            options = {
-              enable = lib.mkEnableOption {
-                description = "your Fediversity configuration";
-              };
-              applications = lib.mapAttrs (
-                _name: application:
-                mkOption {
-                  description = application.description;
-                  type = submoduleWith {
-                    class = "fediversity-application-config";
-                    modules = [ application.module ];
-                  };
-                  default = { };
-                }
-              ) config.applications;
-            };
-          }
-        ];
-      };
-    };
   };
 }

deployment/deployment.nix

@@ -0,0 +1,12 @@
+{
+  inputs,
+  ...
+}:
+
+inputs.nixops4.modules.nixops4Deployment.default
+
+#   inherit lib config resources;
+#   # config = {
+#   #   type providers provider inputs outputsSkeleton resourceType
+#   # };
+# }