Skip to content

Commit 503460f

Browse files
authored
Merge pull request #1301 from crazy-max/update-mergo
chore(deps): bump dario.cat/mergo to 1.0.1
2 parents 11448fe + a5444ad commit 503460f

24 files changed

+1323
-391
lines changed

go.mod

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ module github.com/crazy-max/diun/v4
33
go 1.23.0
44

55
require (
6+
dario.cat/mergo v1.0.1
67
github.com/AlecAivazis/survey/v2 v2.3.7
78
github.com/PaulSonOfLars/gotgbot/v2 v2.0.0-rc.30
89
github.com/alecthomas/kong v1.6.0
@@ -22,7 +23,6 @@ require (
2223
github.com/gregdel/pushover v1.3.1
2324
github.com/hako/durafmt v0.0.0-20210608085754-5c1018a4e16b
2425
github.com/hashicorp/nomad/api v0.0.0-20231213195942-64e3dca9274b // v1.7.2
25-
github.com/imdario/mergo v0.3.16
2626
github.com/jedib0t/go-pretty/v6 v6.6.5
2727
github.com/matcornic/hermes/v2 v2.1.0
2828
github.com/matrix-org/gomatrix v0.0.0-20210324163249-be2af5ef2e16
@@ -97,6 +97,7 @@ require (
9797
github.com/hashicorp/go-multierror v1.1.1 // indirect
9898
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
9999
github.com/huandu/xstrings v1.2.0 // indirect
100+
github.com/imdario/mergo v0.3.6 // indirect
100101
github.com/jaytaylor/html2text v0.0.0-20180606194806-57d518f124b0 // indirect
101102
github.com/josharian/intern v1.0.0 // indirect
102103
github.com/json-iterator/go v1.1.12 // indirect

go.sum

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +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=
13
github.com/AlecAivazis/survey/v2 v2.3.7 h1:6I/u8FvytdGsgonrYsVn2t8t4QiRnh6QSTqkkhIiSjQ=
24
github.com/AlecAivazis/survey/v2 v2.3.7/go.mod h1:xUTIdE4KCOIjsBAE1JYsUPoCqYdZ1reCfTwbto0Fduo=
35
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0=
@@ -175,9 +177,8 @@ github.com/hinshun/vt10x v0.0.0-20220119200601-820417d04eec/go.mod h1:Q48J4R4Dvx
175177
github.com/huandu/xstrings v1.2.0 h1:yPeWdRnmynF7p+lLYz0H2tthW9lqhMJrQV/U7yy4wX0=
176178
github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4=
177179
github.com/ianlancetaylor/demangle v0.0.0-20210905161508-09a460cdf81d/go.mod h1:aYm2/VgdVmcIU8iMfdMvDMsRAQjcfZSKFby6HOFvi/w=
180+
github.com/imdario/mergo v0.3.6 h1:xTNEAn+kxVO7dTZGu0CegyqKZmoWFI0rF8UxjlB2d28=
178181
github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
179-
github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=
180-
github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
181182
github.com/jaytaylor/html2text v0.0.0-20180606194806-57d518f124b0 h1:xqgexXAGQgY3HAjNPSaCqn5Aahbo5TKsmhp8VRfr1iQ=
182183
github.com/jaytaylor/html2text v0.0.0-20180606194806-57d518f124b0/go.mod h1:CVKlgaMiht+LXvHG173ujK6JUhZXKb2u/BQtjPDIvyk=
183184
github.com/jedib0t/go-pretty/v6 v6.6.5 h1:9PgMJOVBedpgYLI56jQRJYqngxYAAzfEUua+3NgSqAo=

internal/app/job.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ import (
44
"fmt"
55
"regexp"
66

7+
"dario.cat/mergo"
78
"github.com/containers/image/v5/pkg/docker/config"
89
"github.com/containers/image/v5/types"
910
"github.com/crazy-max/diun/v4/internal/model"
1011
"github.com/crazy-max/diun/v4/pkg/registry"
1112
"github.com/crazy-max/diun/v4/pkg/utl"
12-
"github.com/imdario/mergo"
1313
"github.com/rs/zerolog/log"
1414
)
1515

internal/provider/common.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ import (
55
"strconv"
66
"strings"
77

8+
"dario.cat/mergo"
89
"github.com/containerd/platforms"
910
"github.com/crazy-max/diun/v4/internal/model"
1011
"github.com/crazy-max/diun/v4/pkg/registry"
11-
"github.com/imdario/mergo"
1212
"github.com/pkg/errors"
1313
)
1414

internal/provider/nomad/task.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import (
44
"reflect"
55
"strings"
66

7+
"dario.cat/mergo"
78
"github.com/crazy-max/diun/v4/internal/model"
89
"github.com/crazy-max/diun/v4/internal/provider"
910
nomad "github.com/hashicorp/nomad/api"
10-
"github.com/imdario/mergo"
1111
)
1212

1313
func parseServiceTags(tags []string) map[string]string {

vendor/github.com/imdario/mergo/.deepsource.toml vendor/dario.cat/mergo/.deepsource.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ name = "go"
99
enabled = true
1010

1111
[analyzers.meta]
12-
import_path = "github.com/imdario/mergo"
12+
import_path = "dario.cat/mergo"

vendor/dario.cat/mergo/.gitignore

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
#### joe made this: http://goel.io/joe
2+
3+
#### go ####
4+
# Binaries for programs and plugins
5+
*.exe
6+
*.dll
7+
*.so
8+
*.dylib
9+
10+
# Test binary, build with `go test -c`
11+
*.test
12+
13+
# Output of the go coverage tool, specifically when used with LiteIDE
14+
*.out
15+
16+
# Golang/Intellij
17+
.idea
18+
19+
# Project-local glide cache, RE: https://github.com/Masterminds/glide/issues/736
20+
.glide/
21+
22+
#### vim ####
23+
# Swap
24+
[._]*.s[a-v][a-z]
25+
[._]*.sw[a-p]
26+
[._]s[a-v][a-z]
27+
[._]sw[a-p]
28+
29+
# Session
30+
Session.vim
31+
32+
# Temporary
33+
.netrwhist
34+
*~
35+
# Auto-generated tag files
36+
tags

vendor/dario.cat/mergo/.travis.yml

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
language: go
2+
arch:
3+
- amd64
4+
- ppc64le
5+
install:
6+
- go get -t
7+
- go get golang.org/x/tools/cmd/cover
8+
- go get github.com/mattn/goveralls
9+
script:
10+
- go test -race -v ./...
11+
after_script:
12+
- $HOME/gopath/bin/goveralls -service=travis-ci -repotoken $COVERALLS_TOKEN
+46
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
## Our Pledge
4+
5+
In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
6+
7+
## Our Standards
8+
9+
Examples of behavior that contributes to creating a positive environment include:
10+
11+
* Using welcoming and inclusive language
12+
* Being respectful of differing viewpoints and experiences
13+
* Gracefully accepting constructive criticism
14+
* Focusing on what is best for the community
15+
* Showing empathy towards other community members
16+
17+
Examples of unacceptable behavior by participants include:
18+
19+
* The use of sexualized language or imagery and unwelcome sexual attention or advances
20+
* Trolling, insulting/derogatory comments, and personal or political attacks
21+
* Public or private harassment
22+
* Publishing others' private information, such as a physical or electronic address, without explicit permission
23+
* Other conduct which could reasonably be considered inappropriate in a professional setting
24+
25+
## Our Responsibilities
26+
27+
Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
28+
29+
Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
30+
31+
## Scope
32+
33+
This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
34+
35+
## Enforcement
36+
37+
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [email protected]. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
38+
39+
Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
40+
41+
## Attribution
42+
43+
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
44+
45+
[homepage]: http://contributor-covenant.org
46+
[version]: http://contributor-covenant.org/version/1/4/

vendor/dario.cat/mergo/LICENSE

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
Copyright (c) 2013 Dario Castañé. All rights reserved.
2+
Copyright (c) 2012 The Go Authors. All rights reserved.
3+
4+
Redistribution and use in source and binary forms, with or without
5+
modification, are permitted provided that the following conditions are
6+
met:
7+
8+
* Redistributions of source code must retain the above copyright
9+
notice, this list of conditions and the following disclaimer.
10+
* Redistributions in binary form must reproduce the above
11+
copyright notice, this list of conditions and the following disclaimer
12+
in the documentation and/or other materials provided with the
13+
distribution.
14+
* Neither the name of Google Inc. nor the names of its
15+
contributors may be used to endorse or promote products derived from
16+
this software without specific prior written permission.
17+
18+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
19+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
20+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
21+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
22+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
23+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
24+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

0 commit comments

Comments
 (0)