Skip to content

Commit

Permalink
chore(deps): use mergo vanity url (#1161)
Browse files Browse the repository at this point in the history
<!-- markdownlint-disable MD041 -->
#### What this PR does / why we need it

`In [1.0.0](https://github.com/imdario/mergo/releases/tag/1.0.0) Mergo
moves to a vanity URL dario.cat/mergo. No more v1 versions will be
released.`

#### Which issue(s) this PR fixes
<!--
Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`.
-->

see https://github.com/darccio/mergo?tab=readme-ov-file#100
  • Loading branch information
jakobmoellerdev authored Nov 28, 2024
1 parent 6aaf3fb commit b02d333
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion api/utils/template/merge.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package template
import (
"encoding/json"

"github.com/imdario/mergo"
"dario.cat/mergo"
"sigs.k8s.io/yaml"
)

Expand Down
7 changes: 5 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ go 1.23.2
replace github.com/spf13/cobra => github.com/open-component-model/cobra v0.0.0-20230329075350-b1fd876abfb9

require (
dario.cat/mergo v1.0.1
github.com/DataDog/gostackparse v0.7.0
github.com/InfiniteLoopSpace/go_S-MIME v0.0.0-20181221134359-3f58f9a4b2b6
github.com/Masterminds/semver/v3 v3.3.1
Expand Down Expand Up @@ -37,7 +38,6 @@ require (
github.com/golang/mock v1.6.0
github.com/google/go-github/v45 v45.2.0
github.com/hashicorp/vault-client-go v0.4.3
github.com/imdario/mergo v0.3.16
github.com/juju/fslock v0.0.0-20160525022230-4d5c94c67b4b
github.com/klauspost/compress v1.17.11
github.com/klauspost/pgzip v1.2.6
Expand Down Expand Up @@ -89,7 +89,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/compute/metadata v0.5.2 // indirect
dario.cat/mergo v1.0.1 // indirect
filippo.io/edwards25519 v1.1.0 // indirect
github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 // indirect
github.com/AliyunContainerService/ack-ram-tool/pkg/credentials/provider v0.15.2 // indirect
Expand Down Expand Up @@ -234,6 +233,7 @@ require (
github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
github.com/hashicorp/hcl v1.0.1-vault-5 // indirect
github.com/huandu/xstrings v1.5.0 // indirect
github.com/imdario/mergo v0.3.16 // indirect
github.com/in-toto/in-toto-golang v0.9.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jedisct1/go-minisign v0.0.0-20230811132847-661be99b8267 // indirect
Expand Down Expand Up @@ -368,6 +368,9 @@ require (
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
)

// see https://github.com/darccio/mergo?tab=readme-ov-file#100
replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.16

retract [v0.16.0, v0.16.9] // Retract all from v0.16 due to https://github.com/open-component-model/ocm-project/issues/293

// crypto/tls: Client Hello is always sent in 2 TCP frames if GODEBUG=tlskyber=1 (default) which causes
Expand Down

0 comments on commit b02d333

Please sign in to comment.