go.mod: mass update modules

Maintenance task: let's update all modules.

Signed-off-by: Giedrius Statkevičius <[email protected]>

Author: GiedriusS

cmd/thanos/main.go

@@ -15,6 +15,7 @@ import (
 	"runtime/debug"
 	"syscall"
 
+	"github.com/alecthomas/kingpin/v2"
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
 	"github.com/oklog/run"
@@ -25,7 +26,6 @@ import (
 	versioncollector "github.com/prometheus/client_golang/prometheus/collectors/version"
 	"github.com/prometheus/common/version"
 	"go.uber.org/automaxprocs/maxprocs"
-	"gopkg.in/alecthomas/kingpin.v2"
 
 	"github.com/thanos-io/thanos/pkg/extkingpin"
 	"github.com/thanos-io/thanos/pkg/logging"

go.mod

@@ -4,7 +4,7 @@
 package extflag
 
 import (
-	"gopkg.in/alecthomas/kingpin.v2"
+	"github.com/alecthomas/kingpin/v2"
 )
 
 type FlagClause interface {

go.sum

@@ -9,12 +9,12 @@ import (
 	"sort"
 	"text/template"
 
+	"github.com/alecthomas/kingpin/v2"
 	"github.com/go-kit/log"
 	"github.com/oklog/run"
 	"github.com/opentracing/opentracing-go"
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
-	"gopkg.in/alecthomas/kingpin.v2"
 )
 
 const UsageTemplate = `{{define "FormatCommand"}}\

pkg/extflag/hidden.go

@@ -7,10 +7,10 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/alecthomas/kingpin/v2"
 	extflag "github.com/efficientgo/tools/extkingpin"
 	"github.com/pkg/errors"
 	"github.com/prometheus/common/model"
-	"gopkg.in/alecthomas/kingpin.v2"
 )
 
 func ModelDuration(flags *kingpin.FlagClause) *model.Duration {

pkg/extkingpin/app.go

@@ -6,9 +6,9 @@ package model
 import (
 	"time"
 
+	"github.com/alecthomas/kingpin/v2"
 	"github.com/prometheus/common/model"
 	"github.com/prometheus/prometheus/model/timestamp"
-	"gopkg.in/alecthomas/kingpin.v2"
 )
 
 // TimeOrDurationValue is a custom kingping parser for time in RFC3339

pkg/extkingpin/flags.go

@@ -7,8 +7,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/alecthomas/kingpin/v2"
 	"github.com/prometheus/prometheus/model/timestamp"
-	"gopkg.in/alecthomas/kingpin.v2"
 
 	"github.com/efficientgo/core/testutil"
 	"github.com/thanos-io/thanos/pkg/model"

pkg/model/timeduration.go

@@ -147,7 +147,7 @@ func EnforceQueryTenancy(tenantLabel string, tenant string, query string) (strin
 		Value: tenant,
 	}
 
-	e := injectproxy.NewEnforcer(false, labelMatcher)
+	e := injectproxy.NewPromQLEnforcer(false, labelMatcher)
 
 	expr, err := extpromql.ParseExpr(query)
 	if err != nil {
@@ -185,7 +185,7 @@ func getLabelMatchers(formMatchers []string, tenant string, enforceTenancy bool,
 		}
 
 		if enforceTenancy {
-			e := injectproxy.NewEnforcer(false, tenantLabelMatcher)
+			e := injectproxy.NewPromQLEnforcer(false, tenantLabelMatcher)
 			matchers, err = e.EnforceMatchers(matchers)
 			if err != nil {
 				return nil, err

pkg/model/timeduration_test.go

@@ -11,6 +11,7 @@ import (
 	"reflect"
 	"strings"
 
+	"github.com/alecthomas/kingpin/v2"
 	"github.com/fatih/structtag"
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
@@ -24,7 +25,6 @@ import (
 	"github.com/thanos-io/objstore/providers/oss"
 	"github.com/thanos-io/objstore/providers/s3"
 	"github.com/thanos-io/objstore/providers/swift"
-	"gopkg.in/alecthomas/kingpin.v2"
 	"gopkg.in/yaml.v2"
 
 	"github.com/thanos-io/thanos/pkg/alert"