Skip to content

Commit 900ffcb

Browse files
authored
chore: migrate from gomodguard to gomodguard_v2 (aquasecurity#10739)
1 parent 3d5bc38 commit 900ffcb

2 files changed

Lines changed: 14 additions & 15 deletions

File tree

.golangci.yaml

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -46,20 +46,19 @@ linters:
4646
gocyclo:
4747
# Next highest complexity candidate: ApplyLayers in pkg/fanal/applier/docker.go (score: 28)
4848
min-complexity: 20
49-
gomodguard:
49+
gomodguard_v2:
5050
blocked:
51-
modules:
52-
- github.com/hashicorp/go-version:
53-
recommendations:
54-
- github.com/aquasecurity/go-version
55-
reason: "`aquasecurity/go-version` is designed for our use-cases"
56-
- github.com/Masterminds/semver:
57-
recommendations:
58-
- github.com/aquasecurity/go-version
59-
reason: "`aquasecurity/go-version` is designed for our use-cases"
60-
- github.com/liamg/memoryfs:
61-
recommendations:
62-
- github.com/aquasecurity/trivy/pkg/mapfs
51+
- module: github.com/hashicorp/go-version
52+
recommendations:
53+
- github.com/aquasecurity/go-version
54+
reason: "`aquasecurity/go-version` is designed for our use-cases"
55+
- module: github.com/Masterminds/semver
56+
recommendations:
57+
- github.com/aquasecurity/go-version
58+
reason: "`aquasecurity/go-version` is designed for our use-cases"
59+
- module: github.com/liamg/memoryfs
60+
recommendations:
61+
- github.com/aquasecurity/trivy/pkg/mapfs
6362
gosec:
6463
excludes:
6564
- G101
@@ -151,7 +150,7 @@ linters:
151150
- depguard
152151
- gocritic
153152
- gocyclo
154-
- gomodguard
153+
- gomodguard_v2
155154
- gosec
156155
- govet
157156
- ineffassign

magefiles/terraformplan.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"path/filepath"
1010
"strings"
1111

12-
hversion "github.com/hashicorp/go-version" //nolint:gomodguard // hc-install uses hashicorp/go-version
12+
hversion "github.com/hashicorp/go-version" //nolint:gomodguard_v2 // hc-install uses hashicorp/go-version
1313
"github.com/hashicorp/hc-install/product"
1414
"github.com/hashicorp/hc-install/releases"
1515
"github.com/hashicorp/terraform-exec/tfexec"

0 commit comments

Comments
 (0)