fix: fromCRD handles structural schema rule 1 exceptions

[rfuwa14]

Fixes #48

TEST

• Test CRD manifest

apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
  name: bars.foo.baz
spec:
  scope: Namespaced
  group: foo.baz
  names:
    kind: Bar
    plural: bars
    shortNames:
      - bar
    singular: bar
  versions:
    - name: v1beta3
      schema:
        openAPIV3Schema:
          properties:
            spec:
              properties:
                node:
                  description: a test node
                  x-kubernetes-int-or-string: true
              required:
                - node
              type: object
          required:
            - spec
          type: object
      served: true
      storage: true

Failure replication

$nix build --show-trace .#gen.bar
# ...
error: attribute 'type' missing
at /nix/store/67bvmrzr4iin6fcvnz9qavr2fya9hnwm-source/pkgs/generators/crd/jsonschema.nix:154:29:
  153|                     # if property has an array type
  154|                     else if property.type == "array"
     |                             ^
  155|                     then
# ...

• flake.lock

    "nixidy": {
      "inputs": {
        "flake-utils": "flake-utils",
        "nix-kube-generators": "nix-kube-generators",
        "nixpkgs": "nixpkgs_2"
      },
      "locked": {
        "lastModified": 1753281262,
        "narHash": "sha256-XZO8SNbjifLzUenfTClpzwBwiOi6OkViZ1DrECqUMHM=",
        "owner": "arnarg",
        "repo": "nixidy",
        "rev": "e7e7685825c6bd62a300bbe3eac09d7352629e92",
        "type": "github"
      },
      "original": {
        "owner": "arnarg",
        "repo": "nixidy",
        "type": "github"
      }
    },
...

Run against this change

$nix build .#gen.bar

[arnarg]

Thanks for your pull request!

To not overcomplicate the if statements in jsonschema.nix we've been handling these kind of edge cases in crd2jsonschema.py instead. Could you move this logic there?

See:

nixidy/pkgs/generators/crd/crd2jsonschema.py

Line 134 in 95d463a

"type" not in definition

[rfuwa14]

done and added an unit test.

TEST

$nix run .#crd2jsonschemaTest
......
----------------------------------------------------------------------
Ran 6 tests in 0.003s

OK

[arnarg]

Out of curiousity, are you using an LLM to write this?

Please don't creep in the type annotations and while unit tests are useful I want to first make this function more testable in the future.

To fix the issue at hand just edit the if statement I linked to like so:

elif "type" not in definition:
  if definition.get("x-kubernetes-preserve-unknown-fields", False)  == True:
    # ... 
  elif definition.get("x-kubernetes-int-or-string", False) == True:
    # ... 

[rfuwa14]

I'm not using an LLM. I added types and a bit of refactoring according to my linter because there isn't a python linter setup in this repo afaik. I removed tests for now, but it is hard to contirubte relatively bigger changes (e.g. #51). Let me know how you'd like to handle this in the future.

[arnarg]

I didn't mean any offense with that question btw.

Yeah this file started as a simple script to transform a CRD into something the existing code generator already understands. Since then handling for more and more edge cases has been added so it should probably be cleaned up a bit and tests added.

[arnarg]

Looks good! Thank you for this contribution!