mirror of
https://github.com/prometheus/prometheus.git
synced 2024-11-09 23:24:05 -08:00
golangci-lint: remove skip-cache and restore singleCaseSwitch rule
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
This commit is contained in:
parent
78cd9ae2c3
commit
7e9acc2e46
1
.github/workflows/ci.yml
vendored
1
.github/workflows/ci.yml
vendored
|
@ -150,7 +150,6 @@ jobs:
|
|||
uses: golangci/golangci-lint-action@v3.4.0
|
||||
with:
|
||||
args: --verbose
|
||||
skip-cache: true
|
||||
version: v1.51.2
|
||||
fuzzing:
|
||||
uses: ./.github/workflows/fuzzing.yml
|
||||
|
|
|
@ -24,9 +24,6 @@ issues:
|
|||
- linters:
|
||||
- gocritic
|
||||
text: "appendAssign"
|
||||
- linters:
|
||||
- gocritic
|
||||
text: "singleCaseSwitch"
|
||||
- path: _test.go
|
||||
linters:
|
||||
- errcheck
|
||||
|
|
|
@ -757,8 +757,7 @@ func subqueryTimes(path []parser.Node) (time.Duration, time.Duration, *int64) {
|
|||
ts int64 = math.MaxInt64
|
||||
)
|
||||
for _, node := range path {
|
||||
switch n := node.(type) {
|
||||
case *parser.SubqueryExpr:
|
||||
if n, ok := node.(*parser.SubqueryExpr); ok {
|
||||
subqOffset += n.OriginalOffset
|
||||
subqRange += n.Range
|
||||
if n.Timestamp != nil {
|
||||
|
@ -847,8 +846,7 @@ func (ng *Engine) getTimeRangesForSelector(s *parser.EvalStmt, n *parser.VectorS
|
|||
func (ng *Engine) getLastSubqueryInterval(path []parser.Node) time.Duration {
|
||||
var interval time.Duration
|
||||
for _, node := range path {
|
||||
switch n := node.(type) {
|
||||
case *parser.SubqueryExpr:
|
||||
if n, ok := node.(*parser.SubqueryExpr); ok {
|
||||
interval = n.Step
|
||||
if n.Step == 0 {
|
||||
interval = time.Duration(ng.noStepSubqueryIntervalFn(durationMilliseconds(n.Range))) * time.Millisecond
|
||||
|
@ -914,8 +912,7 @@ func extractGroupsFromPath(p []parser.Node) (bool, []string) {
|
|||
if len(p) == 0 {
|
||||
return false, nil
|
||||
}
|
||||
switch n := p[len(p)-1].(type) {
|
||||
case *parser.AggregateExpr:
|
||||
if n, ok := p[len(p)-1].(*parser.AggregateExpr); ok {
|
||||
return !n.Without, n.Grouping
|
||||
}
|
||||
return false, nil
|
||||
|
|
Loading…
Reference in a new issue