Skip to content

Commit a27a862

Browse files
committed
vendor: dario.cat/mergo v1.0.2
drops gopkg.in/yaml.v3 as dependency full diff: darccio/mergo@v1.0.1...v1.0.2 Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit a93ed48) Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent 44fb305 commit a27a862

File tree

6 files changed

+13
-11
lines changed

6 files changed

+13
-11
lines changed

vendor.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ module github.com/docker/cli
77
go 1.23.0
88

99
require (
10-
dario.cat/mergo v1.0.1
10+
dario.cat/mergo v1.0.2
1111
github.com/containerd/errdefs v1.0.0
1212
github.com/containerd/log v0.1.0
1313
github.com/containerd/platforms v1.0.0-rc.1

vendor.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s=
2-
dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
1+
dario.cat/mergo v1.0.2 h1:85+piFYR1tMbRrLcDwR18y4UKJ3aH1Tbzi24VRW1TK8=
2+
dario.cat/mergo v1.0.2/go.mod h1:E/hbnu0NxMFBjpMIE34DRGLWqDy0g5FuKDhCb31ngxA=
33
github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 h1:He8afgbRMd7mFxO99hRNu+6tazq8nFF9lIwo9JFroBk=
44
github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8=
55
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
@@ -1,4 +1,4 @@
1-
# dario.cat/mergo v1.0.1
1+
# dario.cat/mergo v1.0.2
22
## explicit; go 1.13
33
dario.cat/mergo
44
# github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c

0 commit comments

Comments
 (0)