From ba77cb5a97f48a30dc0a77e76d57d9aa8082c13e Mon Sep 17 00:00:00 2001
From: Todd <github@quaddi.com>
Date: Thu, 25 Apr 2024 20:26:30 +0000
Subject: [PATCH] backport of commit 72c9759987b95982c1ba9b15ac4c745ce2b2bd9d

---
 .../internal/cache/repository_resolvable_aliases.go   | 11 +++++++----
 .../clientcache/internal/cache/repository_sessions.go | 11 +++++++----
 .../clientcache/internal/cache/repository_targets.go  | 11 +++++++----
 internal/cmd/base/base.go                             |  5 -----
 4 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/internal/clientcache/internal/cache/repository_resolvable_aliases.go b/internal/clientcache/internal/cache/repository_resolvable_aliases.go
index 3b17b93817..1bec59e9ae 100644
--- a/internal/clientcache/internal/cache/repository_resolvable_aliases.go
+++ b/internal/clientcache/internal/cache/repository_resolvable_aliases.go
@@ -26,10 +26,13 @@ type ResolvableAliasRetrievalFunc func(ctx context.Context, addr, authTok, userI
 
 func defaultResolvableAliasFunc(ctx context.Context, addr, authTok, userId string, refreshTok RefreshTokenValue) ([]*aliases.Alias, []string, RefreshTokenValue, error) {
 	const op = "cache.defaultResolvableAliasFunc"
-	client, err := api.NewClient(&api.Config{
-		Addr:  addr,
-		Token: authTok,
-	})
+	conf, err := api.DefaultConfig()
+	if err != nil {
+		return nil, nil, "", errors.Wrap(ctx, err, op)
+	}
+	conf.Addr = addr
+	conf.Token = authTok
+	client, err := api.NewClient(conf)
 	if err != nil {
 		return nil, nil, "", errors.Wrap(ctx, err, op)
 	}
diff --git a/internal/clientcache/internal/cache/repository_sessions.go b/internal/clientcache/internal/cache/repository_sessions.go
index a591c15a05..99f5bad1c3 100644
--- a/internal/clientcache/internal/cache/repository_sessions.go
+++ b/internal/clientcache/internal/cache/repository_sessions.go
@@ -25,10 +25,13 @@ type SessionRetrievalFunc func(ctx context.Context, addr, authTok string, refres
 
 func defaultSessionFunc(ctx context.Context, addr, authTok string, refreshTok RefreshTokenValue) ([]*sessions.Session, []string, RefreshTokenValue, error) {
 	const op = "cache.defaultSessionFunc"
-	client, err := api.NewClient(&api.Config{
-		Addr:  addr,
-		Token: authTok,
-	})
+	conf, err := api.DefaultConfig()
+	if err != nil {
+		return nil, nil, "", errors.Wrap(ctx, err, op)
+	}
+	conf.Addr = addr
+	conf.Token = authTok
+	client, err := api.NewClient(conf)
 	if err != nil {
 		return nil, nil, "", errors.Wrap(ctx, err, op)
 	}
diff --git a/internal/clientcache/internal/cache/repository_targets.go b/internal/clientcache/internal/cache/repository_targets.go
index 39c7aa6fb1..f52c9c0785 100644
--- a/internal/clientcache/internal/cache/repository_targets.go
+++ b/internal/clientcache/internal/cache/repository_targets.go
@@ -25,10 +25,13 @@ type TargetRetrievalFunc func(ctx context.Context, addr, authTok string, refresh
 
 func defaultTargetFunc(ctx context.Context, addr, authTok string, refreshTok RefreshTokenValue) ([]*targets.Target, []string, RefreshTokenValue, error) {
 	const op = "cache.defaultTargetFunc"
-	client, err := api.NewClient(&api.Config{
-		Addr:  addr,
-		Token: authTok,
-	})
+	conf, err := api.DefaultConfig()
+	if err != nil {
+		return nil, nil, "", errors.Wrap(ctx, err, op)
+	}
+	conf.Addr = addr
+	conf.Token = authTok
+	client, err := api.NewClient(conf)
 	if err != nil {
 		return nil, nil, "", errors.Wrap(ctx, err, op)
 	}
diff --git a/internal/cmd/base/base.go b/internal/cmd/base/base.go
index 312ac31be4..cff6fb1468 100644
--- a/internal/cmd/base/base.go
+++ b/internal/cmd/base/base.go
@@ -270,11 +270,6 @@ func (c *Command) Client(opt ...Option) (*api.Client, error) {
 		}
 	}
 
-	// Turn off retries on the CLI
-	if os.Getenv(api.EnvBoundaryMaxRetries) == "" {
-		c.client.SetMaxRetries(0)
-	}
-
 	switch {
 	case opts.withNoTokenValue:
 		c.client.SetToken("")