chore: update golint (#3177)

* chore: update golint Signed-off-by: zirain <zirain2009@gmail.com> * fix lint Signed-off-by: zirain <zirain2009@gmail.com> --------- Signed-off-by: zirain <zirain2009@gmail.com>
envoyproxy · Apr 12, 2024 · 92b4a9b · 92b4a9b
1 parent cdab7d5
commit 92b4a9b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/test/cel-validation/backendtrafficpolicy_test.go b/test/cel-validation/backendtrafficpolicy_test.go
@@ -16,9 +16,7 @@ import (
 	"time"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/utils/pointer"
 	"k8s.io/utils/ptr"
-
 	gwapiv1 "sigs.k8s.io/gateway-api/apis/v1"
 	gwapiv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2"
 
@@ -436,8 +434,8 @@ func TestBackendTrafficPolicyTarget(t *testing.T) {
 		{
 			desc: " valid config: min, max, nil",
 			mutate: func(btp *egv1a1.BackendTrafficPolicy) {
-				valMax := pointer.Int64(4294967295)
-				valMin := pointer.Int64(0)
+				valMax := ptr.To[int64](4294967295)
+				valMin := ptr.To[int64](0)
 				btp.Spec = egv1a1.BackendTrafficPolicySpec{
 					TargetRef: gwapiv1a2.PolicyTargetReferenceWithSectionName{
 						PolicyTargetReference: gwapiv1a2.PolicyTargetReference{
@@ -459,8 +457,8 @@ func TestBackendTrafficPolicyTarget(t *testing.T) {
 		{
 			desc: " invalid config: min and max values",
 			mutate: func(btp *egv1a1.BackendTrafficPolicy) {
-				valOverMax := pointer.Int64(4294967296)
-				valUnderMin := pointer.Int64(-1)
+				valOverMax := ptr.To[int64](4294967296)
+				valUnderMin := ptr.To[int64](-1)
 				btp.Spec = egv1a1.BackendTrafficPolicySpec{
 					TargetRef: gwapiv1a2.PolicyTargetReferenceWithSectionName{
 						PolicyTargetReference: gwapiv1a2.PolicyTargetReference{

diff --git a/test/cel-validation/main_test.go b/test/cel-validation/main_test.go
@@ -28,6 +28,10 @@ import (
 var c client.Client
 
 func TestMain(m *testing.M) {
+	os.Exit(runTest(m))
+}
+
+func runTest(m *testing.M) int {
 	// Setup the test environment.
 	testEnv, restCfg, err := startEnv()
 	if err != nil {
@@ -47,8 +51,7 @@ func TestMain(m *testing.M) {
 		panic(fmt.Sprintf("Error initializing client: %v", err))
 	}
 	_ = egv1a1.AddToScheme(c.Scheme())
-
-	os.Exit(m.Run())
+	return m.Run()
 }
 
 func startEnv() (*envtest.Environment, *rest.Config, error) {

diff --git a/tools/make/lint.mk b/tools/make/lint.mk
@@ -20,7 +20,7 @@ lint: lint.golint
 lint-deps: $(tools/golangci-lint)
 lint.golint: $(tools/golangci-lint)
 	@$(LOG_TARGET)
-	$(tools/golangci-lint) run $(GOLANGCI_LINT_FLAGS) --build-tags=e2e --config=tools/linter/golangci-lint/.golangci.yml
+	$(tools/golangci-lint) run $(GOLANGCI_LINT_FLAGS) --build-tags=e2e,celvalidation --config=tools/linter/golangci-lint/.golangci.yml
 
 .PHONY: lint.yamllint
 lint: lint.yamllint