Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix CRD import issue with oneOf, not, and anyOf #424

Merged
merged 6 commits into from
Dec 14, 2024

Conversation

errordeveloper
Copy link
Contributor

@errordeveloper errordeveloper commented Sep 10, 2024

CUE now has resolved the CRD import issue with oneOf, not, and anyOf (#336) as well required fields. This PR integrates latest revision and updates tests.

Fix: #336

@errordeveloper errordeveloper marked this pull request as ready for review September 10, 2024 12:29
@errordeveloper
Copy link
Contributor Author

Adding a bump for gomega, as it gets only a shy +1 as part of CUE bump, might as well get the very latest.

Copy link
Owner

@stefanprodan stefanprodan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @errordeveloper! Really happy to see the CRD import working for oneOf/anyOf 🎉

go.mod Outdated
@@ -3,7 +3,7 @@ module github.com/stefanprodan/timoni
go 1.22.0

require (
cuelang.org/go v0.9.2
cuelang.org/go v0.11.0-alpha.1.0.20240910060539-63413629e06b
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We'll need to wait for v0.11.0 to go GA before merging.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes... only if one could use build tags in 'go.mod'!

@errordeveloper
Copy link
Contributor Author

Should we add test cases for all verbs? I think Flagger CRD has only one of them.

@stefanprodan
Copy link
Owner

v0.11.0 is out so we can move forward with this PR https://github.com/cue-lang/cue/releases/tag/v0.11.0

@errordeveloper
Copy link
Contributor Author

errordeveloper commented Nov 19, 2024 via email

@stefanprodan
Copy link
Owner

@errordeveloper I don't think CI would run if the PR has conflicts, but you can run it locally with make test.

@errordeveloper
Copy link
Contributor Author

@stefanprodan tests are passing now now, please have a look over the changes, I cannot be too sure of what some of the CUE changes in tests amount to, clearly a few things have changes in 0.11.0.

@stefanprodan stefanprodan changed the title Update to latest version of CUE Fix CRD import issue with oneOf, not, and anyOf Dec 14, 2024
@stefanprodan stefanprodan added the area/engine CUE engine related issues and pull requests label Dec 14, 2024
Copy link
Owner

@stefanprodan stefanprodan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Thanks @errordeveloper 🏅

@stefanprodan stefanprodan merged commit d54ad1b into stefanprodan:main Dec 14, 2024
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/engine CUE engine related issues and pull requests
Projects
None yet
2 participants