From 30e47e5a04467cb3def18c5ad34a4df7f9f395c7 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 3 Mar 2022 13:44:32 +0100 Subject: [PATCH] vendor: github.com/prometheus/common v0.10.0 full diff: https://github.com/prometheus/common/compare/v0.9.1...v0.10.0 Signed-off-by: Sebastiaan van Stijn --- vendor.mod | 1 - vendor.sum | 4 +++- vendor/github.com/prometheus/common/model/time.go | 4 ++++ vendor/modules.txt | 3 +-- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/vendor.mod b/vendor.mod index c45928feb0..1710c7a702 100644 --- a/vendor.mod +++ b/vendor.mod @@ -53,6 +53,5 @@ replace ( github.com/docker/docker => github.com/docker/docker v20.10.3-0.20210811141259-343665850e3a+incompatible // master (v21.xx-dev) github.com/gogo/googleapis => github.com/gogo/googleapis v1.3.2 github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.6.0 - github.com/prometheus/common => github.com/prometheus/common v0.9.1 github.com/prometheus/procfs => github.com/prometheus/procfs v0.0.11 ) diff --git a/vendor.sum b/vendor.sum index ea3d5c68b3..1b1a8613b2 100644 --- a/vendor.sum +++ b/vendor.sum @@ -603,8 +603,10 @@ github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1: github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/common v0.9.1 h1:KOMtN28tlbam3/7ZKEYKHhKoJZYYj3gMH4uc62x7X7U= +github.com/prometheus/common v0.0.0-20180110214958-89604d197083/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= +github.com/prometheus/common v0.10.0 h1:RyRA7RzGXQZiW+tGMr7sxa85G1z0yOpM1qq5c8lNawc= +github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/procfs v0.0.11 h1:DhHlBtkHWPYi8O2y31JkK0TF+DGM+51OopZjH/Ia5qI= github.com/prometheus/procfs v0.0.11/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= diff --git a/vendor/github.com/prometheus/common/model/time.go b/vendor/github.com/prometheus/common/model/time.go index 7b0064fdb2..490a0240c1 100644 --- a/vendor/github.com/prometheus/common/model/time.go +++ b/vendor/github.com/prometheus/common/model/time.go @@ -186,6 +186,10 @@ var durationRE = regexp.MustCompile("^([0-9]+)(y|w|d|h|m|s|ms)$") // ParseDuration parses a string into a time.Duration, assuming that a year // always has 365d, a week always has 7d, and a day always has 24h. func ParseDuration(durationStr string) (Duration, error) { + // Allow 0 without a unit. + if durationStr == "0" { + return 0, nil + } matches := durationRE.FindStringSubmatch(durationStr) if len(matches) != 3 { return 0, fmt.Errorf("not a valid duration string: %q", durationStr) diff --git a/vendor/modules.txt b/vendor/modules.txt index 11c1f474a5..58aee5e90a 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -184,7 +184,7 @@ github.com/prometheus/client_golang/prometheus/internal github.com/prometheus/client_golang/prometheus/promhttp # github.com/prometheus/client_model v0.2.0 github.com/prometheus/client_model/go -# github.com/prometheus/common v0.10.0 => github.com/prometheus/common v0.9.1 +# github.com/prometheus/common v0.10.0 github.com/prometheus/common/expfmt github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg github.com/prometheus/common/model @@ -364,5 +364,4 @@ gotest.tools/v3/skip # github.com/docker/docker => github.com/docker/docker v20.10.3-0.20210811141259-343665850e3a+incompatible # github.com/gogo/googleapis => github.com/gogo/googleapis v1.3.2 # github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.6.0 -# github.com/prometheus/common => github.com/prometheus/common v0.9.1 # github.com/prometheus/procfs => github.com/prometheus/procfs v0.0.11