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.

Sign up for GitHub

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

Jump to bottom

JSON decoder fixup #105702

Merged
merged 3 commits into from
Oct 15, 2021
Merged

JSON decoder fixup #105702

merged 3 commits into from
Oct 15, 2021

Conversation

liggitt
Copy link
Member

@liggitt liggitt commented Oct 15, 2021

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

Fixes two issues with the json decoding, ahead of #105030

  1. Adds an items json tag to the internal unstructured list type
  2. Fixes the strict json decoder tests
  • Matches real apiVersion/kind decoding behavior
  • Removes misleading "untagged fields" tests (the tests were returning errors because of unknown apiVersion fields, not the untagged fields)
NONE

/cc @deads2k
/sig api-machinery

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Oct 15, 2021
liggitt
liggitt commented Oct 15, 2021
View reviewed changes
staging/src/k8s.io/apimachinery/pkg/runtime/serializer/json/json_test.go
typer: &mockTyper{gvk: &schema.GroupVersionKind{Kind: "Test", Group: "other", Version: "blah"}},
expectedGVK: &schema.GroupVersionKind{Kind: "Test", Group: "other", Version: "blah"},
errFn: func(err error) bool {
return strings.Contains(err.Error(), "found unknown field")
Copy link
Member Author

Choose a reason for hiding this comment

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

this was erroring on the unknown field apiVersion, not the untagged field Other

liggitt
liggitt commented Oct 15, 2021
View reviewed changes
staging/src/k8s.io/apimachinery/pkg/runtime/serializer/json/json_test.go
typer: &mockTyper{gvk: &schema.GroupVersionKind{Kind: "Test", Group: "other", Version: "blah"}},
expectedGVK: &schema.GroupVersionKind{Kind: "Test", Group: "other", Version: "blah"},
errFn: func(err error) bool {
return strings.Contains(err.Error(), "found unknown field")
Copy link
Member Author

Choose a reason for hiding this comment

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

this was erroring on the unknown field apiVersion, not the untagged field Other

@liggitt liggitt mentioned this pull request Oct 15, 2021
Merged
@k8s-triage-robot
Copy link

This PR may require API review.

If so, when the changes are ready, complete the pre-review checklist and request an API review.

Status of requested reviews is tracked in the API Review project.

@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Oct 15, 2021
@liggitt
Copy link
Member Author

liggitt commented Oct 15, 2021

/retest

@liggitt liggitt mentioned this pull request Oct 15, 2021
Merged
4 tasks
@dims
Copy link
Member

dims commented Oct 15, 2021

/approve
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 15, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dims, liggitt

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-triage-robot
Copy link

The Kubernetes project has merge-blocking tests that are currently too flaky to consistently pass.

This bot retests PRs for certain kubernetes repos according to the following rules:

  • The PR does have any do-not-merge/* labels
  • The PR does not have the needs-ok-to-test label
  • The PR is mergeable (does not have a needs-rebase label)
  • The PR is approved (has cncf-cla: yes, lgtm, approved labels)
  • The PR is failing tests required for merge

You can:

/retest

aojea
aojea reviewed Oct 15, 2021
View reviewed changes
staging/src/k8s.io/apimachinery/pkg/runtime/serializer/json/json_test.go
@@ -30,11 +31,12 @@ import (
)

type testDecodable struct {
metav1.TypeMeta `json:",inline"`
Copy link
Member

Choose a reason for hiding this comment

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

heh, I just found this golang/go#6213, what is this inline tag used for in kubernetes?
comments says is a noop

Copy link
Member Author

Choose a reason for hiding this comment

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

huh... I... don't know... tracked it back to #79

Copy link
Member

Choose a reason for hiding this comment

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

🙃

@k8s-ci-robot k8s-ci-robot merged commit 3f40906 into kubernetes:master Oct 15, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.23 milestone Oct 15, 2021
@liggitt liggitt deleted the json-strict-test branch October 18, 2021 17:35
@fedebongio
Copy link
Contributor

/triage accepted

@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. and removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Oct 19, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aojea aojea aojea left review comments

@deads2k deads2k Awaiting requested review from deads2k

Assignees

@dims dims

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. kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. release-note-none Denotes a PR that doesn't merit a release note. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
None yet
Milestone
v1.23
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@liggitt @k8s-triage-robot @dims @k8s-ci-robot @fedebongio @aojea