From 61f551b77fe6185a6ace92f590de213d2bb3193b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Aug 2021 18:45:22 +0000 Subject: [PATCH] Bump github.com/docker/go-units from 0.3.2 to 0.4.0 in /agent Bumps [github.com/docker/go-units](https://github.com/docker/go-units) from 0.3.2 to 0.4.0. - [Release notes](https://github.com/docker/go-units/releases) - [Commits](https://github.com/docker/go-units/compare/v0.3.2...v0.4.0) --- updated-dependencies: - dependency-name: github.com/docker/go-units dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- agent/go.mod | 2 +- agent/go.sum | 4 +-- .../github.com/docker/go-units/MAINTAINERS | 33 +++++++++++++++---- .../github.com/docker/go-units/circle.yml | 2 +- .../github.com/docker/go-units/duration.go | 2 +- .../vendor/github.com/docker/go-units/size.go | 2 +- .../github.com/docker/go-units/ulimit.go | 9 +++-- agent/vendor/modules.txt | 2 +- 8 files changed, 40 insertions(+), 16 deletions(-) diff --git a/agent/go.mod b/agent/go.mod index c5679bfc5c7..55bf0229b23 100644 --- a/agent/go.mod +++ b/agent/go.mod @@ -17,7 +17,7 @@ require ( github.com/docker/distribution v0.0.0-20181002220433-1cb4180b1a5b // indirect github.com/docker/docker v0.0.0-20200531234253-77e06fda0c94 github.com/docker/go-connections v0.3.0 - github.com/docker/go-units v0.3.2 + github.com/docker/go-units v0.4.0 github.com/godbus/dbus v4.1.0+incompatible // indirect github.com/golang/mock v1.1.1 github.com/google/go-cmp v0.5.6 // indirect diff --git a/agent/go.sum b/agent/go.sum index 90f6f7eab07..75a73d5fe78 100644 --- a/agent/go.sum +++ b/agent/go.sum @@ -51,8 +51,8 @@ github.com/docker/docker v0.0.0-20200531234253-77e06fda0c94 h1:YBrOju+pvHeUDXJuZ github.com/docker/docker v0.0.0-20200531234253-77e06fda0c94/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.3.0 h1:3lOnM9cSzgGwx8VfK/NGOW5fLQ0GjIlCkaktF+n1M6o= github.com/docker/go-connections v0.3.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= -github.com/docker/go-units v0.3.2 h1:Kjm80apys7gTtfVmCvVY8gwu10uofaFSrmAKOVrtueE= -github.com/docker/go-units v0.3.2/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= +github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw= +github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= diff --git a/agent/vendor/github.com/docker/go-units/MAINTAINERS b/agent/vendor/github.com/docker/go-units/MAINTAINERS index 477be8b214b..4aac7c74110 100644 --- a/agent/vendor/github.com/docker/go-units/MAINTAINERS +++ b/agent/vendor/github.com/docker/go-units/MAINTAINERS @@ -1,6 +1,6 @@ -# go-connections maintainers file +# go-units maintainers file # -# This file describes who runs the docker/go-connections project and how. +# This file describes who runs the docker/go-units project and how. # This is a living document - if you see something out of date or missing, speak up! # # It is structured to be consumable by both humans and programs. @@ -11,7 +11,10 @@ [Org] [Org."Core maintainers"] people = [ - "calavera", + "akihirosuda", + "dnephin", + "thajeztah", + "vdemeester", ] [people] @@ -21,7 +24,23 @@ # in the people section. # ADD YOURSELF HERE IN ALPHABETICAL ORDER - [people.calavera] - Name = "David Calavera" - Email = "david.calavera@gmail.com" - GitHub = "calavera" + + [people.akihirosuda] + Name = "Akihiro Suda" + Email = "akihiro.suda.cz@hco.ntt.co.jp" + GitHub = "AkihiroSuda" + + [people.dnephin] + Name = "Daniel Nephin" + Email = "dnephin@gmail.com" + GitHub = "dnephin" + + [people.thajeztah] + Name = "Sebastiaan van Stijn" + Email = "github@gone.nl" + GitHub = "thaJeztah" + + [people.vdemeester] + Name = "Vincent Demeester" + Email = "vincent@sbr.pm" + GitHub = "vdemeester" \ No newline at end of file diff --git a/agent/vendor/github.com/docker/go-units/circle.yml b/agent/vendor/github.com/docker/go-units/circle.yml index 9043b35478c..af9d6055293 100644 --- a/agent/vendor/github.com/docker/go-units/circle.yml +++ b/agent/vendor/github.com/docker/go-units/circle.yml @@ -1,7 +1,7 @@ dependencies: post: # install golint - - go get github.com/golang/lint/golint + - go get golang.org/x/lint/golint test: pre: diff --git a/agent/vendor/github.com/docker/go-units/duration.go b/agent/vendor/github.com/docker/go-units/duration.go index ba02af26dc5..48dd8744d43 100644 --- a/agent/vendor/github.com/docker/go-units/duration.go +++ b/agent/vendor/github.com/docker/go-units/duration.go @@ -18,7 +18,7 @@ func HumanDuration(d time.Duration) string { return fmt.Sprintf("%d seconds", seconds) } else if minutes := int(d.Minutes()); minutes == 1 { return "About a minute" - } else if minutes < 46 { + } else if minutes < 60 { return fmt.Sprintf("%d minutes", minutes) } else if hours := int(d.Hours() + 0.5); hours == 1 { return "About an hour" diff --git a/agent/vendor/github.com/docker/go-units/size.go b/agent/vendor/github.com/docker/go-units/size.go index 44616c27187..85f6ab07155 100644 --- a/agent/vendor/github.com/docker/go-units/size.go +++ b/agent/vendor/github.com/docker/go-units/size.go @@ -31,7 +31,7 @@ type unitMap map[string]int64 var ( decimalMap = unitMap{"k": KB, "m": MB, "g": GB, "t": TB, "p": PB} binaryMap = unitMap{"k": KiB, "m": MiB, "g": GiB, "t": TiB, "p": PiB} - sizeRegex = regexp.MustCompile(`^(\d+(\.\d+)*) ?([kKmMgGtTpP])?[bB]?$`) + sizeRegex = regexp.MustCompile(`^(\d+(\.\d+)*) ?([kKmMgGtTpP])?[iI]?[bB]?$`) ) var decimapAbbrs = []string{"B", "kB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"} diff --git a/agent/vendor/github.com/docker/go-units/ulimit.go b/agent/vendor/github.com/docker/go-units/ulimit.go index 5ac7fd825fc..fca0400cc82 100644 --- a/agent/vendor/github.com/docker/go-units/ulimit.go +++ b/agent/vendor/github.com/docker/go-units/ulimit.go @@ -96,8 +96,13 @@ func ParseUlimit(val string) (*Ulimit, error) { return nil, fmt.Errorf("too many limit value arguments - %s, can only have up to two, `soft[:hard]`", parts[1]) } - if soft > *hard { - return nil, fmt.Errorf("ulimit soft limit must be less than or equal to hard limit: %d > %d", soft, *hard) + if *hard != -1 { + if soft == -1 { + return nil, fmt.Errorf("ulimit soft limit must be less than or equal to hard limit: soft: -1 (unlimited), hard: %d", *hard) + } + if soft > *hard { + return nil, fmt.Errorf("ulimit soft limit must be less than or equal to hard limit: %d > %d", soft, *hard) + } } return &Ulimit{Name: parts[0], Soft: soft, Hard: *hard}, nil diff --git a/agent/vendor/modules.txt b/agent/vendor/modules.txt index 6f52dc8835c..d4af1551f9c 100644 --- a/agent/vendor/modules.txt +++ b/agent/vendor/modules.txt @@ -128,7 +128,7 @@ github.com/docker/docker/pkg/system github.com/docker/go-connections/nat github.com/docker/go-connections/sockets github.com/docker/go-connections/tlsconfig -# github.com/docker/go-units v0.3.2 +# github.com/docker/go-units v0.4.0 github.com/docker/go-units # github.com/godbus/dbus v4.1.0+incompatible => github.com/godbus/dbus v4.1.0+incompatible github.com/godbus/dbus