mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-30 06:54:01 +00:00
Fix forkedjson.LookupPatchMetadata for pointers.
The provided test case fails without the lines added to fields.go.
This commit is contained in:
parent
f6929fc089
commit
cbc116fa3c
@ -3,6 +3,7 @@ package(default_visibility = ["//visibility:public"])
|
||||
load(
|
||||
"@io_bazel_rules_go//go:def.bzl",
|
||||
"go_library",
|
||||
"go_test",
|
||||
)
|
||||
|
||||
go_library(
|
||||
@ -10,6 +11,12 @@ go_library(
|
||||
srcs = ["fields.go"],
|
||||
)
|
||||
|
||||
go_test(
|
||||
name = "go_default_test",
|
||||
srcs = ["fields_test.go"],
|
||||
library = ":go_default_library",
|
||||
)
|
||||
|
||||
filegroup(
|
||||
name = "package-srcs",
|
||||
srcs = glob(["**"]),
|
||||
|
@ -28,6 +28,9 @@ const (
|
||||
// TODO: fix the returned errors to be introspectable.
|
||||
func LookupPatchMetadata(t reflect.Type, jsonField string) (
|
||||
elemType reflect.Type, patchStrategies []string, patchMergeKey string, e error) {
|
||||
if t.Kind() == reflect.Ptr {
|
||||
t = t.Elem()
|
||||
}
|
||||
if t.Kind() == reflect.Map {
|
||||
elemType = t.Elem()
|
||||
return
|
||||
|
30
staging/src/k8s.io/apimachinery/third_party/forked/golang/json/fields_test.go
vendored
Normal file
30
staging/src/k8s.io/apimachinery/third_party/forked/golang/json/fields_test.go
vendored
Normal file
@ -0,0 +1,30 @@
|
||||
package json
|
||||
|
||||
import (
|
||||
"reflect"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestLookupPtrToStruct(t *testing.T) {
|
||||
type Elem struct {
|
||||
Key string
|
||||
Value string
|
||||
}
|
||||
type Outer struct {
|
||||
Inner []Elem `json:"inner" patchStrategy:"merge" patchMergeKey:"key"`
|
||||
}
|
||||
outer := &Outer{}
|
||||
elemType, patchStrategies, patchMergeKey, err := LookupPatchMetadata(reflect.TypeOf(outer), "inner")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if elemType != reflect.TypeOf([]Elem{}) {
|
||||
t.Errorf("elemType = %v, want: %v", elemType, reflect.TypeOf([]Elem{}))
|
||||
}
|
||||
if !reflect.DeepEqual(patchStrategies, []string{"merge"}) {
|
||||
t.Errorf("patchStrategies = %v, want: %v", patchStrategies, []string{"merge"})
|
||||
}
|
||||
if patchMergeKey != "key" {
|
||||
t.Errorf("patchMergeKey = %v, want: %v", patchMergeKey, "key")
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue
Block a user