fix: use errors and string concatenation to avoid fmt (#371)

Signed-off-by: Chris Gianelloni <[email protected]>

Author: wolf31o2

cmd/cardano-up/validate.go

@@ -64,10 +64,7 @@ func validateCommand() *cobra.Command {
 				os.Exit(1)
 			}
 			slog.Info(
-				fmt.Sprintf(
-					"Validating packages in path %s",
-					absPackagesDir,
-				),
+				"Validating packages in path " + absPackagesDir,
 			)
 			if err := pm.ValidatePackages(); err != nil {
 				slog.Error("problems were found")

pkgmgr/config.go

@@ -43,8 +43,8 @@ func NewDefaultConfig() (Config, error) {
 			err,
 		)
 	}
-	userBinDir := fmt.Sprintf("%s/.local/bin", userHomeDir)
-	userDataDir := fmt.Sprintf("%s/.local/share", userHomeDir)
+	userBinDir := userHomeDir + "/.local/bin"
+	userDataDir := userHomeDir + "/.local/share"
 	userCacheDir, err := os.UserCacheDir()
 	if err != nil {
 		return Config{}, fmt.Errorf(

pkgmgr/docker.go

@@ -115,7 +115,7 @@ func (d *DockerService) Start() error {
 		if err != nil {
 			return err
 		}
-		d.logger.Debug(fmt.Sprintf("starting container %s", d.ContainerName))
+		d.logger.Debug("starting container " + d.ContainerName)
 		if err := client.ContainerStart(
 			context.Background(),
 			d.ContainerId,
@@ -137,7 +137,7 @@ func (d *DockerService) Stop() error {
 		if err != nil {
 			return err
 		}
-		d.logger.Debug(fmt.Sprintf("stopping container %s", d.ContainerName))
+		d.logger.Debug("stopping container " + d.ContainerName)
 		stopTimeout := 60
 		if err := client.ContainerStop(
 			context.Background(),
@@ -186,7 +186,7 @@ func (d *DockerService) Create() error {
 	groupID := os.Getgid()
 	userAndGroup := fmt.Sprintf("%d:%d", userID, groupID)
 	// Create container
-	d.logger.Debug(fmt.Sprintf("creating container %s", d.ContainerName))
+	d.logger.Debug("creating container " + d.ContainerName)
 	resp, err := client.ContainerCreate(
 		context.Background(),
 		&container.Config{
@@ -225,13 +225,13 @@ func (d *DockerService) Remove() error {
 		return err
 	}
 	if running {
-		return fmt.Errorf("can't remove a running container")
+		return errors.New("can't remove a running container")
 	}
 	client, err := d.getClient()
 	if err != nil {
 		return err
 	}
-	d.logger.Debug(fmt.Sprintf("removing container %s", d.ContainerName))
+	d.logger.Debug("removing container " + d.ContainerName)
 	if err := client.ContainerRemove(
 		context.Background(),
 		d.ContainerId,

pkgmgr/package.go

@@ -189,10 +189,7 @@ func (p Package) install(
 				)
 			} else if !ok {
 				cfg.Logger.Debug(
-					fmt.Sprintf(
-						"skipping install step due to condition: %s",
-						installStep.Condition,
-					),
+					"skipping install step due to condition: " + installStep.Condition,
 				)
 				continue
 			}
@@ -302,10 +299,7 @@ func (p Package) uninstall(
 				return NewInstallStepConditionError(installStep.Condition, err)
 			} else if !ok {
 				cfg.Logger.Debug(
-					fmt.Sprintf(
-						"skipping uninstall step due to condition: %s",
-						installStep.Condition,
-					),
+					"skipping uninstall step due to condition: " + installStep.Condition,
 				)
 				continue
 			}
@@ -393,10 +387,7 @@ func (p Package) activate(cfg Config, context string) error {
 				return NewInstallStepConditionError(installStep.Condition, err)
 			} else if !ok {
 				cfg.Logger.Debug(
-					fmt.Sprintf(
-						"skipping install step due to condition: %s",
-						installStep.Condition,
-					),
+					"skipping install step due to condition: " + installStep.Condition,
 				)
 				continue
 			}
@@ -425,10 +416,7 @@ func (p Package) deactivate(cfg Config, context string) error {
 				return NewInstallStepConditionError(installStep.Condition, err)
 			} else if !ok {
 				cfg.Logger.Debug(
-					fmt.Sprintf(
-						"skipping install step due to condition: %s",
-						installStep.Condition,
-					),
+					"skipping install step due to condition: " + installStep.Condition,
 				)
 				continue
 			}
@@ -451,7 +439,7 @@ func (p Package) deactivate(cfg Config, context string) error {
 func (p Package) validate(cfg Config) error {
 	// Check empty name
 	if p.Name == "" {
-		return fmt.Errorf("package name cannot be empty")
+		return errors.New("package name cannot be empty")
 	}
 	// Check name matches allowed characters
 	reName := regexp.MustCompile(`^[-a-zA-Z0-9]+$`)
@@ -460,7 +448,7 @@ func (p Package) validate(cfg Config) error {
 	}
 	// Check empty version
 	if p.Version == "" {
-		return fmt.Errorf("package version cannot be empty")
+		return errors.New("package version cannot be empty")
 	}
 	// Check version is well formed
 	if _, err := version.NewVersion(p.Version); err != nil {
@@ -535,7 +523,7 @@ func (p Package) startService(cfg Config, context string) error {
 			}
 			// Start the Docker container if it's not running
 			slog.Info(
-				fmt.Sprintf("Starting Docker container %s", containerName),
+				"Starting Docker container " + containerName,
 			)
 			if err := dockerService.Start(); err != nil {
 				startErrors = append(
@@ -588,7 +576,7 @@ func (p Package) stopService(cfg Config, context string) error {
 				continue
 			}
 			// Stop the Docker container
-			slog.Info(fmt.Sprintf("Stopping container %s", containerName))
+			slog.Info("Stopping container " + containerName)
 			if err := dockerService.Stop(); err != nil {
 				stopErrors = append(
 					stopErrors,
@@ -685,7 +673,7 @@ type PackageInstallStepDocker struct {
 
 func (p *PackageInstallStepDocker) validate(cfg Config) error {
 	if p.Image == "" {
-		return fmt.Errorf("docker image must be provided")
+		return errors.New("docker image must be provided")
 	}
 	// TODO: add more checks
 	return nil
@@ -808,10 +796,7 @@ func (p *PackageInstallStepDocker) uninstall(
 		if err != nil {
 			if err == ErrContainerNotExists {
 				cfg.Logger.Debug(
-					fmt.Sprintf(
-						"container missing on uninstall: %s",
-						containerName,
-					),
+					"container missing on uninstall: " + containerName,
 				)
 			} else {
 				return err
@@ -932,7 +917,7 @@ func (p *PackageInstallStepFile) install(
 			return err
 		}
 		if u.Scheme == "" || u.Host == "" {
-			return fmt.Errorf("invalid URL given...")
+			return errors.New("invalid URL given...")
 		}
 
 		// Fetch data
@@ -951,12 +936,12 @@ func (p *PackageInstallStepFile) install(
 
 		fileContent = respBody
 	} else {
-		return fmt.Errorf("packages must provide content, source, or url for file install types")
+		return errors.New("packages must provide content, source, or url for file install types")
 	}
 	if err := os.WriteFile(filePath, fileContent, fileMode); err != nil {
 		return err
 	}
-	cfg.Logger.Debug(fmt.Sprintf("wrote file %s", filePath))
+	cfg.Logger.Debug("wrote file " + filePath)
 	return nil
 }
 
@@ -966,10 +951,10 @@ func (p *PackageInstallStepFile) uninstall(cfg Config, pkgName string) error {
 		pkgName,
 		p.Filename,
 	)
-	cfg.Logger.Debug(fmt.Sprintf("deleting file %s", filePath))
+	cfg.Logger.Debug("deleting file " + filePath)
 	if err := os.Remove(filePath); err != nil {
 		if !errors.Is(err, fs.ErrNotExist) {
-			cfg.Logger.Warn(fmt.Sprintf("failed to remove file %s", filePath))
+			cfg.Logger.Warn("failed to remove file " + filePath)
 		}
 	}
 	return nil
@@ -1043,7 +1028,7 @@ func (p *PackageInstallStepFile) deactivate(cfg Config, pkgName string) error {
 				return err
 			}
 		}
-		cfg.Logger.Debug(fmt.Sprintf("removed symlink %s", binPath))
+		cfg.Logger.Debug("removed symlink " + binPath)
 	}
 	return nil
 }

pkgmgr/pkgmgr.go

@@ -466,10 +466,7 @@ func (p *PackageManager) Info(pkgs ...string) error {
 			activeContextName,
 		)
 		if infoPkg.PostInstallNotes != "" {
-			infoOutput += fmt.Sprintf(
-				"\n\nPost-install notes:\n\n%s",
-				infoPkg.PostInstallNotes,
-			)
+			infoOutput += "\n\nPost-install notes:\n\n" + infoPkg.PostInstallNotes
 		}
 		// Gather package services
 		services, err := infoPkg.Package.services(p.config, infoPkg.Context)
@@ -517,16 +514,10 @@ func (p *PackageManager) Info(pkgs ...string) error {
 			}
 		}
 		if statusOutput != "" {
-			infoOutput += fmt.Sprintf(
-				"\n\nServices:\n\n%s",
-				strings.TrimSuffix(statusOutput, "\n"),
-			)
+			infoOutput += "\n\nServices:\n\n" + strings.TrimSuffix(statusOutput, "\n")
 		}
 		if portOutput != "" {
-			infoOutput += fmt.Sprintf(
-				"\n\nMapped ports:\n\n%s",
-				strings.TrimSuffix(portOutput, "\n"),
-			)
+			infoOutput += "\n\nMapped ports:\n\n" + strings.TrimSuffix(portOutput, "\n")
 		}
 		if idx < len(infoPkgs)-1 {
 			infoOutput += "\n\n---\n\n"
@@ -705,10 +696,7 @@ func (p *PackageManager) ValidatePackages() error {
 			continue
 		}
 		p.config.Logger.Debug(
-			fmt.Sprintf(
-				"checking package %s",
-				pkg.filePath,
-			),
+			"checking package " + pkg.filePath,
 		)
 		if err := pkg.validate(p.config); err != nil {
 			foundError = true

pkgmgr/registry.go

@@ -134,7 +134,7 @@ func registryPackagesUrl(cfg Config, validate bool) ([]Package, error) {
 		stat.ModTime().Before(time.Now().Add(-24*time.Hour)) {
 		// Fetch registry ZIP
 		cfg.Logger.Info(
-			fmt.Sprintf("Fetching package registry %s", cfg.RegistryUrl),
+			"Fetching package registry " + cfg.RegistryUrl,
 		)
 		resp, err := http.Get(cfg.RegistryUrl)
 		if err != nil {
@@ -172,7 +172,7 @@ func registryPackagesUrl(cfg Config, validate bool) ([]Package, error) {
 			}
 			// Ensure there are no parent dir references in path
 			if strings.Contains(zipFile.Name, "..") {
-				return nil, fmt.Errorf("parent path reference in zip name")
+				return nil, errors.New("parent path reference in zip name")
 			}
 			// #nosec G305
 			outPath := filepath.Join(
@@ -181,7 +181,7 @@ func registryPackagesUrl(cfg Config, validate bool) ([]Package, error) {
 			)
 			// Ensure our path is sane to prevent the gosec issue above
 			if !strings.HasPrefix(outPath, filepath.Clean(cachePath)) {
-				return nil, fmt.Errorf("zip extraction path mismatch")
+				return nil, errors.New("zip extraction path mismatch")
 			}
 			// Create parent dir(s)
 			if err := os.MkdirAll(filepath.Dir(outPath), fs.ModePerm); err != nil {