Restrict visibility

GoogleCloudPlatform · Oct 10, 2024 · eb7dcdd · eb7dcdd
1 parent 308df69
commit eb7dcdd
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 203 deletions.
diff --git a/cmd/config_validation_test.go b/cmd/config_validation_test.go
@@ -38,7 +38,7 @@ func getConfigObject(t *testing.T, args []string) (*cfg.Config, error) {
 	require.Nil(t, err)
 	cmdArgs := append([]string{"gcsfuse"}, args...)
 	cmdArgs = append(cmdArgs, "a")
-	cmd.SetArgs(ConvertToPosixArgs(cmdArgs, cmd))
+	cmd.SetArgs(convertToPosixArgs(cmdArgs, cmd))
 	if err = cmd.Execute(); err != nil {
 		return nil, err
 	}

diff --git a/cmd/datatypes_parsing_test.go b/cmd/datatypes_parsing_test.go
@@ -581,7 +581,7 @@ func TestCLIFlagPassing(t *testing.T) {
 			require.NoError(t, err)
 			cmdArgs := append([]string{"gcsfuse"}, tc.args...)
 			cmdArgs = append(cmdArgs, "a")
-			command.SetArgs(ConvertToPosixArgs(cmdArgs, command))
+			command.SetArgs(convertToPosixArgs(cmdArgs, command))
 
 			require.NoError(t, command.Execute())
 
@@ -753,7 +753,7 @@ func TestConfigPassing(t *testing.T) {
 			})
 			require.NoError(t, err)
 			cmdArgs := append([]string{"gcsfuse", fmt.Sprintf("--config-file=testdata/%s", tc.file)}, "a")
-			command.SetArgs(ConvertToPosixArgs(cmdArgs, command))
+			command.SetArgs(convertToPosixArgs(cmdArgs, command))
 
 			require.NoError(t, command.Execute())
 
@@ -807,7 +807,7 @@ func TestPredefinedFlagThrowNoError(t *testing.T) {
 			})
 			require.NoError(t, err)
 			cmdArgs := append([]string{"gcsfuse"}, tc.args...)
-			command.SetArgs(ConvertToPosixArgs(cmdArgs, command))
+			command.SetArgs(convertToPosixArgs(cmdArgs, command))
 
 			assert.NoError(t, command.Execute())
 		})

diff --git a/cmd/legacy_main.go b/cmd/legacy_main.go
@@ -47,7 +47,6 @@ import (
 const (
 	SuccessfulMountMessage         = "File system has been successfully mounted."
 	UnsuccessfulMountMessagePrefix = "Error while mounting gcsfuse"
-	EnableViperConfigEnvVariable   = "ENABLE_GCSFUSE_VIPER_CONFIG"
 )
 
 ////////////////////////////////////////////////////////////////////////
@@ -291,10 +290,6 @@ func Mount(newConfig *cfg.Config, bucketName, mountPoint string) (err error) {
 			fmt.Sprintf("PATH=%s", os.Getenv("PATH")),
 		}
 
-		// Pass along ENABLE_GCSFUSE_VIPER_CONFIG environment variable, since we
-		// need to use Viper config if this environment variable is set.
-		env = append(env, fmt.Sprintf(EnableViperConfigEnvVariable+"=%s", os.Getenv(EnableViperConfigEnvVariable)))
-
 		// Pass along GOOGLE_APPLICATION_CREDENTIALS, since we document in
 		// mounting.md that it can be used for specifying a key file.
 		if p, ok := os.LookupEnv("GOOGLE_APPLICATION_CREDENTIALS"); ok {

diff --git a/cmd/root.go b/cmd/root.go
@@ -104,11 +104,11 @@ of Cloud Storage FUSE, see https://cloud.google.com/storage/docs/gcs-fuse.`,
 	return rootCmd, nil
 }
 
-// ConvertToPosixArgs converts a slice of commandline args and transforms them
+// convertToPosixArgs converts a slice of commandline args and transforms them
 // into POSIX compliant args. All it does is that it converts flags specified
 // using a single-hyphen to double-hyphens. We are excluding "-v" because it's
 // reserved for showing version in Cobra.
-func ConvertToPosixArgs(args []string, c *cobra.Command) []string {
+func convertToPosixArgs(args []string, c *cobra.Command) []string {
 	pArgs := make([]string, 0, len(args))
 	flagSet := make(map[string]bool)
 	c.PersistentFlags().VisitAll(func(f *pflag.Flag) {
@@ -146,12 +146,12 @@ func ConvertToPosixArgs(args []string, c *cobra.Command) []string {
 	return pArgs
 }
 
-var ExecuteNewMain = func() {
+var ExecuteMountCmd = func() {
 	rootCmd, err := NewRootCmd(Mount)
 	if err != nil {
 		log.Fatalf("Error occurred while creating the root command: %v", err)
 	}
-	rootCmd.SetArgs(ConvertToPosixArgs(os.Args, rootCmd))
+	rootCmd.SetArgs(convertToPosixArgs(os.Args, rootCmd))
 	if err := rootCmd.Execute(); err != nil {
 		log.Fatalf("Error occurred during command execution: %v", err)
 	}

diff --git a/cmd/root_test.go b/cmd/root_test.go
@@ -34,7 +34,7 @@ func TestDefaultMaxParallelDownloads(t *testing.T) {
 		return nil
 	})
 	require.Nil(t, err)
-	cmd.SetArgs(ConvertToPosixArgs([]string{"abc", "pqr"}, cmd))
+	cmd.SetArgs(convertToPosixArgs([]string{"abc", "pqr"}, cmd))
 
 	if assert.Nil(t, cmd.Execute()) {
 		assert.LessOrEqual(t, int64(16), actual.FileCache.MaxParallelDownloads)
@@ -73,7 +73,7 @@ func TestCobraArgsNumInRange(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			cmd, err := NewRootCmd(func(*cfg.Config, string, string) error { return nil })
 			require.Nil(t, err)
-			cmd.SetArgs(ConvertToPosixArgs(tc.args, cmd))
+			cmd.SetArgs(convertToPosixArgs(tc.args, cmd))
 
 			err = cmd.Execute()
 
@@ -132,7 +132,7 @@ func TestArgsParsing_MountPoint(t *testing.T) {
 				return nil
 			})
 			require.Nil(t, err)
-			cmd.SetArgs(ConvertToPosixArgs(tc.args, cmd))
+			cmd.SetArgs(convertToPosixArgs(tc.args, cmd))
 
 			err = cmd.Execute()
 
@@ -180,7 +180,7 @@ func TestArgsParsing_MountOptions(t *testing.T) {
 				return nil
 			})
 			require.Nil(t, err)
-			cmd.SetArgs(ConvertToPosixArgs(tc.args, cmd))
+			cmd.SetArgs(convertToPosixArgs(tc.args, cmd))
 
 			err = cmd.Execute()
 
@@ -283,7 +283,7 @@ func TestArgsParsing_WriteConfigFlags(t *testing.T) {
 				return nil
 			})
 			require.Nil(t, err)
-			cmd.SetArgs(ConvertToPosixArgs(tc.args, cmd))
+			cmd.SetArgs(convertToPosixArgs(tc.args, cmd))
 
 			err = cmd.Execute()
 
@@ -347,7 +347,7 @@ func TestArgsParsing_FileCacheFlags(t *testing.T) {
 				return nil
 			})
 			require.Nil(t, err)
-			cmd.SetArgs(ConvertToPosixArgs(tc.args, cmd))
+			cmd.SetArgs(convertToPosixArgs(tc.args, cmd))
 
 			err = cmd.Execute()
 
@@ -399,7 +399,7 @@ func TestArgParsing_ExperimentalMetadataPrefetchFlag(t *testing.T) {
 				return nil
 			})
 			require.Nil(t, err)
-			cmd.SetArgs(ConvertToPosixArgs(tc.args, cmd))
+			cmd.SetArgs(convertToPosixArgs(tc.args, cmd))
 
 			err = cmd.Execute()
 
@@ -431,7 +431,7 @@ func TestArgParsing_ExperimentalMetadataPrefetchFlag_Failed(t *testing.T) {
 				return nil
 			})
 			require.Nil(t, err)
-			cmd.SetArgs(ConvertToPosixArgs(tc.args, cmd))
+			cmd.SetArgs(convertToPosixArgs(tc.args, cmd))
 
 			err = cmd.Execute()
 
@@ -482,7 +482,7 @@ func TestArgsParsing_GCSAuthFlags(t *testing.T) {
 				return nil
 			})
 			require.Nil(t, err)
-			cmd.SetArgs(ConvertToPosixArgs(tc.args, cmd))
+			cmd.SetArgs(convertToPosixArgs(tc.args, cmd))
 
 			err = cmd.Execute()
 
@@ -519,7 +519,7 @@ func TestArgsParsing_GCSAuthFlagsThrowsError(t *testing.T) {
 				return nil
 			})
 			require.Nil(t, err)
-			cmd.SetArgs(ConvertToPosixArgs(tc.args, cmd))
+			cmd.SetArgs(convertToPosixArgs(tc.args, cmd))
 
 			assert.Error(t, cmd.Execute())
 		})
@@ -580,7 +580,7 @@ func TestArgsParsing_GCSConnectionFlags(t *testing.T) {
 				return nil
 			})
 			require.Nil(t, err)
-			cmd.SetArgs(ConvertToPosixArgs(tc.args, cmd))
+			cmd.SetArgs(convertToPosixArgs(tc.args, cmd))
 
 			err = cmd.Execute()
 
@@ -623,7 +623,7 @@ func TestArgsParsing_GCSConnectionFlagsThrowsError(t *testing.T) {
 				return nil
 			})
 			require.Nil(t, err)
-			cmd.SetArgs(ConvertToPosixArgs(tc.args, cmd))
+			cmd.SetArgs(convertToPosixArgs(tc.args, cmd))
 
 			assert.Error(t, cmd.Execute())
 		})
@@ -702,7 +702,7 @@ func TestArgsParsing_FileSystemFlags(t *testing.T) {
 				return nil
 			})
 			require.Nil(t, err)
-			cmd.SetArgs(ConvertToPosixArgs(tc.args, cmd))
+			cmd.SetArgs(convertToPosixArgs(tc.args, cmd))
 
 			err = cmd.Execute()
 
@@ -746,7 +746,7 @@ func TestArgsParsing_FileSystemFlagsThrowsError(t *testing.T) {
 				return nil
 			})
 			require.Nil(t, err)
-			cmd.SetArgs(ConvertToPosixArgs(tc.args, cmd))
+			cmd.SetArgs(convertToPosixArgs(tc.args, cmd))
 
 			assert.Error(t, cmd.Execute())
 		})
@@ -783,7 +783,7 @@ func TestArgsParsing_ListFlags(t *testing.T) {
 				return nil
 			})
 			require.Nil(t, err)
-			cmd.SetArgs(ConvertToPosixArgs(tc.args, cmd))
+			cmd.SetArgs(convertToPosixArgs(tc.args, cmd))
 
 			err = cmd.Execute()
 
@@ -820,7 +820,7 @@ func TestArgsParsing_EnableHNSFlags(t *testing.T) {
 				return nil
 			})
 			require.Nil(t, err)
-			cmd.SetArgs(ConvertToPosixArgs(tc.args, cmd))
+			cmd.SetArgs(convertToPosixArgs(tc.args, cmd))
 
 			err = cmd.Execute()
 
@@ -879,7 +879,7 @@ func TestArgsParsing_MetadataCacheFlags(t *testing.T) {
 				return nil
 			})
 			require.Nil(t, err)
-			cmd.SetArgs(ConvertToPosixArgs(tc.args, cmd))
+			cmd.SetArgs(convertToPosixArgs(tc.args, cmd))
 
 			err = cmd.Execute()
 

diff --git a/go.mod b/go.mod
@@ -4,6 +4,7 @@ go 1.23.0
 
 require (
 	cloud.google.com/go/compute/metadata v0.5.0
+	cloud.google.com/go/iam v1.1.13
 	cloud.google.com/go/secretmanager v1.13.5
 	cloud.google.com/go/storage v1.43.0
 	contrib.go.opencensus.io/exporter/ocagent v0.7.0
@@ -27,7 +28,6 @@ require (
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.19.0
 	github.com/stretchr/testify v1.9.0
-	github.com/urfave/cli v1.22.15
 	go.opencensus.io v0.24.0
 	go.opentelemetry.io/contrib/detectors/gcp v1.29.0
 	go.opentelemetry.io/otel v1.29.0
@@ -52,7 +52,6 @@ require (
 	cloud.google.com/go v0.115.1 // indirect
 	cloud.google.com/go/auth v0.8.1 // indirect
 	cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect
-	cloud.google.com/go/iam v1.1.13 // indirect
 	cloud.google.com/go/longrunning v0.5.11 // indirect
 	cloud.google.com/go/monitoring v1.20.3 // indirect
 	cloud.google.com/go/pubsub v1.41.0 // indirect
@@ -64,7 +63,6 @@ require (
 	github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/cncf/xds/go v0.0.0-20240423153145-555b57ec207b // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/envoyproxy/go-control-plane v0.12.0 // indirect
 	github.com/envoyproxy/protoc-gen-validate v1.0.4 // indirect
@@ -97,7 +95,6 @@ require (
 	github.com/prometheus/prometheus v0.35.0 // indirect
 	github.com/prometheus/statsd_exporter v0.22.7 // indirect
 	github.com/rogpeppe/go-internal v1.12.0 // indirect
-	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/sagikazarmark/locafero v0.4.0 // indirect
 	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
 	github.com/sourcegraph/conc v0.3.0 // indirect

diff --git a/go.sum b/go.sum
@@ -110,7 +110,6 @@ github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZ
 github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8=
 github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
 github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.1 h1:pB2F2JKCj1Znmp2rwxxt1J0Fg0wezTMgWYk5Mpbi1kg=
@@ -351,7 +350,6 @@ github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfc
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
-github.com/cpuguy83/go-md2man/v2 v2.0.4 h1:wfIWP927BUkWJb2NmU/kNDYIBTh/ziUX91+lVfRxZq4=
 github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
@@ -1057,7 +1055,6 @@ github.com/rs/cors v1.8.2/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=
 github.com/rs/xid v1.5.0 h1:mKX4bl4iPYJtEIxp6CYiUuLQ/8DYMoz0PUdtGgMFRVc=
 github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
@@ -1163,8 +1160,6 @@ github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod h1:70zkFmudgCuE/
 github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
 github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
 github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
-github.com/urfave/cli v1.22.15 h1:nuqt+pdC/KqswQKhETJjo7pvn/k4xMUxgW6liI7XpnM=
-github.com/urfave/cli v1.22.15/go.mod h1:wSan1hmo5zeyLGBjRJbzRTNk8gwoYa2B9n4q9dmRIc0=
 github.com/vishvananda/netlink v0.0.0-20181108222139-023a6dafdcdf/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk=
 github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE=
 github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852/go.mod h1:twkDnbuQxJYemMlGd4JFIcuhgX83tXhKS2B/PRMpOho=

diff --git a/main.go b/main.go
@@ -49,5 +49,5 @@ func main() {
 	go perf.HandleCPUProfileSignals()
 	go perf.HandleMemoryProfileSignals()
 
-	cmd.ExecuteNewMain()
+	cmd.ExecuteMountCmd()
 }
diff --git a/main_test.go b/main_test.go