From db7817c42a8d8e5439dcff2700e709d935db560a Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Wed, 27 Mar 2019 09:03:07 -0400 Subject: [PATCH] Bump vendor to take in new sdk/api versions (#5574) --- vendor/github.com/hashicorp/consul/api/go.mod | 4 ++-- .../consul/{internal => sdk}/freeport/freeport.go | 0 .../consul/{internal => sdk}/testutil/README.md | 2 +- .../hashicorp/consul/{internal => sdk}/testutil/io.go | 0 .../consul/{internal => sdk}/testutil/retry/retry.go | 0 .../consul/{internal => sdk}/testutil/server.go | 0 .../{internal => sdk}/testutil/server_methods.go | 0 .../{internal => sdk}/testutil/server_wrapper.go | 0 .../consul/{internal => sdk}/testutil/testlog.go | 0 vendor/modules.txt | 10 +++++----- 10 files changed, 8 insertions(+), 8 deletions(-) rename vendor/github.com/hashicorp/consul/{internal => sdk}/freeport/freeport.go (100%) rename vendor/github.com/hashicorp/consul/{internal => sdk}/testutil/README.md (97%) rename vendor/github.com/hashicorp/consul/{internal => sdk}/testutil/io.go (100%) rename vendor/github.com/hashicorp/consul/{internal => sdk}/testutil/retry/retry.go (100%) rename vendor/github.com/hashicorp/consul/{internal => sdk}/testutil/server.go (100%) rename vendor/github.com/hashicorp/consul/{internal => sdk}/testutil/server_methods.go (100%) rename vendor/github.com/hashicorp/consul/{internal => sdk}/testutil/server_wrapper.go (100%) rename vendor/github.com/hashicorp/consul/{internal => sdk}/testutil/testlog.go (100%) diff --git a/vendor/github.com/hashicorp/consul/api/go.mod b/vendor/github.com/hashicorp/consul/api/go.mod index 0c8a7503ec..25f931c556 100644 --- a/vendor/github.com/hashicorp/consul/api/go.mod +++ b/vendor/github.com/hashicorp/consul/api/go.mod @@ -2,10 +2,10 @@ module github.com/hashicorp/consul/api go 1.12 -replace github.com/hashicorp/consul/internal => ../internal +replace github.com/hashicorp/consul/sdk => ../sdk require ( - github.com/hashicorp/consul/internal v0.1.0 + github.com/hashicorp/consul/sdk v0.1.0 github.com/hashicorp/go-cleanhttp v0.5.1 github.com/hashicorp/go-rootcerts v1.0.0 github.com/hashicorp/go-uuid v1.0.1 diff --git a/vendor/github.com/hashicorp/consul/internal/freeport/freeport.go b/vendor/github.com/hashicorp/consul/sdk/freeport/freeport.go similarity index 100% rename from vendor/github.com/hashicorp/consul/internal/freeport/freeport.go rename to vendor/github.com/hashicorp/consul/sdk/freeport/freeport.go diff --git a/vendor/github.com/hashicorp/consul/internal/testutil/README.md b/vendor/github.com/hashicorp/consul/sdk/testutil/README.md similarity index 97% rename from vendor/github.com/hashicorp/consul/internal/testutil/README.md rename to vendor/github.com/hashicorp/consul/sdk/testutil/README.md index 303ae24a9c..2462d55dfb 100644 --- a/vendor/github.com/hashicorp/consul/internal/testutil/README.md +++ b/vendor/github.com/hashicorp/consul/sdk/testutil/README.md @@ -22,7 +22,7 @@ import ( "testing" "github.com/hashicorp/consul/consul/structs" - "github.com/hashicorp/consul/internal/testutil" + "github.com/hashicorp/consul/sdk/testutil" ) func TestFoo_bar(t *testing.T) { diff --git a/vendor/github.com/hashicorp/consul/internal/testutil/io.go b/vendor/github.com/hashicorp/consul/sdk/testutil/io.go similarity index 100% rename from vendor/github.com/hashicorp/consul/internal/testutil/io.go rename to vendor/github.com/hashicorp/consul/sdk/testutil/io.go diff --git a/vendor/github.com/hashicorp/consul/internal/testutil/retry/retry.go b/vendor/github.com/hashicorp/consul/sdk/testutil/retry/retry.go similarity index 100% rename from vendor/github.com/hashicorp/consul/internal/testutil/retry/retry.go rename to vendor/github.com/hashicorp/consul/sdk/testutil/retry/retry.go diff --git a/vendor/github.com/hashicorp/consul/internal/testutil/server.go b/vendor/github.com/hashicorp/consul/sdk/testutil/server.go similarity index 100% rename from vendor/github.com/hashicorp/consul/internal/testutil/server.go rename to vendor/github.com/hashicorp/consul/sdk/testutil/server.go diff --git a/vendor/github.com/hashicorp/consul/internal/testutil/server_methods.go b/vendor/github.com/hashicorp/consul/sdk/testutil/server_methods.go similarity index 100% rename from vendor/github.com/hashicorp/consul/internal/testutil/server_methods.go rename to vendor/github.com/hashicorp/consul/sdk/testutil/server_methods.go diff --git a/vendor/github.com/hashicorp/consul/internal/testutil/server_wrapper.go b/vendor/github.com/hashicorp/consul/sdk/testutil/server_wrapper.go similarity index 100% rename from vendor/github.com/hashicorp/consul/internal/testutil/server_wrapper.go rename to vendor/github.com/hashicorp/consul/sdk/testutil/server_wrapper.go diff --git a/vendor/github.com/hashicorp/consul/internal/testutil/testlog.go b/vendor/github.com/hashicorp/consul/sdk/testutil/testlog.go similarity index 100% rename from vendor/github.com/hashicorp/consul/internal/testutil/testlog.go rename to vendor/github.com/hashicorp/consul/sdk/testutil/testlog.go diff --git a/vendor/modules.txt b/vendor/modules.txt index fe58cd0451..41f982696f 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -189,12 +189,12 @@ github.com/gregjones/httpcache github.com/gregjones/httpcache/diskcache # github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed github.com/hailocab/go-hostpool -# github.com/hashicorp/consul/api v1.0.0 => ./api +# github.com/hashicorp/consul/api v1.0.1 => ./api github.com/hashicorp/consul/api -# github.com/hashicorp/consul/internal v0.1.0 => ./internal -github.com/hashicorp/consul/internal/freeport -github.com/hashicorp/consul/internal/testutil/retry -github.com/hashicorp/consul/internal/testutil +# github.com/hashicorp/consul/sdk v0.1.0 => ./sdk +github.com/hashicorp/consul/sdk/freeport +github.com/hashicorp/consul/sdk/testutil/retry +github.com/hashicorp/consul/sdk/testutil # github.com/hashicorp/errwrap v1.0.0 github.com/hashicorp/errwrap # github.com/hashicorp/go-checkpoint v0.0.0-20171009173528-1545e56e46de