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

[HACK] explicitly set resource options, as defaults seem insufficient

clarify comment

deployment/data-model-test.nix

@@ -37,7 +37,7 @@ in
                   };
 
                 policy =
-                  { config, ... }:
+                  { ... }:
                   {
                     _class = "fediversity-resource-policy";
 
@@ -45,10 +45,10 @@ in
                       extra-config = mkOption {
                         description = "Any options from NixOS";
                       };
-                      apply = mkOption {
+                    };
-                        type = with types; functionTo raw;
+                    config = {
-                        default = requests: lib.mkMerge (requests ++ [ config.extra-config ]);
+                      resource-type = types.raw; # TODO: what's the type of a NixOS configuration?
-                      };
+                      apply = policy: requests: lib.mkMerge (requests ++ [ policy.extra-config ]);
                     };
                   };
               };
@@ -72,7 +72,7 @@ in
                     };
                   };
                 policy =
-                  { config, ... }:
+                  { ... }:
                   {
                     _class = "fediversity-resource-policy";
                     options = {
@@ -85,22 +85,22 @@ in
                         type = types.bool;
                         default = false;
                       };
-                      apply = mkOption {
+                    };
-                        type = with types; functionTo raw; # TODO: splice out the user type from NixOS
+                    config = {
-                        default =
+                      resource-type = types.raw; # TODO: splice out the user type from NixOS
-                          requests:
+                      apply =
-                          let
+                        policy: requests:
-                            # Filter out requests that need wheel if policy doesn't allow it
+                        let
-                            validRequests = lib.filterAttrs (_name: req: !req.wheel || config.wheel) requests;
+                          # Filter out requests that need wheel if policy doesn't allow it
-                          in
+                          validRequests = lib.filterAttrs (_name: req: !req.wheel || policy.wheel) requests;
-                          lib.optionalAttrs (validRequests != { }) {
+                        in
-                            ${config.username} = {
+                        lib.optionalAttrs (validRequests != { }) {
-                              isNormalUser = true;
+                          ${policy.username} = {
-                              packages = with lib; concatMap (request: attrValues request.packages) (attrValues validRequests);
+                            isNormalUser = true;
-                              extraGroups = lib.optional config.wheel "wheel";
+                            packages = with lib; concatMap (request: attrValues request.packages) (attrValues validRequests);
-                            };
+                            extraGroups = lib.optional policy.wheel "wheel";
                           };
-                      };
+                        };
                     };
                   };
               };
@@ -125,26 +125,26 @@ in
                       };
                     };
                 };
-              environments.single-nixos-vm =
+              environments.single-nixos-vm = environment: {
-                { ... }:
+                _class = "fediversity-environment";
-                {
+                resources.shell.login-shell = {
-                  _class = "fediversity-environment";
+                  username = "operator";
-                  resources.shell.login-shell.username = "operator";
+                  wheel = false; # FIXME: default needs the type uncommented
-                  implementation = requests: {
-                    _class = "nixos";
-                    users.users = (
-                      config.resources.login-shell.policy.apply (
-                        lib.concatMapAttrs (
-                          _application: resources:
-                          lib.mapAttrs (_k: lib.getAttr "login-shell") (
-                            lib.filterAttrs (_name: value: value ? login-shell) resources
-                          )
-                        ) requests
-                      )
-                    );
-
-                  };
                 };
+                implementation = requests: {
+                  _class = "nixos";
+                  users.users = (
+                    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 {

deployment/data-model.nix

@@ -72,11 +72,26 @@ in
                   type = submoduleWith {
                     class = "fediversity-resource-policy";
                     modules = [
-                      {
+                      (policy: {
-                        options.apply = mkOption {
+                        _class = "fediversity-resource-policy";
-                          description = "Apply the policy to a request";
+                        options = {
+                          # TODO(@fricklerhandwerk): not sure it can be made
+                          # sensible syntactically, but essentially we want to
+                          # ensure that `apply` is defined, but since its output
+                          # depends on the specific policy we also need to
+                          # determine that somehow.
+                          # hopefully this also helps with correct composition down the line.
+                          resource-type = mkOption {
+                            description = "The type of resource this policy configures";
+                            type = types.optionType;
+                          };
+                          # TODO(@fricklerhandwerk): do we need a function type here as well, or is it in the way?
+                          apply = mkOption {
+                            description = "Apply the policy to a request";
+                            type = functionTo policy.config.resource-type;
+                          };
                         };
-                      }
+                      })
                     ];
                   };
                 };
@@ -133,23 +148,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 = functionTo environment.config.resource-mapping.output-type;
+                type = functionTo raw;
               };
               resource-mapping = mkOption {
                 description = "Function type for the mapping from resources to a (NixOps4) deployment";
@@ -165,7 +185,7 @@ in
               };
               deployment = mkOption {
                 description = "Generate a deployment from a configuration";
-                type = functionTo (submodule environment.config.resource-mapping.output-type);
+                type = functionTo raw;
                 readOnly = true;
                 default =
                   cfg: