From ee12424795b520a2a4159a62bd7409e160525369 Mon Sep 17 00:00:00 2001 From: Ludovic Fernandez Date: Thu, 6 May 2021 09:32:04 +0200 Subject: [PATCH] Bump paerser to v0.1.4 --- go.mod | 2 +- go.sum | 22 ++++---- .../testdata/anonymized-dynamic-config.json | 12 ++--- .../testdata/anonymized-static-config.json | 54 +++++++++---------- pkg/api/testdata/entrypoints.json | 22 ++++---- 5 files changed, 57 insertions(+), 55 deletions(-) diff --git a/go.mod b/go.mod index 3d76db417..94dd21d39 100644 --- a/go.mod +++ b/go.mod @@ -71,7 +71,7 @@ require ( github.com/stvp/go-udp-testing v0.0.0-20191102171040-06b61409b154 github.com/tinylib/msgp v1.0.2 // indirect github.com/traefik/gziphandler v1.1.2-0.20210212101304-175e0fad6888 - github.com/traefik/paerser v0.1.2 + github.com/traefik/paerser v0.1.4 github.com/traefik/yaegi v0.9.17 github.com/uber/jaeger-client-go v2.25.0+incompatible github.com/uber/jaeger-lib v2.2.0+incompatible diff --git a/go.sum b/go.sum index ed9ed62ce..32f28bef2 100644 --- a/go.sum +++ b/go.sum @@ -74,16 +74,16 @@ github.com/DataDog/zstd v1.3.6-0.20190409195224-796139022798/go.mod h1:1jcaCB/uf github.com/ExpediaDotCom/haystack-client-go v0.0.0-20190315171017-e7edbdf53a61 h1:1NIUJ+MAMpqDr4LWIfNsoJR+G7zg/8GZVwuRkmJxtTc= github.com/ExpediaDotCom/haystack-client-go v0.0.0-20190315171017-e7edbdf53a61/go.mod h1:62qWSDaEI0BLykU+zQza5CAKgW0lOy9oBSz3/DvYz4w= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= -github.com/Masterminds/goutils v1.1.0 h1:zukEsf/1JZwCMgHiK3GZftabmxiCw4apj3a28RPBiVg= -github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= +github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI= +github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= github.com/Masterminds/semver v1.4.2 h1:WBLTQ37jOCzSLtXNdoo8bNM8876KhNqOKvrlGITgsTc= github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= -github.com/Masterminds/semver/v3 v3.1.0 h1:Y2lUDsFKVRSYGojLJ1yLxSXdMmMYTYls0rCvoqmMUQk= -github.com/Masterminds/semver/v3 v3.1.0/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= +github.com/Masterminds/semver/v3 v3.1.1 h1:hLg3sBzpNErnxhQtUy/mmLR2I9foDujNK030IGemrRc= +github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= github.com/Masterminds/sprig v2.22.0+incompatible h1:z4yfnGrZ7netVz+0EDJ0Wi+5VZCSYp4Z0m2dk6cEM60= github.com/Masterminds/sprig v2.22.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o= -github.com/Masterminds/sprig/v3 v3.1.0 h1:j7GpgZ7PdFqNsmncycTHsLmVPf5/3wJtlgW9TNDYD9Y= -github.com/Masterminds/sprig/v3 v3.1.0/go.mod h1:ONGMf7UfYGAbMXCZmQLy8x3lCDIPrEZE/rU8pmrbihA= +github.com/Masterminds/sprig/v3 v3.2.2 h1:17jRggJu518dr3QaafizSXOjKYp94wKfABxUmyxvxX8= +github.com/Masterminds/sprig/v3 v3.2.2/go.mod h1:UoaO7Yp8KlPnJIYWTFkMaqPUYKTfGFPhxNuwnnxkKlk= github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5 h1:ygIc8M6trr62pF5DucadTWGdEB4mEyvzi0e2nbcmcyA= github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw= github.com/Microsoft/hcsshim v0.8.7 h1:ptnOoufxGSzauVTsdE+wMYnCWA301PdoN4xg5oRdZpg= @@ -554,9 +554,9 @@ github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1: github.com/iij/doapi v0.0.0-20190504054126-0bbf12d6d7df h1:MZf03xP9WdakyXhOWuAD5uPK3wHh96wCsqe3hCMKh8E= github.com/iij/doapi v0.0.0-20190504054126-0bbf12d6d7df/go.mod h1:QMZY7/J/KSQEhKWFeDesPjMj+wCHReeknARU3wqlyN4= github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -github.com/imdario/mergo v0.3.10 h1:6q5mVkdH/vYmqngx7kZQTjJ5HRsx+ImorDIEQ+beJgc= github.com/imdario/mergo v0.3.10/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= +github.com/imdario/mergo v0.3.11 h1:3tnifQM4i+fbajXKBHXWEH+KvNHqojZ778UH75j3bGA= +github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d h1:/WZQPMZNsjZ7IlCpsLGdQBINg5bxKQ1K1sh6awxLtkA= github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= @@ -866,6 +866,8 @@ github.com/santhosh-tekuri/jsonschema v1.2.4/go.mod h1:TEAUOeZSmIxTTuHatJzrvARHi github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= +github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ= +github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= @@ -932,8 +934,8 @@ github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5 h1:LnC5Kc github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/traefik/gziphandler v1.1.2-0.20210212101304-175e0fad6888 h1:GMY0C+M/w8xO+/NP3Kq6sroMd+z2KbbdVr1K8o2NLHk= github.com/traefik/gziphandler v1.1.2-0.20210212101304-175e0fad6888/go.mod h1:sLqwoN03tkluITKL+lPEZbfsJQU2suYoKbrR/HeV9aM= -github.com/traefik/paerser v0.1.2 h1:0zvJgdwp2dNUodZHfgf+3IcaeJH2B28NcCGM+iZVtds= -github.com/traefik/paerser v0.1.2/go.mod h1:yYnAgdEC2wJH5CgG75qGWC8SsFDEapg09o9RrA6FfrE= +github.com/traefik/paerser v0.1.4 h1:/IXjV04Gf6di51H8Jl7jyS3OylsLjIasrwXIIwj1aT8= +github.com/traefik/paerser v0.1.4/go.mod h1:FIdQ4Y92ulQUGSeZgxchtBKEcLw1o551PMNg9PoIq/4= github.com/traefik/yaegi v0.9.17 h1:sJ4Wk6S7HHHXtJnOuxC/3qjdQKRy3q9ZhNP0ZGL7Ltw= github.com/traefik/yaegi v0.9.17/go.mod h1:FAYnRlZyuVlEkvnkHq3bvJ1lW5be6XuwgLdkYgYG6Lk= github.com/transip/gotransip/v6 v6.6.0 h1:dAHCTZzX98H6QE2kA4R9acAXu5RPPTwMSUFtpKZF3Nk= diff --git a/pkg/anonymize/testdata/anonymized-dynamic-config.json b/pkg/anonymize/testdata/anonymized-dynamic-config.json index ca116768b..5e5b03f69 100644 --- a/pkg/anonymize/testdata/anonymized-dynamic-config.json +++ b/pkg/anonymize/testdata/anonymized-dynamic-config.json @@ -190,7 +190,7 @@ }, "rateLimit": { "average": 42, - "period": 42, + "period": "42ns", "burst": 42, "sourceCriterion": { "ipStrategy": { @@ -306,7 +306,7 @@ }, "retry": { "attempts": 42, - "initialInterval": 42 + "initialInterval": "42ns" }, "contentType": { "autoDetect": true @@ -352,9 +352,9 @@ ], "maxIdleConnsPerHost": 42, "forwardingTimeouts": { - "dialTimeout": 42, - "responseHeaderTimeout": 42, - "idleConnTimeout": 42 + "dialTimeout": "42ns", + "responseHeaderTimeout": "42ns", + "idleConnTimeout": "42ns" } } } @@ -473,4 +473,4 @@ } } } -} +} \ No newline at end of file diff --git a/pkg/anonymize/testdata/anonymized-static-config.json b/pkg/anonymize/testdata/anonymized-static-config.json index a6ccb1727..ea511146a 100644 --- a/pkg/anonymize/testdata/anonymized-static-config.json +++ b/pkg/anonymize/testdata/anonymized-static-config.json @@ -12,9 +12,9 @@ ], "maxIdleConnsPerHost": 111, "forwardingTimeouts": { - "dialTimeout": 111000000000, - "responseHeaderTimeout": 111000000000, - "idleConnTimeout": 111000000000 + "dialTimeout": "1m51s", + "responseHeaderTimeout": "1m51s", + "idleConnTimeout": "1m51s" } }, "entryPoints": { @@ -22,13 +22,13 @@ "address": "xxxx", "transport": { "lifeCycle": { - "requestAcceptGraceTimeout": 111000000000, - "graceTimeOut": 111000000000 + "requestAcceptGraceTimeout": "1m51s", + "graceTimeOut": "1m51s" }, "respondingTimeouts": { - "readTimeout": 111000000000, - "writeTimeout": 111000000000, - "idleTimeout": 111000000000 + "readTimeout": "1m51s", + "writeTimeout": "1m51s", + "idleTimeout": "1m51s" } }, "proxyProtocol": { @@ -75,7 +75,7 @@ } }, "providers": { - "providersThrottleDuration": 111000000000, + "providersThrottleDuration": "1m51s", "docker": { "constraints": "Label(\"foo\", \"bar\")", "watch": true, @@ -92,8 +92,8 @@ "useBindPortIP": true, "swarmMode": true, "network": "MyNetwork", - "swarmModeRefreshSeconds": 42, - "httpClientTimeout": 42 + "swarmModeRefreshSeconds": "42ns", + "httpClientTimeout": "42ns" }, "file": { "directory": "file Directory", @@ -116,10 +116,10 @@ "key": "xxxx", "insecureSkipVerify": true }, - "dialerTimeout": 42, - "responseHeaderTimeout": 42, - "tlsHandshakeTimeout": 42, - "keepAlive": 42, + "dialerTimeout": "42ns", + "responseHeaderTimeout": "42ns", + "tlsHandshakeTimeout": "42ns", + "keepAlive": "42ns", "forceTaskHostname": true, "basic": { "httpBasicAuthUser": "xxxx", @@ -142,7 +142,7 @@ "hostname": "xxxx", "publishedService": "xxxx" }, - "throttleDuration": 111000000000 + "throttleDuration": "1m51s" }, "kubernetesCRD": { "endpoint": "xxxx", @@ -154,7 +154,7 @@ ], "labelSelector": "myLabelSelector", "ingressClass": "MyIngressClass", - "throttleDuration": 111000000000 + "throttleDuration": "1m51s" }, "kubernetesGateway": { "endpoint": "xxxx", @@ -165,7 +165,7 @@ "b" ], "labelSelector": "myLabelSelector", - "throttleDuration": 111000000000 + "throttleDuration": "1m51s" }, "rest": { "insecure": true @@ -198,10 +198,10 @@ "username": "xxxx", "password": "xxxx" }, - "endpointWaitTime": 42 + "endpointWaitTime": "42ns" }, "prefix": "MyPrefix", - "refreshInterval": 42, + "refreshInterval": "42ns", "requireConsistent": true, "stale": true, "cache": true, @@ -272,8 +272,8 @@ }, "http": { "endpoint": "xxxx", - "pollInterval": 42, - "pollTimeout": 42, + "pollInterval": "42ns", + "pollTimeout": "42ns", "tls": { "ca": "xxxx", "caOptional": true, @@ -303,13 +303,13 @@ }, "datadog": { "address": "xxxx", - "pushInterval": 42, + "pushInterval": "42ns", "addEntryPointsLabels": true, "addServicesLabels": true }, "statsD": { "address": "xxxx", - "pushInterval": 42, + "pushInterval": "42ns", "addEntryPointsLabels": true, "addServicesLabels": true, "prefix": "MyPrefix" @@ -317,7 +317,7 @@ "influxDB": { "address": "xxxx", "protocol": "xxxx", - "pushInterval": 42, + "pushInterval": "42ns", "database": "myDB", "retentionPolicy": "12", "username": "xxxx", @@ -345,7 +345,7 @@ "500" ], "retryAttempts": true, - "minDuration": 42 + "minDuration": "42ns" }, "fields": { "defaultMode": "drop", @@ -428,7 +428,7 @@ "keyType": "MyKeyType", "dnsChallenge": { "provider": "DNSProvider", - "delayBeforeCheck": 42, + "delayBeforeCheck": "42ns", "resolvers": [ "xxxx", "xxxx" diff --git a/pkg/api/testdata/entrypoints.json b/pkg/api/testdata/entrypoints.json index 15c46b787..d93d07bfc 100644 --- a/pkg/api/testdata/entrypoints.json +++ b/pkg/api/testdata/entrypoints.json @@ -19,13 +19,13 @@ }, "transport": { "lifeCycle": { - "graceTimeOut": 2, - "requestAcceptGraceTimeout": 1 + "graceTimeOut": "2ns", + "requestAcceptGraceTimeout": "1ns" }, "respondingTimeouts": { - "idleTimeout": 5, - "readTimeout": 3, - "writeTimeout": 4 + "idleTimeout": "5ns", + "readTimeout": "3ns", + "writeTimeout": "4ns" } } }, @@ -49,14 +49,14 @@ }, "transport": { "lifeCycle": { - "graceTimeOut": 20, - "requestAcceptGraceTimeout": 10 + "graceTimeOut": "20ns", + "requestAcceptGraceTimeout": "10ns" }, "respondingTimeouts": { - "idleTimeout": 50, - "readTimeout": 30, - "writeTimeout": 40 + "idleTimeout": "50ns", + "readTimeout": "30ns", + "writeTimeout": "40ns" } } } -] \ No newline at end of file +]