Merge pull request #531 from xiaoyu74/fix_ci_build

Fix the golang-lint issue

Makefile

@@ -9,7 +9,7 @@ GO_BUILD_FLAGS :=-tags 'include_gcs include_oss containers_image_openpgp gssapi'
 GO_BUILD_FLAGS_DARWIN :=-tags 'include_gcs include_oss containers_image_openpgp'
 GO_BUILD_FLAGS_LINUX_CROSS :=-tags 'include_gcs include_oss containers_image_openpgp'
 
-GOLANGCI_LINT_VERSION=v1.52.2
+GOLANGCI_LINT_VERSION=v1.61.0
 GORELEASER_VERSION=v1.14.1
 GOVULNCHECK_VERSION=v1.0.1
 

pkg/healthcheck/check_proxy.go

@@ -22,7 +22,7 @@ func CheckProxyConnectivity(client HTTPClient) (string, error) {
 	if proxyURL == nil || *proxyURL == "" {
 		errMsg := "no proxy URL configured in backplane configuration"
 		logger.Warn(errMsg)
-		return "", fmt.Errorf(errMsg)
+		return "", fmt.Errorf("%s", errMsg)
 	}
 
 	logger.Infof("Getting the working proxy URL ['%s'] from local backplane configuration.", *proxyURL)
@@ -53,8 +53,8 @@ func CheckProxyConnectivity(client HTTPClient) (string, error) {
 	logger.Infof("Testing connectivity to the pre-defined test endpoint ['%s'] with the proxy.", proxyTestEndpoint)
 	if err := testEndPointConnectivity(proxyTestEndpoint, httpClientWithProxy); err != nil {
 		errMsg := fmt.Sprintf("Failed to access target endpoint ['%s'] with the proxy: %v", proxyTestEndpoint, err)
-		logger.Errorf(errMsg)
-		return "", fmt.Errorf(errMsg)
+		logger.Errorf("%s", errMsg)
+		return "", fmt.Errorf("%s", errMsg)
 	}
 
 	logger.Debugf("Successfully connected to proxy test endpoint: %s", proxyTestEndpoint)
@@ -70,7 +70,7 @@ func GetProxyTestEndpoint() (string, error) {
 	if bpConfig.ProxyCheckEndpoint == "" {
 		errMsg := "proxy test endpoint not configured"
 		logger.Warn(errMsg)
-		return "", fmt.Errorf(errMsg)
+		return "", fmt.Errorf("%s", errMsg)
 	}
 	return bpConfig.ProxyCheckEndpoint, nil
 }

pkg/healthcheck/check_vpn.go

@@ -33,7 +33,7 @@ func CheckVPNConnectivity(netInterfaces NetworkInterface, client HTTPClient) err
 	if !vpnConnected {
 		errMsg := fmt.Sprintf("No VPN interfaces found: %v", vpnInterfaces)
 		logger.Warn(errMsg)
-		return fmt.Errorf(errMsg)
+		return fmt.Errorf("%s", errMsg)
 	}
 
 	vpnCheckEndpoint, err := GetVPNCheckEndpointFunc()
@@ -43,8 +43,8 @@ func CheckVPNConnectivity(netInterfaces NetworkInterface, client HTTPClient) err
 	}
 	if err := testEndPointConnectivity(vpnCheckEndpoint, client); err != nil {
 		errMsg := fmt.Sprintf("Failed to access internal URL %s: %v", vpnCheckEndpoint, err)
-		logger.Errorf(errMsg)
-		return fmt.Errorf(errMsg)
+		logger.Errorf("%s", errMsg)
+		return fmt.Errorf("%s", errMsg)
 	}
 
 	return nil
@@ -59,7 +59,7 @@ func GetVPNCheckEndpoint() (string, error) {
 	if bpConfig.VPNCheckEndpoint == "" {
 		errMsg := "VPN check endpoint not configured"
 		logger.Warn(errMsg)
-		return "", fmt.Errorf(errMsg)
+		return "", fmt.Errorf("%s", errMsg)
 	}
 	return bpConfig.VPNCheckEndpoint, nil
 }

pkg/healthcheck/connectivity_checks.go

@@ -129,7 +129,7 @@ func testEndPointConnectivity(testURL string, client HTTPClient) error {
 	if resp.StatusCode != http.StatusOK {
 		errMsg := fmt.Sprintf("Unexpected status code: %v", resp.StatusCode)
 		logger.Error(errMsg)
-		return fmt.Errorf(errMsg)
+		return fmt.Errorf("%s", errMsg)
 	}
 	return nil
 }

pkg/monitoring/monitoring.go

@@ -158,7 +158,7 @@ func (c Client) RunMonitoring(monitoringType string) error {
 
 	if resp.StatusCode >= 400 {
 		responseBody, _ := io.ReadAll(resp.Body)
-		return fmt.Errorf(string(responseBody))
+		return fmt.Errorf("%s", string(responseBody))
 	}
 
 	// If the above test pass, we will construct a reverse proxy for the user