Merge pull request kubernetes#113133 from sxllwx:automated-cherry-pic…

…k-of-kubernetes#113133-upstream-release-1.25

Automated cherry pick of kubernetes#113133: Fix DeleteCollection API decode DeleteOptions fail

staging/src/k8s.io/apiserver/pkg/endpoints/handlers/delete.go

@@ -231,7 +231,7 @@ func DeleteCollection(r rest.CollectionDeleter, checkBody bool, scope *RequestSc
 				return
 			}
 			if len(body) > 0 {
-				s, err := negotiation.NegotiateInputSerializer(req, false, scope.Serializer)
+				s, err := negotiation.NegotiateInputSerializer(req, false, metainternalversionscheme.Codecs)
 				if err != nil {
 					scope.err(err, w, req)
 					return

staging/src/k8s.io/apiserver/pkg/endpoints/handlers/delete_test.go

@@ -0,0 +1,206 @@
+/*
+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 handlers
+
+import (
+	"context"
+	"io"
+	"net/http"
+	"strings"
+	"testing"
+
+	metainternalversionscheme "k8s.io/apimachinery/pkg/apis/meta/internalversion/scheme"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/runtime/serializer"
+	auditapis "k8s.io/apiserver/pkg/apis/audit"
+	"k8s.io/apiserver/pkg/audit"
+	"k8s.io/apiserver/pkg/endpoints/handlers/negotiation"
+	"k8s.io/utils/pointer"
+)
+
+type mockCodecs struct {
+	serializer.CodecFactory
+	err error
+}
+
+type mockCodec struct {
+	runtime.Codec
+	codecs *mockCodecs
+}
+
+func (p mockCodec) Encode(obj runtime.Object, w io.Writer) error {
+	err := p.Codec.Encode(obj, w)
+	p.codecs.err = err
+	return err
+}
+
+func (s *mockCodecs) EncoderForVersion(encoder runtime.Encoder, gv runtime.GroupVersioner) runtime.Encoder {
+	out := s.CodecFactory.CodecForVersions(encoder, nil, gv, nil)
+	return &mockCodec{
+		Codec:  out,
+		codecs: s,
+	}
+}
+
+func TestDeleteResourceAuditLogRequestObject(t *testing.T) {
+
+	ctx := audit.WithAuditContext(context.TODO(), &audit.AuditContext{
+		Event: &auditapis.Event{
+			Level: auditapis.LevelRequestResponse,
+		},
+	})
+
+	policy := metav1.DeletePropagationBackground
+	deleteOption := &metav1.DeleteOptions{
+		GracePeriodSeconds: pointer.Int64Ptr(30),
+		PropagationPolicy:  &policy,
+	}
+
+	fakeCorev1GroupVersion := schema.GroupVersion{
+		Group:   "",
+		Version: "v1",
+	}
+	testScheme := runtime.NewScheme()
+	metav1.AddToGroupVersion(testScheme, fakeCorev1GroupVersion)
+	testCodec := serializer.NewCodecFactory(testScheme)
+
+	tests := []struct {
+		name       string
+		object     runtime.Object
+		gv         schema.GroupVersion
+		serializer serializer.CodecFactory
+		ok         bool
+	}{
+		{
+			name: "meta built-in Codec encode v1.DeleteOptions",
+			object: &metav1.DeleteOptions{
+				GracePeriodSeconds: pointer.Int64Ptr(30),
+				PropagationPolicy:  &policy,
+			},
+			gv:         metav1.SchemeGroupVersion,
+			serializer: metainternalversionscheme.Codecs,
+			ok:         true,
+		},
+		{
+			name: "fake corev1 registered codec encode v1 DeleteOptions",
+			object: &metav1.DeleteOptions{
+				GracePeriodSeconds: pointer.Int64Ptr(30),
+				PropagationPolicy:  &policy,
+			},
+			gv:         metav1.SchemeGroupVersion,
+			serializer: testCodec,
+			ok:         false,
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+
+			codecs := &mockCodecs{}
+			codecs.CodecFactory = test.serializer
+
+			audit.LogRequestObject(ctx, deleteOption, test.gv, schema.GroupVersionResource{
+				Group:    "",
+				Version:  "v1",
+				Resource: "pods",
+			}, "", codecs)
+
+			err := codecs.err
+			if err != nil {
+				if test.ok {
+					t.Errorf("expect nil but got %#v", err)
+				}
+				t.Logf("encode object: %#v", err)
+			} else {
+				if !test.ok {
+					t.Errorf("expect err but got nil")
+				}
+			}
+		})
+	}
+}
+
+func TestDeleteCollection(t *testing.T) {
+	req := &http.Request{
+		Header: http.Header{},
+	}
+	req.Header.Set("Content-Type", "application/json")
+
+	fakeCorev1GroupVersion := schema.GroupVersion{
+		Group:   "",
+		Version: "v1",
+	}
+	fakeCorev1Scheme := runtime.NewScheme()
+	fakeCorev1Scheme.AddKnownTypes(fakeCorev1GroupVersion, &metav1.DeleteOptions{})
+	fakeCorev1Codec := serializer.NewCodecFactory(fakeCorev1Scheme)
+
+	tests := []struct {
+		name         string
+		codecFactory serializer.CodecFactory
+		data         []byte
+		expectErr    string
+	}{
+		//  for issue: https://github.com/kubernetes/kubernetes/issues/111985
+		{
+			name:         "decode '{}' to metav1.DeleteOptions with fakeCorev1Codecs",
+			codecFactory: fakeCorev1Codec,
+			data:         []byte("{}"),
+			expectErr:    "no kind \"DeleteOptions\" is registered",
+		},
+		{
+			name:         "decode '{}' to metav1.DeleteOptions with metainternalversionscheme.Codecs",
+			codecFactory: metainternalversionscheme.Codecs,
+			data:         []byte("{}"),
+			expectErr:    "",
+		},
+		{
+			name:         "decode versioned (corev1) DeleteOptions with metainternalversionscheme.Codecs",
+			codecFactory: metainternalversionscheme.Codecs,
+			data:         []byte(`{"apiVersion":"v1","kind":"DeleteOptions","gracePeriodSeconds":123}`),
+			expectErr:    "",
+		},
+		{
+			name:         "decode versioned (foo) DeleteOptions with metainternalversionscheme.Codecs",
+			codecFactory: metainternalversionscheme.Codecs,
+			data:         []byte(`{"apiVersion":"foo/v1","kind":"DeleteOptions","gracePeriodSeconds":123}`),
+			expectErr:    "",
+		},
+	}
+
+	defaultGVK := metav1.SchemeGroupVersion.WithKind("DeleteOptions")
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			s, err := negotiation.NegotiateInputSerializer(req, false, test.codecFactory)
+			if err != nil {
+				t.Fatal(err)
+			}
+
+			options := &metav1.DeleteOptions{}
+			_, _, err = metainternalversionscheme.Codecs.DecoderToVersion(s.Serializer, defaultGVK.GroupVersion()).Decode(test.data, &defaultGVK, options)
+			if test.expectErr != "" {
+				if err == nil {
+					t.Fatalf("expect %s but got nil", test.expectErr)
+				}
+				if !strings.Contains(err.Error(), test.expectErr) {
+					t.Fatalf("expect %s but got %s", test.expectErr, err.Error())
+				}
+			}
+		})
+	}
+}