refactor: remove pkg/errors

This commit is contained in:
Fu Diwei
2025-04-22 22:12:58 +08:00
parent f5807d215f
commit 6dac89e9a1
103 changed files with 500 additions and 575 deletions

View File

@@ -5,8 +5,7 @@ import (
"crypto/x509"
"encoding/pem"
"errors"
xerrors "github.com/pkg/errors"
"fmt"
)
// 将 x509.Certificate 对象转换为 PEM 编码的字符串。
@@ -45,7 +44,7 @@ func ConvertECPrivateKeyToPEM(privkey *ecdsa.PrivateKey) (privkeyPEM string, err
data, err := x509.MarshalECPrivateKey(privkey)
if err != nil {
return "", xerrors.Wrap(err, "failed to marshal EC private key")
return "", fmt.Errorf("failed to marshal EC private key: %w", err)
}
block := &pem.Block{

View File

@@ -7,9 +7,9 @@ import (
"crypto/x509"
"encoding/pem"
"errors"
"fmt"
"github.com/go-acme/lego/v4/certcrypto"
xerrors "github.com/pkg/errors"
)
// 从 PEM 编码的证书字符串解析并返回一个 x509.Certificate 对象。
@@ -31,7 +31,7 @@ func ParseCertificateFromPEM(certPEM string) (cert *x509.Certificate, err error)
cert, err = x509.ParseCertificate(block.Bytes)
if err != nil {
return nil, xerrors.Wrap(err, "failed to parse certificate")
return nil, fmt.Errorf("failed to parse certificate: %w", err)
}
return cert, nil
@@ -68,7 +68,7 @@ func ParseECPrivateKeyFromPEM(privkeyPEM string) (privkey *ecdsa.PrivateKey, err
privkey, err = x509.ParseECPrivateKey(block.Bytes)
if err != nil {
return nil, xerrors.Wrap(err, "failed to parse private key")
return nil, fmt.Errorf("failed to parse private key: %w", err)
}
return privkey, nil
@@ -92,7 +92,7 @@ func ParsePKCS1PrivateKeyFromPEM(privkeyPEM string) (privkey *rsa.PrivateKey, er
privkey, err = x509.ParsePKCS1PrivateKey(block.Bytes)
if err != nil {
return nil, xerrors.Wrap(err, "failed to parse private key")
return nil, fmt.Errorf("failed to parse private key: %w", err)
}
return privkey, nil

View File

@@ -1,10 +1,9 @@
package fileutil
import (
"fmt"
"os"
"path/filepath"
xerrors "github.com/pkg/errors"
)
// 与 [Write] 类似,但写入的是字符串内容。
@@ -34,18 +33,18 @@ func Write(path string, data []byte) error {
err := os.MkdirAll(dir, os.ModePerm)
if err != nil {
return xerrors.Wrap(err, "failed to create directory")
return fmt.Errorf("failed to create directory: %w", err)
}
file, err := os.Create(path)
if err != nil {
return xerrors.Wrap(err, "failed to create file")
return fmt.Errorf("failed to create file: %w", err)
}
defer file.Close()
_, err = file.Write(data)
if err != nil {
return xerrors.Wrap(err, "failed to write file")
return fmt.Errorf("failed to write file: %w", err)
}
return nil