Add edge case in crd2jsonschema.py where anyOf can be present in additionalProperties

Author: arnarg

modules/generated/argocd.nix

@@ -7342,7 +7342,7 @@ in {
         };
       }
       // {
-        "appprojects" = mkOption {
+        "appProjects" = mkOption {
           description = "AppProject provides a logical grouping of applications, providing controls for: * where the apps may deploy to (cluster whitelist) * what may be deployed (repository whitelist, resource whitelist/blacklist) * who can access these applications (roles, OIDC group claims bindings) * and what they can do (RBAC policies) * automation access to these roles (JWT tokens)";
           type = types.attrsOf (submoduleForDefinition "argoproj.io.v1alpha1.AppProject" "appprojects" "AppProject" "argoproj.io" "v1alpha1");
           default = {};
@@ -7366,7 +7366,7 @@ in {
         group = "argoproj.io";
         version = "v1alpha1";
         kind = "AppProject";
-        attrName = "appprojects";
+        attrName = "appProjects";
       }
       {
         name = "applications";
@@ -7379,7 +7379,7 @@ in {
 
     resources = {
       "argoproj.io"."v1alpha1"."AppProject" =
-        mkAliasDefinitions options.resources."appprojects";
+        mkAliasDefinitions options.resources."appProjects";
       "argoproj.io"."v1alpha1"."Application" =
         mkAliasDefinitions options.resources."applications";
     };

pkgs/generators/crd2jsonschema.py

@@ -64,6 +64,10 @@ def flatten_ref(definition, key, root=True):
         if not root:
             if 'type' in definition and definition['type'] == 'object':
                 if not 'properties' in definition:
+                    # The nix generator doesn't support anyOf
+                    if 'additionalProperties' in definition and 'anyOf' in definition['additionalProperties']:
+                        definition['additionalProperties'] = definition['additionalProperties']['anyOf'][0]
+
                     return definition
                 else:
                     schema['definitions'][key] = flatten_ref(definition, key, True)
@@ -76,6 +80,7 @@ def flatten_ref(definition, key, root=True):
                 definition['items'] = flatten_ref(definition['items'], key, False)
                 return definition
 
+            # The nix generator doesn't support anyOf
             elif 'anyOf' in definition:
                 newDef = definition['anyOf'][0]
                 newDef['description'] = definition.get('description', '')