From 3574e83a4a3b431cfb63d0cd7f7d1e9f81d30c8f Mon Sep 17 00:00:00 2001
From: Ricky Stewart <ricky@cockroachlabs.com>
Date: Fri, 2 Aug 2024 13:42:37 -0500
Subject: [PATCH] dev: in `doctor`, add `--sandbox_add_mount_pair` if relevant

This was apparently broken with the Bazel 7 upgrade and
bazelbuild/bazel#22001 specifically. If `--test_tmpdir` is set to
some directory under `/tmp`, we need to add `/tmp` as a mount pair as
well. This cannot be done in remote mode so `doctor` needs to be aware
of this.

Closes: #128204
Epic: None
Release note: None
Release justification: Build-only code changes
---
 dev                   |  2 +-
 pkg/cmd/dev/doctor.go | 53 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/dev b/dev
index b4bdcd18727f..6089c8c67ba6 100755
--- a/dev
+++ b/dev
@@ -8,7 +8,7 @@ fi
 set -euo pipefail
 
 # Bump this counter to force rebuilding `dev` on all machines.
-DEV_VERSION=97
+DEV_VERSION=98
 
 THIS_DIR=$(cd "$(dirname "$0")" && pwd)
 BINARY_DIR=$THIS_DIR/bin/dev-versions
diff --git a/pkg/cmd/dev/doctor.go b/pkg/cmd/dev/doctor.go
index 43d62a509793..70e87d07f7c4 100644
--- a/pkg/cmd/dev/doctor.go
+++ b/pkg/cmd/dev/doctor.go
@@ -394,6 +394,59 @@ slightly slower and introduce a noticeable delay in first-time build setup.`
 		},
 		remoteOnly: true,
 	},
+	{
+		name: "sandbox_add_mount_pair_local",
+		check: func(d *dev, _ context.Context, cfg doctorConfig) string {
+			// This check only matters for Linux machines.
+			if runtime.GOOS != "linux" {
+				return ""
+			}
+			if !d.checkLinePresenceInBazelRcUser(cfg.workspace, "test --test_tmpdir=/tmp") {
+				return ""
+			}
+			if d.checkLinePresenceInBazelRcUser(cfg.workspace, "test --sandbox_add_mount_pair=/tmp") {
+				return ""
+			}
+			return "Should set --sandbox_add_mount_pair=/tmp given the use of --test_tmpdir=/tmp"
+		},
+		autofix: func(d *dev, ctx context.Context, cfg doctorConfig) error {
+			if !cfg.haveAutofixPermission && cfg.interactive {
+				response := promptInteractiveInput("Do you want me to update your .bazelrc.user file for you? I will add a line `test --sandbox_add_mount_pair=/tmp`.", "y")
+				canAutofix, ok := toBoolFuzzy(response)
+				if ok && canAutofix {
+					cfg.haveAutofixPermission = true
+				}
+			}
+			if !cfg.haveAutofixPermission {
+				return fmt.Errorf("do not have permission to update .bazelrc.user")
+			}
+			return d.addLineToBazelRcUser(cfg.workspace, "test --sandbox_add_mount_pair=/tmp")
+		},
+		nonRemoteOnly: true,
+	},
+	{
+		name: "sandbox_add_mount_pair_remote",
+		check: func(d *dev, _ context.Context, cfg doctorConfig) string {
+			if d.checkLinePresenceInBazelRcUser(cfg.workspace, "test --sandbox_add_mount_pair=/tmp") {
+				return "Should not set --sandbox_add_mount_pair in remote mode"
+			}
+			return ""
+		},
+		autofix: func(d *dev, ctx context.Context, cfg doctorConfig) error {
+			if !cfg.haveAutofixPermission && cfg.interactive {
+				response := promptInteractiveInput("Do you want me to update your .bazelrc.user file for you? I will remove all --sandbox_add_mount_pair from your .bazelrc.user", "y")
+				canAutofix, ok := toBoolFuzzy(response)
+				if ok && canAutofix {
+					cfg.haveAutofixPermission = true
+				}
+			}
+			if !cfg.haveAutofixPermission {
+				return fmt.Errorf("do not have permission to update .bazelrc.user")
+			}
+			return d.removeAllPrefixesInFile(filepath.Join(cfg.workspace, ".bazelrc.user"), "test --sandbox_add_mount_pair")
+		},
+		remoteOnly: true,
+	},
 	{
 		name: "patchelf",
 		check: func(d *dev, ctx context.Context, cfg doctorConfig) string {