1
1
mirror of https://github.com/go-gitea/gitea synced 2025-07-03 17:17:19 +00:00

[Vendor] Update directly used dependencys (#15593)

* update github.com/blevesearch/bleve v2.0.2 -> v2.0.3

* github.com/denisenkom/go-mssqldb v0.9.0 -> v0.10.0

* github.com/editorconfig/editorconfig-core-go v2.4.1 -> v2.4.2

* github.com/go-chi/cors v1.1.1 -> v1.2.0

* github.com/go-git/go-billy v5.0.0 -> v5.1.0

* github.com/go-git/go-git v5.2.0 -> v5.3.0

* github.com/go-ldap/ldap v3.2.4 -> v3.3.0

* github.com/go-redis/redis v8.6.0 -> v8.8.2

* github.com/go-sql-driver/mysql v1.5.0 -> v1.6.0

* github.com/go-swagger/go-swagger v0.26.1 -> v0.27.0

* github.com/lib/pq v1.9.0 -> v1.10.1

* github.com/mattn/go-sqlite3 v1.14.6 -> v1.14.7

* github.com/go-testfixtures/testfixtures v3.5.0 -> v3.6.0

* github.com/issue9/identicon v1.0.1 -> v1.2.0

* github.com/klauspost/compress v1.11.8 -> v1.12.1

* github.com/mgechev/revive v1.0.3 -> v1.0.6

* github.com/microcosm-cc/bluemonday v1.0.7 -> v1.0.8

* github.com/niklasfasching/go-org v1.4.0 -> v1.5.0

* github.com/olivere/elastic v7.0.22 -> v7.0.24

* github.com/pelletier/go-toml v1.8.1 -> v1.9.0

* github.com/prometheus/client_golang v1.9.0 -> v1.10.0

* github.com/xanzy/go-gitlab v0.44.0 -> v0.48.0

* github.com/yuin/goldmark v1.3.3 -> v1.3.5

* github.com/6543/go-version v1.2.4 -> v1.3.1

* do github.com/lib/pq v1.10.0 -> v1.10.1 again ...
This commit is contained in:
6543
2021-04-23 02:08:53 +02:00
committed by GitHub
parent 834fc74873
commit 792b4dba2c
558 changed files with 32080 additions and 24669 deletions

107
vendor/github.com/mgechev/revive/formatter/sarif.go generated vendored Normal file
View File

@ -0,0 +1,107 @@
package formatter
import (
"bytes"
"fmt"
"strings"
"github.com/chavacava/garif"
"github.com/mgechev/revive/lint"
)
// Sarif is an implementation of the Formatter interface
// which formats revive failures into SARIF format.
type Sarif struct {
Metadata lint.FormatterMetadata
}
// Name returns the name of the formatter
func (f *Sarif) Name() string {
return "sarif"
}
const reviveSite = "https://revive.run"
// Format formats the failures gotten from the lint.
func (f *Sarif) Format(failures <-chan lint.Failure, cfg lint.Config) (string, error) {
sarifLog := newReviveRunLog(cfg)
for failure := range failures {
sarifLog.AddResult(failure)
}
buf := new(bytes.Buffer)
sarifLog.PrettyWrite(buf)
return buf.String(), nil
}
type reviveRunLog struct {
*garif.LogFile
run *garif.Run
rules map[string]lint.RuleConfig
}
func newReviveRunLog(cfg lint.Config) *reviveRunLog {
run := garif.NewRun(garif.NewTool(garif.NewDriver("revive").WithInformationUri(reviveSite)))
log := garif.NewLogFile([]*garif.Run{run}, garif.Version210)
reviveLog := &reviveRunLog{
log,
run,
cfg.Rules,
}
reviveLog.addRules(cfg.Rules)
return reviveLog
}
func (l *reviveRunLog) addRules(cfg map[string]lint.RuleConfig) {
for name, ruleCfg := range cfg {
rule := garif.NewRule(name).WithHelpUri(reviveSite + "/r#" + name)
setRuleProperties(rule, ruleCfg)
driver := l.run.Tool.Driver
if driver.Rules == nil {
driver.Rules = []*garif.ReportingDescriptor{rule}
return
}
driver.Rules = append(driver.Rules, rule)
}
}
func (l *reviveRunLog) AddResult(failure lint.Failure) {
positiveOrZero := func(x int) int {
if x > 0 {
return x
}
return 0
}
position := failure.Position
filename := position.Start.Filename
line := positiveOrZero(position.Start.Line - 1) // https://docs.oasis-open.org/sarif/sarif/v2.1.0/csprd01/sarif-v2.1.0-csprd01.html#def_line
column := positiveOrZero(position.Start.Column - 1) // https://docs.oasis-open.org/sarif/sarif/v2.1.0/csprd01/sarif-v2.1.0-csprd01.html#def_column
result := garif.NewResult(garif.NewMessageFromText(failure.Failure))
location := garif.NewLocation().WithURI(filename).WithLineColumn(line, column)
result.Locations = append(result.Locations, location)
result.RuleId = failure.RuleName
result.Level = l.rules[failure.RuleName].Severity
l.run.Results = append(l.run.Results, result)
}
func setRuleProperties(sarifRule *garif.ReportingDescriptor, lintRule lint.RuleConfig) {
arguments := make([]string, len(lintRule.Arguments))
for i, arg := range lintRule.Arguments {
arguments[i] = fmt.Sprintf("%+v", arg)
}
if len(arguments) > 0 {
sarifRule.WithProperties("arguments", strings.Join(arguments, ","))
}
sarifRule.WithProperties("severity", string(lintRule.Severity))
}

View File

@ -29,4 +29,5 @@ type Config struct {
ErrorCode int `toml:"errorCode"`
WarningCode int `toml:"warningCode"`
Directives DirectivesConfig `toml:"directive"`
Exclude []string `toml:"exclude"`
}

View File

@ -2,6 +2,7 @@ package rule
import (
"go/ast"
"strings"
"github.com/mgechev/revive/lint"
)
@ -9,66 +10,66 @@ import (
// BlankImportsRule lints given else constructs.
type BlankImportsRule struct{}
// Apply applies the rule to given file.
func (r *BlankImportsRule) Apply(file *lint.File, _ lint.Arguments) []lint.Failure {
var failures []lint.Failure
fileAst := file.AST
walker := lintBlankImports{
file: file,
fileAst: fileAst,
onFailure: func(failure lint.Failure) {
failures = append(failures, failure)
},
}
ast.Walk(walker, fileAst)
return failures
}
// Name returns the rule name.
func (r *BlankImportsRule) Name() string {
return "blank-imports"
}
type lintBlankImports struct {
fileAst *ast.File
file *lint.File
onFailure func(lint.Failure)
}
func (w lintBlankImports) Visit(_ ast.Node) ast.Visitor {
// In package main and in tests, we don't complain about blank imports.
if w.file.Pkg.IsMain() || w.file.IsTest() {
// Apply applies the rule to given file.
func (r *BlankImportsRule) Apply(file *lint.File, _ lint.Arguments) []lint.Failure {
if file.Pkg.IsMain() || file.IsTest() {
return nil
}
const (
message = "a blank import should be only in a main or test package, or have a comment justifying it"
category = "imports"
embedImportPath = `"embed"`
)
var failures []lint.Failure
// The first element of each contiguous group of blank imports should have
// an explanatory comment of some kind.
for i, imp := range w.fileAst.Imports {
pos := w.file.ToPosition(imp.Pos())
for i, imp := range file.AST.Imports {
pos := file.ToPosition(imp.Pos())
if !isBlank(imp.Name) {
continue // Ignore non-blank imports.
}
if i > 0 {
prev := w.fileAst.Imports[i-1]
prevPos := w.file.ToPosition(prev.Pos())
if isBlank(prev.Name) && prevPos.Line+1 == pos.Line {
continue // A subsequent blank in a group.
prev := file.AST.Imports[i-1]
prevPos := file.ToPosition(prev.Pos())
isSubsequentBlancInAGroup := isBlank(prev.Name) && prevPos.Line+1 == pos.Line && prev.Path.Value != embedImportPath
if isSubsequentBlancInAGroup {
continue
}
}
if imp.Path.Value == embedImportPath && r.fileHasValidEmbedComment(file.AST) {
continue
}
// This is the first blank import of a group.
if imp.Doc == nil && imp.Comment == nil {
w.onFailure(lint.Failure{
Node: imp,
Failure: "a blank import should be only in a main or test package, or have a comment justifying it",
Confidence: 1,
Category: "imports",
})
failures = append(failures, lint.Failure{Failure: message, Category: category, Node: imp, Confidence: 1})
}
}
return nil
return failures
}
func (r *BlankImportsRule) fileHasValidEmbedComment(fileAst *ast.File) bool {
for _, commentGroup := range fileAst.Comments {
for _, comment := range commentGroup.List {
if strings.HasPrefix(comment.Text, "//go:embed ") {
return true
}
}
}
return false
}

View File

@ -0,0 +1,153 @@
package rule
import (
"fmt"
"go/ast"
"reflect"
"github.com/mgechev/revive/lint"
)
// FunctionLength lint.
type FunctionLength struct{}
// Apply applies the rule to given file.
func (r *FunctionLength) Apply(file *lint.File, arguments lint.Arguments) []lint.Failure {
maxStmt, maxLines := r.parseArguments(arguments)
var failures []lint.Failure
walker := lintFuncLength{
file: file,
maxStmt: int(maxStmt),
maxLines: int(maxLines),
onFailure: func(failure lint.Failure) {
failures = append(failures, failure)
},
}
ast.Walk(walker, file.AST)
return failures
}
// Name returns the rule name.
func (r *FunctionLength) Name() string {
return "function-length"
}
func (r *FunctionLength) parseArguments(arguments lint.Arguments) (maxStmt int64, maxLines int64) {
if len(arguments) != 2 {
panic(fmt.Sprintf(`invalid configuration for "function-length" rule, expected 2 arguments but got %d`, len(arguments)))
}
maxStmt, maxStmtOk := arguments[0].(int64)
if !maxStmtOk {
panic(fmt.Sprintf(`invalid configuration value for max statements in "function-length" rule; need int64 but got %T`, arguments[0]))
}
if maxStmt < 0 {
panic(fmt.Sprintf(`the configuration value for max statements in "function-length" rule cannot be negative, got %d`, maxStmt))
}
maxLines, maxLinesOk := arguments[1].(int64)
if !maxLinesOk {
panic(fmt.Sprintf(`invalid configuration value for max lines in "function-length" rule; need int64 but got %T`, arguments[1]))
}
if maxLines < 0 {
panic(fmt.Sprintf(`the configuration value for max statements in "function-length" rule cannot be negative, got %d`, maxLines))
}
return
}
type lintFuncLength struct {
file *lint.File
maxStmt int
maxLines int
onFailure func(lint.Failure)
}
func (w lintFuncLength) Visit(n ast.Node) ast.Visitor {
node, ok := n.(*ast.FuncDecl)
if !ok {
return w
}
body := node.Body
if body == nil || len(node.Body.List) == 0 {
return nil
}
if w.maxStmt > 0 {
stmtCount := w.countStmts(node.Body.List)
if stmtCount > w.maxStmt {
w.onFailure(lint.Failure{
Confidence: 1,
Failure: fmt.Sprintf("maximum number of statements per function exceeded; max %d but got %d", w.maxStmt, stmtCount),
Node: node,
})
}
}
if w.maxLines > 0 {
lineCount := w.countLines(node.Body)
if lineCount > w.maxLines {
w.onFailure(lint.Failure{
Confidence: 1,
Failure: fmt.Sprintf("maximum number of lines per function exceeded; max %d but got %d", w.maxLines, lineCount),
Node: node,
})
}
}
return nil
}
func (w lintFuncLength) countLines(b *ast.BlockStmt) int {
return w.file.ToPosition(b.End()).Line - w.file.ToPosition(b.Pos()).Line - 1
}
func (w lintFuncLength) countStmts(b []ast.Stmt) int {
count := 0
for _, s := range b {
switch stmt := s.(type) {
case *ast.BlockStmt:
count += w.countStmts(stmt.List)
case *ast.IfStmt:
count += 1 + w.countBodyListStmts(stmt)
if stmt.Else != nil {
elseBody, ok := stmt.Else.(*ast.BlockStmt)
if ok {
count += w.countStmts(elseBody.List)
}
}
case *ast.ForStmt, *ast.RangeStmt,
*ast.SwitchStmt, *ast.TypeSwitchStmt, *ast.SelectStmt:
count += 1 + w.countBodyListStmts(stmt)
case *ast.CaseClause:
count += w.countStmts(stmt.Body)
case *ast.AssignStmt:
count += 1 + w.countFuncLitStmts(stmt.Rhs[0])
case *ast.GoStmt:
count += 1 + w.countFuncLitStmts(stmt.Call.Fun)
case *ast.DeferStmt:
count += 1 + w.countFuncLitStmts(stmt.Call.Fun)
default:
count++
}
}
return count
}
func (w lintFuncLength) countFuncLitStmts(stmt ast.Expr) int {
if block, ok := stmt.(*ast.FuncLit); ok {
return w.countStmts(block.Body.List)
}
return 0
}
func (w lintFuncLength) countBodyListStmts(t interface{}) int {
i := reflect.ValueOf(t).Elem().FieldByName(`Body`).Elem().FieldByName(`List`).Interface()
return w.countStmts(i.([]ast.Stmt))
}

View File

@ -168,7 +168,7 @@ func (w lintStructTagRule) checkJSONTag(name string, options []string) (string,
case "":
// special case for JSON key "-"
if name != "-" {
return "option can not be empty in JSON tag", false
return "option can not be empty in JSON tag", false
}
default:
return fmt.Sprintf("unknown option '%s' in JSON tag", opt), false