handle custom decode

pkg/container/cri/json.go

@@ -23,10 +23,11 @@ import (
 )
 
 /*
-Custom JSON / yaml (by way of json) serialization for these types
+Custom JSON (de)serialization for these types
+TODO: just use yaml ...
 */
 
-// MarshalJSON implements custom encoding for JSON and Yaml
+// MarshalJSON implements custom encoding for JSON
 // https://golang.org/pkg/encoding/json/
 func (m *Mount) MarshalJSON() ([]byte, error) {
 	type Alias Mount
@@ -67,7 +68,7 @@ func (m *Mount) UnmarshalJSON(data []byte) error {
 	return nil
 }
 
-// MarshalJSON implements custom encoding for JSON and Yaml
+// MarshalJSON implements custom encoding for JSON
 // https://golang.org/pkg/encoding/json/
 func (p *PortMapping) MarshalJSON() ([]byte, error) {
 	type Alias PortMapping
@@ -84,7 +85,7 @@ func (p *PortMapping) MarshalJSON() ([]byte, error) {
 	})
 }
 
-// UnmarshalJSON implements custom decoding for JSON and Yaml
+// UnmarshalJSON implements custom decoding for JSON
 // https://golang.org/pkg/encoding/json/
 func (p *PortMapping) UnmarshalJSON(data []byte) error {
 	type Alias PortMapping

pkg/container/cri/yaml.go

@@ -0,0 +1,68 @@
+/*
+Copyright 2019 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 cri
+
+/*
+Custom YAML (de)serialization for these types
+*/
+
+// UnmarshalYAML implements custom decoding YAML
+// https://godoc.org/gopkg.in/yaml.v3
+func (m *Mount) UnmarshalYAML(unmarshal func(interface{}) error) error {
+	type Alias Mount
+	aux := &struct {
+		Propagation string `yaml:"propagation"`
+		*Alias
+	}{
+		Alias: (*Alias)(m),
+	}
+	if err := unmarshal(data, &aux); err != nil {
+		return err
+	}
+	// if unset, will fallback to the default (0)
+	if aux.Propagation != "" {
+		val, ok := MountPropagationNameToValue[aux.Propagation]
+		if !ok {
+			return fmt.Errorf("unknown propagation value: %s", aux.Propagation)
+		}
+		m.Propagation = MountPropagation(val)
+	}
+	return nil
+}
+
+// UnmarshalYAML implements custom decoding YAML
+// https://godoc.org/gopkg.in/yaml.v3
+func (p *PortMapping) UnmarshalYAML(unmarshal func(interface{}) error) error {
+	type Alias PortMapping
+	aux := &struct {
+		Protocol string `json:"protocol"`
+		*Alias
+	}{
+		Alias: (*Alias)(p),
+	}
+	if err := unmarshal(data, &aux); err != nil {
+		return err
+	}
+	if aux.Protocol != "" {
+		val, ok := PortMappingProtocolNameToValue[strings.ToUpper(aux.Protocol)]
+		if !ok {
+			return fmt.Errorf("unknown protocol value: %s", aux.Protocol)
+		}
+		p.Protocol = PortMappingProtocol(val)
+	}
+	return nil
+}