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

@@ -7,8 +7,6 @@ import (
"log/slog"
"strings"
xerrors "github.com/pkg/errors"
"github.com/usual2970/certimate/internal/pkg/core/uploader"
rainyunsdk "github.com/usual2970/certimate/internal/pkg/sdk3rd/rainyun"
certutil "github.com/usual2970/certimate/internal/pkg/utils/cert"
@@ -34,7 +32,7 @@ func NewUploader(config *UploaderConfig) (*UploaderProvider, error) {
client, err := createSdkClient(config.ApiKey)
if err != nil {
return nil, xerrors.Wrap(err, "failed to create sdk client")
return nil, fmt.Errorf("failed to create sdk client: %w", err)
}
return &UploaderProvider{
@@ -70,7 +68,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE
sslCenterCreateResp, err := u.sdkClient.SslCenterCreate(sslCenterCreateReq)
u.logger.Debug("sdk request 'sslcenter.Create'", slog.Any("request", sslCenterCreateReq), slog.Any("response", sslCenterCreateResp))
if err != nil {
return nil, xerrors.Wrap(err, "failed to execute sdk request 'sslcenter.Create'")
return nil, fmt.Errorf("failed to execute sdk request 'sslcenter.Create': %w", err)
}
if res, err := u.getCertIfExists(ctx, certPEM); err != nil {
@@ -105,7 +103,7 @@ func (u *UploaderProvider) getCertIfExists(ctx context.Context, certPEM string)
sslCenterListResp, err := u.sdkClient.SslCenterList(sslCenterListReq)
u.logger.Debug("sdk request 'sslcenter.List'", slog.Any("request", sslCenterListReq), slog.Any("response", sslCenterListResp))
if err != nil {
return nil, xerrors.Wrap(err, "failed to execute sdk request 'sslcenter.List'")
return nil, fmt.Errorf("failed to execute sdk request 'sslcenter.List': %w", err)
}
if sslCenterListResp.Data != nil && sslCenterListResp.Data.Records != nil {
@@ -123,7 +121,7 @@ func (u *UploaderProvider) getCertIfExists(ctx context.Context, certPEM string)
// 最后对比证书内容
sslCenterGetResp, err := u.sdkClient.SslCenterGet(sslItem.ID)
if err != nil {
return nil, xerrors.Wrap(err, "failed to execute sdk request 'sslcenter.Get'")
return nil, fmt.Errorf("failed to execute sdk request 'sslcenter.Get': %w", err)
}
var isSameCert bool