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 SIGSERV when RawSpec is nil (due to anonymous struct) #1098

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

rkettelerij
Copy link

This is the same PR as #892 but that one was automatically closed. This time testdata is included as requested so I'm hoping to get this merged.

From the original PR:

Under some circumstances RawSpec can be nil. I've encountred this when generating a CRD of a complex set of structs. Currently the structToSchema func fails hard on this (SIGSERV). This PR fixes the latter.

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: rkettelerij
Once this PR has been reviewed and has the lgtm label, please assign sbueringer for approval. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Nov 28, 2024
@k8s-ci-robot
Copy link
Contributor

Hi @rkettelerij. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Nov 28, 2024
@chrischdi
Copy link
Member

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Nov 28, 2024
@rkettelerij
Copy link
Author

Apparently this was also reported before in #340 and #415 but never merged due to staleness.

@@ -404,7 +404,7 @@ func structToSchema(ctx *schemaContext, structType *ast.StructType) *apiext.JSON
Properties: make(map[string]apiext.JSONSchemaProps),
}

if ctx.info.RawSpec.Type != structType {
if ctx.info.RawSpec != nil && ctx.info.RawSpec.Type != structType {
Copy link
Member

Choose a reason for hiding this comment

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

But this would allow embedded structs / anonymous structs, which does not seem to be allowed according to the error below?

Shouldn't this then be:

Suggested change
if ctx.info.RawSpec != nil && ctx.info.RawSpec.Type != structType {
if ctx.info.RawSpec == nil || ctx.info.RawSpec.Type != structType {

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants