From 552157a18ef624f7a8a1d54097961f64533d4f57 Mon Sep 17 00:00:00 2001 From: Ludovic Fernandez Date: Sun, 9 Oct 2022 13:06:39 +0200 Subject: [PATCH] revive: fix configuration parsing (#3284) --- .golangci.reference.yml | 4 +++- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.golangci.reference.yml b/.golangci.reference.yml index 6c1cce1e02eb..1ba4f5087b5d 100644 --- a/.golangci.reference.yml +++ b/.golangci.reference.yml @@ -1397,6 +1397,8 @@ linters-settings: - name: context-as-argument severity: warning disabled: false + arguments: + - allowTypesBefore: "*testing.T,*github.com/user/repo/testing.Harness" # https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md#context-keys-type - name: context-keys-type severity: warning @@ -1931,7 +1933,7 @@ linters-settings: # Allow multiple var/declaration statements to be cuddled. allow-cuddle-declarations: false - # Aa list of call idents that everything can be cuddled with. + # A list of call idents that everything can be cuddled with. # Defaults to calls looking like locks. allow-cuddle-with-calls: [ "Lock", "RLock" ] diff --git a/go.mod b/go.mod index 10b6279e63da..4b01584a6abb 100644 --- a/go.mod +++ b/go.mod @@ -90,7 +90,7 @@ require ( github.com/sourcegraph/go-diff v0.6.1 github.com/spf13/cobra v1.5.0 github.com/spf13/pflag v1.0.5 - github.com/spf13/viper v1.13.0 + github.com/spf13/viper v1.12.0 github.com/ssgreg/nlreturn/v2 v2.2.1 github.com/stbenjam/no-sprintf-host-port v0.1.1 github.com/stretchr/testify v1.8.0 diff --git a/go.sum b/go.sum index b344c2fc5522..3af4cd0f8fa7 100644 --- a/go.sum +++ b/go.sum @@ -504,8 +504,8 @@ github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmq github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.13.0 h1:BWSJ/M+f+3nmdz9bxB+bWX28kkALN2ok11D0rSo8EJU= -github.com/spf13/viper v1.13.0/go.mod h1:Icm2xNL3/8uyh/wFuB1jI7TiTNKp8632Nwegu+zgdYw= +github.com/spf13/viper v1.12.0 h1:CZ7eSOd3kZoaYDLbXnmzgQI5RlciuXBMA+18HwHRfZQ= +github.com/spf13/viper v1.12.0/go.mod h1:b6COn30jlNxbm/V2IqWiNWkJ+vZNiMNksliPCiuKtSI= github.com/ssgreg/nlreturn/v2 v2.2.1 h1:X4XDI7jstt3ySqGU86YGAURbxw3oTDPK9sPEi6YEwQ0= github.com/ssgreg/nlreturn/v2 v2.2.1/go.mod h1:E/iiPB78hV7Szg2YfRgyIrk1AD6JVMTRkkxBiELzh2I= github.com/stbenjam/no-sprintf-host-port v0.1.1 h1:tYugd/yrm1O0dV+ThCbaKZh195Dfm07ysF0U6JQXczc=