chore: streamline: replace use of GetMayastorPluginCmdString

Replace use of GetMayastorPluginCmdString with GetMayastorPluginCmd().String() Signed-off-by: Blaise Dias <[email protected]>
openebs · Nov 20, 2024 · 8a57b1e · 8a57b1e
1 parent d002e89
commit 8a57b1e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/common/controlplane/v1/plugin.go b/common/controlplane/v1/plugin.go
@@ -78,11 +78,3 @@ func GetMayastorPluginCmd(arg ...string) *exec.Cmd {
 	}
 	return exec.Command(binPath, arg...)
 }
-
-// GetMayastorPluginCmdString return a string which can be supplied to
-// shell commands to invoke the plugin for the mayastor IOEngine
-// deprecated: use GetMayastorPluginCmd in preference
-func GetMayastorPluginCmdString() string {
-	cmd := GetMayastorPluginCmd()
-	return fmt.Sprintf("%v ", cmd)
-}
diff --git a/common/k8stest/util.go b/common/k8stest/util.go
@@ -1001,7 +1001,7 @@ func GenerateSupportBundle(testLogDir string) {
 	bashCmd := fmt.Sprintf("%s/e2e-cluster-dump.sh  --destdir '%s' --plugin '%s'",
 		locations.GetE2EScriptsPath(),
 		testLogDir,
-		mcpV1.GetMayastorPluginCmdString(),
+		mcpV1.GetMayastorPluginCmd().String(),
 	)
 	logf.Log.Info("About to execute", "command", bashCmd)
 	cmd := exec.Command("bash", "-c", bashCmd)
@@ -1012,9 +1012,8 @@ func GenerateSupportBundle(testLogDir string) {
 		logf.Log.Info("command failed", "error", err)
 		logf.Log.Info(out.String())
 	}
-	bashCmd = fmt.Sprintf("%s -n %s get volume-replica-topologies -o json > %s/%s",
-		mcpV1.GetMayastorPluginCmdString(),
-		common.NSMayastor(),
+	bashCmd = fmt.Sprintf("%s > %s/%s",
+		mcpV1.GetMayastorPluginCmd("-n", common.NSMayastor(), "get", "volume-replica-topologies", "-o", "json").String(),
 		testLogDir,
 		"replica-topologies.json")
 	logf.Log.Info("About to execute", "command", bashCmd)