aboutsummaryrefslogtreecommitdiffstats
path: root/vendor/github.com/ryancurrah
diff options
context:
space:
mode:
authorTaras Madan <tarasmadan@google.com>2024-09-10 12:16:33 +0200
committerTaras Madan <tarasmadan@google.com>2024-09-10 14:05:26 +0000
commitc97c816133b42257d0bcf1ee4bd178bb2a7a2b9e (patch)
tree0bcbc2e540bbf8f62f6c17887cdd53b8c2cee637 /vendor/github.com/ryancurrah
parent54e657429ab892ad06c90cd7c1a4eb33ba93a3dc (diff)
vendor: update
Diffstat (limited to 'vendor/github.com/ryancurrah')
-rw-r--r--vendor/github.com/ryancurrah/gomodguard/.golangci.yml128
-rw-r--r--vendor/github.com/ryancurrah/gomodguard/.goreleaser.yml9
-rw-r--r--vendor/github.com/ryancurrah/gomodguard/Makefile8
-rw-r--r--vendor/github.com/ryancurrah/gomodguard/README.md2
-rw-r--r--vendor/github.com/ryancurrah/gomodguard/blocked.go16
-rw-r--r--vendor/github.com/ryancurrah/gomodguard/processor.go37
-rw-r--r--vendor/github.com/ryancurrah/gomodguard/tools.go5
7 files changed, 67 insertions, 138 deletions
diff --git a/vendor/github.com/ryancurrah/gomodguard/.golangci.yml b/vendor/github.com/ryancurrah/gomodguard/.golangci.yml
index a0e6fd55e..5be8aa487 100644
--- a/vendor/github.com/ryancurrah/gomodguard/.golangci.yml
+++ b/vendor/github.com/ryancurrah/gomodguard/.golangci.yml
@@ -1,111 +1,23 @@
# See https://golangci-lint.run/usage/configuration/
-
-linters-settings:
- revive:
- # see https://github.com/mgechev/revive#available-rules for details.
- ignore-generated-header: true
- severity: warning
- rules:
- - name: atomic
- - name: blank-imports
- - name: bool-literal-in-expr
- - name: call-to-gc
- - name: confusing-naming
- - name: confusing-results
- - name: constant-logical-expr
- - name: context-as-argument
- - name: context-keys-type
- - name: deep-exit
- - name: defer
- - name: dot-imports
- - name: duplicated-imports
- - name: early-return
- - name: empty-block
- - name: empty-lines
- - name: error-naming
- - name: error-return
- - name: error-strings
- - name: errorf
- - name: exported
- - name: get-return
- - name: identical-branches
- - name: if-return
- - name: import-shadowing
- - name: increment-decrement
- - name: indent-error-flow
- - name: modifies-parameter
- - name: modifies-value-receiver
- - name: package-comments
- - name: range
- - name: range-val-address
- - name: range-val-in-closure
- - name: receiver-naming
- - name: redefines-builtin-id
- - name: string-of-int
- - name: struct-tag
- - name: superfluous-else
- - name: time-naming
- - name: unconditional-recursion
- - name: unexported-naming
- - name: unexported-return
- - name: unnecessary-stmt
- - name: unreachable-code
- - name: unused-parameter
- - name: var-declaration
- - name: var-naming
- - name: waitgroup-by-value
-
linters:
- disable-all: true
- enable:
- - asciicheck
- - bodyclose
- - dogsled
- - dupl
- - durationcheck
- - errcheck
- - errorlint
- - exhaustive
- - exportloopref
- - forcetypeassert
- - funlen
- - gochecknoinits
- - gocognit
- - goconst
- - gocritic
- - gocyclo
- - godot
- - godox
- - goimports
- - gomoddirectives
- - gomodguard
- - goprintffuncname
- - gosec
- - gosimple
- - govet
- - importas
- - ineffassign
+ enable-all: true
+ disable:
- lll
- - makezero
- - misspell
- - nakedret
- - nestif
- - nilerr
- - noctx
- - nolintlint
- - prealloc
- - predeclared
- - revive
- - rowserrcheck
- - sqlclosecheck
- - staticcheck
- - stylecheck
- - testpackage
- - thelper
- - tparallel
- - typecheck
- - unconvert
- - unparam
- - unused
- - whitespace
- - wsl
+ - gomodguard
+ - gochecknoglobals
+ - paralleltest
+ - varnamelen
+ - exhaustruct
+ - gomnd
+ - depguard
+ - forbidigo
+ - funlen
+ - nlreturn
+ - gofumpt
+ - nonamedreturns
+ - cyclop
+ - err113
+ - perfsprint
+ - tagliatelle
+ - wrapcheck
+ - mnd
diff --git a/vendor/github.com/ryancurrah/gomodguard/.goreleaser.yml b/vendor/github.com/ryancurrah/gomodguard/.goreleaser.yml
index f3675a9c2..5a41de893 100644
--- a/vendor/github.com/ryancurrah/gomodguard/.goreleaser.yml
+++ b/vendor/github.com/ryancurrah/gomodguard/.goreleaser.yml
@@ -1,3 +1,4 @@
+version: 2
builds:
- main: ./cmd/gomodguard/main.go
env:
@@ -9,6 +10,14 @@ archives:
{{- if eq .Arch "amd64" }}x86_64
{{- else if eq .Arch "386" }}i386
{{- else }}{{ .Arch }}{{ end }}
+ wrap_in_directory: true
+ format_overrides:
+ - goos: windows
+ format: zip
+ - goos: darwin
+ format: tar.xz
+ - goos: linux
+ format: tar.xz
checksum:
name_template: 'checksums.txt'
dockers:
diff --git a/vendor/github.com/ryancurrah/gomodguard/Makefile b/vendor/github.com/ryancurrah/gomodguard/Makefile
index 5235d5aad..b02bd5809 100644
--- a/vendor/github.com/ryancurrah/gomodguard/Makefile
+++ b/vendor/github.com/ryancurrah/gomodguard/Makefile
@@ -6,7 +6,7 @@ lint:
.PHONY: build
build:
- go build -o gomodguard cmd/gomodguard/main.go
+ go build -o "$$(go env GOPATH)/bin/gomodguard" cmd/gomodguard/main.go
.PHONY: run
run: build
@@ -26,11 +26,11 @@ dockerrun: dockerbuild
.PHONY: snapshot
snapshot:
- goreleaser --rm-dist --snapshot
+ goreleaser --clean --snapshot
.PHONY: release
release:
- goreleaser --rm-dist
+ goreleaser --clean
.PHONY: clean
clean:
@@ -43,4 +43,4 @@ install-tools-mac:
.PHONY: install-go-tools
install-go-tools:
- go install -v github.com/t-yuki/gocover-cobertura
+ go install -v github.com/t-yuki/gocover-cobertura@latest
diff --git a/vendor/github.com/ryancurrah/gomodguard/README.md b/vendor/github.com/ryancurrah/gomodguard/README.md
index 4945f0101..68dc86044 100644
--- a/vendor/github.com/ryancurrah/gomodguard/README.md
+++ b/vendor/github.com/ryancurrah/gomodguard/README.md
@@ -1,7 +1,7 @@
# gomodguard
[![License](https://img.shields.io/github/license/ryancurrah/gomodguard?style=flat-square)](/LICENSE)
[![Codecov](https://img.shields.io/codecov/c/gh/ryancurrah/gomodguard?style=flat-square)](https://codecov.io/gh/ryancurrah/gomodguard)
-[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/ryancurrah/gomodguard/Go?logo=Go&style=flat-square)](https://github.com/ryancurrah/gomodguard/actions?query=workflow%3AGo)
+[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/ryancurrah/gomodguard/go.yml?branch=main&logo=Go&style=flat-square)](https://github.com/ryancurrah/gomodguard/actions?query=workflow%3AGo)
[![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/ryancurrah/gomodguard?style=flat-square)](https://github.com/ryancurrah/gomodguard/releases/latest)
[![Docker](https://img.shields.io/docker/pulls/ryancurrah/gomodguard?style=flat-square)](https://hub.docker.com/r/ryancurrah/gomodguard)
[![Github Releases Stats of golangci-lint](https://img.shields.io/github/downloads/ryancurrah/gomodguard/total.svg?logo=github&style=flat-square)](https://somsubhra.com/github-release-stats/?username=ryancurrah&repository=gomodguard)
diff --git a/vendor/github.com/ryancurrah/gomodguard/blocked.go b/vendor/github.com/ryancurrah/gomodguard/blocked.go
index 2a6e5c215..df24b85ac 100644
--- a/vendor/github.com/ryancurrah/gomodguard/blocked.go
+++ b/vendor/github.com/ryancurrah/gomodguard/blocked.go
@@ -4,7 +4,7 @@ import (
"fmt"
"strings"
- "github.com/Masterminds/semver"
+ "github.com/Masterminds/semver/v3"
)
// Blocked is a list of modules that are
@@ -15,7 +15,7 @@ type Blocked struct {
LocalReplaceDirectives bool `yaml:"local_replace_directives"`
}
-// BlockedVersion has a version constraint a reason why the the module version is blocked.
+// BlockedVersion has a version constraint a reason why the module version is blocked.
type BlockedVersion struct {
Version string `yaml:"version"`
Reason string `yaml:"reason"`
@@ -23,24 +23,22 @@ type BlockedVersion struct {
// IsLintedModuleVersionBlocked returns true if a version constraint is specified and the
// linted module version matches the constraint.
-func (r *BlockedVersion) IsLintedModuleVersionBlocked(lintedModuleVersion string) bool {
+func (r *BlockedVersion) IsLintedModuleVersionBlocked(lintedModuleVersion string) (bool, error) {
if r.Version == "" {
- return false
+ return false, nil
}
constraint, err := semver.NewConstraint(r.Version)
if err != nil {
- return false
+ return true, err
}
version, err := semver.NewVersion(lintedModuleVersion)
if err != nil {
- return false
+ return true, err
}
- meet := constraint.Check(version)
-
- return meet
+ return constraint.Check(version), nil
}
// Message returns the reason why the module version is blocked.
diff --git a/vendor/github.com/ryancurrah/gomodguard/processor.go b/vendor/github.com/ryancurrah/gomodguard/processor.go
index 51038f37f..f3f42a5be 100644
--- a/vendor/github.com/ryancurrah/gomodguard/processor.go
+++ b/vendor/github.com/ryancurrah/gomodguard/processor.go
@@ -22,12 +22,10 @@ const (
)
var (
- blockReasonNotInAllowedList = "import of package `%s` is blocked because the module is not in the " +
- "allowed modules list."
- blockReasonInBlockedList = "import of package `%s` is blocked because the module is in the " +
- "blocked modules list."
- blockReasonHasLocalReplaceDirective = "import of package `%s` is blocked because the module has a " +
- "local replace directive."
+ blockReasonNotInAllowedList = "import of package `%s` is blocked because the module is not in the allowed modules list."
+ blockReasonInBlockedList = "import of package `%s` is blocked because the module is in the blocked modules list."
+ blockReasonHasLocalReplaceDirective = "import of package `%s` is blocked because the module has a local replace directive."
+ blockReasonInvalidVersionConstraint = "import of package `%s` is blocked because the version constraint is invalid."
// startsWithVersion is used to test when a string begins with the version identifier of a module,
// after having stripped the prefix base module name. IE "github.com/foo/bar/v2/baz" => "v2/baz"
@@ -181,9 +179,21 @@ func (p *Processor) SetBlockedModules() { //nolint:funlen
fmt.Sprintf("%s %s", blockReasonInBlockedList, blockModuleReason.Message()))
}
- if blockVersionReason != nil && blockVersionReason.IsLintedModuleVersionBlocked(lintedModuleVersion) {
- blockedModules[lintedModuleName] = append(blockedModules[lintedModuleName],
- fmt.Sprintf("%s %s", blockReasonInBlockedList, blockVersionReason.Message(lintedModuleVersion)))
+ if blockVersionReason != nil {
+ isVersBlocked, err := blockVersionReason.IsLintedModuleVersionBlocked(lintedModuleVersion)
+
+ var msg string
+
+ switch err {
+ case nil:
+ msg = fmt.Sprintf("%s %s", blockReasonInBlockedList, blockVersionReason.Message(lintedModuleVersion))
+ default:
+ msg = fmt.Sprintf("%s %s", blockReasonInvalidVersionConstraint, err)
+ }
+
+ if isVersBlocked {
+ blockedModules[lintedModuleName] = append(blockedModules[lintedModuleName], msg)
+ }
}
}
@@ -223,6 +233,11 @@ func (p *Processor) isBlockedPackageFromModFile(packageName string) []string {
return nil
}
+// loadGoModFile loads the contents of the go.mod file in the current working directory.
+// It first checks the "GOMOD" environment variable to determine the path of the go.mod file.
+// If the environment variable is not set or the file does not exist, it falls back to reading the go.mod file in the current directory.
+// If the "GOMOD" environment variable is set to "/dev/null", it returns an error indicating that the current working directory must have a go.mod file.
+// The function returns the contents of the go.mod file as a byte slice and any error encountered during the process.
func loadGoModFile() ([]byte, error) {
cmd := exec.Command("go", "env", "-json")
stdout, _ := cmd.StdoutPipe()
@@ -250,14 +265,14 @@ func loadGoModFile() ([]byte, error) {
return os.ReadFile(goModFilename)
}
- if goEnv["GOMOD"] == "/dev/null" {
+ if goEnv["GOMOD"] == "/dev/null" || goEnv["GOMOD"] == "NUL" {
return nil, errors.New("current working directory must have a go.mod file")
}
return os.ReadFile(goEnv["GOMOD"])
}
-// isPackageInModule determines if a package is apart of the specified go module.
+// isPackageInModule determines if a package is a part of the specified Go module.
func isPackageInModule(pkg, mod string) bool {
// Split pkg and mod paths into parts
pkgPart := strings.Split(pkg, "/")
diff --git a/vendor/github.com/ryancurrah/gomodguard/tools.go b/vendor/github.com/ryancurrah/gomodguard/tools.go
deleted file mode 100644
index d56bcc747..000000000
--- a/vendor/github.com/ryancurrah/gomodguard/tools.go
+++ /dev/null
@@ -1,5 +0,0 @@
-//go:build tools
-
-package gomodguard
-
-import _ "github.com/t-yuki/gocover-cobertura"