Call Close() on files and HTTP response bodies (#564)

Signed-off-by: Caleb Xu <caxu@redhat.com>

Author: caxu-rh

cmd/report.go

@@ -80,6 +80,7 @@ func NewReportCmd(config *viper.Viper) *cobra.Command {
 			if openErr != nil {
 				return fmt.Errorf("report path %s: error opening file  %v", reportArg, openErr)
 			}
+			defer reportFile.Close()
 
 			reportBytes, readErr := io.ReadAll(reportFile)
 			if readErr != nil {

internal/chartverifier/checks/checks.go

@@ -361,6 +361,7 @@ func SignatureIsValid(opts *CheckOptions) (Result, error) {
 		if err != nil {
 			return NewResult(false, fmt.Sprintf("%s : get error was %v", SignatureFailure, err)), nil
 		}
+		defer resp.Body.Close()
 
 		if resp.StatusCode == 404 {
 			return NewSkippedResult(fmt.Sprintf("%s : %s", ChartNotSigned, SignatureIsNotPresentSuccess)), nil
@@ -458,6 +459,8 @@ func downloadFile(fileURL *url.URL, directory string) (string, error) {
 	if err != nil {
 		return "", err
 	}
+	defer file.Close()
+
 	client := http.Client{
 		CheckRedirect: func(r *http.Request, via []*http.Request) error {
 			r.URL.Opaque = r.URL.Path
@@ -476,8 +479,6 @@ func downloadFile(fileURL *url.URL, directory string) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	// #nosec G307
-	defer file.Close()
 
 	return filePath, nil
 }

internal/chartverifier/checks/helm.go

@@ -53,6 +53,7 @@ func loadChartFromRemote(url *url.URL) (*chart.Chart, error) {
 	if err != nil {
 		return nil, err
 	}
+	defer resp.Body.Close()
 
 	if resp.StatusCode == http.StatusNotFound {
 		return nil, ChartNotFoundErr(url.String())

internal/chartverifier/pyxis/pyxis.go

@@ -95,9 +95,9 @@ func GetImageRegistries(repository string) ([]string, error) {
 		if reqErr != nil {
 			err = fmt.Errorf("error getting repository %s : %v", repository, err)
 		} else {
+			// #nosec G307
+			defer resp.Body.Close()
 			if resp.StatusCode == 200 {
-				// #nosec G307
-				defer resp.Body.Close()
 				body, _ := io.ReadAll(resp.Body)
 				var repositoriesBody RepositoriesBody
 				//nolint:errcheck // TODO(komish): this should be checked, but we really need
@@ -162,9 +162,9 @@ Loops:
 			resp, reqErr := client.Do(req)
 
 			if reqErr == nil {
+				// #nosec G307
+				defer resp.Body.Close()
 				if resp.StatusCode == 200 {
-					// #nosec G307
-					defer resp.Body.Close()
 					// TODO(komish): this should be checked, but we really need
 					// to look at refactoring this block in its entirety. Delay fixing this until then
 					//

pkg/chartverifier/report/report.go

@@ -132,6 +132,7 @@ func loadReportFromRemote(url *url.URL) (string, error) {
 	if getErr != nil {
 		return "", fmt.Errorf("report uri %s: error reading from url  %v", url, getErr)
 	}
+	defer resp.Body.Close()
 
 	if resp.StatusCode == http.StatusNotFound {
 		return "", fmt.Errorf("report uri %s: bad response reading from url  %d", url, resp.StatusCode)

pkg/chartverifier/reportsummary/reportsummary_test.go

@@ -304,6 +304,7 @@ func loadChartFromAbsPath(path string) ([]byte, error) {
 	if openErr != nil {
 		return nil, fmt.Errorf("report path %s: error opening file  %v", path, openErr)
 	}
+	defer reportFile.Close()
 
 	reportBytes, readErr := io.ReadAll(reportFile)
 	if readErr != nil {