From b83e57621e23e8d90e21b6b0c34315281c9a9f31 Mon Sep 17 00:00:00 2001
From: Shreyas Goenka <shreyas.goenka@databricks.com>
Date: Mon, 3 Feb 2025 04:20:24 +0100
Subject: [PATCH] -

---
 acceptance/acceptance_test.go                    | 4 ++--
 acceptance/help/output.txt                       | 2 +-
 acceptance/libs/telemetry/dummy/out.requests.txt | 2 +-
 libs/testdiff/golden.go                          | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/acceptance/acceptance_test.go b/acceptance/acceptance_test.go
index 0da36b92a..9834a06ab 100644
--- a/acceptance/acceptance_test.go
+++ b/acceptance/acceptance_test.go
@@ -36,7 +36,7 @@ var (
 // In order to debug CLI running under acceptance test, set this to full subtest name, e.g. "bundle/variables/empty"
 // Then install your breakpoints and click "debug test" near TestAccept in VSCODE.
 // example: var SingleTest = "bundle/variables/empty"
-var SingleTest = "libs/telemetry/upload"
+var SingleTest = ""
 
 // If enabled, instead of compiling and running CLI externally, we'll start in-process server that accepts and runs
 // CLI commands. The $CLI in test scripts is a helper that just forwards command-line arguments to this server (see bin/callserver.py).
@@ -44,7 +44,7 @@ var SingleTest = "libs/telemetry/upload"
 var InprocessMode bool
 
 func init() {
-	flag.BoolVar(&InprocessMode, "inprocess", false, "Run CLI in the same process as test (for debugging)")
+	flag.BoolVar(&InprocessMode, "inprocess", SingleTest != "", "Run CLI in the same process as test (for debugging)")
 	flag.BoolVar(&KeepTmp, "keeptmp", false, "Do not delete TMP directory after run")
 	flag.BoolVar(&NoRepl, "norepl", false, "Do not apply any replacements (for debugging)")
 }
diff --git a/acceptance/help/output.txt b/acceptance/help/output.txt
index 528954bdf..70bd8a948 100644
--- a/acceptance/help/output.txt
+++ b/acceptance/help/output.txt
@@ -2,6 +2,6 @@ panic: runtime error: index out of range [1] with length 1
 
 goroutine 1 [running]:
 main.main()
-	/Users/shreyas.goenka/cli/main.go:18 +0x154
+	/Users/shreyas.goenka/cli/main.go:22 +0x1b0
 
 Exit code: 2
diff --git a/acceptance/libs/telemetry/dummy/out.requests.txt b/acceptance/libs/telemetry/dummy/out.requests.txt
index 65c2a9c5b..39f8ed635 100644
--- a/acceptance/libs/telemetry/dummy/out.requests.txt
+++ b/acceptance/libs/telemetry/dummy/out.requests.txt
@@ -1 +1 @@
-{"method":"POST","path":"/telemetry-ext","body":{"uploadTime":"[UNIX_TIME_MILLIS]","items":[],"protoLogs":["{\"frontend_log_event_id\":\"[UUID]\",\"entry\":{\"databricks_cli_log\":{\"execution_context\":{\"cmd_exec_id\":\"[UUID]\",\"version\":\"$DEV_VERSION\",\"command\":\"telemetry_dummy\",\"operating_system\":\"darwin\",\"execution_time_ms\":1},\"cli_test_event\":{\"name\":\"VALUE1\"}}}}","{\"frontend_log_event_id\":\"[UUID]\",\"entry\":{\"databricks_cli_log\":{\"execution_context\":{\"cmd_exec_id\":\"[UUID]\",\"version\":\"$DEV_VERSION\",\"command\":\"telemetry_dummy\",\"operating_system\":\"darwin\",\"execution_time_ms\":1},\"cli_test_event\":{\"name\":\"VALUE2\"}}}}"]}}
+{"method":"POST","path":"/telemetry-ext","body":{"uploadTime":"[UNIX_TIME_MILLIS]","items":[],"protoLogs":["{\"frontend_log_event_id\":\"[UUID]\",\"entry\":{\"databricks_cli_log\":{\"execution_context\":{\"cmd_exec_id\":\"[UUID]\",\"version\":\"$DEV_VERSION\",\"command\":\"telemetry_dummy\",\"operating_system\":\"darwin\"},\"cli_test_event\":{\"name\":\"VALUE1\"}}}}","{\"frontend_log_event_id\":\"[UUID]\",\"entry\":{\"databricks_cli_log\":{\"execution_context\":{\"cmd_exec_id\":\"[UUID]\",\"version\":\"$DEV_VERSION\",\"command\":\"telemetry_dummy\",\"operating_system\":\"darwin\"},\"cli_test_event\":{\"name\":\"VALUE2\"}}}}"]}}
diff --git a/libs/testdiff/golden.go b/libs/testdiff/golden.go
index bc1e738e4..c1c51b6c5 100644
--- a/libs/testdiff/golden.go
+++ b/libs/testdiff/golden.go
@@ -14,7 +14,7 @@ import (
 var OverwriteMode = false
 
 func init() {
-	flag.BoolVar(&OverwriteMode, "update", true, "Overwrite golden files")
+	flag.BoolVar(&OverwriteMode, "update", false, "Overwrite golden files")
 }
 
 func ReadFile(t testutil.TestingT, ctx context.Context, filename string) string {