Update staging/src/k8s.io/apiserver/pkg/audit/request_log_test.go

Co-authored-by: Tim Allclair <timallclair@gmail.com>
Signed-off-by: Davanum Srinivas <davanum@gmail.com>

Kubernetes-commit: 721947a5703f2ffaafdc9bef983a6b60c6253ca8

pkg/audit/request_log_test.go

@@ -97,21 +97,36 @@ func TestLogResponseObjectWithPod(t *testing.T) {
 }
 
 func TestLogResponseObjectWithStatus(t *testing.T) {
-	// Create a status object to test ResponseStatus handling
+	testCases := []struct {
-	testStatus := &metav1.Status{
+		name               string
-		TypeMeta: metav1.TypeMeta{
+		level              auditinternal.Level
-			APIVersion: "v1",
+		status             *metav1.Status
-			Kind:       "Status",
+		shouldEncode       bool
+		expectResponseObj  bool
+		expectStatusFields bool
+	}{
+		{
+			name:               "RequestResponse level should encode and log status fields",
+			level:              auditinternal.LevelRequestResponse,
+			status:             &metav1.Status{Status: "Success", Message: "Test message", Code: 200},
+			shouldEncode:       true,
+			expectResponseObj:  true,
+			expectStatusFields: true,
+		},
+		{
+			name:               "Metadata level should log status fields without encoding",
+			level:              auditinternal.LevelMetadata,
+			status:             &metav1.Status{Status: "Success", Message: "Test message", Code: 200},
+			shouldEncode:       false,
+			expectResponseObj:  false,
+			expectStatusFields: true,
 		},
-		Status:  "Success",
-		Message: "Test status message",
-		Reason:  "TestReason",
-		Code:    200,
 	}
 
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
 			scheme := runtime.NewScheme()
-	err := metav1.AddMetaToScheme(scheme)
+			if err := metav1.AddMetaToScheme(scheme); err != nil {
-	if err != nil {
 				t.Fatalf("Failed to add meta to scheme: %v", err)
 			}
 			scheme.AddKnownTypes(schema.GroupVersion{Version: "v1"}, &metav1.Status{})
@@ -122,11 +137,11 @@ func TestLogResponseObjectWithStatus(t *testing.T) {
 			ac := AuditContextFrom(ctx)
 
 			captureSink := &capturingAuditSink{}
-	if err := ac.Init(RequestAuditConfig{Level: auditinternal.LevelRequestResponse}, captureSink); err != nil {
+			if err := ac.Init(RequestAuditConfig{Level: tc.level}, captureSink); err != nil {
 				t.Fatalf("Failed to initialize audit context: %v", err)
 			}
 
-	LogResponseObject(ctx, testStatus, schema.GroupVersion{Group: "", Version: "v1"}, negotiatedSerializer)
+			LogResponseObject(ctx, tc.status, schema.GroupVersion{Group: "", Version: "v1"}, negotiatedSerializer)
 			ac.ProcessEventStage(ctx, auditinternal.StageResponseComplete)
 
 			if len(captureSink.events) != 1 {
@@ -134,23 +149,33 @@ func TestLogResponseObjectWithStatus(t *testing.T) {
 			}
 			event := captureSink.events[0]
 
+			if tc.expectResponseObj {
 				if event.ResponseObject == nil {
-		t.Fatal("Expected ResponseObject to be set, but it was nil")
+					t.Error("Expected ResponseObject to be set, but it was nil")
 				}
+			} else {
+				if event.ResponseObject != nil {
+					t.Error("Expected ResponseObject to be nil")
+				}
+			}
+
+			if tc.expectStatusFields {
 				if event.ResponseStatus == nil {
-		t.Fatal("Expected ResponseStatus to be set for Status object, but it was nil")
+					t.Fatal("Expected ResponseStatus to be set, but it was nil")
 				}
-	if event.ResponseStatus.Status != "Success" {
+				if event.ResponseStatus.Status != tc.status.Status {
-		t.Errorf("Expected ResponseStatus.Status to be 'Success', got %q", event.ResponseStatus.Status)
+					t.Errorf("Expected ResponseStatus.Status to be %q, got %q", tc.status.Status, event.ResponseStatus.Status)
 				}
-	if event.ResponseStatus.Message != "Test status message" {
+				if event.ResponseStatus.Message != tc.status.Message {
-		t.Errorf("Expected ResponseStatus.Message to be 'Test status message', got %q", event.ResponseStatus.Message)
+					t.Errorf("Expected ResponseStatus.Message to be %q, got %q", tc.status.Message, event.ResponseStatus.Message)
 				}
-	if event.ResponseStatus.Reason != "TestReason" {
+				if event.ResponseStatus.Code != tc.status.Code {
-		t.Errorf("Expected ResponseStatus.Reason to be 'TestReason', got %q", event.ResponseStatus.Reason)
+					t.Errorf("Expected ResponseStatus.Code to be %d, got %d", tc.status.Code, event.ResponseStatus.Code)
 				}
-	if event.ResponseStatus.Code != 200 {
+			} else if event.ResponseStatus != nil {
-		t.Errorf("Expected ResponseStatus.Code to be 200, got %d", event.ResponseStatus.Code)
+				t.Error("Expected ResponseStatus to be nil")
+			}
+		})
 	}
 }
 
@@ -179,6 +204,18 @@ func TestLogResponseObjectLevelCheck(t *testing.T) {
 			expectResponseObj:  false,
 			expectStatusFields: false,
 		},
+		{
+			name:  "Metadata level with Status should log status fields without encoding",
+			level: auditinternal.LevelMetadata,
+			obj: &metav1.Status{
+				Status:  "Success",
+				Message: "Test message",
+				Code:    200,
+			},
+			shouldEncode:       false,
+			expectResponseObj:  false,
+			expectStatusFields: true,
+		},
 		{
 			name:               "Request level with Pod should not encode or log",
 			level:              auditinternal.LevelRequest,
@@ -270,11 +307,9 @@ func TestLogResponseObjectLevelCheck(t *testing.T) {
 						t.Errorf("Expected ResponseStatus.Code to be %d, got %d", status.Code, event.ResponseStatus.Code)
 					}
 				}
-			} else {
+			} else if event.ResponseStatus != nil {
-				if event.ResponseStatus != nil {
 				t.Error("Expected ResponseStatus to be nil")
 			}
-			}
 		})
 	}
 }