From 5f4a1aa58c3dbdffbc5bd49a1bd7363b1cd20345 Mon Sep 17 00:00:00 2001 From: ylink-lfs Date: Thu, 24 Jul 2025 09:11:09 +0800 Subject: [PATCH] chore: ptrTo util removal with ptr.To --- .../policy/validating/admission_test.go | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/validating/admission_test.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/validating/admission_test.go index 14f33b17594..6a6ee0b31b3 100644 --- a/staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/validating/admission_test.go +++ b/staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/validating/admission_test.go @@ -46,6 +46,7 @@ import ( "k8s.io/apiserver/pkg/authorization/authorizer" "k8s.io/apiserver/pkg/warning" "k8s.io/client-go/kubernetes" + "k8s.io/utils/ptr" ) var ( @@ -72,7 +73,7 @@ var ( APIVersion: paramsGVK.GroupVersion().String(), Kind: paramsGVK.Kind, }, - FailurePolicy: ptrTo(admissionregistrationv1.Fail), + FailurePolicy: ptr.To(admissionregistrationv1.Fail), Validations: []admissionregistrationv1.Validation{ { Expression: "messageId for deny policy", @@ -105,7 +106,7 @@ var ( Name: fakeParams.GetName(), Namespace: fakeParams.GetNamespace(), // fake object tracker does not populate defaults - ParameterNotFoundAction: ptrTo(admissionregistrationv1.DenyAction), + ParameterNotFoundAction: ptr.To(admissionregistrationv1.DenyAction), }, ValidationActions: []admissionregistrationv1.ValidationAction{admissionregistrationv1.Deny}, }, @@ -437,10 +438,6 @@ func attributeRecord( } } -func ptrTo[T any](obj T) *T { - return &obj -} - // ////////////////////////////////////////////////////////////////////////////// // Functionality Tests // ////////////////////////////////////////////////////////////////////////////// @@ -655,7 +652,7 @@ func TestReconfigureBinding(t *testing.T) { ParamRef: &admissionregistrationv1.ParamRef{ Name: fakeParams2.GetName(), Namespace: fakeParams2.GetNamespace(), - ParameterNotFoundAction: ptrTo(admissionregistrationv1.DenyAction), + ParameterNotFoundAction: ptr.To(admissionregistrationv1.DenyAction), }, ValidationActions: []admissionregistrationv1.ValidationAction{admissionregistrationv1.Deny}, }, @@ -991,7 +988,7 @@ func TestMultiplePoliciesSharedParamType(t *testing.T) { APIVersion: paramsGVK.GroupVersion().String(), Kind: paramsGVK.Kind, }, - FailurePolicy: ptrTo(admissionregistrationv1.Fail), + FailurePolicy: ptr.To(admissionregistrationv1.Fail), Validations: []admissionregistrationv1.Validation{ { Expression: "policy1", @@ -1006,7 +1003,7 @@ func TestMultiplePoliciesSharedParamType(t *testing.T) { APIVersion: paramsGVK.GroupVersion().String(), Kind: paramsGVK.Kind, }, - FailurePolicy: ptrTo(admissionregistrationv1.Fail), + FailurePolicy: ptr.To(admissionregistrationv1.Fail), Validations: []admissionregistrationv1.Validation{ { Expression: "policy2", @@ -1583,9 +1580,9 @@ func testParamRefCase(t *testing.T, paramIsClusterScoped, nameIsSet, namespaceIs } if denyNotFound { - paramRef.ParameterNotFoundAction = ptrTo(admissionregistrationv1.DenyAction) + paramRef.ParameterNotFoundAction = ptr.To(admissionregistrationv1.DenyAction) } else { - paramRef.ParameterNotFoundAction = ptrTo(admissionregistrationv1.AllowAction) + paramRef.ParameterNotFoundAction = ptr.To(admissionregistrationv1.AllowAction) } compiler := &fakeCompiler{}