fix: resolve warnings and improve file extraction logic

Signed-off-by: ShigrafS <[email protected]>

Author: ShigrafS

.github/debug-build.yml

@@ -0,0 +1,25 @@
+name: Debug Linter on Push
+
+on:
+  push:
+    branches:
+      - '**' # Run on any branch
+
+jobs:
+  golangci-lint-check:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.21' # or match your version
+
+      - name: Install dependencies
+        run: go mod download
+
+      - name: Run make check with extended timeout
+        run: make check GOLANGCI_LINT_EXTRA_ARGS="--timeout 30m"

.golangci.yml

@@ -1,2 +1,4 @@
+version: 2
+
 run:
   timeout: 5m

Makefile

@@ -3,7 +3,7 @@ include build/Makefile.show-help.mk
 
 ## Run suite of Golang lint checks
 check:
-	golangci-lint run -c .golangci.yml -v ./...
+	golangci-lint run -c .golangci.yml -v $(GOLANGCI_LINT_EXTRA_ARGS) ./...
 
 ## Run Golang tests
 test:

converter/tests/helm_test.go

@@ -5,6 +5,7 @@ import (
 	"bytes"
 	"compress/gzip"
 	"io"
+	"log"
 	"os"
 	"strings"
 	"testing"
@@ -15,18 +16,18 @@ import (
 
 func TestHelmConverter_Convert(t *testing.T) {
 	testCases := []struct {
-		name              string
-		filePath          string
-		expectError       bool
-		expectedErrCode   string
-		checkManifest     bool
+		name               string
+		filePath           string
+		expectError        bool
+		expectedErrCode    string
+		checkManifest      bool
 		wantManifestSubstr string
 	}{
 		{
-			name:              "Valid Edge Firewall Relationship Deployment",
-			filePath:          "./samples/edge-firewall-relationship.yml",
-			expectError:       false,
-			checkManifest:     true,
+			name:               "Valid Edge Firewall Relationship Deployment",
+			filePath:           "./samples/edge-firewall-relationship.yml",
+			expectError:        false,
+			checkManifest:      true,
 			wantManifestSubstr: "apiVersion",
 		},
 		{
@@ -60,10 +61,10 @@ func TestHelmConverter_Convert(t *testing.T) {
 			expectedErrCode: "meshkit-11315",
 		},
 		{
-			name:              "No Components",
-			filePath:          "./samples/no-components.yaml",
-			expectError:       false,
-			checkManifest:     true,
+			name:               "No Components",
+			filePath:           "./samples/no-components.yaml",
+			expectError:        false,
+			checkManifest:      true,
 			wantManifestSubstr: "",
 		},
 		{
@@ -79,19 +80,19 @@ func TestHelmConverter_Convert(t *testing.T) {
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
 			var data []byte
-        	var err error
-        	if _, err = os.Stat(tc.filePath); err == nil {
-            	data, err = os.ReadFile(tc.filePath)
-            	if err != nil {
-                	t.Fatalf("Failed to read test file: %v", err)
-            	}
-        	} else {
-            	data = nil
-        	}
+			var err error
+			if _, err = os.Stat(tc.filePath); err == nil {
+				data, err = os.ReadFile(tc.filePath)
+				if err != nil {
+					t.Fatalf("Failed to read test file: %v", err)
+				}
+			} else {
+				data = nil
+			}
 
-        chartData, err := hc.Convert(string(data))
+			chartData, err := hc.Convert(string(data))
 
-						if tc.expectError {
+			if tc.expectError {
 				if err == nil {
 					t.Fatalf("Expected error, got nil")
 				}
@@ -127,7 +128,11 @@ func extractManifestFromChart(chartData []byte) (bool, string) {
 	if err != nil {
 		return false, ""
 	}
-	defer gr.Close()
+	defer func() {
+		if err := gr.Close(); err != nil {
+			log.Printf("error closing gzip reader: %v", err)
+		}
+	}()
 	tr := tar.NewReader(gr)
 	for {
 		hdr, err := tr.Next()
@@ -139,7 +144,10 @@ func extractManifestFromChart(chartData []byte) (bool, string) {
 		}
 		if strings.HasSuffix(hdr.Name, "templates/manifest.yaml") {
 			buf := new(bytes.Buffer)
-			io.Copy(buf, tr)
+			if _, err := io.Copy(buf, tr); err != nil {
+				log.Printf("error copying tar contents: %v", err)
+				return false, ""
+			}
 			return true, buf.String()
 		}
 	}

files/identification.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"log"
 	"os"
 	"path/filepath"
 	"strings"
@@ -109,14 +110,22 @@ func ParseCompressedOCIArtifactIntoDesign(artifact []byte) (*pattern.PatternFile
 	if err != nil {
 		return nil, utils.ErrCreateDir(err, "OCI")
 	}
-	defer os.RemoveAll(tmpDir)
+	defer func() {
+		if err := os.RemoveAll(tmpDir); err != nil {
+			log.Printf("error removing temp dir %s: %v", tmpDir, err)
+		}
+	}()
 
 	tmpInputDesignFile := filepath.Join(tmpDir, "design.tar")
 	file, err := os.Create(tmpInputDesignFile)
 	if err != nil {
 		return nil, utils.ErrCreateFile(err, tmpInputDesignFile)
 	}
-	defer file.Close()
+	defer func() {
+		if err := file.Close(); err != nil {
+			log.Printf("error closing file %s: %v", tmpInputDesignFile, err)
+		}
+	}()
 
 	reader := bytes.NewReader(artifact)
 	if _, err := io.Copy(file, reader); err != nil {
@@ -141,7 +150,7 @@ func ParseCompressedOCIArtifactIntoDesign(artifact []byte) (*pattern.PatternFile
 	}
 	var design *walker.File
 
-	// the extracted layer may contain metadata files like artifact.yml for artifacthub,etc
+	// the extracted layer may contain metadata files like artifact.yml for artifacthub, etc
 	for _, file := range files {
 		if file.Name == "design.yml" {
 			design = file
@@ -155,7 +164,6 @@ func ParseCompressedOCIArtifactIntoDesign(artifact []byte) (*pattern.PatternFile
 	var patternFile pattern.PatternFile
 
 	err = encoding.Unmarshal([]byte(design.Content), &patternFile)
-
 	if err != nil {
 		return nil, ErrDecodePattern(err)
 	}

files/sanitization.go

@@ -6,6 +6,7 @@ import (
 	"bytes"
 	"compress/gzip"
 	"encoding/json"
+	"log"
 
 	"fmt"
 	"io"
@@ -92,7 +93,11 @@ func ExtractTar(reader io.Reader, archiveFile string, outputDir string) error {
 		if err != nil {
 			return err
 		}
-		defer gzipReader.Close()
+		defer func() {
+			if cerr := gzipReader.Close(); cerr != nil {
+				log.Printf("error closing gzipReader: %v", cerr)
+			}
+		}()
 		reader = gzipReader
 	}
 
@@ -132,7 +137,11 @@ func ExtractTar(reader io.Reader, archiveFile string, outputDir string) error {
 		if err != nil {
 			return fmt.Errorf("failed to create file: %v", err)
 		}
-		defer file.Close()
+		defer func(f *os.File) {
+			if cerr := f.Close(); cerr != nil {
+				log.Printf("error closing file %s: %v", targetPath, cerr)
+			}
+		}(file)
 
 		// Copy file contents
 		if _, err := io.Copy(file, tarReader); err != nil {
@@ -178,16 +187,22 @@ func ExtractZipFromBytes(data []byte, outputDir string) error {
 		if err != nil {
 			return fmt.Errorf("failed to open file in zip: %w", err)
 		}
-		defer zipFile.Close()
+		defer func(zf io.Closer, name string) {
+			if cerr := zf.Close(); cerr != nil {
+				log.Printf("error closing zip file %s: %v", name, cerr)
+			}
+		}(zipFile, file.Name)
 
-		// Create the output file
 		outFile, err := os.Create(filePath)
 		if err != nil {
 			return fmt.Errorf("failed to create output file: %w", err)
 		}
-		defer outFile.Close()
+		defer func(f *os.File) {
+			if cerr := f.Close(); cerr != nil {
+				log.Printf("error closing output file %s: %v", filePath, cerr)
+			}
+		}(outFile)
 
-		// Copy the contents of the file from the ZIP archive to the output file
 		if _, err := io.Copy(outFile, zipFile); err != nil {
 			return fmt.Errorf("failed to copy file contents: %w", err)
 		}

utils/utils.go

@@ -112,7 +112,11 @@ func DownloadFile(filepath string, url string) error {
 	if err != nil {
 		return err
 	}
-	defer resp.Body.Close()
+	defer func() {
+		if cerr := resp.Body.Close(); cerr != nil {
+			log.Printf("error closing response body from %s: %v", url, cerr)
+		}
+	}()
 
 	if resp.StatusCode != 200 {
 		return fmt.Errorf("failed to get the file %d status code for %s file", resp.StatusCode, url)
@@ -123,7 +127,11 @@ func DownloadFile(filepath string, url string) error {
 	if err != nil {
 		return err
 	}
-	defer out.Close()
+	defer func() {
+		if cerr := out.Close(); cerr != nil {
+			log.Printf("error closing file %s: %v", filepath, cerr)
+		}
+	}()
 
 	// Write the body to file
 	_, err = io.Copy(out, resp.Body)
@@ -311,16 +319,17 @@ func WriteToFile(path string, content string) error {
 	if err != nil {
 		return ErrCreateFile(err, path)
 	}
+	defer func() {
+		if cerr := file.Close(); cerr != nil {
+			log.Printf("error closing file %s: %v", path, cerr)
+		}
+	}()
 
 	_, err = file.WriteString(content)
 	if err != nil {
 		return ErrWriteFile(err, path)
 	}
-	// Close the file to save the changes.
-	err = file.Close()
-	if err != nil {
-		return ErrWriteFile(err, path)
-	}
+
 	return nil
 }
 
@@ -371,12 +380,19 @@ func WriteYamlToFile[K any](outputPath string, data K) error {
 	if err != nil {
 		return ErrCreateFile(err, outputPath)
 	}
-	defer file.Close()
+	defer func() {
+		if cerr := file.Close(); cerr != nil {
+			log.Printf("error closing YAML file %s: %v", outputPath, cerr)
+		}
+	}()
 
 	encoder := yaml.NewEncoder(file)
 	encoder.SetIndent(2)
-
-	defer encoder.Close()
+	defer func() {
+		if cerr := encoder.Close(); cerr != nil {
+			log.Printf("error closing YAML encoder for file %s: %v", outputPath, cerr)
+		}
+	}()
 
 	if err := encoder.Encode(data); err != nil {
 		return ErrMarshal(err)
@@ -561,9 +577,17 @@ func ReadSVGData(baseDir, path string) (string, error) {
 }
 func Compress(src string, buf io.Writer) error {
 	zr := gzip.NewWriter(buf)
-	defer zr.Close()
+	defer func() {
+		if cerr := zr.Close(); cerr != nil {
+			log.Printf("error closing gzip writer: %v", cerr)
+		}
+	}()
 	tw := tar.NewWriter(zr)
-	defer tw.Close()
+	defer func() {
+		if cerr := tw.Close(); cerr != nil {
+			log.Printf("error closing tar writer: %v", cerr)
+		}
+	}()
 
 	return filepath.Walk(src, func(file string, fi os.FileInfo, err error) error {
 		if err != nil {
@@ -590,7 +614,11 @@ func Compress(src string, buf io.Writer) error {
 			if err != nil {
 				return err
 			}
-			defer data.Close()
+			defer func() {
+				if cerr := data.Close(); cerr != nil {
+					log.Printf("error closing file %s: %v", file, cerr)
+				}
+			}()
 
 			_, err = io.Copy(tw, data)
 			if err != nil {
@@ -893,4 +921,4 @@ func TruncateErrorMessage(err error, wordLimit int) error {
 	}
 
 	return err
-}
+}