diff --git a/packages/eventgenerator/spec b/packages/eventgenerator/spec index 532b39ca45..c07ec0f71f 100644 --- a/packages/eventgenerator/spec +++ b/packages/eventgenerator/spec @@ -34,6 +34,7 @@ files: - autoscaler/vendor/code.cloudfoundry.org/lager/v3/* # gosub - autoscaler/vendor/code.cloudfoundry.org/lager/v3/internal/truncate/* # gosub - autoscaler/vendor/code.cloudfoundry.org/tlsconfig/* # gosub +- autoscaler/vendor/dario.cat/mergo/* # gosub - autoscaler/vendor/github.com/beorn7/perks/quantile/* # gosub - autoscaler/vendor/github.com/blang/semver/* # gosub - autoscaler/vendor/github.com/cenk/backoff/* # gosub @@ -53,7 +54,6 @@ files: - autoscaler/vendor/github.com/grpc-ecosystem/grpc-gateway/v2/utilities/* # gosub - autoscaler/vendor/github.com/hashicorp/go-cleanhttp/* # gosub - autoscaler/vendor/github.com/hashicorp/go-retryablehttp/* # gosub -- autoscaler/vendor/github.com/imdario/mergo/* # gosub - autoscaler/vendor/github.com/jackc/pgpassfile/* # gosub - autoscaler/vendor/github.com/jackc/pgservicefile/* # gosub - autoscaler/vendor/github.com/jackc/pgx/v5/* # gosub diff --git a/packages/metricsserver/spec b/packages/metricsserver/spec index f1f6ba6cb1..fbfab8141e 100644 --- a/packages/metricsserver/spec +++ b/packages/metricsserver/spec @@ -28,6 +28,7 @@ files: - autoscaler/vendor/code.cloudfoundry.org/lager/v3/* # gosub - autoscaler/vendor/code.cloudfoundry.org/lager/v3/internal/truncate/* # gosub - autoscaler/vendor/code.cloudfoundry.org/tlsconfig/* # gosub +- autoscaler/vendor/dario.cat/mergo/* # gosub - autoscaler/vendor/github.com/beorn7/perks/quantile/* # gosub - autoscaler/vendor/github.com/cespare/xxhash/v2/* # gosub - autoscaler/vendor/github.com/go-sql-driver/mysql/* # gosub @@ -41,7 +42,6 @@ files: - autoscaler/vendor/github.com/gorilla/websocket/* # gosub - autoscaler/vendor/github.com/hashicorp/go-cleanhttp/* # gosub - autoscaler/vendor/github.com/hashicorp/go-retryablehttp/* # gosub -- autoscaler/vendor/github.com/imdario/mergo/* # gosub - autoscaler/vendor/github.com/jackc/pgpassfile/* # gosub - autoscaler/vendor/github.com/jackc/pgservicefile/* # gosub - autoscaler/vendor/github.com/jackc/pgx/v5/* # gosub diff --git a/src/autoscaler/envelopeprocessor/envelope_processor.go b/src/autoscaler/envelopeprocessor/envelope_processor.go index 6c749b2463..24d282f35e 100644 --- a/src/autoscaler/envelopeprocessor/envelope_processor.go +++ b/src/autoscaler/envelopeprocessor/envelope_processor.go @@ -12,7 +12,7 @@ import ( "code.cloudfoundry.org/app-autoscaler/src/autoscaler/models" "code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2" - "github.com/imdario/mergo" + "dario.cat/mergo" ) type EnvelopeProcessorCreator interface { diff --git a/src/autoscaler/go.mod b/src/autoscaler/go.mod index 2479613845..b3705782ab 100644 --- a/src/autoscaler/go.mod +++ b/src/autoscaler/go.mod @@ -9,6 +9,7 @@ require ( code.cloudfoundry.org/go-loggregator/v9 v9.0.6 code.cloudfoundry.org/lager/v3 v3.0.2 code.cloudfoundry.org/tlsconfig v0.0.0-20220621140725-0e6fbd869921 + dario.cat/mergo v1.0.0 github.com/cenkalti/backoff/v4 v4.2.1 github.com/go-sql-driver/mysql v1.7.1 github.com/golang/protobuf v1.5.3 @@ -16,7 +17,6 @@ require ( github.com/gorilla/mux v1.8.0 github.com/gorilla/websocket v1.5.0 github.com/hashicorp/go-retryablehttp v0.7.4 - github.com/imdario/mergo v0.3.16 github.com/jackc/pgx/v5 v5.4.1 github.com/jmoiron/sqlx v1.3.5 github.com/maxbrunsfeld/counterfeiter/v6 v6.6.2 diff --git a/src/autoscaler/go.sum b/src/autoscaler/go.sum index 38dbf52ea0..bbfd6bba80 100644 --- a/src/autoscaler/go.sum +++ b/src/autoscaler/go.sum @@ -610,6 +610,8 @@ code.cloudfoundry.org/lager/v3 v3.0.2 h1:H0dcQY+814G1Ea0e5K/AMaMpcr+Pe5Iv+AALJEw code.cloudfoundry.org/lager/v3 v3.0.2/go.mod h1:zA6tOIWhr5uZUez+PGpdfBHDWQOfhOrr0cgKDagZPwk= code.cloudfoundry.org/tlsconfig v0.0.0-20220621140725-0e6fbd869921 h1:1PLAuQR56K2pw0lnlcXe+37uOaGg939W1Lqv8wxYpu4= code.cloudfoundry.org/tlsconfig v0.0.0-20220621140725-0e6fbd869921/go.mod h1:oItDsgL/IixCV1BTTY9XqyhGojI5wyEgyPcBwXfKbvs= +dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk= +dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= filippo.io/edwards25519 v1.0.0-rc.1 h1:m0VOOB23frXZvAOK44usCgLWvtsxIoMCTBGJZlpmGfU= filippo.io/edwards25519 v1.0.0-rc.1/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns= @@ -1007,8 +1009,6 @@ github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1: github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= -github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4= -github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=