reverted changes

Author: biswajit-patra-dev

.github/workflows/test.yml

@@ -11,7 +11,7 @@ jobs:
     name: CLI
     strategy:
       matrix:
-        os: [ 'ubuntu-latest', 'windows-latest', 'macos-latest' ]
+        os: [ 'ubuntu-latest', 'windows-latest', 'macos-13' ]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Set git to use LF
@@ -24,22 +24,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.23'
-
-      - name: Install PHP and Composer
-        run: |
-          if [ "$RUNNER_OS" == "Linux" ]; then
-            sudo apt-get update
-            sudo apt-get install -y php php-curl php-mbstring php-xml
-            curl -sS https://getcomposer.org/installer | php
-            sudo mv composer.phar /usr/local/bin/composer
-          elif [ "$RUNNER_OS" == "macOS" ]; then
-            brew install composer
-          elif [ "$RUNNER_OS" == "Windows" ]; then
-            choco install composer -y
-          fi
-          composer --version
-        shell: bash
+          go-version: '1.20'
 
       - name: Install Bower
         run: |
@@ -90,7 +75,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.23'
+          go-version: '1.20'
 
       - name: Pull Supported Formats
         run: |
@@ -152,12 +137,12 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.23'
+          go-version: '1.20'
       - name: Pull Supported Formats
         run: |
           cd cmd/debricked
           go generate -v -x
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v4
         with:
-          version: v1.62
+          version: v1.52

internal/cmd/report/license/license.go

@@ -48,7 +48,7 @@ func RunE(r report.IReporter) func(_ *cobra.Command, args []string) error {
 		}
 
 		if err := r.Order(orderArgs); err != nil {
-			return fmt.Errorf("%s\n", color.RedString("⨯")+" "+err.Error())
+			return fmt.Errorf("%s %s\n", color.RedString("⨯"), err.Error())
 		}
 
 		fmt.Printf("%s Successfully ordered license export\n", color.GreenString("✔"))

internal/cmd/report/sbom/sbom.go

@@ -86,7 +86,7 @@ func RunE(r report.IReporter) func(_ *cobra.Command, args []string) error {
 		}
 
 		if err := r.Order(orderArgs); err != nil {
-			return fmt.Errorf("%s", color.RedString("⨯")+" "+err.Error())
+			return fmt.Errorf("%s %s", color.RedString("⨯"), err.Error())
 		}
 
 		return nil

internal/cmd/report/vulnerability/vulnerability.go

@@ -38,7 +38,7 @@ func RunE(r report.IReporter) func(_ *cobra.Command, args []string) error {
 	return func(_ *cobra.Command, _ []string) error {
 		orderArgs := vulnerability.OrderArgs{Email: viper.GetString(EmailFlag)}
 		if err := r.Order(orderArgs); err != nil {
-			return fmt.Errorf("%s\n", color.RedString("⨯")+" "+err.Error())
+			return fmt.Errorf("%s %s\n", color.RedString("⨯"), err.Error())
 		}
 
 		fmt.Printf("%s Successfully ordered vulnerability export\n", color.GreenString("✔"))

internal/cmd/scan/scan.go

@@ -270,7 +270,7 @@ func RunE(s *scan.IScanner) func(_ *cobra.Command, args []string) error {
 
 			return scanCmdError
 		} else if scanCmdError != nil {
-			return fmt.Errorf("%s\n", color.RedString("⨯")+" "+scanCmdError.Error())
+			return fmt.Errorf("%s %s\n", color.RedString("⨯"), scanCmdError.Error())
 		}
 
 		return scanCmdError

internal/fingerprint/fingerprint.go

@@ -447,20 +447,19 @@ func inMemFingerprintZipContent(filename string, exclusions []string, inclusions
 
 		_, err = io.Copy(hasher, rc) // #nosec
 		if err != nil {
-		rc.Close()
+			rc.Close()
 
-		return nil, err
-	}
+			return nil, err
+		}
 
-	// #nosec G115 - UncompressedSize64 is always positive and within int64 range for valid zip files
-	fingerprints = append(fingerprints, FileFingerprint{
-		path:          longFileName,
-		contentLength: int64(f.UncompressedSize64),
-		fingerprint:   hasher.Sum(nil),
-	})
+		fingerprints = append(fingerprints, FileFingerprint{
+			path:          longFileName,
+			contentLength: int64(f.UncompressedSize64),
+			fingerprint:   hasher.Sum(nil),
+		})
 
-	rc.Close()
-}
+		rc.Close()
+	}
 
 	return fingerprints, nil
 }