Merge pull request #125418 from benluddy/cbor-byte-array-to-array

KEP-4222: Encode byte array to CBOR as array of integer, not byte string.

staging/src/k8s.io/apimachinery/pkg/runtime/serializer/cbor/internal/modes/encode.go

@@ -75,6 +75,10 @@ var Encode cbor.EncMode = func() cbor.EncMode {
 		// Encode struct field names to the byte string type rather than the text string
 		// type.
 		FieldName: cbor.FieldNameToByteString,
+
+		// Marshal Go byte arrays to CBOR arrays of integers (as in JSON) instead of byte
+		// strings.
+		ByteArray: cbor.ByteArrayToArray,
 	}.EncMode()
 	if err != nil {
 		panic(err)

staging/src/k8s.io/apimachinery/pkg/runtime/serializer/cbor/internal/modes/encode_test.go

@@ -64,6 +64,12 @@ func TestEncode(t *testing.T) {
 				}
 			}),
 		},
+		{
+			name:          "byte array encodes to array of integers",
+			in:            [3]byte{0x01, 0x02, 0x03},
+			want:          []byte{0x83, 0x01, 0x02, 0x03}, // [1, 2, 3]
+			assertOnError: assertNilError,
+		},
 	} {
 		encModes := tc.modes
 		if len(encModes) == 0 {

staging/src/k8s.io/apimachinery/pkg/runtime/serializer/cbor/internal/modes/roundtrip_test.go

@@ -47,6 +47,10 @@ func TestRoundtrip(t *testing.T) {
 			name: "nil slice",
 			obj:  []interface{}(nil),
 		},
+		{
+			name: "byte array",
+			obj:  [3]byte{0x01, 0x02, 0x03},
+		},
 		{
 			name: "nil map",
 			obj:  map[string]interface{}(nil),