Merge pull request #2042 from EtienneBruines/patch-2

fix: timeout issues for list.peerings

Author: sreeram77

dependency/consul_peering.go

@@ -99,12 +99,7 @@ func (l *ListPeeringQuery) Fetch(clients *ClientSet, opts *QueryOptions) (interf
 		RawQuery: opts.String(),
 	})
 
-	// list peering is a blocking API, so making sure the ctx passed while calling it
-	// times out after the default wait time.
-	ctx, cancel := context.WithTimeout(context.Background(), DefaultContextTimeout)
-	defer cancel()
-
-	p, meta, err := clients.Consul().Peerings().List(ctx, opts.ToConsulOpts())
+	p, meta, err := clients.Consul().Peerings().List(context.Background(), opts.ToConsulOpts())
 	if err != nil {
 		return nil, nil, errors.Wrap(err, l.String())
 	}

dependency/dependency.go

@@ -44,11 +44,6 @@ const (
 	TypeNomad
 )
 
-const (
-	// DefaultContextTimeout context wait timeout for blocking queries.
-	DefaultContextTimeout = 60 * time.Second
-)
-
 // Dependency is an interface for a dependency that Consul Template is capable
 // of watching.
 type Dependency interface {