Skip to content

Commit 9f8f367

Browse files
liggittliggitt
committed
Fixup lint warning
1 parent 4d535db commit 9f8f367

File tree

1 file changed

+20
-19
lines changed

1 file changed

+20
-19
lines changed

‎staging/src/k8s.io/apiserver/pkg/admission/plugin/cel/filter_test.go‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ import (
2828
celtypes "github.com/google/cel-go/common/types"
2929
"github.com/stretchr/testify/require"
3030

31+
pointer "k8s.io/utils/ptr"
32+
3133
corev1 "k8s.io/api/core/v1"
3234
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3335
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@@ -46,7 +48,6 @@ import (
4648
genericfeatures "k8s.io/apiserver/pkg/features"
4749
utilfeature "k8s.io/apiserver/pkg/util/feature"
4850
featuregatetesting "k8s.io/component-base/featuregate/testing"
49-
"k8s.io/utils/pointer"
5051
)
5152

5253
type condition struct {
@@ -996,7 +997,7 @@ func TestRuntimeCELCostBudget(t *testing.T) {
996997
params: configMapParams,
997998
exceedBudget: false,
998999
testRuntimeCELCostBudget: 10,
999-
expectRemainingBudget: pointer.Int64(4), // 10 - 6
1000+
expectRemainingBudget: pointer.To(int64(4)), // 10 - 6
10001001
},
10011002
{
10021003
name: "test RuntimeCELCostBudge exactly covers",
@@ -1013,7 +1014,7 @@ func TestRuntimeCELCostBudget(t *testing.T) {
10131014
params: configMapParams,
10141015
exceedBudget: false,
10151016
testRuntimeCELCostBudget: 6,
1016-
expectRemainingBudget: pointer.Int64(0),
1017+
expectRemainingBudget: pointer.To(int64(0)),
10171018
},
10181019
{
10191020
name: "test RuntimeCELCostBudge exactly covers then constant",
@@ -1033,7 +1034,7 @@ func TestRuntimeCELCostBudget(t *testing.T) {
10331034
params: configMapParams,
10341035
exceedBudget: false,
10351036
testRuntimeCELCostBudget: 6,
1036-
expectRemainingBudget: pointer.Int64(0),
1037+
expectRemainingBudget: pointer.To(int64(0)),
10371038
},
10381039
{
10391040
name: "Extended library cost: authz check",
@@ -1046,7 +1047,7 @@ func TestRuntimeCELCostBudget(t *testing.T) {
10461047
hasParamKind: false,
10471048
exceedBudget: false,
10481049
testRuntimeCELCostBudget: 6,
1049-
expectRemainingBudget: pointer.Int64(0),
1050+
expectRemainingBudget: pointer.To(int64(0)),
10501051
authorizer: denyAll,
10511052
},
10521053
{
@@ -1060,7 +1061,7 @@ func TestRuntimeCELCostBudget(t *testing.T) {
10601061
hasParamKind: false,
10611062
exceedBudget: false,
10621063
testRuntimeCELCostBudget: 1,
1063-
expectRemainingBudget: pointer.Int64(0),
1064+
expectRemainingBudget: pointer.To(int64(0)),
10641065
},
10651066
{
10661067
name: "Extended library cost: url",
@@ -1073,7 +1074,7 @@ func TestRuntimeCELCostBudget(t *testing.T) {
10731074
hasParamKind: false,
10741075
exceedBudget: false,
10751076
testRuntimeCELCostBudget: 2,
1076-
expectRemainingBudget: pointer.Int64(0),
1077+
expectRemainingBudget: pointer.To(int64(0)),
10771078
},
10781079
{
10791080
name: "Extended library cost: split",
@@ -1086,7 +1087,7 @@ func TestRuntimeCELCostBudget(t *testing.T) {
10861087
hasParamKind: false,
10871088
exceedBudget: false,
10881089
testRuntimeCELCostBudget: 3,
1089-
expectRemainingBudget: pointer.Int64(0),
1090+
expectRemainingBudget: pointer.To(int64(0)),
10901091
},
10911092
{
10921093
name: "Extended library cost: join",
@@ -1099,7 +1100,7 @@ func TestRuntimeCELCostBudget(t *testing.T) {
10991100
hasParamKind: false,
11001101
exceedBudget: false,
11011102
testRuntimeCELCostBudget: 3,
1102-
expectRemainingBudget: pointer.Int64(0),
1103+
expectRemainingBudget: pointer.To(int64(0)),
11031104
},
11041105
{
11051106
name: "Extended library cost: find",
@@ -1112,7 +1113,7 @@ func TestRuntimeCELCostBudget(t *testing.T) {
11121113
hasParamKind: false,
11131114
exceedBudget: false,
11141115
testRuntimeCELCostBudget: 3,
1115-
expectRemainingBudget: pointer.Int64(0),
1116+
expectRemainingBudget: pointer.To(int64(0)),
11161117
},
11171118
{
11181119
name: "Extended library cost: quantity",
@@ -1125,7 +1126,7 @@ func TestRuntimeCELCostBudget(t *testing.T) {
11251126
hasParamKind: false,
11261127
exceedBudget: false,
11271128
testRuntimeCELCostBudget: 6,
1128-
expectRemainingBudget: pointer.Int64(0),
1129+
expectRemainingBudget: pointer.To(int64(0)),
11291130
},
11301131
{
11311132
name: "With StrictCostEnforcementForVAP enabled: expression exceed RuntimeCELCostBudget at fist expression",
@@ -1176,7 +1177,7 @@ func TestRuntimeCELCostBudget(t *testing.T) {
11761177
params: configMapParams,
11771178
exceedBudget: false,
11781179
testRuntimeCELCostBudget: 700011,
1179-
expectRemainingBudget: pointer.Int64(1), // 700011 - 700010
1180+
expectRemainingBudget: pointer.To(int64(1)), // 700011 - 700010
11801181
authorizer: denyAll,
11811182
enableStrictCostEnforcement: true,
11821183
},
@@ -1195,7 +1196,7 @@ func TestRuntimeCELCostBudget(t *testing.T) {
11951196
params: configMapParams,
11961197
exceedBudget: false,
11971198
testRuntimeCELCostBudget: 700010,
1198-
expectRemainingBudget: pointer.Int64(0),
1199+
expectRemainingBudget: pointer.To(int64(0)),
11991200
authorizer: denyAll,
12001201
enableStrictCostEnforcement: true,
12011202
},
@@ -1225,7 +1226,7 @@ func TestRuntimeCELCostBudget(t *testing.T) {
12251226
hasParamKind: false,
12261227
exceedBudget: false,
12271228
testRuntimeCELCostBudget: 4,
1228-
expectRemainingBudget: pointer.Int64(0),
1229+
expectRemainingBudget: pointer.To(int64(0)),
12291230
enableStrictCostEnforcement: true,
12301231
},
12311232
{
@@ -1239,7 +1240,7 @@ func TestRuntimeCELCostBudget(t *testing.T) {
12391240
hasParamKind: false,
12401241
exceedBudget: false,
12411242
testRuntimeCELCostBudget: 4,
1242-
expectRemainingBudget: pointer.Int64(0),
1243+
expectRemainingBudget: pointer.To(int64(0)),
12431244
enableStrictCostEnforcement: true,
12441245
},
12451246
{
@@ -1253,7 +1254,7 @@ func TestRuntimeCELCostBudget(t *testing.T) {
12531254
hasParamKind: false,
12541255
exceedBudget: false,
12551256
testRuntimeCELCostBudget: 5,
1256-
expectRemainingBudget: pointer.Int64(0),
1257+
expectRemainingBudget: pointer.To(int64(0)),
12571258
enableStrictCostEnforcement: true,
12581259
},
12591260
{
@@ -1267,7 +1268,7 @@ func TestRuntimeCELCostBudget(t *testing.T) {
12671268
hasParamKind: false,
12681269
exceedBudget: false,
12691270
testRuntimeCELCostBudget: 7,
1270-
expectRemainingBudget: pointer.Int64(0),
1271+
expectRemainingBudget: pointer.To(int64(0)),
12711272
enableStrictCostEnforcement: true,
12721273
},
12731274
{
@@ -1281,7 +1282,7 @@ func TestRuntimeCELCostBudget(t *testing.T) {
12811282
hasParamKind: false,
12821283
exceedBudget: false,
12831284
testRuntimeCELCostBudget: 4,
1284-
expectRemainingBudget: pointer.Int64(0),
1285+
expectRemainingBudget: pointer.To(int64(0)),
12851286
enableStrictCostEnforcement: true,
12861287
},
12871288
{
@@ -1295,7 +1296,7 @@ func TestRuntimeCELCostBudget(t *testing.T) {
12951296
hasParamKind: false,
12961297
exceedBudget: false,
12971298
testRuntimeCELCostBudget: 6,
1298-
expectRemainingBudget: pointer.Int64(0),
1299+
expectRemainingBudget: pointer.To(int64(0)),
12991300
enableStrictCostEnforcement: true,
13001301
},
13011302
}

0 commit comments

Comments
 (0)