mirror of
https://github.com/kubernetes/sample-controller.git
synced 2025-02-01 17:42:52 +08:00
a1cbb76b5c
Automatic merge from submit-queue (batch tested with PRs 65946, 65904, 65913, 65906, 65920). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. track schemes by name for error reporting Getting an error message about a type not being in the scheme is hard to fix if you don't know which scheme is failing. This adds a name to the scheme which can be set during creation or can be set based on the calling stack. If you use the old constructor a name is generated for you based on the stack. Something like "k8s.io/client-go/dynamic/scheme.go:28" for instance. Also moves a typer to its point of use. This was debt from previous refactors which I noticed going through. @kubernetes/sig-api-machinery-misc @sttts ```release-note NONE ``` Kubernetes-commit: 8e2fdb32bc84103b15310a221a375470bf567bdc
52 lines
1.7 KiB
Go
52 lines
1.7 KiB
Go
/*
|
|
Copyright 2014 The Kubernetes Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package runtime
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/json"
|
|
"errors"
|
|
)
|
|
|
|
func (re *RawExtension) UnmarshalJSON(in []byte) error {
|
|
if re == nil {
|
|
return errors.New("runtime.RawExtension: UnmarshalJSON on nil pointer")
|
|
}
|
|
if !bytes.Equal(in, []byte("null")) {
|
|
re.Raw = append(re.Raw[0:0], in...)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// MarshalJSON may get called on pointers or values, so implement MarshalJSON on value.
|
|
// http://stackoverflow.com/questions/21390979/custom-marshaljson-never-gets-called-in-go
|
|
func (re RawExtension) MarshalJSON() ([]byte, error) {
|
|
if re.Raw == nil {
|
|
// TODO: this is to support legacy behavior of JSONPrinter and YAMLPrinter, which
|
|
// expect to call json.Marshal on arbitrary versioned objects (even those not in
|
|
// the scheme). pkg/kubectl/resource#AsVersionedObjects and its interaction with
|
|
// kubectl get on objects not in the scheme needs to be updated to ensure that the
|
|
// objects that are not part of the scheme are correctly put into the right form.
|
|
if re.Object != nil {
|
|
return json.Marshal(re.Object)
|
|
}
|
|
return []byte("null"), nil
|
|
}
|
|
// TODO: Check whether ContentType is actually JSON before returning it.
|
|
return re.Raw, nil
|
|
}
|