Skip to content

Commit 27da7d7

Browse files
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 55e7f80 commit 27da7d7

File tree

6 files changed

+13
-11
lines changed

6 files changed

+13
-11
lines changed

go.mod

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

3131
require (
3232
cel.dev/expr v0.19.1 // indirect
33-
dario.cat/mergo v1.0.1 // indirect
33+
dario.cat/mergo v1.0.2 // indirect
3434
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
3535
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
3636
github.com/BurntSushi/toml v1.4.0 // indirect

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cel.dev/expr v0.19.1 h1:NciYrtDRIR0lNCnH1LFJegdjspNx9fI59O7TWcua/W4=
22
cel.dev/expr v0.19.1/go.mod h1:MrpN08Q+lEBs+bGYdLxxHkZoUSsCp0nSKTs0nTymJgw=
3-
dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s=
4-
dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
3+
dario.cat/mergo v1.0.2 h1:85+piFYR1tMbRrLcDwR18y4UKJ3aH1Tbzi24VRW1TK8=
4+
dario.cat/mergo v1.0.2/go.mod h1:E/hbnu0NxMFBjpMIE34DRGLWqDy0g5FuKDhCb31ngxA=
55
filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
66
filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
77
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 h1:bvDV9vkmnHYOMsOr4WLk+Vo07yKIzd94sVoIqshQ4bU=
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
@@ -1,7 +1,7 @@
11
# cel.dev/expr v0.19.1
22
## explicit; go 1.21.1
33
cel.dev/expr
4-
# dario.cat/mergo v1.0.1
4+
# dario.cat/mergo v1.0.2
55
## explicit; go 1.13
66
dario.cat/mergo
77
# github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24

0 commit comments

Comments
 (0)