convert error fromating to %w everywhere (#6995)
This commit is contained in:
@@ -63,13 +63,13 @@ func (ra *SeaweedFileReaderAt) ReadAt(p []byte, off int64) (n int, err error) {
|
||||
}
|
||||
|
||||
if _, err := ra.reader.Seek(bufferKey, io.SeekStart); err != nil {
|
||||
return 0, fmt.Errorf("seek error: %v", err)
|
||||
return 0, fmt.Errorf("seek error: %w", err)
|
||||
}
|
||||
|
||||
buffer = make([]byte, readSize)
|
||||
readBytes, err := io.ReadFull(ra.reader, buffer)
|
||||
if err != nil && err != io.ErrUnexpectedEOF {
|
||||
return 0, fmt.Errorf("read error: %v", err)
|
||||
return 0, fmt.Errorf("read error: %w", err)
|
||||
}
|
||||
buffer = buffer[:readBytes]
|
||||
ra.cache.Put(bufferKey, buffer)
|
||||
|
||||
@@ -139,7 +139,7 @@ func (fs *SftpServer) newFileWriter(r *sftp.Request) (io.WriterAt, error) {
|
||||
// Create a temporary file to buffer writes
|
||||
tmpFile, err := os.CreateTemp("", "sftp-upload-*")
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("failed to create temp file: %v", err)
|
||||
return nil, fmt.Errorf("failed to create temp file: %w", err)
|
||||
}
|
||||
|
||||
return &SeaweedSftpFileWriter{
|
||||
@@ -303,19 +303,19 @@ func (fs *SftpServer) putFile(filepath string, reader io.Reader, user *user.User
|
||||
// We can skip ContentLength if unknown (chunked transfer encoding)
|
||||
req, err := http.NewRequest(http.MethodPut, uploadUrl, body)
|
||||
if err != nil {
|
||||
return fmt.Errorf("create request: %v", err)
|
||||
return fmt.Errorf("create request: %w", err)
|
||||
}
|
||||
req.Header.Set("Content-Type", "application/octet-stream")
|
||||
|
||||
resp, err := http.DefaultClient.Do(req)
|
||||
if err != nil {
|
||||
return fmt.Errorf("upload to filer: %v", err)
|
||||
return fmt.Errorf("upload to filer: %w", err)
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
|
||||
respBody, err := io.ReadAll(resp.Body)
|
||||
if err != nil {
|
||||
return fmt.Errorf("read response: %v", err)
|
||||
return fmt.Errorf("read response: %w", err)
|
||||
}
|
||||
|
||||
if resp.StatusCode != http.StatusOK && resp.StatusCode != http.StatusCreated {
|
||||
@@ -324,7 +324,7 @@ func (fs *SftpServer) putFile(filepath string, reader io.Reader, user *user.User
|
||||
|
||||
var result weed_server.FilerPostResult
|
||||
if err := json.Unmarshal(respBody, &result); err != nil {
|
||||
return fmt.Errorf("parse response: %v", err)
|
||||
return fmt.Errorf("parse response: %w", err)
|
||||
}
|
||||
if result.Error != "" {
|
||||
return fmt.Errorf("filer error: %s", result.Error)
|
||||
@@ -338,7 +338,7 @@ func (fs *SftpServer) putFile(filepath string, reader io.Reader, user *user.User
|
||||
Name: filename,
|
||||
})
|
||||
if err != nil {
|
||||
return fmt.Errorf("lookup file for attribute update: %v", err)
|
||||
return fmt.Errorf("lookup file for attribute update: %w", err)
|
||||
}
|
||||
|
||||
if lookupResp.Entry == nil {
|
||||
|
||||
@@ -98,7 +98,7 @@ func (fs *SftpServer) EnsureHomeDirectory() error {
|
||||
})
|
||||
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to create home directory: %v", err)
|
||||
return fmt.Errorf("failed to create home directory: %w", err)
|
||||
}
|
||||
|
||||
glog.V(0).Infof("Successfully created home directory for user %s: %s", fs.user.Username, fs.user.HomeDir)
|
||||
|
||||
@@ -71,7 +71,7 @@ func (s *SFTPService) Serve(listener net.Listener) error {
|
||||
// Build SSH server config
|
||||
sshConfig, err := s.buildSSHConfig()
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to create SSH config: %v", err)
|
||||
return fmt.Errorf("failed to create SSH config: %w", err)
|
||||
}
|
||||
|
||||
glog.V(0).Infof("Starting Seaweed SFTP service on %s", listener.Addr().String())
|
||||
@@ -79,7 +79,7 @@ func (s *SFTPService) Serve(listener net.Listener) error {
|
||||
for {
|
||||
conn, err := listener.Accept()
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to accept incoming connection: %v", err)
|
||||
return fmt.Errorf("failed to accept incoming connection: %w", err)
|
||||
}
|
||||
go s.handleSSHConnection(conn, sshConfig)
|
||||
}
|
||||
@@ -110,7 +110,7 @@ func (s *SFTPService) buildSSHConfig() (*ssh.ServerConfig, error) {
|
||||
if s.options.HostKeysFolder != "" {
|
||||
files, err := os.ReadDir(s.options.HostKeysFolder)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("failed to read host keys folder: %v", err)
|
||||
return nil, fmt.Errorf("failed to read host keys folder: %w", err)
|
||||
}
|
||||
for _, file := range files {
|
||||
if file.IsDir() {
|
||||
|
||||
@@ -61,7 +61,7 @@ func NewFileStore(filePath string) (*FileStore, error) {
|
||||
if _, err := os.Stat(filePath); os.IsNotExist(err) {
|
||||
// Create an empty users array
|
||||
if err := os.WriteFile(filePath, []byte("[]"), 0600); err != nil {
|
||||
return nil, fmt.Errorf("failed to create user store file: %v", err)
|
||||
return nil, fmt.Errorf("failed to create user store file: %w", err)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -79,12 +79,12 @@ func (s *FileStore) loadUsers() error {
|
||||
|
||||
data, err := os.ReadFile(s.filePath)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to read user store file: %v", err)
|
||||
return fmt.Errorf("failed to read user store file: %w", err)
|
||||
}
|
||||
|
||||
var users []*User
|
||||
if err := json.Unmarshal(data, &users); err != nil {
|
||||
return fmt.Errorf("failed to parse user store file: %v", err)
|
||||
return fmt.Errorf("failed to parse user store file: %w", err)
|
||||
}
|
||||
|
||||
// Clear existing users and add the loaded ones
|
||||
@@ -119,11 +119,11 @@ func (s *FileStore) saveUsers() error {
|
||||
|
||||
data, err := json.MarshalIndent(users, "", " ")
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to serialize users: %v", err)
|
||||
return fmt.Errorf("failed to serialize users: %w", err)
|
||||
}
|
||||
|
||||
if err := os.WriteFile(s.filePath, data, 0600); err != nil {
|
||||
return fmt.Errorf("failed to write user store file: %v", err)
|
||||
return fmt.Errorf("failed to write user store file: %w", err)
|
||||
}
|
||||
|
||||
return nil
|
||||
|
||||
Reference in New Issue
Block a user