From e82f78c4aec18928d09994352e01770ea61485a4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2024 14:06:16 +0000 Subject: [PATCH 1/2] fix(deps): update module github.com/imdario/mergo to v1 --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 24bdc41341c7d..5929cb8c41250 100644 --- a/go.mod +++ b/go.mod @@ -59,7 +59,7 @@ require ( github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 github.com/hashicorp/consul/api v1.30.0 github.com/hashicorp/golang-lru/v2 v2.0.7 - github.com/imdario/mergo v0.3.16 + github.com/imdario/mergo v1.0.1 github.com/influxdata/telegraf v1.16.3 github.com/jmespath/go-jmespath v0.4.0 github.com/joncrlsn/dque v0.0.0-20211108142734-c2ef48c5192a From 5cb26e7a8218eed889bc77ce2dde56b268abcea6 Mon Sep 17 00:00:00 2001 From: Paul Rogers Date: Wed, 20 Nov 2024 10:53:52 -0500 Subject: [PATCH 2/2] Rename package --- clients/pkg/promtail/targets/serverutils/config.go | 2 +- go.mod | 4 ++-- integration/util/merger.go | 2 +- pkg/ruler/registry.go | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/clients/pkg/promtail/targets/serverutils/config.go b/clients/pkg/promtail/targets/serverutils/config.go index 451a3d0953c76..add94dc8157f4 100644 --- a/clients/pkg/promtail/targets/serverutils/config.go +++ b/clients/pkg/promtail/targets/serverutils/config.go @@ -3,8 +3,8 @@ package serverutils import ( "flag" + "dario.cat/mergo" "github.com/grafana/dskit/server" - "github.com/imdario/mergo" ) // MergeWithDefaults applies server.Config defaults to a given and different server.Config. diff --git a/go.mod b/go.mod index 5929cb8c41250..c8ac196870a2e 100644 --- a/go.mod +++ b/go.mod @@ -8,6 +8,7 @@ require ( cloud.google.com/go/bigtable v1.33.0 cloud.google.com/go/pubsub v1.45.1 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-storage-blob-go v0.15.0 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/hashicorp/consul/api v1.30.0 github.com/hashicorp/golang-lru/v2 v2.0.7 - github.com/imdario/mergo v1.0.1 github.com/influxdata/telegraf v1.16.3 github.com/jmespath/go-jmespath v0.4.0 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/oauth2adapt v0.2.5 // 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/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.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/gorilla/handlers v1.5.2 // 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/moby/docker-image-spec v1.3.1 // indirect github.com/moby/sys/userns v0.1.0 // indirect diff --git a/integration/util/merger.go b/integration/util/merger.go index dbd88a4205fc9..5458c1ce3f125 100644 --- a/integration/util/merger.go +++ b/integration/util/merger.go @@ -3,7 +3,7 @@ package util import ( "fmt" - "github.com/imdario/mergo" + "dario.cat/mergo" "gopkg.in/yaml.v2" ) diff --git a/pkg/ruler/registry.go b/pkg/ruler/registry.go index 29297fcab5a74..67ef1d9bbf32c 100644 --- a/pkg/ruler/registry.go +++ b/pkg/ruler/registry.go @@ -8,10 +8,10 @@ import ( "sync" "time" + "dario.cat/mergo" "github.com/go-kit/log" "github.com/go-kit/log/level" "github.com/grafana/dskit/user" - "github.com/imdario/mergo" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" promConfig "github.com/prometheus/common/config"