From 11e7a0d5471498df2b43d1b64c5492b8149faa22 Mon Sep 17 00:00:00 2001
From: cskh <hui.kang@hashicorp.com>
Date: Wed, 10 Aug 2022 10:53:57 -0400
Subject: [PATCH] fix: shadowed err in retryJoin() (#14112)

- err value will be used later to surface the error message
  if r.join() returns any err.
---
 agent/retry_join.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/agent/retry_join.go b/agent/retry_join.go
index 8cfb00e22e..b807697e84 100644
--- a/agent/retry_join.go
+++ b/agent/retry_join.go
@@ -226,7 +226,8 @@ func (r *retryJoiner) retryJoin() error {
 	for {
 		addrs := retryJoinAddrs(disco, r.variant, r.cluster, r.addrs, r.logger)
 		if len(addrs) > 0 {
-			n, err := r.join(addrs)
+			n := 0
+			n, err = r.join(addrs)
 			if err == nil {
 				if r.variant == retryJoinMeshGatewayVariant {
 					r.logger.Info("Refreshing mesh gateways completed")