fix: use %w for error wrapping and lowercase error messages

Replace %v/%s with %w in fmt.Errorf calls across 18 files to preserve
error chains for errors.Is()/errors.As(). Lowercase error message
prefixes per Go conventions. Also fix misleading error messages,
add os.O_TRUNC to CopyFileContents, and wrap user.Current() errors.

Author: sebrandon1

cmd/crc-embedder/cmd/embed.go

@@ -88,13 +88,13 @@ func embedFiles(executablePath string, filenames []string) error {
 		logging.Debugf("Embedding %s in %s", filename, executablePath)
 		f, err := os.Open(filename) // #nosec G304
 		if err != nil {
-			return fmt.Errorf("Failed to open %s: %v", filename, err)
+			return fmt.Errorf("failed to open %s: %w", filename, err)
 		}
 		defer f.Close()
 
 		err = appender.AppendStreamReader(path.Base(filename), f, false)
 		if err != nil {
-			return fmt.Errorf("Failed to append %s to %s: %v", filename, executablePath, err)
+			return fmt.Errorf("failed to append %s to %s: %w", filename, executablePath, err)
 		}
 	}
 

cmd/crc/cmd/generate_kubeconfig.go

@@ -37,7 +37,7 @@ func runGenerateKubeconfig() error {
 
 	data, err := os.ReadFile(constants.KubeconfigFilePath)
 	if err != nil {
-		return fmt.Errorf("Error reading kubeconfig: %v", err)
+		return fmt.Errorf("error reading kubeconfig: %w", err)
 	}
 	fmt.Print(string(data))
 	return nil

pkg/crc/cluster/cert_renewal.go

@@ -32,7 +32,7 @@ func approvePendingCSRs(ctx context.Context, ocConfig oc.Config, expectedSignerN
 			logging.Debugf("Approving csr %s (signerName: %s)", csr.Name, expectedSignerName)
 			_, stderr, err := ocConfig.RunOcCommand("adm", "certificate", "approve", csr.Name)
 			if err != nil {
-				return fmt.Errorf("Not able to approve csr (%v : %s)", err, stderr)
+				return fmt.Errorf("not able to approve csr: %s: %w", stderr, err)
 			}
 			csrsApproved = true
 		}

pkg/crc/cluster/cluster.go

@@ -168,7 +168,7 @@ func EnsureSSHKeyPresentInTheCluster(ctx context.Context, ocConfig oc.Config, ss
 	}
 	stdout, stderr, err := ocConfig.RunOcCommand("get", "machineconfigs", "99-master-ssh", "-o", `jsonpath='{.spec.config.passwd.users[0].sshAuthorizedKeys[0]}'`)
 	if err != nil {
-		return fmt.Errorf("Failed to get machine configs %v: %s", err, stderr)
+		return fmt.Errorf("failed to get machine configs: %s: %w", stderr, err)
 	}
 	if stdout == string(sshPublicKey) {
 		return nil
@@ -179,7 +179,7 @@ func EnsureSSHKeyPresentInTheCluster(ctx context.Context, ocConfig oc.Config, ss
 		"--type", "merge"}
 	_, stderr, err = ocConfig.RunOcCommand(cmdArgs...)
 	if err != nil {
-		return fmt.Errorf("Failed to update ssh key %v: %s", err, stderr)
+		return fmt.Errorf("failed to update ssh key: %s: %w", stderr, err)
 	}
 	return nil
 }
@@ -191,7 +191,7 @@ func EnsurePullSecretPresentInTheCluster(ctx context.Context, ocConfig oc.Config
 
 	stdout, stderr, err := ocConfig.RunOcCommandPrivate("get", "secret", "pull-secret", "-n", "openshift-config", "-o", `jsonpath="{['data']['\.dockerconfigjson']}"`)
 	if err != nil {
-		return fmt.Errorf("Failed to get pull secret %v: %s", err, stderr)
+		return fmt.Errorf("failed to get pull secret: %s: %w", stderr, err)
 	}
 	decoded, err := base64.StdEncoding.DecodeString(stdout)
 	if err != nil {
@@ -213,7 +213,7 @@ func EnsurePullSecretPresentInTheCluster(ctx context.Context, ocConfig oc.Config
 
 	_, stderr, err = ocConfig.RunOcCommandPrivate(cmdArgs...)
 	if err != nil {
-		return fmt.Errorf("Failed to add Pull secret %v: %s", err, stderr)
+		return fmt.Errorf("failed to add pull secret: %s: %w", stderr, err)
 	}
 	return nil
 }
@@ -225,7 +225,7 @@ func EnsureGeneratedClientCAPresentInTheCluster(ctx context.Context, ocConfig oc
 	}
 	clusterClientCA, stderr, err := ocConfig.RunOcCommand("get", "configmaps", "admin-kubeconfig-client-ca", "-n", "openshift-config", "-o", `jsonpath="{.data.ca-bundle\.crt}"`)
 	if err != nil {
-		return fmt.Errorf("Failed to get config map %v: %s", err, stderr)
+		return fmt.Errorf("failed to get config map: %s: %w", stderr, err)
 	}
 
 	ok, err := crctls.VerifyCertificateAgainstRootCA(clusterClientCA, adminCert)
@@ -242,10 +242,10 @@ func EnsureGeneratedClientCAPresentInTheCluster(ctx context.Context, ocConfig oc
 		"-n", "openshift-config", "--patch", jsonPath}
 	_, stderr, err = ocConfig.RunOcCommand(cmdArgs...)
 	if err != nil {
-		return fmt.Errorf("Failed to patch admin-kubeconfig-client-ca config map with new CA` %v: %s", err, stderr)
+		return fmt.Errorf("failed to patch admin-kubeconfig-client-ca config map with new CA: %s: %w", stderr, err)
 	}
 	if err := sshRunner.CopyFile(constants.KubeconfigFilePath, ocConfig.KubeconfigPath, 0644); err != nil {
-		return fmt.Errorf("Failed to copy generated kubeconfig file to VM: %v", err)
+		return fmt.Errorf("failed to copy generated kubeconfig file to VM: %w", err)
 	}
 
 	return nil
@@ -259,7 +259,7 @@ func RemovePullSecretFromCluster(ctx context.Context, ocConfig oc.Config, sshRun
 
 	_, stderr, err := ocConfig.RunOcCommand(cmdArgs...)
 	if err != nil {
-		return fmt.Errorf("Failed to remove Pull secret %w: %s", err, stderr)
+		return fmt.Errorf("failed to remove pull secret: %s: %w", stderr, err)
 	}
 	return waitForPullSecretRemovedFromInstanceDisk(ctx, sshRunner)
 }
@@ -269,7 +269,7 @@ func waitForPullSecretRemovedFromInstanceDisk(ctx context.Context, sshRunner *ss
 	pullSecretPresentFunc := func() error {
 		stdout, stderr, err := sshRunner.RunPrivate(fmt.Sprintf("sudo cat %s", vmPullSecretPath))
 		if err != nil {
-			return &errors.RetriableError{Err: fmt.Errorf("failed to read %s file: %v: %s", vmPullSecretPath, err, stderr)}
+			return &errors.RetriableError{Err: fmt.Errorf("failed to read %s file: %s: %w", vmPullSecretPath, stderr, err)}
 		}
 		if err := validation.ImagePullSecret(stdout); err == nil {
 			return &errors.RetriableError{Err: fmt.Errorf("pull secret is still present on the instance disk")}
@@ -286,7 +286,7 @@ func RemoveOldRenderedMachineConfig(ocConfig oc.Config) error {
 	// For 4.8 we don't disable mco and it does contain the machineconfigs.
 	stdout, stderr, err := ocConfig.RunOcCommand("get mc --sort-by=.metadata.creationTimestamp --no-headers -oname")
 	if err != nil {
-		return fmt.Errorf("failed to get machineconfig resource %w: %s", err, stderr)
+		return fmt.Errorf("failed to get machineconfig resource: %s: %w", stderr, err)
 	}
 	sortedMachineConfigsWithTime := strings.Split(stdout, "\n")
 	if len(sortedMachineConfigsWithTime) == 0 {
@@ -318,7 +318,7 @@ func RemoveOldRenderedMachineConfig(ocConfig oc.Config) error {
 	if deleteRenderedMachineConfig != "" {
 		_, stderr, err = ocConfig.RunOcCommand(fmt.Sprintf("delete %s", deleteRenderedMachineConfig))
 		if err != nil {
-			return fmt.Errorf("Failed to remove machineconfigpools %w: %s", err, stderr)
+			return fmt.Errorf("failed to remove machineconfigpools: %s: %w", stderr, err)
 		}
 	}
 	return nil
@@ -331,7 +331,7 @@ func EnsureClusterIDIsNotEmpty(ctx context.Context, ocConfig oc.Config) error {
 
 	stdout, stderr, err := ocConfig.RunOcCommand("get", "clusterversion", "version", "-o", `jsonpath="{['spec']['clusterID']}"`)
 	if err != nil {
-		return fmt.Errorf("Failed to get clusterversion %v: %s", err, stderr)
+		return fmt.Errorf("failed to get clusterversion: %s: %w", stderr, err)
 	}
 	if strings.TrimSpace(stdout) != "" {
 		return nil
@@ -344,7 +344,7 @@ func EnsureClusterIDIsNotEmpty(ctx context.Context, ocConfig oc.Config) error {
 
 	_, stderr, err = ocConfig.RunOcCommand(cmdArgs...)
 	if err != nil {
-		return fmt.Errorf("Failed to update cluster ID %v: %s", err, stderr)
+		return fmt.Errorf("failed to update cluster ID: %s: %w", stderr, err)
 	}
 
 	return nil
@@ -389,13 +389,13 @@ func AddProxyConfigToCluster(ctx context.Context, sshRunner *ssh.Runner, ocConfi
 
 	patchEncode, err := json.Marshal(patch)
 	if err != nil {
-		return fmt.Errorf("Failed to encode to json: %v", err)
+		return fmt.Errorf("failed to encode to json: %w", err)
 	}
 	logging.Debugf("Patch string %s", string(patchEncode))
 
 	cmdArgs := []string{"patch", "proxy", "cluster", "-p", fmt.Sprintf("'%s'", string(patchEncode)), "--type", "merge"}
 	if _, stderr, err := ocConfig.RunOcCommandPrivate(cmdArgs...); err != nil {
-		return fmt.Errorf("Failed to add proxy details %v: %s", err, stderr)
+		return fmt.Errorf("failed to add proxy details: %s: %w", stderr, err)
 	}
 	return nil
 }
@@ -423,7 +423,7 @@ func addProxyCACertToCluster(sshRunner *ssh.Runner, ocConfig oc.Config, proxy *h
 	}
 	cmdArgs := []string{"apply", "-f", proxyConfigMapFileName}
 	if _, stderr, err := ocConfig.RunOcCommandPrivate(cmdArgs...); err != nil {
-		return fmt.Errorf("Failed to add proxy cert details %v: %s", err, stderr)
+		return fmt.Errorf("failed to add proxy cert details: %s: %w", stderr, err)
 	}
 	return nil
 }
@@ -452,7 +452,7 @@ func WaitForPullSecretPresentOnInstanceDisk(ctx context.Context, sshRunner *ssh.
 		}
 		stdout, stderr, err := sshRunner.RunPrivate(fmt.Sprintf("sudo cat %s", vmPullSecretPath))
 		if err != nil {
-			return fmt.Errorf("failed to read %s file: %v: %s", vmPullSecretPath, err, stderr)
+			return fmt.Errorf("failed to read %s file: %s: %w", vmPullSecretPath, stderr, err)
 		}
 		if err := validation.ImagePullSecret(stdout); err != nil {
 			return &errors.RetriableError{Err: fmt.Errorf("pull secret not updated to disk")}

pkg/crc/cluster/csr.go

@@ -33,7 +33,7 @@ func getCSRList(ctx context.Context, ocConfig oc.Config, expectedSignerName stri
 	}
 	output, stderr, err := ocConfig.WithFailFast().RunOcCommand("get", "csr", "-ojson")
 	if err != nil {
-		return nil, fmt.Errorf("Failed to get all certificate signing requests: %v %s", err, stderr)
+		return nil, fmt.Errorf("failed to get all certificate signing requests: %s: %w", stderr, err)
 	}
 	err = json.Unmarshal([]byte(output), &csrs)
 	if err != nil {

pkg/crc/cluster/kubeadmin_password.go

@@ -40,7 +40,7 @@ func UpdateUserPasswords(ctx context.Context, ocConfig oc.Config, newKubeAdminPa
 
 	given, stderr, err := ocConfig.RunOcCommandPrivate("get", "secret", "htpass-secret", "-n", "openshift-config", "-o", `jsonpath="{.data.htpasswd}"`)
 	if err != nil {
-		return fmt.Errorf("%s:%v", stderr, err)
+		return fmt.Errorf("%s: %w", stderr, err)
 	}
 	ok, externals, err := compareHtpasswd(given, credentials)
 	if err != nil {
@@ -60,7 +60,7 @@ func UpdateUserPasswords(ctx context.Context, ocConfig oc.Config, newKubeAdminPa
 		"-n", "openshift-config", "--type", "merge"}
 	_, stderr, err = ocConfig.RunOcCommandPrivate(cmdArgs...)
 	if err != nil {
-		return fmt.Errorf("failed to update user passwords %v: %s", err, stderr)
+		return fmt.Errorf("failed to update user passwords: %s: %w", stderr, err)
 	}
 	return nil
 }

pkg/crc/config/viper_config.go

@@ -43,7 +43,7 @@ func (c *ViperStorage) viperInstance() (*viper.Viper, error) {
 	v.AutomaticEnv()
 	v.SetTypeByDefaultValue(true)
 	if err := v.ReadInConfig(); err != nil {
-		return nil, fmt.Errorf("error reading configuration file '%s': %v", c.configFile, err)
+		return nil, fmt.Errorf("error reading configuration file '%s': %w", c.configFile, err)
 	}
 	if c.flagSet == nil {
 		return v, nil

pkg/crc/gpg/gpg.go

@@ -29,11 +29,11 @@ func Verify(filePath, signatureFilePath string) error {
 
 	keyring, err := openpgp.ReadArmoredKeyRing(bytes.NewBufferString(constants.CrcOrgPublicKey))
 	if err != nil {
-		return fmt.Errorf("failed to parse public key: %s", err)
+		return fmt.Errorf("failed to parse public key: %w", err)
 	}
 
 	if _, err = openpgp.CheckArmoredDetachedSignature(keyring, data, signature, nil); err != nil {
-		return fmt.Errorf("failed to check signature: %s", err)
+		return fmt.Errorf("failed to check signature: %w", err)
 	}
 	return nil
 }

pkg/crc/machine/bundle/metadata.go

@@ -435,7 +435,7 @@ func FetchLatestReleaseInfo() (*ReleaseInfo, error) {
 
 	var releaseInfo ReleaseInfo
 	if err := json.Unmarshal(releaseMetaData, &releaseInfo); err != nil {
-		return nil, fmt.Errorf("Error unmarshaling JSON metadata: %v", err)
+		return nil, fmt.Errorf("error unmarshaling JSON metadata: %w", err)
 	}
 
 	return &releaseInfo, nil

pkg/crc/machine/exists.go

@@ -11,7 +11,7 @@ func (client *client) Exists() (bool, error) {
 	defer cleanup()
 	exists, err := libMachineAPIClient.Exists(client.name)
 	if err != nil {
-		return false, fmt.Errorf("Error checking if the host exists: %s", err)
+		return false, fmt.Errorf("error checking if the host exists: %w", err)
 	}
 	return exists, nil
 }