From 07d3bd4b486c318655e40ca397cd47da0725ef15 Mon Sep 17 00:00:00 2001
From: Kislay Kishore <kislayk@google.com>
Date: Thu, 19 Sep 2024 13:57:50 +0530
Subject: [PATCH] Persistent mounting kill switch (#2513)

* Support Viper kill-switch for persistent mounting

* Add tests
---
 tools/mount_gcsfuse/main.go      |  3 ++-
 tools/mount_gcsfuse/main_test.go | 12 ++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/tools/mount_gcsfuse/main.go b/tools/mount_gcsfuse/main.go
index f64698dabd..3628cc9c7b 100644
--- a/tools/mount_gcsfuse/main.go
+++ b/tools/mount_gcsfuse/main.go
@@ -88,7 +88,8 @@ func makeGcsfuseArgs(
 			"enable_hns",
 			"ignore_interrupts",
 			"anonymous_access",
-			"log_rotate_compress":
+			"log_rotate_compress",
+			"disable_viper_config":
 			if value == "" {
 				value = "true"
 			}
diff --git a/tools/mount_gcsfuse/main_test.go b/tools/mount_gcsfuse/main_test.go
index 326023b5c8..589d47f257 100644
--- a/tools/mount_gcsfuse/main_test.go
+++ b/tools/mount_gcsfuse/main_test.go
@@ -42,7 +42,8 @@ func TestMakeGcsfuseArgs(t *testing.T) {
 				"enable_hns":                    "",
 				"ignore_interrupts":             "",
 				"anonymous_access":              "false",
-				"log_rotate_compress":           "false"},
+				"log_rotate_compress":           "false",
+				"disable_viper_config":          "true"},
 			expectedFlags: []string{"--implicit-dirs=true",
 				"--foreground=true",
 				"--reuse-token-from-url=false",
@@ -51,7 +52,8 @@ func TestMakeGcsfuseArgs(t *testing.T) {
 				"--enable-hns=true",
 				"--ignore-interrupts=true",
 				"--anonymous-access=false",
-				"--log-rotate-compress=false"},
+				"--log-rotate-compress=false",
+				"--disable-viper-config=true"},
 		},
 
 		{
@@ -64,7 +66,8 @@ func TestMakeGcsfuseArgs(t *testing.T) {
 				"enable-hns":                    "",
 				"ignore-interrupts":             "",
 				"anonymous-access":              "false",
-				"log_rotate-compress":           "false"},
+				"log_rotate-compress":           "false",
+				"disable-viper-config":          "false"},
 			expectedFlags: []string{"--implicit-dirs=true",
 				"--foreground=true",
 				"--reuse-token-from-url=false",
@@ -73,7 +76,8 @@ func TestMakeGcsfuseArgs(t *testing.T) {
 				"--enable-hns=true",
 				"--ignore-interrupts=true",
 				"--anonymous-access=false",
-				"--log-rotate-compress=false"},
+				"--log-rotate-compress=false",
+				"--disable-viper-config=false"},
 		},
 
 		{