From 4c5e7a238dab6eea8b25e068e1cb520ede236290 Mon Sep 17 00:00:00 2001 From: Fernandez Ludovic Date: Sat, 3 Aug 2019 03:58:23 +0200 Subject: [PATCH] chore: go module --- cmd/configuration.go | 4 +- cmd/healthcheck/healthcheck.go | 4 +- cmd/traefik/traefik.go | 32 +- cmd/version/version.go | 4 +- go.mod | 130 ++++ go.sum | 674 ++++++++++++++++++ integration/access_log_test.go | 6 +- integration/acme_test.go | 10 +- integration/docker_compose_test.go | 6 +- integration/docker_test.go | 2 +- integration/error_pages_test.go | 2 +- integration/fake_dns_server.go | 2 +- integration/file_test.go | 2 +- integration/grpc_test.go | 6 +- integration/headers_test.go | 2 +- integration/healthcheck_test.go | 2 +- integration/hostresolver_test.go | 2 +- integration/https_test.go | 6 +- integration/integration_test.go | 2 +- integration/k8s_test.go | 4 +- integration/keepalive_test.go | 2 +- integration/log_rotation_test.go | 2 +- integration/marathon15_test.go | 2 +- integration/marathon_test.go | 2 +- integration/proxy_protocol_test.go | 2 +- integration/ratelimit_test.go | 2 +- integration/rest_test.go | 4 +- integration/retry_test.go | 2 +- integration/simple_test.go | 4 +- integration/tcp_test.go | 2 +- integration/timeout_test.go | 2 +- integration/tls_client_headers_test.go | 2 +- integration/tracing_test.go | 2 +- integration/try/try.go | 2 +- integration/websocket_test.go | 2 +- internal/gendoc.go | 12 +- pkg/anonymize/anonymize.go | 4 +- pkg/anonymize/anonymize_config_test.go | 30 +- pkg/api/dashboard.go | 4 +- pkg/api/debug.go | 2 +- pkg/api/handler.go | 10 +- pkg/api/handler_entrypoint.go | 6 +- pkg/api/handler_entrypoint_test.go | 6 +- pkg/api/handler_http.go | 6 +- pkg/api/handler_http_test.go | 8 +- pkg/api/handler_overview.go | 6 +- pkg/api/handler_overview_test.go | 26 +- pkg/api/handler_tcp.go | 6 +- pkg/api/handler_tcp_test.go | 8 +- pkg/api/handler_test.go | 8 +- pkg/cli/help.go | 6 +- pkg/cli/loader_env.go | 4 +- pkg/cli/loader_file.go | 6 +- pkg/cli/loader_flag.go | 4 +- pkg/collector/collector.go | 8 +- pkg/config/dynamic/config.go | 2 +- pkg/config/dynamic/http_config.go | 2 +- pkg/config/dynamic/middlewares.go | 4 +- pkg/config/dynamic/tcp_config.go | 2 +- pkg/config/dynamic/zz_generated.deepcopy.go | 4 +- pkg/config/env/env.go | 2 +- pkg/config/env/env_test.go | 4 +- pkg/config/env/filter.go | 2 +- pkg/config/file/file.go | 2 +- pkg/config/file/file_node.go | 2 +- pkg/config/file/file_node_test.go | 2 +- pkg/config/file/raw_node.go | 2 +- pkg/config/file/raw_node_test.go | 2 +- pkg/config/flag/flag.go | 2 +- pkg/config/flag/flag_test.go | 6 +- pkg/config/flag/flagparser.go | 2 +- pkg/config/flag/flagtype.go | 2 +- pkg/config/flag/flagtype_test.go | 2 +- pkg/config/generator/generator.go | 2 +- pkg/config/generator/generator_test.go | 2 +- pkg/config/label/label.go | 4 +- pkg/config/label/label_test.go | 2 +- pkg/config/parser/element_fill.go | 2 +- pkg/config/parser/element_fill_test.go | 2 +- pkg/config/parser/flat_encode.go | 2 +- pkg/config/parser/flat_encode_test.go | 2 +- pkg/config/runtime/runtime.go | 4 +- pkg/config/runtime/runtime_test.go | 4 +- pkg/config/static/static_config.go | 36 +- pkg/healthcheck/healthcheck.go | 6 +- pkg/healthcheck/healthcheck_test.go | 4 +- pkg/hostresolver/hostresolver.go | 2 +- pkg/job/job.go | 2 +- pkg/job/job_test.go | 2 +- pkg/metrics/datadog.go | 6 +- pkg/metrics/datadog_test.go | 2 +- pkg/metrics/influxdb.go | 6 +- pkg/metrics/influxdb_test.go | 2 +- pkg/metrics/prometheus.go | 10 +- pkg/metrics/prometheus_test.go | 6 +- pkg/metrics/statsd.go | 6 +- pkg/metrics/statsd_test.go | 2 +- .../accesslog/capture_response_writer.go | 2 +- pkg/middlewares/accesslog/logger.go | 4 +- pkg/middlewares/accesslog/logger_test.go | 2 +- pkg/middlewares/addprefix/add_prefix.go | 6 +- pkg/middlewares/addprefix/add_prefix_test.go | 4 +- pkg/middlewares/auth/basic_auth.go | 8 +- pkg/middlewares/auth/basic_auth_test.go | 4 +- pkg/middlewares/auth/digest_auth.go | 8 +- pkg/middlewares/auth/digest_auth_test.go | 4 +- pkg/middlewares/auth/forward.go | 6 +- pkg/middlewares/auth/forward_test.go | 4 +- pkg/middlewares/buffering/buffering.go | 6 +- pkg/middlewares/chain/chain.go | 4 +- .../circuitbreaker/circuit_breaker.go | 8 +- pkg/middlewares/compress/compress.go | 4 +- pkg/middlewares/compress/compress_test.go | 2 +- pkg/middlewares/customerrors/custom_errors.go | 8 +- .../customerrors/custom_errors_test.go | 6 +- .../empty_backend_handler.go | 2 +- .../empty_backend_handler_test.go | 2 +- .../forwardedheaders/forwarded_header.go | 2 +- pkg/middlewares/handler_switcher.go | 2 +- pkg/middlewares/headers/headers.go | 6 +- pkg/middlewares/headers/headers_test.go | 6 +- pkg/middlewares/ipwhitelist/ip_whitelist.go | 8 +- .../ipwhitelist/ip_whitelist_test.go | 2 +- .../maxconnection/max_connection.go | 6 +- pkg/middlewares/metrics/metrics.go | 8 +- pkg/middlewares/middleware.go | 2 +- .../passtlsclientcert/pass_tls_client_cert.go | 8 +- .../pass_tls_client_cert_test.go | 4 +- pkg/middlewares/pipelining/pipelining.go | 2 +- pkg/middlewares/ratelimiter/rate_limiter.go | 6 +- pkg/middlewares/recovery/recovery.go | 2 +- pkg/middlewares/redirect/redirect.go | 2 +- pkg/middlewares/redirect/redirect_regex.go | 4 +- .../redirect/redirect_regex_test.go | 4 +- pkg/middlewares/redirect/redirect_scheme.go | 4 +- .../redirect/redirect_scheme_test.go | 2 +- pkg/middlewares/replacepath/replace_path.go | 6 +- .../replacepath/replace_path_test.go | 4 +- .../replacepathregex/replace_path_regex.go | 8 +- .../replace_path_regex_test.go | 6 +- .../requestdecorator/hostresolver.go | 2 +- .../requestdecorator/request_decorator.go | 2 +- .../request_decorator_test.go | 4 +- pkg/middlewares/retry/retry.go | 6 +- pkg/middlewares/retry/retry_test.go | 6 +- pkg/middlewares/stripprefix/strip_prefix.go | 6 +- .../stripprefix/strip_prefix_test.go | 4 +- .../stripprefixregex/strip_prefix_regex.go | 10 +- .../strip_prefix_regex_test.go | 6 +- pkg/middlewares/tracing/entrypoint.go | 4 +- pkg/middlewares/tracing/entrypoint_test.go | 2 +- pkg/middlewares/tracing/forwarder.go | 4 +- pkg/middlewares/tracing/forwarder_test.go | 2 +- pkg/middlewares/tracing/wrapper.go | 4 +- pkg/ping/ping.go | 2 +- pkg/provider/acme/account.go | 6 +- pkg/provider/acme/challenge_http.go | 12 +- pkg/provider/acme/challenge_tls.go | 8 +- pkg/provider/acme/local_store.go | 4 +- pkg/provider/acme/provider.go | 26 +- pkg/provider/acme/provider_test.go | 6 +- pkg/provider/aggregator/aggregator.go | 12 +- pkg/provider/configuration.go | 4 +- pkg/provider/docker/config.go | 10 +- pkg/provider/docker/config_test.go | 2 +- pkg/provider/docker/docker.go | 16 +- pkg/provider/docker/label.go | 2 +- pkg/provider/file/file.go | 10 +- pkg/provider/file/file_test.go | 4 +- pkg/provider/kubernetes/crd/client.go | 8 +- .../kubernetes/crd/client_mock_test.go | 4 +- .../clientset/versioned/clientset.go | 2 +- .../versioned/fake/clientset_generated.go | 6 +- .../clientset/versioned/fake/register.go | 2 +- .../clientset/versioned/scheme/register.go | 2 +- .../v1alpha1/fake/fake_ingressroute.go | 2 +- .../v1alpha1/fake/fake_ingressroutetcp.go | 2 +- .../traefik/v1alpha1/fake/fake_middleware.go | 2 +- .../traefik/v1alpha1/fake/fake_tlsoption.go | 2 +- .../v1alpha1/fake/fake_traefik_client.go | 2 +- .../typed/traefik/v1alpha1/ingressroute.go | 4 +- .../typed/traefik/v1alpha1/ingressroutetcp.go | 4 +- .../typed/traefik/v1alpha1/middleware.go | 4 +- .../typed/traefik/v1alpha1/tlsoption.go | 4 +- .../typed/traefik/v1alpha1/traefik_client.go | 4 +- .../informers/externalversions/factory.go | 6 +- .../informers/externalversions/generic.go | 2 +- .../internalinterfaces/factory_interfaces.go | 2 +- .../externalversions/traefik/interface.go | 4 +- .../traefik/v1alpha1/ingressroute.go | 8 +- .../traefik/v1alpha1/ingressroutetcp.go | 8 +- .../traefik/v1alpha1/interface.go | 2 +- .../traefik/v1alpha1/middleware.go | 8 +- .../traefik/v1alpha1/tlsoption.go | 8 +- .../listers/traefik/v1alpha1/ingressroute.go | 2 +- .../traefik/v1alpha1/ingressroutetcp.go | 2 +- .../listers/traefik/v1alpha1/middleware.go | 2 +- .../listers/traefik/v1alpha1/tlsoption.go | 2 +- pkg/provider/kubernetes/crd/kubernetes.go | 14 +- .../kubernetes/crd/kubernetes_test.go | 6 +- .../crd/traefik/v1alpha1/middleware.go | 2 +- pkg/provider/kubernetes/ingress/client.go | 2 +- .../kubernetes/ingress/client_mock_test.go | 2 +- pkg/provider/kubernetes/ingress/kubernetes.go | 12 +- .../kubernetes/ingress/kubernetes_test.go | 6 +- pkg/provider/kubernetes/k8s/parser.go | 2 +- pkg/provider/marathon/config.go | 10 +- pkg/provider/marathon/config_test.go | 2 +- pkg/provider/marathon/fake_client_test.go | 2 +- pkg/provider/marathon/label.go | 2 +- pkg/provider/marathon/marathon.go | 14 +- pkg/provider/marathon/readiness.go | 2 +- pkg/provider/provider.go | 4 +- pkg/provider/rancher/config.go | 10 +- pkg/provider/rancher/config_test.go | 2 +- pkg/provider/rancher/label.go | 2 +- pkg/provider/rancher/rancher.go | 12 +- pkg/provider/rest/rest.go | 10 +- pkg/responsemodifiers/headers.go | 4 +- pkg/responsemodifiers/log.go | 2 +- pkg/responsemodifiers/response_modifier.go | 2 +- .../response_modifier_test.go | 6 +- pkg/rules/rules.go | 6 +- pkg/rules/rules_test.go | 6 +- pkg/safe/routine.go | 4 +- pkg/safe/routine_test.go | 2 +- pkg/server/aggregator.go | 8 +- pkg/server/aggregator_test.go | 4 +- pkg/server/cookie/cookie.go | 2 +- pkg/server/internal/provider.go | 2 +- pkg/server/middleware/middlewares.go | 40 +- pkg/server/middleware/middlewares_test.go | 6 +- pkg/server/roundtripper.go | 6 +- .../router/route_appender_aggregator.go | 14 +- .../router/route_appender_aggregator_test.go | 6 +- pkg/server/router/route_appender_factory.go | 10 +- pkg/server/router/router.go | 20 +- pkg/server/router/router_test.go | 18 +- pkg/server/router/tcp/router.go | 14 +- pkg/server/router/tcp/router_test.go | 8 +- pkg/server/server.go | 28 +- pkg/server/server_configuration.go | 32 +- pkg/server/server_configuration_test.go | 8 +- pkg/server/server_entrypoint_tcp.go | 14 +- pkg/server/server_entrypoint_tcp_test.go | 6 +- pkg/server/server_signals.go | 2 +- pkg/server/server_test.go | 10 +- pkg/server/service/proxy.go | 6 +- pkg/server/service/proxy_test.go | 2 +- pkg/server/service/service.go | 22 +- pkg/server/service/service_test.go | 8 +- pkg/server/service/tcp/service.go | 8 +- pkg/server/service/tcp/service_test.go | 6 +- pkg/tcp/proxy.go | 2 +- pkg/tcp/router.go | 2 +- pkg/tcp/rr_load_balancer.go | 2 +- pkg/tcp/switcher.go | 2 +- pkg/testhelpers/config.go | 2 +- pkg/tls/certificate.go | 4 +- pkg/tls/certificate_store.go | 4 +- pkg/tls/certificate_store_test.go | 2 +- pkg/tls/tlsmanager.go | 8 +- pkg/tracing/datadog/datadog.go | 2 +- pkg/tracing/haystack/haystack.go | 2 +- pkg/tracing/haystack/logger.go | 2 +- pkg/tracing/instana/instana.go | 2 +- pkg/tracing/jaeger/jaeger.go | 2 +- pkg/tracing/jaeger/logger.go | 2 +- pkg/tracing/operation_name.go | 2 +- pkg/tracing/tracing.go | 2 +- pkg/tracing/zipkin/zipkin.go | 2 +- pkg/types/route_appender.go | 2 +- pkg/types/tls.go | 2 +- pkg/version/version.go | 6 +- script/update-generated-crd-code.sh | 6 + tools.go | 7 + 276 files changed, 1555 insertions(+), 738 deletions(-) create mode 100644 go.mod create mode 100644 go.sum create mode 100644 tools.go diff --git a/cmd/configuration.go b/cmd/configuration.go index 795026e7a..31e730e12 100644 --- a/cmd/configuration.go +++ b/cmd/configuration.go @@ -3,8 +3,8 @@ package cmd import ( "time" - "github.com/containous/traefik/pkg/config/static" - "github.com/containous/traefik/pkg/types" + "github.com/containous/traefik/v2/pkg/config/static" + "github.com/containous/traefik/v2/pkg/types" ) // TraefikCmdConfiguration wraps the static configuration and extra parameters. diff --git a/cmd/healthcheck/healthcheck.go b/cmd/healthcheck/healthcheck.go index 36dcc9c5e..829e473aa 100644 --- a/cmd/healthcheck/healthcheck.go +++ b/cmd/healthcheck/healthcheck.go @@ -7,8 +7,8 @@ import ( "os" "time" - "github.com/containous/traefik/pkg/cli" - "github.com/containous/traefik/pkg/config/static" + "github.com/containous/traefik/v2/pkg/cli" + "github.com/containous/traefik/v2/pkg/config/static" ) // NewCmd builds a new HealthCheck command. diff --git a/cmd/traefik/traefik.go b/cmd/traefik/traefik.go index f41b74ffd..6bb59b448 100644 --- a/cmd/traefik/traefik.go +++ b/cmd/traefik/traefik.go @@ -11,22 +11,22 @@ import ( "strings" "time" - "github.com/containous/traefik/autogen/genstatic" - "github.com/containous/traefik/cmd" - "github.com/containous/traefik/cmd/healthcheck" - cmdVersion "github.com/containous/traefik/cmd/version" - "github.com/containous/traefik/pkg/cli" - "github.com/containous/traefik/pkg/collector" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/config/static" - "github.com/containous/traefik/pkg/log" - "github.com/containous/traefik/pkg/provider/acme" - "github.com/containous/traefik/pkg/provider/aggregator" - "github.com/containous/traefik/pkg/safe" - "github.com/containous/traefik/pkg/server" - "github.com/containous/traefik/pkg/server/router" - traefiktls "github.com/containous/traefik/pkg/tls" - "github.com/containous/traefik/pkg/version" + "github.com/containous/traefik/v2/autogen/genstatic" + "github.com/containous/traefik/v2/cmd" + "github.com/containous/traefik/v2/cmd/healthcheck" + cmdVersion "github.com/containous/traefik/v2/cmd/version" + "github.com/containous/traefik/v2/pkg/cli" + "github.com/containous/traefik/v2/pkg/collector" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/config/static" + "github.com/containous/traefik/v2/pkg/log" + "github.com/containous/traefik/v2/pkg/provider/acme" + "github.com/containous/traefik/v2/pkg/provider/aggregator" + "github.com/containous/traefik/v2/pkg/safe" + "github.com/containous/traefik/v2/pkg/server" + "github.com/containous/traefik/v2/pkg/server/router" + traefiktls "github.com/containous/traefik/v2/pkg/tls" + "github.com/containous/traefik/v2/pkg/version" "github.com/coreos/go-systemd/daemon" assetfs "github.com/elazarl/go-bindata-assetfs" "github.com/sirupsen/logrus" diff --git a/cmd/version/version.go b/cmd/version/version.go index cf1f9bcf7..756306ad7 100644 --- a/cmd/version/version.go +++ b/cmd/version/version.go @@ -7,8 +7,8 @@ import ( "runtime" "text/template" - "github.com/containous/traefik/pkg/cli" - "github.com/containous/traefik/pkg/version" + "github.com/containous/traefik/v2/pkg/cli" + "github.com/containous/traefik/v2/pkg/version" ) var versionTemplate = `Version: {{.Version}} diff --git a/go.mod b/go.mod new file mode 100644 index 000000000..98b76cd58 --- /dev/null +++ b/go.mod @@ -0,0 +1,130 @@ +module github.com/containous/traefik/v2 + +go 1.12 + +require ( + github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect + github.com/BurntSushi/toml v0.3.1 + github.com/ExpediaDotCom/haystack-client-go v0.0.0-20190315171017-e7edbdf53a61 + github.com/Masterminds/goutils v1.1.0 // indirect + github.com/Masterminds/semver v1.4.2 // indirect + github.com/Masterminds/sprig v2.20.0+incompatible + github.com/Microsoft/go-winio v0.4.14 // indirect + github.com/Microsoft/hcsshim v0.8.6 // indirect + github.com/NYTimes/gziphandler v1.1.1 + github.com/Shopify/sarama v1.23.1 // indirect + github.com/VividCortex/gohistogram v1.0.0 // indirect + github.com/abbot/go-http-auth v0.0.0-00010101000000-000000000000 + github.com/abronan/valkeyrie v0.0.0-20190802193736-ed4c4a229894 + github.com/armon/go-proxyproto v0.0.0-20190211145416-68259f75880e + github.com/aws/aws-sdk-go v1.21.9 // indirect + github.com/cenkalti/backoff/v3 v3.0.0 + github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc // indirect + github.com/containous/alice v0.0.0-20181107144136-d83ebdd94cbd + github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f + github.com/davecgh/go-spew v1.1.1 + github.com/docker/cli v0.0.0-20190711175710-5b38d82aa076 // indirect + github.com/docker/distribution v2.7.1+incompatible // indirect + github.com/docker/docker v0.0.0-00010101000000-000000000000 + github.com/docker/docker-credential-helpers v0.6.3 // indirect + github.com/docker/go-connections v0.4.0 + github.com/docker/go-metrics v0.0.0-20181218153428-b84716841b82 // indirect + github.com/docker/go-units v0.4.0 // indirect + github.com/docker/libcompose v0.0.0-20190805081528-eac9fe1b8b03 // indirect + github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect + github.com/donovanhide/eventsource v0.0.0-20170630084216-b8f31a59085e // indirect + github.com/eapache/channels v1.1.0 + github.com/elazarl/go-bindata-assetfs v1.0.0 + github.com/evanphx/json-patch v4.5.0+incompatible // indirect + github.com/fatih/structs v1.1.0 + github.com/felixge/httpsnoop v1.0.0 // indirect + github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 // indirect + github.com/gambol99/go-marathon v0.0.0-20180614232016-99a156b96fb2 + github.com/go-acme/lego/v3 v3.0.0 + github.com/go-check/check v0.0.0-00010101000000-000000000000 + github.com/go-kit/kit v0.9.0 + github.com/golang/protobuf v1.3.2 + github.com/google/go-github/v27 v27.0.4 + github.com/googleapis/gnostic v0.1.0 // indirect + github.com/gorilla/mux v1.6.2 + github.com/gorilla/websocket v1.4.0 + github.com/hashicorp/go-version v1.2.0 + github.com/huandu/xstrings v1.2.0 // indirect + github.com/influxdata/influxdb1-client v0.0.0-20190402204710-8ff2fc3824fc + github.com/instana/go-sensor v1.4.17-0.20190515112224-78c14625025a + github.com/labbsr0x/goh v0.0.0-20190610190554-60aa50bcbca7 // indirect + github.com/libkermit/compose v0.0.0-20171122111507-c04e39c026ad + github.com/libkermit/docker v0.0.0-20171122101128-e6674d32b807 + github.com/libkermit/docker-check v0.0.0-20171122104347-1113af38e591 + github.com/looplab/fsm v0.1.0 // indirect + github.com/magiconair/properties v1.8.1 // indirect + github.com/miekg/dns v1.1.15 + github.com/mitchellh/copystructure v1.0.0 + github.com/mitchellh/hashstructure v1.0.0 + github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c // indirect + github.com/opencontainers/go-digest v1.0.0-rc1 // indirect + github.com/opencontainers/image-spec v1.0.1 // indirect + github.com/opencontainers/runc v1.0.0-rc8 // indirect + github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492 // indirect + github.com/opentracing/basictracer-go v1.0.0 // indirect + github.com/opentracing/opentracing-go v1.1.0 + github.com/openzipkin-contrib/zipkin-go-opentracing v0.3.5 + github.com/patrickmn/go-cache v2.1.0+incompatible + github.com/philhofer/fwd v1.0.0 // indirect + github.com/pmezard/go-difflib v1.0.0 + github.com/prometheus/client_golang v1.0.0 + github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 + github.com/prometheus/common v0.6.0 // indirect + github.com/prometheus/procfs v0.0.3 // indirect + github.com/rancher/go-rancher-metadata v0.0.0-00010101000000-000000000000 + github.com/sirupsen/logrus v1.4.2 + github.com/stretchr/testify v1.3.0 + github.com/stvp/go-udp-testing v0.0.0-20171104055251-c4434f09ec13 + github.com/tinylib/msgp v1.0.2 // indirect + github.com/transip/gotransip v5.8.2+incompatible // indirect + github.com/uber/jaeger-client-go v2.16.0+incompatible + github.com/uber/jaeger-lib v2.0.0+incompatible + github.com/unrolled/render v1.0.1 + github.com/unrolled/secure v1.0.1 + github.com/vdemeester/shakers v0.1.0 + github.com/vulcand/oxy v1.0.0 + github.com/vulcand/predicate v1.1.0 + golang.org/x/net v0.0.0-20190724013045-ca1201d0de80 + golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 // indirect + google.golang.org/grpc v1.22.1 + gopkg.in/DataDog/dd-trace-go.v1 v1.16.1 + gopkg.in/fsnotify.v1 v1.4.7 + gopkg.in/jcmturner/goidentity.v3 v3.0.0 // indirect + gopkg.in/ns1/ns1-go.v2 v2.0.0-20190730140822-b51389932cbc // indirect + gopkg.in/yaml.v2 v2.2.2 + gotest.tools v2.2.0+incompatible // indirect + k8s.io/api v0.0.0-20190718183219-b59d8169aab5 + k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719 + k8s.io/client-go v0.0.0-20190718183610-8e956561bbf5 + k8s.io/code-generator v0.0.0-20190612205613-18da4a14b22b + mvdan.cc/xurls/v2 v2.0.0 +) + +replace ( + github.com/Azure/go-autorest => github.com/Azure/go-autorest v12.4.1+incompatible + github.com/docker/docker => github.com/docker/engine v0.0.0-20190725163905-fa8dd90ceb7b +) + +// Containous forks +replace ( + github.com/abbot/go-http-auth => github.com/containous/go-http-auth v0.4.1-0.20180112153951-65b0cdae8d7f + github.com/go-check/check => github.com/containous/check v0.0.0-20170915194414-ca0bf163426a + github.com/gorilla/mux => github.com/containous/mux v0.0.0-20181024131434-c33f32e26898 + github.com/mailgun/minheap => github.com/containous/minheap v0.0.0-20190809180810-6e71eb837595 + github.com/mailgun/multibuf => github.com/containous/multibuf v0.0.0-20190809014333-8b6c9a7e6bba + github.com/rancher/go-rancher-metadata => github.com/containous/go-rancher-metadata v0.0.0-20190402144056-c6a65f8b7a28 +) + +// related to invalid pseudo version used by some dependencies +// https://github.com/cloudflare/cloudflare-go/pull/334 +// https://github.com/cloudflare/cloudflare-go/pull/333 +// https://github.com/go-acme/lego/pull/945 +replace ( + golang.org/x/lint => golang.org/x/lint v0.0.0-20190409202823-959b441ac422 + golang.org/x/time => golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 +) diff --git a/go.sum b/go.sum new file mode 100644 index 000000000..bf13a7526 --- /dev/null +++ b/go.sum @@ -0,0 +1,674 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.38.0 h1:ROfEUZz+Gh5pa62DJWXSaonyu3StP6EA6lPEXPI6mCo= +cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= +contrib.go.opencensus.io/exporter/ocagent v0.4.12 h1:jGFvw3l57ViIVEPKKEUXPcLYIXJmQxLUh6ey1eJhwyc= +contrib.go.opencensus.io/exporter/ocagent v0.4.12/go.mod h1:450APlNTSR6FrvC3CTRqYosuDstRB9un7SOx2k/9ckA= +github.com/Azure/azure-sdk-for-go v32.0.0+incompatible h1:lkD8YqWFj4DVw65CHwtjOtTnlMD2LLy9z/f8I+BBsVM= +github.com/Azure/azure-sdk-for-go v32.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= +github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8= +github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= +github.com/Azure/go-autorest v12.4.1+incompatible h1:pst/kk4ljPhiBW1FDMi1BZBxJRPFrVBxHrJQVeXcv/E= +github.com/Azure/go-autorest v12.4.1+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= +github.com/Azure/go-autorest/autorest v0.1.0/go.mod h1:AKyIcETwSUFxIcs/Wnq/C+kwCtlEYGUVd7FPNb2slmg= +github.com/Azure/go-autorest/autorest v0.5.0 h1:Mlm9qy2fpQ9MvfyI41G2Zf5B4CsgjjNbLOWszfK6KrY= +github.com/Azure/go-autorest/autorest v0.5.0/go.mod h1:9HLKlQjVBH6U3oDfsXOeVc56THsLPw1L03yban4xThw= +github.com/Azure/go-autorest/autorest/adal v0.1.0/go.mod h1:MeS4XhScH55IST095THyTxElntu7WqB7pNbZo8Q5G3E= +github.com/Azure/go-autorest/autorest/adal v0.2.0 h1:7IBDu1jgh+ADHXnEYExkV9RE/ztOOlxdACkkPRthGKw= +github.com/Azure/go-autorest/autorest/adal v0.2.0/go.mod h1:MeS4XhScH55IST095THyTxElntu7WqB7pNbZo8Q5G3E= +github.com/Azure/go-autorest/autorest/azure/auth v0.1.0 h1:YgO/vSnJEc76NLw2ecIXvXa8bDWiqf1pOJzARAoZsYU= +github.com/Azure/go-autorest/autorest/azure/auth v0.1.0/go.mod h1:Gf7/i2FUpyb/sGBLIFxTBzrNzBo7aPXXE3ZVeDRwdpM= +github.com/Azure/go-autorest/autorest/azure/cli v0.1.0 h1:YTtBrcb6mhA+PoSW8WxFDoIIyjp13XqJeX80ssQtri4= +github.com/Azure/go-autorest/autorest/azure/cli v0.1.0/go.mod h1:Dk8CUAt/b/PzkfeRsWzVG9Yj3ps8mS8ECztu43rdU8U= +github.com/Azure/go-autorest/autorest/date v0.1.0 h1:YGrhWfrgtFs84+h0o46rJrlmsZtyZRg470CqAXTZaGM= +github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA= +github.com/Azure/go-autorest/autorest/mocks v0.1.0 h1:Kx+AUU2Te+A3JIyYn6Dfs+cFgx5XorQKuIXrZGoq/SI= +github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= +github.com/Azure/go-autorest/autorest/to v0.2.0 h1:nQOZzFCudTh+TvquAtCRjM01VEYx85e9qbwt5ncW4L8= +github.com/Azure/go-autorest/autorest/to v0.2.0/go.mod h1:GunWKJp1AEqgMaGLV+iocmRAJWqST1wQYhyyjXJ3SJc= +github.com/Azure/go-autorest/autorest/validation v0.1.0 h1:ISSNzGUh+ZSzizJWOWzs8bwpXIePbGLW4z/AmUFGH5A= +github.com/Azure/go-autorest/autorest/validation v0.1.0/go.mod h1:Ha3z/SqBeaalWQvokg3NZAlQTalVMtOIAs1aGK7G6u8= +github.com/Azure/go-autorest/logger v0.1.0 h1:ruG4BSDXONFRrZZJ2GUXDiUyVpayPmb1GnWeHDdaNKY= +github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc= +github.com/Azure/go-autorest/tracing v0.1.0 h1:TRBxC5Pj/fIuh4Qob0ZpkggbfT8RC0SubHbpV3p4/Vc= +github.com/Azure/go-autorest/tracing v0.1.0/go.mod h1:ROEEAFwXycQw7Sn3DXNtEedEvdeRAgDr0izn4z5Ij88= +github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +github.com/DataDog/zstd v1.3.6-0.20190409195224-796139022798 h1:2T/jmrHeTezcCM58lvEQXs0UpQJCo5SoGAcg+mbSTIg= +github.com/DataDog/zstd v1.3.6-0.20190409195224-796139022798/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= +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/Masterminds/goutils v1.1.0 h1:zukEsf/1JZwCMgHiK3GZftabmxiCw4apj3a28RPBiVg= +github.com/Masterminds/goutils v1.1.0/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/sprig v2.20.0+incompatible h1:dJTKKuUkYW3RMFdQFXPU/s6hg10RgctmTjRcbZ98Ap8= +github.com/Masterminds/sprig v2.20.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o= +github.com/Microsoft/go-winio v0.4.14 h1:+hMXMk01us9KgxGb7ftKQt2Xpf5hH/yky+TDA+qxleU= +github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= +github.com/Microsoft/hcsshim v0.8.6 h1:ZfF0+zZeYdzMIVMZHKtDKJvLHj76XCuVae/jNkjj0IA= +github.com/Microsoft/hcsshim v0.8.6/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg= +github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cqUQ3I= +github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c= +github.com/OpenDNS/vegadns2client v0.0.0-20180418235048-a3fa4a771d87 h1:xPMsUicZ3iosVPSIP7bW5EcGUzjiiMl1OYTe14y/R24= +github.com/OpenDNS/vegadns2client v0.0.0-20180418235048-a3fa4a771d87/go.mod h1:iGLljf5n9GjT6kc0HBvyI1nOKnGQbNB66VzSNbK5iks= +github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= +github.com/Shopify/sarama v1.23.1 h1:XxJBCZEoWJtoWjf/xRbmGUpAmTZGnuuF0ON0EvxxBrs= +github.com/Shopify/sarama v1.23.1/go.mod h1:XLH1GYJnLVE0XCr6KdJGVJRTwY30moWNJ4sERjXX6fs= +github.com/Shopify/toxiproxy v2.1.4+incompatible h1:TKdv8HiTLgE5wdJuEML90aBgNWsokNbMijUGhmcoBJc= +github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= +github.com/VividCortex/gohistogram v1.0.0 h1:6+hBz+qvs0JOrrNhhmR7lFxo5sINxBCGXrdtl/UvroE= +github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= +github.com/abronan/valkeyrie v0.0.0-20190802193736-ed4c4a229894 h1:6oe+/ZnkM+gEJL+28sgHiCvO6qt15NE2lm52BuzBees= +github.com/abronan/valkeyrie v0.0.0-20190802193736-ed4c4a229894/go.mod h1:sQZ/48uDt1GRBDNsLboJGPD2w/HxEOhqf3JiikfHj1I= +github.com/akamai/AkamaiOPEN-edgegrid-golang v0.8.0 h1:deI0mtQseP6qmCRJ+/Gk2RkklniIY3Rp2RTB38rPd1M= +github.com/akamai/AkamaiOPEN-edgegrid-golang v0.8.0/go.mod h1:zpDJeKyp9ScW4NNrbdr+Eyxvry3ilGPewKoXw3XGN1k= +github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190805122214-0f87a8a69ca7 h1:esXp8ysxOfiuqJYPGspq3G7JpZdv3b3gpxLraKOLT3Q= +github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190805122214-0f87a8a69ca7/go.mod h1:myCDvQSzCW+wB1WAlocEru4wMGJxy+vlxHdhegi1CDQ= +github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190307165228-86c17b95fcd5/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8= +github.com/apache/thrift v0.12.0 h1:pODnxUFNcjP9UTLZGTdeh+j16A8lJbRvD3rOtrk/7bs= +github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= +github.com/armon/go-proxyproto v0.0.0-20190211145416-68259f75880e h1:h0gP0hBU6DsA5IQduhLWGOEfIUKzJS5hhXQBSgHuF/g= +github.com/armon/go-proxyproto v0.0.0-20190211145416-68259f75880e/go.mod h1:QmP9hvJ91BbJmGVGSbutW19IC0Q9phDCLGaomwTJbgU= +github.com/aws/aws-sdk-go v1.16.23/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= +github.com/aws/aws-sdk-go v1.21.8/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= +github.com/aws/aws-sdk-go v1.21.9 h1:+HXP97l4IbJvccwwNoweEknroEcX8QLwExcnc+Kxobg= +github.com/aws/aws-sdk-go v1.21.9/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= +github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod h1:AuiFmCCPBSrqvVMvuqFuk0qogytodnVFVSN5CeJB8Gc= +github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= +github.com/beorn7/perks v1.0.0 h1:HWo1m869IqiPhD389kmkxeTalrjNbbJTC8LXupb+sl0= +github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= +github.com/cenkalti/backoff/v3 v3.0.0 h1:ske+9nBpD9qZsTBoF41nW5L+AIuFBKMeze18XQ3eG1c= +github.com/cenkalti/backoff/v3 v3.0.0/go.mod h1:cIeZDE3IrqwwJl6VUwCN6trj1oXrTS4rc0ij+ULvLYs= +github.com/census-instrumentation/opencensus-proto v0.2.0 h1:LzQXZOgg4CQfE6bFvXGM30YZL1WW/M337pXml+GrcZ4= +github.com/census-instrumentation/opencensus-proto v0.2.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cloudflare/cloudflare-go v0.9.4 h1:L3P7f+/Y9TYqZwjXBpVe/DRXcSmaujdaV2N07ZgDxR4= +github.com/cloudflare/cloudflare-go v0.9.4/go.mod h1:X6KWDVXllCSjZ6KOlwVGfGIiSosjc7/5DtR6sbcwMDw= +github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd h1:qMd81Ts1T2OTKmB4acZcyKaMtRnY5Y44NuXGX2GFJ1w= +github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= +github.com/codegangsta/negroni v1.0.0 h1:+aYywywx4bnKXWvoWtRfJ91vC59NbEhEY03sZjQhbVY= +github.com/codegangsta/negroni v1.0.0/go.mod h1:v0y3T5G7Y1UlFfyxFn/QLRU4a2EuNau2iZY63YTKWo0= +github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc h1:TP+534wVlf61smEIq1nwLLAjQVEK2EADoW3CX9AuT+8= +github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= +github.com/containous/alice v0.0.0-20181107144136-d83ebdd94cbd h1:0n+lFLh5zU0l6KSk3KpnDwfbPGAR44aRLgTbCnhRBHU= +github.com/containous/alice v0.0.0-20181107144136-d83ebdd94cbd/go.mod h1:BbQgeDS5i0tNvypwEoF1oNjOJw8knRAE1DnVvjDstcQ= +github.com/containous/check v0.0.0-20170915194414-ca0bf163426a h1:8esAQaPKjfntQR1bag/mAOvWJd5HqSX5nsa+0KT63zo= +github.com/containous/check v0.0.0-20170915194414-ca0bf163426a/go.mod h1:eQOqZ7GoFsLxI7jFKLs7+Nv2Rm1x4FyK8d2NV+yGjwQ= +github.com/containous/go-http-auth v0.4.1-0.20180112153951-65b0cdae8d7f h1:AgXgJSqQmsiNFW268OGe/y7Mn4jiCWaMUk05qser3Bo= +github.com/containous/go-http-auth v0.4.1-0.20180112153951-65b0cdae8d7f/go.mod h1:dCmRGidPSLagL8D/2u7yIO6Y/8D/yuYX9EdKrnrhpCA= +github.com/containous/go-rancher-metadata v0.0.0-20190402144056-c6a65f8b7a28 h1:YBo7nuGRif2QvUvqJuAEp8trX+5jnFj/8iAPJDe5U4k= +github.com/containous/go-rancher-metadata v0.0.0-20190402144056-c6a65f8b7a28/go.mod h1:YTAhdMF+tmHPGF7v0uZJ22+XNY/jz1ZYdBCeTZnsrYU= +github.com/containous/minheap v0.0.0-20190809180810-6e71eb837595 h1:aPspFRO6b94To3gl4yTDOEtpjFwXI7V2W+z0JcNljQ4= +github.com/containous/minheap v0.0.0-20190809180810-6e71eb837595/go.mod h1:+lHFbEasIiQVGzhVDVw/cn0ZaOzde2OwNncp1NhXV4c= +github.com/containous/multibuf v0.0.0-20190809014333-8b6c9a7e6bba h1:PhR03pep+5eO/9BSvCY9RyG8rjogB3uYS4X/WBYNTT8= +github.com/containous/multibuf v0.0.0-20190809014333-8b6c9a7e6bba/go.mod h1:zkWcASFUJEst6QwCrxLdkuw1gvaKqmflEipm+iecV5M= +github.com/containous/mux v0.0.0-20181024131434-c33f32e26898 h1:1srn9voikJGofblBhWy3WuZWqo14Ou7NaswNG/I2yWc= +github.com/containous/mux v0.0.0-20181024131434-c33f32e26898/go.mod h1:z8WW7n06n8/1xF9Jl9WmuDeZuHAhfL+bwarNjsciwwg= +github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f h1:JOrtw2xFKzlg+cbHpyrpLDmnN1HqhBfnX7WDiW7eG2c= +github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/cpu/goacmedns v0.0.1 h1:GeIU5chKys9zmHgOAgP+bstRaLqcGQ6HJh/hLw9hrus= +github.com/cpu/goacmedns v0.0.1/go.mod h1:sesf/pNnCYwUevQEQfEwY0Y3DydlQWSGZbaMElOWxok= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/decker502/dnspod-go v0.2.0 h1:6dwhUFCYbC5bgpebLKn7PrI43e/5mn9tpUL9YcYCdTU= +github.com/decker502/dnspod-go v0.2.0/go.mod h1:qsurYu1FgxcDwfSwXJdLt4kRsBLZeosEb9uq4Sy+08g= +github.com/dgrijalva/jwt-go v0.0.0-20160705203006-01aeca54ebda/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= +github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +github.com/dimchansky/utfbom v1.1.0 h1:FcM3g+nofKgUteL8dm/UpdRXNC9KmADgTpLKsu0TRo4= +github.com/dimchansky/utfbom v1.1.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQvIirEdv+8= +github.com/dnaeon/go-vcr v0.0.0-20180814043457-aafff18a5cc2 h1:G9/PqfhOrt8JXnw0DGTfVoOkKHDhOlEZqhE/cu+NvQM= +github.com/dnaeon/go-vcr v0.0.0-20180814043457-aafff18a5cc2/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E= +github.com/dnsimple/dnsimple-go v0.30.0 h1:IBIrn9jMKRMwporIRwdFyKdnHXVmwy6obnguB+ZMDIY= +github.com/dnsimple/dnsimple-go v0.30.0/go.mod h1:O5TJ0/U6r7AfT8niYNlmohpLbCSG+c71tQlGr9SeGrg= +github.com/docker/cli v0.0.0-20190711175710-5b38d82aa076 h1:bYvTMcZVIsw5l+uhPIPBI8VCVPKXgyQhP63+xXfM8bw= +github.com/docker/cli v0.0.0-20190711175710-5b38d82aa076/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/distribution v2.7.1+incompatible h1:a5mlkVzth6W5A4fOsS3D2EO5BUmsJpcB+cRlLU7cSug= +github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= +github.com/docker/docker-credential-helpers v0.6.3 h1:zI2p9+1NQYdnG6sMU26EX4aVGlqbInSQxQXLvzJ4RPQ= +github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y= +github.com/docker/engine v0.0.0-20190725163905-fa8dd90ceb7b h1:rN+GLmgWe6Yb5E8yfvGmgKfksvla7QyvqFCUKWTD8Qo= +github.com/docker/engine v0.0.0-20190725163905-fa8dd90ceb7b/go.mod h1:3CPr2caMgTHxxIAZgEMd3uLYPDlRvPqCpyeRf6ncPcY= +github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= +github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= +github.com/docker/go-metrics v0.0.0-20181218153428-b84716841b82 h1:X0fj836zx99zFu83v/M79DuBn84IL/Syx1SY6Y5ZEMA= +github.com/docker/go-metrics v0.0.0-20181218153428-b84716841b82/go.mod h1:/u0gXw0Gay3ceNrsHubL3BtdOL2fHf93USgMTe0W5dI= +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/docker/libcompose v0.0.0-20190805081528-eac9fe1b8b03 h1:kodxuqd2aTzaoldemGNQLrnYGpYLvm1kRdzngQa6hPc= +github.com/docker/libcompose v0.0.0-20190805081528-eac9fe1b8b03/go.mod h1:EyqDS+Iyca0hS44T7qIMTeO1EOYWWWNOGpufHu9R8cs= +github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 h1:UhxFibDNY/bfvqU5CAUmr9zpesgbU6SWc8/B4mflAE4= +github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7/go.mod h1:cyGadeNEkKy96OOhEzfZl+yxihPEzKnqJwvfuSUqbZE= +github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= +github.com/donovanhide/eventsource v0.0.0-20170630084216-b8f31a59085e h1:rMOGp6HPeMHbdLrZkX2nD+94uqDunc27tXVuS+ey4mQ= +github.com/donovanhide/eventsource v0.0.0-20170630084216-b8f31a59085e/go.mod h1:56wL82FO0bfMU5RvfXoIwSOP2ggqqxT+tAfNEIyxuHw= +github.com/eapache/channels v1.1.0 h1:F1taHcn7/F0i8DYqKXJnyhJcVpp2kgFcNePxXtnyu4k= +github.com/eapache/channels v1.1.0/go.mod h1:jMm2qB5Ubtg9zLd+inMZd2/NUvXgzmWXsDaLyQIGfH0= +github.com/eapache/go-resiliency v1.1.0 h1:1NtRmCAqadE2FN4ZcN6g90TP3uk8cg9rn9eNK2197aU= +github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= +github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 h1:YEetp8/yCZMuEPMUDHG0CW/brkkEp8mzqk2+ODEitlw= +github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= +github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc= +github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= +github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385 h1:clC1lXBpe2kTj2VHdaIu9ajZQe4kcEY9j0NsnDDBZ3o= +github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM= +github.com/elazarl/go-bindata-assetfs v1.0.0 h1:G/bYguwHIzWq9ZoyUQqrjTmJbbYn3j3CKKpKinvZLFk= +github.com/elazarl/go-bindata-assetfs v1.0.0/go.mod h1:v+YaWX3bdea5J/mo8dSETolEo7R71Vk1u8bnjau5yw4= +github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= +github.com/evanphx/json-patch v0.0.0-20190203023257-5858425f7550/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= +github.com/evanphx/json-patch v4.5.0+incompatible h1:ouOWdg56aJriqS0huScTkVXPC5IcNrDCXZ6OoTAWu7M= +github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= +github.com/exoscale/egoscale v0.18.1 h1:1FNZVk8jHUx0AvWhOZxLEDNlacTU0chMXUUNkm9EZaI= +github.com/exoscale/egoscale v0.18.1/go.mod h1:Z7OOdzzTOz1Q1PjQXumlz9Wn/CddH0zSYdCF3rnBKXE= +github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo= +github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= +github.com/felixge/httpsnoop v1.0.0 h1:gh8fMGz0rlOv/1WmRZm7OgncIOTsAj21iNJot48omJQ= +github.com/felixge/httpsnoop v1.0.0/go.mod h1:3+D9sFq0ahK/JeJPhCBUV1xlf4/eIYrUQaxulT0VzX8= +github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ= +github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= +github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/gambol99/go-marathon v0.0.0-20180614232016-99a156b96fb2 h1:df6OFl8WNXk82xxP3R9ZPZ5seOA8XZkwLdbEzZF1/xI= +github.com/gambol99/go-marathon v0.0.0-20180614232016-99a156b96fb2/go.mod h1:GLyXJD41gBO/NPKVPGQbhyyC06eugGy15QEZyUkE2/s= +github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/go-acme/lego/v3 v3.0.0 h1:vowaDZ8Z792A3EciTcR5dRGY49xlybfQPJRG7T6dEo0= +github.com/go-acme/lego/v3 v3.0.0/go.mod h1:zlnqyJK/ycdTPn8SMdgQnRf0sEenTpY7E/ijccUzIxk= +github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w= +github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= +github.com/go-ini/ini v1.44.0 h1:8+SRbfpRFlIunpSum4BEf1ClTtVjOgKzgBv9pHFkI6w= +github.com/go-ini/ini v1.44.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= +github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/kit v0.9.0 h1:wDJmvq38kDhkVxi50ni9ykkdUr1PKgqKOoi01fa0Mdk= +github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= +github.com/go-logfmt/logfmt v0.4.0 h1:MP4Eh7ZCb31lleYCFuwm0oe4/YGak+5l1vA2NOE80nA= +github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= +github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/gofrs/uuid v3.2.0+incompatible h1:y12jRkkFxsd7GpqdSZ+/KCs/fJbqpEXSGd4+jfEaewE= +github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= +github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.0 h1:xU6/SpYbvkNYiptHJYEDRseDLvYE7wSqhYYNy0QSUzI= +github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/goji/httpauth v0.0.0-20160601135302-2da839ab0f4d/go.mod h1:nnjvkQ9ptGaCkuDUx6wNykzzlUixGxvkme+H/lnzb+A= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903 h1:LbsanbbD6LieFkXbj9YNNBupiGHJgFeLpO0j0Fza1h8= +github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg= +github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= +github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/google/btree v0.0.0-20160524151835-7d79101e329e/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-github/v27 v27.0.4 h1:N/EEqsvJLgqTbepTiMBz+12KhwLovv6YvwpRezd+4Fg= +github.com/google/go-github/v27 v27.0.4/go.mod h1:/0Gr8pJ55COkmv+S/yPKCczSkUPIM/LnFyubufRNIS0= +github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk= +github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= +github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf h1:+RRA9JqSOZFfKrOeqr2z77+8R2RKyh8PG66dcu1V0ck= +github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= +github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= +github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY= +github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= +github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= +github.com/googleapis/gnostic v0.1.0 h1:rVsPeBmXbYv4If/cumu1AzZPwV58q433hvONV1UEZoI= +github.com/googleapis/gnostic v0.1.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= +github.com/gophercloud/gophercloud v0.0.0-20190126172459-c818fa66e4c8/go.mod h1:3WdhXV3rUYy9p6AUW8d94kr+HS62Y4VL9mBnFxsD8q4= +github.com/gophercloud/gophercloud v0.3.0 h1:6sjpKIpVwRIIwmcEGp+WwNovNsem+c+2vm6oxshRpL8= +github.com/gophercloud/gophercloud v0.3.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8= +github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= +github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q= +github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/gravitational/trace v0.0.0-20190726142706-a535a178675f h1:68WxnfBzJRYktZ30fmIjGQ74RsXYLoeH2/NITPktTMY= +github.com/gravitational/trace v0.0.0-20190726142706-a535a178675f/go.mod h1:RvdOUHE4SHqR3oXlFFKnGzms8a5dugHygGw1bqDstYI= +github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= +github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/grpc-ecosystem/grpc-gateway v1.9.5 h1:UImYN5qQ8tuGpGE16ZmjvcTtTw24zw1QAp/SlnNrZhI= +github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542 h1:2VTzZjLZBgl62/EtslCrtky5vbi9dd7HrQPQIx6wqiw= +github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542/go.mod h1:Ow0tF8D4Kplbc8s8sSb3V2oUCygFHVp8gC3Dn6U4MNI= +github.com/hashicorp/consul v1.4.0/go.mod h1:mFrjN1mfidgJfYP1xrJCF+AfRhr6Eaqhb2+sfyn/OOI= +github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= +github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= +github.com/hashicorp/go-uuid v1.0.1 h1:fv1ep09latC32wFoVwnqcnKJGnMSdBanPczbHAYm1BE= +github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-version v1.2.0 h1:3vNe/fWF5CBgRIguda1meWhsZHy3m8gCJ5wx+dIzX/E= +github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.3 h1:YPkqC67at8FYaadspW/6uE0COsBxS2656RLEr8Bppgk= +github.com/hashicorp/golang-lru v0.5.3/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= +github.com/hashicorp/serf v0.8.1/go.mod h1:h/Ru6tmZazX7WO/GDmwdpS975F019L4t5ng5IgwbNrE= +github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= +github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/huandu/xstrings v1.2.0 h1:yPeWdRnmynF7p+lLYz0H2tthW9lqhMJrQV/U7yy4wX0= +github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4= +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 h1:JboBksRwiiAJWvIYJVo46AfV+IAIKZpfrSzVKj42R4Q= +github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/influxdata/influxdb1-client v0.0.0-20190402204710-8ff2fc3824fc h1:KpMgaYJRieDkHZJWY3LMafvtqS/U8xX6+lUN+OKpl/Y= +github.com/influxdata/influxdb1-client v0.0.0-20190402204710-8ff2fc3824fc/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= +github.com/instana/go-sensor v1.4.17-0.20190515112224-78c14625025a h1:S3CSPEIeIuXsxtwurn9dx41RoHIAvVjEeiQV6enM7WA= +github.com/instana/go-sensor v1.4.17-0.20190515112224-78c14625025a/go.mod h1:P1ynE0u78bUBZ2GkWewRpAO1/w1oW9CKDozeueH6QSg= +github.com/jcmturner/gofork v0.0.0-20190328161633-dc7c13fece03 h1:FUwcHNlEqkqLjLBdCp5PRlCFijNjvcYANOZXzCfXwCM= +github.com/jcmturner/gofork v0.0.0-20190328161633-dc7c13fece03/go.mod h1:MK8+TM0La+2rjBD4jE12Kj1pCCxK7d2LK/UM3ncEo0o= +github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM= +github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= +github.com/jonboulle/clockwork v0.1.0 h1:VKV+ZcuP6l3yW9doeqz6ziZGgcynBVQO+obU0+0hcPo= +github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= +github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v1.1.6 h1:MrUvLMLTMxbqFJ9kzlvat/rYZqZnW3u4wkLzWTaFwKs= +github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= +github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= +github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= +github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/kolo/xmlrpc v0.0.0-20190717152603-07c4ee3fd181 h1:TrxPzApUukas24OMMVDUMlCs1XCExJtnGaDEiIAR4oQ= +github.com/kolo/xmlrpc v0.0.0-20190717152603-07c4ee3fd181/go.mod h1:o03bZfuBwAXHetKXuInt4S7omeXUu62/A845kiycsSQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s= +github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 h1:T+h1c/A9Gawja4Y9mFVWj2vyii2bbUNDw3kt9VxK2EY= +github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= +github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/labbsr0x/bindman-dns-webhook v1.0.0 h1:gooRvyQtVOCtV/l9ZCI4CManZeVN/kUWG/vugRqHqv4= +github.com/labbsr0x/bindman-dns-webhook v1.0.0/go.mod h1:pn4jcNjxSywRWDPDyGkFzgSnwty18OFdiUFc6S6fpgc= +github.com/labbsr0x/goh v0.0.0-20190417202808-8b16b4848295/go.mod h1:RBxeaayaaMmp7GxwHiKANjkg9e+rxjOm4mB5vD5rt/I= +github.com/labbsr0x/goh v0.0.0-20190610190554-60aa50bcbca7 h1:ocfbpesrzMqybD816LDEjourU4jiHj6gDGMieAcU8Io= +github.com/labbsr0x/goh v0.0.0-20190610190554-60aa50bcbca7/go.mod h1:RBxeaayaaMmp7GxwHiKANjkg9e+rxjOm4mB5vD5rt/I= +github.com/libkermit/compose v0.0.0-20171122111507-c04e39c026ad h1:nTyRWZ864mnHUnusBCVA628AZFgfGHwRUpbHqGhRQr8= +github.com/libkermit/compose v0.0.0-20171122111507-c04e39c026ad/go.mod h1:GyCk/ifDcqsU1tsRMMWqXANnTtxzcwEWscb7j5qmblM= +github.com/libkermit/docker v0.0.0-20171122101128-e6674d32b807 h1:/7J1WDQd6Xn1Pr8KtE2I/7/cKw66AV3hBUOyxqyXo84= +github.com/libkermit/docker v0.0.0-20171122101128-e6674d32b807/go.mod h1:std11u6pTaNwryy0Hy1dTQNdHKka1jNpflEieKtv5VE= +github.com/libkermit/docker-check v0.0.0-20171122104347-1113af38e591 h1:+zkZyvOyHZZUnITx0oJxAG/2+YLOjmy8YMMa1aWyrs4= +github.com/libkermit/docker-check v0.0.0-20171122104347-1113af38e591/go.mod h1:EBQ0jeOrBpOTkquwjmJl4W6z5xqlf5oA2LZfTqRNcO0= +github.com/linode/linodego v0.10.0 h1:AMdb82HVgY8o3mjBXJcUv9B+fnJjfDMn2rNRGbX+jvM= +github.com/linode/linodego v0.10.0/go.mod h1:cziNP7pbvE3mXIPneHj0oRY8L1WtGEIKlZ8LANE4eXA= +github.com/looplab/fsm v0.1.0 h1:Qte7Zdn/5hBNbXzP7yxVU4OIFHWXBovyTT2LaBTyC20= +github.com/looplab/fsm v0.1.0/go.mod h1:m2VaOfDHxqXBBMgc26m6yUOwkFn8H2AlJDE+jd/uafI= +github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4= +github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/mailgun/timetools v0.0.0-20141028012446-7e6055773c51 h1:Kg/NPZLLC3aAFr1YToMs98dbCdhootQ1hZIvZU28hAQ= +github.com/mailgun/timetools v0.0.0-20141028012446-7e6055773c51/go.mod h1:RYmqHbhWwIz3z9eVmQ2rx82rulEMG0t+Q1bzfc9DYN4= +github.com/mailgun/ttlmap v0.0.0-20170619185759-c1c17f74874f h1:ZZYhg16XocqSKPGNQAe0aeweNtFxuedbwwb4fSlg7h4= +github.com/mailgun/ttlmap v0.0.0-20170619185759-c1c17f74874f/go.mod h1:8heskWJ5c0v5J9WH89ADhyal1DOZcayll8fSbhB+/9A= +github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= +github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= +github.com/mattn/go-tty v0.0.0-20180219170247-931426f7535a/go.mod h1:XPvLUNfbS4fJH25nqRHfWLMa1ONC8Amw+mIA639KxkE= +github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= +github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/miekg/dns v1.1.15 h1:CSSIDtllwGLMoA6zjdKnaE6Tx6eVUxQ29LUgGetiDCI= +github.com/miekg/dns v1.1.15/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= +github.com/mitchellh/copystructure v1.0.0 h1:Laisrj+bAB6b/yJwB5Bt3ITZhGJdqmxquMKeZ+mmkFQ= +github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= +github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-vnc v0.0.0-20150629162542-723ed9867aed/go.mod h1:3rdaFaCv4AyBgu5ALFM0+tSuHrBh6v692nyQe3ikrq0= +github.com/mitchellh/hashstructure v1.0.0 h1:ZkRJX1CyOoTkar7p/mLS5TZU4nJ1Rn/F8u9dGS02Q3Y= +github.com/mitchellh/hashstructure v1.0.0/go.mod h1:QjSHrPWS+BGUVBYkbTZWEnOh3G1DutKwClXU/ABz6AQ= +github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE= +github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/reflectwalk v1.0.0 h1:9D+8oIskB4VJBN5SFlmc27fSlIBZaov1Wpk/IfikLNY= +github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI= +github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c h1:nXxl5PrvVm2L/wCy8dQu6DMTwH4oIuGN8GJDAlqDdVE= +github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= +github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= +github.com/namedotcom/go v0.0.0-20180403034216-08470befbe04 h1:o6uBwrhM5C8Ll3MAAxrQxRHEu7FkapwTuI2WmL1rw4g= +github.com/namedotcom/go v0.0.0-20180403034216-08470befbe04/go.mod h1:5sN+Lt1CaY4wsPvgQH/jsuJi4XO2ssZbdsIizr4CVC8= +github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32 h1:W6apQkHrMkS0Muv8G/TipAy/FJl/rCYT0+EuS8+Z0z4= +github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod h1:9wM+0iRr9ahx58uYLpLIr5fm8diHn0JbqRycJi6w0Ms= +github.com/nrdcg/auroradns v1.0.0 h1:b+NpSqNG6HzMqX2ohGQe4Q/G0WQq8pduWCiZ19vdLY8= +github.com/nrdcg/auroradns v1.0.0/go.mod h1:6JPXKzIRzZzMqtTDgueIhTi6rFf1QvYE/HzqidhOhjw= +github.com/nrdcg/goinwx v0.6.1 h1:AJnjoWPELyCtofhGcmzzcEMFd9YdF2JB/LgutWsWt/s= +github.com/nrdcg/goinwx v0.6.1/go.mod h1:XPiut7enlbEdntAqalBIqcYcTEVhpv/dKWgDCX2SwKQ= +github.com/nrdcg/namesilo v0.2.1 h1:kLjCjsufdW/IlC+iSfAqj0iQGgKjlbUUeDJio5Y6eMg= +github.com/nrdcg/namesilo v0.2.1/go.mod h1:lwMvfQTyYq+BbjJd30ylEG4GPSS6PII0Tia4rRpRiyw= +github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= +github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.8.0 h1:VkHVNpR4iVnU8XQR6DBm8BqYjN7CRzw+xKUbVVbbW9w= +github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/gomega v0.0.0-20190113212917-5533ce8a0da3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/onsi/gomega v1.5.0 h1:izbySO9zDPmjJ8rDjLvkA2zJHIo+HkYXHnf7eN7SSyo= +github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/opencontainers/go-digest v1.0.0-rc1 h1:WzifXhOVOEOuFYOJAW6aQqW0TooG2iki3E3Ii+WN7gQ= +github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= +github.com/opencontainers/image-spec v1.0.1 h1:JMemWkRwHx4Zj+fVxWoMCFm/8sYGGrUVojFA6h/TRcI= +github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= +github.com/opencontainers/runc v1.0.0-rc8 h1:dDCFes8Hj1r/i5qnypONo5jdOme/8HWZC/aNDyhECt0= +github.com/opencontainers/runc v1.0.0-rc8/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= +github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492 h1:lM6RxxfUMrYL/f8bWEUqdXrANWtrL7Nndbm9iFN0DlU= +github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis= +github.com/opentracing/basictracer-go v1.0.0 h1:YyUAhaEfjoWXclZVJ9sGoNct7j4TVk7lZWlQw5UXuoo= +github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74= +github.com/opentracing/opentracing-go v1.1.0 h1:pWlfV3Bxv7k65HYwkikxat0+s3pV4bsqf19k25Ur8rU= +github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= +github.com/openzipkin-contrib/zipkin-go-opentracing v0.3.5 h1:82Tnq9OJpn+h5xgGpss5/mOv3KXdjtkdorFSOUusjM8= +github.com/openzipkin-contrib/zipkin-go-opentracing v0.3.5/go.mod h1:uVHyebswE1cCXr2A73cRM2frx5ld1RJUCJkFNZ90ZiI= +github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= +github.com/oracle/oci-go-sdk v6.1.0+incompatible h1:sksvnP7m17+YuV9X11D39LNr7ZIraoRLba9NciVO0tw= +github.com/oracle/oci-go-sdk v6.1.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888= +github.com/ovh/go-ovh v0.0.0-20181109152953-ba5adb4cf014 h1:37VE5TYj2m/FLA9SNr4z0+A0JefvTmR60Zwf8XSEV7c= +github.com/ovh/go-ovh v0.0.0-20181109152953-ba5adb4cf014/go.mod h1:joRatxRJaZBsY3JAOEMcoOp05CnZzsx4scTxi95DHyQ= +github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= +github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= +github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= +github.com/philhofer/fwd v1.0.0 h1:UbZqGr5Y38ApvM/V/jEljVxwocdweyH+vmYvRPBnbqQ= +github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= +github.com/pierrec/lz4 v0.0.0-20190327172049-315a67e90e41/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= +github.com/pierrec/lz4 v2.0.5+incompatible h1:2xWsjqPFWcplujydGg4WmhC/6fZqK42wMM8aXeqhl0I= +github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= +github.com/prometheus/client_golang v1.0.0 h1:vrDKnkGzuGvhNAL56c7DBz29ZL+KxnoR0x7enabFceM= +github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= +github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 h1:S/YWwWx/RA8rT8tKFRuGUZhuA90OyIBpPCXkcbwU8DE= +github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.6.0 h1:kRhiuYSXR3+uv2IbVbZhUxK5zVD/2pp3Gd2PpvPkpEo= +github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc= +github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.0.3 h1:CTwfnzjQ+8dS6MhHHu4YswVAD99sL2wjPqP+VkURmKE= +github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= +github.com/rainycape/memcache v0.0.0-20150622160815-1031fa0ce2f2/go.mod h1:7tZKcyumwBO6qip7RNQ5r77yrssm9bfCowcLEBcU5IA= +github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a h1:9ZKAASQSHhDYGoxY8uLVpewe1GDZ2vu2Tr/vTdVAkFQ= +github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= +github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M= +github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= +github.com/sacloud/libsacloud v1.26.1 h1:td3Kd7lvpSAxxHEVpnaZ9goHmmhi0D/RfP0Rqqf/kek= +github.com/sacloud/libsacloud v1.26.1/go.mod h1:79ZwATmHLIFZIMd7sxA3LwzVy/B77uj3LDoToVTxDoQ= +github.com/samuel/go-zookeeper v0.0.0-20180130194729-c4fab1ac1bec/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= +github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= +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= +github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4= +github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= +github.com/skratchdot/open-golang v0.0.0-20160302144031-75fb7ed4208c/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= +github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a h1:pa8hGb/2YqsZKovtsgrwcDH1RZhVbTKCjLp47XpqCDs= +github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= +github.com/spf13/pflag v1.0.1 h1:aCvUg6QPl3ibpQUxyLkrEkCHtPqYJL4x9AuhqVqFis4= +github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stvp/go-udp-testing v0.0.0-20171104055251-c4434f09ec13 h1:WYRIgR83bWdH2zjqXalfLuQYtgBG1KKxDRxinx2ygMI= +github.com/stvp/go-udp-testing v0.0.0-20171104055251-c4434f09ec13/go.mod h1:7jxmlfBCDBXRzr0eAQJ48XC1hBu1np4CS5+cHEYfwpc= +github.com/timewasted/linode v0.0.0-20160829202747-37e84520dcf7 h1:CpHxIaZzVy26GqJn8ptRyto8fuoYOd1v0fXm9bG3wQ8= +github.com/timewasted/linode v0.0.0-20160829202747-37e84520dcf7/go.mod h1:imsgLplxEC/etjIhdr3dNzV3JeT27LbVu5pYWm0JCBY= +github.com/tinylib/msgp v1.0.2 h1:DfdQrzQa7Yh2es9SuLkixqxuXS2SxsdYn0KbdrOGWD8= +github.com/tinylib/msgp v1.0.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= +github.com/transip/gotransip v0.0.0-20190614113603-efb64632cab7/go.mod h1:i0f4R4o2HM0m3DZYQWsj6/MEowD57VzoH0v3d7igeFY= +github.com/transip/gotransip v5.8.2+incompatible h1:aNJhw/w/3QBqFcHAIPz1ytoK5FexeMzbUCGrrhWr3H0= +github.com/transip/gotransip v5.8.2+incompatible/go.mod h1:uacMoJVmrfOcscM4Bi5NVg708b7c6rz2oDTWqa7i2Ic= +github.com/uber-go/atomic v1.3.2 h1:Azu9lPBWRNKzYXSIwRfgRuDuS0YKsK4NFhiQv98gkxo= +github.com/uber-go/atomic v1.3.2/go.mod h1:/Ct5t2lcmbJ4OSe/waGBoaVvVqtO0bmtfVNex1PFV8g= +github.com/uber/jaeger-client-go v2.16.0+incompatible h1:Q2Pp6v3QYiocMxomCaJuwQGFt7E53bPYqEgug/AoBtY= +github.com/uber/jaeger-client-go v2.16.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= +github.com/uber/jaeger-lib v2.0.0+incompatible h1:iMSCV0rmXEogjNWPh2D0xk9YVKvrtGoHJNe9ebLu/pw= +github.com/uber/jaeger-lib v2.0.0+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U= +github.com/ugorji/go v0.0.0-20171019201919-bdcc60b419d1/go.mod h1:hnLbHMwcvSihnDhEfx2/BzKp2xb0Y+ErdfYcrs9tkJQ= +github.com/unrolled/render v1.0.1 h1:VDDnQQVfBMsOsp3VaCJszSO0nkBIVEYoPWeRThk9spY= +github.com/unrolled/render v1.0.1/go.mod h1:gN9T0NhL4Bfbwu8ann7Ry/TGHYfosul+J0obPf6NBdM= +github.com/unrolled/secure v1.0.1 h1:PZ79/VmnyIrDWRAUp9lWSwmckdf8H0v9djiqZxAb8Tc= +github.com/unrolled/secure v1.0.1/go.mod h1:R6rugAuzh4TQpbFAq69oqZggyBQxFRFQIewtz5z7Jsc= +github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= +github.com/urfave/cli v1.21.0/go.mod h1:lxDj6qX9Q6lWQxIrbrT0nwecwUtRnhVZAJjJZrVUZZQ= +github.com/vdemeester/shakers v0.1.0 h1:K+n9sSyUCg2ywmZkv+3c7vsYZfivcfKhMh8kRxCrONM= +github.com/vdemeester/shakers v0.1.0/go.mod h1:IZ1HHynUOQt32iQ3rvAeVddXLd19h/6LWiKsh9RZtAQ= +github.com/vulcand/oxy v1.0.0 h1:7vL5/pjDFzHGbtBEhmlHITUi6KLH4xXTDF33/wrdRKw= +github.com/vulcand/oxy v1.0.0/go.mod h1:6EXgOAl6CRa46/2ZGcDJKf3ywJUp5WtT7vSlGSkvecI= +github.com/vulcand/predicate v1.1.0 h1:Gq/uWopa4rx/tnZu2opOSBqHK63Yqlou/SzrbwdJiNg= +github.com/vulcand/predicate v1.1.0/go.mod h1:mlccC5IRBoc2cIFmCB8ZM62I3VDb6p2GXESMHa3CnZg= +github.com/vultr/govultr v0.1.4 h1:UnNMixYFVO0p80itc8PcweoVENyo1PasfvwKhoasR9U= +github.com/vultr/govultr v0.1.4/go.mod h1:9H008Uxr/C4vFNGLqKx232C206GL0PBHzOP0809bGNA= +github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I= +github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y= +github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c= +github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= +github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0= +github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= +github.com/xeipuuv/gojsonschema v1.1.0 h1:ngVtJC9TY/lg0AA/1k48FYhBrhRoFlEmWzsehpNAaZg= +github.com/xeipuuv/gojsonschema v1.1.0/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs= +go.etcd.io/bbolt v1.3.1-etcd.8/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +go.etcd.io/etcd v3.3.13+incompatible/go.mod h1:yaeTdrJi5lOmYerz05bd8+V7KubZs8YSFZfzsF9A6aI= +go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= +go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= +go.opencensus.io v0.21.0 h1:mU6zScU4U1YAFPHEHYk+3JC4SY7JxgkqS10ZOSyksNg= +go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= +go.uber.org/atomic v1.3.2 h1:2Oa65PReHzfn29GpvgsYwloV9AVFHPDk8tYxt2c2tr4= +go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/ratelimit v0.0.0-20180316092928-c15da0234277 h1:d9qaMM+ODpCq+9We41//fu/sHsTnXcrqd1en3x+GKy4= +go.uber.org/ratelimit v0.0.0-20180316092928-c15da0234277/go.mod h1:2X8KaoNd1J0lZV+PxJk/5+DGbO/tpwLR1m++a7FnB/Y= +golang.org/x/crypto v0.0.0-20180621125126-a49355c7e3f8/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20181025213731-e84da0312774/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190404164418-38d8ce5564a5/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= +golang.org/x/crypto v0.0.0-20190418165655-df01cb2cc480/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= +golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 h1:HuIa8hRrWRSrqYzx1qI49NNxhdi2PrY7gxVSq1JjLDc= +golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190312203227-4b39c73a6495 h1:I6A9Ag9FpEKOjcKrRNjQkPHawoXIhKyTGfvvjFAiiAk= +golang.org/x/exp v0.0.0-20190312203227-4b39c73a6495/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= +golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= +golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= +golang.org/x/net v0.0.0-20180611182652-db08ff08e862/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190206173232-65e2d4e15006/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190724013045-ca1201d0de80 h1:Ao/3l156eZf2AW5wK8a7/smtodRU+gha3+BeqJ69lRk= +golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0= +golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180622082034-63fc586f45fe/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b h1:ag/x1USPSsqHud38I9BAC88qdNLDHHtQ4mlgQIZPPNA= +golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 h1:SvFZT6jyqRaOeXpc5h/JSfZenJ2O330aBsf7JfSUXmQ= +golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c h1:97SnQk1GYRXJgvwZ8fadnxDOWfKvkNQHH3CtZntPSrM= +golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135 h1:5Beo0mZN8dRzgrMMkDp0jc8YXQKx9DiJ2k1dkvGsn5A= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 h1:9zdDQZ7Thm29KFXgAX/+yaf3eVbP7djjWp/dXAppNCc= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485 h1:OB/uP/Puiu5vS5QMRPrXCDWUPb+kt8f1KW8oQzFejQw= +gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0= +gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= +gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e h1:jRyg0XfpwWlhEV8mDfdNGBeSJM2fuyh9Yjrnd8kF2Ts= +gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e/go.mod h1:kS+toOQn6AQKjmKJ7gzohV1XkqsFehRA2FbsbkopSuQ= +google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= +google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= +google.golang.org/api v0.7.0 h1:9sdfJOzWlkqPltHAuzT2Cp+yrBeY1KRVYgms8soxMwM= +google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.5.0 h1:KxkO13IPW4Lslp2bz+KHP2E3gtFlrIGNThxkZQ3g+4c= +google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873 h1:nfPFGzJkUDX6uBmpN/pSw7MbOAWegH5QDQuoXFHedLg= +google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= +google.golang.org/grpc v1.18.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.19.1/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.20.1 h1:Hz2g2wirWK7H0qIIhGIqRGTuMwTE8HEKFnDZZ7lm9NU= +google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= +google.golang.org/grpc v1.22.1 h1:/7cs52RnTJmD43s3uxzlq2U7nqVTd/37viQwMrMNlOM= +google.golang.org/grpc v1.22.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +gopkg.in/DataDog/dd-trace-go.v1 v1.16.1 h1:Dngw1zun6yTYFHNdzEWBlrJzFA2QJMjSA2sZ4nH2UWo= +gopkg.in/DataDog/dd-trace-go.v1 v1.16.1/go.mod h1:DVp8HmDh8PuTu2Z0fVVlBsyWaC++fzwVCaGWylTe3tg= +gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= +gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= +gopkg.in/h2non/gock.v1 v1.0.15 h1:SzLqcIlb/fDfg7UvukMpNcWsu7sI5tWwL+KCATZqks0= +gopkg.in/h2non/gock.v1 v1.0.15/go.mod h1:sX4zAkdYX1TRGJ2JY156cFspQn4yRWn6p9EMdODlynE= +gopkg.in/inf.v0 v0.9.0 h1:3zYtXIO92bvsdS3ggAdA8Gb4Azj0YU+TVY1uGYNFA8o= +gopkg.in/inf.v0 v0.9.0/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= +gopkg.in/ini.v1 v1.42.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/ini.v1 v1.44.0 h1:YRJzTUp0kSYWUVFF5XAbDFfyiqwsl0Vb9R8TVP5eRi0= +gopkg.in/ini.v1 v1.44.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/jcmturner/aescts.v1 v1.0.1 h1:cVVZBK2b1zY26haWB4vbBiZrfFQnfbTVrE3xZq6hrEw= +gopkg.in/jcmturner/aescts.v1 v1.0.1/go.mod h1:nsR8qBOg+OucoIW+WMhB3GspUQXq9XorLnQb9XtvcOo= +gopkg.in/jcmturner/dnsutils.v1 v1.0.1 h1:cIuC1OLRGZrld+16ZJvvZxVJeKPsvd5eUIvxfoN5hSM= +gopkg.in/jcmturner/dnsutils.v1 v1.0.1/go.mod h1:m3v+5svpVOhtFAP/wSz+yzh4Mc0Fg7eRhxkJMWSIz9Q= +gopkg.in/jcmturner/goidentity.v3 v3.0.0 h1:1duIyWiTaYvVx3YX2CYtpJbUFd7/UuPYCfgXtQ3VTbI= +gopkg.in/jcmturner/goidentity.v3 v3.0.0/go.mod h1:oG2kH0IvSYNIu80dVAyu/yoefjq1mNfM5bm88whjWx4= +gopkg.in/jcmturner/gokrb5.v7 v7.2.3 h1:hHMV/yKPwMnJhPuPx7pH2Uw/3Qyf+thJYlisUc44010= +gopkg.in/jcmturner/gokrb5.v7 v7.2.3/go.mod h1:l8VISx+WGYp+Fp7KRbsiUuXTTOnxIc3Tuvyavf11/WM= +gopkg.in/jcmturner/rpc.v1 v1.1.0 h1:QHIUxTX1ISuAv9dD2wJ9HWQVuWDX/Zc0PfeC2tjc4rU= +gopkg.in/jcmturner/rpc.v1 v1.1.0/go.mod h1:YIdkC4XfD6GXbzje11McwsDuOlZQSb9W4vfLvuNnlv8= +gopkg.in/ns1/ns1-go.v2 v2.0.0-20190430170845-6c599e5e5790/go.mod h1:VV+3haRsgDiVLxyifmMBrBIuCWFBPYKbRssXB9z67Hw= +gopkg.in/ns1/ns1-go.v2 v2.0.0-20190730140822-b51389932cbc h1:GAcf+t0o8gdJAdSFYdE9wChu4bIyguMVqz0RHiFL5VY= +gopkg.in/ns1/ns1-go.v2 v2.0.0-20190730140822-b51389932cbc/go.mod h1:VV+3haRsgDiVLxyifmMBrBIuCWFBPYKbRssXB9z67Hw= +gopkg.in/redis.v5 v5.2.9/go.mod h1:6gtv0/+A4iM08kdRfocWYB3bLX2tebpNtfKlFT6H4mY= +gopkg.in/resty.v1 v1.9.1/go.mod h1:vo52Hzryw9PnPHcJfPsBiFW62XhNx5OczbV9y+IMpgc= +gopkg.in/resty.v1 v1.12.0 h1:CuXP0Pjfw9rOuY6EP+UvtNvt5DSqHpIxILZKT/quCZI= +gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= +gopkg.in/square/go-jose.v2 v2.3.1 h1:SK5KegNXmKmqE342YYN2qPHEnUYeoMiXXl1poUlI+o4= +gopkg.in/square/go-jose.v2 v2.3.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= +gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= +honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +k8s.io/api v0.0.0-20190718183219-b59d8169aab5 h1:X3LHYU4fwu75lvvWypbppCKuhqg1KrvcZ1lLaAgmE/g= +k8s.io/api v0.0.0-20190718183219-b59d8169aab5/go.mod h1:TBhBqb1AWbBQbW3XRusr7n7E4v2+5ZY8r8sAMnyFC5A= +k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719 h1:uV4S5IB5g4Nvi+TBVNf3e9L4wrirlwYJ6w88jUQxTUw= +k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719/go.mod h1:I4A+glKBHiTgiEjQiCCQfCAIcIMFGt291SmsvcrFzJA= +k8s.io/client-go v0.0.0-20190718183610-8e956561bbf5 h1:ZIHnBytv9H1jiI7K/Szva829lP6zKsluhjVRdxf5kHA= +k8s.io/client-go v0.0.0-20190718183610-8e956561bbf5/go.mod h1:ozblAqkW495yoAX60QZyxQBq5W0YixE9Ffn4F91RO0g= +k8s.io/code-generator v0.0.0-20190612205613-18da4a14b22b h1:p+PRuwXWwk5e+UYvicGiavEupapqM5NOxUl3y1GkD6c= +k8s.io/code-generator v0.0.0-20190612205613-18da4a14b22b/go.mod h1:G8bQwmHm2eafm5bgtX67XDZQ8CWKSGu9DekI+yN4Y5I= +k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af h1:SwjZbO0u5ZuaV6TRMWOGB40iaycX8sbdMQHtjNZ19dk= +k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= +k8s.io/klog v0.3.1 h1:RVgyDHY/kFKtLqh67NvEWIgkMneNoIrdkN0CxDSQc68= +k8s.io/klog v0.3.1/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= +k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30 h1:TRb4wNWoBVrH9plmkp2q86FIDppkbrEXdXlxU3a3BMI= +k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc= +k8s.io/utils v0.0.0-20190221042446-c2654d5206da h1:ElyM7RPonbKnQqOcw7dG2IK5uvQQn3b/WPHqD5mBvP4= +k8s.io/utils v0.0.0-20190221042446-c2654d5206da/go.mod h1:8k8uAuAQ0rXslZKaEWd0c3oVhZz7sSzSiPnVZayjIX0= +modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw= +modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk= +modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k= +modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs= +modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I= +mvdan.cc/xurls/v2 v2.0.0 h1:r1zSOSNS/kqtpmATyMMMvaZ4/djsesbYz5kr0+qMRWc= +mvdan.cc/xurls/v2 v2.0.0/go.mod h1:2/webFPYOXN9jp/lzuj0zuAVlF+9g4KPFJANH1oJhRU= +sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs= +sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= diff --git a/integration/access_log_test.go b/integration/access_log_test.go index c87daaaf3..5017b2132 100644 --- a/integration/access_log_test.go +++ b/integration/access_log_test.go @@ -11,9 +11,9 @@ import ( "strings" "time" - "github.com/containous/traefik/integration/try" - "github.com/containous/traefik/pkg/log" - "github.com/containous/traefik/pkg/middlewares/accesslog" + "github.com/containous/traefik/v2/integration/try" + "github.com/containous/traefik/v2/pkg/log" + "github.com/containous/traefik/v2/pkg/middlewares/accesslog" "github.com/go-check/check" checker "github.com/vdemeester/shakers" ) diff --git a/integration/acme_test.go b/integration/acme_test.go index 23c774b6b..d253b3ace 100644 --- a/integration/acme_test.go +++ b/integration/acme_test.go @@ -10,11 +10,11 @@ import ( "path/filepath" "time" - "github.com/containous/traefik/integration/try" - "github.com/containous/traefik/pkg/config/static" - "github.com/containous/traefik/pkg/provider/acme" - "github.com/containous/traefik/pkg/testhelpers" - "github.com/containous/traefik/pkg/types" + "github.com/containous/traefik/v2/integration/try" + "github.com/containous/traefik/v2/pkg/config/static" + "github.com/containous/traefik/v2/pkg/provider/acme" + "github.com/containous/traefik/v2/pkg/testhelpers" + "github.com/containous/traefik/v2/pkg/types" "github.com/go-check/check" "github.com/miekg/dns" checker "github.com/vdemeester/shakers" diff --git a/integration/docker_compose_test.go b/integration/docker_compose_test.go index 5d81608ff..d499d2258 100644 --- a/integration/docker_compose_test.go +++ b/integration/docker_compose_test.go @@ -6,9 +6,9 @@ import ( "os" "time" - "github.com/containous/traefik/integration/try" - "github.com/containous/traefik/pkg/api" - "github.com/containous/traefik/pkg/testhelpers" + "github.com/containous/traefik/v2/integration/try" + "github.com/containous/traefik/v2/pkg/api" + "github.com/containous/traefik/v2/pkg/testhelpers" "github.com/go-check/check" checker "github.com/vdemeester/shakers" ) diff --git a/integration/docker_test.go b/integration/docker_test.go index b60a5d0c0..9e5db3972 100644 --- a/integration/docker_test.go +++ b/integration/docker_test.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "github.com/containous/traefik/integration/try" + "github.com/containous/traefik/v2/integration/try" "github.com/docker/docker/pkg/namesgenerator" "github.com/go-check/check" d "github.com/libkermit/docker" diff --git a/integration/error_pages_test.go b/integration/error_pages_test.go index b321b909f..5a4fd4afb 100644 --- a/integration/error_pages_test.go +++ b/integration/error_pages_test.go @@ -5,7 +5,7 @@ import ( "os" "time" - "github.com/containous/traefik/integration/try" + "github.com/containous/traefik/v2/integration/try" "github.com/go-check/check" checker "github.com/vdemeester/shakers" ) diff --git a/integration/fake_dns_server.go b/integration/fake_dns_server.go index 4c4fc1709..1c4c7a6cd 100644 --- a/integration/fake_dns_server.go +++ b/integration/fake_dns_server.go @@ -5,7 +5,7 @@ import ( "net" "os" - "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/v2/pkg/log" "github.com/miekg/dns" ) diff --git a/integration/file_test.go b/integration/file_test.go index 0a9db2266..85079b4e0 100644 --- a/integration/file_test.go +++ b/integration/file_test.go @@ -5,7 +5,7 @@ import ( "os" "time" - "github.com/containous/traefik/integration/try" + "github.com/containous/traefik/v2/integration/try" "github.com/go-check/check" checker "github.com/vdemeester/shakers" ) diff --git a/integration/grpc_test.go b/integration/grpc_test.go index e2d4c63e3..7664c4548 100644 --- a/integration/grpc_test.go +++ b/integration/grpc_test.go @@ -11,9 +11,9 @@ import ( "os" "time" - "github.com/containous/traefik/integration/helloworld" - "github.com/containous/traefik/integration/try" - "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/v2/integration/helloworld" + "github.com/containous/traefik/v2/integration/try" + "github.com/containous/traefik/v2/pkg/log" "github.com/go-check/check" "google.golang.org/grpc" "google.golang.org/grpc/credentials" diff --git a/integration/headers_test.go b/integration/headers_test.go index 7e0a1422e..8d5194abd 100644 --- a/integration/headers_test.go +++ b/integration/headers_test.go @@ -5,7 +5,7 @@ import ( "os" "time" - "github.com/containous/traefik/integration/try" + "github.com/containous/traefik/v2/integration/try" "github.com/go-check/check" checker "github.com/vdemeester/shakers" ) diff --git a/integration/healthcheck_test.go b/integration/healthcheck_test.go index 13fc47860..110ba08eb 100644 --- a/integration/healthcheck_test.go +++ b/integration/healthcheck_test.go @@ -6,7 +6,7 @@ import ( "os" "time" - "github.com/containous/traefik/integration/try" + "github.com/containous/traefik/v2/integration/try" "github.com/go-check/check" checker "github.com/vdemeester/shakers" ) diff --git a/integration/hostresolver_test.go b/integration/hostresolver_test.go index 9ff71ad99..c1e58b07d 100644 --- a/integration/hostresolver_test.go +++ b/integration/hostresolver_test.go @@ -4,7 +4,7 @@ import ( "net/http" "time" - "github.com/containous/traefik/integration/try" + "github.com/containous/traefik/v2/integration/try" "github.com/go-check/check" checker "github.com/vdemeester/shakers" ) diff --git a/integration/https_test.go b/integration/https_test.go index 5da57cd61..79ee639a6 100644 --- a/integration/https_test.go +++ b/integration/https_test.go @@ -11,9 +11,9 @@ import ( "time" "github.com/BurntSushi/toml" - "github.com/containous/traefik/integration/try" - "github.com/containous/traefik/pkg/config/dynamic" - traefiktls "github.com/containous/traefik/pkg/tls" + "github.com/containous/traefik/v2/integration/try" + "github.com/containous/traefik/v2/pkg/config/dynamic" + traefiktls "github.com/containous/traefik/v2/pkg/tls" "github.com/go-check/check" checker "github.com/vdemeester/shakers" ) diff --git a/integration/integration_test.go b/integration/integration_test.go index 1ab4da6a8..599b2e8c5 100644 --- a/integration/integration_test.go +++ b/integration/integration_test.go @@ -14,7 +14,7 @@ import ( "testing" "text/template" - "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/v2/pkg/log" "github.com/fatih/structs" "github.com/go-check/check" compose "github.com/libkermit/compose/check" diff --git a/integration/k8s_test.go b/integration/k8s_test.go index 4bb6cb02d..457d639e8 100644 --- a/integration/k8s_test.go +++ b/integration/k8s_test.go @@ -14,8 +14,8 @@ import ( "regexp" "time" - "github.com/containous/traefik/integration/try" - "github.com/containous/traefik/pkg/api" + "github.com/containous/traefik/v2/integration/try" + "github.com/containous/traefik/v2/pkg/api" "github.com/go-check/check" "github.com/pmezard/go-difflib/difflib" checker "github.com/vdemeester/shakers" diff --git a/integration/keepalive_test.go b/integration/keepalive_test.go index 7dad0153b..8e1838974 100644 --- a/integration/keepalive_test.go +++ b/integration/keepalive_test.go @@ -8,7 +8,7 @@ import ( "os" "time" - "github.com/containous/traefik/integration/try" + "github.com/containous/traefik/v2/integration/try" "github.com/go-check/check" checker "github.com/vdemeester/shakers" ) diff --git a/integration/log_rotation_test.go b/integration/log_rotation_test.go index 60b04ad73..d1be2974d 100644 --- a/integration/log_rotation_test.go +++ b/integration/log_rotation_test.go @@ -10,7 +10,7 @@ import ( "syscall" "time" - "github.com/containous/traefik/integration/try" + "github.com/containous/traefik/v2/integration/try" "github.com/go-check/check" checker "github.com/vdemeester/shakers" ) diff --git a/integration/marathon15_test.go b/integration/marathon15_test.go index 274170e1d..a15ce8e85 100644 --- a/integration/marathon15_test.go +++ b/integration/marathon15_test.go @@ -6,7 +6,7 @@ import ( "os" "time" - "github.com/containous/traefik/integration/try" + "github.com/containous/traefik/v2/integration/try" "github.com/gambol99/go-marathon" "github.com/go-check/check" checker "github.com/vdemeester/shakers" diff --git a/integration/marathon_test.go b/integration/marathon_test.go index 67d742993..b0406bf9c 100644 --- a/integration/marathon_test.go +++ b/integration/marathon_test.go @@ -6,7 +6,7 @@ import ( "os" "time" - "github.com/containous/traefik/integration/try" + "github.com/containous/traefik/v2/integration/try" "github.com/gambol99/go-marathon" "github.com/go-check/check" checker "github.com/vdemeester/shakers" diff --git a/integration/proxy_protocol_test.go b/integration/proxy_protocol_test.go index 66d5c93c5..126aaf343 100644 --- a/integration/proxy_protocol_test.go +++ b/integration/proxy_protocol_test.go @@ -5,7 +5,7 @@ import ( "os" "time" - "github.com/containous/traefik/integration/try" + "github.com/containous/traefik/v2/integration/try" "github.com/go-check/check" checker "github.com/vdemeester/shakers" ) diff --git a/integration/ratelimit_test.go b/integration/ratelimit_test.go index 204221b80..bd43117a9 100644 --- a/integration/ratelimit_test.go +++ b/integration/ratelimit_test.go @@ -5,7 +5,7 @@ import ( "os" "time" - "github.com/containous/traefik/integration/try" + "github.com/containous/traefik/v2/integration/try" "github.com/go-check/check" checker "github.com/vdemeester/shakers" ) diff --git a/integration/rest_test.go b/integration/rest_test.go index a5da9df05..3aac50fd0 100644 --- a/integration/rest_test.go +++ b/integration/rest_test.go @@ -6,8 +6,8 @@ import ( "net/http" "time" - "github.com/containous/traefik/integration/try" - "github.com/containous/traefik/pkg/config/dynamic" + "github.com/containous/traefik/v2/integration/try" + "github.com/containous/traefik/v2/pkg/config/dynamic" "github.com/go-check/check" checker "github.com/vdemeester/shakers" ) diff --git a/integration/retry_test.go b/integration/retry_test.go index a2d404d16..5b39e2d40 100644 --- a/integration/retry_test.go +++ b/integration/retry_test.go @@ -5,7 +5,7 @@ import ( "os" "time" - "github.com/containous/traefik/integration/try" + "github.com/containous/traefik/v2/integration/try" "github.com/go-check/check" "github.com/gorilla/websocket" checker "github.com/vdemeester/shakers" diff --git a/integration/simple_test.go b/integration/simple_test.go index 9ab260eb1..a004ffd19 100644 --- a/integration/simple_test.go +++ b/integration/simple_test.go @@ -11,8 +11,8 @@ import ( "syscall" "time" - "github.com/containous/traefik/integration/try" - "github.com/containous/traefik/pkg/config/dynamic" + "github.com/containous/traefik/v2/integration/try" + "github.com/containous/traefik/v2/pkg/config/dynamic" "github.com/go-check/check" checker "github.com/vdemeester/shakers" ) diff --git a/integration/tcp_test.go b/integration/tcp_test.go index 095993166..5551911a9 100644 --- a/integration/tcp_test.go +++ b/integration/tcp_test.go @@ -8,7 +8,7 @@ import ( "os" "time" - "github.com/containous/traefik/integration/try" + "github.com/containous/traefik/v2/integration/try" "github.com/go-check/check" checker "github.com/vdemeester/shakers" ) diff --git a/integration/timeout_test.go b/integration/timeout_test.go index 43db8761c..2a35ed04a 100644 --- a/integration/timeout_test.go +++ b/integration/timeout_test.go @@ -6,7 +6,7 @@ import ( "os" "time" - "github.com/containous/traefik/integration/try" + "github.com/containous/traefik/v2/integration/try" "github.com/go-check/check" checker "github.com/vdemeester/shakers" ) diff --git a/integration/tls_client_headers_test.go b/integration/tls_client_headers_test.go index f46ed660d..f730ec413 100644 --- a/integration/tls_client_headers_test.go +++ b/integration/tls_client_headers_test.go @@ -7,7 +7,7 @@ import ( "os" "time" - "github.com/containous/traefik/integration/try" + "github.com/containous/traefik/v2/integration/try" "github.com/go-check/check" checker "github.com/vdemeester/shakers" ) diff --git a/integration/tracing_test.go b/integration/tracing_test.go index 2d57b9e38..26cf987f9 100644 --- a/integration/tracing_test.go +++ b/integration/tracing_test.go @@ -5,7 +5,7 @@ import ( "os" "time" - "github.com/containous/traefik/integration/try" + "github.com/containous/traefik/v2/integration/try" "github.com/go-check/check" checker "github.com/vdemeester/shakers" ) diff --git a/integration/try/try.go b/integration/try/try.go index 60a2764bd..f9f982dbf 100644 --- a/integration/try/try.go +++ b/integration/try/try.go @@ -7,7 +7,7 @@ import ( "os" "time" - "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/v2/pkg/log" ) const ( diff --git a/integration/websocket_test.go b/integration/websocket_test.go index ef83c88bf..e2c834cd4 100644 --- a/integration/websocket_test.go +++ b/integration/websocket_test.go @@ -11,7 +11,7 @@ import ( "os" "time" - "github.com/containous/traefik/integration/try" + "github.com/containous/traefik/v2/integration/try" "github.com/go-check/check" gorillawebsocket "github.com/gorilla/websocket" checker "github.com/vdemeester/shakers" diff --git a/internal/gendoc.go b/internal/gendoc.go index 92405a4d3..1f102082a 100644 --- a/internal/gendoc.go +++ b/internal/gendoc.go @@ -6,12 +6,12 @@ import ( "os" "strings" - "github.com/containous/traefik/pkg/config/env" - "github.com/containous/traefik/pkg/config/flag" - "github.com/containous/traefik/pkg/config/generator" - "github.com/containous/traefik/pkg/config/parser" - "github.com/containous/traefik/pkg/config/static" - "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/v2/pkg/config/env" + "github.com/containous/traefik/v2/pkg/config/flag" + "github.com/containous/traefik/v2/pkg/config/generator" + "github.com/containous/traefik/v2/pkg/config/parser" + "github.com/containous/traefik/v2/pkg/config/static" + "github.com/containous/traefik/v2/pkg/log" ) func main() { diff --git a/pkg/anonymize/anonymize.go b/pkg/anonymize/anonymize.go index 7be585ee5..f955985aa 100644 --- a/pkg/anonymize/anonymize.go +++ b/pkg/anonymize/anonymize.go @@ -7,7 +7,7 @@ import ( "regexp" "github.com/mitchellh/copystructure" - "github.com/mvdan/xurls" + "mvdan.cc/xurls/v2" ) const ( @@ -39,7 +39,7 @@ func Do(baseConfig interface{}, indent bool) (string, error) { func doOnJSON(input string) string { mailExp := regexp.MustCompile(`\w[-._\w]*\w@\w[-._\w]*\w\.\w{2,3}"`) - return xurls.Relaxed.ReplaceAllString(mailExp.ReplaceAllString(input, maskLarge+"\""), maskLarge) + return xurls.Relaxed().ReplaceAllString(mailExp.ReplaceAllString(input, maskLarge+"\""), maskLarge) } func doOnStruct(field reflect.Value) error { diff --git a/pkg/anonymize/anonymize_config_test.go b/pkg/anonymize/anonymize_config_test.go index 2e0e3d338..6dfd372f7 100644 --- a/pkg/anonymize/anonymize_config_test.go +++ b/pkg/anonymize/anonymize_config_test.go @@ -5,21 +5,21 @@ import ( "testing" "time" - "github.com/containous/traefik/pkg/config/static" - "github.com/containous/traefik/pkg/ping" - "github.com/containous/traefik/pkg/provider/acme" - acmeprovider "github.com/containous/traefik/pkg/provider/acme" - "github.com/containous/traefik/pkg/provider/docker" - "github.com/containous/traefik/pkg/provider/file" - "github.com/containous/traefik/pkg/provider/kubernetes/crd" - "github.com/containous/traefik/pkg/provider/kubernetes/ingress" - traefiktls "github.com/containous/traefik/pkg/tls" - "github.com/containous/traefik/pkg/tracing/datadog" - "github.com/containous/traefik/pkg/tracing/haystack" - "github.com/containous/traefik/pkg/tracing/instana" - "github.com/containous/traefik/pkg/tracing/jaeger" - "github.com/containous/traefik/pkg/tracing/zipkin" - "github.com/containous/traefik/pkg/types" + "github.com/containous/traefik/v2/pkg/config/static" + "github.com/containous/traefik/v2/pkg/ping" + "github.com/containous/traefik/v2/pkg/provider/acme" + acmeprovider "github.com/containous/traefik/v2/pkg/provider/acme" + "github.com/containous/traefik/v2/pkg/provider/docker" + "github.com/containous/traefik/v2/pkg/provider/file" + "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd" + "github.com/containous/traefik/v2/pkg/provider/kubernetes/ingress" + traefiktls "github.com/containous/traefik/v2/pkg/tls" + "github.com/containous/traefik/v2/pkg/tracing/datadog" + "github.com/containous/traefik/v2/pkg/tracing/haystack" + "github.com/containous/traefik/v2/pkg/tracing/instana" + "github.com/containous/traefik/v2/pkg/tracing/jaeger" + "github.com/containous/traefik/v2/pkg/tracing/zipkin" + "github.com/containous/traefik/v2/pkg/types" assetfs "github.com/elazarl/go-bindata-assetfs" ) diff --git a/pkg/api/dashboard.go b/pkg/api/dashboard.go index f3c1bd758..001cc83d5 100644 --- a/pkg/api/dashboard.go +++ b/pkg/api/dashboard.go @@ -3,9 +3,9 @@ package api import ( "net/http" - "github.com/containous/mux" - "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/v2/pkg/log" assetfs "github.com/elazarl/go-bindata-assetfs" + "github.com/gorilla/mux" ) // DashboardHandler expose dashboard routes diff --git a/pkg/api/debug.go b/pkg/api/debug.go index 35868f3c6..e9c7f8abc 100644 --- a/pkg/api/debug.go +++ b/pkg/api/debug.go @@ -7,7 +7,7 @@ import ( "net/http/pprof" "runtime" - "github.com/containous/mux" + "github.com/gorilla/mux" ) func init() { diff --git a/pkg/api/handler.go b/pkg/api/handler.go index 594e9b46c..7ee900c75 100644 --- a/pkg/api/handler.go +++ b/pkg/api/handler.go @@ -7,12 +7,12 @@ import ( "strconv" "strings" - "github.com/containous/mux" - "github.com/containous/traefik/pkg/config/runtime" - "github.com/containous/traefik/pkg/config/static" - "github.com/containous/traefik/pkg/log" - "github.com/containous/traefik/pkg/version" + "github.com/containous/traefik/v2/pkg/config/runtime" + "github.com/containous/traefik/v2/pkg/config/static" + "github.com/containous/traefik/v2/pkg/log" + "github.com/containous/traefik/v2/pkg/version" assetfs "github.com/elazarl/go-bindata-assetfs" + "github.com/gorilla/mux" ) const ( diff --git a/pkg/api/handler_entrypoint.go b/pkg/api/handler_entrypoint.go index b36dd619c..b4cc3f4e5 100644 --- a/pkg/api/handler_entrypoint.go +++ b/pkg/api/handler_entrypoint.go @@ -6,9 +6,9 @@ import ( "sort" "strconv" - "github.com/containous/mux" - "github.com/containous/traefik/pkg/config/static" - "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/v2/pkg/config/static" + "github.com/containous/traefik/v2/pkg/log" + "github.com/gorilla/mux" ) type entryPointRepresentation struct { diff --git a/pkg/api/handler_entrypoint_test.go b/pkg/api/handler_entrypoint_test.go index 333fd6c4c..9e796e59d 100644 --- a/pkg/api/handler_entrypoint_test.go +++ b/pkg/api/handler_entrypoint_test.go @@ -9,9 +9,9 @@ import ( "strconv" "testing" - "github.com/containous/mux" - "github.com/containous/traefik/pkg/config/runtime" - "github.com/containous/traefik/pkg/config/static" + "github.com/containous/traefik/v2/pkg/config/runtime" + "github.com/containous/traefik/v2/pkg/config/static" + "github.com/gorilla/mux" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/api/handler_http.go b/pkg/api/handler_http.go index d13d92f7a..39bc3fd3f 100644 --- a/pkg/api/handler_http.go +++ b/pkg/api/handler_http.go @@ -6,9 +6,9 @@ import ( "sort" "strconv" - "github.com/containous/mux" - "github.com/containous/traefik/pkg/config/runtime" - "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/v2/pkg/config/runtime" + "github.com/containous/traefik/v2/pkg/log" + "github.com/gorilla/mux" ) type routerRepresentation struct { diff --git a/pkg/api/handler_http_test.go b/pkg/api/handler_http_test.go index 2d04091c7..ea89966a1 100644 --- a/pkg/api/handler_http_test.go +++ b/pkg/api/handler_http_test.go @@ -9,10 +9,10 @@ import ( "strconv" "testing" - "github.com/containous/mux" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/config/runtime" - "github.com/containous/traefik/pkg/config/static" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/config/runtime" + "github.com/containous/traefik/v2/pkg/config/static" + "github.com/gorilla/mux" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/api/handler_overview.go b/pkg/api/handler_overview.go index 9818de22f..f08d80351 100644 --- a/pkg/api/handler_overview.go +++ b/pkg/api/handler_overview.go @@ -5,9 +5,9 @@ import ( "net/http" "reflect" - "github.com/containous/traefik/pkg/config/runtime" - "github.com/containous/traefik/pkg/config/static" - "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/v2/pkg/config/runtime" + "github.com/containous/traefik/v2/pkg/config/static" + "github.com/containous/traefik/v2/pkg/log" ) type schemeOverview struct { diff --git a/pkg/api/handler_overview_test.go b/pkg/api/handler_overview_test.go index 07c9fc05c..c259de2a7 100644 --- a/pkg/api/handler_overview_test.go +++ b/pkg/api/handler_overview_test.go @@ -7,19 +7,19 @@ import ( "net/http/httptest" "testing" - "github.com/containous/mux" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/config/runtime" - "github.com/containous/traefik/pkg/config/static" - "github.com/containous/traefik/pkg/provider/docker" - "github.com/containous/traefik/pkg/provider/file" - "github.com/containous/traefik/pkg/provider/kubernetes/crd" - "github.com/containous/traefik/pkg/provider/kubernetes/ingress" - "github.com/containous/traefik/pkg/provider/marathon" - "github.com/containous/traefik/pkg/provider/rancher" - "github.com/containous/traefik/pkg/provider/rest" - "github.com/containous/traefik/pkg/tracing/jaeger" - "github.com/containous/traefik/pkg/types" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/config/runtime" + "github.com/containous/traefik/v2/pkg/config/static" + "github.com/containous/traefik/v2/pkg/provider/docker" + "github.com/containous/traefik/v2/pkg/provider/file" + "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd" + "github.com/containous/traefik/v2/pkg/provider/kubernetes/ingress" + "github.com/containous/traefik/v2/pkg/provider/marathon" + "github.com/containous/traefik/v2/pkg/provider/rancher" + "github.com/containous/traefik/v2/pkg/provider/rest" + "github.com/containous/traefik/v2/pkg/tracing/jaeger" + "github.com/containous/traefik/v2/pkg/types" + "github.com/gorilla/mux" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/api/handler_tcp.go b/pkg/api/handler_tcp.go index 6dcb0915a..3f91f0386 100644 --- a/pkg/api/handler_tcp.go +++ b/pkg/api/handler_tcp.go @@ -6,9 +6,9 @@ import ( "sort" "strconv" - "github.com/containous/mux" - "github.com/containous/traefik/pkg/config/runtime" - "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/v2/pkg/config/runtime" + "github.com/containous/traefik/v2/pkg/log" + "github.com/gorilla/mux" ) type tcpRouterRepresentation struct { diff --git a/pkg/api/handler_tcp_test.go b/pkg/api/handler_tcp_test.go index 92009abc4..28c833f8b 100644 --- a/pkg/api/handler_tcp_test.go +++ b/pkg/api/handler_tcp_test.go @@ -7,10 +7,10 @@ import ( "net/http/httptest" "testing" - "github.com/containous/mux" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/config/runtime" - "github.com/containous/traefik/pkg/config/static" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/config/runtime" + "github.com/containous/traefik/v2/pkg/config/static" + "github.com/gorilla/mux" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/api/handler_test.go b/pkg/api/handler_test.go index 1055eead0..2971f0354 100644 --- a/pkg/api/handler_test.go +++ b/pkg/api/handler_test.go @@ -8,10 +8,10 @@ import ( "net/http/httptest" "testing" - "github.com/containous/mux" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/config/runtime" - "github.com/containous/traefik/pkg/config/static" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/config/runtime" + "github.com/containous/traefik/v2/pkg/config/static" + "github.com/gorilla/mux" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/cli/help.go b/pkg/cli/help.go index 83f3a4935..7926ca7ec 100644 --- a/pkg/cli/help.go +++ b/pkg/cli/help.go @@ -7,9 +7,9 @@ import ( "text/template" "github.com/Masterminds/sprig" - "github.com/containous/traefik/pkg/config/flag" - "github.com/containous/traefik/pkg/config/generator" - "github.com/containous/traefik/pkg/config/parser" + "github.com/containous/traefik/v2/pkg/config/flag" + "github.com/containous/traefik/v2/pkg/config/generator" + "github.com/containous/traefik/v2/pkg/config/parser" ) const tmplHelp = `{{ .Cmd.Name }} {{ .Cmd.Description }} diff --git a/pkg/cli/loader_env.go b/pkg/cli/loader_env.go index 07e40faa4..c622a6821 100644 --- a/pkg/cli/loader_env.go +++ b/pkg/cli/loader_env.go @@ -5,8 +5,8 @@ import ( "os" "strings" - "github.com/containous/traefik/pkg/config/env" - "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/v2/pkg/config/env" + "github.com/containous/traefik/v2/pkg/log" ) // EnvLoader loads a configuration from all the environment variables prefixed with "TRAEFIK_". diff --git a/pkg/cli/loader_file.go b/pkg/cli/loader_file.go index 2c0a04fe3..eb0b3f78e 100644 --- a/pkg/cli/loader_file.go +++ b/pkg/cli/loader_file.go @@ -5,9 +5,9 @@ import ( "os" "strings" - "github.com/containous/traefik/pkg/config/file" - "github.com/containous/traefik/pkg/config/flag" - "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/v2/pkg/config/file" + "github.com/containous/traefik/v2/pkg/config/flag" + "github.com/containous/traefik/v2/pkg/log" ) // FileLoader loads a configuration from a file. diff --git a/pkg/cli/loader_flag.go b/pkg/cli/loader_flag.go index fcf2b3076..36ce0b521 100644 --- a/pkg/cli/loader_flag.go +++ b/pkg/cli/loader_flag.go @@ -3,8 +3,8 @@ package cli import ( "fmt" - "github.com/containous/traefik/pkg/config/flag" - "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/v2/pkg/config/flag" + "github.com/containous/traefik/v2/pkg/log" ) // FlagLoader loads configuration from flags. diff --git a/pkg/collector/collector.go b/pkg/collector/collector.go index 0b41dd0ba..4a1a6f2a5 100644 --- a/pkg/collector/collector.go +++ b/pkg/collector/collector.go @@ -9,10 +9,10 @@ import ( "strconv" "time" - "github.com/containous/traefik/pkg/anonymize" - "github.com/containous/traefik/pkg/config/static" - "github.com/containous/traefik/pkg/log" - "github.com/containous/traefik/pkg/version" + "github.com/containous/traefik/v2/pkg/anonymize" + "github.com/containous/traefik/v2/pkg/config/static" + "github.com/containous/traefik/v2/pkg/log" + "github.com/containous/traefik/v2/pkg/version" "github.com/mitchellh/hashstructure" ) diff --git a/pkg/config/dynamic/config.go b/pkg/config/dynamic/config.go index 225cd12f1..d41af3c46 100644 --- a/pkg/config/dynamic/config.go +++ b/pkg/config/dynamic/config.go @@ -1,7 +1,7 @@ package dynamic import ( - "github.com/containous/traefik/pkg/tls" + "github.com/containous/traefik/v2/pkg/tls" ) // +k8s:deepcopy-gen=true diff --git a/pkg/config/dynamic/http_config.go b/pkg/config/dynamic/http_config.go index 5356a5503..6bd05ba00 100644 --- a/pkg/config/dynamic/http_config.go +++ b/pkg/config/dynamic/http_config.go @@ -3,7 +3,7 @@ package dynamic import ( "reflect" - "github.com/containous/traefik/pkg/types" + "github.com/containous/traefik/v2/pkg/types" ) // +k8s:deepcopy-gen=true diff --git a/pkg/config/dynamic/middlewares.go b/pkg/config/dynamic/middlewares.go index 9d8520e07..578ed2e28 100644 --- a/pkg/config/dynamic/middlewares.go +++ b/pkg/config/dynamic/middlewares.go @@ -7,8 +7,8 @@ import ( "io/ioutil" "os" - "github.com/containous/traefik/pkg/ip" - "github.com/containous/traefik/pkg/types" + "github.com/containous/traefik/v2/pkg/ip" + "github.com/containous/traefik/v2/pkg/types" ) // +k8s:deepcopy-gen=true diff --git a/pkg/config/dynamic/tcp_config.go b/pkg/config/dynamic/tcp_config.go index e72c2fd76..3e1c1e826 100644 --- a/pkg/config/dynamic/tcp_config.go +++ b/pkg/config/dynamic/tcp_config.go @@ -3,7 +3,7 @@ package dynamic import ( "reflect" - "github.com/containous/traefik/pkg/types" + "github.com/containous/traefik/v2/pkg/types" ) // +k8s:deepcopy-gen=true diff --git a/pkg/config/dynamic/zz_generated.deepcopy.go b/pkg/config/dynamic/zz_generated.deepcopy.go index 46b64d071..09f24794e 100644 --- a/pkg/config/dynamic/zz_generated.deepcopy.go +++ b/pkg/config/dynamic/zz_generated.deepcopy.go @@ -29,8 +29,8 @@ THE SOFTWARE. package dynamic import ( - tls "github.com/containous/traefik/pkg/tls" - types "github.com/containous/traefik/pkg/types" + tls "github.com/containous/traefik/v2/pkg/tls" + types "github.com/containous/traefik/v2/pkg/types" ) // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. diff --git a/pkg/config/env/env.go b/pkg/config/env/env.go index d915272af..5fbd2a877 100644 --- a/pkg/config/env/env.go +++ b/pkg/config/env/env.go @@ -6,7 +6,7 @@ import ( "regexp" "strings" - "github.com/containous/traefik/pkg/config/parser" + "github.com/containous/traefik/v2/pkg/config/parser" ) // DefaultNamePrefix is the default prefix for environment variable names. diff --git a/pkg/config/env/env_test.go b/pkg/config/env/env_test.go index 9294f4da6..9e399d283 100644 --- a/pkg/config/env/env_test.go +++ b/pkg/config/env/env_test.go @@ -3,8 +3,8 @@ package env import ( "testing" - "github.com/containous/traefik/pkg/config/generator" - "github.com/containous/traefik/pkg/config/parser" + "github.com/containous/traefik/v2/pkg/config/generator" + "github.com/containous/traefik/v2/pkg/config/parser" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/config/env/filter.go b/pkg/config/env/filter.go index 78604bc38..56914d3b7 100644 --- a/pkg/config/env/filter.go +++ b/pkg/config/env/filter.go @@ -4,7 +4,7 @@ import ( "reflect" "strings" - "github.com/containous/traefik/pkg/config/parser" + "github.com/containous/traefik/v2/pkg/config/parser" ) // FindPrefixedEnvVars finds prefixed environment variables. diff --git a/pkg/config/file/file.go b/pkg/config/file/file.go index 6601669ce..2c0ca10e0 100644 --- a/pkg/config/file/file.go +++ b/pkg/config/file/file.go @@ -2,7 +2,7 @@ package file import ( - "github.com/containous/traefik/pkg/config/parser" + "github.com/containous/traefik/v2/pkg/config/parser" ) // Decode decodes the given configuration file into the given element. diff --git a/pkg/config/file/file_node.go b/pkg/config/file/file_node.go index 0c64f6e35..a18a8e8c4 100644 --- a/pkg/config/file/file_node.go +++ b/pkg/config/file/file_node.go @@ -8,7 +8,7 @@ import ( "strings" "github.com/BurntSushi/toml" - "github.com/containous/traefik/pkg/config/parser" + "github.com/containous/traefik/v2/pkg/config/parser" "gopkg.in/yaml.v2" ) diff --git a/pkg/config/file/file_node_test.go b/pkg/config/file/file_node_test.go index affb8513b..1d9db2cde 100644 --- a/pkg/config/file/file_node_test.go +++ b/pkg/config/file/file_node_test.go @@ -3,7 +3,7 @@ package file import ( "testing" - "github.com/containous/traefik/pkg/config/parser" + "github.com/containous/traefik/v2/pkg/config/parser" "github.com/stretchr/testify/assert" ) diff --git a/pkg/config/file/raw_node.go b/pkg/config/file/raw_node.go index f39499898..135e9cd68 100644 --- a/pkg/config/file/raw_node.go +++ b/pkg/config/file/raw_node.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "github.com/containous/traefik/pkg/config/parser" + "github.com/containous/traefik/v2/pkg/config/parser" ) func decodeRawToNode(data map[string]interface{}, rootName string, filters ...string) (*parser.Node, error) { diff --git a/pkg/config/file/raw_node_test.go b/pkg/config/file/raw_node_test.go index dd3fea861..cd57c74bd 100644 --- a/pkg/config/file/raw_node_test.go +++ b/pkg/config/file/raw_node_test.go @@ -3,7 +3,7 @@ package file import ( "testing" - "github.com/containous/traefik/pkg/config/parser" + "github.com/containous/traefik/v2/pkg/config/parser" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/config/flag/flag.go b/pkg/config/flag/flag.go index 91a356f3b..354335647 100644 --- a/pkg/config/flag/flag.go +++ b/pkg/config/flag/flag.go @@ -2,7 +2,7 @@ package flag import ( - "github.com/containous/traefik/pkg/config/parser" + "github.com/containous/traefik/v2/pkg/config/parser" ) // Decode decodes the given flag arguments into the given element. diff --git a/pkg/config/flag/flag_test.go b/pkg/config/flag/flag_test.go index 171a3f714..27112020a 100644 --- a/pkg/config/flag/flag_test.go +++ b/pkg/config/flag/flag_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" - "github.com/containous/traefik/pkg/config/generator" - "github.com/containous/traefik/pkg/config/parser" - "github.com/containous/traefik/pkg/types" + "github.com/containous/traefik/v2/pkg/config/generator" + "github.com/containous/traefik/v2/pkg/config/parser" + "github.com/containous/traefik/v2/pkg/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/config/flag/flagparser.go b/pkg/config/flag/flagparser.go index d28248315..5638e7649 100644 --- a/pkg/config/flag/flagparser.go +++ b/pkg/config/flag/flagparser.go @@ -5,7 +5,7 @@ import ( "reflect" "strings" - "github.com/containous/traefik/pkg/config/parser" + "github.com/containous/traefik/v2/pkg/config/parser" ) // Parse parses the command-line flag arguments into a map, diff --git a/pkg/config/flag/flagtype.go b/pkg/config/flag/flagtype.go index 93b4fd58d..12abd152d 100644 --- a/pkg/config/flag/flagtype.go +++ b/pkg/config/flag/flagtype.go @@ -4,7 +4,7 @@ import ( "reflect" "strings" - "github.com/containous/traefik/pkg/config/parser" + "github.com/containous/traefik/v2/pkg/config/parser" ) func getFlagTypes(element interface{}) map[string]reflect.Kind { diff --git a/pkg/config/flag/flagtype_test.go b/pkg/config/flag/flagtype_test.go index 046d25ea4..93dcb6fca 100644 --- a/pkg/config/flag/flagtype_test.go +++ b/pkg/config/flag/flagtype_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/containous/traefik/pkg/config/parser" + "github.com/containous/traefik/v2/pkg/config/parser" "github.com/stretchr/testify/assert" ) diff --git a/pkg/config/generator/generator.go b/pkg/config/generator/generator.go index b8956a565..3615169fd 100644 --- a/pkg/config/generator/generator.go +++ b/pkg/config/generator/generator.go @@ -4,7 +4,7 @@ package generator import ( "reflect" - "github.com/containous/traefik/pkg/config/parser" + "github.com/containous/traefik/v2/pkg/config/parser" ) type initializer interface { diff --git a/pkg/config/generator/generator_test.go b/pkg/config/generator/generator_test.go index fbd64a94d..70551db79 100644 --- a/pkg/config/generator/generator_test.go +++ b/pkg/config/generator/generator_test.go @@ -3,7 +3,7 @@ package generator import ( "testing" - "github.com/containous/traefik/pkg/config/parser" + "github.com/containous/traefik/v2/pkg/config/parser" "github.com/stretchr/testify/assert" ) diff --git a/pkg/config/label/label.go b/pkg/config/label/label.go index 09fdfac4e..c3fcc94fd 100644 --- a/pkg/config/label/label.go +++ b/pkg/config/label/label.go @@ -2,8 +2,8 @@ package label import ( - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/config/parser" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/config/parser" ) // DecodeConfiguration converts the labels to a configuration. diff --git a/pkg/config/label/label_test.go b/pkg/config/label/label_test.go index f7a305afd..edeca179e 100644 --- a/pkg/config/label/label_test.go +++ b/pkg/config/label/label_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/containous/traefik/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/config/dynamic" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/config/parser/element_fill.go b/pkg/config/parser/element_fill.go index 8b6119b73..0aa0a8bdb 100644 --- a/pkg/config/parser/element_fill.go +++ b/pkg/config/parser/element_fill.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/containous/traefik/pkg/types" + "github.com/containous/traefik/v2/pkg/types" ) type initializer interface { diff --git a/pkg/config/parser/element_fill_test.go b/pkg/config/parser/element_fill_test.go index db0726c45..664b81bd7 100644 --- a/pkg/config/parser/element_fill_test.go +++ b/pkg/config/parser/element_fill_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/containous/traefik/pkg/types" + "github.com/containous/traefik/v2/pkg/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/config/parser/flat_encode.go b/pkg/config/parser/flat_encode.go index a18e6daf7..443e7dad1 100644 --- a/pkg/config/parser/flat_encode.go +++ b/pkg/config/parser/flat_encode.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/containous/traefik/pkg/types" + "github.com/containous/traefik/v2/pkg/types" ) const defaultPtrValue = "false" diff --git a/pkg/config/parser/flat_encode_test.go b/pkg/config/parser/flat_encode_test.go index 665bd894b..69f94f42c 100644 --- a/pkg/config/parser/flat_encode_test.go +++ b/pkg/config/parser/flat_encode_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/containous/traefik/pkg/types" + "github.com/containous/traefik/v2/pkg/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/config/runtime/runtime.go b/pkg/config/runtime/runtime.go index aac70cc56..c64b22cbe 100644 --- a/pkg/config/runtime/runtime.go +++ b/pkg/config/runtime/runtime.go @@ -6,8 +6,8 @@ import ( "strings" "sync" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/log" ) // Status of the router/service diff --git a/pkg/config/runtime/runtime_test.go b/pkg/config/runtime/runtime_test.go index 0d5885f22..5a20af3d9 100644 --- a/pkg/config/runtime/runtime_test.go +++ b/pkg/config/runtime/runtime_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/config/runtime" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/config/runtime" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/config/static/static_config.go b/pkg/config/static/static_config.go index 3b568c458..a701b5e6c 100644 --- a/pkg/config/static/static_config.go +++ b/pkg/config/static/static_config.go @@ -6,25 +6,25 @@ import ( "strings" "time" - "github.com/containous/traefik/pkg/log" - "github.com/containous/traefik/pkg/ping" - acmeprovider "github.com/containous/traefik/pkg/provider/acme" - "github.com/containous/traefik/pkg/provider/docker" - "github.com/containous/traefik/pkg/provider/file" - "github.com/containous/traefik/pkg/provider/kubernetes/crd" - "github.com/containous/traefik/pkg/provider/kubernetes/ingress" - "github.com/containous/traefik/pkg/provider/marathon" - "github.com/containous/traefik/pkg/provider/rancher" - "github.com/containous/traefik/pkg/provider/rest" - "github.com/containous/traefik/pkg/tls" - "github.com/containous/traefik/pkg/tracing/datadog" - "github.com/containous/traefik/pkg/tracing/haystack" - "github.com/containous/traefik/pkg/tracing/instana" - "github.com/containous/traefik/pkg/tracing/jaeger" - "github.com/containous/traefik/pkg/tracing/zipkin" - "github.com/containous/traefik/pkg/types" + "github.com/containous/traefik/v2/pkg/log" + "github.com/containous/traefik/v2/pkg/ping" + acmeprovider "github.com/containous/traefik/v2/pkg/provider/acme" + "github.com/containous/traefik/v2/pkg/provider/docker" + "github.com/containous/traefik/v2/pkg/provider/file" + "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd" + "github.com/containous/traefik/v2/pkg/provider/kubernetes/ingress" + "github.com/containous/traefik/v2/pkg/provider/marathon" + "github.com/containous/traefik/v2/pkg/provider/rancher" + "github.com/containous/traefik/v2/pkg/provider/rest" + "github.com/containous/traefik/v2/pkg/tls" + "github.com/containous/traefik/v2/pkg/tracing/datadog" + "github.com/containous/traefik/v2/pkg/tracing/haystack" + "github.com/containous/traefik/v2/pkg/tracing/instana" + "github.com/containous/traefik/v2/pkg/tracing/jaeger" + "github.com/containous/traefik/v2/pkg/tracing/zipkin" + "github.com/containous/traefik/v2/pkg/types" assetfs "github.com/elazarl/go-bindata-assetfs" - legolog "github.com/go-acme/lego/log" + legolog "github.com/go-acme/lego/v3/log" "github.com/sirupsen/logrus" ) diff --git a/pkg/healthcheck/healthcheck.go b/pkg/healthcheck/healthcheck.go index e821e5efe..0e5ff0de7 100644 --- a/pkg/healthcheck/healthcheck.go +++ b/pkg/healthcheck/healthcheck.go @@ -10,9 +10,9 @@ import ( "sync" "time" - "github.com/containous/traefik/pkg/config/runtime" - "github.com/containous/traefik/pkg/log" - "github.com/containous/traefik/pkg/safe" + "github.com/containous/traefik/v2/pkg/config/runtime" + "github.com/containous/traefik/v2/pkg/log" + "github.com/containous/traefik/v2/pkg/safe" "github.com/go-kit/kit/metrics" "github.com/vulcand/oxy/roundrobin" ) diff --git a/pkg/healthcheck/healthcheck_test.go b/pkg/healthcheck/healthcheck_test.go index b70ff7d93..fc9bbd9c1 100644 --- a/pkg/healthcheck/healthcheck_test.go +++ b/pkg/healthcheck/healthcheck_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "github.com/containous/traefik/pkg/config/runtime" - "github.com/containous/traefik/pkg/testhelpers" + "github.com/containous/traefik/v2/pkg/config/runtime" + "github.com/containous/traefik/v2/pkg/testhelpers" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/vulcand/oxy/roundrobin" diff --git a/pkg/hostresolver/hostresolver.go b/pkg/hostresolver/hostresolver.go index cbf5f8164..2a7c7dcee 100644 --- a/pkg/hostresolver/hostresolver.go +++ b/pkg/hostresolver/hostresolver.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/v2/pkg/log" "github.com/miekg/dns" "github.com/patrickmn/go-cache" ) diff --git a/pkg/job/job.go b/pkg/job/job.go index 658ed86ae..244e449ed 100644 --- a/pkg/job/job.go +++ b/pkg/job/job.go @@ -3,7 +3,7 @@ package job import ( "time" - "github.com/cenkalti/backoff" + "github.com/cenkalti/backoff/v3" ) var ( diff --git a/pkg/job/job_test.go b/pkg/job/job_test.go index 0f85e45f0..5e3c488e6 100644 --- a/pkg/job/job_test.go +++ b/pkg/job/job_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/cenkalti/backoff" + "github.com/cenkalti/backoff/v3" ) func TestJobBackOff(t *testing.T) { diff --git a/pkg/metrics/datadog.go b/pkg/metrics/datadog.go index f2f9b026d..fcd564461 100644 --- a/pkg/metrics/datadog.go +++ b/pkg/metrics/datadog.go @@ -4,9 +4,9 @@ import ( "context" "time" - "github.com/containous/traefik/pkg/log" - "github.com/containous/traefik/pkg/safe" - "github.com/containous/traefik/pkg/types" + "github.com/containous/traefik/v2/pkg/log" + "github.com/containous/traefik/v2/pkg/safe" + "github.com/containous/traefik/v2/pkg/types" kitlog "github.com/go-kit/kit/log" "github.com/go-kit/kit/metrics/dogstatsd" ) diff --git a/pkg/metrics/datadog_test.go b/pkg/metrics/datadog_test.go index a01252fe4..32e4fc1d7 100644 --- a/pkg/metrics/datadog_test.go +++ b/pkg/metrics/datadog_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/containous/traefik/pkg/types" + "github.com/containous/traefik/v2/pkg/types" "github.com/stvp/go-udp-testing" ) diff --git a/pkg/metrics/influxdb.go b/pkg/metrics/influxdb.go index eae96d123..3bc859889 100644 --- a/pkg/metrics/influxdb.go +++ b/pkg/metrics/influxdb.go @@ -8,9 +8,9 @@ import ( "regexp" "time" - "github.com/containous/traefik/pkg/log" - "github.com/containous/traefik/pkg/safe" - "github.com/containous/traefik/pkg/types" + "github.com/containous/traefik/v2/pkg/log" + "github.com/containous/traefik/v2/pkg/safe" + "github.com/containous/traefik/v2/pkg/types" kitlog "github.com/go-kit/kit/log" "github.com/go-kit/kit/metrics/influx" influxdb "github.com/influxdata/influxdb1-client/v2" diff --git a/pkg/metrics/influxdb_test.go b/pkg/metrics/influxdb_test.go index 5b72fc632..10df13633 100644 --- a/pkg/metrics/influxdb_test.go +++ b/pkg/metrics/influxdb_test.go @@ -11,7 +11,7 @@ import ( "testing" "time" - "github.com/containous/traefik/pkg/types" + "github.com/containous/traefik/v2/pkg/types" "github.com/stvp/go-udp-testing" ) diff --git a/pkg/metrics/prometheus.go b/pkg/metrics/prometheus.go index bca770b3c..ffe236b94 100644 --- a/pkg/metrics/prometheus.go +++ b/pkg/metrics/prometheus.go @@ -8,12 +8,12 @@ import ( "strings" "sync" - "github.com/containous/mux" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/log" - "github.com/containous/traefik/pkg/safe" - "github.com/containous/traefik/pkg/types" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/log" + "github.com/containous/traefik/v2/pkg/safe" + "github.com/containous/traefik/v2/pkg/types" "github.com/go-kit/kit/metrics" + "github.com/gorilla/mux" stdprometheus "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" ) diff --git a/pkg/metrics/prometheus_test.go b/pkg/metrics/prometheus_test.go index 36a6fc970..7c0c5ed02 100644 --- a/pkg/metrics/prometheus_test.go +++ b/pkg/metrics/prometheus_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - "github.com/containous/traefik/pkg/config/dynamic" - th "github.com/containous/traefik/pkg/testhelpers" - "github.com/containous/traefik/pkg/types" + "github.com/containous/traefik/v2/pkg/config/dynamic" + th "github.com/containous/traefik/v2/pkg/testhelpers" + "github.com/containous/traefik/v2/pkg/types" "github.com/prometheus/client_golang/prometheus" dto "github.com/prometheus/client_model/go" "github.com/stretchr/testify/assert" diff --git a/pkg/metrics/statsd.go b/pkg/metrics/statsd.go index 38147ec2f..8ebf6986e 100644 --- a/pkg/metrics/statsd.go +++ b/pkg/metrics/statsd.go @@ -4,9 +4,9 @@ import ( "context" "time" - "github.com/containous/traefik/pkg/log" - "github.com/containous/traefik/pkg/safe" - "github.com/containous/traefik/pkg/types" + "github.com/containous/traefik/v2/pkg/log" + "github.com/containous/traefik/v2/pkg/safe" + "github.com/containous/traefik/v2/pkg/types" kitlog "github.com/go-kit/kit/log" "github.com/go-kit/kit/metrics/statsd" ) diff --git a/pkg/metrics/statsd_test.go b/pkg/metrics/statsd_test.go index c2c6f2f33..240685d67 100644 --- a/pkg/metrics/statsd_test.go +++ b/pkg/metrics/statsd_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/containous/traefik/pkg/types" + "github.com/containous/traefik/v2/pkg/types" "github.com/stvp/go-udp-testing" ) diff --git a/pkg/middlewares/accesslog/capture_response_writer.go b/pkg/middlewares/accesslog/capture_response_writer.go index 200db3c12..094b5c922 100644 --- a/pkg/middlewares/accesslog/capture_response_writer.go +++ b/pkg/middlewares/accesslog/capture_response_writer.go @@ -6,7 +6,7 @@ import ( "net" "net/http" - "github.com/containous/traefik/pkg/middlewares" + "github.com/containous/traefik/v2/pkg/middlewares" ) var ( diff --git a/pkg/middlewares/accesslog/logger.go b/pkg/middlewares/accesslog/logger.go index a07945ed7..4cce7fe06 100644 --- a/pkg/middlewares/accesslog/logger.go +++ b/pkg/middlewares/accesslog/logger.go @@ -13,8 +13,8 @@ import ( "time" "github.com/containous/alice" - "github.com/containous/traefik/pkg/log" - "github.com/containous/traefik/pkg/types" + "github.com/containous/traefik/v2/pkg/log" + "github.com/containous/traefik/v2/pkg/types" "github.com/sirupsen/logrus" ) diff --git a/pkg/middlewares/accesslog/logger_test.go b/pkg/middlewares/accesslog/logger_test.go index db11adb2a..f133ae530 100644 --- a/pkg/middlewares/accesslog/logger_test.go +++ b/pkg/middlewares/accesslog/logger_test.go @@ -14,7 +14,7 @@ import ( "testing" "time" - "github.com/containous/traefik/pkg/types" + "github.com/containous/traefik/v2/pkg/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/middlewares/addprefix/add_prefix.go b/pkg/middlewares/addprefix/add_prefix.go index c2d44c086..02374ea89 100644 --- a/pkg/middlewares/addprefix/add_prefix.go +++ b/pkg/middlewares/addprefix/add_prefix.go @@ -5,9 +5,9 @@ import ( "fmt" "net/http" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/middlewares" - "github.com/containous/traefik/pkg/tracing" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/middlewares" + "github.com/containous/traefik/v2/pkg/tracing" "github.com/opentracing/opentracing-go/ext" ) diff --git a/pkg/middlewares/addprefix/add_prefix_test.go b/pkg/middlewares/addprefix/add_prefix_test.go index 01d1c16d1..1d130a083 100644 --- a/pkg/middlewares/addprefix/add_prefix_test.go +++ b/pkg/middlewares/addprefix/add_prefix_test.go @@ -5,8 +5,8 @@ import ( "net/http" "testing" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/testhelpers" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/testhelpers" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/middlewares/auth/basic_auth.go b/pkg/middlewares/auth/basic_auth.go index 62ec3773e..62eca1cb9 100644 --- a/pkg/middlewares/auth/basic_auth.go +++ b/pkg/middlewares/auth/basic_auth.go @@ -8,10 +8,10 @@ import ( "strings" goauth "github.com/abbot/go-http-auth" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/middlewares" - "github.com/containous/traefik/pkg/middlewares/accesslog" - "github.com/containous/traefik/pkg/tracing" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/middlewares" + "github.com/containous/traefik/v2/pkg/middlewares/accesslog" + "github.com/containous/traefik/v2/pkg/tracing" "github.com/opentracing/opentracing-go/ext" ) diff --git a/pkg/middlewares/auth/basic_auth_test.go b/pkg/middlewares/auth/basic_auth_test.go index 103fd7771..19e176202 100644 --- a/pkg/middlewares/auth/basic_auth_test.go +++ b/pkg/middlewares/auth/basic_auth_test.go @@ -9,8 +9,8 @@ import ( "os" "testing" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/testhelpers" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/testhelpers" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/middlewares/auth/digest_auth.go b/pkg/middlewares/auth/digest_auth.go index 3611b2cd5..25cb29cda 100644 --- a/pkg/middlewares/auth/digest_auth.go +++ b/pkg/middlewares/auth/digest_auth.go @@ -8,10 +8,10 @@ import ( "strings" goauth "github.com/abbot/go-http-auth" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/middlewares" - "github.com/containous/traefik/pkg/middlewares/accesslog" - "github.com/containous/traefik/pkg/tracing" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/middlewares" + "github.com/containous/traefik/v2/pkg/middlewares/accesslog" + "github.com/containous/traefik/v2/pkg/tracing" "github.com/opentracing/opentracing-go/ext" ) diff --git a/pkg/middlewares/auth/digest_auth_test.go b/pkg/middlewares/auth/digest_auth_test.go index 7fc16e1f1..0993be036 100644 --- a/pkg/middlewares/auth/digest_auth_test.go +++ b/pkg/middlewares/auth/digest_auth_test.go @@ -9,8 +9,8 @@ import ( "os" "testing" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/testhelpers" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/testhelpers" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/middlewares/auth/forward.go b/pkg/middlewares/auth/forward.go index 7e074b29f..85891f76e 100644 --- a/pkg/middlewares/auth/forward.go +++ b/pkg/middlewares/auth/forward.go @@ -9,9 +9,9 @@ import ( "net/http" "strings" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/middlewares" - "github.com/containous/traefik/pkg/tracing" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/middlewares" + "github.com/containous/traefik/v2/pkg/tracing" "github.com/opentracing/opentracing-go/ext" "github.com/vulcand/oxy/forward" "github.com/vulcand/oxy/utils" diff --git a/pkg/middlewares/auth/forward_test.go b/pkg/middlewares/auth/forward_test.go index 9b698186d..a816fb813 100644 --- a/pkg/middlewares/auth/forward_test.go +++ b/pkg/middlewares/auth/forward_test.go @@ -8,8 +8,8 @@ import ( "net/http/httptest" "testing" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/testhelpers" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/testhelpers" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/vulcand/oxy/forward" diff --git a/pkg/middlewares/buffering/buffering.go b/pkg/middlewares/buffering/buffering.go index d247b2de2..97fdd1314 100644 --- a/pkg/middlewares/buffering/buffering.go +++ b/pkg/middlewares/buffering/buffering.go @@ -4,9 +4,9 @@ import ( "context" "net/http" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/middlewares" - "github.com/containous/traefik/pkg/tracing" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/middlewares" + "github.com/containous/traefik/v2/pkg/tracing" "github.com/opentracing/opentracing-go/ext" oxybuffer "github.com/vulcand/oxy/buffer" ) diff --git a/pkg/middlewares/chain/chain.go b/pkg/middlewares/chain/chain.go index 914766a9d..ee3668bbd 100644 --- a/pkg/middlewares/chain/chain.go +++ b/pkg/middlewares/chain/chain.go @@ -5,8 +5,8 @@ import ( "net/http" "github.com/containous/alice" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/middlewares" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/middlewares" ) const ( diff --git a/pkg/middlewares/circuitbreaker/circuit_breaker.go b/pkg/middlewares/circuitbreaker/circuit_breaker.go index cb57b8894..dc561b465 100644 --- a/pkg/middlewares/circuitbreaker/circuit_breaker.go +++ b/pkg/middlewares/circuitbreaker/circuit_breaker.go @@ -4,10 +4,10 @@ import ( "context" "net/http" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/log" - "github.com/containous/traefik/pkg/middlewares" - "github.com/containous/traefik/pkg/tracing" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/log" + "github.com/containous/traefik/v2/pkg/middlewares" + "github.com/containous/traefik/v2/pkg/tracing" "github.com/opentracing/opentracing-go/ext" "github.com/vulcand/oxy/cbreaker" ) diff --git a/pkg/middlewares/compress/compress.go b/pkg/middlewares/compress/compress.go index 8d3c3d933..2e9be3b81 100644 --- a/pkg/middlewares/compress/compress.go +++ b/pkg/middlewares/compress/compress.go @@ -7,8 +7,8 @@ import ( "strings" "github.com/NYTimes/gziphandler" - "github.com/containous/traefik/pkg/middlewares" - "github.com/containous/traefik/pkg/tracing" + "github.com/containous/traefik/v2/pkg/middlewares" + "github.com/containous/traefik/v2/pkg/tracing" "github.com/opentracing/opentracing-go/ext" "github.com/sirupsen/logrus" ) diff --git a/pkg/middlewares/compress/compress_test.go b/pkg/middlewares/compress/compress_test.go index 6f2c4e923..bca126916 100644 --- a/pkg/middlewares/compress/compress_test.go +++ b/pkg/middlewares/compress/compress_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/NYTimes/gziphandler" - "github.com/containous/traefik/pkg/testhelpers" + "github.com/containous/traefik/v2/pkg/testhelpers" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/middlewares/customerrors/custom_errors.go b/pkg/middlewares/customerrors/custom_errors.go index 77a552c2f..c88c90c2f 100644 --- a/pkg/middlewares/customerrors/custom_errors.go +++ b/pkg/middlewares/customerrors/custom_errors.go @@ -11,10 +11,10 @@ import ( "strconv" "strings" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/middlewares" - "github.com/containous/traefik/pkg/tracing" - "github.com/containous/traefik/pkg/types" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/middlewares" + "github.com/containous/traefik/v2/pkg/tracing" + "github.com/containous/traefik/v2/pkg/types" "github.com/opentracing/opentracing-go/ext" "github.com/sirupsen/logrus" "github.com/vulcand/oxy/utils" diff --git a/pkg/middlewares/customerrors/custom_errors_test.go b/pkg/middlewares/customerrors/custom_errors_test.go index cf7d577b9..19aee2437 100644 --- a/pkg/middlewares/customerrors/custom_errors_test.go +++ b/pkg/middlewares/customerrors/custom_errors_test.go @@ -7,9 +7,9 @@ import ( "net/http/httptest" "testing" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/middlewares" - "github.com/containous/traefik/pkg/testhelpers" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/middlewares" + "github.com/containous/traefik/v2/pkg/testhelpers" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/middlewares/emptybackendhandler/empty_backend_handler.go b/pkg/middlewares/emptybackendhandler/empty_backend_handler.go index 532e8cbd5..73743adfb 100644 --- a/pkg/middlewares/emptybackendhandler/empty_backend_handler.go +++ b/pkg/middlewares/emptybackendhandler/empty_backend_handler.go @@ -3,7 +3,7 @@ package emptybackendhandler import ( "net/http" - "github.com/containous/traefik/pkg/healthcheck" + "github.com/containous/traefik/v2/pkg/healthcheck" ) // EmptyBackend is a middleware that checks whether the current Backend diff --git a/pkg/middlewares/emptybackendhandler/empty_backend_handler_test.go b/pkg/middlewares/emptybackendhandler/empty_backend_handler_test.go index 514748698..dc4e89c94 100644 --- a/pkg/middlewares/emptybackendhandler/empty_backend_handler_test.go +++ b/pkg/middlewares/emptybackendhandler/empty_backend_handler_test.go @@ -7,7 +7,7 @@ import ( "net/url" "testing" - "github.com/containous/traefik/pkg/testhelpers" + "github.com/containous/traefik/v2/pkg/testhelpers" "github.com/stretchr/testify/assert" "github.com/vulcand/oxy/roundrobin" ) diff --git a/pkg/middlewares/forwardedheaders/forwarded_header.go b/pkg/middlewares/forwardedheaders/forwarded_header.go index 09f350353..455e756ec 100644 --- a/pkg/middlewares/forwardedheaders/forwarded_header.go +++ b/pkg/middlewares/forwardedheaders/forwarded_header.go @@ -6,7 +6,7 @@ import ( "os" "strings" - "github.com/containous/traefik/pkg/ip" + "github.com/containous/traefik/v2/pkg/ip" ) const ( diff --git a/pkg/middlewares/handler_switcher.go b/pkg/middlewares/handler_switcher.go index a52432aef..79be6d2e9 100644 --- a/pkg/middlewares/handler_switcher.go +++ b/pkg/middlewares/handler_switcher.go @@ -3,7 +3,7 @@ package middlewares import ( "net/http" - "github.com/containous/traefik/pkg/safe" + "github.com/containous/traefik/v2/pkg/safe" ) // HTTPHandlerSwitcher allows hot switching of http.ServeMux diff --git a/pkg/middlewares/headers/headers.go b/pkg/middlewares/headers/headers.go index d496ba5e5..63a623e13 100644 --- a/pkg/middlewares/headers/headers.go +++ b/pkg/middlewares/headers/headers.go @@ -8,9 +8,9 @@ import ( "strconv" "strings" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/middlewares" - "github.com/containous/traefik/pkg/tracing" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/middlewares" + "github.com/containous/traefik/v2/pkg/tracing" "github.com/opentracing/opentracing-go/ext" "github.com/unrolled/secure" ) diff --git a/pkg/middlewares/headers/headers_test.go b/pkg/middlewares/headers/headers_test.go index d4ec57e73..592be7a02 100644 --- a/pkg/middlewares/headers/headers_test.go +++ b/pkg/middlewares/headers/headers_test.go @@ -8,9 +8,9 @@ import ( "net/http/httptest" "testing" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/testhelpers" - "github.com/containous/traefik/pkg/tracing" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/testhelpers" + "github.com/containous/traefik/v2/pkg/tracing" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/middlewares/ipwhitelist/ip_whitelist.go b/pkg/middlewares/ipwhitelist/ip_whitelist.go index 659800c51..20c9bd7bc 100644 --- a/pkg/middlewares/ipwhitelist/ip_whitelist.go +++ b/pkg/middlewares/ipwhitelist/ip_whitelist.go @@ -6,10 +6,10 @@ import ( "fmt" "net/http" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/ip" - "github.com/containous/traefik/pkg/middlewares" - "github.com/containous/traefik/pkg/tracing" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/ip" + "github.com/containous/traefik/v2/pkg/middlewares" + "github.com/containous/traefik/v2/pkg/tracing" "github.com/opentracing/opentracing-go/ext" "github.com/sirupsen/logrus" ) diff --git a/pkg/middlewares/ipwhitelist/ip_whitelist_test.go b/pkg/middlewares/ipwhitelist/ip_whitelist_test.go index 5200dea54..940716292 100644 --- a/pkg/middlewares/ipwhitelist/ip_whitelist_test.go +++ b/pkg/middlewares/ipwhitelist/ip_whitelist_test.go @@ -6,7 +6,7 @@ import ( "net/http/httptest" "testing" - "github.com/containous/traefik/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/config/dynamic" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/middlewares/maxconnection/max_connection.go b/pkg/middlewares/maxconnection/max_connection.go index e81c3089b..9e3660fa0 100644 --- a/pkg/middlewares/maxconnection/max_connection.go +++ b/pkg/middlewares/maxconnection/max_connection.go @@ -5,9 +5,9 @@ import ( "fmt" "net/http" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/middlewares" - "github.com/containous/traefik/pkg/tracing" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/middlewares" + "github.com/containous/traefik/v2/pkg/tracing" "github.com/opentracing/opentracing-go/ext" "github.com/vulcand/oxy/connlimit" "github.com/vulcand/oxy/utils" diff --git a/pkg/middlewares/metrics/metrics.go b/pkg/middlewares/metrics/metrics.go index d66d3b16f..6f86095e7 100644 --- a/pkg/middlewares/metrics/metrics.go +++ b/pkg/middlewares/metrics/metrics.go @@ -10,10 +10,10 @@ import ( "unicode/utf8" "github.com/containous/alice" - "github.com/containous/traefik/pkg/log" - "github.com/containous/traefik/pkg/metrics" - "github.com/containous/traefik/pkg/middlewares" - "github.com/containous/traefik/pkg/middlewares/retry" + "github.com/containous/traefik/v2/pkg/log" + "github.com/containous/traefik/v2/pkg/metrics" + "github.com/containous/traefik/v2/pkg/middlewares" + "github.com/containous/traefik/v2/pkg/middlewares/retry" gokitmetrics "github.com/go-kit/kit/metrics" ) diff --git a/pkg/middlewares/middleware.go b/pkg/middlewares/middleware.go index 0c65b9745..2b76b2bc8 100644 --- a/pkg/middlewares/middleware.go +++ b/pkg/middlewares/middleware.go @@ -3,7 +3,7 @@ package middlewares import ( "context" - "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/v2/pkg/log" "github.com/sirupsen/logrus" ) diff --git a/pkg/middlewares/passtlsclientcert/pass_tls_client_cert.go b/pkg/middlewares/passtlsclientcert/pass_tls_client_cert.go index 22002ef26..64d6f2fea 100644 --- a/pkg/middlewares/passtlsclientcert/pass_tls_client_cert.go +++ b/pkg/middlewares/passtlsclientcert/pass_tls_client_cert.go @@ -11,10 +11,10 @@ import ( "net/url" "strings" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/log" - "github.com/containous/traefik/pkg/middlewares" - "github.com/containous/traefik/pkg/tracing" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/log" + "github.com/containous/traefik/v2/pkg/middlewares" + "github.com/containous/traefik/v2/pkg/tracing" "github.com/opentracing/opentracing-go/ext" "github.com/sirupsen/logrus" ) diff --git a/pkg/middlewares/passtlsclientcert/pass_tls_client_cert_test.go b/pkg/middlewares/passtlsclientcert/pass_tls_client_cert_test.go index a2c6cd967..5ba15c535 100644 --- a/pkg/middlewares/passtlsclientcert/pass_tls_client_cert_test.go +++ b/pkg/middlewares/passtlsclientcert/pass_tls_client_cert_test.go @@ -13,8 +13,8 @@ import ( "strings" "testing" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/testhelpers" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/testhelpers" "github.com/stretchr/testify/require" ) diff --git a/pkg/middlewares/pipelining/pipelining.go b/pkg/middlewares/pipelining/pipelining.go index cd0340f3f..e2cf2898a 100644 --- a/pkg/middlewares/pipelining/pipelining.go +++ b/pkg/middlewares/pipelining/pipelining.go @@ -6,7 +6,7 @@ import ( "net" "net/http" - "github.com/containous/traefik/pkg/middlewares" + "github.com/containous/traefik/v2/pkg/middlewares" ) const ( diff --git a/pkg/middlewares/ratelimiter/rate_limiter.go b/pkg/middlewares/ratelimiter/rate_limiter.go index 4f9e53865..157d7c8c5 100644 --- a/pkg/middlewares/ratelimiter/rate_limiter.go +++ b/pkg/middlewares/ratelimiter/rate_limiter.go @@ -5,9 +5,9 @@ import ( "net/http" "time" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/middlewares" - "github.com/containous/traefik/pkg/tracing" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/middlewares" + "github.com/containous/traefik/v2/pkg/tracing" "github.com/opentracing/opentracing-go/ext" "github.com/vulcand/oxy/ratelimit" "github.com/vulcand/oxy/utils" diff --git a/pkg/middlewares/recovery/recovery.go b/pkg/middlewares/recovery/recovery.go index 627478fdc..054b2d402 100644 --- a/pkg/middlewares/recovery/recovery.go +++ b/pkg/middlewares/recovery/recovery.go @@ -4,7 +4,7 @@ import ( "context" "net/http" - "github.com/containous/traefik/pkg/middlewares" + "github.com/containous/traefik/v2/pkg/middlewares" "github.com/sirupsen/logrus" ) diff --git a/pkg/middlewares/redirect/redirect.go b/pkg/middlewares/redirect/redirect.go index 44a7c0e4a..541c4ab7c 100644 --- a/pkg/middlewares/redirect/redirect.go +++ b/pkg/middlewares/redirect/redirect.go @@ -10,7 +10,7 @@ import ( "regexp" "strings" - "github.com/containous/traefik/pkg/tracing" + "github.com/containous/traefik/v2/pkg/tracing" "github.com/opentracing/opentracing-go/ext" "github.com/vulcand/oxy/utils" ) diff --git a/pkg/middlewares/redirect/redirect_regex.go b/pkg/middlewares/redirect/redirect_regex.go index 1028e2403..0c8f6406e 100644 --- a/pkg/middlewares/redirect/redirect_regex.go +++ b/pkg/middlewares/redirect/redirect_regex.go @@ -4,8 +4,8 @@ import ( "context" "net/http" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/middlewares" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/middlewares" ) const ( diff --git a/pkg/middlewares/redirect/redirect_regex_test.go b/pkg/middlewares/redirect/redirect_regex_test.go index 774f31b6d..9a3882003 100644 --- a/pkg/middlewares/redirect/redirect_regex_test.go +++ b/pkg/middlewares/redirect/redirect_regex_test.go @@ -7,8 +7,8 @@ import ( "net/http/httptest" "testing" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/testhelpers" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/testhelpers" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/middlewares/redirect/redirect_scheme.go b/pkg/middlewares/redirect/redirect_scheme.go index f95679eab..0ffd5d704 100644 --- a/pkg/middlewares/redirect/redirect_scheme.go +++ b/pkg/middlewares/redirect/redirect_scheme.go @@ -5,8 +5,8 @@ import ( "errors" "net/http" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/middlewares" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/middlewares" ) const ( diff --git a/pkg/middlewares/redirect/redirect_scheme_test.go b/pkg/middlewares/redirect/redirect_scheme_test.go index 3e5072aa3..7000912db 100644 --- a/pkg/middlewares/redirect/redirect_scheme_test.go +++ b/pkg/middlewares/redirect/redirect_scheme_test.go @@ -8,7 +8,7 @@ import ( "regexp" "testing" - "github.com/containous/traefik/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/config/dynamic" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/middlewares/replacepath/replace_path.go b/pkg/middlewares/replacepath/replace_path.go index 9706c425c..a53cc9a54 100644 --- a/pkg/middlewares/replacepath/replace_path.go +++ b/pkg/middlewares/replacepath/replace_path.go @@ -4,9 +4,9 @@ import ( "context" "net/http" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/middlewares" - "github.com/containous/traefik/pkg/tracing" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/middlewares" + "github.com/containous/traefik/v2/pkg/tracing" "github.com/opentracing/opentracing-go/ext" ) diff --git a/pkg/middlewares/replacepath/replace_path_test.go b/pkg/middlewares/replacepath/replace_path_test.go index 16d07442b..ca9e03e81 100644 --- a/pkg/middlewares/replacepath/replace_path_test.go +++ b/pkg/middlewares/replacepath/replace_path_test.go @@ -5,8 +5,8 @@ import ( "net/http" "testing" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/testhelpers" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/testhelpers" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/middlewares/replacepathregex/replace_path_regex.go b/pkg/middlewares/replacepathregex/replace_path_regex.go index 0421cc06f..89d3b062a 100644 --- a/pkg/middlewares/replacepathregex/replace_path_regex.go +++ b/pkg/middlewares/replacepathregex/replace_path_regex.go @@ -7,10 +7,10 @@ import ( "regexp" "strings" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/middlewares" - "github.com/containous/traefik/pkg/middlewares/replacepath" - "github.com/containous/traefik/pkg/tracing" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/middlewares" + "github.com/containous/traefik/v2/pkg/middlewares/replacepath" + "github.com/containous/traefik/v2/pkg/tracing" "github.com/opentracing/opentracing-go/ext" ) diff --git a/pkg/middlewares/replacepathregex/replace_path_regex_test.go b/pkg/middlewares/replacepathregex/replace_path_regex_test.go index fe73c6199..d865a5cc2 100644 --- a/pkg/middlewares/replacepathregex/replace_path_regex_test.go +++ b/pkg/middlewares/replacepathregex/replace_path_regex_test.go @@ -5,9 +5,9 @@ import ( "net/http" "testing" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/middlewares/replacepath" - "github.com/containous/traefik/pkg/testhelpers" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/middlewares/replacepath" + "github.com/containous/traefik/v2/pkg/testhelpers" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/middlewares/requestdecorator/hostresolver.go b/pkg/middlewares/requestdecorator/hostresolver.go index a5e7076d5..3c4652231 100644 --- a/pkg/middlewares/requestdecorator/hostresolver.go +++ b/pkg/middlewares/requestdecorator/hostresolver.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/v2/pkg/log" "github.com/miekg/dns" "github.com/patrickmn/go-cache" ) diff --git a/pkg/middlewares/requestdecorator/request_decorator.go b/pkg/middlewares/requestdecorator/request_decorator.go index a4c053cbe..eebf8a9e7 100644 --- a/pkg/middlewares/requestdecorator/request_decorator.go +++ b/pkg/middlewares/requestdecorator/request_decorator.go @@ -7,7 +7,7 @@ import ( "strings" "github.com/containous/alice" - "github.com/containous/traefik/pkg/types" + "github.com/containous/traefik/v2/pkg/types" ) const ( diff --git a/pkg/middlewares/requestdecorator/request_decorator_test.go b/pkg/middlewares/requestdecorator/request_decorator_test.go index 4cce6bd1b..a757c1f60 100644 --- a/pkg/middlewares/requestdecorator/request_decorator_test.go +++ b/pkg/middlewares/requestdecorator/request_decorator_test.go @@ -4,9 +4,9 @@ import ( "net/http" "testing" - "github.com/containous/traefik/pkg/types" + "github.com/containous/traefik/v2/pkg/types" - "github.com/containous/traefik/pkg/testhelpers" + "github.com/containous/traefik/v2/pkg/testhelpers" "github.com/stretchr/testify/assert" ) diff --git a/pkg/middlewares/retry/retry.go b/pkg/middlewares/retry/retry.go index 3658e69f0..05fd158f1 100644 --- a/pkg/middlewares/retry/retry.go +++ b/pkg/middlewares/retry/retry.go @@ -9,9 +9,9 @@ import ( "net/http" "net/http/httptrace" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/middlewares" - "github.com/containous/traefik/pkg/tracing" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/middlewares" + "github.com/containous/traefik/v2/pkg/tracing" "github.com/opentracing/opentracing-go/ext" ) diff --git a/pkg/middlewares/retry/retry_test.go b/pkg/middlewares/retry/retry_test.go index 9df97011b..3aad970fb 100644 --- a/pkg/middlewares/retry/retry_test.go +++ b/pkg/middlewares/retry/retry_test.go @@ -9,9 +9,9 @@ import ( "strings" "testing" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/middlewares/emptybackendhandler" - "github.com/containous/traefik/pkg/testhelpers" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/middlewares/emptybackendhandler" + "github.com/containous/traefik/v2/pkg/testhelpers" "github.com/gorilla/websocket" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/middlewares/stripprefix/strip_prefix.go b/pkg/middlewares/stripprefix/strip_prefix.go index 94c8de90e..42a113206 100644 --- a/pkg/middlewares/stripprefix/strip_prefix.go +++ b/pkg/middlewares/stripprefix/strip_prefix.go @@ -5,9 +5,9 @@ import ( "net/http" "strings" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/middlewares" - "github.com/containous/traefik/pkg/tracing" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/middlewares" + "github.com/containous/traefik/v2/pkg/tracing" "github.com/opentracing/opentracing-go/ext" ) diff --git a/pkg/middlewares/stripprefix/strip_prefix_test.go b/pkg/middlewares/stripprefix/strip_prefix_test.go index e1aed92cb..31d417162 100644 --- a/pkg/middlewares/stripprefix/strip_prefix_test.go +++ b/pkg/middlewares/stripprefix/strip_prefix_test.go @@ -6,8 +6,8 @@ import ( "net/http/httptest" "testing" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/testhelpers" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/testhelpers" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/middlewares/stripprefixregex/strip_prefix_regex.go b/pkg/middlewares/stripprefixregex/strip_prefix_regex.go index 6af3bb090..c2c98328e 100644 --- a/pkg/middlewares/stripprefixregex/strip_prefix_regex.go +++ b/pkg/middlewares/stripprefixregex/strip_prefix_regex.go @@ -5,11 +5,11 @@ import ( "net/http" "strings" - "github.com/containous/mux" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/middlewares" - "github.com/containous/traefik/pkg/middlewares/stripprefix" - "github.com/containous/traefik/pkg/tracing" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/middlewares" + "github.com/containous/traefik/v2/pkg/middlewares/stripprefix" + "github.com/containous/traefik/v2/pkg/tracing" + "github.com/gorilla/mux" "github.com/opentracing/opentracing-go/ext" ) diff --git a/pkg/middlewares/stripprefixregex/strip_prefix_regex_test.go b/pkg/middlewares/stripprefixregex/strip_prefix_regex_test.go index 01ba9224e..df67d9f57 100644 --- a/pkg/middlewares/stripprefixregex/strip_prefix_regex_test.go +++ b/pkg/middlewares/stripprefixregex/strip_prefix_regex_test.go @@ -6,9 +6,9 @@ import ( "net/http/httptest" "testing" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/middlewares/stripprefix" - "github.com/containous/traefik/pkg/testhelpers" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/middlewares/stripprefix" + "github.com/containous/traefik/v2/pkg/testhelpers" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/middlewares/tracing/entrypoint.go b/pkg/middlewares/tracing/entrypoint.go index 9fcc9471e..f7eeb7dc9 100644 --- a/pkg/middlewares/tracing/entrypoint.go +++ b/pkg/middlewares/tracing/entrypoint.go @@ -5,8 +5,8 @@ import ( "net/http" "github.com/containous/alice" - "github.com/containous/traefik/pkg/middlewares" - "github.com/containous/traefik/pkg/tracing" + "github.com/containous/traefik/v2/pkg/middlewares" + "github.com/containous/traefik/v2/pkg/tracing" "github.com/opentracing/opentracing-go" "github.com/opentracing/opentracing-go/ext" ) diff --git a/pkg/middlewares/tracing/entrypoint_test.go b/pkg/middlewares/tracing/entrypoint_test.go index 9d0ffd1dd..2fe090448 100644 --- a/pkg/middlewares/tracing/entrypoint_test.go +++ b/pkg/middlewares/tracing/entrypoint_test.go @@ -6,7 +6,7 @@ import ( "net/http/httptest" "testing" - "github.com/containous/traefik/pkg/tracing" + "github.com/containous/traefik/v2/pkg/tracing" "github.com/opentracing/opentracing-go/ext" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/middlewares/tracing/forwarder.go b/pkg/middlewares/tracing/forwarder.go index c485f927d..25f8ba8bc 100644 --- a/pkg/middlewares/tracing/forwarder.go +++ b/pkg/middlewares/tracing/forwarder.go @@ -4,8 +4,8 @@ import ( "context" "net/http" - "github.com/containous/traefik/pkg/middlewares" - "github.com/containous/traefik/pkg/tracing" + "github.com/containous/traefik/v2/pkg/middlewares" + "github.com/containous/traefik/v2/pkg/tracing" "github.com/opentracing/opentracing-go/ext" ) diff --git a/pkg/middlewares/tracing/forwarder_test.go b/pkg/middlewares/tracing/forwarder_test.go index f9253d859..7bf911aa0 100644 --- a/pkg/middlewares/tracing/forwarder_test.go +++ b/pkg/middlewares/tracing/forwarder_test.go @@ -6,7 +6,7 @@ import ( "net/http/httptest" "testing" - "github.com/containous/traefik/pkg/tracing" + "github.com/containous/traefik/v2/pkg/tracing" "github.com/opentracing/opentracing-go/ext" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/middlewares/tracing/wrapper.go b/pkg/middlewares/tracing/wrapper.go index a0686bf76..1e4204914 100644 --- a/pkg/middlewares/tracing/wrapper.go +++ b/pkg/middlewares/tracing/wrapper.go @@ -5,8 +5,8 @@ import ( "net/http" "github.com/containous/alice" - "github.com/containous/traefik/pkg/log" - "github.com/containous/traefik/pkg/tracing" + "github.com/containous/traefik/v2/pkg/log" + "github.com/containous/traefik/v2/pkg/tracing" "github.com/opentracing/opentracing-go/ext" ) diff --git a/pkg/ping/ping.go b/pkg/ping/ping.go index 4477c71c7..44383d8bc 100644 --- a/pkg/ping/ping.go +++ b/pkg/ping/ping.go @@ -5,7 +5,7 @@ import ( "fmt" "net/http" - "github.com/containous/mux" + "github.com/gorilla/mux" ) // Handler expose ping routes. diff --git a/pkg/provider/acme/account.go b/pkg/provider/acme/account.go index a997a92b5..1959745be 100644 --- a/pkg/provider/acme/account.go +++ b/pkg/provider/acme/account.go @@ -7,9 +7,9 @@ import ( "crypto/rsa" "crypto/x509" - "github.com/containous/traefik/pkg/log" - "github.com/go-acme/lego/certcrypto" - "github.com/go-acme/lego/registration" + "github.com/containous/traefik/v2/pkg/log" + "github.com/go-acme/lego/v3/certcrypto" + "github.com/go-acme/lego/v3/registration" ) // Account is used to store lets encrypt registration info diff --git a/pkg/provider/acme/challenge_http.go b/pkg/provider/acme/challenge_http.go index e370883d0..c224e3de5 100644 --- a/pkg/provider/acme/challenge_http.go +++ b/pkg/provider/acme/challenge_http.go @@ -6,12 +6,12 @@ import ( "net/http" "time" - "github.com/cenkalti/backoff" - "github.com/containous/mux" - "github.com/containous/traefik/pkg/log" - "github.com/containous/traefik/pkg/safe" - "github.com/go-acme/lego/challenge" - "github.com/go-acme/lego/challenge/http01" + "github.com/cenkalti/backoff/v3" + "github.com/containous/traefik/v2/pkg/log" + "github.com/containous/traefik/v2/pkg/safe" + "github.com/go-acme/lego/v3/challenge" + "github.com/go-acme/lego/v3/challenge/http01" + "github.com/gorilla/mux" ) var _ challenge.ProviderTimeout = (*challengeHTTP)(nil) diff --git a/pkg/provider/acme/challenge_tls.go b/pkg/provider/acme/challenge_tls.go index 196d2d256..2adba5537 100644 --- a/pkg/provider/acme/challenge_tls.go +++ b/pkg/provider/acme/challenge_tls.go @@ -3,10 +3,10 @@ package acme import ( "crypto/tls" - "github.com/containous/traefik/pkg/log" - "github.com/containous/traefik/pkg/types" - "github.com/go-acme/lego/challenge" - "github.com/go-acme/lego/challenge/tlsalpn01" + "github.com/containous/traefik/v2/pkg/log" + "github.com/containous/traefik/v2/pkg/types" + "github.com/go-acme/lego/v3/challenge" + "github.com/go-acme/lego/v3/challenge/tlsalpn01" ) var _ challenge.Provider = (*challengeTLSALPN)(nil) diff --git a/pkg/provider/acme/local_store.go b/pkg/provider/acme/local_store.go index 717f30c2c..e0786911b 100644 --- a/pkg/provider/acme/local_store.go +++ b/pkg/provider/acme/local_store.go @@ -7,8 +7,8 @@ import ( "os" "sync" - "github.com/containous/traefik/pkg/log" - "github.com/containous/traefik/pkg/safe" + "github.com/containous/traefik/v2/pkg/log" + "github.com/containous/traefik/v2/pkg/safe" ) var _ Store = (*LocalStore)(nil) diff --git a/pkg/provider/acme/provider.go b/pkg/provider/acme/provider.go index b20b8e8e0..2025eb5ff 100644 --- a/pkg/provider/acme/provider.go +++ b/pkg/provider/acme/provider.go @@ -12,19 +12,19 @@ import ( "sync" "time" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/log" - "github.com/containous/traefik/pkg/rules" - "github.com/containous/traefik/pkg/safe" - traefiktls "github.com/containous/traefik/pkg/tls" - "github.com/containous/traefik/pkg/types" - "github.com/containous/traefik/pkg/version" - "github.com/go-acme/lego/certificate" - "github.com/go-acme/lego/challenge" - "github.com/go-acme/lego/challenge/dns01" - "github.com/go-acme/lego/lego" - "github.com/go-acme/lego/providers/dns" - "github.com/go-acme/lego/registration" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/log" + "github.com/containous/traefik/v2/pkg/rules" + "github.com/containous/traefik/v2/pkg/safe" + traefiktls "github.com/containous/traefik/v2/pkg/tls" + "github.com/containous/traefik/v2/pkg/types" + "github.com/containous/traefik/v2/pkg/version" + "github.com/go-acme/lego/v3/certificate" + "github.com/go-acme/lego/v3/challenge" + "github.com/go-acme/lego/v3/challenge/dns01" + "github.com/go-acme/lego/v3/lego" + "github.com/go-acme/lego/v3/providers/dns" + "github.com/go-acme/lego/v3/registration" ) var ( diff --git a/pkg/provider/acme/provider_test.go b/pkg/provider/acme/provider_test.go index 2629dda10..49df9ac5b 100644 --- a/pkg/provider/acme/provider_test.go +++ b/pkg/provider/acme/provider_test.go @@ -5,9 +5,9 @@ import ( "crypto/tls" "testing" - "github.com/containous/traefik/pkg/safe" - "github.com/containous/traefik/pkg/types" - "github.com/go-acme/lego/certcrypto" + "github.com/containous/traefik/v2/pkg/safe" + "github.com/containous/traefik/v2/pkg/types" + "github.com/go-acme/lego/v3/certcrypto" "github.com/stretchr/testify/assert" ) diff --git a/pkg/provider/aggregator/aggregator.go b/pkg/provider/aggregator/aggregator.go index 403dc1416..5cc7ede82 100644 --- a/pkg/provider/aggregator/aggregator.go +++ b/pkg/provider/aggregator/aggregator.go @@ -3,12 +3,12 @@ package aggregator import ( "encoding/json" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/config/static" - "github.com/containous/traefik/pkg/log" - "github.com/containous/traefik/pkg/provider" - "github.com/containous/traefik/pkg/provider/file" - "github.com/containous/traefik/pkg/safe" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/config/static" + "github.com/containous/traefik/v2/pkg/log" + "github.com/containous/traefik/v2/pkg/provider" + "github.com/containous/traefik/v2/pkg/provider/file" + "github.com/containous/traefik/v2/pkg/safe" ) // ProviderAggregator aggregates providers. diff --git a/pkg/provider/configuration.go b/pkg/provider/configuration.go index 882a58255..7146e9d3e 100644 --- a/pkg/provider/configuration.go +++ b/pkg/provider/configuration.go @@ -10,8 +10,8 @@ import ( "unicode" "github.com/Masterminds/sprig" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/log" ) // Merge Merges multiple configurations. diff --git a/pkg/provider/docker/config.go b/pkg/provider/docker/config.go index d8474e60d..63858c17a 100644 --- a/pkg/provider/docker/config.go +++ b/pkg/provider/docker/config.go @@ -7,11 +7,11 @@ import ( "net" "strings" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/config/label" - "github.com/containous/traefik/pkg/log" - "github.com/containous/traefik/pkg/provider" - "github.com/containous/traefik/pkg/provider/constraints" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/config/label" + "github.com/containous/traefik/v2/pkg/log" + "github.com/containous/traefik/v2/pkg/provider" + "github.com/containous/traefik/v2/pkg/provider/constraints" "github.com/docker/go-connections/nat" ) diff --git a/pkg/provider/docker/config_test.go b/pkg/provider/docker/config_test.go index 107e9c4c6..c7a996593 100644 --- a/pkg/provider/docker/config_test.go +++ b/pkg/provider/docker/config_test.go @@ -5,7 +5,7 @@ import ( "strconv" "testing" - "github.com/containous/traefik/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/config/dynamic" docker "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/swarm" "github.com/docker/go-connections/nat" diff --git a/pkg/provider/docker/docker.go b/pkg/provider/docker/docker.go index dc7dff779..9d3d4c038 100644 --- a/pkg/provider/docker/docker.go +++ b/pkg/provider/docker/docker.go @@ -11,14 +11,14 @@ import ( "text/template" "time" - "github.com/cenkalti/backoff" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/job" - "github.com/containous/traefik/pkg/log" - "github.com/containous/traefik/pkg/provider" - "github.com/containous/traefik/pkg/safe" - "github.com/containous/traefik/pkg/types" - "github.com/containous/traefik/pkg/version" + "github.com/cenkalti/backoff/v3" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/job" + "github.com/containous/traefik/v2/pkg/log" + "github.com/containous/traefik/v2/pkg/provider" + "github.com/containous/traefik/v2/pkg/safe" + "github.com/containous/traefik/v2/pkg/types" + "github.com/containous/traefik/v2/pkg/version" dockertypes "github.com/docker/docker/api/types" dockercontainertypes "github.com/docker/docker/api/types/container" eventtypes "github.com/docker/docker/api/types/events" diff --git a/pkg/provider/docker/label.go b/pkg/provider/docker/label.go index 53705c0a7..131d852a3 100644 --- a/pkg/provider/docker/label.go +++ b/pkg/provider/docker/label.go @@ -3,7 +3,7 @@ package docker import ( "fmt" - "github.com/containous/traefik/pkg/config/label" + "github.com/containous/traefik/v2/pkg/config/label" ) const ( diff --git a/pkg/provider/file/file.go b/pkg/provider/file/file.go index 6133a6eb9..2ab456373 100644 --- a/pkg/provider/file/file.go +++ b/pkg/provider/file/file.go @@ -13,11 +13,11 @@ import ( "github.com/BurntSushi/toml" "github.com/Masterminds/sprig" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/log" - "github.com/containous/traefik/pkg/provider" - "github.com/containous/traefik/pkg/safe" - "github.com/containous/traefik/pkg/tls" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/log" + "github.com/containous/traefik/v2/pkg/provider" + "github.com/containous/traefik/v2/pkg/safe" + "github.com/containous/traefik/v2/pkg/tls" "gopkg.in/fsnotify.v1" "gopkg.in/yaml.v2" ) diff --git a/pkg/provider/file/file_test.go b/pkg/provider/file/file_test.go index cb4131d1b..fab3f6d1d 100644 --- a/pkg/provider/file/file_test.go +++ b/pkg/provider/file/file_test.go @@ -10,8 +10,8 @@ import ( "testing" "time" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/safe" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/safe" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/provider/kubernetes/crd/client.go b/pkg/provider/kubernetes/crd/client.go index ab5fb3f0e..fd662019d 100644 --- a/pkg/provider/kubernetes/crd/client.go +++ b/pkg/provider/kubernetes/crd/client.go @@ -6,10 +6,10 @@ import ( "io/ioutil" "time" - "github.com/containous/traefik/pkg/log" - "github.com/containous/traefik/pkg/provider/kubernetes/crd/generated/clientset/versioned" - "github.com/containous/traefik/pkg/provider/kubernetes/crd/generated/informers/externalversions" - "github.com/containous/traefik/pkg/provider/kubernetes/crd/traefik/v1alpha1" + "github.com/containous/traefik/v2/pkg/log" + "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned" + "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/informers/externalversions" + "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" corev1 "k8s.io/api/core/v1" extensionsv1beta1 "k8s.io/api/extensions/v1beta1" kubeerror "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/provider/kubernetes/crd/client_mock_test.go b/pkg/provider/kubernetes/crd/client_mock_test.go index 9d0478bf7..da85f03d8 100644 --- a/pkg/provider/kubernetes/crd/client_mock_test.go +++ b/pkg/provider/kubernetes/crd/client_mock_test.go @@ -5,8 +5,8 @@ import ( "io/ioutil" "path/filepath" - "github.com/containous/traefik/pkg/provider/kubernetes/crd/traefik/v1alpha1" - "github.com/containous/traefik/pkg/provider/kubernetes/k8s" + "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + "github.com/containous/traefik/v2/pkg/provider/kubernetes/k8s" corev1 "k8s.io/api/core/v1" extensionsv1beta1 "k8s.io/api/extensions/v1beta1" v1beta12 "k8s.io/api/extensions/v1beta1" diff --git a/pkg/provider/kubernetes/crd/generated/clientset/versioned/clientset.go b/pkg/provider/kubernetes/crd/generated/clientset/versioned/clientset.go index 8757738a4..d0c83077f 100644 --- a/pkg/provider/kubernetes/crd/generated/clientset/versioned/clientset.go +++ b/pkg/provider/kubernetes/crd/generated/clientset/versioned/clientset.go @@ -27,7 +27,7 @@ THE SOFTWARE. package versioned import ( - traefikv1alpha1 "github.com/containous/traefik/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1" + traefikv1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1" discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" diff --git a/pkg/provider/kubernetes/crd/generated/clientset/versioned/fake/clientset_generated.go b/pkg/provider/kubernetes/crd/generated/clientset/versioned/fake/clientset_generated.go index d02f889a0..695f82e01 100644 --- a/pkg/provider/kubernetes/crd/generated/clientset/versioned/fake/clientset_generated.go +++ b/pkg/provider/kubernetes/crd/generated/clientset/versioned/fake/clientset_generated.go @@ -27,9 +27,9 @@ THE SOFTWARE. package fake import ( - clientset "github.com/containous/traefik/pkg/provider/kubernetes/crd/generated/clientset/versioned" - traefikv1alpha1 "github.com/containous/traefik/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1" - faketraefikv1alpha1 "github.com/containous/traefik/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake" + clientset "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned" + traefikv1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1" + faketraefikv1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/discovery" diff --git a/pkg/provider/kubernetes/crd/generated/clientset/versioned/fake/register.go b/pkg/provider/kubernetes/crd/generated/clientset/versioned/fake/register.go index 7b70355a2..f203f1751 100644 --- a/pkg/provider/kubernetes/crd/generated/clientset/versioned/fake/register.go +++ b/pkg/provider/kubernetes/crd/generated/clientset/versioned/fake/register.go @@ -27,7 +27,7 @@ THE SOFTWARE. package fake import ( - traefikv1alpha1 "github.com/containous/traefik/pkg/provider/kubernetes/crd/traefik/v1alpha1" + traefikv1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme/register.go b/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme/register.go index d54dbbb83..17ec0dd01 100644 --- a/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme/register.go +++ b/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme/register.go @@ -27,7 +27,7 @@ THE SOFTWARE. package scheme import ( - traefikv1alpha1 "github.com/containous/traefik/pkg/provider/kubernetes/crd/traefik/v1alpha1" + traefikv1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_ingressroute.go b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_ingressroute.go index fb579061c..85bf5990e 100644 --- a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_ingressroute.go +++ b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_ingressroute.go @@ -27,7 +27,7 @@ THE SOFTWARE. package fake import ( - v1alpha1 "github.com/containous/traefik/pkg/provider/kubernetes/crd/traefik/v1alpha1" + v1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_ingressroutetcp.go b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_ingressroutetcp.go index c87a5073e..7013fa49e 100644 --- a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_ingressroutetcp.go +++ b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_ingressroutetcp.go @@ -27,7 +27,7 @@ THE SOFTWARE. package fake import ( - v1alpha1 "github.com/containous/traefik/pkg/provider/kubernetes/crd/traefik/v1alpha1" + v1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_middleware.go b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_middleware.go index 08e9cf022..07428eabd 100644 --- a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_middleware.go +++ b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_middleware.go @@ -27,7 +27,7 @@ THE SOFTWARE. package fake import ( - v1alpha1 "github.com/containous/traefik/pkg/provider/kubernetes/crd/traefik/v1alpha1" + v1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_tlsoption.go b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_tlsoption.go index 885fc8367..9f2560c6e 100644 --- a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_tlsoption.go +++ b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_tlsoption.go @@ -27,7 +27,7 @@ THE SOFTWARE. package fake import ( - v1alpha1 "github.com/containous/traefik/pkg/provider/kubernetes/crd/traefik/v1alpha1" + v1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_traefik_client.go b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_traefik_client.go index 92998021f..aeb1ddd26 100644 --- a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_traefik_client.go +++ b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/fake/fake_traefik_client.go @@ -27,7 +27,7 @@ THE SOFTWARE. package fake import ( - v1alpha1 "github.com/containous/traefik/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1" + v1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" ) diff --git a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/ingressroute.go b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/ingressroute.go index 090a9622f..8691d7dfa 100644 --- a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/ingressroute.go +++ b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/ingressroute.go @@ -29,8 +29,8 @@ package v1alpha1 import ( "time" - scheme "github.com/containous/traefik/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme" - v1alpha1 "github.com/containous/traefik/pkg/provider/kubernetes/crd/traefik/v1alpha1" + scheme "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme" + v1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/ingressroutetcp.go b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/ingressroutetcp.go index e789c9189..e98f82073 100644 --- a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/ingressroutetcp.go +++ b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/ingressroutetcp.go @@ -29,8 +29,8 @@ package v1alpha1 import ( "time" - scheme "github.com/containous/traefik/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme" - v1alpha1 "github.com/containous/traefik/pkg/provider/kubernetes/crd/traefik/v1alpha1" + scheme "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme" + v1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/middleware.go b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/middleware.go index e8a0c7ef8..6c56f0fcd 100644 --- a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/middleware.go +++ b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/middleware.go @@ -29,8 +29,8 @@ package v1alpha1 import ( "time" - scheme "github.com/containous/traefik/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme" - v1alpha1 "github.com/containous/traefik/pkg/provider/kubernetes/crd/traefik/v1alpha1" + scheme "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme" + v1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/tlsoption.go b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/tlsoption.go index 9f5e779ad..deda19d30 100644 --- a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/tlsoption.go +++ b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/tlsoption.go @@ -29,8 +29,8 @@ package v1alpha1 import ( "time" - scheme "github.com/containous/traefik/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme" - v1alpha1 "github.com/containous/traefik/pkg/provider/kubernetes/crd/traefik/v1alpha1" + scheme "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme" + v1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/traefik_client.go b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/traefik_client.go index 5617e9596..51c42b06e 100644 --- a/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/traefik_client.go +++ b/pkg/provider/kubernetes/crd/generated/clientset/versioned/typed/traefik/v1alpha1/traefik_client.go @@ -27,8 +27,8 @@ THE SOFTWARE. package v1alpha1 import ( - "github.com/containous/traefik/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme" - v1alpha1 "github.com/containous/traefik/pkg/provider/kubernetes/crd/traefik/v1alpha1" + "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned/scheme" + v1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" rest "k8s.io/client-go/rest" ) diff --git a/pkg/provider/kubernetes/crd/generated/informers/externalversions/factory.go b/pkg/provider/kubernetes/crd/generated/informers/externalversions/factory.go index bf5ddeab3..5df045346 100644 --- a/pkg/provider/kubernetes/crd/generated/informers/externalversions/factory.go +++ b/pkg/provider/kubernetes/crd/generated/informers/externalversions/factory.go @@ -31,9 +31,9 @@ import ( sync "sync" time "time" - versioned "github.com/containous/traefik/pkg/provider/kubernetes/crd/generated/clientset/versioned" - internalinterfaces "github.com/containous/traefik/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" - traefik "github.com/containous/traefik/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik" + versioned "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned" + internalinterfaces "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" + traefik "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/provider/kubernetes/crd/generated/informers/externalversions/generic.go b/pkg/provider/kubernetes/crd/generated/informers/externalversions/generic.go index 70060f80a..daee522b5 100644 --- a/pkg/provider/kubernetes/crd/generated/informers/externalversions/generic.go +++ b/pkg/provider/kubernetes/crd/generated/informers/externalversions/generic.go @@ -29,7 +29,7 @@ package externalversions import ( "fmt" - v1alpha1 "github.com/containous/traefik/pkg/provider/kubernetes/crd/traefik/v1alpha1" + v1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" ) diff --git a/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces/factory_interfaces.go b/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces/factory_interfaces.go index b7c46e786..d07e4d945 100644 --- a/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces/factory_interfaces.go +++ b/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces/factory_interfaces.go @@ -29,7 +29,7 @@ package internalinterfaces import ( time "time" - versioned "github.com/containous/traefik/pkg/provider/kubernetes/crd/generated/clientset/versioned" + versioned "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" diff --git a/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/interface.go b/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/interface.go index 907cc9a03..7f254f123 100644 --- a/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/interface.go +++ b/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/interface.go @@ -27,8 +27,8 @@ THE SOFTWARE. package traefik import ( - internalinterfaces "github.com/containous/traefik/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/containous/traefik/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1" + internalinterfaces "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1" ) // Interface provides access to each of this group's versions. diff --git a/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/ingressroute.go b/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/ingressroute.go index 3c5c64ff6..acc6a8048 100644 --- a/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/ingressroute.go +++ b/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/ingressroute.go @@ -29,10 +29,10 @@ package v1alpha1 import ( time "time" - versioned "github.com/containous/traefik/pkg/provider/kubernetes/crd/generated/clientset/versioned" - internalinterfaces "github.com/containous/traefik/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/containous/traefik/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1" - traefikv1alpha1 "github.com/containous/traefik/pkg/provider/kubernetes/crd/traefik/v1alpha1" + versioned "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned" + internalinterfaces "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1" + traefikv1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/ingressroutetcp.go b/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/ingressroutetcp.go index f4b328d01..9ec652929 100644 --- a/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/ingressroutetcp.go +++ b/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/ingressroutetcp.go @@ -29,10 +29,10 @@ package v1alpha1 import ( time "time" - versioned "github.com/containous/traefik/pkg/provider/kubernetes/crd/generated/clientset/versioned" - internalinterfaces "github.com/containous/traefik/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/containous/traefik/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1" - traefikv1alpha1 "github.com/containous/traefik/pkg/provider/kubernetes/crd/traefik/v1alpha1" + versioned "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned" + internalinterfaces "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1" + traefikv1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/interface.go b/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/interface.go index 54b02039a..06e742230 100644 --- a/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/interface.go +++ b/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/interface.go @@ -27,7 +27,7 @@ THE SOFTWARE. package v1alpha1 import ( - internalinterfaces "github.com/containous/traefik/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" + internalinterfaces "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" ) // Interface provides access to all the informers in this group version. diff --git a/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/middleware.go b/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/middleware.go index a5ae6de39..dc1cffd14 100644 --- a/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/middleware.go +++ b/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/middleware.go @@ -29,10 +29,10 @@ package v1alpha1 import ( time "time" - versioned "github.com/containous/traefik/pkg/provider/kubernetes/crd/generated/clientset/versioned" - internalinterfaces "github.com/containous/traefik/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/containous/traefik/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1" - traefikv1alpha1 "github.com/containous/traefik/pkg/provider/kubernetes/crd/traefik/v1alpha1" + versioned "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned" + internalinterfaces "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1" + traefikv1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/tlsoption.go b/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/tlsoption.go index 4bbf1d981..aab823607 100644 --- a/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/tlsoption.go +++ b/pkg/provider/kubernetes/crd/generated/informers/externalversions/traefik/v1alpha1/tlsoption.go @@ -29,10 +29,10 @@ package v1alpha1 import ( time "time" - versioned "github.com/containous/traefik/pkg/provider/kubernetes/crd/generated/clientset/versioned" - internalinterfaces "github.com/containous/traefik/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/containous/traefik/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1" - traefikv1alpha1 "github.com/containous/traefik/pkg/provider/kubernetes/crd/traefik/v1alpha1" + versioned "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/clientset/versioned" + internalinterfaces "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1" + traefikv1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/ingressroute.go b/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/ingressroute.go index b796931b0..ea12c715a 100644 --- a/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/ingressroute.go +++ b/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/ingressroute.go @@ -27,7 +27,7 @@ THE SOFTWARE. package v1alpha1 import ( - v1alpha1 "github.com/containous/traefik/pkg/provider/kubernetes/crd/traefik/v1alpha1" + v1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/ingressroutetcp.go b/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/ingressroutetcp.go index c3c758ba1..e21ad0e4d 100644 --- a/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/ingressroutetcp.go +++ b/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/ingressroutetcp.go @@ -27,7 +27,7 @@ THE SOFTWARE. package v1alpha1 import ( - v1alpha1 "github.com/containous/traefik/pkg/provider/kubernetes/crd/traefik/v1alpha1" + v1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/middleware.go b/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/middleware.go index 70f1e39f7..eeed37d84 100644 --- a/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/middleware.go +++ b/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/middleware.go @@ -27,7 +27,7 @@ THE SOFTWARE. package v1alpha1 import ( - v1alpha1 "github.com/containous/traefik/pkg/provider/kubernetes/crd/traefik/v1alpha1" + v1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/tlsoption.go b/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/tlsoption.go index d8e2ca80b..11693fe4a 100644 --- a/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/tlsoption.go +++ b/pkg/provider/kubernetes/crd/generated/listers/traefik/v1alpha1/tlsoption.go @@ -27,7 +27,7 @@ THE SOFTWARE. package v1alpha1 import ( - v1alpha1 "github.com/containous/traefik/pkg/provider/kubernetes/crd/traefik/v1alpha1" + v1alpha1 "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/pkg/provider/kubernetes/crd/kubernetes.go b/pkg/provider/kubernetes/crd/kubernetes.go index 5bec9bca1..f0e01c0e6 100644 --- a/pkg/provider/kubernetes/crd/kubernetes.go +++ b/pkg/provider/kubernetes/crd/kubernetes.go @@ -12,13 +12,13 @@ import ( "strings" "time" - "github.com/cenkalti/backoff" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/job" - "github.com/containous/traefik/pkg/log" - "github.com/containous/traefik/pkg/provider/kubernetes/crd/traefik/v1alpha1" - "github.com/containous/traefik/pkg/safe" - "github.com/containous/traefik/pkg/tls" + "github.com/cenkalti/backoff/v3" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/job" + "github.com/containous/traefik/v2/pkg/log" + "github.com/containous/traefik/v2/pkg/provider/kubernetes/crd/traefik/v1alpha1" + "github.com/containous/traefik/v2/pkg/safe" + "github.com/containous/traefik/v2/pkg/tls" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/labels" ) diff --git a/pkg/provider/kubernetes/crd/kubernetes_test.go b/pkg/provider/kubernetes/crd/kubernetes_test.go index 25557beb1..3cd4af3af 100644 --- a/pkg/provider/kubernetes/crd/kubernetes_test.go +++ b/pkg/provider/kubernetes/crd/kubernetes_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/provider" - "github.com/containous/traefik/pkg/tls" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/provider" + "github.com/containous/traefik/v2/pkg/tls" "github.com/stretchr/testify/assert" ) diff --git a/pkg/provider/kubernetes/crd/traefik/v1alpha1/middleware.go b/pkg/provider/kubernetes/crd/traefik/v1alpha1/middleware.go index eeb4b9d06..c01f12c99 100644 --- a/pkg/provider/kubernetes/crd/traefik/v1alpha1/middleware.go +++ b/pkg/provider/kubernetes/crd/traefik/v1alpha1/middleware.go @@ -1,7 +1,7 @@ package v1alpha1 import ( - "github.com/containous/traefik/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/config/dynamic" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/provider/kubernetes/ingress/client.go b/pkg/provider/kubernetes/ingress/client.go index 18b7321f1..18725c964 100644 --- a/pkg/provider/kubernetes/ingress/client.go +++ b/pkg/provider/kubernetes/ingress/client.go @@ -6,7 +6,7 @@ import ( "io/ioutil" "time" - "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/v2/pkg/log" corev1 "k8s.io/api/core/v1" extensionsv1beta1 "k8s.io/api/extensions/v1beta1" kubeerror "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/provider/kubernetes/ingress/client_mock_test.go b/pkg/provider/kubernetes/ingress/client_mock_test.go index 1b5cc49cb..5acf5f5ab 100644 --- a/pkg/provider/kubernetes/ingress/client_mock_test.go +++ b/pkg/provider/kubernetes/ingress/client_mock_test.go @@ -4,7 +4,7 @@ import ( "fmt" "io/ioutil" - "github.com/containous/traefik/pkg/provider/kubernetes/k8s" + "github.com/containous/traefik/v2/pkg/provider/kubernetes/k8s" corev1 "k8s.io/api/core/v1" extensionsv1beta1 "k8s.io/api/extensions/v1beta1" v1beta12 "k8s.io/api/extensions/v1beta1" diff --git a/pkg/provider/kubernetes/ingress/kubernetes.go b/pkg/provider/kubernetes/ingress/kubernetes.go index 1b3dd8c77..84f285aa4 100644 --- a/pkg/provider/kubernetes/ingress/kubernetes.go +++ b/pkg/provider/kubernetes/ingress/kubernetes.go @@ -12,12 +12,12 @@ import ( "strings" "time" - "github.com/cenkalti/backoff" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/job" - "github.com/containous/traefik/pkg/log" - "github.com/containous/traefik/pkg/safe" - "github.com/containous/traefik/pkg/tls" + "github.com/cenkalti/backoff/v3" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/job" + "github.com/containous/traefik/v2/pkg/log" + "github.com/containous/traefik/v2/pkg/safe" + "github.com/containous/traefik/v2/pkg/tls" corev1 "k8s.io/api/core/v1" "k8s.io/api/extensions/v1beta1" "k8s.io/apimachinery/pkg/labels" diff --git a/pkg/provider/kubernetes/ingress/kubernetes_test.go b/pkg/provider/kubernetes/ingress/kubernetes_test.go index c9d434e2c..c508ac1c6 100644 --- a/pkg/provider/kubernetes/ingress/kubernetes_test.go +++ b/pkg/provider/kubernetes/ingress/kubernetes_test.go @@ -8,9 +8,9 @@ import ( "strings" "testing" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/provider" - "github.com/containous/traefik/pkg/tls" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/provider" + "github.com/containous/traefik/v2/pkg/tls" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" "k8s.io/api/extensions/v1beta1" diff --git a/pkg/provider/kubernetes/k8s/parser.go b/pkg/provider/kubernetes/k8s/parser.go index 0c4ae4cd1..b154872fe 100644 --- a/pkg/provider/kubernetes/k8s/parser.go +++ b/pkg/provider/kubernetes/k8s/parser.go @@ -5,7 +5,7 @@ import ( "regexp" "strings" - "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/v2/pkg/log" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/kubernetes/scheme" ) diff --git a/pkg/provider/marathon/config.go b/pkg/provider/marathon/config.go index 43ce3016d..cd1d81939 100644 --- a/pkg/provider/marathon/config.go +++ b/pkg/provider/marathon/config.go @@ -9,11 +9,11 @@ import ( "strconv" "strings" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/config/label" - "github.com/containous/traefik/pkg/log" - "github.com/containous/traefik/pkg/provider" - "github.com/containous/traefik/pkg/provider/constraints" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/config/label" + "github.com/containous/traefik/v2/pkg/log" + "github.com/containous/traefik/v2/pkg/provider" + "github.com/containous/traefik/v2/pkg/provider/constraints" "github.com/gambol99/go-marathon" ) diff --git a/pkg/provider/marathon/config_test.go b/pkg/provider/marathon/config_test.go index 83ce1e89a..8d9504e35 100644 --- a/pkg/provider/marathon/config_test.go +++ b/pkg/provider/marathon/config_test.go @@ -5,7 +5,7 @@ import ( "math" "testing" - "github.com/containous/traefik/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/config/dynamic" "github.com/gambol99/go-marathon" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/provider/marathon/fake_client_test.go b/pkg/provider/marathon/fake_client_test.go index 86b671081..978f5d57c 100644 --- a/pkg/provider/marathon/fake_client_test.go +++ b/pkg/provider/marathon/fake_client_test.go @@ -3,7 +3,7 @@ package marathon import ( "errors" - "github.com/containous/traefik/pkg/provider/marathon/mocks" + "github.com/containous/traefik/v2/pkg/provider/marathon/mocks" "github.com/gambol99/go-marathon" "github.com/stretchr/testify/mock" ) diff --git a/pkg/provider/marathon/label.go b/pkg/provider/marathon/label.go index 3dba526db..eb7773ed6 100644 --- a/pkg/provider/marathon/label.go +++ b/pkg/provider/marathon/label.go @@ -3,7 +3,7 @@ package marathon import ( "math" - "github.com/containous/traefik/pkg/config/label" + "github.com/containous/traefik/v2/pkg/config/label" "github.com/gambol99/go-marathon" ) diff --git a/pkg/provider/marathon/marathon.go b/pkg/provider/marathon/marathon.go index 379d61d57..adef44ab4 100644 --- a/pkg/provider/marathon/marathon.go +++ b/pkg/provider/marathon/marathon.go @@ -9,13 +9,13 @@ import ( "text/template" "time" - "github.com/cenkalti/backoff" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/job" - "github.com/containous/traefik/pkg/log" - "github.com/containous/traefik/pkg/provider" - "github.com/containous/traefik/pkg/safe" - "github.com/containous/traefik/pkg/types" + "github.com/cenkalti/backoff/v3" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/job" + "github.com/containous/traefik/v2/pkg/log" + "github.com/containous/traefik/v2/pkg/provider" + "github.com/containous/traefik/v2/pkg/safe" + "github.com/containous/traefik/v2/pkg/types" "github.com/gambol99/go-marathon" "github.com/sirupsen/logrus" ) diff --git a/pkg/provider/marathon/readiness.go b/pkg/provider/marathon/readiness.go index af1228ae6..1d462115f 100644 --- a/pkg/provider/marathon/readiness.go +++ b/pkg/provider/marathon/readiness.go @@ -3,7 +3,7 @@ package marathon import ( "time" - "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/v2/pkg/log" "github.com/gambol99/go-marathon" ) diff --git a/pkg/provider/provider.go b/pkg/provider/provider.go index e9c1b64ed..df7d65734 100644 --- a/pkg/provider/provider.go +++ b/pkg/provider/provider.go @@ -1,8 +1,8 @@ package provider import ( - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/safe" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/safe" ) // Provider defines methods of a provider. diff --git a/pkg/provider/rancher/config.go b/pkg/provider/rancher/config.go index 08c48406a..24a32e66c 100644 --- a/pkg/provider/rancher/config.go +++ b/pkg/provider/rancher/config.go @@ -7,11 +7,11 @@ import ( "net" "strings" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/config/label" - "github.com/containous/traefik/pkg/log" - "github.com/containous/traefik/pkg/provider" - "github.com/containous/traefik/pkg/provider/constraints" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/config/label" + "github.com/containous/traefik/v2/pkg/log" + "github.com/containous/traefik/v2/pkg/provider" + "github.com/containous/traefik/v2/pkg/provider/constraints" ) func (p *Provider) buildConfiguration(ctx context.Context, services []rancherData) *dynamic.Configuration { diff --git a/pkg/provider/rancher/config_test.go b/pkg/provider/rancher/config_test.go index 7a180260c..cc40a74c6 100644 --- a/pkg/provider/rancher/config_test.go +++ b/pkg/provider/rancher/config_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/containous/traefik/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/config/dynamic" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/provider/rancher/label.go b/pkg/provider/rancher/label.go index bd42ff51c..bf4749f0d 100644 --- a/pkg/provider/rancher/label.go +++ b/pkg/provider/rancher/label.go @@ -1,7 +1,7 @@ package rancher import ( - "github.com/containous/traefik/pkg/config/label" + "github.com/containous/traefik/v2/pkg/config/label" ) type configuration struct { diff --git a/pkg/provider/rancher/rancher.go b/pkg/provider/rancher/rancher.go index 8d1c118a5..f69d0cbde 100644 --- a/pkg/provider/rancher/rancher.go +++ b/pkg/provider/rancher/rancher.go @@ -6,12 +6,12 @@ import ( "text/template" "time" - "github.com/cenkalti/backoff" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/job" - "github.com/containous/traefik/pkg/log" - "github.com/containous/traefik/pkg/provider" - "github.com/containous/traefik/pkg/safe" + "github.com/cenkalti/backoff/v3" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/job" + "github.com/containous/traefik/v2/pkg/log" + "github.com/containous/traefik/v2/pkg/provider" + "github.com/containous/traefik/v2/pkg/safe" rancher "github.com/rancher/go-rancher-metadata/metadata" ) diff --git a/pkg/provider/rest/rest.go b/pkg/provider/rest/rest.go index 175e89dbd..8c3c082a6 100644 --- a/pkg/provider/rest/rest.go +++ b/pkg/provider/rest/rest.go @@ -6,11 +6,11 @@ import ( "io/ioutil" "net/http" - "github.com/containous/mux" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/log" - "github.com/containous/traefik/pkg/provider" - "github.com/containous/traefik/pkg/safe" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/log" + "github.com/containous/traefik/v2/pkg/provider" + "github.com/containous/traefik/v2/pkg/safe" + "github.com/gorilla/mux" "github.com/unrolled/render" ) diff --git a/pkg/responsemodifiers/headers.go b/pkg/responsemodifiers/headers.go index c7eaa8ee3..403785eea 100644 --- a/pkg/responsemodifiers/headers.go +++ b/pkg/responsemodifiers/headers.go @@ -3,8 +3,8 @@ package responsemodifiers import ( "net/http" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/middlewares/headers" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/middlewares/headers" "github.com/unrolled/secure" ) diff --git a/pkg/responsemodifiers/log.go b/pkg/responsemodifiers/log.go index fb2e2316e..b9ae3639f 100644 --- a/pkg/responsemodifiers/log.go +++ b/pkg/responsemodifiers/log.go @@ -3,7 +3,7 @@ package responsemodifiers import ( "context" - "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/v2/pkg/log" "github.com/sirupsen/logrus" ) diff --git a/pkg/responsemodifiers/response_modifier.go b/pkg/responsemodifiers/response_modifier.go index e12bddf9c..507627d69 100644 --- a/pkg/responsemodifiers/response_modifier.go +++ b/pkg/responsemodifiers/response_modifier.go @@ -4,7 +4,7 @@ import ( "context" "net/http" - "github.com/containous/traefik/pkg/config/runtime" + "github.com/containous/traefik/v2/pkg/config/runtime" ) // NewBuilder creates a builder. diff --git a/pkg/responsemodifiers/response_modifier_test.go b/pkg/responsemodifiers/response_modifier_test.go index de48fc4b3..79c1f1132 100644 --- a/pkg/responsemodifiers/response_modifier_test.go +++ b/pkg/responsemodifiers/response_modifier_test.go @@ -6,9 +6,9 @@ import ( "net/http/httptest" "testing" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/config/runtime" - "github.com/containous/traefik/pkg/middlewares/headers" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/config/runtime" + "github.com/containous/traefik/v2/pkg/middlewares/headers" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/rules/rules.go b/pkg/rules/rules.go index 36458f4f7..441c4b668 100644 --- a/pkg/rules/rules.go +++ b/pkg/rules/rules.go @@ -5,9 +5,9 @@ import ( "net/http" "strings" - "github.com/containous/mux" - "github.com/containous/traefik/pkg/log" - "github.com/containous/traefik/pkg/middlewares/requestdecorator" + "github.com/containous/traefik/v2/pkg/log" + "github.com/containous/traefik/v2/pkg/middlewares/requestdecorator" + "github.com/gorilla/mux" "github.com/vulcand/predicate" ) diff --git a/pkg/rules/rules_test.go b/pkg/rules/rules_test.go index 3f459f2a2..3b44a4cc9 100644 --- a/pkg/rules/rules_test.go +++ b/pkg/rules/rules_test.go @@ -5,9 +5,9 @@ import ( "net/http/httptest" "testing" - "github.com/containous/mux" - "github.com/containous/traefik/pkg/middlewares/requestdecorator" - "github.com/containous/traefik/pkg/testhelpers" + "github.com/containous/traefik/v2/pkg/middlewares/requestdecorator" + "github.com/containous/traefik/v2/pkg/testhelpers" + "github.com/gorilla/mux" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/safe/routine.go b/pkg/safe/routine.go index d9e213166..a95c0ecf8 100644 --- a/pkg/safe/routine.go +++ b/pkg/safe/routine.go @@ -6,8 +6,8 @@ import ( "runtime/debug" "sync" - "github.com/cenkalti/backoff" - "github.com/containous/traefik/pkg/log" + "github.com/cenkalti/backoff/v3" + "github.com/containous/traefik/v2/pkg/log" ) type routine struct { diff --git a/pkg/safe/routine_test.go b/pkg/safe/routine_test.go index deaa3fc66..20d28d4f2 100644 --- a/pkg/safe/routine_test.go +++ b/pkg/safe/routine_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/cenkalti/backoff" + "github.com/cenkalti/backoff/v3" ) func TestNewPoolContext(t *testing.T) { diff --git a/pkg/server/aggregator.go b/pkg/server/aggregator.go index c00255ec3..7ae5d6c2e 100644 --- a/pkg/server/aggregator.go +++ b/pkg/server/aggregator.go @@ -1,10 +1,10 @@ package server import ( - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/log" - "github.com/containous/traefik/pkg/server/internal" - "github.com/containous/traefik/pkg/tls" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/log" + "github.com/containous/traefik/v2/pkg/server/internal" + "github.com/containous/traefik/v2/pkg/tls" ) func mergeConfiguration(configurations dynamic.Configurations) dynamic.Configuration { diff --git a/pkg/server/aggregator_test.go b/pkg/server/aggregator_test.go index 98e92166f..9bfb1310d 100644 --- a/pkg/server/aggregator_test.go +++ b/pkg/server/aggregator_test.go @@ -3,8 +3,8 @@ package server import ( "testing" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/tls" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/tls" "github.com/stretchr/testify/assert" ) diff --git a/pkg/server/cookie/cookie.go b/pkg/server/cookie/cookie.go index b1d0e28ee..632763a8f 100644 --- a/pkg/server/cookie/cookie.go +++ b/pkg/server/cookie/cookie.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/v2/pkg/log" ) const cookieNameLength = 6 diff --git a/pkg/server/internal/provider.go b/pkg/server/internal/provider.go index 3750d339a..c8e9a53e6 100644 --- a/pkg/server/internal/provider.go +++ b/pkg/server/internal/provider.go @@ -4,7 +4,7 @@ import ( "context" "strings" - "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/v2/pkg/log" ) type contextKey int diff --git a/pkg/server/middleware/middlewares.go b/pkg/server/middleware/middlewares.go index a887d2854..ea8254f32 100644 --- a/pkg/server/middleware/middlewares.go +++ b/pkg/server/middleware/middlewares.go @@ -8,26 +8,26 @@ import ( "strings" "github.com/containous/alice" - "github.com/containous/traefik/pkg/config/runtime" - "github.com/containous/traefik/pkg/middlewares/addprefix" - "github.com/containous/traefik/pkg/middlewares/auth" - "github.com/containous/traefik/pkg/middlewares/buffering" - "github.com/containous/traefik/pkg/middlewares/chain" - "github.com/containous/traefik/pkg/middlewares/circuitbreaker" - "github.com/containous/traefik/pkg/middlewares/compress" - "github.com/containous/traefik/pkg/middlewares/customerrors" - "github.com/containous/traefik/pkg/middlewares/headers" - "github.com/containous/traefik/pkg/middlewares/ipwhitelist" - "github.com/containous/traefik/pkg/middlewares/maxconnection" - "github.com/containous/traefik/pkg/middlewares/passtlsclientcert" - "github.com/containous/traefik/pkg/middlewares/redirect" - "github.com/containous/traefik/pkg/middlewares/replacepath" - "github.com/containous/traefik/pkg/middlewares/replacepathregex" - "github.com/containous/traefik/pkg/middlewares/retry" - "github.com/containous/traefik/pkg/middlewares/stripprefix" - "github.com/containous/traefik/pkg/middlewares/stripprefixregex" - "github.com/containous/traefik/pkg/middlewares/tracing" - "github.com/containous/traefik/pkg/server/internal" + "github.com/containous/traefik/v2/pkg/config/runtime" + "github.com/containous/traefik/v2/pkg/middlewares/addprefix" + "github.com/containous/traefik/v2/pkg/middlewares/auth" + "github.com/containous/traefik/v2/pkg/middlewares/buffering" + "github.com/containous/traefik/v2/pkg/middlewares/chain" + "github.com/containous/traefik/v2/pkg/middlewares/circuitbreaker" + "github.com/containous/traefik/v2/pkg/middlewares/compress" + "github.com/containous/traefik/v2/pkg/middlewares/customerrors" + "github.com/containous/traefik/v2/pkg/middlewares/headers" + "github.com/containous/traefik/v2/pkg/middlewares/ipwhitelist" + "github.com/containous/traefik/v2/pkg/middlewares/maxconnection" + "github.com/containous/traefik/v2/pkg/middlewares/passtlsclientcert" + "github.com/containous/traefik/v2/pkg/middlewares/redirect" + "github.com/containous/traefik/v2/pkg/middlewares/replacepath" + "github.com/containous/traefik/v2/pkg/middlewares/replacepathregex" + "github.com/containous/traefik/v2/pkg/middlewares/retry" + "github.com/containous/traefik/v2/pkg/middlewares/stripprefix" + "github.com/containous/traefik/v2/pkg/middlewares/stripprefixregex" + "github.com/containous/traefik/v2/pkg/middlewares/tracing" + "github.com/containous/traefik/v2/pkg/server/internal" ) type middlewareStackType int diff --git a/pkg/server/middleware/middlewares_test.go b/pkg/server/middleware/middlewares_test.go index 5da03c335..a3d855c44 100644 --- a/pkg/server/middleware/middlewares_test.go +++ b/pkg/server/middleware/middlewares_test.go @@ -7,9 +7,9 @@ import ( "net/http/httptest" "testing" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/config/runtime" - "github.com/containous/traefik/pkg/server/internal" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/config/runtime" + "github.com/containous/traefik/v2/pkg/server/internal" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/server/roundtripper.go b/pkg/server/roundtripper.go index f5a99f61f..165476029 100644 --- a/pkg/server/roundtripper.go +++ b/pkg/server/roundtripper.go @@ -8,9 +8,9 @@ import ( "net/http" "time" - "github.com/containous/traefik/pkg/config/static" - "github.com/containous/traefik/pkg/log" - traefiktls "github.com/containous/traefik/pkg/tls" + "github.com/containous/traefik/v2/pkg/config/static" + "github.com/containous/traefik/v2/pkg/log" + traefiktls "github.com/containous/traefik/v2/pkg/tls" "golang.org/x/net/http2" ) diff --git a/pkg/server/router/route_appender_aggregator.go b/pkg/server/router/route_appender_aggregator.go index 80bb02583..71702a6d6 100644 --- a/pkg/server/router/route_appender_aggregator.go +++ b/pkg/server/router/route_appender_aggregator.go @@ -4,13 +4,13 @@ import ( "context" "github.com/containous/alice" - "github.com/containous/mux" - "github.com/containous/traefik/pkg/api" - "github.com/containous/traefik/pkg/config/runtime" - "github.com/containous/traefik/pkg/config/static" - "github.com/containous/traefik/pkg/log" - "github.com/containous/traefik/pkg/metrics" - "github.com/containous/traefik/pkg/types" + "github.com/containous/traefik/v2/pkg/api" + "github.com/containous/traefik/v2/pkg/config/runtime" + "github.com/containous/traefik/v2/pkg/config/static" + "github.com/containous/traefik/v2/pkg/log" + "github.com/containous/traefik/v2/pkg/metrics" + "github.com/containous/traefik/v2/pkg/types" + "github.com/gorilla/mux" ) // chainBuilder The contract of the middleware builder diff --git a/pkg/server/router/route_appender_aggregator_test.go b/pkg/server/router/route_appender_aggregator_test.go index 7e948262c..ffc9c9d6f 100644 --- a/pkg/server/router/route_appender_aggregator_test.go +++ b/pkg/server/router/route_appender_aggregator_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/containous/alice" - "github.com/containous/mux" - "github.com/containous/traefik/pkg/config/static" - "github.com/containous/traefik/pkg/ping" + "github.com/containous/traefik/v2/pkg/config/static" + "github.com/containous/traefik/v2/pkg/ping" + "github.com/gorilla/mux" "github.com/stretchr/testify/assert" ) diff --git a/pkg/server/router/route_appender_factory.go b/pkg/server/router/route_appender_factory.go index 2391fea79..7831e3b34 100644 --- a/pkg/server/router/route_appender_factory.go +++ b/pkg/server/router/route_appender_factory.go @@ -3,11 +3,11 @@ package router import ( "context" - "github.com/containous/traefik/pkg/config/runtime" - "github.com/containous/traefik/pkg/config/static" - "github.com/containous/traefik/pkg/provider/acme" - "github.com/containous/traefik/pkg/server/middleware" - "github.com/containous/traefik/pkg/types" + "github.com/containous/traefik/v2/pkg/config/runtime" + "github.com/containous/traefik/v2/pkg/config/static" + "github.com/containous/traefik/v2/pkg/provider/acme" + "github.com/containous/traefik/v2/pkg/server/middleware" + "github.com/containous/traefik/v2/pkg/types" ) // NewRouteAppenderFactory Creates a new RouteAppenderFactory diff --git a/pkg/server/router/router.go b/pkg/server/router/router.go index 6f69e0e6e..9b08cff95 100644 --- a/pkg/server/router/router.go +++ b/pkg/server/router/router.go @@ -6,16 +6,16 @@ import ( "net/http" "github.com/containous/alice" - "github.com/containous/traefik/pkg/config/runtime" - "github.com/containous/traefik/pkg/log" - "github.com/containous/traefik/pkg/middlewares/accesslog" - "github.com/containous/traefik/pkg/middlewares/recovery" - "github.com/containous/traefik/pkg/middlewares/tracing" - "github.com/containous/traefik/pkg/responsemodifiers" - "github.com/containous/traefik/pkg/rules" - "github.com/containous/traefik/pkg/server/internal" - "github.com/containous/traefik/pkg/server/middleware" - "github.com/containous/traefik/pkg/server/service" + "github.com/containous/traefik/v2/pkg/config/runtime" + "github.com/containous/traefik/v2/pkg/log" + "github.com/containous/traefik/v2/pkg/middlewares/accesslog" + "github.com/containous/traefik/v2/pkg/middlewares/recovery" + "github.com/containous/traefik/v2/pkg/middlewares/tracing" + "github.com/containous/traefik/v2/pkg/responsemodifiers" + "github.com/containous/traefik/v2/pkg/rules" + "github.com/containous/traefik/v2/pkg/server/internal" + "github.com/containous/traefik/v2/pkg/server/middleware" + "github.com/containous/traefik/v2/pkg/server/service" ) const ( diff --git a/pkg/server/router/router_test.go b/pkg/server/router/router_test.go index 21a475aa9..02b8606e5 100644 --- a/pkg/server/router/router_test.go +++ b/pkg/server/router/router_test.go @@ -8,15 +8,15 @@ import ( "strings" "testing" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/config/runtime" - "github.com/containous/traefik/pkg/middlewares/accesslog" - "github.com/containous/traefik/pkg/middlewares/requestdecorator" - "github.com/containous/traefik/pkg/responsemodifiers" - "github.com/containous/traefik/pkg/server/middleware" - "github.com/containous/traefik/pkg/server/service" - "github.com/containous/traefik/pkg/testhelpers" - "github.com/containous/traefik/pkg/types" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/config/runtime" + "github.com/containous/traefik/v2/pkg/middlewares/accesslog" + "github.com/containous/traefik/v2/pkg/middlewares/requestdecorator" + "github.com/containous/traefik/v2/pkg/responsemodifiers" + "github.com/containous/traefik/v2/pkg/server/middleware" + "github.com/containous/traefik/v2/pkg/server/service" + "github.com/containous/traefik/v2/pkg/testhelpers" + "github.com/containous/traefik/v2/pkg/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/server/router/tcp/router.go b/pkg/server/router/tcp/router.go index e60d8995e..bf4931695 100644 --- a/pkg/server/router/tcp/router.go +++ b/pkg/server/router/tcp/router.go @@ -7,13 +7,13 @@ import ( "fmt" "net/http" - "github.com/containous/traefik/pkg/config/runtime" - "github.com/containous/traefik/pkg/log" - "github.com/containous/traefik/pkg/rules" - "github.com/containous/traefik/pkg/server/internal" - tcpservice "github.com/containous/traefik/pkg/server/service/tcp" - "github.com/containous/traefik/pkg/tcp" - traefiktls "github.com/containous/traefik/pkg/tls" + "github.com/containous/traefik/v2/pkg/config/runtime" + "github.com/containous/traefik/v2/pkg/log" + "github.com/containous/traefik/v2/pkg/rules" + "github.com/containous/traefik/v2/pkg/server/internal" + tcpservice "github.com/containous/traefik/v2/pkg/server/service/tcp" + "github.com/containous/traefik/v2/pkg/tcp" + traefiktls "github.com/containous/traefik/v2/pkg/tls" ) // NewManager Creates a new Manager diff --git a/pkg/server/router/tcp/router_test.go b/pkg/server/router/tcp/router_test.go index cb4c66640..86fb882c6 100644 --- a/pkg/server/router/tcp/router_test.go +++ b/pkg/server/router/tcp/router_test.go @@ -4,10 +4,10 @@ import ( "context" "testing" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/config/runtime" - "github.com/containous/traefik/pkg/server/service/tcp" - "github.com/containous/traefik/pkg/tls" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/config/runtime" + "github.com/containous/traefik/v2/pkg/server/service/tcp" + "github.com/containous/traefik/v2/pkg/tls" "github.com/stretchr/testify/assert" ) diff --git a/pkg/server/server.go b/pkg/server/server.go index 99e925e07..59dca31b3 100644 --- a/pkg/server/server.go +++ b/pkg/server/server.go @@ -9,20 +9,20 @@ import ( "sync" "time" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/config/runtime" - "github.com/containous/traefik/pkg/config/static" - "github.com/containous/traefik/pkg/log" - "github.com/containous/traefik/pkg/metrics" - "github.com/containous/traefik/pkg/middlewares/accesslog" - "github.com/containous/traefik/pkg/middlewares/requestdecorator" - "github.com/containous/traefik/pkg/provider" - "github.com/containous/traefik/pkg/safe" - "github.com/containous/traefik/pkg/server/middleware" - "github.com/containous/traefik/pkg/tls" - "github.com/containous/traefik/pkg/tracing" - "github.com/containous/traefik/pkg/tracing/jaeger" - "github.com/containous/traefik/pkg/types" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/config/runtime" + "github.com/containous/traefik/v2/pkg/config/static" + "github.com/containous/traefik/v2/pkg/log" + "github.com/containous/traefik/v2/pkg/metrics" + "github.com/containous/traefik/v2/pkg/middlewares/accesslog" + "github.com/containous/traefik/v2/pkg/middlewares/requestdecorator" + "github.com/containous/traefik/v2/pkg/provider" + "github.com/containous/traefik/v2/pkg/safe" + "github.com/containous/traefik/v2/pkg/server/middleware" + "github.com/containous/traefik/v2/pkg/tls" + "github.com/containous/traefik/v2/pkg/tracing" + "github.com/containous/traefik/v2/pkg/tracing/jaeger" + "github.com/containous/traefik/v2/pkg/types" ) // Server is the reverse-proxy/load-balancer engine diff --git a/pkg/server/server_configuration.go b/pkg/server/server_configuration.go index 84009edc5..65a0521f4 100644 --- a/pkg/server/server_configuration.go +++ b/pkg/server/server_configuration.go @@ -8,23 +8,23 @@ import ( "time" "github.com/containous/alice" - "github.com/containous/mux" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/config/runtime" - "github.com/containous/traefik/pkg/log" - "github.com/containous/traefik/pkg/metrics" - "github.com/containous/traefik/pkg/middlewares/accesslog" - metricsmiddleware "github.com/containous/traefik/pkg/middlewares/metrics" - "github.com/containous/traefik/pkg/middlewares/requestdecorator" - "github.com/containous/traefik/pkg/middlewares/tracing" - "github.com/containous/traefik/pkg/responsemodifiers" - "github.com/containous/traefik/pkg/server/middleware" - "github.com/containous/traefik/pkg/server/router" - routertcp "github.com/containous/traefik/pkg/server/router/tcp" - "github.com/containous/traefik/pkg/server/service" - "github.com/containous/traefik/pkg/server/service/tcp" - tcpCore "github.com/containous/traefik/pkg/tcp" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/config/runtime" + "github.com/containous/traefik/v2/pkg/log" + "github.com/containous/traefik/v2/pkg/metrics" + "github.com/containous/traefik/v2/pkg/middlewares/accesslog" + metricsmiddleware "github.com/containous/traefik/v2/pkg/middlewares/metrics" + "github.com/containous/traefik/v2/pkg/middlewares/requestdecorator" + "github.com/containous/traefik/v2/pkg/middlewares/tracing" + "github.com/containous/traefik/v2/pkg/responsemodifiers" + "github.com/containous/traefik/v2/pkg/server/middleware" + "github.com/containous/traefik/v2/pkg/server/router" + routertcp "github.com/containous/traefik/v2/pkg/server/router/tcp" + "github.com/containous/traefik/v2/pkg/server/service" + "github.com/containous/traefik/v2/pkg/server/service/tcp" + tcpCore "github.com/containous/traefik/v2/pkg/tcp" "github.com/eapache/channels" + "github.com/gorilla/mux" "github.com/sirupsen/logrus" ) diff --git a/pkg/server/server_configuration_test.go b/pkg/server/server_configuration_test.go index 9d12b725c..732529f8e 100644 --- a/pkg/server/server_configuration_test.go +++ b/pkg/server/server_configuration_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/config/runtime" - "github.com/containous/traefik/pkg/config/static" - th "github.com/containous/traefik/pkg/testhelpers" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/config/runtime" + "github.com/containous/traefik/v2/pkg/config/static" + th "github.com/containous/traefik/v2/pkg/testhelpers" "github.com/stretchr/testify/assert" ) diff --git a/pkg/server/server_entrypoint_tcp.go b/pkg/server/server_entrypoint_tcp.go index 98a56800e..4e890c91a 100644 --- a/pkg/server/server_entrypoint_tcp.go +++ b/pkg/server/server_entrypoint_tcp.go @@ -9,13 +9,13 @@ import ( "time" "github.com/armon/go-proxyproto" - "github.com/containous/traefik/pkg/config/static" - "github.com/containous/traefik/pkg/ip" - "github.com/containous/traefik/pkg/log" - "github.com/containous/traefik/pkg/middlewares" - "github.com/containous/traefik/pkg/middlewares/forwardedheaders" - "github.com/containous/traefik/pkg/safe" - "github.com/containous/traefik/pkg/tcp" + "github.com/containous/traefik/v2/pkg/config/static" + "github.com/containous/traefik/v2/pkg/ip" + "github.com/containous/traefik/v2/pkg/log" + "github.com/containous/traefik/v2/pkg/middlewares" + "github.com/containous/traefik/v2/pkg/middlewares/forwardedheaders" + "github.com/containous/traefik/v2/pkg/safe" + "github.com/containous/traefik/v2/pkg/tcp" "golang.org/x/net/http2" "golang.org/x/net/http2/h2c" ) diff --git a/pkg/server/server_entrypoint_tcp_test.go b/pkg/server/server_entrypoint_tcp_test.go index 041ecdcfd..525cea4f9 100644 --- a/pkg/server/server_entrypoint_tcp_test.go +++ b/pkg/server/server_entrypoint_tcp_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - "github.com/containous/traefik/pkg/config/static" - "github.com/containous/traefik/pkg/tcp" - "github.com/containous/traefik/pkg/types" + "github.com/containous/traefik/v2/pkg/config/static" + "github.com/containous/traefik/v2/pkg/tcp" + "github.com/containous/traefik/v2/pkg/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/server/server_signals.go b/pkg/server/server_signals.go index 63bf9d5c0..a1411dc65 100644 --- a/pkg/server/server_signals.go +++ b/pkg/server/server_signals.go @@ -6,7 +6,7 @@ import ( "os/signal" "syscall" - "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/v2/pkg/log" ) func (s *Server) configureSignals() { diff --git a/pkg/server/server_test.go b/pkg/server/server_test.go index 4756a197e..9f0913742 100644 --- a/pkg/server/server_test.go +++ b/pkg/server/server_test.go @@ -7,11 +7,11 @@ import ( "testing" "time" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/config/runtime" - "github.com/containous/traefik/pkg/config/static" - th "github.com/containous/traefik/pkg/testhelpers" - "github.com/containous/traefik/pkg/types" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/config/runtime" + "github.com/containous/traefik/v2/pkg/config/static" + th "github.com/containous/traefik/v2/pkg/testhelpers" + "github.com/containous/traefik/v2/pkg/types" "github.com/stretchr/testify/assert" ) diff --git a/pkg/server/service/proxy.go b/pkg/server/service/proxy.go index 2c59c6475..a305fbb1d 100644 --- a/pkg/server/service/proxy.go +++ b/pkg/server/service/proxy.go @@ -10,9 +10,9 @@ import ( "net/url" "time" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/log" - "github.com/containous/traefik/pkg/types" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/log" + "github.com/containous/traefik/v2/pkg/types" ) // StatusClientClosedRequest non-standard HTTP status code for client disconnection diff --git a/pkg/server/service/proxy_test.go b/pkg/server/service/proxy_test.go index 5201741ab..53d8b5d14 100644 --- a/pkg/server/service/proxy_test.go +++ b/pkg/server/service/proxy_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/containous/traefik/pkg/testhelpers" + "github.com/containous/traefik/v2/pkg/testhelpers" ) type staticTransport struct { diff --git a/pkg/server/service/service.go b/pkg/server/service/service.go index 1a8fab5a6..7e2a0e8f1 100644 --- a/pkg/server/service/service.go +++ b/pkg/server/service/service.go @@ -9,17 +9,17 @@ import ( "time" "github.com/containous/alice" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/config/runtime" - "github.com/containous/traefik/pkg/healthcheck" - "github.com/containous/traefik/pkg/log" - "github.com/containous/traefik/pkg/metrics" - "github.com/containous/traefik/pkg/middlewares/accesslog" - "github.com/containous/traefik/pkg/middlewares/emptybackendhandler" - metricsMiddle "github.com/containous/traefik/pkg/middlewares/metrics" - "github.com/containous/traefik/pkg/middlewares/pipelining" - "github.com/containous/traefik/pkg/server/cookie" - "github.com/containous/traefik/pkg/server/internal" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/config/runtime" + "github.com/containous/traefik/v2/pkg/healthcheck" + "github.com/containous/traefik/v2/pkg/log" + "github.com/containous/traefik/v2/pkg/metrics" + "github.com/containous/traefik/v2/pkg/middlewares/accesslog" + "github.com/containous/traefik/v2/pkg/middlewares/emptybackendhandler" + metricsMiddle "github.com/containous/traefik/v2/pkg/middlewares/metrics" + "github.com/containous/traefik/v2/pkg/middlewares/pipelining" + "github.com/containous/traefik/v2/pkg/server/cookie" + "github.com/containous/traefik/v2/pkg/server/internal" "github.com/vulcand/oxy/roundrobin" ) diff --git a/pkg/server/service/service_test.go b/pkg/server/service/service_test.go index 9dd4344fd..a075b5cae 100644 --- a/pkg/server/service/service_test.go +++ b/pkg/server/service/service_test.go @@ -7,10 +7,10 @@ import ( "strings" "testing" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/config/runtime" - "github.com/containous/traefik/pkg/server/internal" - "github.com/containous/traefik/pkg/testhelpers" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/config/runtime" + "github.com/containous/traefik/v2/pkg/server/internal" + "github.com/containous/traefik/v2/pkg/testhelpers" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/server/service/tcp/service.go b/pkg/server/service/tcp/service.go index 59d159a11..e5311a7eb 100644 --- a/pkg/server/service/tcp/service.go +++ b/pkg/server/service/tcp/service.go @@ -5,10 +5,10 @@ import ( "fmt" "net" - "github.com/containous/traefik/pkg/config/runtime" - "github.com/containous/traefik/pkg/log" - "github.com/containous/traefik/pkg/server/internal" - "github.com/containous/traefik/pkg/tcp" + "github.com/containous/traefik/v2/pkg/config/runtime" + "github.com/containous/traefik/v2/pkg/log" + "github.com/containous/traefik/v2/pkg/server/internal" + "github.com/containous/traefik/v2/pkg/tcp" ) // Manager is the TCPHandlers factory diff --git a/pkg/server/service/tcp/service_test.go b/pkg/server/service/tcp/service_test.go index a4ec678d6..8d680f11f 100644 --- a/pkg/server/service/tcp/service_test.go +++ b/pkg/server/service/tcp/service_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/containous/traefik/pkg/config/dynamic" - "github.com/containous/traefik/pkg/config/runtime" - "github.com/containous/traefik/pkg/server/internal" + "github.com/containous/traefik/v2/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/config/runtime" + "github.com/containous/traefik/v2/pkg/server/internal" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/tcp/proxy.go b/pkg/tcp/proxy.go index 0338508c6..76a20aa91 100644 --- a/pkg/tcp/proxy.go +++ b/pkg/tcp/proxy.go @@ -4,7 +4,7 @@ import ( "io" "net" - "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/v2/pkg/log" ) // Proxy forwards a TCP request to a TCP service diff --git a/pkg/tcp/router.go b/pkg/tcp/router.go index dd7eb5020..7dc379373 100644 --- a/pkg/tcp/router.go +++ b/pkg/tcp/router.go @@ -9,7 +9,7 @@ import ( "net/http" "strings" - "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/v2/pkg/log" ) // Router is a TCP router diff --git a/pkg/tcp/rr_load_balancer.go b/pkg/tcp/rr_load_balancer.go index 84fb63596..6187d5417 100644 --- a/pkg/tcp/rr_load_balancer.go +++ b/pkg/tcp/rr_load_balancer.go @@ -4,7 +4,7 @@ import ( "net" "sync" - "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/v2/pkg/log" ) // RRLoadBalancer is a naive RoundRobin load balancer for TCP services diff --git a/pkg/tcp/switcher.go b/pkg/tcp/switcher.go index 9ff7e31d9..330fc993f 100644 --- a/pkg/tcp/switcher.go +++ b/pkg/tcp/switcher.go @@ -3,7 +3,7 @@ package tcp import ( "net" - "github.com/containous/traefik/pkg/safe" + "github.com/containous/traefik/v2/pkg/safe" ) // HandlerSwitcher is a TCP handler switcher diff --git a/pkg/testhelpers/config.go b/pkg/testhelpers/config.go index 6cfcbbb43..e0f9b807b 100644 --- a/pkg/testhelpers/config.go +++ b/pkg/testhelpers/config.go @@ -1,7 +1,7 @@ package testhelpers import ( - "github.com/containous/traefik/pkg/config/dynamic" + "github.com/containous/traefik/v2/pkg/config/dynamic" ) // BuildConfiguration is a helper to create a configuration. diff --git a/pkg/tls/certificate.go b/pkg/tls/certificate.go index 4b59fee49..7f739e38b 100644 --- a/pkg/tls/certificate.go +++ b/pkg/tls/certificate.go @@ -9,8 +9,8 @@ import ( "sort" "strings" - "github.com/containous/traefik/pkg/log" - "github.com/containous/traefik/pkg/tls/generate" + "github.com/containous/traefik/v2/pkg/log" + "github.com/containous/traefik/v2/pkg/tls/generate" ) var ( diff --git a/pkg/tls/certificate_store.go b/pkg/tls/certificate_store.go index 040d2b978..da16472b3 100644 --- a/pkg/tls/certificate_store.go +++ b/pkg/tls/certificate_store.go @@ -8,8 +8,8 @@ import ( "strings" "time" - "github.com/containous/traefik/pkg/log" - "github.com/containous/traefik/pkg/safe" + "github.com/containous/traefik/v2/pkg/log" + "github.com/containous/traefik/v2/pkg/safe" "github.com/patrickmn/go-cache" ) diff --git a/pkg/tls/certificate_store_test.go b/pkg/tls/certificate_store_test.go index b67ac3cff..9ee0339b6 100644 --- a/pkg/tls/certificate_store_test.go +++ b/pkg/tls/certificate_store_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/containous/traefik/pkg/safe" + "github.com/containous/traefik/v2/pkg/safe" "github.com/patrickmn/go-cache" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/tls/tlsmanager.go b/pkg/tls/tlsmanager.go index 90914998b..27fdbb1eb 100644 --- a/pkg/tls/tlsmanager.go +++ b/pkg/tls/tlsmanager.go @@ -7,10 +7,10 @@ import ( "fmt" "sync" - "github.com/containous/traefik/pkg/log" - "github.com/containous/traefik/pkg/tls/generate" - "github.com/containous/traefik/pkg/types" - "github.com/go-acme/lego/challenge/tlsalpn01" + "github.com/containous/traefik/v2/pkg/log" + "github.com/containous/traefik/v2/pkg/tls/generate" + "github.com/containous/traefik/v2/pkg/types" + "github.com/go-acme/lego/v3/challenge/tlsalpn01" "github.com/sirupsen/logrus" ) diff --git a/pkg/tracing/datadog/datadog.go b/pkg/tracing/datadog/datadog.go index 466df2ca9..d297fe916 100644 --- a/pkg/tracing/datadog/datadog.go +++ b/pkg/tracing/datadog/datadog.go @@ -4,7 +4,7 @@ import ( "io" "strings" - "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/v2/pkg/log" "github.com/opentracing/opentracing-go" ddtracer "gopkg.in/DataDog/dd-trace-go.v1/ddtrace/opentracer" datadog "gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer" diff --git a/pkg/tracing/haystack/haystack.go b/pkg/tracing/haystack/haystack.go index 19038fff9..aa48375de 100644 --- a/pkg/tracing/haystack/haystack.go +++ b/pkg/tracing/haystack/haystack.go @@ -6,7 +6,7 @@ import ( "time" "github.com/ExpediaDotCom/haystack-client-go" - "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/v2/pkg/log" "github.com/opentracing/opentracing-go" ) diff --git a/pkg/tracing/haystack/logger.go b/pkg/tracing/haystack/logger.go index f88089d5b..aa223fcb8 100644 --- a/pkg/tracing/haystack/logger.go +++ b/pkg/tracing/haystack/logger.go @@ -1,7 +1,7 @@ package haystack import ( - "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/v2/pkg/log" ) /*NullLogger does nothing*/ diff --git a/pkg/tracing/instana/instana.go b/pkg/tracing/instana/instana.go index 34df22f16..e2912bbdd 100644 --- a/pkg/tracing/instana/instana.go +++ b/pkg/tracing/instana/instana.go @@ -3,7 +3,7 @@ package instana import ( "io" - "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/v2/pkg/log" instana "github.com/instana/go-sensor" "github.com/opentracing/opentracing-go" ) diff --git a/pkg/tracing/jaeger/jaeger.go b/pkg/tracing/jaeger/jaeger.go index 2c463adbf..ba8c702e0 100644 --- a/pkg/tracing/jaeger/jaeger.go +++ b/pkg/tracing/jaeger/jaeger.go @@ -4,7 +4,7 @@ import ( "fmt" "io" - "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/v2/pkg/log" "github.com/opentracing/opentracing-go" jaeger "github.com/uber/jaeger-client-go" jaegercli "github.com/uber/jaeger-client-go" diff --git a/pkg/tracing/jaeger/logger.go b/pkg/tracing/jaeger/logger.go index 6e6d8a439..2df321b8c 100644 --- a/pkg/tracing/jaeger/logger.go +++ b/pkg/tracing/jaeger/logger.go @@ -1,7 +1,7 @@ package jaeger import ( - "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/v2/pkg/log" "github.com/sirupsen/logrus" ) diff --git a/pkg/tracing/operation_name.go b/pkg/tracing/operation_name.go index 8d0887a04..a076e4e45 100644 --- a/pkg/tracing/operation_name.go +++ b/pkg/tracing/operation_name.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/v2/pkg/log" ) // TraceNameHashLength defines the number of characters to use from the head of the generated hash. diff --git a/pkg/tracing/tracing.go b/pkg/tracing/tracing.go index c370c05b9..82d5f2226 100644 --- a/pkg/tracing/tracing.go +++ b/pkg/tracing/tracing.go @@ -7,7 +7,7 @@ import ( "io" "net/http" - "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/v2/pkg/log" "github.com/opentracing/opentracing-go" "github.com/opentracing/opentracing-go/ext" ) diff --git a/pkg/tracing/zipkin/zipkin.go b/pkg/tracing/zipkin/zipkin.go index 3d246be9f..52885ca4a 100644 --- a/pkg/tracing/zipkin/zipkin.go +++ b/pkg/tracing/zipkin/zipkin.go @@ -4,7 +4,7 @@ import ( "io" "time" - "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/v2/pkg/log" "github.com/opentracing/opentracing-go" zipkin "github.com/openzipkin-contrib/zipkin-go-opentracing" ) diff --git a/pkg/types/route_appender.go b/pkg/types/route_appender.go index 01e24a3bf..3549bef5e 100644 --- a/pkg/types/route_appender.go +++ b/pkg/types/route_appender.go @@ -1,7 +1,7 @@ package types import ( - "github.com/containous/mux" + "github.com/gorilla/mux" ) // RouteAppender appends routes on a router (/api, /ping ...) diff --git a/pkg/types/tls.go b/pkg/types/tls.go index 492225003..2610345c0 100644 --- a/pkg/types/tls.go +++ b/pkg/types/tls.go @@ -8,7 +8,7 @@ import ( "io/ioutil" "os" - "github.com/containous/traefik/pkg/log" + "github.com/containous/traefik/v2/pkg/log" ) // ClientTLS holds TLS specific configurations as client diff --git a/pkg/version/version.go b/pkg/version/version.go index 386df6153..478c4f132 100644 --- a/pkg/version/version.go +++ b/pkg/version/version.go @@ -5,9 +5,9 @@ import ( "net/http" "net/url" - "github.com/containous/mux" - "github.com/containous/traefik/pkg/log" - "github.com/google/go-github/github" + "github.com/containous/traefik/v2/pkg/log" + "github.com/google/go-github/v27/github" + "github.com/gorilla/mux" goversion "github.com/hashicorp/go-version" "github.com/unrolled/render" ) diff --git a/script/update-generated-crd-code.sh b/script/update-generated-crd-code.sh index b19eceb63..25b40b204 100755 --- a/script/update-generated-crd-code.sh +++ b/script/update-generated-crd-code.sh @@ -3,6 +3,10 @@ HACK_DIR="$( cd "$( dirname "${0}" )" && pwd -P)"; export HACK_DIR REPO_ROOT=${HACK_DIR}/.. +rm -rf "${REPO_ROOT}"/vendor +go mod vendor +chmod +x "${REPO_ROOT}"/vendor/k8s.io/code-generator/*.sh + "${REPO_ROOT}"/vendor/k8s.io/code-generator/generate-groups.sh \ all \ github.com/containous/traefik/pkg/provider/kubernetes/crd/generated \ @@ -16,3 +20,5 @@ deepcopy-gen \ --input-dirs github.com/containous/traefik/pkg/tls \ --input-dirs github.com/containous/traefik/pkg/types \ -O zz_generated.deepcopy --go-header-file "${HACK_DIR}"/boilerplate.go.tmpl + +rm -rf "${REPO_ROOT}"/vendor diff --git a/tools.go b/tools.go new file mode 100644 index 000000000..1185af9e3 --- /dev/null +++ b/tools.go @@ -0,0 +1,7 @@ +// +build tools + +package main + +import ( + _ "k8s.io/code-generator" +)