Address import loop

Move the ConsistentHashingStrategyKey to client not config.

pkg/client/client.go

@@ -12,7 +12,6 @@ import (
 
 	"github.com/hashicorp/go-retryablehttp"
 
-	"github.com/replicate/pget/pkg/config"
 	"github.com/replicate/pget/pkg/logging"
 	"github.com/replicate/pget/pkg/version"
 )
@@ -24,6 +23,10 @@ const (
 	retryMaxWait = 1250 * time.Millisecond
 )
 
+type ConsistentHashingStrategy struct{}
+
+var ConsistentHashingStrategyKey ConsistentHashingStrategy
+
 var ErrStrategyFallback = errors.New("fallback to next strategy")
 
 // HTTPClient is a wrapper around http.Client that allows for limiting the number of concurrent connections per host
@@ -111,7 +114,7 @@ func RetryPolicy(ctx context.Context, resp *http.Response, err error) (bool, err
 
 	// While type assertions are not ideal, alternatives are limited to adding custom data in the request
 	// or in the context. The context clearly isolates this data.
-	consistentHashing, ok := ctx.Value(config.ConsistentHashingStrategyKey).(bool)
+	consistentHashing, ok := ctx.Value(ConsistentHashingStrategyKey).(bool)
 	if ok && consistentHashing {
 		if fallbackError(err) {
 			return false, ErrStrategyFallback

pkg/client/client_test.go

@@ -11,7 +11,6 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	"github.com/replicate/pget/pkg/client"
-	"github.com/replicate/pget/pkg/config"
 )
 
 func TestGetSchemeHostKey(t *testing.T) {
@@ -24,7 +23,7 @@ func TestGetSchemeHostKey(t *testing.T) {
 
 func TestRetryPolicy(t *testing.T) {
 	bgCtx := context.Background()
-	chCtx := context.WithValue(bgCtx, config.ConsistentHashingStrategyKey, true)
+	chCtx := context.WithValue(bgCtx, client.ConsistentHashingStrategyKey, true)
 	errContext, cancel := context.WithCancel(bgCtx)
 	cancel()
 

pkg/config/config.go

@@ -27,10 +27,6 @@ var (
 	DefaultCacheURIPrefixes = []string{"https://weights.replicate.delivery"}
 )
 
-type ConsistentHashingStrategy struct{}
-
-var ConsistentHashingStrategyKey ConsistentHashingStrategy
-
 type DeprecatedFlag struct {
 	Flag string
 	Msg  string

pkg/download/consistent_hashing.go

@@ -13,7 +13,6 @@ import (
 	"golang.org/x/sync/errgroup"
 
 	"github.com/replicate/pget/pkg/client"
-	"github.com/replicate/pget/pkg/config"
 	"github.com/replicate/pget/pkg/consistent"
 	"github.com/replicate/pget/pkg/logging"
 )
@@ -250,7 +249,7 @@ func (m *ConsistentHashingMode) Fetch(ctx context.Context, urlString string) (io
 }
 
 func (m *ConsistentHashingMode) DoRequest(ctx context.Context, start, end int64, urlString string) (*http.Response, error) {
-	chContext := context.WithValue(ctx, config.ConsistentHashingStrategyKey, true)
+	chContext := context.WithValue(ctx, client.ConsistentHashingStrategyKey, true)
 	req, err := http.NewRequestWithContext(chContext, "GET", urlString, nil)
 	if err != nil {
 		return nil, fmt.Errorf("failed to download %s: %w", req.URL.String(), err)