Merge pull request #2708 from vincepri/golangci-lint1562

🌱 Update golangci-lint to v1.56.2
kubernetes-sigs · Mar 15, 2024 · e95fbce · e95fbce
2 parents cb5107b + 2e225f6
commit e95fbce
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 50 deletions.
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -22,5 +22,5 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v4
         with:
-          version: v1.54.0
+          version: v1.56.2
           working-directory: ${{matrix.working-directory}}
diff --git a/pkg/builder/webhook_test.go b/pkg/builder/webhook_test.go
@@ -42,6 +42,14 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 )
 
+const (
+	admissionReviewGV = `{
+  "kind":"AdmissionReview",
+  "apiVersion":"admission.k8s.io/`
+
+	svcBaseAddr = "http://svc-name.svc-ns.svc"
+)
+
 var _ = Describe("webhook", func() {
 	Describe("New", func() {
 		Context("v1 AdmissionReview", func() {
@@ -89,9 +97,7 @@ func runTests(admissionReviewVersion string) {
 		svr := m.GetWebhookServer()
 		ExpectWithOffset(1, svr).NotTo(BeNil())
 
-		reader := strings.NewReader(`{
-  "kind":"AdmissionReview",
-  "apiVersion":"admission.k8s.io/` + admissionReviewVersion + `",
+		reader := strings.NewReader(admissionReviewGV + admissionReviewVersion + `",
   "request":{
     "uid":"07e52e8d-4513-11e9-a716-42010a800270",
     "kind":{
@@ -122,7 +128,7 @@ func runTests(admissionReviewVersion string) {
 
 		By("sending a request to a mutating webhook path")
 		path := generateMutatePath(testDefaulterGVK)
-		req := httptest.NewRequest("POST", "http://svc-name.svc-ns.svc"+path, reader)
+		req := httptest.NewRequest("POST", svcBaseAddr+path, reader)
 		req.Header.Add("Content-Type", "application/json")
 		w := httptest.NewRecorder()
 		svr.WebhookMux().ServeHTTP(w, req)
@@ -136,7 +142,7 @@ func runTests(admissionReviewVersion string) {
 		path = generateValidatePath(testDefaulterGVK)
 		_, err = reader.Seek(0, 0)
 		ExpectWithOffset(1, err).NotTo(HaveOccurred())
-		req = httptest.NewRequest("POST", "http://svc-name.svc-ns.svc"+path, reader)
+		req = httptest.NewRequest("POST", svcBaseAddr+path, reader)
 		req.Header.Add("Content-Type", "application/json")
 		w = httptest.NewRecorder()
 		svr.WebhookMux().ServeHTTP(w, req)
@@ -162,9 +168,7 @@ func runTests(admissionReviewVersion string) {
 		svr := m.GetWebhookServer()
 		ExpectWithOffset(1, svr).NotTo(BeNil())
 
-		reader := strings.NewReader(`{
-  "kind":"AdmissionReview",
-  "apiVersion":"admission.k8s.io/` + admissionReviewVersion + `",
+		reader := strings.NewReader(admissionReviewGV + admissionReviewVersion + `",
   "request":{
     "uid":"07e52e8d-4513-11e9-a716-42010a800270",
     "kind":{
@@ -196,7 +200,7 @@ func runTests(admissionReviewVersion string) {
 
 		By("sending a request to a mutating webhook path")
 		path := generateMutatePath(testDefaulterGVK)
-		req := httptest.NewRequest("POST", "http://svc-name.svc-ns.svc"+path, reader)
+		req := httptest.NewRequest("POST", svcBaseAddr+path, reader)
 		req.Header.Add("Content-Type", "application/json")
 		w := httptest.NewRecorder()
 		svr.WebhookMux().ServeHTTP(w, req)
@@ -229,9 +233,7 @@ func runTests(admissionReviewVersion string) {
 		svr := m.GetWebhookServer()
 		ExpectWithOffset(1, svr).NotTo(BeNil())
 
-		reader := strings.NewReader(`{
-  "kind":"AdmissionReview",
-  "apiVersion":"admission.k8s.io/` + admissionReviewVersion + `",
+		reader := strings.NewReader(admissionReviewGV + admissionReviewVersion + `",
   "request":{
     "uid":"07e52e8d-4513-11e9-a716-42010a800270",
     "kind":{
@@ -263,7 +265,7 @@ func runTests(admissionReviewVersion string) {
 
 		By("sending a request to a mutating webhook path")
 		path := generateMutatePath(testDefaulterGVK)
-		req := httptest.NewRequest("POST", "http://svc-name.svc-ns.svc"+path, reader)
+		req := httptest.NewRequest("POST", svcBaseAddr+path, reader)
 		req.Header.Add("Content-Type", "application/json")
 		w := httptest.NewRecorder()
 		svr.WebhookMux().ServeHTTP(w, req)
@@ -278,7 +280,7 @@ func runTests(admissionReviewVersion string) {
 		path = generateValidatePath(testDefaulterGVK)
 		_, err = reader.Seek(0, 0)
 		ExpectWithOffset(1, err).NotTo(HaveOccurred())
-		req = httptest.NewRequest("POST", "http://svc-name.svc-ns.svc"+path, reader)
+		req = httptest.NewRequest("POST", svcBaseAddr+path, reader)
 		req.Header.Add("Content-Type", "application/json")
 		w = httptest.NewRecorder()
 		svr.WebhookMux().ServeHTTP(w, req)
@@ -303,9 +305,7 @@ func runTests(admissionReviewVersion string) {
 		svr := m.GetWebhookServer()
 		ExpectWithOffset(1, svr).NotTo(BeNil())
 
-		reader := strings.NewReader(`{
-  "kind":"AdmissionReview",
-  "apiVersion":"admission.k8s.io/` + admissionReviewVersion + `",
+		reader := strings.NewReader(admissionReviewGV + admissionReviewVersion + `",
   "request":{
     "uid":"07e52e8d-4513-11e9-a716-42010a800270",
     "kind":{
@@ -338,7 +338,7 @@ func runTests(admissionReviewVersion string) {
 
 		By("sending a request to a mutating webhook path that doesn't exist")
 		path := generateMutatePath(testValidatorGVK)
-		req := httptest.NewRequest("POST", "http://svc-name.svc-ns.svc"+path, reader)
+		req := httptest.NewRequest("POST", svcBaseAddr+path, reader)
 		req.Header.Add("Content-Type", "application/json")
 		w := httptest.NewRecorder()
 		svr.WebhookMux().ServeHTTP(w, req)
@@ -348,7 +348,7 @@ func runTests(admissionReviewVersion string) {
 		path = generateValidatePath(testValidatorGVK)
 		_, err = reader.Seek(0, 0)
 		ExpectWithOffset(1, err).NotTo(HaveOccurred())
-		req = httptest.NewRequest("POST", "http://svc-name.svc-ns.svc"+path, reader)
+		req = httptest.NewRequest("POST", svcBaseAddr+path, reader)
 		req.Header.Add("Content-Type", "application/json")
 		w = httptest.NewRecorder()
 		svr.WebhookMux().ServeHTTP(w, req)
@@ -377,9 +377,7 @@ func runTests(admissionReviewVersion string) {
 		svr := m.GetWebhookServer()
 		ExpectWithOffset(1, svr).NotTo(BeNil())
 
-		reader := strings.NewReader(`{
-  "kind":"AdmissionReview",
-  "apiVersion":"admission.k8s.io/` + admissionReviewVersion + `",
+		reader := strings.NewReader(admissionReviewGV + admissionReviewVersion + `",
   "request":{
     "uid":"07e52e8d-4513-11e9-a716-42010a800270",
     "kind":{
@@ -412,7 +410,7 @@ func runTests(admissionReviewVersion string) {
 		path := generateValidatePath(testValidatorGVK)
 		_, err = reader.Seek(0, 0)
 		ExpectWithOffset(1, err).NotTo(HaveOccurred())
-		req := httptest.NewRequest("POST", "http://svc-name.svc-ns.svc"+path, reader)
+		req := httptest.NewRequest("POST", svcBaseAddr+path, reader)
 		req.Header.Add("Content-Type", "application/json")
 		w := httptest.NewRecorder()
 		svr.WebhookMux().ServeHTTP(w, req)
@@ -445,9 +443,7 @@ func runTests(admissionReviewVersion string) {
 		svr := m.GetWebhookServer()
 		ExpectWithOffset(1, svr).NotTo(BeNil())
 
-		reader := strings.NewReader(`{
-  "kind":"AdmissionReview",
-  "apiVersion":"admission.k8s.io/` + admissionReviewVersion + `",
+		reader := strings.NewReader(admissionReviewGV + admissionReviewVersion + `",
   "request":{
     "uid":"07e52e8d-4513-11e9-a716-42010a800270",
     "kind":{
@@ -481,7 +477,7 @@ func runTests(admissionReviewVersion string) {
 
 		By("sending a request to a mutating webhook path that doesn't exist")
 		path := generateMutatePath(testValidatorGVK)
-		req := httptest.NewRequest("POST", "http://svc-name.svc-ns.svc"+path, reader)
+		req := httptest.NewRequest("POST", svcBaseAddr+path, reader)
 		req.Header.Add("Content-Type", "application/json")
 		w := httptest.NewRecorder()
 		svr.WebhookMux().ServeHTTP(w, req)
@@ -491,7 +487,7 @@ func runTests(admissionReviewVersion string) {
 		path = generateValidatePath(testValidatorGVK)
 		_, err = reader.Seek(0, 0)
 		ExpectWithOffset(1, err).NotTo(HaveOccurred())
-		req = httptest.NewRequest("POST", "http://svc-name.svc-ns.svc"+path, reader)
+		req = httptest.NewRequest("POST", svcBaseAddr+path, reader)
 		req.Header.Add("Content-Type", "application/json")
 		w = httptest.NewRecorder()
 		svr.WebhookMux().ServeHTTP(w, req)
@@ -520,9 +516,7 @@ func runTests(admissionReviewVersion string) {
 		svr := m.GetWebhookServer()
 		ExpectWithOffset(1, svr).NotTo(BeNil())
 
-		reader := strings.NewReader(`{
-  "kind":"AdmissionReview",
-  "apiVersion":"admission.k8s.io/` + admissionReviewVersion + `",
+		reader := strings.NewReader(admissionReviewGV + admissionReviewVersion + `",
   "request":{
     "uid":"07e52e8d-4513-11e9-a716-42010a800270",
     "kind":{
@@ -553,7 +547,7 @@ func runTests(admissionReviewVersion string) {
 
 		By("sending a request to a mutating webhook path")
 		path := generateMutatePath(testDefaultValidatorGVK)
-		req := httptest.NewRequest("POST", "http://svc-name.svc-ns.svc"+path, reader)
+		req := httptest.NewRequest("POST", svcBaseAddr+path, reader)
 		req.Header.Add("Content-Type", "application/json")
 		w := httptest.NewRecorder()
 		svr.WebhookMux().ServeHTTP(w, req)
@@ -567,7 +561,7 @@ func runTests(admissionReviewVersion string) {
 		path = generateValidatePath(testDefaultValidatorGVK)
 		_, err = reader.Seek(0, 0)
 		ExpectWithOffset(1, err).NotTo(HaveOccurred())
-		req = httptest.NewRequest("POST", "http://svc-name.svc-ns.svc"+path, reader)
+		req = httptest.NewRequest("POST", svcBaseAddr+path, reader)
 		req.Header.Add("Content-Type", "application/json")
 		w = httptest.NewRecorder()
 		svr.WebhookMux().ServeHTTP(w, req)
@@ -597,9 +591,7 @@ func runTests(admissionReviewVersion string) {
 		svr := m.GetWebhookServer()
 		ExpectWithOffset(1, svr).NotTo(BeNil())
 
-		reader := strings.NewReader(`{
-  "kind":"AdmissionReview",
-  "apiVersion":"admission.k8s.io/` + admissionReviewVersion + `",
+		reader := strings.NewReader(admissionReviewGV + admissionReviewVersion + `",
   "request":{
     "uid":"07e52e8d-4513-11e9-a716-42010a800270",
     "kind":{
@@ -629,7 +621,7 @@ func runTests(admissionReviewVersion string) {
 
 		By("sending a request to a validating webhook path to check for failed delete")
 		path := generateValidatePath(testValidatorGVK)
-		req := httptest.NewRequest("POST", "http://svc-name.svc-ns.svc"+path, reader)
+		req := httptest.NewRequest("POST", svcBaseAddr+path, reader)
 		req.Header.Add("Content-Type", "application/json")
 		w := httptest.NewRecorder()
 		svr.WebhookMux().ServeHTTP(w, req)
@@ -638,9 +630,7 @@ func runTests(admissionReviewVersion string) {
 		ExpectWithOffset(1, w.Body).To(ContainSubstring(`"allowed":false`))
 		ExpectWithOffset(1, w.Body).To(ContainSubstring(`"code":403`))
 
-		reader = strings.NewReader(`{
-  "kind":"AdmissionReview",
-  "apiVersion":"admission.k8s.io/` + admissionReviewVersion + `",
+		reader = strings.NewReader(admissionReviewGV + admissionReviewVersion + `",
   "request":{
     "uid":"07e52e8d-4513-11e9-a716-42010a800270",
     "kind":{
@@ -663,7 +653,7 @@ func runTests(admissionReviewVersion string) {
 }`)
 		By("sending a request to a validating webhook path with correct request")
 		path = generateValidatePath(testValidatorGVK)
-		req = httptest.NewRequest("POST", "http://svc-name.svc-ns.svc"+path, reader)
+		req = httptest.NewRequest("POST", svcBaseAddr+path, reader)
 		req.Header.Add("Content-Type", "application/json")
 		w = httptest.NewRecorder()
 		svr.WebhookMux().ServeHTTP(w, req)

diff --git a/pkg/internal/testing/certs/tinyca_test.go b/pkg/internal/testing/certs/tinyca_test.go
@@ -47,8 +47,8 @@ var _ = Describe("TinyCA", func() {
 		})
 
 		It("should be usable for signing & verifying", func() {
-			Expect(ca.CA.Cert.KeyUsage&x509.KeyUsageCertSign).NotTo(Equal(0), "should be usable for cert signing")
-			Expect(ca.CA.Cert.KeyUsage&x509.KeyUsageDigitalSignature).NotTo(Equal(0), "should be usable for signature verifying")
+			Expect(ca.CA.Cert.KeyUsage&x509.KeyUsageCertSign).NotTo(BeEquivalentTo(0), "should be usable for cert signing")
+			Expect(ca.CA.Cert.KeyUsage&x509.KeyUsageDigitalSignature).NotTo(BeEquivalentTo(0), "should be usable for signature verifying")
 		})
 	})
 
@@ -141,8 +141,8 @@ var _ = Describe("TinyCA", func() {
 			cert, err := ca.NewServingCert()
 			Expect(err).NotTo(HaveOccurred(), "should be able to generate a serving cert")
 
-			Expect(cert.Cert.KeyUsage&x509.KeyUsageKeyEncipherment).NotTo(Equal(0), "should be usable for key enciphering")
-			Expect(cert.Cert.KeyUsage&x509.KeyUsageDigitalSignature).NotTo(Equal(0), "should be usable for signature verifying")
+			Expect(cert.Cert.KeyUsage&x509.KeyUsageKeyEncipherment).NotTo(BeEquivalentTo(0), "should be usable for key enciphering")
+			Expect(cert.Cert.KeyUsage&x509.KeyUsageDigitalSignature).NotTo(BeEquivalentTo(0), "should be usable for signature verifying")
 			Expect(cert.Cert.ExtKeyUsage).To(ContainElement(x509.ExtKeyUsageServerAuth), "should be usable for server auth")
 
 		})
@@ -172,8 +172,8 @@ var _ = Describe("TinyCA", func() {
 		})
 
 		It("should be usable for client auth, verifying, and enciphering", func() {
-			Expect(cert.Cert.KeyUsage&x509.KeyUsageKeyEncipherment).NotTo(Equal(0), "should be usable for key enciphering")
-			Expect(cert.Cert.KeyUsage&x509.KeyUsageDigitalSignature).NotTo(Equal(0), "should be usable for signature verifying")
+			Expect(cert.Cert.KeyUsage&x509.KeyUsageKeyEncipherment).NotTo(BeEquivalentTo(0), "should be usable for key enciphering")
+			Expect(cert.Cert.KeyUsage&x509.KeyUsageDigitalSignature).NotTo(BeEquivalentTo(0), "should be usable for signature verifying")
 			Expect(cert.Cert.ExtKeyUsage).To(ContainElement(x509.ExtKeyUsageClientAuth), "should be usable for client auth")
 		})
 

diff --git a/pkg/internal/testing/controlplane/apiserver_test.go b/pkg/internal/testing/controlplane/apiserver_test.go
@@ -128,7 +128,7 @@ var _ = Describe("APIServer", func() {
 
 		Context("when SecureServing is not set", func() {
 			It("should be defaulted with a random port", func() {
-				Expect(server.Port).NotTo(Equal(0))
+				Expect(server.Port).NotTo(BeEquivalentTo(0))
 			})
 		})
 	})

diff --git a/pkg/manager/manager_test.go b/pkg/manager/manager_test.go
@@ -254,7 +254,7 @@ var _ = Describe("manger.Manager", func() {
 			Expect(m.WebhookServer.(*webhook.DefaultServer).Options.Port).To(Equal(8080))
 			Expect(m.WebhookServer.(*webhook.DefaultServer).Options.Host).To(Equal("example.com"))
 			Expect(m.WebhookServer.(*webhook.DefaultServer).Options.CertDir).To(Equal("/pki"))
-			Expect(m.WebhookServer.(*webhook.DefaultServer).Options.TLSOpts).To(Equal(optionsTlSOptsFuncs))
+			Expect(m.WebhookServer.(*webhook.DefaultServer).Options.TLSOpts).To(BeEquivalentTo(optionsTlSOptsFuncs))
 		})
 
 		It("should lazily initialize a webhook server if needed", func() {