Fix lint errors in tests

kubernetes-sigs · Oct 9, 2024 · a785d3b · a785d3b
1 parent 512866f
commit a785d3b
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 14 deletions.
diff --git a/conformance/tests/backendtlspolicy.go b/conformance/tests/backendtlspolicy.go
@@ -20,6 +20,7 @@ import (
 	"testing"
 
 	"k8s.io/apimachinery/pkg/types"
+
 	"sigs.k8s.io/gateway-api/conformance/utils/http"
 	"sigs.k8s.io/gateway-api/conformance/utils/kubernetes"
 	"sigs.k8s.io/gateway-api/conformance/utils/suite"

diff --git a/conformance/utils/kubernetes/certificate.go b/conformance/utils/kubernetes/certificate.go
@@ -99,7 +99,7 @@ func generateRSACert(hosts []string, keyOut, certOut io.Writer) error {
 	for _, h := range hosts {
 		if ip := net.ParseIP(h); ip != nil {
 			template.IPAddresses = append(template.IPAddresses, ip)
-		} else if err := validateHost(h); err == nil {
+		} else if err = validateHost(h); err == nil {
 			template.DNSNames = append(template.DNSNames, h)
 		}
 	}

diff --git a/conformance/utils/kubernetes/certificate_test.go b/conformance/utils/kubernetes/certificate_test.go
@@ -74,26 +74,28 @@ func Test_generateCACert(t *testing.T) {
 			block, _ := pem.Decode(serverCert.Bytes())
 			if block == nil {
 				require.FailNow(t, "failed to decode PEM block containing cert")
-			}
-			if block.Type == "CERTIFICATE" {
-				cert, err := x509.ParseCertificate(block.Bytes)
-				require.NoError(t, err, "failed to parse certificate")
-				for _, h := range tc.hosts {
-					if err = cert.VerifyHostname(h); err != nil {
-						require.EqualValues(t, tc.expectedErr, err.Error(), "certificate verification failed")
-					} else if len(tc.hosts) < 2 && err == nil && tc.expectedErr != "" {
-						require.EqualValues(t, tc.expectedErr, nil, "expected an error but certification verification succeeded")
+			} else {
+				if block.Type == "CERTIFICATE" {
+					cert, err := x509.ParseCertificate(block.Bytes)
+					require.NoError(t, err, "failed to parse certificate")
+					for _, h := range tc.hosts {
+						if err = cert.VerifyHostname(h); err != nil {
+							require.EqualValues(t, tc.expectedErr, err.Error(), "certificate verification failed")
+						} else if len(tc.hosts) < 2 && err == nil && tc.expectedErr != "" {
+							require.EqualValues(t, tc.expectedErr, err, "expected an error but certification verification succeeded")
+						}
 					}
 				}
 			}
 			// Test that the server key is decodable and parseable.
 			block, _ = pem.Decode(serverKey.Bytes())
 			if block == nil {
 				require.FailNow(t, "failed to decode PEM block containing public key")
-			}
-			if block.Type == "RSA PRIVATE KEY" {
-				_, err := x509.ParsePKCS1PrivateKey(block.Bytes)
-				require.NoError(t, err, "failed to parse key")
+			} else {
+				if block.Type == "RSA PRIVATE KEY" {
+					_, err := x509.ParsePKCS1PrivateKey(block.Bytes)
+					require.NoError(t, err, "failed to parse key")
+				}
 			}
 		})
 	}