data model: add classes

specifies classes in the data model, raising these to from `_class`
model attributes to `subModuleWith`'s `class` parameter where possible.

note: resource policy has remained as to use `deferredModuleWith`
(rather than `submoduleWith`) to ensure evaluation will go thru.

deployment/data-model-test.nix

@@ -68,8 +68,9 @@ in
                         default = false;
                       };
                     };
-                    config.resource-type = types.raw; # TODO: splice out the user type from NixOS
-                    config.apply =
+                    config = {
+                      resource-type = types.raw; # TODO: splice out the user type from NixOS
+                      apply =
                         requests:
                         let
                           # Filter out requests that need wheel if policy doesn't allow it
@@ -88,6 +89,7 @@ in
                         };
                     };
                   };
+              };
               applications.hello =
                 { ... }:
                 {
@@ -151,7 +153,7 @@ in
           }
         );
         resources = fediversity.applications.hello.resources fediversity.example-configuration.applications.hello;
-        hello-shell = (resources).resources.hello.login-shell;
+        hello-shell = resources.resources.hello.login-shell;
         environment = fediversity.environments.single-nixos-vm.resources.operator-environment.login-shell;
         result = mkDeployment {
           modules = [
@@ -160,7 +162,7 @@ in
         };
 
       in
-      rec {
+      {
         number-of-resources = with lib; length (attrNames fediversity.resources);
         inherit (fediversity) example-configuration;
         hello-package-exists = hello-shell.packages ? hello;
@@ -172,7 +174,7 @@ in
           in
           {
             inherit (operator) isNormalUser;
-            packages = with lib; map (p: "${p.pname}") operator.packages;
+            packages = map (p: "${p.pname}") operator.packages;
             extraGroups = operator.extraGroups;
           };
         deployment = {

deployment/data-model.nix

@@ -11,12 +11,14 @@ let
     attrTag
     deferredModuleWith
     submodule
+    submoduleWith
     optionType
     functionTo
     ;
 
   functionType = import ./function.nix;
   application-resources = submodule {
+    _class = "fediversity-application-requirements";
     options.resources = mkOption {
       # TODO: maybe transpose, and group the resources by type instead
       type = attrsOf (
@@ -40,13 +42,15 @@ let
   };
 in
 {
-  _class = "nixops4Deployment";
+  _class = "fediversity-settings";
 
   options = {
     resources = mkOption {
       description = "Collection of deployment resources that can be required by applications and policed by hosting providers";
-      type = attrsOf (
-        submodule (
+      type = attrsOf (submoduleWith {
+        class = "fediversity-resource";
+        modules = [
+          (
             { ... }:
             {
               _class = "fediversity-resource";
@@ -73,7 +77,7 @@ in
                         # and then also rename this to be consistent with the application's resource mapping
                         options.apply = mkOption {
                           description = "Apply the policy to a request";
-                        type = with types; functionTo policy.config.resource-type;
+                          type = functionTo policy.config.resource-type;
                         };
                       })
                     ];
@@ -82,12 +86,15 @@ in
               };
             }
           )
-      );
+        ];
+      });
     };
     applications = mkOption {
       description = "Collection of Fediversity applications";
-      type = attrsOf (
-        submodule (application: {
+      type = attrsOf (submoduleWith {
+        class = "fediversity-application";
+        modules = [
+          (application: {
             _class = "fediversity-application";
             options = {
               description = mkOption {
@@ -111,7 +118,10 @@ in
               # 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 = submodule functionType;
+                type = submoduleWith {
+                  class = "module-function";
+                  modules = [ functionType ];
+                };
                 readOnly = true;
                 default = {
                   input-type = submodule application.config.module;
@@ -120,13 +130,15 @@ in
               };
             };
           })
-      );
+        ];
+      });
     };
     environments = mkOption {
       description = "Run-time environments for Fediversity applications to be deployed to";
-      type = attrsOf (
-        submodule (environment: {
-          _class = "fediversity-environment";
+      type = attrsOf (submoduleWith {
+        class = "fediversity-environment";
+        modules = [
+          (environment: {
             options = {
               resources = mkOption {
                 description = ''
@@ -137,7 +149,15 @@ in
                 # TODO: maybe transpose, and group the resources by type instead
                 type = attrsOf (
                   attrTag (
-                  lib.mapAttrs (_name: resource: mkOption { type = submodule resource.policy; }) config.resources
+                    lib.mapAttrs (
+                      _name: resource:
+                      mkOption {
+                        type = submoduleWith {
+                          class = "fediversity-resource-policy";
+                          modules = [ resource.policy ];
+                        };
+                      }
+                    ) config.resources
                   )
                 );
               };
@@ -147,7 +167,10 @@ in
               };
               resource-mapping = mkOption {
                 description = "Function type for the mapping from resources to a (NixOps4) deployment";
-              type = submodule functionType;
+                type = submoduleWith {
+                  class = "module-function";
+                  modules = [ functionType ];
+                };
                 readOnly = true;
                 default = {
                   input-type = application-resources;
@@ -174,7 +197,8 @@ in
               };
             };
           })
-      );
+        ];
+      });
     };
     configuration = mkOption {
       description = "Configuration type declaring options to be set by operators";
@@ -189,7 +213,10 @@ in
             _name: application:
             mkOption {
               description = application.description;
-              type = submodule application.module;
+              type = submoduleWith {
+                class = "fediversity-application-config";
+                modules = [ application.module ];
+              };
               default = { };
             }
           ) config.applications;