From 9ffeba18ee97832156658c5f9410c2fd539989b8 Mon Sep 17 00:00:00 2001 From: Frank Schroeder Date: Wed, 2 Aug 2017 17:59:47 +0200 Subject: [PATCH] agent: fix code for updated go-discover signature Closes #3351 --- agent/retry_join.go | 12 +++--------- agent/retry_join_test.go | 7 +++---- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/agent/retry_join.go b/agent/retry_join.go index dcf6c2dbc2..a5561b12db 100644 --- a/agent/retry_join.go +++ b/agent/retry_join.go @@ -6,13 +6,6 @@ import ( "time" discover "github.com/hashicorp/go-discover" - - // support retry-join only for the following providers - // to add more providers import additional packages or 'all' - // to support all providers of go-discover - _ "github.com/hashicorp/go-discover/provider/aws" - _ "github.com/hashicorp/go-discover/provider/azure" - _ "github.com/hashicorp/go-discover/provider/gce" ) // RetryJoin is used to handle retrying a join until it succeeds or all @@ -23,7 +16,8 @@ func (a *Agent) retryJoin() { return } - a.logger.Printf("[INFO] agent: Supporting retry join for %v", discover.ProviderNames()) + disco := discover.Discover{} + a.logger.Printf("[INFO] agent: Retry join is supported for: %s", strings.Join(disco.Names(), " ")) a.logger.Printf("[INFO] agent: Joining cluster...") attempt := 0 for { @@ -33,7 +27,7 @@ func (a *Agent) retryJoin() { for _, addr := range cfg.RetryJoin { switch { case strings.Contains(addr, "provider="): - servers, err := discover.Addrs(addr, a.logger) + servers, err := disco.Addrs(addr, a.logger) if err != nil { a.logger.Printf("[ERR] agent: %s", err) } else { diff --git a/agent/retry_join_test.go b/agent/retry_join_test.go index 703277e9c9..a0d60d5190 100644 --- a/agent/retry_join_test.go +++ b/agent/retry_join_test.go @@ -7,11 +7,10 @@ import ( discover "github.com/hashicorp/go-discover" ) -// if this test fails check the _ imports of go-discover/provider/* packages -// in retry_join.go func TestGoDiscoverRegistration(t *testing.T) { - got := discover.ProviderNames() - want := []string{"aws", "azure", "gce"} + d := discover.Discover{} + got := d.Names() + want := []string{"aws", "azure", "gce", "softlayer"} if !reflect.DeepEqual(got, want) { t.Fatalf("got go-discover providers %v want %v", got, want) }