fix(deps): update module github.com/imdario/mergo to v1 (#15035)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Paul Rogers <paul.rogers@grafana.com>
pull/15009/head
renovate[bot] 6 months ago committed by GitHub
parent 9decb65714
commit be24862f53
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 2
      clients/pkg/promtail/targets/serverutils/config.go
  2. 4
      go.mod
  3. 2
      integration/util/merger.go
  4. 2
      pkg/ruler/registry.go

@ -3,8 +3,8 @@ package serverutils
import ( import (
"flag" "flag"
"dario.cat/mergo"
"github.com/grafana/dskit/server" "github.com/grafana/dskit/server"
"github.com/imdario/mergo"
) )
// MergeWithDefaults applies server.Config defaults to a given and different server.Config. // MergeWithDefaults applies server.Config defaults to a given and different server.Config.

@ -8,6 +8,7 @@ require (
cloud.google.com/go/bigtable v1.33.0 cloud.google.com/go/bigtable v1.33.0
cloud.google.com/go/pubsub v1.45.1 cloud.google.com/go/pubsub v1.45.1
cloud.google.com/go/storage v1.47.0 cloud.google.com/go/storage v1.47.0
dario.cat/mergo v1.0.1
github.com/Azure/azure-pipeline-go v0.2.3 github.com/Azure/azure-pipeline-go v0.2.3
github.com/Azure/azure-storage-blob-go v0.15.0 github.com/Azure/azure-storage-blob-go v0.15.0
github.com/Azure/go-autorest/autorest/adal v0.9.24 github.com/Azure/go-autorest/autorest/adal v0.9.24
@ -59,7 +60,6 @@ require (
github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645
github.com/hashicorp/consul/api v1.30.0 github.com/hashicorp/consul/api v1.30.0
github.com/hashicorp/golang-lru/v2 v2.0.7 github.com/hashicorp/golang-lru/v2 v2.0.7
github.com/imdario/mergo v0.3.16
github.com/influxdata/telegraf v1.16.3 github.com/influxdata/telegraf v1.16.3
github.com/jmespath/go-jmespath v0.4.0 github.com/jmespath/go-jmespath v0.4.0
github.com/joncrlsn/dque v0.0.0-20211108142734-c2ef48c5192a github.com/joncrlsn/dque v0.0.0-20211108142734-c2ef48c5192a
@ -159,7 +159,6 @@ require (
cloud.google.com/go/auth v0.10.2 // indirect cloud.google.com/go/auth v0.10.2 // indirect
cloud.google.com/go/auth/oauth2adapt v0.2.5 // indirect cloud.google.com/go/auth/oauth2adapt v0.2.5 // indirect
cloud.google.com/go/monitoring v1.21.2 // indirect cloud.google.com/go/monitoring v1.21.2 // indirect
dario.cat/mergo v1.0.1 // indirect
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.1 // indirect github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.1 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.48.1 // indirect github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.48.1 // indirect
@ -173,6 +172,7 @@ require (
github.com/goccy/go-json v0.10.3 // indirect github.com/goccy/go-json v0.10.3 // indirect
github.com/gorilla/handlers v1.5.2 // indirect github.com/gorilla/handlers v1.5.2 // indirect
github.com/hashicorp/golang-lru v0.6.0 // indirect github.com/hashicorp/golang-lru v0.6.0 // indirect
github.com/imdario/mergo v0.3.16 // indirect
github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c // indirect github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c // indirect
github.com/moby/docker-image-spec v1.3.1 // indirect github.com/moby/docker-image-spec v1.3.1 // indirect
github.com/moby/sys/userns v0.1.0 // indirect github.com/moby/sys/userns v0.1.0 // indirect

@ -3,7 +3,7 @@ package util
import ( import (
"fmt" "fmt"
"github.com/imdario/mergo" "dario.cat/mergo"
"gopkg.in/yaml.v2" "gopkg.in/yaml.v2"
) )

@ -8,10 +8,10 @@ import (
"sync" "sync"
"time" "time"
"dario.cat/mergo"
"github.com/go-kit/log" "github.com/go-kit/log"
"github.com/go-kit/log/level" "github.com/go-kit/log/level"
"github.com/grafana/dskit/user" "github.com/grafana/dskit/user"
"github.com/imdario/mergo"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
promConfig "github.com/prometheus/common/config" promConfig "github.com/prometheus/common/config"

Loading…
Cancel
Save