refactor: optimize error handling for ssh.ReadFile

pkg/platform/provider/baremetal/cluster/create.go

@@ -734,37 +734,37 @@ func (p *Provider) EnsureStoreCredential(ctx context.Context, c *v1.Cluster) err
 
  data, err := machineSSH.ReadFile(constants.CACertName)
  if err != nil {
- return errors.Wrapf(err, "read %s error", constants.CACertName)
+ return err
  }
  c.ClusterCredential.CACert = data
 
  data, err = machineSSH.ReadFile(constants.CAKeyName)
  if err != nil {
- return errors.Wrapf(err, "read %s error", constants.CAKeyName)
+ return err
  }
  c.ClusterCredential.CAKey = data
 
  data, err = machineSSH.ReadFile(constants.EtcdCACertName)
  if err != nil {
- return errors.Wrapf(err, "read %s error", constants.EtcdCACertName)
+ return err
  }
  c.ClusterCredential.ETCDCACert = data
 
  data, err = machineSSH.ReadFile(constants.EtcdCAKeyName)
  if err != nil {
- return errors.Wrapf(err, "read %s error", constants.EtcdCAKeyName)
+ return err
  }
  c.ClusterCredential.ETCDCAKey = data
 
  data, err = machineSSH.ReadFile(constants.APIServerEtcdClientCertName)
  if err != nil {
- return errors.Wrapf(err, "read %s error", constants.APIServerEtcdClientCertName)
+ return err
  }
  c.ClusterCredential.ETCDAPIClientCert = data
 
  data, err = machineSSH.ReadFile(constants.APIServerEtcdClientKeyName)
  if err != nil {
- return errors.Wrapf(err, "read %s error", constants.APIServerEtcdClientKeyName)
+ return err
  }
  c.ClusterCredential.ETCDAPIClientKey = data
 

pkg/platform/provider/baremetal/preflight/checks.go

@@ -271,7 +271,7 @@ func (fcc FileContentCheck) Check() (warnings, errorList []error) {
  log.Infof("validating the contents of file %s", fcc.Path)
  data, err := fcc.ReadFile(fcc.Path)
  if err != nil {
- return nil, []error{errors.Errorf("%s could not be read", fcc.Path)}
+ return nil, []error{err}
  }
 
  if !bytes.Equal(data[:len(fcc.Content)], fcc.Content) {

pkg/util/ssh/ssh.go

@@ -32,12 +32,11 @@ import (
  "path"
  "time"
 
- "tkestack.io/tke/pkg/util/hash"
-
  "github.com/pkg/sftp"
  "golang.org/x/crypto/ssh"
  "gopkg.in/go-playground/validator.v9"
  "k8s.io/apimachinery/pkg/util/wait"
+ "tkestack.io/tke/pkg/util/hash"
  "tkestack.io/tke/pkg/util/log"
 )
 
@@ -326,29 +325,33 @@ func (s *SSH) ReadFile(filename string) ([]byte, error) {
  if err != nil {
  err = wait.Poll(5*time.Second, time.Duration(s.Retry)*5*time.Second, func() (bool, error) {
  if client, err = s.dialer.Dial("tcp", s.addr, config); err != nil {
- return false, err
+ return false, fmt.Errorf("read file %s error: %w", filename, err)
  }
  return true, nil
  })
  }
  if err != nil {
- return nil, err
+ return nil, fmt.Errorf("read file %s error: %w", filename, err)
  }
  defer client.Close()
 
  sftpClient, err := sftp.NewClient(client)
  if err != nil {
- return nil, err
+ return nil, fmt.Errorf("read file %s error: %w", filename, err)
  }
  defer sftpClient.Close()
 
  f, err := sftpClient.Open(filename)
  if err != nil {
- return nil, err
+ return nil, fmt.Errorf("read file %s error: %w", filename, err)
  }
  data := new(bytes.Buffer)
  _, err = f.WriteTo(data)
- return data.Bytes(), err
+ if err != nil {
+ return nil, fmt.Errorf("read file %s error: %w", filename, err)
+ }
+
+ return data.Bytes(), nil
 }
 
 func (s *SSH) LookPath(file string) (string, error) {