Merge branch 'main' into rego-iam-doc

.github/workflows/test-go.yml

@@ -8,11 +8,19 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-go@v5
-      with:
-        go-version-file: go.mod
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version-file: go.mod
 
-    - name: Run tests
-      run: make test
-      shell: bash
+      - name: go mod tidy
+        run: |
+          go mod tidy
+          if [ -n "$(git status --porcelain)" ]; then
+            echo "Run 'go mod tidy' and push it"
+            exit 1
+          fi
+
+      - name: Run tests
+        run: make test
+        shell: bash

go.mod

@@ -28,7 +28,6 @@ require (
 	golang.org/x/text v0.14.0
 	gopkg.in/yaml.v3 v3.0.1
 	helm.sh/helm/v3 v3.13.3
-	k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
 )
 
 require (
@@ -211,6 +210,7 @@ require (
 	k8s.io/klog/v2 v2.100.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
 	k8s.io/kubectl v0.28.4 // indirect
+	k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
 	oras.land/oras-go v1.2.4 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect

pkg/scanners/azure/value.go

@@ -4,9 +4,10 @@ import (
 	"strings"
 	"time"
 
+	"golang.org/x/exp/slices"
+
 	"github.com/aquasecurity/defsec/pkg/types"
 	"github.com/aquasecurity/trivy-iac/pkg/scanners/azure/arm/parser/armjson"
-	"k8s.io/utils/strings/slices"
 )
 
 type EvalContext struct{}

pkg/scanners/terraformplan/scanner.go

@@ -141,8 +141,8 @@ func (s *Scanner) ScanFile(filepath string, fs fs.FS) (scan.Results, error) {
 	if err != nil {
 		return nil, err
 	}
+	defer file.Close()
 	return s.Scan(file)
-
 }
 
 func (s *Scanner) Scan(reader io.Reader) (scan.Results, error) {