Fixup lint warning

This commit is contained in:
Jordan Liggitt 2024-06-27 00:42:01 -04:00
parent 4d535db8be
commit 9f8f36708a
No known key found for this signature in database

View File

@ -28,6 +28,8 @@ import (
celtypes "github.com/google/cel-go/common/types" celtypes "github.com/google/cel-go/common/types"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
pointer "k8s.io/utils/ptr"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@ -46,7 +48,6 @@ import (
genericfeatures "k8s.io/apiserver/pkg/features" genericfeatures "k8s.io/apiserver/pkg/features"
utilfeature "k8s.io/apiserver/pkg/util/feature" utilfeature "k8s.io/apiserver/pkg/util/feature"
featuregatetesting "k8s.io/component-base/featuregate/testing" featuregatetesting "k8s.io/component-base/featuregate/testing"
"k8s.io/utils/pointer"
) )
type condition struct { type condition struct {
@ -996,7 +997,7 @@ func TestRuntimeCELCostBudget(t *testing.T) {
params: configMapParams, params: configMapParams,
exceedBudget: false, exceedBudget: false,
testRuntimeCELCostBudget: 10, testRuntimeCELCostBudget: 10,
expectRemainingBudget: pointer.Int64(4), // 10 - 6 expectRemainingBudget: pointer.To(int64(4)), // 10 - 6
}, },
{ {
name: "test RuntimeCELCostBudge exactly covers", name: "test RuntimeCELCostBudge exactly covers",
@ -1013,7 +1014,7 @@ func TestRuntimeCELCostBudget(t *testing.T) {
params: configMapParams, params: configMapParams,
exceedBudget: false, exceedBudget: false,
testRuntimeCELCostBudget: 6, testRuntimeCELCostBudget: 6,
expectRemainingBudget: pointer.Int64(0), expectRemainingBudget: pointer.To(int64(0)),
}, },
{ {
name: "test RuntimeCELCostBudge exactly covers then constant", name: "test RuntimeCELCostBudge exactly covers then constant",
@ -1033,7 +1034,7 @@ func TestRuntimeCELCostBudget(t *testing.T) {
params: configMapParams, params: configMapParams,
exceedBudget: false, exceedBudget: false,
testRuntimeCELCostBudget: 6, testRuntimeCELCostBudget: 6,
expectRemainingBudget: pointer.Int64(0), expectRemainingBudget: pointer.To(int64(0)),
}, },
{ {
name: "Extended library cost: authz check", name: "Extended library cost: authz check",
@ -1046,7 +1047,7 @@ func TestRuntimeCELCostBudget(t *testing.T) {
hasParamKind: false, hasParamKind: false,
exceedBudget: false, exceedBudget: false,
testRuntimeCELCostBudget: 6, testRuntimeCELCostBudget: 6,
expectRemainingBudget: pointer.Int64(0), expectRemainingBudget: pointer.To(int64(0)),
authorizer: denyAll, authorizer: denyAll,
}, },
{ {
@ -1060,7 +1061,7 @@ func TestRuntimeCELCostBudget(t *testing.T) {
hasParamKind: false, hasParamKind: false,
exceedBudget: false, exceedBudget: false,
testRuntimeCELCostBudget: 1, testRuntimeCELCostBudget: 1,
expectRemainingBudget: pointer.Int64(0), expectRemainingBudget: pointer.To(int64(0)),
}, },
{ {
name: "Extended library cost: url", name: "Extended library cost: url",
@ -1073,7 +1074,7 @@ func TestRuntimeCELCostBudget(t *testing.T) {
hasParamKind: false, hasParamKind: false,
exceedBudget: false, exceedBudget: false,
testRuntimeCELCostBudget: 2, testRuntimeCELCostBudget: 2,
expectRemainingBudget: pointer.Int64(0), expectRemainingBudget: pointer.To(int64(0)),
}, },
{ {
name: "Extended library cost: split", name: "Extended library cost: split",
@ -1086,7 +1087,7 @@ func TestRuntimeCELCostBudget(t *testing.T) {
hasParamKind: false, hasParamKind: false,
exceedBudget: false, exceedBudget: false,
testRuntimeCELCostBudget: 3, testRuntimeCELCostBudget: 3,
expectRemainingBudget: pointer.Int64(0), expectRemainingBudget: pointer.To(int64(0)),
}, },
{ {
name: "Extended library cost: join", name: "Extended library cost: join",
@ -1099,7 +1100,7 @@ func TestRuntimeCELCostBudget(t *testing.T) {
hasParamKind: false, hasParamKind: false,
exceedBudget: false, exceedBudget: false,
testRuntimeCELCostBudget: 3, testRuntimeCELCostBudget: 3,
expectRemainingBudget: pointer.Int64(0), expectRemainingBudget: pointer.To(int64(0)),
}, },
{ {
name: "Extended library cost: find", name: "Extended library cost: find",
@ -1112,7 +1113,7 @@ func TestRuntimeCELCostBudget(t *testing.T) {
hasParamKind: false, hasParamKind: false,
exceedBudget: false, exceedBudget: false,
testRuntimeCELCostBudget: 3, testRuntimeCELCostBudget: 3,
expectRemainingBudget: pointer.Int64(0), expectRemainingBudget: pointer.To(int64(0)),
}, },
{ {
name: "Extended library cost: quantity", name: "Extended library cost: quantity",
@ -1125,7 +1126,7 @@ func TestRuntimeCELCostBudget(t *testing.T) {
hasParamKind: false, hasParamKind: false,
exceedBudget: false, exceedBudget: false,
testRuntimeCELCostBudget: 6, testRuntimeCELCostBudget: 6,
expectRemainingBudget: pointer.Int64(0), expectRemainingBudget: pointer.To(int64(0)),
}, },
{ {
name: "With StrictCostEnforcementForVAP enabled: expression exceed RuntimeCELCostBudget at fist expression", name: "With StrictCostEnforcementForVAP enabled: expression exceed RuntimeCELCostBudget at fist expression",
@ -1176,7 +1177,7 @@ func TestRuntimeCELCostBudget(t *testing.T) {
params: configMapParams, params: configMapParams,
exceedBudget: false, exceedBudget: false,
testRuntimeCELCostBudget: 700011, testRuntimeCELCostBudget: 700011,
expectRemainingBudget: pointer.Int64(1), // 700011 - 700010 expectRemainingBudget: pointer.To(int64(1)), // 700011 - 700010
authorizer: denyAll, authorizer: denyAll,
enableStrictCostEnforcement: true, enableStrictCostEnforcement: true,
}, },
@ -1195,7 +1196,7 @@ func TestRuntimeCELCostBudget(t *testing.T) {
params: configMapParams, params: configMapParams,
exceedBudget: false, exceedBudget: false,
testRuntimeCELCostBudget: 700010, testRuntimeCELCostBudget: 700010,
expectRemainingBudget: pointer.Int64(0), expectRemainingBudget: pointer.To(int64(0)),
authorizer: denyAll, authorizer: denyAll,
enableStrictCostEnforcement: true, enableStrictCostEnforcement: true,
}, },
@ -1225,7 +1226,7 @@ func TestRuntimeCELCostBudget(t *testing.T) {
hasParamKind: false, hasParamKind: false,
exceedBudget: false, exceedBudget: false,
testRuntimeCELCostBudget: 4, testRuntimeCELCostBudget: 4,
expectRemainingBudget: pointer.Int64(0), expectRemainingBudget: pointer.To(int64(0)),
enableStrictCostEnforcement: true, enableStrictCostEnforcement: true,
}, },
{ {
@ -1239,7 +1240,7 @@ func TestRuntimeCELCostBudget(t *testing.T) {
hasParamKind: false, hasParamKind: false,
exceedBudget: false, exceedBudget: false,
testRuntimeCELCostBudget: 4, testRuntimeCELCostBudget: 4,
expectRemainingBudget: pointer.Int64(0), expectRemainingBudget: pointer.To(int64(0)),
enableStrictCostEnforcement: true, enableStrictCostEnforcement: true,
}, },
{ {
@ -1253,7 +1254,7 @@ func TestRuntimeCELCostBudget(t *testing.T) {
hasParamKind: false, hasParamKind: false,
exceedBudget: false, exceedBudget: false,
testRuntimeCELCostBudget: 5, testRuntimeCELCostBudget: 5,
expectRemainingBudget: pointer.Int64(0), expectRemainingBudget: pointer.To(int64(0)),
enableStrictCostEnforcement: true, enableStrictCostEnforcement: true,
}, },
{ {
@ -1267,7 +1268,7 @@ func TestRuntimeCELCostBudget(t *testing.T) {
hasParamKind: false, hasParamKind: false,
exceedBudget: false, exceedBudget: false,
testRuntimeCELCostBudget: 7, testRuntimeCELCostBudget: 7,
expectRemainingBudget: pointer.Int64(0), expectRemainingBudget: pointer.To(int64(0)),
enableStrictCostEnforcement: true, enableStrictCostEnforcement: true,
}, },
{ {
@ -1281,7 +1282,7 @@ func TestRuntimeCELCostBudget(t *testing.T) {
hasParamKind: false, hasParamKind: false,
exceedBudget: false, exceedBudget: false,
testRuntimeCELCostBudget: 4, testRuntimeCELCostBudget: 4,
expectRemainingBudget: pointer.Int64(0), expectRemainingBudget: pointer.To(int64(0)),
enableStrictCostEnforcement: true, enableStrictCostEnforcement: true,
}, },
{ {
@ -1295,7 +1296,7 @@ func TestRuntimeCELCostBudget(t *testing.T) {
hasParamKind: false, hasParamKind: false,
exceedBudget: false, exceedBudget: false,
testRuntimeCELCostBudget: 6, testRuntimeCELCostBudget: 6,
expectRemainingBudget: pointer.Int64(0), expectRemainingBudget: pointer.To(int64(0)),
enableStrictCostEnforcement: true, enableStrictCostEnforcement: true,
}, },
} }