RSDK-6155 - add initialDialAttempts to robot client options

robot/client/client.go

@@ -303,8 +303,24 @@ func New(ctx context.Context, address string, clientLogger logging.ZapCompatible
 		rc.dialOptions = append(rc.dialOptions, rpc.WithUnaryClientInterceptor(inter.UnaryClientInterceptor))
 	}
 
-	if err := rc.Connect(ctx); err != nil {
-		return nil, err
+	numAttempts := 3
+	if rOpts.initialConnectionAttempts != nil {
+		numAttempts = *rOpts.initialConnectionAttempts
+	}
+
+	if numAttempts == 0 {
+		numAttempts = -1
+	}
+
+	for {
+		if err := rc.Connect(ctx); err != nil {
+			numAttempts--
+			if numAttempts == 0 {
+				return nil, err
+			}
+		} else {
+			break
+		}
 	}
 
 	// If running in a testing environment, wait for machine to report a state of

robot/client/client_options.go

@@ -33,6 +33,11 @@ type robotClientOpts struct {
 	// controls whether or not sessions are disabled.
 	disableSessions bool
 
+	// initialConnectionAttempts indicates the number of times to try dialing when making
+	// initial connection to a machine. Defaults to three. If set to zero or a negative
+	// value, will attempt to connect forever.
+	initialConnectionAttempts *int
+
 	modName string
 }
 
@@ -74,6 +79,15 @@ func WithRefreshEvery(refreshEvery time.Duration) RobotClientOption {
 	})
 }
 
+// WithInitialDialAttempts sets the number of times to attempt to connect to a robot when
+// initially dialing. Defaults to 3 attempts. If set to zero or a negative value, will
+// attempt to connect forever.
+func WithInitialDialAttempts(attempts int) RobotClientOption {
+	return newFuncRobotClientOption(func(o *robotClientOpts) {
+		o.initialConnectionAttempts = &attempts
+	})
+}
+
 // WithCheckConnectedEvery returns a RobotClientOption for how often to check connection to the robot.
 func WithCheckConnectedEvery(checkConnectedEvery time.Duration) RobotClientOption {
 	return newFuncRobotClientOption(func(o *robotClientOpts) {