lxd/storage/drivers: Remove unnecessary fmt.Sprintfs

Signed-off-by: Max Asnaashari <[email protected]>
canonical · Oct 23, 2024 · a552128 · a552128
1 parent e6f6866
commit a552128
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 20 deletions.
diff --git a/lxd/storage/drivers/driver_ceph.go b/lxd/storage/drivers/driver_ceph.go
@@ -116,7 +116,7 @@ func (d *ceph) FillConfig() error {
 
 	if d.config["ceph.osd.pool_size"] == "" {
 		size, err := shared.TryRunCommand("ceph",
-			"--name", fmt.Sprintf("client.%s", d.config["ceph.user.name"]),
+			"--name", "client.%s"+d.config["ceph.user.name"],
 			"--cluster", d.config["ceph.cluster_name"],
 			"config",
 			"get",
@@ -183,7 +183,7 @@ func (d *ceph) Create() error {
 	if !poolExists {
 		// Create new osd pool.
 		_, err := shared.TryRunCommand("ceph",
-			"--name", fmt.Sprintf("client.%s", d.config["ceph.user.name"]),
+			"--name", "client.%s"+d.config["ceph.user.name"],
 			"--cluster", d.config["ceph.cluster_name"],
 			"osd",
 			"pool",
@@ -197,7 +197,7 @@ func (d *ceph) Create() error {
 		revert.Add(func() { _ = d.osdDeletePool() })
 
 		_, err = shared.TryRunCommand("ceph",
-			"--name", fmt.Sprintf("client.%s", d.config["ceph.user.name"]),
+			"--name", "client.%s"+d.config["ceph.user.name"],
 			"--cluster", d.config["ceph.cluster_name"],
 			"osd",
 			"pool",
@@ -256,7 +256,7 @@ func (d *ceph) Create() error {
 
 		// Use existing OSD pool.
 		msg, err := shared.RunCommand("ceph",
-			"--name", fmt.Sprintf("client.%s", d.config["ceph.user.name"]),
+			"--name", "client.%s"+d.config["ceph.user.name"],
 			"--cluster", d.config["ceph.cluster_name"],
 			"osd",
 			"pool",
@@ -407,7 +407,7 @@ func (d *ceph) Update(changedConfig map[string]string) error {
 	newSize := changedConfig["ceph.osd.pool_size"]
 	if newSize != d.config["ceph.osd.pool_size"] && newSize != "" {
 		_, err := shared.TryRunCommand("ceph",
-			"--name", fmt.Sprintf("client.%s", d.config["ceph.user.name"]),
+			"--name", "client.%s"+d.config["ceph.user.name"],
 			"--cluster", d.config["ceph.cluster_name"],
 			"osd",
 			"pool",
@@ -451,7 +451,7 @@ func (d *ceph) GetResources() (*api.ResourcesStoragePool, error) {
 
 	err := shared.RunCommandWithFds(context.TODO(), nil, &stdout,
 		"ceph",
-		"--name", fmt.Sprintf("client.%s", d.config["ceph.user.name"]),
+		"--name", "client.%s"+d.config["ceph.user.name"],
 		"--cluster", d.config["ceph.cluster_name"],
 		"df",
 		"-f", "json")

diff --git a/lxd/storage/drivers/driver_ceph_utils.go b/lxd/storage/drivers/driver_ceph_utils.go
@@ -49,7 +49,7 @@ var cephVolTypePrefixes = map[VolumeType]string{
 func (d *ceph) osdPoolExists() (bool, error) {
 	_, err := shared.RunCommand(
 		"ceph",
-		"--name", fmt.Sprintf("client.%s", d.config["ceph.user.name"]),
+		"--name", "client.%s"+d.config["ceph.user.name"],
 		"--cluster", d.config["ceph.cluster_name"],
 		"osd",
 		"pool",
@@ -83,7 +83,7 @@ func (d *ceph) osdPoolExists() (bool, error) {
 func (d *ceph) osdDeletePool() error {
 	_, err := shared.RunCommand(
 		"ceph",
-		"--name", fmt.Sprintf("client.%s", d.config["ceph.user.name"]),
+		"--name", "client.%s"+d.config["ceph.user.name"],
 		"--cluster", d.config["ceph.cluster_name"],
 		"osd",
 		"pool",

diff --git a/lxd/storage/drivers/driver_cephfs.go b/lxd/storage/drivers/driver_cephfs.go
@@ -106,7 +106,7 @@ func (d *cephfs) FillConfig() error {
 
 	if d.config["cephfs.osd_pool_size"] == "" {
 		size, err := shared.TryRunCommand("ceph",
-			"--name", fmt.Sprintf("client.%s", d.config["cephfs.user.name"]),
+			"--name", "client."+d.config["cephfs.user.name"],
 			"--cluster", d.config["cephfs.cluster_name"],
 			"config",
 			"get",
@@ -201,7 +201,7 @@ func (d *cephfs) Create() error {
 			if !osdPoolExists {
 				// Create new osd pool.
 				_, err := shared.RunCommand("ceph",
-					"--name", fmt.Sprintf("client.%s", d.config["cephfs.user.name"]),
+					"--name", "client."+d.config["cephfs.user.name"],
 					"--cluster", d.config["cephfs.cluster_name"],
 					"osd",
 					"pool",
@@ -216,7 +216,7 @@ func (d *cephfs) Create() error {
 				revert.Add(func() {
 					// Delete the OSD pool.
 					_, _ = shared.RunCommand("ceph",
-						"--name", fmt.Sprintf("client.%s", d.config["cephfs.user.name"]),
+						"--name", "client."+d.config["cephfs.user.name"],
 						"--cluster", d.config["cephfs.cluster_name"],
 						"osd",
 						"pool",
@@ -228,7 +228,7 @@ func (d *cephfs) Create() error {
 				})
 
 				_, err = shared.TryRunCommand("ceph",
-					"--name", fmt.Sprintf("client.%s", d.config["cephfs.user.name"]),
+					"--name", "client."+d.config["cephfs.user.name"],
 					"--cluster", d.config["cephfs.cluster_name"],
 					"osd",
 					"pool",
@@ -245,7 +245,7 @@ func (d *cephfs) Create() error {
 
 		// Create the filesystem.
 		_, err := shared.RunCommand("ceph",
-			"--name", fmt.Sprintf("client.%s", d.config["cephfs.user.name"]),
+			"--name", "client."+d.config["cephfs.user.name"],
 			"--cluster", d.config["cephfs.cluster_name"],
 			"fs",
 			"new",
@@ -260,7 +260,7 @@ func (d *cephfs) Create() error {
 		revert.Add(func() {
 			// Set the FS to fail so that we can remove it.
 			_, _ = shared.RunCommand("ceph",
-				"--name", fmt.Sprintf("client.%s", d.config["cephfs.user.name"]),
+				"--name", "client."+d.config["cephfs.user.name"],
 				"--cluster", d.config["cephfs.cluster_name"],
 				"fs",
 				"fail",
@@ -269,7 +269,7 @@ func (d *cephfs) Create() error {
 
 			// Delete the FS.
 			_, _ = shared.RunCommand("ceph",
-				"--name", fmt.Sprintf("client.%s", d.config["cephfs.user.name"]),
+				"--name", "client."+d.config["cephfs.user.name"],
 				"--cluster", d.config["cephfs.cluster_name"],
 				"fs",
 				"rm",
@@ -491,7 +491,7 @@ func (d *cephfs) Update(changedConfig map[string]string) error {
 			}
 
 			_, err := shared.TryRunCommand("ceph",
-				"--name", fmt.Sprintf("client.%s", d.config["cephfs.user.name"]),
+				"--name", "client."+d.config["cephfs.user.name"],
 				"--cluster", d.config["cephfs.cluster_name"],
 				"osd",
 				"pool",

diff --git a/lxd/storage/drivers/driver_cephfs_utils.go b/lxd/storage/drivers/driver_cephfs_utils.go
@@ -1,14 +1,12 @@
 package drivers
 
 import (
-	"fmt"
-
 	"github.com/canonical/lxd/shared"
 )
 
 // fsExists checks that the Ceph FS instance indeed exists.
 func (d *cephfs) fsExists(clusterName string, userName string, fsName string) (bool, error) {
-	_, err := shared.RunCommand("ceph", "--name", fmt.Sprintf("client.%s", userName), "--cluster", clusterName, "fs", "get", fsName)
+	_, err := shared.RunCommand("ceph", "--name", "client.%s"+userName, "--cluster", clusterName, "fs", "get", fsName)
 	if err != nil {
 		status, _ := shared.ExitStatus(err)
 		// If the error status code is 2, the fs definitely doesn't exist.
@@ -27,7 +25,7 @@ func (d *cephfs) fsExists(clusterName string, userName string, fsName string) (b
 
 // osdPoolExists checks that the Ceph OSD Pool indeed exists.
 func (d *cephfs) osdPoolExists(clusterName string, userName string, osdPoolName string) (bool, error) {
-	_, err := shared.RunCommand("ceph", "--name", fmt.Sprintf("client.%s", userName), "--cluster", clusterName, "osd", "pool", "get", osdPoolName, "size")
+	_, err := shared.RunCommand("ceph", "--name", "client.%s"+userName, "--cluster", clusterName, "osd", "pool", "get", osdPoolName, "size")
 	if err != nil {
 		status, _ := shared.ExitStatus(err)
 		// If the error status code is 2, the pool definitely doesn't exist.