[HACK] comment environment resources type, making the test go through

rm deployment

deployment/data-model-test.nix

@@ -13,7 +13,6 @@ let
         ./data-model.nix
       ];
     }).config;
-  nixops4Deployment = inputs.nixops4.modules.nixops4Deployment.default;
 in
 {
   test-eval = {
@@ -36,7 +35,7 @@ in
                   };
 
                 policy =
-                  { config, ... }:
+                  { ... }:
                   {
                     _class = "fediversity-resource-policy";
 
@@ -46,7 +45,7 @@ in
                       };
                       apply = mkOption {
                         type = with types; functionTo raw;
-                        default = requests: lib.mkMerge (requests ++ [ config.extra-config ]);
+                        default = policy: requests: lib.mkMerge (requests ++ [ policy.extra-config ]);
                       };
                     };
                   };
@@ -71,7 +70,7 @@ in
                     };
                   };
                 policy =
-                  { config, ... }:
+                  { ... }:
                   {
                     _class = "fediversity-resource-policy";
                     options = {
@@ -87,16 +86,16 @@ in
                       apply = mkOption {
                         type = with types; functionTo raw; # TODO: splice out the user type from NixOS
                         default =
-                          requests:
+                          policy: requests:
                           let
                             # Filter out requests that need wheel if policy doesn't allow it
-                            validRequests = lib.filterAttrs (_name: req: !req.wheel || config.wheel) requests;
+                            validRequests = lib.filterAttrs (_name: req: !req.wheel || policy.wheel) requests;
                           in
                           lib.optionalAttrs (validRequests != { }) {
-                            ${config.username} = {
+                            ${policy.username} = {
                               isNormalUser = true;
                               packages = with lib; concatMap (request: attrValues request.packages) (attrValues validRequests);
-                              extraGroups = lib.optional config.wheel "wheel";
+                              extraGroups = lib.optional policy.wheel "wheel";
                             };
                           };
                       };
@@ -122,37 +121,27 @@ in
                       dummy.login-shell.packages.hello = pkgs.hello;
                     };
                 };
-              environments.single-nixos-vm =
+              environments.single-nixos-vm = environment: {
-                { config, ... }:
-                {
                 _class = "fediversity-environment";
-                  resources.shell.login-shell.username = "operator";
+                resources.shell.login-shell = {
-                  implementation =
+                  username = "operator";
-                    requests:
+                  wheel = false; # FIXME: why do i need to make this explicit, if a default was supposed to be set?
-                    { providers, ... }:
-                    {
-                      _class = "nixops4Deployment";
-                      providers = {
-                        inherit (inputs.nixops4.modules.nixops4Provider) local;
                 };
-                      resources.the-machine = {
+                implementation = requests: {
-                        _class = "nixops4Resource";
-                        type = providers.local.exec;
-                        imports = [
-                          inputs.nixops4-nixos.modules.nixops4Resource.nixos
-                        ];
-                        nixos.module =
-                          { ... }:
-                          {
                   _class = "nixos";
-                            users.users = config.resources.shell.login-shell.apply (
+                  users.users = (
-                              lib.filterAttrs (_name: value: value ? login-shell) requests
+                    config.resources.login-shell.policy.apply environment.config.resources.shell.login-shell (
+                      lib.concatMapAttrs (
+                        _application: resources:
+                        lib.mapAttrs (_k: lib.getAttr "login-shell") (
+                          lib.filterAttrs (_name: value: value ? login-shell) resources
+                        )
+                      ) requests
+                    )
                   );
                 };
               };
             };
-                };
-            };
             options = {
               example-configuration = mkOption {
                 type = config.configuration;
@@ -164,10 +153,7 @@ in
                 };
               };
               example-deployment = mkOption {
-                type = types.submoduleWith {
+                type = types.raw;
-                  class = "nixops4Deployment";
-                  modules = [ nixops4Deployment ];
-                };
                 readOnly = true;
                 default = config.environments.single-nixos-vm.deployment config.example-configuration;
               };

deployment/data-model.nix

@@ -1,7 +1,6 @@
 {
   lib,
   config,
-  inputs,
   ...
 }:
 let
@@ -13,14 +12,44 @@ let
     submoduleWith
     optionType
     functionTo
+    raw
     ;
 
   functionType = import ./function.nix;
-  nixops4Deployment = inputs.nixops4.modules.nixops4Deployment.default;
+
+  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;
+          };
+        }
+      ];
+    };
+  };
 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 {
@@ -77,7 +106,11 @@ in
                 # TODO: maybe transpose, and group the resources by type instead
                 type = functionTo (
                   attrsOf (
-                    attrTag (lib.mapAttrs (_name: resource: mkOption { type = resource.request; }) config.resources)
+                    attrTag (
+                      lib.mapAttrs (
+                        _name: resource: mkOption { type = types.submodule resource.request; }
+                      ) config.resources
+                    )
                   )
                 );
               };
@@ -100,23 +133,28 @@ in
                   Setting this is optional, but provides a place to declare that information for programmatic use in the resource mapping.
                 '';
                 # TODO: maybe transpose, and group the resources by type instead
-                type = attrsOf (
+                # # FIXME: error: The option `environments.single-nixos-vm.resources.shell.login-shell.apply' does not exist. Definition values:
-                  attrTag (
+                # # - In `<unknown-file>': <function>
-                    lib.mapAttrs (
+                # # However there are no options defined in `environments.single-nixos-vm.resources.shell.login-shell'. Are you sure you've
-                      _name: resource:
+                # # declared your options properly? This can happen if you e.g. declared your options in `types.submodule'
-                      mkOption {
+                # # under `config' rather than `options'.
-                        type = submoduleWith {
+                # type = attrsOf (
-                          class = "fediversity-resource-policy";
+                #   attrTag (
-                          modules = [ resource.policy ];
+                #     lib.mapAttrs (
-                        };
+                #       _name: resource:
-                      }
+                #       mkOption {
-                    ) config.resources
+                #         type = submoduleWith {
-                  )
+                #           class = "fediversity-resource-policy";
-                );
+                #           modules = [ resource.policy ];
+                #         };
+                #       }
+                #     ) config.resources
+                #   )
+                # );
               };
               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";
@@ -126,16 +164,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:
@@ -153,33 +188,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;
-            };
-          }
-        ];
-      };
-    };
   };
 }