Skip to content

Commit 11eccd5

Browse files
chore(deps): update module dario.cat/mergo to v1.0.2
Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com>
1 parent ff5dc8a commit 11eccd5

6 files changed

Lines changed: 13 additions & 11 deletions

File tree

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ require (
3232

3333
require (
3434
cloud.google.com/go/compute/metadata v0.3.0 // indirect
35-
dario.cat/mergo v1.0.1 // indirect
35+
dario.cat/mergo v1.0.2 // indirect
3636
github.com/42wim/httpsig v1.2.2 // indirect
3737
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
3838
github.com/BurntSushi/toml v1.4.0 // indirect

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ cloud.google.com/go/compute/metadata v0.3.0 h1:Tz+eQXMEqDIKRsmY3cHTL6FVaynIjX2Qx
44
cloud.google.com/go/compute/metadata v0.3.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k=
55
code.gitea.io/sdk/gitea v0.21.0 h1:69n6oz6kEVHRo1+APQQyizkhrZrLsTLXey9142pfkD4=
66
code.gitea.io/sdk/gitea v0.21.0/go.mod h1:tnBjVhuKJCn8ibdyyhvUyxrR1Ca2KHEoTWoukNhXQPA=
7-
dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s=
8-
dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
7+
dario.cat/mergo v1.0.2 h1:85+piFYR1tMbRrLcDwR18y4UKJ3aH1Tbzi24VRW1TK8=
8+
dario.cat/mergo v1.0.2/go.mod h1:E/hbnu0NxMFBjpMIE34DRGLWqDy0g5FuKDhCb31ngxA=
99
github.com/42wim/httpsig v1.2.2 h1:ofAYoHUNs/MJOLqQ8hIxeyz2QxOz8qdSVvp3PX/oPgA=
1010
github.com/42wim/httpsig v1.2.2/go.mod h1:P/UYo7ytNBFwc+dg35IubuAUIs8zj5zzFIgUCEl55WY=
1111
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c h1:udKWzYgxTojEKWjV8V+WSxDXJ4NFATAsZjh8iIbsQIg=
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"drips": {
3+
"ethereum": {
4+
"ownedBy": "0x6160020e7102237aC41bdb156e94401692D76930"
5+
}
6+
}
7+
}

vendor/dario.cat/mergo/README.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ Mergo is used by [thousands](https://deps.dev/go/dario.cat%2Fmergo/v1.0.0/depend
8585
* [goreleaser/goreleaser](https://github.com/goreleaser/goreleaser)
8686
* [go-micro/go-micro](https://github.com/go-micro/go-micro)
8787
* [grafana/loki](https://github.com/grafana/loki)
88-
* [kubernetes/kubernetes](https://github.com/kubernetes/kubernetes)
8988
* [masterminds/sprig](github.com/Masterminds/sprig)
9089
* [moby/moby](https://github.com/moby/moby)
9190
* [slackhq/nebula](https://github.com/slackhq/nebula)
@@ -191,10 +190,6 @@ func main() {
191190
}
192191
```
193192

194-
Note: if test are failing due missing package, please execute:
195-
196-
go get gopkg.in/yaml.v3
197-
198193
### Transformers
199194

200195
Transformers allow to merge specific types differently than in the default behavior. In other words, now you can customize how some types are merged. For example, `time.Time` is a struct; it doesn't have zero value but IsZero can return true because it has fields with zero value. How can we merge a non-zero `time.Time`?

vendor/dario.cat/mergo/SECURITY.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
| Version | Supported |
66
| ------- | ------------------ |
7-
| 0.3.x | :white_check_mark: |
8-
| < 0.3 | :x: |
7+
| 1.x.x | :white_check_mark: |
8+
| < 1.0 | :x: |
99

1010
## Security contact information
1111

vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ cloud.google.com/go/compute/metadata
44
# code.gitea.io/sdk/gitea v0.21.0
55
## explicit; go 1.23
66
code.gitea.io/sdk/gitea
7-
# dario.cat/mergo v1.0.1
7+
# dario.cat/mergo v1.0.2
88
## explicit; go 1.13
99
dario.cat/mergo
1010
# github.com/42wim/httpsig v1.2.2

0 commit comments

Comments
 (0)