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 panic when calling ToUnstructured on nil metav1.Time #258

Merged
merged 1 commit into from
May 30, 2024

Conversation

com6056
Copy link
Contributor

@com6056 com6056 commented May 15, 2024

Currently, when calling ToUnstructured on a metav1.Time that is a nil pointer, you get a panic:

panic: value method k8s.io/apimachinery/pkg/apis/meta/v1.Time.ToUnstructured called using nil *Time pointer

goroutine 1 [running]:
k8s.io/apimachinery/pkg/apis/meta/v1.(*Time).ToUnstructured(0x100000001?)
	<autogenerated>:1 +0x48
sigs.k8s.io/structured-merge-diff/v4/value.TypeReflectCacheEntry.ToUnstructured({0x1, 0x0, 0x0, 0x0, 0x1, 0x0, 0x0, {0x0, 0x0, 0x0}}, ...)
	external/io_k8s_sigs_structured_merge_diff_v4/value/reflectcache.go:192 +0x658
k8s.io/apimachinery/pkg/runtime.toUnstructured({0x108eaaf80?, 0x14001065390?, 0x1?}, {0x108686960?, 0x14003e181b0?, 0x98?})
	external/io_k8s_apimachinery/pkg/runtime/converter.go:655 +0x6d4
k8s.io/apimachinery/pkg/runtime.structToUnstructured({0x108a15600?, 0x14001065378?, 0x1?}, {0x108686960?, 0x14003e18150?, 0x104d118f8?})
	external/io_k8s_apimachinery/pkg/runtime/converter.go:843 +0x764
k8s.io/apimachinery/pkg/runtime.toUnstructured({0x108a15600?, 0x14001065378?, 0x3?}, {0x108686960?, 0x14003e18150?, 0x98?})
	external/io_k8s_apimachinery/pkg/runtime/converter.go:692 +0x628
k8s.io/apimachinery/pkg/runtime.structToUnstructured({0x108b1ca20?, 0x14001065008?, 0x8?}, {0x10870bce0?, 0x14001783600?, 0x104d118f8?})
	external/io_k8s_apimachinery/pkg/runtime/converter.go:843 +0x764
k8s.io/apimachinery/pkg/runtime.toUnstructured({0x108b1ca20?, 0x14001065008?, 0x10823aa40?}, {0x10870bce0?, 0x14001783600?, 0x8?})
	external/io_k8s_apimachinery/pkg/runtime/converter.go:692 +0x628
k8s.io/apimachinery/pkg/runtime.(*unstructuredConverter).ToUnstructured(0x10b8d9c80, {0x108e80880, 0x14001065008})
	external/io_k8s_apimachinery/pkg/runtime/converter.go:586 +0x250
...

This moves the nil pointer check up to before we check if there is a custom converter so that we don't attempt to call ToUnstructured on a nil pointer which triggers the panic.

Related issues:

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label May 15, 2024
@k8s-ci-robot
Copy link
Contributor

Welcome @com6056!

It looks like this is your first PR to kubernetes-sigs/structured-merge-diff 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/structured-merge-diff has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label May 15, 2024
@k8s-ci-robot
Copy link
Contributor

Hi @com6056. 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/M Denotes a PR that changes 30-99 lines, ignoring generated files. label May 15, 2024
@dprotaso
Copy link

/ok-to-test
/assign @jpbetz

@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 May 15, 2024
@com6056
Copy link
Contributor Author

com6056 commented May 21, 2024

@jpbetz anything I can do to help get this reviewed? Let me know if I can provide any additional context! 🙏

@Rubik0000
Copy link

It seems the PR fixes metav1.Duration too, so it would be nice to have the fix, thanks @com6056

@jpbetz
Copy link
Contributor

jpbetz commented May 29, 2024

ack, i'll try to get to this

@jpbetz
Copy link
Contributor

jpbetz commented May 29, 2024

/lgtm
/approve
Thanks for the fix!

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 29, 2024
@dprotaso
Copy link

dprotaso commented May 30, 2024 via email

@apelisse
Copy link
Contributor

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: apelisse, com6056, jpbetz

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

The pull request process is described 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 the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 30, 2024
@k8s-ci-robot k8s-ci-robot merged commit 92c1d38 into kubernetes-sigs:master May 30, 2024
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants