Merge pull request #7042 from Checkmarx/update-mod-version

fix(gopkg): update package path for v2

.github/scripts/coverage/get-coverage.py

@@ -96,7 +96,7 @@ def key(i): return i.filename
     print("::endgroup::")
 
     for filename, group in itertools.groupby(lines, key=key):
-        filename = filename.replace("github.com/Checkmarx/kics/", "")
+        filename = filename.replace("github.com/Checkmarx/kics/v2/", "")
         if filename in exclude:
             continue
         group = list(group)

.github/workflows/go-e2e-debian.yaml

@@ -84,7 +84,7 @@ jobs:
           E2E_KICS_DOCKER: kics:e2e-debian-tests-${{ github.sha }}
           E2E_KICS_QUERIES_PATH: ${{ steps.getbin.outputs.queries }}
         run: |
-          go test -tags dev "github.com/Checkmarx/kics/e2e" -timeout 1500s -json > results.json
+          go test -tags dev "github.com/Checkmarx/kics/v2/e2e" -timeout 1500s -json > results.json
       - name: Generate E2E Report
         if: always()
         env:

.github/workflows/go-e2e.yaml

@@ -82,7 +82,7 @@ jobs:
           E2E_KICS_DOCKER: kics:e2e-tests-${{ github.sha }}
           E2E_KICS_QUERIES_PATH: ${{ steps.getbin.outputs.queries }}
         run: |
-          go test -tags dev "github.com/Checkmarx/kics/e2e" -timeout 1500s -json > results.json
+          go test -tags dev "github.com/Checkmarx/kics/v2/e2e" -timeout 1500s -json > results.json
       - name: Generate E2E Report
         if: always()
         env:

Makefile

@@ -110,7 +110,7 @@ test-coverage-report: test-cover
 test-e2e: ## Run E2E tests
 test-e2e: build
 	$(call print-target)
-	E2E_KICS_BINARY=$(PWD)/bin/kics go test "github.com/Checkmarx/kics/e2e" -v -timeout 1500s
+	E2E_KICS_BINARY=$(PWD)/bin/kics go test "github.com/Checkmarx/kics/v2/e2e" -v -timeout 1500s
 
 .PHONY: cover
 cover: ## generate coverage report

cmd/builder/main.go

@@ -6,8 +6,8 @@ import (
 	"path"
 	"path/filepath"
 
-	"github.com/Checkmarx/kics/pkg/builder/engine"
-	"github.com/Checkmarx/kics/pkg/builder/writer"
+	"github.com/Checkmarx/kics/v2/pkg/builder/engine"
+	"github.com/Checkmarx/kics/v2/pkg/builder/writer"
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"

cmd/console/main.go

@@ -3,9 +3,9 @@ package main
 import (
 	"os"
 
-	"github.com/Checkmarx/kics/internal/console"
-	"github.com/Checkmarx/kics/internal/console/helpers"
-	"github.com/Checkmarx/kics/internal/constants"
+	"github.com/Checkmarx/kics/v2/internal/console"
+	"github.com/Checkmarx/kics/v2/internal/console/helpers"
+	"github.com/Checkmarx/kics/v2/internal/constants"
 )
 
 func main() {

e2e/README.md

@@ -30,7 +30,7 @@ WINDOWS: go build -tags dev -o ./bin/kics.exe cmd/console/main.go
 
 Run
 ```bash
-go test "github.com/Checkmarx/kics/e2e" -v -count=1 -tags dev
+go test "github.com/Checkmarx/kics/v2/e2e" -v -count=1 -tags dev
 ```
 
 - **Running E2E Tests from docker (slower) (used in CI):**
@@ -45,13 +45,13 @@ WINDOWS: docker build -t kics:e2e-tests -f .\Dockerfile .
 
 Run (linux/mac/bash):
 ```bash
-E2E_KICS_DOCKER=kics:e2e-tests go test "github.com/Checkmarx/kics/e2e" -v -count=1 -tags dev
+E2E_KICS_DOCKER=kics:e2e-tests go test "github.com/Checkmarx/kics/v2/e2e" -v -count=1 -tags dev
 ```
 
 Run (windows)
 ```powershell
 SET "E2E_KICS_DOCKER=kics:e2e-tests" (or set the variable using environment variables window)
-go test "github.com/Checkmarx/kics/e2e" -v -count=1 -tags dev
+go test "github.com/Checkmarx/kics/v2/e2e" -v -count=1 -tags dev
 ```
 
 ## Test Structure

e2e/cli_test.go

@@ -9,8 +9,8 @@ import (
 	"text/template"
 	"time"
 
-	"github.com/Checkmarx/kics/e2e/testcases"
-	"github.com/Checkmarx/kics/e2e/utils"
+	"github.com/Checkmarx/kics/v2/e2e/testcases"
+	"github.com/Checkmarx/kics/v2/e2e/utils"
 	"github.com/stretchr/testify/require"
 )
 

e2e/testcases/utils.go

@@ -4,11 +4,11 @@ import (
 	"os"
 	"path/filepath"
 
-	u "github.com/Checkmarx/kics/e2e/utils"
-	"github.com/Checkmarx/kics/pkg/model"
-	"github.com/Checkmarx/kics/pkg/remediation"
-	"github.com/Checkmarx/kics/pkg/report"
-	"github.com/Checkmarx/kics/pkg/utils"
+	u "github.com/Checkmarx/kics/v2/e2e/utils"
+	"github.com/Checkmarx/kics/v2/pkg/model"
+	"github.com/Checkmarx/kics/v2/pkg/remediation"
+	"github.com/Checkmarx/kics/v2/pkg/report"
+	"github.com/Checkmarx/kics/v2/pkg/utils"
 	"github.com/rs/zerolog/log"
 )
 

e2e/utils/html.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/Checkmarx/kics/internal/constants"
+	"github.com/Checkmarx/kics/v2/internal/constants"
 	"github.com/stretchr/testify/require"
 	"golang.org/x/net/html"
 )

e2e/utils/json.go

@@ -11,7 +11,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/Checkmarx/kics/pkg/model"
+	"github.com/Checkmarx/kics/v2/pkg/model"
 	"github.com/stretchr/testify/require"
 	"github.com/xeipuuv/gojsonschema"
 )

e2e/utils/xml.go

@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	reportModel "github.com/Checkmarx/kics/pkg/report/model"
+	reportModel "github.com/Checkmarx/kics/v2/pkg/report/model"
 	"github.com/stretchr/testify/require"
 )
 

go.mod

@@ -1,4 +1,4 @@
-module github.com/Checkmarx/kics
+module github.com/Checkmarx/kics/v2
 
 go 1.22.3
 

internal/console/analyze.go

@@ -6,11 +6,11 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/Checkmarx/kics/internal/console/flags"
-	sentryReport "github.com/Checkmarx/kics/internal/sentry"
-	"github.com/Checkmarx/kics/pkg/analyzer"
-	"github.com/Checkmarx/kics/pkg/engine/source"
-	"github.com/Checkmarx/kics/pkg/model"
+	"github.com/Checkmarx/kics/v2/internal/console/flags"
+	sentryReport "github.com/Checkmarx/kics/v2/internal/sentry"
+	"github.com/Checkmarx/kics/v2/pkg/analyzer"
+	"github.com/Checkmarx/kics/v2/pkg/engine/source"
+	"github.com/Checkmarx/kics/v2/pkg/model"
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
 )

internal/console/flags/flags.go

@@ -6,8 +6,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/Checkmarx/kics/internal/console/helpers"
-	"github.com/Checkmarx/kics/internal/constants"
+	"github.com/Checkmarx/kics/v2/internal/console/helpers"
+	"github.com/Checkmarx/kics/v2/internal/constants"
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"

internal/console/flags/flags_test.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/Checkmarx/kics/internal/constants"
+	"github.com/Checkmarx/kics/v2/internal/constants"
 	"github.com/spf13/cobra"
 	"github.com/stretchr/testify/require"
 )

internal/console/flags/validate_multi_str.go

@@ -7,9 +7,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/Checkmarx/kics/internal/console/helpers"
-	"github.com/Checkmarx/kics/internal/constants"
-	"github.com/Checkmarx/kics/pkg/utils"
+	"github.com/Checkmarx/kics/v2/internal/console/helpers"
+	"github.com/Checkmarx/kics/v2/internal/constants"
+	"github.com/Checkmarx/kics/v2/pkg/utils"
 )
 
 var validMultiStrEnums = map[string]map[string]string{

internal/console/flags/validate_str.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/Checkmarx/kics/internal/constants"
-	"github.com/Checkmarx/kics/pkg/utils"
+	"github.com/Checkmarx/kics/v2/internal/constants"
+	"github.com/Checkmarx/kics/v2/pkg/utils"
 )
 
 var validStrEnums = map[string]map[string]string{

internal/console/helpers/exit_handler.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/Checkmarx/kics/pkg/model"
+	"github.com/Checkmarx/kics/v2/pkg/model"
 )
 
 var shouldIgnore string

internal/console/helpers/exit_handler_test.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/Checkmarx/kics/pkg/model"
-	"github.com/Checkmarx/kics/test"
+	"github.com/Checkmarx/kics/v2/pkg/model"
+	"github.com/Checkmarx/kics/v2/test"
 	"github.com/stretchr/testify/require"
 )
 

internal/console/helpers/helpers.go

@@ -14,9 +14,9 @@ import (
 	"strings"
 
 	"github.com/BurntSushi/toml"
-	"github.com/Checkmarx/kics/internal/metrics"
-	"github.com/Checkmarx/kics/pkg/progress"
-	"github.com/Checkmarx/kics/pkg/report"
+	"github.com/Checkmarx/kics/v2/internal/metrics"
+	"github.com/Checkmarx/kics/v2/pkg/progress"
+	"github.com/Checkmarx/kics/v2/pkg/report"
 	"github.com/hashicorp/hcl"
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"

internal/console/helpers/helpers_test.go

@@ -6,8 +6,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/Checkmarx/kics/pkg/progress"
-	"github.com/Checkmarx/kics/test"
+	"github.com/Checkmarx/kics/v2/pkg/progress"
+	"github.com/Checkmarx/kics/v2/test"
 	"github.com/rs/zerolog"
 	"github.com/stretchr/testify/require"
 )

internal/console/kics.go

@@ -6,11 +6,11 @@ import (
 	"os"
 	"time"
 
-	"github.com/Checkmarx/kics/internal/console/flags"
-	"github.com/Checkmarx/kics/internal/constants"
-	sentryReport "github.com/Checkmarx/kics/internal/sentry"
-	"github.com/Checkmarx/kics/pkg/engine/source"
-	"github.com/Checkmarx/kics/pkg/printer"
+	"github.com/Checkmarx/kics/v2/internal/console/flags"
+	"github.com/Checkmarx/kics/v2/internal/constants"
+	sentryReport "github.com/Checkmarx/kics/v2/internal/sentry"
+	"github.com/Checkmarx/kics/v2/pkg/engine/source"
+	"github.com/Checkmarx/kics/v2/pkg/printer"
 	"github.com/getsentry/sentry-go"
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"

internal/console/list_platforms.go

@@ -3,7 +3,7 @@ package console
 import (
 	"fmt"
 
-	"github.com/Checkmarx/kics/pkg/engine/source"
+	"github.com/Checkmarx/kics/v2/pkg/engine/source"
 	"github.com/spf13/cobra"
 )
 

internal/console/pre_scan.go

@@ -9,12 +9,12 @@ import (
 	"strings"
 
 	"code.cloudfoundry.org/bytefmt"
-	"github.com/Checkmarx/kics/internal/console/flags"
-	consoleHelpers "github.com/Checkmarx/kics/internal/console/helpers"
-	"github.com/Checkmarx/kics/internal/constants"
-	"github.com/Checkmarx/kics/internal/metrics"
-	internalPrinter "github.com/Checkmarx/kics/pkg/printer"
-	"github.com/Checkmarx/kics/pkg/progress"
+	"github.com/Checkmarx/kics/v2/internal/console/flags"
+	consoleHelpers "github.com/Checkmarx/kics/v2/internal/console/helpers"
+	"github.com/Checkmarx/kics/v2/internal/constants"
+	"github.com/Checkmarx/kics/v2/internal/metrics"
+	internalPrinter "github.com/Checkmarx/kics/v2/pkg/printer"
+	"github.com/Checkmarx/kics/v2/pkg/progress"
 	"github.com/mackerelio/go-osstat/memory"
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog/log"

internal/console/remediate.go

@@ -7,12 +7,12 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/Checkmarx/kics/internal/console/flags"
-	consoleHelpers "github.com/Checkmarx/kics/internal/console/helpers"
-	sentryReport "github.com/Checkmarx/kics/internal/sentry"
-	"github.com/Checkmarx/kics/pkg/engine/source"
-	internalPrinter "github.com/Checkmarx/kics/pkg/printer"
-	"github.com/Checkmarx/kics/pkg/remediation"
+	"github.com/Checkmarx/kics/v2/internal/console/flags"
+	consoleHelpers "github.com/Checkmarx/kics/v2/internal/console/helpers"
+	sentryReport "github.com/Checkmarx/kics/v2/internal/sentry"
+	"github.com/Checkmarx/kics/v2/pkg/engine/source"
+	internalPrinter "github.com/Checkmarx/kics/v2/pkg/printer"
+	"github.com/Checkmarx/kics/v2/pkg/remediation"
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"

internal/console/scan.go

@@ -8,12 +8,12 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/Checkmarx/kics/internal/console/flags"
-	consoleHelpers "github.com/Checkmarx/kics/internal/console/helpers"
-	"github.com/Checkmarx/kics/internal/constants"
-	sentryReport "github.com/Checkmarx/kics/internal/sentry"
-	"github.com/Checkmarx/kics/pkg/engine/source"
-	"github.com/Checkmarx/kics/pkg/scan"
+	"github.com/Checkmarx/kics/v2/internal/console/flags"
+	consoleHelpers "github.com/Checkmarx/kics/v2/internal/console/helpers"
+	"github.com/Checkmarx/kics/v2/internal/constants"
+	sentryReport "github.com/Checkmarx/kics/v2/internal/sentry"
+	"github.com/Checkmarx/kics/v2/pkg/engine/source"
+	"github.com/Checkmarx/kics/v2/pkg/scan"
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
 )

internal/console/version.go

@@ -3,7 +3,7 @@ package console
 import (
 	"fmt"
 
-	"github.com/Checkmarx/kics/internal/constants"
+	"github.com/Checkmarx/kics/v2/internal/constants"
 	"github.com/spf13/cobra"
 )
 

internal/sentry/sentry.go

@@ -3,8 +3,8 @@ package sentry
 import (
 	"encoding/json"
 
-	"github.com/Checkmarx/kics/internal/console/flags"
-	"github.com/Checkmarx/kics/pkg/model"
+	"github.com/Checkmarx/kics/v2/internal/console/flags"
+	"github.com/Checkmarx/kics/v2/pkg/model"
 	"github.com/getsentry/sentry-go"
 	"github.com/rs/zerolog/log"
 )

internal/storage/memory.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/Checkmarx/kics/pkg/model"
+	"github.com/Checkmarx/kics/v2/pkg/model"
 	"github.com/rs/zerolog/log"
 )
 

internal/storage/memory_test.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/Checkmarx/kics/pkg/model"
+	"github.com/Checkmarx/kics/v2/pkg/model"
 )
 
 // TestMemoryStorage_SaveFile tests the functions [SaveFile()]

internal/tracker/ci.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/Checkmarx/kics/internal/constants"
-	"github.com/Checkmarx/kics/pkg/model"
+	"github.com/Checkmarx/kics/v2/internal/constants"
+	"github.com/Checkmarx/kics/v2/pkg/model"
 )
 
 // CITracker contains information of how many queries were loaded and executed

internal/tracker/ci_test.go

@@ -5,8 +5,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/Checkmarx/kics/pkg/model"
-	"github.com/Checkmarx/kics/test"
+	"github.com/Checkmarx/kics/v2/pkg/model"
+	"github.com/Checkmarx/kics/v2/test"
 	"github.com/stretchr/testify/require"
 )