diff --git a/internal/applicant/acme_user.go b/internal/applicant/acme_user.go index d4284a10..29ac80cd 100644 --- a/internal/applicant/acme_user.go +++ b/internal/applicant/acme_user.go @@ -146,7 +146,7 @@ func registerAcmeUser(client *lego.Client, user *acmeUser, userRegisterOptions m } default: - err = fmt.Errorf("unsupported ca provider: %s", user.CA) + err = fmt.Errorf("unsupported ca provider '%s'", user.CA) } if err != nil { return nil, err diff --git a/internal/applicant/applicant.go b/internal/applicant/applicant.go index 216ff789..7b8b94f9 100644 --- a/internal/applicant/applicant.go +++ b/internal/applicant/applicant.go @@ -56,7 +56,7 @@ type applicantOptions struct { func NewWithApplyNode(node *domain.WorkflowNode) (Applicant, error) { if node.Type != domain.WorkflowNodeTypeApply { - return nil, fmt.Errorf("node type is not apply") + return nil, fmt.Errorf("node type is not '%s'", string(domain.WorkflowNodeTypeApply)) } nodeConfig := node.GetConfigForApply() @@ -181,7 +181,7 @@ func apply(challengeProvider challenge.Provider, options *applicantOptions) (*Ap if !user.hasRegistration() { reg, err := registerAcmeUserWithSingleFlight(client, user, options.CAProviderAccessConfig) if err != nil { - return nil, fmt.Errorf("failed to register: %w", err) + return nil, fmt.Errorf("failed to register acme user: %w", err) } user.Registration = reg } diff --git a/internal/applicant/providers.go b/internal/applicant/providers.go index 7f9d8a9d..d4ad473f 100644 --- a/internal/applicant/providers.go +++ b/internal/applicant/providers.go @@ -509,5 +509,5 @@ func createApplicant(options *applicantOptions) (challenge.Provider, error) { } } - return nil, fmt.Errorf("unsupported applicant provider: %s", string(options.Provider)) + return nil, fmt.Errorf("unsupported applicant provider '%s'", string(options.Provider)) } diff --git a/internal/deployer/deployer.go b/internal/deployer/deployer.go index c023a236..972e7aa3 100644 --- a/internal/deployer/deployer.go +++ b/internal/deployer/deployer.go @@ -28,7 +28,7 @@ func NewWithDeployNode(node *domain.WorkflowNode, certdata struct { }, ) (Deployer, error) { if node.Type != domain.WorkflowNodeTypeDeploy { - return nil, fmt.Errorf("node type is not deploy") + return nil, fmt.Errorf("node type is not '%s'", string(domain.WorkflowNodeTypeDeploy)) } nodeConfig := node.GetConfigForDeploy() diff --git a/internal/deployer/providers.go b/internal/deployer/providers.go index cdf53b1d..6b6daea1 100644 --- a/internal/deployer/providers.go +++ b/internal/deployer/providers.go @@ -1077,5 +1077,5 @@ func createDeployer(options *deployerOptions) (deployer.Deployer, error) { } } - return nil, fmt.Errorf("unsupported deployer provider: %s", string(options.Provider)) + return nil, fmt.Errorf("unsupported deployer provider '%s'", string(options.Provider)) } diff --git a/internal/notify/providers.go b/internal/notify/providers.go index 8c8b99bc..bae9ba72 100644 --- a/internal/notify/providers.go +++ b/internal/notify/providers.go @@ -102,5 +102,5 @@ func createNotifier(channel domain.NotifyChannelType, channelConfig map[string]a }) } - return nil, fmt.Errorf("unsupported notifier channel: %s", channelConfig) + return nil, fmt.Errorf("unsupported notifier channel '%s'", channelConfig) } diff --git a/internal/pkg/core/deployer/providers/1panel-console/1panel_console.go b/internal/pkg/core/deployer/providers/1panel-console/1panel_console.go index c44cb09c..55a48035 100644 --- a/internal/pkg/core/deployer/providers/1panel-console/1panel_console.go +++ b/internal/pkg/core/deployer/providers/1panel-console/1panel_console.go @@ -4,11 +4,10 @@ import ( "context" "crypto/tls" "errors" + "fmt" "log/slog" "net/url" - xerrors "github.com/pkg/errors" - "github.com/usual2970/certimate/internal/pkg/core/deployer" opsdk "github.com/usual2970/certimate/internal/pkg/sdk3rd/1panel" ) @@ -39,7 +38,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { client, err := createSdkClient(config.ApiUrl, config.ApiKey, config.AllowInsecureConnections) 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 &DeployerProvider{ @@ -74,7 +73,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE updateSystemSSLResp, err := d.sdkClient.UpdateSystemSSL(updateSystemSSLReq) d.logger.Debug("sdk request '1panel.UpdateSystemSSL'", slog.Any("request", updateSystemSSLReq), slog.Any("response", updateSystemSSLResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request '1panel.UpdateSystemSSL'") + return nil, fmt.Errorf("failed to execute sdk request '1panel.UpdateSystemSSL': %w", err) } return &deployer.DeployResult{}, nil diff --git a/internal/pkg/core/deployer/providers/1panel-site/1panel_site.go b/internal/pkg/core/deployer/providers/1panel-site/1panel_site.go index 5d4561e0..aa5fa507 100644 --- a/internal/pkg/core/deployer/providers/1panel-site/1panel_site.go +++ b/internal/pkg/core/deployer/providers/1panel-site/1panel_site.go @@ -9,8 +9,6 @@ import ( "net/url" "strconv" - xerrors "github.com/pkg/errors" - "github.com/usual2970/certimate/internal/pkg/core/deployer" "github.com/usual2970/certimate/internal/pkg/core/uploader" uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/1panel-ssl" @@ -50,7 +48,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { client, err := createSdkClient(config.ApiUrl, config.ApiKey, config.AllowInsecureConnections) if err != nil { - return nil, xerrors.Wrap(err, "failed to create sdk client") + return nil, fmt.Errorf("failed to create sdk client: %w", err) } uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{ @@ -58,7 +56,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { ApiKey: config.ApiKey, }) if err != nil { - return nil, xerrors.Wrap(err, "failed to create ssl uploader") + return nil, fmt.Errorf("failed to create ssl uploader: %w", err) } return &DeployerProvider{ @@ -93,7 +91,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE } default: - return nil, fmt.Errorf("unsupported resource type: %s", d.config.ResourceType) + return nil, fmt.Errorf("unsupported resource type '%s'", d.config.ResourceType) } return &deployer.DeployResult{}, nil @@ -111,13 +109,13 @@ func (d *DeployerProvider) deployToWebsite(ctx context.Context, certPEM string, getHttpsConfResp, err := d.sdkClient.GetHttpsConf(getHttpsConfReq) d.logger.Debug("sdk request '1panel.GetHttpsConf'", slog.Any("request", getHttpsConfReq), slog.Any("response", getHttpsConfResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request '1panel.GetHttpsConf'") + return fmt.Errorf("failed to execute sdk request '1panel.GetHttpsConf': %w", err) } // 上传证书到面板 upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM) if err != nil { - return xerrors.Wrap(err, "failed to upload certificate file") + return fmt.Errorf("failed to upload certificate file: %w", err) } else { d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } @@ -137,7 +135,7 @@ func (d *DeployerProvider) deployToWebsite(ctx context.Context, certPEM string, updateHttpsConfResp, err := d.sdkClient.UpdateHttpsConf(updateHttpsConfReq) d.logger.Debug("sdk request '1panel.UpdateHttpsConf'", slog.Any("request", updateHttpsConfReq), slog.Any("response", updateHttpsConfResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request '1panel.UpdateHttpsConf'") + return fmt.Errorf("failed to execute sdk request '1panel.UpdateHttpsConf': %w", err) } return nil @@ -155,7 +153,7 @@ func (d *DeployerProvider) deployToCertificate(ctx context.Context, certPEM stri getWebsiteSSLResp, err := d.sdkClient.GetWebsiteSSL(getWebsiteSSLReq) d.logger.Debug("sdk request '1panel.GetWebsiteSSL'", slog.Any("request", getWebsiteSSLReq), slog.Any("response", getWebsiteSSLResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request '1panel.GetWebsiteSSL'") + return fmt.Errorf("failed to execute sdk request '1panel.GetWebsiteSSL': %w", err) } // 更新证书 @@ -169,7 +167,7 @@ func (d *DeployerProvider) deployToCertificate(ctx context.Context, certPEM stri uploadWebsiteSSLResp, err := d.sdkClient.UploadWebsiteSSL(uploadWebsiteSSLReq) d.logger.Debug("sdk request '1panel.UploadWebsiteSSL'", slog.Any("request", uploadWebsiteSSLReq), slog.Any("response", uploadWebsiteSSLResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request '1panel.UploadWebsiteSSL'") + return fmt.Errorf("failed to execute sdk request '1panel.UploadWebsiteSSL': %w", err) } return nil diff --git a/internal/pkg/core/deployer/providers/aliyun-alb/aliyun_alb.go b/internal/pkg/core/deployer/providers/aliyun-alb/aliyun_alb.go index e14f04ce..ddf49218 100644 --- a/internal/pkg/core/deployer/providers/aliyun-alb/aliyun_alb.go +++ b/internal/pkg/core/deployer/providers/aliyun-alb/aliyun_alb.go @@ -13,7 +13,6 @@ import ( alicas "github.com/alibabacloud-go/cas-20200407/v3/client" aliopen "github.com/alibabacloud-go/darabonba-openapi/v2/client" "github.com/alibabacloud-go/tea/tea" - xerrors "github.com/pkg/errors" "golang.org/x/exp/slices" "github.com/usual2970/certimate/internal/pkg/core/deployer" @@ -62,12 +61,12 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { clients, err := createSdkClients(config.AccessKeyId, config.AccessKeySecret, config.Region) if err != nil { - return nil, xerrors.Wrap(err, "failed to create sdk clients") + return nil, fmt.Errorf("failed to create sdk clients: %w", err) } uploader, err := createSslUploader(config.AccessKeyId, config.AccessKeySecret, config.Region) if err != nil { - return nil, xerrors.Wrap(err, "failed to create ssl uploader") + return nil, fmt.Errorf("failed to create ssl uploader: %w", err) } return &DeployerProvider{ @@ -92,7 +91,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE // 上传证书到 CAS upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM) if err != nil { - return nil, xerrors.Wrap(err, "failed to upload certificate file") + return nil, fmt.Errorf("failed to upload certificate file: %w", err) } else { d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } @@ -110,7 +109,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE } default: - return nil, fmt.Errorf("unsupported resource type: %s", d.config.ResourceType) + return nil, fmt.Errorf("unsupported resource type '%s'", d.config.ResourceType) } return &deployer.DeployResult{}, nil @@ -129,7 +128,7 @@ func (d *DeployerProvider) deployToLoadbalancer(ctx context.Context, cloudCertId getLoadBalancerAttributeResp, err := d.sdkClients.ALB.GetLoadBalancerAttribute(getLoadBalancerAttributeReq) d.logger.Debug("sdk request 'alb.GetLoadBalancerAttribute'", slog.Any("request", getLoadBalancerAttributeReq), slog.Any("response", getLoadBalancerAttributeResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'alb.GetLoadBalancerAttribute'") + return fmt.Errorf("failed to execute sdk request 'alb.GetLoadBalancerAttribute': %w", err) } // 查询 HTTPS 监听列表 @@ -147,7 +146,7 @@ func (d *DeployerProvider) deployToLoadbalancer(ctx context.Context, cloudCertId listListenersResp, err := d.sdkClients.ALB.ListListeners(listListenersReq) d.logger.Debug("sdk request 'alb.ListListeners'", slog.Any("request", listListenersReq), slog.Any("response", listListenersResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'alb.ListListeners'") + return fmt.Errorf("failed to execute sdk request 'alb.ListListeners': %w", err) } if listListenersResp.Body.Listeners != nil { @@ -176,7 +175,7 @@ func (d *DeployerProvider) deployToLoadbalancer(ctx context.Context, cloudCertId listListenersResp, err := d.sdkClients.ALB.ListListeners(listListenersReq) d.logger.Debug("sdk request 'alb.ListListeners'", slog.Any("request", listListenersReq), slog.Any("response", listListenersResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'alb.ListListeners'") + return fmt.Errorf("failed to execute sdk request 'alb.ListListeners': %w", err) } if listListenersResp.Body.Listeners != nil { @@ -235,7 +234,7 @@ func (d *DeployerProvider) updateListenerCertificate(ctx context.Context, cloudL getListenerAttributeResp, err := d.sdkClients.ALB.GetListenerAttribute(getListenerAttributeReq) d.logger.Debug("sdk request 'alb.GetListenerAttribute'", slog.Any("request", getListenerAttributeReq), slog.Any("response", getListenerAttributeResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'alb.GetListenerAttribute'") + return fmt.Errorf("failed to execute sdk request 'alb.GetListenerAttribute': %w", err) } if d.config.Domain == "" { @@ -252,7 +251,7 @@ func (d *DeployerProvider) updateListenerCertificate(ctx context.Context, cloudL updateListenerAttributeResp, err := d.sdkClients.ALB.UpdateListenerAttribute(updateListenerAttributeReq) d.logger.Debug("sdk request 'alb.UpdateListenerAttribute'", slog.Any("request", updateListenerAttributeReq), slog.Any("response", updateListenerAttributeResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'alb.UpdateListenerAttribute'") + return fmt.Errorf("failed to execute sdk request 'alb.UpdateListenerAttribute': %w", err) } } else { // 指定 SNI，需部署到扩展域名 @@ -272,7 +271,7 @@ func (d *DeployerProvider) updateListenerCertificate(ctx context.Context, cloudL listListenerCertificatesResp, err := d.sdkClients.ALB.ListListenerCertificates(listListenerCertificatesReq) d.logger.Debug("sdk request 'alb.ListListenerCertificates'", slog.Any("request", listListenerCertificatesReq), slog.Any("response", listListenerCertificatesResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'alb.ListListenerCertificates'") + return fmt.Errorf("failed to execute sdk request 'alb.ListListenerCertificates': %w", err) } if listListenerCertificatesResp.Body.Certificates != nil { @@ -331,7 +330,7 @@ func (d *DeployerProvider) updateListenerCertificate(ctx context.Context, cloudL } } - errs = append(errs, xerrors.Wrap(err, "failed to execute sdk request 'cas.GetUserCertificateDetail'")) + errs = append(errs, fmt.Errorf("failed to execute sdk request 'cas.GetUserCertificateDetail': %w", err)) continue } else { certCNMatched := tea.StringValue(getUserCertificateDetailResp.Body.Common) == d.config.Domain @@ -368,7 +367,7 @@ func (d *DeployerProvider) updateListenerCertificate(ctx context.Context, cloudL associateAdditionalCertificatesFromListenerResp, err := d.sdkClients.ALB.AssociateAdditionalCertificatesWithListener(associateAdditionalCertificatesFromListenerReq) d.logger.Debug("sdk request 'alb.AssociateAdditionalCertificatesWithListener'", slog.Any("request", associateAdditionalCertificatesFromListenerReq), slog.Any("response", associateAdditionalCertificatesFromListenerResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'alb.AssociateAdditionalCertificatesWithListener'") + return fmt.Errorf("failed to execute sdk request 'alb.AssociateAdditionalCertificatesWithListener': %w", err) } } @@ -389,7 +388,7 @@ func (d *DeployerProvider) updateListenerCertificate(ctx context.Context, cloudL dissociateAdditionalCertificatesFromListenerResp, err := d.sdkClients.ALB.DissociateAdditionalCertificatesFromListener(dissociateAdditionalCertificatesFromListenerReq) d.logger.Debug("sdk request 'alb.DissociateAdditionalCertificatesFromListener'", slog.Any("request", dissociateAdditionalCertificatesFromListenerReq), slog.Any("response", dissociateAdditionalCertificatesFromListenerResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'alb.DissociateAdditionalCertificatesFromListener'") + return fmt.Errorf("failed to execute sdk request 'alb.DissociateAdditionalCertificatesFromListener': %w", err) } } } diff --git a/internal/pkg/core/deployer/providers/aliyun-apigw/aliyun_apigw.go b/internal/pkg/core/deployer/providers/aliyun-apigw/aliyun_apigw.go index b9995c10..2d85be7a 100644 --- a/internal/pkg/core/deployer/providers/aliyun-apigw/aliyun_apigw.go +++ b/internal/pkg/core/deployer/providers/aliyun-apigw/aliyun_apigw.go @@ -12,7 +12,6 @@ import ( alicloudapi "github.com/alibabacloud-go/cloudapi-20160714/v5/client" aliopen "github.com/alibabacloud-go/darabonba-openapi/v2/client" "github.com/alibabacloud-go/tea/tea" - xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" "github.com/usual2970/certimate/internal/pkg/core/uploader" @@ -59,12 +58,12 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { clients, err := createSdkClients(config.AccessKeyId, config.AccessKeySecret, config.Region) if err != nil { - return nil, xerrors.Wrap(err, "failed to create sdk clients") + return nil, fmt.Errorf("failed to create sdk clients: %w", err) } uploader, err := createSslUploader(config.AccessKeyId, config.AccessKeySecret, config.Region) if err != nil { - return nil, xerrors.Wrap(err, "failed to create ssl uploader") + return nil, fmt.Errorf("failed to create ssl uploader: %w", err) } return &DeployerProvider{ @@ -97,7 +96,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE } default: - return nil, xerrors.Errorf("unsupported service type: %s", string(d.config.ServiceType)) + return nil, fmt.Errorf("unsupported service type '%s'", string(d.config.ServiceType)) } return &deployer.DeployResult{}, nil @@ -123,7 +122,7 @@ func (d *DeployerProvider) deployToTraditional(ctx context.Context, certPEM stri setDomainCertificateResp, err := d.sdkClients.TraditionalAPIGateway.SetDomainCertificate(setDomainCertificateReq) d.logger.Debug("sdk request 'apigateway.SetDomainCertificate'", slog.Any("request", setDomainCertificateReq), slog.Any("response", setDomainCertificateResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'apigateway.SetDomainCertificate'") + return fmt.Errorf("failed to execute sdk request 'apigateway.SetDomainCertificate': %w", err) } return nil @@ -152,7 +151,7 @@ func (d *DeployerProvider) deployToCloudNative(ctx context.Context, certPEM stri listDomainsResp, err := d.sdkClients.CloudNativeAPIGateway.ListDomains(listDomainsReq) d.logger.Debug("sdk request 'apig.ListDomains'", slog.Any("request", listDomainsReq), slog.Any("response", listDomainsResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'apig.ListDomains'") + return fmt.Errorf("failed to execute sdk request 'apig.ListDomains': %w", err) } if listDomainsResp.Body.Data.Items != nil { @@ -184,13 +183,13 @@ func (d *DeployerProvider) deployToCloudNative(ctx context.Context, certPEM stri getDomainResp, err := d.sdkClients.CloudNativeAPIGateway.GetDomain(tea.String(domainId), getDomainReq) d.logger.Debug("sdk request 'apig.GetDomain'", slog.Any("domainId", domainId), slog.Any("request", getDomainReq), slog.Any("response", getDomainResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'apig.GetDomain'") + return fmt.Errorf("failed to execute sdk request 'apig.GetDomain': %w", err) } // 上传证书到 CAS upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM) if err != nil { - return xerrors.Wrap(err, "failed to upload certificate file") + return fmt.Errorf("failed to upload certificate file: %w", err) } else { d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } @@ -210,7 +209,7 @@ func (d *DeployerProvider) deployToCloudNative(ctx context.Context, certPEM stri updateDomainResp, err := d.sdkClients.CloudNativeAPIGateway.UpdateDomain(tea.String(domainId), updateDomainReq) d.logger.Debug("sdk request 'apig.UpdateDomain'", slog.Any("domainId", domainId), slog.Any("request", updateDomainReq), slog.Any("response", updateDomainResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'apig.UpdateDomain'") + return fmt.Errorf("failed to execute sdk request 'apig.UpdateDomain': %w", err) } return nil diff --git a/internal/pkg/core/deployer/providers/aliyun-cas-deploy/aliyun_cas_deploy.go b/internal/pkg/core/deployer/providers/aliyun-cas-deploy/aliyun_cas_deploy.go index 223a30db..a819de13 100644 --- a/internal/pkg/core/deployer/providers/aliyun-cas-deploy/aliyun_cas_deploy.go +++ b/internal/pkg/core/deployer/providers/aliyun-cas-deploy/aliyun_cas_deploy.go @@ -11,7 +11,6 @@ import ( alicas "github.com/alibabacloud-go/cas-20200407/v3/client" aliopen "github.com/alibabacloud-go/darabonba-openapi/v2/client" "github.com/alibabacloud-go/tea/tea" - xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" "github.com/usual2970/certimate/internal/pkg/core/uploader" @@ -48,7 +47,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { client, err := createSdkClient(config.AccessKeyId, config.AccessKeySecret, config.Region) if err != nil { - return nil, xerrors.Wrap(err, "failed to create sdk client") + return nil, fmt.Errorf("failed to create sdk client: %w", err) } uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{ @@ -57,7 +56,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { Region: config.Region, }) if err != nil { - return nil, xerrors.Wrap(err, "failed to create ssl uploader") + return nil, fmt.Errorf("failed to create ssl uploader: %w", err) } return &DeployerProvider{ @@ -86,7 +85,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE // 上传证书到 CAS upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM) if err != nil { - return nil, xerrors.Wrap(err, "failed to upload certificate file") + return nil, fmt.Errorf("failed to upload certificate file: %w", err) } else { d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } @@ -101,7 +100,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE listContactResp, err := d.sdkClient.ListContact(listContactReq) d.logger.Debug("sdk request 'cas.ListContact'", slog.Any("request", listContactReq), slog.Any("response", listContactResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'cas.ListContact'") + return nil, fmt.Errorf("failed to execute sdk request 'cas.ListContact': %w", err) } if len(listContactResp.Body.ContactList) > 0 { @@ -121,7 +120,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE createDeploymentJobResp, err := d.sdkClient.CreateDeploymentJob(createDeploymentJobReq) d.logger.Debug("sdk request 'cas.CreateDeploymentJob'", slog.Any("request", createDeploymentJobReq), slog.Any("response", createDeploymentJobResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'cas.CreateDeploymentJob'") + return nil, fmt.Errorf("failed to execute sdk request 'cas.CreateDeploymentJob': %w", err) } // 循环获取部署任务详情，等待任务状态变更 @@ -137,7 +136,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE describeDeploymentJobResp, err := d.sdkClient.DescribeDeploymentJob(describeDeploymentJobReq) d.logger.Debug("sdk request 'cas.DescribeDeploymentJob'", slog.Any("request", describeDeploymentJobReq), slog.Any("response", describeDeploymentJobResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'cas.DescribeDeploymentJob'") + return nil, fmt.Errorf("failed to execute sdk request 'cas.DescribeDeploymentJob': %w", err) } if describeDeploymentJobResp.Body.Status == nil || *describeDeploymentJobResp.Body.Status == "editing" { diff --git a/internal/pkg/core/deployer/providers/aliyun-cas/aliyun_cas.go b/internal/pkg/core/deployer/providers/aliyun-cas/aliyun_cas.go index 9eeff2c1..56681e57 100644 --- a/internal/pkg/core/deployer/providers/aliyun-cas/aliyun_cas.go +++ b/internal/pkg/core/deployer/providers/aliyun-cas/aliyun_cas.go @@ -2,10 +2,9 @@ package aliyuncas import ( "context" + "fmt" "log/slog" - xerrors "github.com/pkg/errors" - "github.com/usual2970/certimate/internal/pkg/core/deployer" "github.com/usual2970/certimate/internal/pkg/core/uploader" uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/aliyun-cas" @@ -39,7 +38,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { Region: config.Region, }) if err != nil { - return nil, xerrors.Wrap(err, "failed to create ssl uploader") + return nil, fmt.Errorf("failed to create ssl uploader: %w", err) } return &DeployerProvider{ @@ -63,7 +62,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE // 上传证书到 CAS upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM) if err != nil { - return nil, xerrors.Wrap(err, "failed to upload certificate file") + return nil, fmt.Errorf("failed to upload certificate file: %w", err) } else { d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } diff --git a/internal/pkg/core/deployer/providers/aliyun-cdn/aliyun_cdn.go b/internal/pkg/core/deployer/providers/aliyun-cdn/aliyun_cdn.go index 3035f3f2..ce5f9fd8 100644 --- a/internal/pkg/core/deployer/providers/aliyun-cdn/aliyun_cdn.go +++ b/internal/pkg/core/deployer/providers/aliyun-cdn/aliyun_cdn.go @@ -10,7 +10,6 @@ import ( alicdn "github.com/alibabacloud-go/cdn-20180510/v5/client" aliopen "github.com/alibabacloud-go/darabonba-openapi/v2/client" "github.com/alibabacloud-go/tea/tea" - xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" ) @@ -39,7 +38,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { client, err := createSdkClient(config.AccessKeyId, config.AccessKeySecret) 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 &DeployerProvider{ @@ -75,7 +74,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE setCdnDomainSSLCertificateResp, err := d.sdkClient.SetCdnDomainSSLCertificate(setCdnDomainSSLCertificateReq) d.logger.Debug("sdk request 'cdn.SetCdnDomainSSLCertificate'", slog.Any("request", setCdnDomainSSLCertificateReq), slog.Any("response", setCdnDomainSSLCertificateResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'cdn.SetCdnDomainSSLCertificate'") + return nil, fmt.Errorf("failed to execute sdk request 'cdn.SetCdnDomainSSLCertificate': %w", err) } return &deployer.DeployResult{}, nil diff --git a/internal/pkg/core/deployer/providers/aliyun-clb/aliyun_clb.go b/internal/pkg/core/deployer/providers/aliyun-clb/aliyun_clb.go index 82e35911..583eeabd 100644 --- a/internal/pkg/core/deployer/providers/aliyun-clb/aliyun_clb.go +++ b/internal/pkg/core/deployer/providers/aliyun-clb/aliyun_clb.go @@ -9,7 +9,6 @@ import ( aliopen "github.com/alibabacloud-go/darabonba-openapi/v2/client" alislb "github.com/alibabacloud-go/slb-20140515/v4/client" "github.com/alibabacloud-go/tea/tea" - xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" "github.com/usual2970/certimate/internal/pkg/core/uploader" @@ -52,7 +51,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { client, err := createSdkClient(config.AccessKeyId, config.AccessKeySecret, config.Region) if err != nil { - return nil, xerrors.Wrap(err, "failed to create sdk client") + return nil, fmt.Errorf("failed to create sdk client: %w", err) } uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{ @@ -61,7 +60,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { Region: config.Region, }) if err != nil { - return nil, xerrors.Wrap(err, "failed to create ssl uploader") + return nil, fmt.Errorf("failed to create ssl uploader: %w", err) } return &DeployerProvider{ @@ -86,7 +85,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE // 上传证书到 SLB upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM) if err != nil { - return nil, xerrors.Wrap(err, "failed to upload certificate file") + return nil, fmt.Errorf("failed to upload certificate file: %w", err) } else { d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } @@ -104,7 +103,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE } default: - return nil, fmt.Errorf("unsupported resource type: %s", d.config.ResourceType) + return nil, fmt.Errorf("unsupported resource type '%s'", d.config.ResourceType) } return &deployer.DeployResult{}, nil @@ -124,7 +123,7 @@ func (d *DeployerProvider) deployToLoadbalancer(ctx context.Context, cloudCertId describeLoadBalancerAttributeResp, err := d.sdkClient.DescribeLoadBalancerAttribute(describeLoadBalancerAttributeReq) d.logger.Debug("sdk request 'slb.DescribeLoadBalancerAttribute'", slog.Any("request", describeLoadBalancerAttributeReq), slog.Any("response", describeLoadBalancerAttributeResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'slb.DescribeLoadBalancerAttribute'") + return fmt.Errorf("failed to execute sdk request 'slb.DescribeLoadBalancerAttribute': %w", err) } // 查询 HTTPS 监听列表 @@ -143,7 +142,7 @@ func (d *DeployerProvider) deployToLoadbalancer(ctx context.Context, cloudCertId describeLoadBalancerListenersResp, err := d.sdkClient.DescribeLoadBalancerListeners(describeLoadBalancerListenersReq) d.logger.Debug("sdk request 'slb.DescribeLoadBalancerListeners'", slog.Any("request", describeLoadBalancerListenersReq), slog.Any("response", describeLoadBalancerListenersResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'slb.DescribeLoadBalancerListeners'") + return fmt.Errorf("failed to execute sdk request 'slb.DescribeLoadBalancerListeners': %w", err) } if describeLoadBalancerListenersResp.Body.Listeners != nil { @@ -206,7 +205,7 @@ func (d *DeployerProvider) updateListenerCertificate(ctx context.Context, cloudL describeLoadBalancerHTTPSListenerAttributeResp, err := d.sdkClient.DescribeLoadBalancerHTTPSListenerAttribute(describeLoadBalancerHTTPSListenerAttributeReq) d.logger.Debug("sdk request 'slb.DescribeLoadBalancerHTTPSListenerAttribute'", slog.Any("request", describeLoadBalancerHTTPSListenerAttributeReq), slog.Any("response", describeLoadBalancerHTTPSListenerAttributeResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'slb.DescribeLoadBalancerHTTPSListenerAttribute'") + return fmt.Errorf("failed to execute sdk request 'slb.DescribeLoadBalancerHTTPSListenerAttribute': %w", err) } if d.config.Domain == "" { @@ -223,7 +222,7 @@ func (d *DeployerProvider) updateListenerCertificate(ctx context.Context, cloudL setLoadBalancerHTTPSListenerAttributeResp, err := d.sdkClient.SetLoadBalancerHTTPSListenerAttribute(setLoadBalancerHTTPSListenerAttributeReq) d.logger.Debug("sdk request 'slb.SetLoadBalancerHTTPSListenerAttribute'", slog.Any("request", setLoadBalancerHTTPSListenerAttributeReq), slog.Any("response", setLoadBalancerHTTPSListenerAttributeResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'slb.SetLoadBalancerHTTPSListenerAttribute'") + return fmt.Errorf("failed to execute sdk request 'slb.SetLoadBalancerHTTPSListenerAttribute': %w", err) } } else { // 指定 SNI，需部署到扩展域名 @@ -238,7 +237,7 @@ func (d *DeployerProvider) updateListenerCertificate(ctx context.Context, cloudL describeDomainExtensionsResp, err := d.sdkClient.DescribeDomainExtensions(describeDomainExtensionsReq) d.logger.Debug("sdk request 'slb.DescribeDomainExtensions'", slog.Any("request", describeDomainExtensionsReq), slog.Any("response", describeDomainExtensionsResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'slb.DescribeDomainExtensions'") + return fmt.Errorf("failed to execute sdk request 'slb.DescribeDomainExtensions': %w", err) } // 遍历修改扩展域名 @@ -259,7 +258,7 @@ func (d *DeployerProvider) updateListenerCertificate(ctx context.Context, cloudL setDomainExtensionAttributeResp, err := d.sdkClient.SetDomainExtensionAttribute(setDomainExtensionAttributeReq) d.logger.Debug("sdk request 'slb.SetDomainExtensionAttribute'", slog.Any("request", setDomainExtensionAttributeReq), slog.Any("response", setDomainExtensionAttributeResp)) if err != nil { - errs = append(errs, xerrors.Wrap(err, "failed to execute sdk request 'slb.SetDomainExtensionAttribute'")) + errs = append(errs, fmt.Errorf("failed to execute sdk request 'slb.SetDomainExtensionAttribute': %w", err)) continue } } diff --git a/internal/pkg/core/deployer/providers/aliyun-dcdn/aliyun_dcdn.go b/internal/pkg/core/deployer/providers/aliyun-dcdn/aliyun_dcdn.go index ad3a4824..4eb411fd 100644 --- a/internal/pkg/core/deployer/providers/aliyun-dcdn/aliyun_dcdn.go +++ b/internal/pkg/core/deployer/providers/aliyun-dcdn/aliyun_dcdn.go @@ -10,7 +10,6 @@ import ( aliopen "github.com/alibabacloud-go/darabonba-openapi/v2/client" alidcdn "github.com/alibabacloud-go/dcdn-20180115/v3/client" "github.com/alibabacloud-go/tea/tea" - xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" ) @@ -39,7 +38,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { client, err := createSdkClient(config.AccessKeyId, config.AccessKeySecret) 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 &DeployerProvider{ @@ -75,7 +74,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE setDcdnDomainSSLCertificateResp, err := d.sdkClient.SetDcdnDomainSSLCertificate(setDcdnDomainSSLCertificateReq) d.logger.Debug("sdk request 'dcdn.SetDcdnDomainSSLCertificate'", slog.Any("request", setDcdnDomainSSLCertificateReq), slog.Any("response", setDcdnDomainSSLCertificateResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'dcdn.SetDcdnDomainSSLCertificate'") + return nil, fmt.Errorf("failed to execute sdk request 'dcdn.SetDcdnDomainSSLCertificate': %w", err) } return &deployer.DeployResult{}, nil diff --git a/internal/pkg/core/deployer/providers/aliyun-esa/aliyun_esa.go b/internal/pkg/core/deployer/providers/aliyun-esa/aliyun_esa.go index bb2c810c..6052eee2 100644 --- a/internal/pkg/core/deployer/providers/aliyun-esa/aliyun_esa.go +++ b/internal/pkg/core/deployer/providers/aliyun-esa/aliyun_esa.go @@ -11,7 +11,6 @@ import ( aliopen "github.com/alibabacloud-go/darabonba-openapi/v2/client" aliesa "github.com/alibabacloud-go/esa-20240910/v2/client" "github.com/alibabacloud-go/tea/tea" - xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" "github.com/usual2970/certimate/internal/pkg/core/uploader" @@ -45,12 +44,12 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { client, err := createSdkClient(config.AccessKeyId, config.AccessKeySecret, config.Region) if err != nil { - return nil, xerrors.Wrap(err, "failed to create sdk client") + return nil, fmt.Errorf("failed to create sdk client: %w", err) } uploader, err := createSslUploader(config.AccessKeyId, config.AccessKeySecret, config.Region) if err != nil { - return nil, xerrors.Wrap(err, "failed to create ssl uploader") + return nil, fmt.Errorf("failed to create ssl uploader: %w", err) } return &DeployerProvider{ @@ -79,7 +78,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE // 上传证书到 CAS upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM) if err != nil { - return nil, xerrors.Wrap(err, "failed to upload certificate file") + return nil, fmt.Errorf("failed to upload certificate file: %w", err) } else { d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } @@ -95,7 +94,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE setCertificateResp, err := d.sdkClient.SetCertificate(setCertificateReq) d.logger.Debug("sdk request 'esa.SetCertificate'", slog.Any("request", setCertificateReq), slog.Any("response", setCertificateResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'esa.SetCertificate'") + return nil, fmt.Errorf("failed to execute sdk request 'esa.SetCertificate': %w", err) } return &deployer.DeployResult{}, nil diff --git a/internal/pkg/core/deployer/providers/aliyun-fc/aliyun_fc.go b/internal/pkg/core/deployer/providers/aliyun-fc/aliyun_fc.go index d69fd30d..8557068c 100644 --- a/internal/pkg/core/deployer/providers/aliyun-fc/aliyun_fc.go +++ b/internal/pkg/core/deployer/providers/aliyun-fc/aliyun_fc.go @@ -10,7 +10,6 @@ import ( alifc3 "github.com/alibabacloud-go/fc-20230330/v4/client" alifc2 "github.com/alibabacloud-go/fc-open-20210406/v2/client" "github.com/alibabacloud-go/tea/tea" - xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" ) @@ -48,7 +47,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { clients, err := createSdkClients(config.AccessKeyId, config.AccessKeySecret, config.Region) if err != nil { - return nil, xerrors.Wrap(err, "failed to create sdk clients") + return nil, fmt.Errorf("failed to create sdk clients: %w", err) } return &DeployerProvider{ @@ -80,7 +79,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE } default: - return nil, xerrors.Errorf("unsupported service version: %s", d.config.ServiceVersion) + return nil, fmt.Errorf("unsupported service version '%s'", d.config.ServiceVersion) } return &deployer.DeployResult{}, nil @@ -92,7 +91,7 @@ func (d *DeployerProvider) deployToFC3(ctx context.Context, certPEM string, priv getCustomDomainResp, err := d.sdkClients.FC3.GetCustomDomain(tea.String(d.config.Domain)) d.logger.Debug("sdk request 'fc.GetCustomDomain'", slog.Any("response", getCustomDomainResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'fc.GetCustomDomain'") + return fmt.Errorf("failed to execute sdk request 'fc.GetCustomDomain': %w", err) } // 更新自定义域名 @@ -111,7 +110,7 @@ func (d *DeployerProvider) deployToFC3(ctx context.Context, certPEM string, priv updateCustomDomainResp, err := d.sdkClients.FC3.UpdateCustomDomain(tea.String(d.config.Domain), updateCustomDomainReq) d.logger.Debug("sdk request 'fc.UpdateCustomDomain'", slog.Any("request", updateCustomDomainReq), slog.Any("response", updateCustomDomainResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'fc.UpdateCustomDomain'") + return fmt.Errorf("failed to execute sdk request 'fc.UpdateCustomDomain': %w", err) } return nil @@ -123,7 +122,7 @@ func (d *DeployerProvider) deployToFC2(ctx context.Context, certPEM string, priv getCustomDomainResp, err := d.sdkClients.FC2.GetCustomDomain(tea.String(d.config.Domain)) d.logger.Debug("sdk request 'fc.GetCustomDomain'", slog.Any("response", getCustomDomainResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'fc.GetCustomDomain'") + return fmt.Errorf("failed to execute sdk request 'fc.GetCustomDomain': %w", err) } // 更新自定义域名 @@ -140,7 +139,7 @@ func (d *DeployerProvider) deployToFC2(ctx context.Context, certPEM string, priv updateCustomDomainResp, err := d.sdkClients.FC2.UpdateCustomDomain(tea.String(d.config.Domain), updateCustomDomainReq) d.logger.Debug("sdk request 'fc.UpdateCustomDomain'", slog.Any("request", updateCustomDomainReq), slog.Any("response", updateCustomDomainResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'fc.UpdateCustomDomain'") + return fmt.Errorf("failed to execute sdk request 'fc.UpdateCustomDomain': %w", err) } return nil diff --git a/internal/pkg/core/deployer/providers/aliyun-live/aliyun_live.go b/internal/pkg/core/deployer/providers/aliyun-live/aliyun_live.go index c67bf495..354c9601 100644 --- a/internal/pkg/core/deployer/providers/aliyun-live/aliyun_live.go +++ b/internal/pkg/core/deployer/providers/aliyun-live/aliyun_live.go @@ -10,7 +10,6 @@ import ( aliopen "github.com/alibabacloud-go/darabonba-openapi/v2/client" alilive "github.com/alibabacloud-go/live-20161101/client" "github.com/alibabacloud-go/tea/tea" - xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" ) @@ -41,7 +40,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { client, err := createSdkClient(config.AccessKeyId, config.AccessKeySecret, config.Region) 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 &DeployerProvider{ @@ -77,7 +76,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE setLiveDomainSSLCertificateResp, err := d.sdkClient.SetLiveDomainCertificate(setLiveDomainSSLCertificateReq) d.logger.Debug("sdk request 'live.SetLiveDomainCertificate'", slog.Any("request", setLiveDomainSSLCertificateReq), slog.Any("response", setLiveDomainSSLCertificateResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'live.SetLiveDomainCertificate'") + return nil, fmt.Errorf("failed to execute sdk request 'live.SetLiveDomainCertificate': %w", err) } return &deployer.DeployResult{}, nil diff --git a/internal/pkg/core/deployer/providers/aliyun-nlb/aliyun_nlb.go b/internal/pkg/core/deployer/providers/aliyun-nlb/aliyun_nlb.go index 836a9d40..326273f8 100644 --- a/internal/pkg/core/deployer/providers/aliyun-nlb/aliyun_nlb.go +++ b/internal/pkg/core/deployer/providers/aliyun-nlb/aliyun_nlb.go @@ -10,7 +10,6 @@ import ( aliopen "github.com/alibabacloud-go/darabonba-openapi/v2/client" alinlb "github.com/alibabacloud-go/nlb-20220430/v2/client" "github.com/alibabacloud-go/tea/tea" - xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" "github.com/usual2970/certimate/internal/pkg/core/uploader" @@ -50,12 +49,12 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { client, err := createSdkClient(config.AccessKeyId, config.AccessKeySecret, config.Region) if err != nil { - return nil, xerrors.Wrap(err, "failed to create sdk client") + return nil, fmt.Errorf("failed to create sdk client: %w", err) } uploader, err := createSslUploader(config.AccessKeyId, config.AccessKeySecret, config.Region) if err != nil { - return nil, xerrors.Wrap(err, "failed to create ssl uploader") + return nil, fmt.Errorf("failed to create ssl uploader: %w", err) } return &DeployerProvider{ @@ -80,7 +79,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE // 上传证书到 CAS upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM) if err != nil { - return nil, xerrors.Wrap(err, "failed to upload certificate file") + return nil, fmt.Errorf("failed to upload certificate file: %w", err) } else { d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } @@ -98,7 +97,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE } default: - return nil, fmt.Errorf("unsupported resource type: %s", d.config.ResourceType) + return nil, fmt.Errorf("unsupported resource type '%s'", d.config.ResourceType) } return &deployer.DeployResult{}, nil @@ -117,7 +116,7 @@ func (d *DeployerProvider) deployToLoadbalancer(ctx context.Context, cloudCertId getLoadBalancerAttributeResp, err := d.sdkClient.GetLoadBalancerAttribute(getLoadBalancerAttributeReq) d.logger.Debug("sdk request 'nlb.GetLoadBalancerAttribute'", slog.Any("request", getLoadBalancerAttributeReq), slog.Any("response", getLoadBalancerAttributeResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'nlb.GetLoadBalancerAttribute'") + return fmt.Errorf("failed to execute sdk request 'nlb.GetLoadBalancerAttribute': %w", err) } // 查询 TCPSSL 监听列表 @@ -135,7 +134,7 @@ func (d *DeployerProvider) deployToLoadbalancer(ctx context.Context, cloudCertId listListenersResp, err := d.sdkClient.ListListeners(listListenersReq) d.logger.Debug("sdk request 'nlb.ListListeners'", slog.Any("request", listListenersReq), slog.Any("response", listListenersResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'nlb.ListListeners'") + return fmt.Errorf("failed to execute sdk request 'nlb.ListListeners': %w", err) } if listListenersResp.Body.Listeners != nil { @@ -194,7 +193,7 @@ func (d *DeployerProvider) updateListenerCertificate(ctx context.Context, cloudL getListenerAttributeResp, err := d.sdkClient.GetListenerAttribute(getListenerAttributeReq) d.logger.Debug("sdk request 'nlb.GetListenerAttribute'", slog.Any("request", getListenerAttributeReq), slog.Any("response", getListenerAttributeResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'nlb.GetListenerAttribute'") + return fmt.Errorf("failed to execute sdk request 'nlb.GetListenerAttribute': %w", err) } // 修改监听的属性 @@ -206,7 +205,7 @@ func (d *DeployerProvider) updateListenerCertificate(ctx context.Context, cloudL updateListenerAttributeResp, err := d.sdkClient.UpdateListenerAttribute(updateListenerAttributeReq) d.logger.Debug("sdk request 'nlb.UpdateListenerAttribute'", slog.Any("request", updateListenerAttributeReq), slog.Any("response", updateListenerAttributeResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'nlb.UpdateListenerAttribute'") + return fmt.Errorf("failed to execute sdk request 'nlb.UpdateListenerAttribute': %w", err) } return nil diff --git a/internal/pkg/core/deployer/providers/aliyun-oss/aliyun_oss.go b/internal/pkg/core/deployer/providers/aliyun-oss/aliyun_oss.go index 8d2a9ff3..474fe5b3 100644 --- a/internal/pkg/core/deployer/providers/aliyun-oss/aliyun_oss.go +++ b/internal/pkg/core/deployer/providers/aliyun-oss/aliyun_oss.go @@ -7,7 +7,6 @@ import ( "log/slog" "github.com/aliyun/aliyun-oss-go-sdk/oss" - xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" ) @@ -40,7 +39,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { client, err := createSdkClient(config.AccessKeyId, config.AccessKeySecret, config.Region) 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 &DeployerProvider{ @@ -80,7 +79,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE err := d.sdkClient.PutBucketCnameWithCertificate(d.config.Bucket, putBucketCnameWithCertificateReq) d.logger.Debug("sdk request 'oss.PutBucketCnameWithCertificate'", slog.Any("bucket", d.config.Bucket), slog.Any("request", putBucketCnameWithCertificateReq)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'oss.PutBucketCnameWithCertificate'") + return nil, fmt.Errorf("failed to execute sdk request 'oss.PutBucketCnameWithCertificate': %w", err) } return &deployer.DeployResult{}, nil diff --git a/internal/pkg/core/deployer/providers/aliyun-vod/aliyun_vod.go b/internal/pkg/core/deployer/providers/aliyun-vod/aliyun_vod.go index a1934429..48e52c26 100644 --- a/internal/pkg/core/deployer/providers/aliyun-vod/aliyun_vod.go +++ b/internal/pkg/core/deployer/providers/aliyun-vod/aliyun_vod.go @@ -9,7 +9,6 @@ import ( aliopen "github.com/alibabacloud-go/darabonba-openapi/v2/client" "github.com/alibabacloud-go/tea/tea" alivod "github.com/alibabacloud-go/vod-20170321/v4/client" - xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" ) @@ -40,7 +39,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { client, err := createSdkClient(config.AccessKeyId, config.AccessKeySecret, config.Region) 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 &DeployerProvider{ @@ -73,7 +72,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE setVodDomainSSLCertificateResp, err := d.sdkClient.SetVodDomainSSLCertificate(setVodDomainSSLCertificateReq) d.logger.Debug("sdk request 'live.SetVodDomainSSLCertificate'", slog.Any("request", setVodDomainSSLCertificateReq), slog.Any("response", setVodDomainSSLCertificateResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'live.SetVodDomainSSLCertificate'") + return nil, fmt.Errorf("failed to execute sdk request 'live.SetVodDomainSSLCertificate': %w", err) } return &deployer.DeployResult{}, nil diff --git a/internal/pkg/core/deployer/providers/aliyun-waf/aliyun_waf.go b/internal/pkg/core/deployer/providers/aliyun-waf/aliyun_waf.go index 5057b4b1..dfe2f27c 100644 --- a/internal/pkg/core/deployer/providers/aliyun-waf/aliyun_waf.go +++ b/internal/pkg/core/deployer/providers/aliyun-waf/aliyun_waf.go @@ -10,7 +10,6 @@ import ( aliopen "github.com/alibabacloud-go/darabonba-openapi/v2/client" "github.com/alibabacloud-go/tea/tea" aliwaf "github.com/alibabacloud-go/waf-openapi-20211001/v5/client" - xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" "github.com/usual2970/certimate/internal/pkg/core/uploader" @@ -49,12 +48,12 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { client, err := createSdkClient(config.AccessKeyId, config.AccessKeySecret, config.Region) if err != nil { - return nil, xerrors.Wrap(err, "failed to create sdk client") + return nil, fmt.Errorf("failed to create sdk client: %w", err) } uploader, err := createSslUploader(config.AccessKeyId, config.AccessKeySecret, config.Region) if err != nil { - return nil, xerrors.Wrap(err, "failed to create ssl uploader") + return nil, fmt.Errorf("failed to create ssl uploader: %w", err) } return &DeployerProvider{ @@ -87,7 +86,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE } default: - return nil, xerrors.Errorf("unsupported service version: %s", d.config.ServiceVersion) + return nil, fmt.Errorf("unsupported service version '%s'", d.config.ServiceVersion) } return &deployer.DeployResult{}, nil @@ -97,7 +96,7 @@ func (d *DeployerProvider) deployToWAF3(ctx context.Context, certPEM string, pri // 上传证书到 CAS upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM) if err != nil { - return xerrors.Wrap(err, "failed to upload certificate file") + return fmt.Errorf("failed to upload certificate file: %w", err) } else { d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } @@ -114,7 +113,7 @@ func (d *DeployerProvider) deployToWAF3(ctx context.Context, certPEM string, pri describeDefaultHttpsResp, err := d.sdkClient.DescribeDefaultHttps(describeDefaultHttpsReq) d.logger.Debug("sdk request 'waf.DescribeDefaultHttps'", slog.Any("request", describeDefaultHttpsReq), slog.Any("response", describeDefaultHttpsResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'waf.DescribeDefaultHttps'") + return fmt.Errorf("failed to execute sdk request 'waf.DescribeDefaultHttps': %w", err) } // 修改默认 SSL/TLS 设置 @@ -133,7 +132,7 @@ func (d *DeployerProvider) deployToWAF3(ctx context.Context, certPEM string, pri modifyDefaultHttpsResp, err := d.sdkClient.ModifyDefaultHttps(modifyDefaultHttpsReq) d.logger.Debug("sdk request 'waf.ModifyDefaultHttps'", slog.Any("request", modifyDefaultHttpsReq), slog.Any("response", modifyDefaultHttpsResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'waf.ModifyDefaultHttps'") + return fmt.Errorf("failed to execute sdk request 'waf.ModifyDefaultHttps': %w", err) } } else { // 指定接入域名 @@ -148,7 +147,7 @@ func (d *DeployerProvider) deployToWAF3(ctx context.Context, certPEM string, pri describeDomainDetailResp, err := d.sdkClient.DescribeDomainDetail(describeDomainDetailReq) d.logger.Debug("sdk request 'waf.DescribeDomainDetail'", slog.Any("request", describeDomainDetailReq), slog.Any("response", describeDomainDetailResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'waf.DescribeDomainDetail'") + return fmt.Errorf("failed to execute sdk request 'waf.DescribeDomainDetail': %w", err) } // 修改 CNAME 接入资源 @@ -164,7 +163,7 @@ func (d *DeployerProvider) deployToWAF3(ctx context.Context, certPEM string, pri modifyDomainResp, err := d.sdkClient.ModifyDomain(modifyDomainReq) d.logger.Debug("sdk request 'waf.ModifyDomain'", slog.Any("request", modifyDomainReq), slog.Any("response", modifyDomainResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'waf.ModifyDomain'") + return fmt.Errorf("failed to execute sdk request 'waf.ModifyDomain': %w", err) } } diff --git a/internal/pkg/core/deployer/providers/aws-acm/aws_acm.go b/internal/pkg/core/deployer/providers/aws-acm/aws_acm.go index 92eed06a..3e817dcf 100644 --- a/internal/pkg/core/deployer/providers/aws-acm/aws_acm.go +++ b/internal/pkg/core/deployer/providers/aws-acm/aws_acm.go @@ -2,10 +2,9 @@ package awsacm import ( "context" + "fmt" "log/slog" - xerrors "github.com/pkg/errors" - "github.com/usual2970/certimate/internal/pkg/core/deployer" "github.com/usual2970/certimate/internal/pkg/core/uploader" uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/aws-acm" @@ -39,7 +38,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { Region: config.Region, }) if err != nil { - return nil, xerrors.Wrap(err, "failed to create ssl uploader") + return nil, fmt.Errorf("failed to create ssl uploader: %w", err) } return &DeployerProvider{ @@ -63,7 +62,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE // 上传证书到 ACM upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM) if err != nil { - return nil, xerrors.Wrap(err, "failed to upload certificate file") + return nil, fmt.Errorf("failed to upload certificate file: %w", err) } else { d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } diff --git a/internal/pkg/core/deployer/providers/aws-cloudfront/aws_cloudfront.go b/internal/pkg/core/deployer/providers/aws-cloudfront/aws_cloudfront.go index 355e8aff..0808a4fb 100644 --- a/internal/pkg/core/deployer/providers/aws-cloudfront/aws_cloudfront.go +++ b/internal/pkg/core/deployer/providers/aws-cloudfront/aws_cloudfront.go @@ -3,6 +3,7 @@ package awscloudfront import ( "context" "errors" + "fmt" "log/slog" aws "github.com/aws/aws-sdk-go-v2/aws" @@ -10,7 +11,6 @@ import ( awscred "github.com/aws/aws-sdk-go-v2/credentials" "github.com/aws/aws-sdk-go-v2/service/cloudfront" "github.com/aws/aws-sdk-go-v2/service/cloudfront/types" - xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" "github.com/usual2970/certimate/internal/pkg/core/uploader" @@ -44,7 +44,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { client, err := createSdkClient(config.AccessKeyId, config.SecretAccessKey, config.Region) if err != nil { - return nil, xerrors.Wrap(err, "failed to create sdk client") + return nil, fmt.Errorf("failed to create sdk client: %w", err) } uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{ @@ -53,7 +53,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { Region: config.Region, }) if err != nil { - return nil, xerrors.Wrap(err, "failed to create ssl uploader") + return nil, fmt.Errorf("failed to create ssl uploader: %w", err) } return &DeployerProvider{ @@ -82,7 +82,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE // 上传证书到 ACM upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM) if err != nil { - return nil, xerrors.Wrap(err, "failed to upload certificate file") + return nil, fmt.Errorf("failed to upload certificate file: %w", err) } else { d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } @@ -95,7 +95,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE getDistributionConfigResp, err := d.sdkClient.GetDistributionConfig(context.TODO(), getDistributionConfigReq) d.logger.Debug("sdk request 'cloudfront.GetDistributionConfig'", slog.Any("request", getDistributionConfigReq), slog.Any("response", getDistributionConfigResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'cloudfront.GetDistributionConfig'") + return nil, fmt.Errorf("failed to execute sdk request 'cloudfront.GetDistributionConfig': %w", err) } // 更新分配配置 @@ -113,7 +113,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE updateDistributionResp, err := d.sdkClient.UpdateDistribution(context.TODO(), updateDistributionReq) d.logger.Debug("sdk request 'cloudfront.UpdateDistribution'", slog.Any("request", updateDistributionReq), slog.Any("response", updateDistributionResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'cloudfront.UpdateDistribution'") + return nil, fmt.Errorf("failed to execute sdk request 'cloudfront.UpdateDistribution': %w", err) } return &deployer.DeployResult{}, nil diff --git a/internal/pkg/core/deployer/providers/azure-keyvault/azure_keyvault.go b/internal/pkg/core/deployer/providers/azure-keyvault/azure_keyvault.go index 60bec745..b1f21fdc 100644 --- a/internal/pkg/core/deployer/providers/azure-keyvault/azure_keyvault.go +++ b/internal/pkg/core/deployer/providers/azure-keyvault/azure_keyvault.go @@ -12,7 +12,6 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/azidentity" "github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azcertificates" - xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" "github.com/usual2970/certimate/internal/pkg/core/uploader" @@ -53,7 +52,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { client, err := createSdkClient(config.TenantId, config.ClientId, config.ClientSecret, config.CloudName, config.KeyVaultName) if err != nil { - return nil, xerrors.Wrap(err, "failed to create sdk client") + return nil, fmt.Errorf("failed to create sdk client: %w", err) } uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{ @@ -64,7 +63,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { KeyVaultName: config.KeyVaultName, }) if err != nil { - return nil, xerrors.Wrap(err, "failed to create ssl uploader") + return nil, fmt.Errorf("failed to create ssl uploader: %w", err) } return &DeployerProvider{ @@ -95,14 +94,14 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE // 转换证书格式 certPFX, err := certutil.TransformCertificateFromPEMToPFX(certPEM, privkeyPEM, "") if err != nil { - return nil, xerrors.Wrap(err, "failed to transform certificate from PEM to PFX") + return nil, fmt.Errorf("failed to transform certificate from PEM to PFX: %w", err) } if d.config.CertificateName == "" { // 上传证书到 KeyVault upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM) if err != nil { - return nil, xerrors.Wrap(err, "failed to upload certificate file") + return nil, fmt.Errorf("failed to upload certificate file: %w", err) } else { d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } @@ -114,7 +113,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE if err != nil { var respErr *azcore.ResponseError if !errors.As(err, &respErr) || (respErr.ErrorCode != "ResourceNotFound" && respErr.ErrorCode != "CertificateNotFound") { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'keyvault.GetCertificate'") + return nil, fmt.Errorf("failed to execute sdk request 'keyvault.GetCertificate': %w", err) } } else { oldCertX509, err := x509.ParseCertificate(getCertificateResp.CER) @@ -142,7 +141,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE importCertificateResp, err := d.sdkClient.ImportCertificate(context.TODO(), d.config.CertificateName, importCertificateParams, nil) d.logger.Debug("sdk request 'keyvault.ImportCertificate'", slog.String("request.certificateName", d.config.CertificateName), slog.Any("request.parameters", importCertificateParams), slog.Any("response", importCertificateResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'keyvault.ImportCertificate'") + return nil, fmt.Errorf("failed to execute sdk request 'keyvault.ImportCertificate': %w", err) } } diff --git a/internal/pkg/core/deployer/providers/baiducloud-appblb/baiducloud_appblb.go b/internal/pkg/core/deployer/providers/baiducloud-appblb/baiducloud_appblb.go index d3a8e3a2..90084f6b 100644 --- a/internal/pkg/core/deployer/providers/baiducloud-appblb/baiducloud_appblb.go +++ b/internal/pkg/core/deployer/providers/baiducloud-appblb/baiducloud_appblb.go @@ -10,7 +10,6 @@ import ( bceappblb "github.com/baidubce/bce-sdk-go/services/appblb" "github.com/google/uuid" - xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" "github.com/usual2970/certimate/internal/pkg/core/uploader" @@ -54,7 +53,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { client, err := createSdkClient(config.AccessKeyId, config.SecretAccessKey, config.Region) if err != nil { - return nil, xerrors.Wrap(err, "failed to create sdk client") + return nil, fmt.Errorf("failed to create sdk client: %w", err) } uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{ @@ -62,7 +61,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { SecretAccessKey: config.SecretAccessKey, }) if err != nil { - return nil, xerrors.Wrap(err, "failed to create ssl uploader") + return nil, fmt.Errorf("failed to create ssl uploader: %w", err) } return &DeployerProvider{ @@ -86,7 +85,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE // 上传证书到 CAS upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM) if err != nil { - return nil, xerrors.Wrap(err, "failed to upload certificate file") + return nil, fmt.Errorf("failed to upload certificate file: %w", err) } else { d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } @@ -104,7 +103,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE } default: - return nil, fmt.Errorf("unsupported resource type: %s", d.config.ResourceType) + return nil, fmt.Errorf("unsupported resource type '%s'", d.config.ResourceType) } return &deployer.DeployResult{}, nil @@ -120,7 +119,7 @@ func (d *DeployerProvider) deployToLoadbalancer(ctx context.Context, cloudCertId describeLoadBalancerDetailResp, err := d.sdkClient.DescribeLoadBalancerDetail(d.config.LoadbalancerId) d.logger.Debug("sdk request 'appblb.DescribeLoadBalancerAttribute'", slog.String("blbId", d.config.LoadbalancerId), slog.Any("response", describeLoadBalancerDetailResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'appblb.DescribeLoadBalancerDetail'") + return fmt.Errorf("failed to execute sdk request 'appblb.DescribeLoadBalancerDetail': %w", err) } // 获取全部 HTTPS/SSL 监听端口 @@ -182,7 +181,7 @@ func (d *DeployerProvider) deployToListener(ctx context.Context, cloudCertId str describeAppAllListenersResp, err := d.sdkClient.DescribeAppAllListeners(d.config.LoadbalancerId, describeAppAllListenersRequest) d.logger.Debug("sdk request 'appblb.DescribeAppAllListeners'", slog.String("blbId", d.config.LoadbalancerId), slog.Any("request", describeAppAllListenersRequest), slog.Any("response", describeAppAllListenersResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'appblb.DescribeAppAllListeners'") + return fmt.Errorf("failed to execute sdk request 'appblb.DescribeAppAllListeners': %w", err) } // 获取全部 HTTPS/SSL 监听端口 @@ -230,7 +229,7 @@ func (d *DeployerProvider) updateListenerCertificate(ctx context.Context, cloudL case "SSL": return d.updateSslListenerCertificate(ctx, cloudLoadbalancerId, cloudListenerPort, cloudCertId) default: - return fmt.Errorf("unsupported listener type: %s", cloudListenerType) + return fmt.Errorf("unsupported listener type '%s'", cloudListenerType) } } @@ -244,7 +243,7 @@ func (d *DeployerProvider) updateHttpsListenerCertificate(ctx context.Context, c describeAppHTTPSListenersResp, err := d.sdkClient.DescribeAppHTTPSListeners(cloudLoadbalancerId, describeAppHTTPSListenersReq) d.logger.Debug("sdk request 'appblb.DescribeAppHTTPSListeners'", slog.String("blbId", cloudLoadbalancerId), slog.Any("request", describeAppHTTPSListenersReq), slog.Any("response", describeAppHTTPSListenersResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'appblb.DescribeAppHTTPSListeners'") + return fmt.Errorf("failed to execute sdk request 'appblb.DescribeAppHTTPSListeners': %w", err) } else if len(describeAppHTTPSListenersResp.ListenerList) == 0 { return fmt.Errorf("listener %s:%d not found", cloudLoadbalancerId, cloudHttpsListenerPort) } @@ -262,7 +261,7 @@ func (d *DeployerProvider) updateHttpsListenerCertificate(ctx context.Context, c err := d.sdkClient.UpdateAppHTTPSListener(cloudLoadbalancerId, updateAppHTTPSListenerReq) d.logger.Debug("sdk request 'appblb.UpdateAppHTTPSListener'", slog.Any("request", updateAppHTTPSListenerReq)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'appblb.UpdateAppHTTPSListener'") + return fmt.Errorf("failed to execute sdk request 'appblb.UpdateAppHTTPSListener': %w", err) } } else { // 指定 SNI，需部署到扩展域名 @@ -289,7 +288,7 @@ func (d *DeployerProvider) updateHttpsListenerCertificate(ctx context.Context, c err := d.sdkClient.UpdateAppHTTPSListener(cloudLoadbalancerId, updateAppHTTPSListenerReq) d.logger.Debug("sdk request 'appblb.UpdateAppHTTPSListener'", slog.Any("request", updateAppHTTPSListenerReq)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'appblb.UpdateAppHTTPSListener'") + return fmt.Errorf("failed to execute sdk request 'appblb.UpdateAppHTTPSListener': %w", err) } } @@ -307,7 +306,7 @@ func (d *DeployerProvider) updateSslListenerCertificate(ctx context.Context, clo err := d.sdkClient.UpdateAppSSLListener(cloudLoadbalancerId, updateAppSSLListenerReq) d.logger.Debug("sdk request 'appblb.UpdateAppSSLListener'", slog.Any("request", updateAppSSLListenerReq)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'appblb.UpdateAppSSLListener'") + return fmt.Errorf("failed to execute sdk request 'appblb.UpdateAppSSLListener': %w", err) } return nil diff --git a/internal/pkg/core/deployer/providers/baiducloud-blb/baiducloud_blb.go b/internal/pkg/core/deployer/providers/baiducloud-blb/baiducloud_blb.go index fe6a4cd8..8c350492 100644 --- a/internal/pkg/core/deployer/providers/baiducloud-blb/baiducloud_blb.go +++ b/internal/pkg/core/deployer/providers/baiducloud-blb/baiducloud_blb.go @@ -10,7 +10,6 @@ import ( bceblb "github.com/baidubce/bce-sdk-go/services/blb" "github.com/google/uuid" - xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" "github.com/usual2970/certimate/internal/pkg/core/uploader" @@ -54,7 +53,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { client, err := createSdkClient(config.AccessKeyId, config.SecretAccessKey, config.Region) if err != nil { - return nil, xerrors.Wrap(err, "failed to create sdk client") + return nil, fmt.Errorf("failed to create sdk client: %w", err) } uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{ @@ -62,7 +61,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { SecretAccessKey: config.SecretAccessKey, }) if err != nil { - return nil, xerrors.Wrap(err, "failed to create ssl uploader") + return nil, fmt.Errorf("failed to create ssl uploader: %w", err) } return &DeployerProvider{ @@ -86,7 +85,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE // 上传证书到 CAS upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM) if err != nil { - return nil, xerrors.Wrap(err, "failed to upload certificate file") + return nil, fmt.Errorf("failed to upload certificate file: %w", err) } else { d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } @@ -104,7 +103,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE } default: - return nil, fmt.Errorf("unsupported resource type: %s", d.config.ResourceType) + return nil, fmt.Errorf("unsupported resource type '%s'", d.config.ResourceType) } return &deployer.DeployResult{}, nil @@ -120,7 +119,7 @@ func (d *DeployerProvider) deployToLoadbalancer(ctx context.Context, cloudCertId describeLoadBalancerDetailResp, err := d.sdkClient.DescribeLoadBalancerDetail(d.config.LoadbalancerId) d.logger.Debug("sdk request 'blb.DescribeLoadBalancerAttribute'", slog.String("blbId", d.config.LoadbalancerId), slog.Any("response", describeLoadBalancerDetailResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'blb.DescribeLoadBalancerDetail'") + return fmt.Errorf("failed to execute sdk request 'blb.DescribeLoadBalancerDetail': %w", err) } // 获取全部 HTTPS/SSL 监听端口 @@ -182,7 +181,7 @@ func (d *DeployerProvider) deployToListener(ctx context.Context, cloudCertId str describeAllListenersResp, err := d.sdkClient.DescribeAllListeners(d.config.LoadbalancerId, describeAllListenersRequest) d.logger.Debug("sdk request 'blb.DescribeAllListeners'", slog.String("blbId", d.config.LoadbalancerId), slog.Any("request", describeAllListenersRequest), slog.Any("response", describeAllListenersResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'blb.DescribeAllListeners'") + return fmt.Errorf("failed to execute sdk request 'blb.DescribeAllListeners': %w", err) } // 获取全部 HTTPS/SSL 监听端口 @@ -230,7 +229,7 @@ func (d *DeployerProvider) updateListenerCertificate(ctx context.Context, cloudL case "SSL": return d.updateSslListenerCertificate(ctx, cloudLoadbalancerId, cloudListenerPort, cloudCertId) default: - return fmt.Errorf("unsupported listener type: %s", cloudListenerType) + return fmt.Errorf("unsupported listener type '%s'", cloudListenerType) } } @@ -244,7 +243,7 @@ func (d *DeployerProvider) updateHttpsListenerCertificate(ctx context.Context, c describeHTTPSListenersResp, err := d.sdkClient.DescribeHTTPSListeners(cloudLoadbalancerId, describeHTTPSListenersReq) d.logger.Debug("sdk request 'blb.DescribeHTTPSListeners'", slog.String("blbId", cloudLoadbalancerId), slog.Any("request", describeHTTPSListenersReq), slog.Any("response", describeHTTPSListenersResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'blb.DescribeHTTPSListeners'") + return fmt.Errorf("failed to execute sdk request 'blb.DescribeHTTPSListeners': %w", err) } else if len(describeHTTPSListenersResp.ListenerList) == 0 { return fmt.Errorf("listener %s:%d not found", cloudLoadbalancerId, cloudHttpsListenerPort) } @@ -262,7 +261,7 @@ func (d *DeployerProvider) updateHttpsListenerCertificate(ctx context.Context, c err := d.sdkClient.UpdateHTTPSListener(cloudLoadbalancerId, updateHTTPSListenerReq) d.logger.Debug("sdk request 'blb.UpdateHTTPSListener'", slog.Any("request", updateHTTPSListenerReq)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'blb.UpdateHTTPSListener'") + return fmt.Errorf("failed to execute sdk request 'blb.UpdateHTTPSListener': %w", err) } } else { // 指定 SNI，需部署到扩展域名 @@ -289,7 +288,7 @@ func (d *DeployerProvider) updateHttpsListenerCertificate(ctx context.Context, c err := d.sdkClient.UpdateHTTPSListener(cloudLoadbalancerId, updateHTTPSListenerReq) d.logger.Debug("sdk request 'blb.UpdateHTTPSListener'", slog.Any("request", updateHTTPSListenerReq)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'blb.UpdateHTTPSListener'") + return fmt.Errorf("failed to execute sdk request 'blb.UpdateHTTPSListener': %w", err) } } @@ -307,7 +306,7 @@ func (d *DeployerProvider) updateSslListenerCertificate(ctx context.Context, clo err := d.sdkClient.UpdateSSLListener(cloudLoadbalancerId, updateSSLListenerReq) d.logger.Debug("sdk request 'blb.UpdateSSLListener'", slog.Any("request", updateSSLListenerReq)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'blb.UpdateSSLListener'") + return fmt.Errorf("failed to execute sdk request 'blb.UpdateSSLListener': %w", err) } return nil diff --git a/internal/pkg/core/deployer/providers/baiducloud-cdn/baiducloud_cdn.go b/internal/pkg/core/deployer/providers/baiducloud-cdn/baiducloud_cdn.go index 35eb084e..7ef78fb1 100644 --- a/internal/pkg/core/deployer/providers/baiducloud-cdn/baiducloud_cdn.go +++ b/internal/pkg/core/deployer/providers/baiducloud-cdn/baiducloud_cdn.go @@ -8,7 +8,6 @@ import ( bcecdn "github.com/baidubce/bce-sdk-go/services/cdn" bcecdnapi "github.com/baidubce/bce-sdk-go/services/cdn/api" - xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" ) @@ -37,7 +36,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { client, err := createSdkClient(config.AccessKeyId, config.SecretAccessKey) 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 &DeployerProvider{ @@ -70,7 +69,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE ) d.logger.Debug("sdk request 'cdn.PutCert'", slog.String("request.domain", d.config.Domain), slog.Any("response", putCertResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'cdn.PutCert'") + return nil, fmt.Errorf("failed to execute sdk request 'cdn.PutCert': %w", err) } return &deployer.DeployResult{}, nil diff --git a/internal/pkg/core/deployer/providers/baiducloud-cert/baiducloud_cert.go b/internal/pkg/core/deployer/providers/baiducloud-cert/baiducloud_cert.go index 5b754a8a..200d34ec 100644 --- a/internal/pkg/core/deployer/providers/baiducloud-cert/baiducloud_cert.go +++ b/internal/pkg/core/deployer/providers/baiducloud-cert/baiducloud_cert.go @@ -2,10 +2,9 @@ package baiducloudcert import ( "context" + "fmt" "log/slog" - xerrors "github.com/pkg/errors" - "github.com/usual2970/certimate/internal/pkg/core/deployer" "github.com/usual2970/certimate/internal/pkg/core/uploader" uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/baiducloud-cert" @@ -36,7 +35,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { SecretAccessKey: config.SecretAccessKey, }) if err != nil { - return nil, xerrors.Wrap(err, "failed to create ssl uploader") + return nil, fmt.Errorf("failed to create ssl uploader: %w", err) } return &DeployerProvider{ @@ -59,7 +58,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE // 上传证书到 CAS upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM) if err != nil { - return nil, xerrors.Wrap(err, "failed to upload certificate file") + return nil, fmt.Errorf("failed to upload certificate file: %w", err) } else { d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } diff --git a/internal/pkg/core/deployer/providers/baishan-cdn/baishan_cdn.go b/internal/pkg/core/deployer/providers/baishan-cdn/baishan_cdn.go index cdf1e8df..95c0f9f4 100644 --- a/internal/pkg/core/deployer/providers/baishan-cdn/baishan_cdn.go +++ b/internal/pkg/core/deployer/providers/baishan-cdn/baishan_cdn.go @@ -10,8 +10,6 @@ import ( "strings" "time" - xerrors "github.com/pkg/errors" - "github.com/usual2970/certimate/internal/pkg/core/deployer" bssdk "github.com/usual2970/certimate/internal/pkg/sdk3rd/baishan" ) @@ -41,7 +39,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { client, err := createSdkClient(config.ApiToken) 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 &DeployerProvider{ @@ -86,7 +84,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE } if certificateId == "" { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'baishan.CreateCertificate'") + return nil, fmt.Errorf("failed to execute sdk request 'baishan.CreateCertificate': %w", err) } } else { certificateId = createCertificateResp.Data.CertId.String() @@ -101,7 +99,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE getDomainConfigResp, err := d.sdkClient.GetDomainConfig(getDomainConfigReq) d.logger.Debug("sdk request 'baishan.GetDomainConfig'", slog.Any("request", getDomainConfigReq), slog.Any("response", getDomainConfigResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'baishan.GetDomainConfig'") + return nil, fmt.Errorf("failed to execute sdk request 'baishan.GetDomainConfig': %w", err) } else if len(getDomainConfigResp.Data) == 0 { return nil, errors.New("domain config not found") } @@ -122,7 +120,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE setDomainConfigResp, err := d.sdkClient.SetDomainConfig(setDomainConfigReq) d.logger.Debug("sdk request 'baishan.SetDomainConfig'", slog.Any("request", setDomainConfigReq), slog.Any("response", setDomainConfigResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'baishan.SetDomainConfig'") + return nil, fmt.Errorf("failed to execute sdk request 'baishan.SetDomainConfig': %w", err) } } else { // 替换证书 @@ -136,7 +134,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE createCertificateResp, err := d.sdkClient.CreateCertificate(createCertificateReq) d.logger.Debug("sdk request 'baishan.CreateCertificate'", slog.Any("request", createCertificateReq), slog.Any("response", createCertificateResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'baishan.CreateCertificate'") + return nil, fmt.Errorf("failed to execute sdk request 'baishan.CreateCertificate': %w", err) } } diff --git a/internal/pkg/core/deployer/providers/baotapanel-console/baotapanel_console.go b/internal/pkg/core/deployer/providers/baotapanel-console/baotapanel_console.go index f6f7aa19..34df198f 100644 --- a/internal/pkg/core/deployer/providers/baotapanel-console/baotapanel_console.go +++ b/internal/pkg/core/deployer/providers/baotapanel-console/baotapanel_console.go @@ -4,11 +4,10 @@ import ( "context" "crypto/tls" "errors" + "fmt" "log/slog" "net/url" - xerrors "github.com/pkg/errors" - "github.com/usual2970/certimate/internal/pkg/core/deployer" btsdk "github.com/usual2970/certimate/internal/pkg/sdk3rd/btpanel" ) @@ -39,7 +38,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { client, err := createSdkClient(config.ApiUrl, config.ApiKey, config.AllowInsecureConnections) 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 &DeployerProvider{ @@ -67,7 +66,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE configSavePanelSSLResp, err := d.sdkClient.ConfigSavePanelSSL(configSavePanelSSLReq) d.logger.Debug("sdk request 'bt.ConfigSavePanelSSL'", slog.Any("request", configSavePanelSSLReq), slog.Any("response", configSavePanelSSLResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'bt.ConfigSavePanelSSL'") + return nil, fmt.Errorf("failed to execute sdk request 'bt.ConfigSavePanelSSL': %w", err) } if d.config.AutoRestart { diff --git a/internal/pkg/core/deployer/providers/baotapanel-site/baotapanel_site.go b/internal/pkg/core/deployer/providers/baotapanel-site/baotapanel_site.go index bd806a95..a06d32fe 100644 --- a/internal/pkg/core/deployer/providers/baotapanel-site/baotapanel_site.go +++ b/internal/pkg/core/deployer/providers/baotapanel-site/baotapanel_site.go @@ -8,8 +8,6 @@ import ( "log/slog" "net/url" - xerrors "github.com/pkg/errors" - "github.com/usual2970/certimate/internal/pkg/core/deployer" btsdk "github.com/usual2970/certimate/internal/pkg/sdk3rd/btpanel" sliceutil "github.com/usual2970/certimate/internal/pkg/utils/slice" @@ -45,7 +43,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { client, err := createSdkClient(config.ApiUrl, config.ApiKey, config.AllowInsecureConnections) 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 &DeployerProvider{ @@ -82,7 +80,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE siteSetSSLResp, err := d.sdkClient.SiteSetSSL(siteSetSSLReq) d.logger.Debug("sdk request 'bt.SiteSetSSL'", slog.Any("request", siteSetSSLReq), slog.Any("response", siteSetSSLResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'bt.SiteSetSSL'") + return nil, fmt.Errorf("failed to execute sdk request 'bt.SiteSetSSL': %w", err) } } @@ -100,7 +98,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE sslCertSaveCertResp, err := d.sdkClient.SSLCertSaveCert(sslCertSaveCertReq) d.logger.Debug("sdk request 'bt.SSLCertSaveCert'", slog.Any("request", sslCertSaveCertReq), slog.Any("response", sslCertSaveCertResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'bt.SSLCertSaveCert'") + return nil, fmt.Errorf("failed to execute sdk request 'bt.SSLCertSaveCert': %w", err) } // 设置站点证书 @@ -115,12 +113,12 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE sslSetBatchCertToSiteResp, err := d.sdkClient.SSLSetBatchCertToSite(sslSetBatchCertToSiteReq) d.logger.Debug("sdk request 'bt.SSLSetBatchCertToSite'", slog.Any("request", sslSetBatchCertToSiteReq), slog.Any("response", sslSetBatchCertToSiteResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'bt.SSLSetBatchCertToSite'") + return nil, fmt.Errorf("failed to execute sdk request 'bt.SSLSetBatchCertToSite': %w", err) } } default: - return nil, fmt.Errorf("unsupported site type: %s", d.config.SiteType) + return nil, fmt.Errorf("unsupported site type '%s'", d.config.SiteType) } return &deployer.DeployResult{}, nil diff --git a/internal/pkg/core/deployer/providers/bunny-cdn/bunny_cdn.go b/internal/pkg/core/deployer/providers/bunny-cdn/bunny_cdn.go index f60b7db8..e2bfd696 100644 --- a/internal/pkg/core/deployer/providers/bunny-cdn/bunny_cdn.go +++ b/internal/pkg/core/deployer/providers/bunny-cdn/bunny_cdn.go @@ -3,10 +3,9 @@ package bunnycdn import ( "context" "encoding/base64" + "fmt" "log/slog" - xerrors "github.com/pkg/errors" - "github.com/usual2970/certimate/internal/pkg/core/deployer" bunnysdk "github.com/usual2970/certimate/internal/pkg/sdk3rd/bunny" ) @@ -60,7 +59,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE createCertificateResp, err := d.sdkClient.AddCustomCertificate(createCertificateReq) d.logger.Debug("sdk request 'bunny.AddCustomCertificate'", slog.Any("request", createCertificateReq), slog.Any("response", createCertificateResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'bunny.AddCustomCertificate'") + return nil, fmt.Errorf("failed to execute sdk request 'bunny.AddCustomCertificate': %w", err) } return &deployer.DeployResult{}, nil diff --git a/internal/pkg/core/deployer/providers/byteplus-cdn/byteplus_cdn.go b/internal/pkg/core/deployer/providers/byteplus-cdn/byteplus_cdn.go index 8ffe1236..d74f6c60 100644 --- a/internal/pkg/core/deployer/providers/byteplus-cdn/byteplus_cdn.go +++ b/internal/pkg/core/deployer/providers/byteplus-cdn/byteplus_cdn.go @@ -3,11 +3,11 @@ package bytepluscdn import ( "context" "errors" + "fmt" "log/slog" "strings" bpcdn "github.com/byteplus-sdk/byteplus-sdk-golang/service/cdn" - xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" "github.com/usual2970/certimate/internal/pkg/core/uploader" @@ -46,7 +46,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { SecretKey: config.SecretKey, }) if err != nil { - return nil, xerrors.Wrap(err, "failed to create ssl uploader") + return nil, fmt.Errorf("failed to create ssl uploader: %w", err) } return &DeployerProvider{ @@ -71,7 +71,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE // 上传证书到 CDN upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM) if err != nil { - return nil, xerrors.Wrap(err, "failed to upload certificate file") + return nil, fmt.Errorf("failed to upload certificate file: %w", err) } else { d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } @@ -86,7 +86,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE describeCertConfigResp, err := d.sdkClient.DescribeCertConfig(describeCertConfigReq) d.logger.Debug("sdk request 'cdn.DescribeCertConfig'", slog.Any("request", describeCertConfigReq), slog.Any("response", describeCertConfigResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'cdn.DescribeCertConfig'") + return nil, fmt.Errorf("failed to execute sdk request 'cdn.DescribeCertConfig': %w", err) } if describeCertConfigResp.Result.CertNotConfig != nil { diff --git a/internal/pkg/core/deployer/providers/cachefly/cachefly.go b/internal/pkg/core/deployer/providers/cachefly/cachefly.go index ff10166a..e3e819d7 100644 --- a/internal/pkg/core/deployer/providers/cachefly/cachefly.go +++ b/internal/pkg/core/deployer/providers/cachefly/cachefly.go @@ -3,10 +3,9 @@ package cachefly import ( "context" "errors" + "fmt" "log/slog" - xerrors "github.com/pkg/errors" - "github.com/usual2970/certimate/internal/pkg/core/deployer" cfsdk "github.com/usual2970/certimate/internal/pkg/sdk3rd/cachefly" ) @@ -31,7 +30,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { client, err := createSdkClient(config.ApiToken) 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 &DeployerProvider{ @@ -59,7 +58,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE createCertificateResp, err := d.sdkClient.CreateCertificate(createCertificateReq) d.logger.Debug("sdk request 'cachefly.CreateCertificate'", slog.Any("request", createCertificateReq), slog.Any("response", createCertificateResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'cachefly.CreateCertificate'") + return nil, fmt.Errorf("failed to execute sdk request 'cachefly.CreateCertificate': %w", err) } return &deployer.DeployResult{}, nil diff --git a/internal/pkg/core/deployer/providers/cdnfly/cdnfly.go b/internal/pkg/core/deployer/providers/cdnfly/cdnfly.go index 3c5f2b72..788d18d5 100644 --- a/internal/pkg/core/deployer/providers/cdnfly/cdnfly.go +++ b/internal/pkg/core/deployer/providers/cdnfly/cdnfly.go @@ -9,8 +9,6 @@ import ( "net/url" "time" - xerrors "github.com/pkg/errors" - "github.com/usual2970/certimate/internal/pkg/core/deployer" cfsdk "github.com/usual2970/certimate/internal/pkg/sdk3rd/cdnfly" ) @@ -47,7 +45,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { client, err := createSdkClient(config.ApiUrl, config.ApiKey, config.ApiSecret) 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 &DeployerProvider{ @@ -80,7 +78,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE } default: - return nil, fmt.Errorf("unsupported resource type: %s", d.config.ResourceType) + return nil, fmt.Errorf("unsupported resource type '%s'", d.config.ResourceType) } return &deployer.DeployResult{}, nil @@ -99,7 +97,7 @@ func (d *DeployerProvider) deployToSite(ctx context.Context, certPEM string, pri getSiteResp, err := d.sdkClient.GetSite(getSiteReq) d.logger.Debug("sdk request 'cdnfly.GetSite'", slog.Any("request", getSiteReq), slog.Any("response", getSiteResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'cdnfly.GetSite'") + return fmt.Errorf("failed to execute sdk request 'cdnfly.GetSite': %w", err) } // 添加单个证书 @@ -113,7 +111,7 @@ func (d *DeployerProvider) deployToSite(ctx context.Context, certPEM string, pri createCertificateResp, err := d.sdkClient.CreateCertificate(createCertificateReq) d.logger.Debug("sdk request 'cdnfly.CreateCertificate'", slog.Any("request", createCertificateReq), slog.Any("response", createCertificateResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'cdnfly.CreateCertificate'") + return fmt.Errorf("failed to execute sdk request 'cdnfly.CreateCertificate': %w", err) } // 修改单个网站 @@ -130,7 +128,7 @@ func (d *DeployerProvider) deployToSite(ctx context.Context, certPEM string, pri updateSiteResp, err := d.sdkClient.UpdateSite(updateSiteReq) d.logger.Debug("sdk request 'cdnfly.UpdateSite'", slog.Any("request", updateSiteReq), slog.Any("response", updateSiteResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'cdnfly.UpdateSite'") + return fmt.Errorf("failed to execute sdk request 'cdnfly.UpdateSite': %w", err) } return nil @@ -153,7 +151,7 @@ func (d *DeployerProvider) deployToCertificate(ctx context.Context, certPEM stri updateCertificateResp, err := d.sdkClient.UpdateCertificate(updateCertificateReq) d.logger.Debug("sdk request 'cdnfly.UpdateCertificate'", slog.Any("request", updateCertificateReq), slog.Any("response", updateCertificateResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'cdnfly.UpdateCertificate'") + return fmt.Errorf("failed to execute sdk request 'cdnfly.UpdateCertificate': %w", err) } return nil diff --git a/internal/pkg/core/deployer/providers/dogecloud-cdn/dogecloud_cdn.go b/internal/pkg/core/deployer/providers/dogecloud-cdn/dogecloud_cdn.go index aba4e697..efcf4b7c 100644 --- a/internal/pkg/core/deployer/providers/dogecloud-cdn/dogecloud_cdn.go +++ b/internal/pkg/core/deployer/providers/dogecloud-cdn/dogecloud_cdn.go @@ -2,11 +2,10 @@ package dogecloudcdn import ( "context" + "fmt" "log/slog" "strconv" - xerrors "github.com/pkg/errors" - "github.com/usual2970/certimate/internal/pkg/core/deployer" "github.com/usual2970/certimate/internal/pkg/core/uploader" uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/dogecloud" @@ -43,7 +42,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { SecretKey: config.SecretKey, }) if err != nil { - return nil, xerrors.Wrap(err, "failed to create ssl uploader") + return nil, fmt.Errorf("failed to create ssl uploader: %w", err) } return &DeployerProvider{ @@ -68,7 +67,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE // 上传证书到 CDN upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM) if err != nil { - return nil, xerrors.Wrap(err, "failed to upload certificate file") + return nil, fmt.Errorf("failed to upload certificate file: %w", err) } else { d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } @@ -79,7 +78,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE bindCdnCertResp, err := d.sdkClient.BindCdnCertWithDomain(bindCdnCertId, d.config.Domain) d.logger.Debug("sdk request 'cdn.BindCdnCert'", slog.Int64("request.certId", bindCdnCertId), slog.String("request.domain", d.config.Domain), slog.Any("response", bindCdnCertResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'cdn.BindCdnCert'") + return nil, fmt.Errorf("failed to execute sdk request 'cdn.BindCdnCert': %w", err) } return &deployer.DeployResult{}, nil diff --git a/internal/pkg/core/deployer/providers/edgio-applications/edgio_applications.go b/internal/pkg/core/deployer/providers/edgio-applications/edgio_applications.go index 8a02e6fc..3dd202a3 100644 --- a/internal/pkg/core/deployer/providers/edgio-applications/edgio_applications.go +++ b/internal/pkg/core/deployer/providers/edgio-applications/edgio_applications.go @@ -2,11 +2,11 @@ package edgioapplications import ( "context" + "fmt" "log/slog" edgio "github.com/Edgio/edgio-api/applications/v7" edgiodtos "github.com/Edgio/edgio-api/applications/v7/dtos" - xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" certutil "github.com/usual2970/certimate/internal/pkg/utils/cert" @@ -36,7 +36,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { client, err := createSdkClient(config.ClientId, config.ClientSecret) 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 &DeployerProvider{ @@ -73,7 +73,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE uploadTlsCertResp, err := d.sdkClient.UploadTlsCert(uploadTlsCertReq) d.logger.Debug("sdk request 'edgio.UploadTlsCert'", slog.Any("request", uploadTlsCertReq), slog.Any("response", uploadTlsCertResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'edgio.UploadTlsCert'") + return nil, fmt.Errorf("failed to execute sdk request 'edgio.UploadTlsCert': %w", err) } return &deployer.DeployResult{}, nil diff --git a/internal/pkg/core/deployer/providers/gcore-cdn/gcore_cdn.go b/internal/pkg/core/deployer/providers/gcore-cdn/gcore_cdn.go index ee921de9..2f36c35a 100644 --- a/internal/pkg/core/deployer/providers/gcore-cdn/gcore_cdn.go +++ b/internal/pkg/core/deployer/providers/gcore-cdn/gcore_cdn.go @@ -3,12 +3,12 @@ package gcorecdn import ( "context" "errors" + "fmt" "log/slog" "strconv" gprovider "github.com/G-Core/gcorelabscdn-go/gcore/provider" gresources "github.com/G-Core/gcorelabscdn-go/resources" - xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" "github.com/usual2970/certimate/internal/pkg/core/uploader" @@ -39,14 +39,14 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { client, err := createSdkClient(config.ApiToken) if err != nil { - return nil, xerrors.Wrap(err, "failed to create sdk client") + return nil, fmt.Errorf("failed to create sdk client: %w", err) } uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{ ApiToken: config.ApiToken, }) if err != nil { - return nil, xerrors.Wrap(err, "failed to create ssl uploader") + return nil, fmt.Errorf("failed to create ssl uploader: %w", err) } return &DeployerProvider{ @@ -75,7 +75,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE // 上传证书到 CDN upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM) if err != nil { - return nil, xerrors.Wrap(err, "failed to upload certificate file") + return nil, fmt.Errorf("failed to upload certificate file: %w", err) } else { d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } @@ -85,7 +85,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE getResourceResp, err := d.sdkClient.Get(context.TODO(), d.config.ResourceId) d.logger.Debug("sdk request 'resources.Get'", slog.Any("resourceId", d.config.ResourceId), slog.Any("response", getResourceResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'resources.Get'") + return nil, fmt.Errorf("failed to execute sdk request 'resources.Get': %w", err) } // 更新 CDN 资源详情 @@ -113,7 +113,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE updateResourceResp, err := d.sdkClient.Update(context.TODO(), d.config.ResourceId, updateResourceReq) d.logger.Debug("sdk request 'resources.Update'", slog.Int64("resourceId", d.config.ResourceId), slog.Any("request", updateResourceReq), slog.Any("response", updateResourceResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'resources.Update'") + return nil, fmt.Errorf("failed to execute sdk request 'resources.Update': %w", err) } return &deployer.DeployResult{}, nil diff --git a/internal/pkg/core/deployer/providers/huaweicloud-cdn/huaweicloud_cdn.go b/internal/pkg/core/deployer/providers/huaweicloud-cdn/huaweicloud_cdn.go index 94df8cf9..d33dafff 100644 --- a/internal/pkg/core/deployer/providers/huaweicloud-cdn/huaweicloud_cdn.go +++ b/internal/pkg/core/deployer/providers/huaweicloud-cdn/huaweicloud_cdn.go @@ -2,13 +2,13 @@ package huaweicloudcdn import ( "context" + "fmt" "log/slog" "github.com/huaweicloud/huaweicloud-sdk-go-v3/core/auth/global" hccdn "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/cdn/v2" hccdnmodel "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/cdn/v2/model" hccdnregion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/cdn/v2/region" - xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" "github.com/usual2970/certimate/internal/pkg/core/uploader" @@ -47,7 +47,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { config.Region, ) if err != nil { - return nil, xerrors.Wrap(err, "failed to create sdk client") + return nil, fmt.Errorf("failed to create sdk client: %w", err) } uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{ @@ -55,7 +55,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { SecretAccessKey: config.SecretAccessKey, }) if err != nil { - return nil, xerrors.Wrap(err, "failed to create ssl uploader") + return nil, fmt.Errorf("failed to create ssl uploader: %w", err) } return &DeployerProvider{ @@ -80,7 +80,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE // 上传证书到 SCM upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM) if err != nil { - return nil, xerrors.Wrap(err, "failed to upload certificate file") + return nil, fmt.Errorf("failed to upload certificate file: %w", err) } else { d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } @@ -93,7 +93,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE showDomainFullConfigResp, err := d.sdkClient.ShowDomainFullConfig(showDomainFullConfigReq) d.logger.Debug("sdk request 'cdn.ShowDomainFullConfig'", slog.Any("request", showDomainFullConfigReq), slog.Any("response", showDomainFullConfigResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'cdn.ShowDomainFullConfig'") + return nil, fmt.Errorf("failed to execute sdk request 'cdn.ShowDomainFullConfig': %w", err) } // 更新加速域名配置 @@ -114,7 +114,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE updateDomainMultiCertificatesResp, err := d.sdkClient.UpdateDomainMultiCertificates(updateDomainMultiCertificatesReq) d.logger.Debug("sdk request 'cdn.UploadDomainMultiCertificates'", slog.Any("request", updateDomainMultiCertificatesReq), slog.Any("response", updateDomainMultiCertificatesResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'cdn.UploadDomainMultiCertificates'") + return nil, fmt.Errorf("failed to execute sdk request 'cdn.UploadDomainMultiCertificates': %w", err) } return &deployer.DeployResult{}, nil diff --git a/internal/pkg/core/deployer/providers/huaweicloud-elb/huaweicloud_elb.go b/internal/pkg/core/deployer/providers/huaweicloud-elb/huaweicloud_elb.go index 8a1f068c..f0c8175e 100644 --- a/internal/pkg/core/deployer/providers/huaweicloud-elb/huaweicloud_elb.go +++ b/internal/pkg/core/deployer/providers/huaweicloud-elb/huaweicloud_elb.go @@ -14,7 +14,6 @@ import ( hciam "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/iam/v3" hciammodel "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/iam/v3/model" hciamregion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/iam/v3/region" - xerrors "github.com/pkg/errors" "golang.org/x/exp/slices" "github.com/usual2970/certimate/internal/pkg/core/deployer" @@ -59,7 +58,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { client, err := createSdkClient(config.AccessKeyId, config.SecretAccessKey, config.Region) if err != nil { - return nil, xerrors.Wrap(err, "failed to create sdk client") + return nil, fmt.Errorf("failed to create sdk client: %w", err) } uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{ @@ -68,7 +67,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { Region: config.Region, }) if err != nil { - return nil, xerrors.Wrap(err, "failed to create ssl uploader") + return nil, fmt.Errorf("failed to create ssl uploader: %w", err) } return &DeployerProvider{ @@ -108,7 +107,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE } default: - return nil, fmt.Errorf("unsupported resource type: %s", d.config.ResourceType) + return nil, fmt.Errorf("unsupported resource type '%s'", d.config.ResourceType) } return &deployer.DeployResult{}, nil @@ -133,7 +132,7 @@ func (d *DeployerProvider) deployToCertificate(ctx context.Context, certPEM stri updateCertificateResp, err := d.sdkClient.UpdateCertificate(updateCertificateReq) d.logger.Debug("sdk request 'elb.UpdateCertificate'", slog.Any("request", updateCertificateReq), slog.Any("response", updateCertificateResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'elb.UpdateCertificate'") + return fmt.Errorf("failed to execute sdk request 'elb.UpdateCertificate': %w", err) } return nil @@ -152,7 +151,7 @@ func (d *DeployerProvider) deployToLoadbalancer(ctx context.Context, certPEM str showLoadBalancerResp, err := d.sdkClient.ShowLoadBalancer(showLoadBalancerReq) d.logger.Debug("sdk request 'elb.ShowLoadBalancer'", slog.Any("request", showLoadBalancerReq), slog.Any("response", showLoadBalancerResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'elb.ShowLoadBalancer'") + return fmt.Errorf("failed to execute sdk request 'elb.ShowLoadBalancer': %w", err) } // 查询监听器列表 @@ -170,7 +169,7 @@ func (d *DeployerProvider) deployToLoadbalancer(ctx context.Context, certPEM str listListenersResp, err := d.sdkClient.ListListeners(listListenersReq) d.logger.Debug("sdk request 'elb.ListListeners'", slog.Any("request", listListenersReq), slog.Any("response", listListenersResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'elb.ListListeners'") + return fmt.Errorf("failed to execute sdk request 'elb.ListListeners': %w", err) } if listListenersResp.Listeners != nil { @@ -189,7 +188,7 @@ func (d *DeployerProvider) deployToLoadbalancer(ctx context.Context, certPEM str // 上传证书到 SCM upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM) if err != nil { - return xerrors.Wrap(err, "failed to upload certificate file") + return fmt.Errorf("failed to upload certificate file: %w", err) } else { d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } @@ -223,7 +222,7 @@ func (d *DeployerProvider) deployToListener(ctx context.Context, certPEM string, // 上传证书到 SCM upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM) if err != nil { - return xerrors.Wrap(err, "failed to upload certificate file") + return fmt.Errorf("failed to upload certificate file: %w", err) } else { d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } @@ -245,7 +244,7 @@ func (d *DeployerProvider) modifyListenerCertificate(ctx context.Context, cloudL showListenerResp, err := d.sdkClient.ShowListener(showListenerReq) d.logger.Debug("sdk request 'elb.ShowListener'", slog.Any("request", showListenerReq), slog.Any("response", showListenerResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'elb.ShowListener'") + return fmt.Errorf("failed to execute sdk request 'elb.ShowListener': %w", err) } // 更新监听器 @@ -270,7 +269,7 @@ func (d *DeployerProvider) modifyListenerCertificate(ctx context.Context, cloudL listOldCertificateResp, err := d.sdkClient.ListCertificates(listOldCertificateReq) d.logger.Debug("sdk request 'elb.ListCertificates'", slog.Any("request", listOldCertificateReq), slog.Any("response", listOldCertificateResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'elb.ListCertificates'") + return fmt.Errorf("failed to execute sdk request 'elb.ListCertificates': %w", err) } showNewCertificateReq := &hcelbmodel.ShowCertificateRequest{ @@ -279,7 +278,7 @@ func (d *DeployerProvider) modifyListenerCertificate(ctx context.Context, cloudL showNewCertificateResp, err := d.sdkClient.ShowCertificate(showNewCertificateReq) d.logger.Debug("sdk request 'elb.ShowCertificate'", slog.Any("request", showNewCertificateReq), slog.Any("response", showNewCertificateResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'elb.ShowCertificate'") + return fmt.Errorf("failed to execute sdk request 'elb.ShowCertificate': %w", err) } for _, certificate := range *listOldCertificateResp.Certificates { @@ -309,7 +308,7 @@ func (d *DeployerProvider) modifyListenerCertificate(ctx context.Context, cloudL updateListenerResp, err := d.sdkClient.UpdateListener(updateListenerReq) d.logger.Debug("sdk request 'elb.UpdateListener'", slog.Any("request", updateListenerReq), slog.Any("response", updateListenerResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'elb.UpdateListener'") + return fmt.Errorf("failed to execute sdk request 'elb.UpdateListener': %w", err) } return nil diff --git a/internal/pkg/core/deployer/providers/huaweicloud-scm/huaweicloud_scm.go b/internal/pkg/core/deployer/providers/huaweicloud-scm/huaweicloud_scm.go index a514eb20..c8c208ad 100644 --- a/internal/pkg/core/deployer/providers/huaweicloud-scm/huaweicloud_scm.go +++ b/internal/pkg/core/deployer/providers/huaweicloud-scm/huaweicloud_scm.go @@ -2,10 +2,9 @@ package huaweicloudscm import ( "context" + "fmt" "log/slog" - xerrors "github.com/pkg/errors" - "github.com/usual2970/certimate/internal/pkg/core/deployer" "github.com/usual2970/certimate/internal/pkg/core/uploader" uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/huaweicloud-scm" @@ -36,7 +35,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { SecretAccessKey: config.SecretAccessKey, }) if err != nil { - return nil, xerrors.Wrap(err, "failed to create ssl uploader") + return nil, fmt.Errorf("failed to create ssl uploader: %w", err) } return &DeployerProvider{ @@ -60,7 +59,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE // 上传证书到 SCM upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM) if err != nil { - return nil, xerrors.Wrap(err, "failed to upload certificate file") + return nil, fmt.Errorf("failed to upload certificate file: %w", err) } else { d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } diff --git a/internal/pkg/core/deployer/providers/huaweicloud-waf/huaweicloud_waf.go b/internal/pkg/core/deployer/providers/huaweicloud-waf/huaweicloud_waf.go index 92fffa8d..ff208fe0 100644 --- a/internal/pkg/core/deployer/providers/huaweicloud-waf/huaweicloud_waf.go +++ b/internal/pkg/core/deployer/providers/huaweicloud-waf/huaweicloud_waf.go @@ -15,7 +15,6 @@ import ( hcwaf "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/waf/v1" hcwafmodel "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/waf/v1/model" hcwafregion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/waf/v1/region" - xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" "github.com/usual2970/certimate/internal/pkg/core/uploader" @@ -56,7 +55,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { client, err := createSdkClient(config.AccessKeyId, config.SecretAccessKey, config.Region) if err != nil { - return nil, xerrors.Wrap(err, "failed to create sdk client") + return nil, fmt.Errorf("failed to create sdk client: %w", err) } uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{ @@ -65,7 +64,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { Region: config.Region, }) if err != nil { - return nil, xerrors.Wrap(err, "failed to create ssl uploader") + return nil, fmt.Errorf("failed to create ssl uploader: %w", err) } return &DeployerProvider{ @@ -90,7 +89,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE // 上传证书到 WAF upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM) if err != nil { - return nil, xerrors.Wrap(err, "failed to upload certificate file") + return nil, fmt.Errorf("failed to upload certificate file: %w", err) } else { d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } @@ -113,7 +112,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE } default: - return nil, fmt.Errorf("unsupported resource type: %s", d.config.ResourceType) + return nil, fmt.Errorf("unsupported resource type '%s'", d.config.ResourceType) } return &deployer.DeployResult{}, nil @@ -132,7 +131,7 @@ func (d *DeployerProvider) deployToCertificate(ctx context.Context, certPEM stri showCertificateResp, err := d.sdkClient.ShowCertificate(showCertificateReq) d.logger.Debug("sdk request 'waf.ShowCertificate'", slog.Any("request", showCertificateReq), slog.Any("response", showCertificateResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'waf.ShowCertificate'") + return fmt.Errorf("failed to execute sdk request 'waf.ShowCertificate': %w", err) } // 更新证书 @@ -148,7 +147,7 @@ func (d *DeployerProvider) deployToCertificate(ctx context.Context, certPEM stri updateCertificateResp, err := d.sdkClient.UpdateCertificate(updateCertificateReq) d.logger.Debug("sdk request 'waf.UpdateCertificate'", slog.Any("request", updateCertificateReq), slog.Any("response", updateCertificateResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'waf.UpdateCertificate'") + return fmt.Errorf("failed to execute sdk request 'waf.UpdateCertificate': %w", err) } return nil @@ -162,7 +161,7 @@ func (d *DeployerProvider) deployToCloudServer(ctx context.Context, certPEM stri // 上传证书到 WAF upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM) if err != nil { - return xerrors.Wrap(err, "failed to upload certificate file") + return fmt.Errorf("failed to upload certificate file: %w", err) } else { d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } @@ -181,7 +180,7 @@ func (d *DeployerProvider) deployToCloudServer(ctx context.Context, certPEM stri listHostResp, err := d.sdkClient.ListHost(listHostReq) d.logger.Debug("sdk request 'waf.ListHost'", slog.Any("request", listHostReq), slog.Any("response", listHostResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'waf.ListHost'") + return fmt.Errorf("failed to execute sdk request 'waf.ListHost': %w", err) } if listHostResp.Items != nil { @@ -215,7 +214,7 @@ func (d *DeployerProvider) deployToCloudServer(ctx context.Context, certPEM stri updateHostResp, err := d.sdkClient.UpdateHost(updateHostReq) d.logger.Debug("sdk request 'waf.UpdateHost'", slog.Any("request", updateHostReq), slog.Any("response", updateHostResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'waf.UpdateHost'") + return fmt.Errorf("failed to execute sdk request 'waf.UpdateHost': %w", err) } return nil @@ -229,7 +228,7 @@ func (d *DeployerProvider) deployToPremiumHost(ctx context.Context, certPEM stri // 上传证书到 WAF upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM) if err != nil { - return xerrors.Wrap(err, "failed to upload certificate file") + return fmt.Errorf("failed to upload certificate file: %w", err) } else { d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } @@ -248,7 +247,7 @@ func (d *DeployerProvider) deployToPremiumHost(ctx context.Context, certPEM stri listPremiumHostResp, err := d.sdkClient.ListPremiumHost(listPremiumHostReq) d.logger.Debug("sdk request 'waf.ListPremiumHost'", slog.Any("request", listPremiumHostReq), slog.Any("response", listPremiumHostResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'waf.ListPremiumHost'") + return fmt.Errorf("failed to execute sdk request 'waf.ListPremiumHost': %w", err) } if listPremiumHostResp.Items != nil { @@ -282,7 +281,7 @@ func (d *DeployerProvider) deployToPremiumHost(ctx context.Context, certPEM stri updatePremiumHostResp, err := d.sdkClient.UpdatePremiumHost(updatePremiumHostReq) d.logger.Debug("sdk request 'waf.UpdatePremiumHost'", slog.Any("request", updatePremiumHostReq), slog.Any("response", updatePremiumHostResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'waf.UpdatePremiumHost'") + return fmt.Errorf("failed to execute sdk request 'waf.UpdatePremiumHost': %w", err) } return nil diff --git a/internal/pkg/core/deployer/providers/jdcloud-alb/jdcloud_alb.go b/internal/pkg/core/deployer/providers/jdcloud-alb/jdcloud_alb.go index 5541c779..339bacc8 100644 --- a/internal/pkg/core/deployer/providers/jdcloud-alb/jdcloud_alb.go +++ b/internal/pkg/core/deployer/providers/jdcloud-alb/jdcloud_alb.go @@ -12,7 +12,6 @@ import ( jdlbapi "github.com/jdcloud-api/jdcloud-sdk-go/services/lb/apis" jdlbclient "github.com/jdcloud-api/jdcloud-sdk-go/services/lb/client" jdlbmodel "github.com/jdcloud-api/jdcloud-sdk-go/services/lb/models" - xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" "github.com/usual2970/certimate/internal/pkg/core/uploader" @@ -56,7 +55,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { client, err := createSdkClient(config.AccessKeyId, config.AccessKeySecret) if err != nil { - return nil, xerrors.Wrap(err, "failed to create sdk client") + return nil, fmt.Errorf("failed to create sdk client: %w", err) } uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{ @@ -64,7 +63,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { AccessKeySecret: config.AccessKeySecret, }) if err != nil { - return nil, xerrors.Wrap(err, "failed to create ssl uploader") + return nil, fmt.Errorf("failed to create ssl uploader: %w", err) } return &DeployerProvider{ @@ -89,7 +88,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE // 上传证书到 SSL upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM) if err != nil { - return nil, xerrors.Wrap(err, "failed to upload certificate file") + return nil, fmt.Errorf("failed to upload certificate file: %w", err) } else { d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } @@ -107,7 +106,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE } default: - return nil, fmt.Errorf("unsupported resource type: %s", d.config.ResourceType) + return nil, fmt.Errorf("unsupported resource type '%s'", d.config.ResourceType) } return &deployer.DeployResult{}, nil @@ -124,7 +123,7 @@ func (d *DeployerProvider) deployToLoadbalancer(ctx context.Context, cloudCertId describeLoadBalancerResp, err := d.sdkClient.DescribeLoadBalancer(describeLoadBalancerReq) d.logger.Debug("sdk request 'lb.DescribeLoadBalancer'", slog.Any("request", describeLoadBalancerReq), slog.Any("response", describeLoadBalancerResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'lb.DescribeLoadBalancer'") + return fmt.Errorf("failed to execute sdk request 'lb.DescribeLoadBalancer': %w", err) } // 查询监听器列表 @@ -140,7 +139,7 @@ func (d *DeployerProvider) deployToLoadbalancer(ctx context.Context, cloudCertId describeListenersResp, err := d.sdkClient.DescribeListeners(describeListenersReq) d.logger.Debug("sdk request 'lb.DescribeListeners'", slog.Any("request", describeListenersReq), slog.Any("response", describeListenersResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'lb.DescribeListeners'") + return fmt.Errorf("failed to execute sdk request 'lb.DescribeListeners': %w", err) } for _, listener := range describeListenersResp.Result.Listeners { @@ -198,7 +197,7 @@ func (d *DeployerProvider) updateListenerCertificate(ctx context.Context, cloudL describeListenerResp, err := d.sdkClient.DescribeListener(describeListenerReq) d.logger.Debug("sdk request 'lb.DescribeListener'", slog.Any("request", describeListenerReq), slog.Any("response", describeListenerResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'lb.DescribeListener'") + return fmt.Errorf("failed to execute sdk request 'lb.DescribeListener': %w", err) } if d.config.Domain == "" { @@ -211,7 +210,7 @@ func (d *DeployerProvider) updateListenerCertificate(ctx context.Context, cloudL updateListenerResp, err := d.sdkClient.UpdateListener(updateListenerReq) d.logger.Debug("sdk request 'lb.UpdateListener'", slog.Any("request", updateListenerReq), slog.Any("response", updateListenerResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'lb.UpdateListener'") + return fmt.Errorf("failed to execute sdk request 'lb.UpdateListener': %w", err) } } else { // 指定 SNI，需部署到扩展证书 @@ -239,7 +238,7 @@ func (d *DeployerProvider) updateListenerCertificate(ctx context.Context, cloudL updateListenerCertificatesResp, err := d.sdkClient.UpdateListenerCertificates(updateListenerCertificatesReq) d.logger.Debug("sdk request 'lb.UpdateListenerCertificates'", slog.Any("request", updateListenerCertificatesReq), slog.Any("response", updateListenerCertificatesResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'lb.UpdateListenerCertificates'") + return fmt.Errorf("failed to execute sdk request 'lb.UpdateListenerCertificates': %w", err) } } diff --git a/internal/pkg/core/deployer/providers/jdcloud-cdn/jdcloud_cdn.go b/internal/pkg/core/deployer/providers/jdcloud-cdn/jdcloud_cdn.go index 767153b7..10ccf19d 100644 --- a/internal/pkg/core/deployer/providers/jdcloud-cdn/jdcloud_cdn.go +++ b/internal/pkg/core/deployer/providers/jdcloud-cdn/jdcloud_cdn.go @@ -2,12 +2,12 @@ package jdcloudcdn import ( "context" + "fmt" "log/slog" jdcore "github.com/jdcloud-api/jdcloud-sdk-go/core" jdcdnapi "github.com/jdcloud-api/jdcloud-sdk-go/services/cdn/apis" jdcdnclient "github.com/jdcloud-api/jdcloud-sdk-go/services/cdn/client" - xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" "github.com/usual2970/certimate/internal/pkg/core/uploader" @@ -39,7 +39,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { client, err := createSdkClient(config.AccessKeyId, config.AccessKeySecret) if err != nil { - return nil, xerrors.Wrap(err, "failed to create sdk client") + return nil, fmt.Errorf("failed to create sdk client: %w", err) } uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{ @@ -47,7 +47,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { AccessKeySecret: config.AccessKeySecret, }) if err != nil { - return nil, xerrors.Wrap(err, "failed to create ssl uploader") + return nil, fmt.Errorf("failed to create ssl uploader: %w", err) } return &DeployerProvider{ @@ -75,13 +75,13 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE queryDomainConfigResp, err := d.sdkClient.QueryDomainConfig(queryDomainConfigReq) d.logger.Debug("sdk request 'cdn.QueryDomainConfig'", slog.Any("request", queryDomainConfigReq), slog.Any("response", queryDomainConfigResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'cdn.QueryDomainConfig'") + return nil, fmt.Errorf("failed to execute sdk request 'cdn.QueryDomainConfig': %w", err) } // 上传证书到 SSL upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM) if err != nil { - return nil, xerrors.Wrap(err, "failed to upload certificate file") + return nil, fmt.Errorf("failed to upload certificate file: %w", err) } else { d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } @@ -98,7 +98,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE setHttpTypeResp, err := d.sdkClient.SetHttpType(setHttpTypeReq) d.logger.Debug("sdk request 'cdn.QueryDomainConfig'", slog.Any("request", setHttpTypeReq), slog.Any("response", setHttpTypeResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'cdn.SetHttpType'") + return nil, fmt.Errorf("failed to execute sdk request 'cdn.SetHttpType': %w", err) } return &deployer.DeployResult{}, nil diff --git a/internal/pkg/core/deployer/providers/jdcloud-live/jdcloud_live.go b/internal/pkg/core/deployer/providers/jdcloud-live/jdcloud_live.go index 3c9d3dc7..24e5bc7a 100644 --- a/internal/pkg/core/deployer/providers/jdcloud-live/jdcloud_live.go +++ b/internal/pkg/core/deployer/providers/jdcloud-live/jdcloud_live.go @@ -2,12 +2,12 @@ package jdcloudlive import ( "context" + "fmt" "log/slog" jdcore "github.com/jdcloud-api/jdcloud-sdk-go/core" jdliveapi "github.com/jdcloud-api/jdcloud-sdk-go/services/live/apis" jdliveclient "github.com/jdcloud-api/jdcloud-sdk-go/services/live/client" - xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" ) @@ -36,7 +36,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { client, err := createSdkClient(config.AccessKeyId, config.AccessKeySecret) 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 &DeployerProvider{ @@ -64,7 +64,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE setLiveDomainCertificateResp, err := d.sdkClient.SetLiveDomainCertificate(setLiveDomainCertificateReq) d.logger.Debug("sdk request 'live.SetLiveDomainCertificate'", slog.Any("request", setLiveDomainCertificateReq), slog.Any("response", setLiveDomainCertificateResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'live.SetLiveDomainCertificate'") + return nil, fmt.Errorf("failed to execute sdk request 'live.SetLiveDomainCertificate': %w", err) } return &deployer.DeployResult{}, nil diff --git a/internal/pkg/core/deployer/providers/jdcloud-vod/jdcloud_vod.go b/internal/pkg/core/deployer/providers/jdcloud-vod/jdcloud_vod.go index 54e8fd63..61c5a6f6 100644 --- a/internal/pkg/core/deployer/providers/jdcloud-vod/jdcloud_vod.go +++ b/internal/pkg/core/deployer/providers/jdcloud-vod/jdcloud_vod.go @@ -2,6 +2,7 @@ package jdcloudvod import ( "context" + "errors" "fmt" "log/slog" "strconv" @@ -10,7 +11,6 @@ import ( jdcore "github.com/jdcloud-api/jdcloud-sdk-go/core" jdvodapi "github.com/jdcloud-api/jdcloud-sdk-go/services/vod/apis" jdvodclient "github.com/jdcloud-api/jdcloud-sdk-go/services/vod/client" - xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" ) @@ -39,7 +39,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { client, err := createSdkClient(config.AccessKeyId, config.AccessKeySecret) 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 &DeployerProvider{ @@ -71,7 +71,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE listDomainsResp, err := d.sdkClient.ListDomains(listDomainsReq) d.logger.Debug("sdk request 'vod.ListDomains'", slog.Any("request", listDomainsReq), slog.Any("response", listDomainsResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'vod.ListDomains'") + return nil, fmt.Errorf("failed to execute sdk request 'vod.ListDomains': %w", err) } for _, domain := range listDomainsResp.Result.Content { @@ -88,7 +88,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE } } if domainId == 0 { - return nil, xerrors.New("domain not found") + return nil, errors.New("domain not found") } // 查询域名 SSL 配置 @@ -97,7 +97,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE getHttpSslResp, err := d.sdkClient.GetHttpSsl(getHttpSslReq) d.logger.Debug("sdk request 'vod.GetHttpSsl'", slog.Any("request", getHttpSslReq), slog.Any("response", getHttpSslResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'vod.GetHttpSsl'") + return nil, fmt.Errorf("failed to execute sdk request 'vod.GetHttpSsl': %w", err) } // 设置域名 SSL 配置 @@ -112,7 +112,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE setHttpSslResp, err := d.sdkClient.SetHttpSsl(setHttpSslReq) d.logger.Debug("sdk request 'vod.SetHttpSsl'", slog.Any("request", setHttpSslReq), slog.Any("response", setHttpSslResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'vod.SetHttpSsl'") + return nil, fmt.Errorf("failed to execute sdk request 'vod.SetHttpSsl': %w", err) } return &deployer.DeployResult{}, nil diff --git a/internal/pkg/core/deployer/providers/k8s-secret/k8s_secret.go b/internal/pkg/core/deployer/providers/k8s-secret/k8s_secret.go index e01062a6..de2e62be 100644 --- a/internal/pkg/core/deployer/providers/k8s-secret/k8s_secret.go +++ b/internal/pkg/core/deployer/providers/k8s-secret/k8s_secret.go @@ -3,10 +3,10 @@ package k8ssecret import ( "context" "errors" + "fmt" "log/slog" "strings" - xerrors "github.com/pkg/errors" k8score "k8s.io/api/core/v1" k8smeta "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" @@ -84,7 +84,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE // 连接 client, err := createK8sClient(d.config.KubeConfig) if err != nil { - return nil, xerrors.Wrap(err, "failed to create k8s client") + return nil, fmt.Errorf("failed to create k8s client: %w", err) } var secretPayload *k8score.Secret @@ -117,7 +117,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE secretPayload, err = client.CoreV1().Secrets(d.config.Namespace).Create(context.TODO(), secretPayload, k8smeta.CreateOptions{}) d.logger.Debug("k8s operate 'Secrets.Create'", slog.String("namespace", d.config.Namespace), slog.Any("secret", secretPayload)) if err != nil { - return nil, xerrors.Wrap(err, "failed to create k8s secret") + return nil, fmt.Errorf("failed to create k8s secret: %w", err) } else { return &deployer.DeployResult{}, nil } @@ -140,7 +140,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE secretPayload, err = client.CoreV1().Secrets(d.config.Namespace).Update(context.TODO(), secretPayload, k8smeta.UpdateOptions{}) d.logger.Debug("k8s operate 'Secrets.Update'", slog.String("namespace", d.config.Namespace), slog.Any("secret", secretPayload)) if err != nil { - return nil, xerrors.Wrap(err, "failed to update k8s secret") + return nil, fmt.Errorf("failed to update k8s secret: %w", err) } return &deployer.DeployResult{}, nil diff --git a/internal/pkg/core/deployer/providers/local/local.go b/internal/pkg/core/deployer/providers/local/local.go index c4e2b115..77f96543 100644 --- a/internal/pkg/core/deployer/providers/local/local.go +++ b/internal/pkg/core/deployer/providers/local/local.go @@ -8,8 +8,6 @@ import ( "os/exec" "runtime" - xerrors "github.com/pkg/errors" - "github.com/usual2970/certimate/internal/pkg/core/deployer" certutil "github.com/usual2970/certimate/internal/pkg/utils/cert" fileutil "github.com/usual2970/certimate/internal/pkg/utils/file" @@ -76,7 +74,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE stdout, stderr, err := execCommand(d.config.ShellEnv, d.config.PreCommand) d.logger.Debug("run pre-command", slog.String("stdout", stdout), slog.String("stderr", stderr)) if err != nil { - return nil, xerrors.Wrapf(err, "failed to execute pre-command, stdout: %s, stderr: %s", stdout, stderr) + return nil, fmt.Errorf("failed to execute pre-command (stdout: %s, stderr: %s): %w ", stdout, stderr, err) } } @@ -84,41 +82,41 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE switch d.config.OutputFormat { case OUTPUT_FORMAT_PEM: if err := fileutil.WriteString(d.config.OutputCertPath, certPEM); err != nil { - return nil, xerrors.Wrap(err, "failed to save certificate file") + return nil, fmt.Errorf("failed to save certificate file: %w", err) } d.logger.Info("ssl certificate file saved", slog.String("path", d.config.OutputCertPath)) if err := fileutil.WriteString(d.config.OutputKeyPath, privkeyPEM); err != nil { - return nil, xerrors.Wrap(err, "failed to save private key file") + return nil, fmt.Errorf("failed to save private key file: %w", err) } d.logger.Info("ssl private key file saved", slog.String("path", d.config.OutputKeyPath)) case OUTPUT_FORMAT_PFX: pfxData, err := certutil.TransformCertificateFromPEMToPFX(certPEM, privkeyPEM, d.config.PfxPassword) if err != nil { - return nil, xerrors.Wrap(err, "failed to transform certificate to PFX") + return nil, fmt.Errorf("failed to transform certificate to PFX: %w", err) } d.logger.Info("ssl certificate transformed to pfx") if err := fileutil.Write(d.config.OutputCertPath, pfxData); err != nil { - return nil, xerrors.Wrap(err, "failed to save certificate file") + return nil, fmt.Errorf("failed to save certificate file: %w", err) } d.logger.Info("ssl certificate file saved", slog.String("path", d.config.OutputCertPath)) case OUTPUT_FORMAT_JKS: jksData, err := certutil.TransformCertificateFromPEMToJKS(certPEM, privkeyPEM, d.config.JksAlias, d.config.JksKeypass, d.config.JksStorepass) if err != nil { - return nil, xerrors.Wrap(err, "failed to transform certificate to JKS") + return nil, fmt.Errorf("failed to transform certificate to JKS: %w", err) } d.logger.Info("ssl certificate transformed to jks") if err := fileutil.Write(d.config.OutputCertPath, jksData); err != nil { - return nil, xerrors.Wrap(err, "failed to save certificate file") + return nil, fmt.Errorf("failed to save certificate file: %w", err) } d.logger.Info("ssl certificate file saved", slog.String("path", d.config.OutputCertPath)) default: - return nil, fmt.Errorf("unsupported output format: %s", d.config.OutputFormat) + return nil, fmt.Errorf("unsupported output format '%s'", d.config.OutputFormat) } // 执行后置命令 @@ -126,7 +124,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE stdout, stderr, err := execCommand(d.config.ShellEnv, d.config.PostCommand) d.logger.Debug("run post-command", slog.String("stdout", stdout), slog.String("stderr", stderr)) if err != nil { - return nil, xerrors.Wrapf(err, "failed to execute post-command, stdout: %s, stderr: %s", stdout, stderr) + return nil, fmt.Errorf("failed to execute post-command (stdout: %s, stderr: %s): %w ", stdout, stderr, err) } } @@ -154,7 +152,7 @@ func execCommand(shellEnv ShellEnvType, command string) (string, string, error) } default: - return "", "", fmt.Errorf("unsupported shell env: %s", shellEnv) + return "", "", fmt.Errorf("unsupported shell env '%s'", shellEnv) } stdoutBuf := bytes.NewBuffer(nil) @@ -163,7 +161,7 @@ func execCommand(shellEnv ShellEnvType, command string) (string, string, error) cmd.Stderr = stderrBuf err := cmd.Run() if err != nil { - return stdoutBuf.String(), stderrBuf.String(), xerrors.Wrap(err, "failed to execute command") + return stdoutBuf.String(), stderrBuf.String(), fmt.Errorf("failed to execute command: %w", err) } return stdoutBuf.String(), stderrBuf.String(), nil diff --git a/internal/pkg/core/deployer/providers/qiniu-cdn/qiniu_cdn.go b/internal/pkg/core/deployer/providers/qiniu-cdn/qiniu_cdn.go index 5ee74597..573eeb94 100644 --- a/internal/pkg/core/deployer/providers/qiniu-cdn/qiniu_cdn.go +++ b/internal/pkg/core/deployer/providers/qiniu-cdn/qiniu_cdn.go @@ -2,10 +2,10 @@ package qiniucdn import ( "context" + "fmt" "log/slog" "strings" - xerrors "github.com/pkg/errors" "github.com/qiniu/go-sdk/v7/auth" "github.com/usual2970/certimate/internal/pkg/core/deployer" @@ -44,7 +44,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { SecretKey: config.SecretKey, }) if err != nil { - return nil, xerrors.Wrap(err, "failed to create ssl uploader") + return nil, fmt.Errorf("failed to create ssl uploader: %w", err) } return &DeployerProvider{ @@ -69,7 +69,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE // 上传证书到 CDN upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM) if err != nil { - return nil, xerrors.Wrap(err, "failed to upload certificate file") + return nil, fmt.Errorf("failed to upload certificate file: %w", err) } else { d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } @@ -82,7 +82,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE getDomainInfoResp, err := d.sdkClient.GetDomainInfo(context.TODO(), domain) d.logger.Debug("sdk request 'cdn.GetDomainInfo'", slog.String("request.domain", domain), slog.Any("response", getDomainInfoResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'cdn.GetDomainInfo'") + return nil, fmt.Errorf("failed to execute sdk request 'cdn.GetDomainInfo': %w", err) } // 判断域名是否已启用 HTTPS。如果已启用，修改域名证书；否则，启用 HTTPS @@ -91,13 +91,13 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE enableDomainHttpsResp, err := d.sdkClient.EnableDomainHttps(context.TODO(), domain, upres.CertId, true, true) d.logger.Debug("sdk request 'cdn.EnableDomainHttps'", slog.String("request.domain", domain), slog.String("request.certId", upres.CertId), slog.Any("response", enableDomainHttpsResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'cdn.EnableDomainHttps'") + return nil, fmt.Errorf("failed to execute sdk request 'cdn.EnableDomainHttps': %w", err) } } else if getDomainInfoResp.Https.CertID != upres.CertId { modifyDomainHttpsConfResp, err := d.sdkClient.ModifyDomainHttpsConf(context.TODO(), domain, upres.CertId, getDomainInfoResp.Https.ForceHttps, getDomainInfoResp.Https.Http2Enable) d.logger.Debug("sdk request 'cdn.ModifyDomainHttpsConf'", slog.String("request.domain", domain), slog.String("request.certId", upres.CertId), slog.Any("response", modifyDomainHttpsConfResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'cdn.ModifyDomainHttpsConf'") + return nil, fmt.Errorf("failed to execute sdk request 'cdn.ModifyDomainHttpsConf': %w", err) } } diff --git a/internal/pkg/core/deployer/providers/qiniu-pili/qiniu_pili.go b/internal/pkg/core/deployer/providers/qiniu-pili/qiniu_pili.go index d739c858..db8d899e 100644 --- a/internal/pkg/core/deployer/providers/qiniu-pili/qiniu_pili.go +++ b/internal/pkg/core/deployer/providers/qiniu-pili/qiniu_pili.go @@ -2,9 +2,9 @@ package qiniupili import ( "context" + "fmt" "log/slog" - xerrors "github.com/pkg/errors" "github.com/qiniu/go-sdk/v7/pili" "github.com/usual2970/certimate/internal/pkg/core/deployer" @@ -44,7 +44,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { SecretKey: config.SecretKey, }) if err != nil { - return nil, xerrors.Wrap(err, "failed to create ssl uploader") + return nil, fmt.Errorf("failed to create ssl uploader: %w", err) } return &DeployerProvider{ @@ -69,7 +69,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE // 上传证书到 CDN upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM) if err != nil { - return nil, xerrors.Wrap(err, "failed to upload certificate file") + return nil, fmt.Errorf("failed to upload certificate file: %w", err) } else { d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } @@ -84,7 +84,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE err = d.sdkClient.SetDomainCert(context.TODO(), setDomainCertReq) d.logger.Debug("sdk request 'pili.SetDomainCert'", slog.Any("request", setDomainCertReq)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'pili.SetDomainCert'") + return nil, fmt.Errorf("failed to execute sdk request 'pili.SetDomainCert': %w", err) } return &deployer.DeployResult{}, nil diff --git a/internal/pkg/core/deployer/providers/rainyun-rcdn/rainyun_rcdn.go b/internal/pkg/core/deployer/providers/rainyun-rcdn/rainyun_rcdn.go index 226b6010..0b003bee 100644 --- a/internal/pkg/core/deployer/providers/rainyun-rcdn/rainyun_rcdn.go +++ b/internal/pkg/core/deployer/providers/rainyun-rcdn/rainyun_rcdn.go @@ -3,11 +3,10 @@ package rainyunrcdn import ( "context" "errors" + "fmt" "log/slog" "strconv" - xerrors "github.com/pkg/errors" - "github.com/usual2970/certimate/internal/pkg/core/deployer" "github.com/usual2970/certimate/internal/pkg/core/uploader" uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/rainyun-sslcenter" @@ -39,14 +38,14 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, 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) } uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{ ApiKey: config.ApiKey, }) if err != nil { - return nil, xerrors.Wrap(err, "failed to create ssl uploader") + return nil, fmt.Errorf("failed to create ssl uploader: %w", err) } return &DeployerProvider{ @@ -71,7 +70,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE // 上传证书到 SSL 证书 upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM) if err != nil { - return nil, xerrors.Wrap(err, "failed to upload certificate file") + return nil, fmt.Errorf("failed to upload certificate file: %w", err) } else { d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } @@ -86,7 +85,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE rcdnInstanceSslBindResp, err := d.sdkClient.RcdnInstanceSslBind(d.config.InstanceId, rcdnInstanceSslBindReq) d.logger.Debug("sdk request 'rcdn.InstanceSslBind'", slog.Any("instanceId", d.config.InstanceId), slog.Any("request", rcdnInstanceSslBindReq), slog.Any("response", rcdnInstanceSslBindResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'rcdn.InstanceSslBind'") + return nil, fmt.Errorf("failed to execute sdk request 'rcdn.InstanceSslBind': %w", err) } return &deployer.DeployResult{}, nil diff --git a/internal/pkg/core/deployer/providers/safeline/safeline.go b/internal/pkg/core/deployer/providers/safeline/safeline.go index 83e6a649..a4621109 100644 --- a/internal/pkg/core/deployer/providers/safeline/safeline.go +++ b/internal/pkg/core/deployer/providers/safeline/safeline.go @@ -8,8 +8,6 @@ import ( "log/slog" "net/url" - xerrors "github.com/pkg/errors" - "github.com/usual2970/certimate/internal/pkg/core/deployer" safelinesdk "github.com/usual2970/certimate/internal/pkg/sdk3rd/safeline" ) @@ -43,7 +41,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { client, err := createSdkClient(config.ApiUrl, config.ApiToken, config.AllowInsecureConnections) 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 &DeployerProvider{ @@ -71,7 +69,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE } default: - return nil, fmt.Errorf("unsupported resource type: %s", d.config.ResourceType) + return nil, fmt.Errorf("unsupported resource type '%s'", d.config.ResourceType) } return &deployer.DeployResult{}, nil @@ -94,7 +92,7 @@ func (d *DeployerProvider) deployToCertificate(ctx context.Context, certPEM stri updateCertificateResp, err := d.sdkClient.UpdateCertificate(updateCertificateReq) d.logger.Debug("sdk request 'safeline.UpdateCertificate'", slog.Any("request", updateCertificateReq), slog.Any("response", updateCertificateResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'safeline.UpdateCertificate'") + return fmt.Errorf("failed to execute sdk request 'safeline.UpdateCertificate': %w", err) } return nil diff --git a/internal/pkg/core/deployer/providers/ssh/ssh.go b/internal/pkg/core/deployer/providers/ssh/ssh.go index a26eb05e..4b8b433d 100644 --- a/internal/pkg/core/deployer/providers/ssh/ssh.go +++ b/internal/pkg/core/deployer/providers/ssh/ssh.go @@ -8,7 +8,6 @@ import ( "os" "path/filepath" - xerrors "github.com/pkg/errors" "github.com/pkg/sftp" "github.com/povsister/scp" "golang.org/x/crypto/ssh" @@ -96,7 +95,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE d.config.SshKeyPassphrase, ) if err != nil { - return nil, xerrors.Wrap(err, "failed to create ssh client") + return nil, fmt.Errorf("failed to create ssh client: %w", err) } defer client.Close() @@ -107,7 +106,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE stdout, stderr, err := execSshCommand(client, d.config.PreCommand) d.logger.Debug("run pre-command", slog.String("stdout", stdout), slog.String("stderr", stderr)) if err != nil { - return nil, xerrors.Wrapf(err, "failed to execute pre-command: stdout: %s, stderr: %s", stdout, stderr) + return nil, fmt.Errorf("failed to execute pre-command (stdout: %s, stderr: %s): %w ", stdout, stderr, err) } } @@ -115,41 +114,41 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE switch d.config.OutputFormat { case OUTPUT_FORMAT_PEM: if err := writeFileString(client, d.config.UseSCP, d.config.OutputCertPath, certPEM); err != nil { - return nil, xerrors.Wrap(err, "failed to upload certificate file") + return nil, fmt.Errorf("failed to upload certificate file: %w", err) } d.logger.Info("ssl certificate file uploaded", slog.String("path", d.config.OutputCertPath)) if err := writeFileString(client, d.config.UseSCP, d.config.OutputKeyPath, privkeyPEM); err != nil { - return nil, xerrors.Wrap(err, "failed to upload private key file") + return nil, fmt.Errorf("failed to upload private key file: %w", err) } d.logger.Info("ssl private key file uploaded", slog.String("path", d.config.OutputKeyPath)) case OUTPUT_FORMAT_PFX: pfxData, err := certutil.TransformCertificateFromPEMToPFX(certPEM, privkeyPEM, d.config.PfxPassword) if err != nil { - return nil, xerrors.Wrap(err, "failed to transform certificate to PFX") + return nil, fmt.Errorf("failed to transform certificate to PFX: %w", err) } d.logger.Info("ssl certificate transformed to pfx") if err := writeFile(client, d.config.UseSCP, d.config.OutputCertPath, pfxData); err != nil { - return nil, xerrors.Wrap(err, "failed to upload certificate file") + return nil, fmt.Errorf("failed to upload certificate file: %w", err) } d.logger.Info("ssl certificate file uploaded", slog.String("path", d.config.OutputCertPath)) case OUTPUT_FORMAT_JKS: jksData, err := certutil.TransformCertificateFromPEMToJKS(certPEM, privkeyPEM, d.config.JksAlias, d.config.JksKeypass, d.config.JksStorepass) if err != nil { - return nil, xerrors.Wrap(err, "failed to transform certificate to JKS") + return nil, fmt.Errorf("failed to transform certificate to JKS: %w", err) } d.logger.Info("ssl certificate transformed to jks") if err := writeFile(client, d.config.UseSCP, d.config.OutputCertPath, jksData); err != nil { - return nil, xerrors.Wrap(err, "failed to upload certificate file") + return nil, fmt.Errorf("failed to upload certificate file: %w", err) } d.logger.Info("ssl certificate file uploaded", slog.String("path", d.config.OutputCertPath)) default: - return nil, fmt.Errorf("unsupported output format: %s", d.config.OutputFormat) + return nil, fmt.Errorf("unsupported output format '%s'", d.config.OutputFormat) } // 执行后置命令 @@ -157,7 +156,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE stdout, stderr, err := execSshCommand(client, d.config.PostCommand) d.logger.Debug("run post-command", slog.String("stdout", stdout), slog.String("stderr", stderr)) if err != nil { - return nil, xerrors.Wrapf(err, "failed to execute post-command, stdout: %s, stderr: %s", stdout, stderr) + return nil, fmt.Errorf("failed to execute post-command (stdout: %s, stderr: %s): %w ", stdout, stderr, err) } } @@ -212,7 +211,7 @@ func execSshCommand(sshCli *ssh.Client, command string) (string, string, error) session.Stderr = stderrBuf err = session.Run(command) if err != nil { - return stdoutBuf.String(), stderrBuf.String(), xerrors.Wrap(err, "failed to execute ssh command") + return stdoutBuf.String(), stderrBuf.String(), fmt.Errorf("failed to execute ssh command: %w", err) } return stdoutBuf.String(), stderrBuf.String(), nil @@ -241,13 +240,13 @@ func writeFileStringWithSCP(sshCli *ssh.Client, path string, content string) err func writeFileWithSCP(sshCli *ssh.Client, path string, data []byte) error { scpCli, err := scp.NewClientFromExistingSSH(sshCli, &scp.ClientOption{}) if err != nil { - return xerrors.Wrap(err, "failed to create scp client") + return fmt.Errorf("failed to create scp client: %w", err) } reader := bytes.NewReader(data) err = scpCli.CopyToRemote(reader, path, &scp.FileTransferOption{}) if err != nil { - return xerrors.Wrap(err, "failed to write to remote file") + return fmt.Errorf("failed to write to remote file: %w", err) } return nil @@ -260,23 +259,23 @@ func writeFileStringWithSFTP(sshCli *ssh.Client, path string, content string) er func writeFileWithSFTP(sshCli *ssh.Client, path string, data []byte) error { sftpCli, err := sftp.NewClient(sshCli) if err != nil { - return xerrors.Wrap(err, "failed to create sftp client") + return fmt.Errorf("failed to create sftp client: %w", err) } defer sftpCli.Close() if err := sftpCli.MkdirAll(filepath.Dir(path)); err != nil { - return xerrors.Wrap(err, "failed to create remote directory") + return fmt.Errorf("failed to create remote directory: %w", err) } file, err := sftpCli.OpenFile(path, os.O_WRONLY|os.O_CREATE|os.O_TRUNC) if err != nil { - return xerrors.Wrap(err, "failed to open remote file") + return fmt.Errorf("failed to open remote file: %w", err) } defer file.Close() _, err = file.Write(data) if err != nil { - return xerrors.Wrap(err, "failed to write to remote file") + return fmt.Errorf("failed to write to remote file: %w", err) } return nil diff --git a/internal/pkg/core/deployer/providers/tencentcloud-cdn/tencentcloud_cdn.go b/internal/pkg/core/deployer/providers/tencentcloud-cdn/tencentcloud_cdn.go index d6aa5bde..01f71d9e 100644 --- a/internal/pkg/core/deployer/providers/tencentcloud-cdn/tencentcloud_cdn.go +++ b/internal/pkg/core/deployer/providers/tencentcloud-cdn/tencentcloud_cdn.go @@ -2,10 +2,10 @@ package tencentcloudcdn import ( "context" + "fmt" "log/slog" "strings" - xerrors "github.com/pkg/errors" tccdn "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn/v20180606" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" @@ -47,7 +47,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { clients, err := createSdkClients(config.SecretId, config.SecretKey) if err != nil { - return nil, xerrors.Wrap(err, "failed to create sdk clients") + return nil, fmt.Errorf("failed to create sdk clients: %w", err) } uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{ @@ -55,7 +55,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { SecretKey: config.SecretKey, }) if err != nil { - return nil, xerrors.Wrap(err, "failed to create ssl uploader") + return nil, fmt.Errorf("failed to create ssl uploader: %w", err) } return &DeployerProvider{ @@ -80,7 +80,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE // 上传证书到 SSL upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM) if err != nil { - return nil, xerrors.Wrap(err, "failed to upload certificate file") + return nil, fmt.Errorf("failed to upload certificate file: %w", err) } else { d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } @@ -130,7 +130,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE deployCertificateInstanceResp, err := d.sdkClients.SSL.DeployCertificateInstance(deployCertificateInstanceReq) d.logger.Debug("sdk request 'ssl.DeployCertificateInstance'", slog.Any("request", deployCertificateInstanceReq), slog.Any("response", deployCertificateInstanceResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'ssl.DeployCertificateInstance'") + return nil, fmt.Errorf("failed to execute sdk request 'ssl.DeployCertificateInstance': %w", err) } } @@ -146,7 +146,7 @@ func (d *DeployerProvider) getDomainsByCertificateId(cloudCertId string) ([]stri describeCertDomainsResp, err := d.sdkClients.CDN.DescribeCertDomains(describeCertDomainsReq) d.logger.Debug("sdk request 'cdn.DescribeCertDomains'", slog.Any("request", describeCertDomainsReq), slog.Any("response", describeCertDomainsResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'cdn.DescribeCertDomains'") + return nil, fmt.Errorf("failed to execute sdk request 'cdn.DescribeCertDomains': %w", err) } domains := make([]string, 0) @@ -168,7 +168,7 @@ func (d *DeployerProvider) getDeployedDomainsByCertificateId(cloudCertId string) describeDeployedResourcesResp, err := d.sdkClients.SSL.DescribeDeployedResources(describeDeployedResourcesReq) d.logger.Debug("sdk request 'cdn.DescribeDeployedResources'", slog.Any("request", describeDeployedResourcesReq), slog.Any("response", describeDeployedResourcesResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'cdn.DescribeDeployedResources'") + return nil, fmt.Errorf("failed to execute sdk request 'cdn.DescribeDeployedResources': %w", err) } domains := make([]string, 0) diff --git a/internal/pkg/core/deployer/providers/tencentcloud-clb/tencentcloud_clb.go b/internal/pkg/core/deployer/providers/tencentcloud-clb/tencentcloud_clb.go index 24357e5f..7625d6ae 100644 --- a/internal/pkg/core/deployer/providers/tencentcloud-clb/tencentcloud_clb.go +++ b/internal/pkg/core/deployer/providers/tencentcloud-clb/tencentcloud_clb.go @@ -6,7 +6,6 @@ import ( "fmt" "log/slog" - xerrors "github.com/pkg/errors" tcclb "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb/v20180317" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" @@ -58,7 +57,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { clients, err := createSdkClients(config.SecretId, config.SecretKey, config.Region) if err != nil { - return nil, xerrors.Wrap(err, "failed to create sdk clients") + return nil, fmt.Errorf("failed to create sdk clients: %w", err) } uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{ @@ -66,7 +65,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { SecretKey: config.SecretKey, }) if err != nil { - return nil, xerrors.Wrap(err, "failed to create ssl uploader") + return nil, fmt.Errorf("failed to create ssl uploader: %w", err) } return &DeployerProvider{ @@ -91,7 +90,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE // 上传证书到 SSL upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM) if err != nil { - return nil, xerrors.Wrap(err, "failed to upload certificate file") + return nil, fmt.Errorf("failed to upload certificate file: %w", err) } else { d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } @@ -119,7 +118,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE } default: - return nil, fmt.Errorf("unsupported resource type: %s", d.config.ResourceType) + return nil, fmt.Errorf("unsupported resource type '%s'", d.config.ResourceType) } return &deployer.DeployResult{}, nil @@ -149,7 +148,7 @@ func (d *DeployerProvider) deployViaSslService(ctx context.Context, cloudCertId deployCertificateInstanceResp, err := d.sdkClients.SSL.DeployCertificateInstance(deployCertificateInstanceReq) d.logger.Debug("sdk request 'ssl.DeployCertificateInstance'", slog.Any("request", deployCertificateInstanceReq), slog.Any("response", deployCertificateInstanceResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'ssl.DeployCertificateInstance'") + return fmt.Errorf("failed to execute sdk request 'ssl.DeployCertificateInstance': %w", err) } return nil @@ -168,7 +167,7 @@ func (d *DeployerProvider) deployToLoadbalancer(ctx context.Context, cloudCertId describeListenersResp, err := d.sdkClients.CLB.DescribeListeners(describeListenersReq) d.logger.Debug("sdk request 'clb.DescribeListeners'", slog.Any("request", describeListenersReq), slog.Any("response", describeListenersResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'clb.DescribeListeners'") + return fmt.Errorf("failed to execute sdk request 'clb.DescribeListeners': %w", err) } else { if describeListenersResp.Response.Listeners != nil { for _, listener := range describeListenersResp.Response.Listeners { @@ -242,7 +241,7 @@ func (d *DeployerProvider) deployToRuleDomain(ctx context.Context, cloudCertId s modifyDomainAttributesResp, err := d.sdkClients.CLB.ModifyDomainAttributes(modifyDomainAttributesReq) d.logger.Debug("sdk request 'clb.ModifyDomainAttributes'", slog.Any("request", modifyDomainAttributesReq), slog.Any("response", modifyDomainAttributesResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'clb.ModifyDomainAttributes'") + return fmt.Errorf("failed to execute sdk request 'clb.ModifyDomainAttributes': %w", err) } return nil @@ -257,7 +256,7 @@ func (d *DeployerProvider) modifyListenerCertificate(ctx context.Context, cloudL describeListenersResp, err := d.sdkClients.CLB.DescribeListeners(describeListenersReq) d.logger.Debug("sdk request 'clb.DescribeListeners'", slog.Any("request", describeListenersReq), slog.Any("response", describeListenersResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'clb.DescribeListeners'") + return fmt.Errorf("failed to execute sdk request 'clb.DescribeListeners': %w", err) } else if len(describeListenersResp.Response.Listeners) == 0 { return errors.New("listener not found") } @@ -277,7 +276,7 @@ func (d *DeployerProvider) modifyListenerCertificate(ctx context.Context, cloudL modifyListenerResp, err := d.sdkClients.CLB.ModifyListener(modifyListenerReq) d.logger.Debug("sdk request 'clb.ModifyListener'", slog.Any("request", modifyListenerReq), slog.Any("response", modifyListenerResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'clb.ModifyListener'") + return fmt.Errorf("failed to execute sdk request 'clb.ModifyListener': %w", err) } return nil diff --git a/internal/pkg/core/deployer/providers/tencentcloud-cos/tencentcloud_cos.go b/internal/pkg/core/deployer/providers/tencentcloud-cos/tencentcloud_cos.go index 58513712..0949c5a3 100644 --- a/internal/pkg/core/deployer/providers/tencentcloud-cos/tencentcloud_cos.go +++ b/internal/pkg/core/deployer/providers/tencentcloud-cos/tencentcloud_cos.go @@ -6,7 +6,6 @@ import ( "fmt" "log/slog" - xerrors "github.com/pkg/errors" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" tcssl "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl/v20191205" @@ -45,7 +44,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { client, err := createSdkClient(config.SecretId, config.SecretKey, config.Region) if err != nil { - return nil, xerrors.Wrap(err, "failed to create sdk client") + return nil, fmt.Errorf("failed to create sdk client: %w", err) } uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{ @@ -53,7 +52,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { SecretKey: config.SecretKey, }) if err != nil { - return nil, xerrors.Wrap(err, "failed to create ssl uploader") + return nil, fmt.Errorf("failed to create ssl uploader: %w", err) } return &DeployerProvider{ @@ -85,7 +84,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE // 上传证书到 SSL upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM) if err != nil { - return nil, xerrors.Wrap(err, "failed to upload certificate file") + return nil, fmt.Errorf("failed to upload certificate file: %w", err) } else { d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } @@ -100,7 +99,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE deployCertificateInstanceResp, err := d.sdkClient.DeployCertificateInstance(deployCertificateInstanceReq) d.logger.Debug("sdk request 'ssl.DeployCertificateInstance'", slog.Any("request", deployCertificateInstanceReq), slog.Any("response", deployCertificateInstanceResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'ssl.DeployCertificateInstance'") + return nil, fmt.Errorf("failed to execute sdk request 'ssl.DeployCertificateInstance': %w", err) } return &deployer.DeployResult{}, nil diff --git a/internal/pkg/core/deployer/providers/tencentcloud-css/tencentcloud_css.go b/internal/pkg/core/deployer/providers/tencentcloud-css/tencentcloud_css.go index d35f7b3c..7de626d9 100644 --- a/internal/pkg/core/deployer/providers/tencentcloud-css/tencentcloud_css.go +++ b/internal/pkg/core/deployer/providers/tencentcloud-css/tencentcloud_css.go @@ -2,9 +2,9 @@ package tencentcloudcss import ( "context" + "fmt" "log/slog" - xerrors "github.com/pkg/errors" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" tclive "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/live/v20180801" @@ -39,7 +39,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { client, err := createSdkClient(config.SecretId, config.SecretKey) if err != nil { - return nil, xerrors.Wrap(err, "failed to create sdk client") + return nil, fmt.Errorf("failed to create sdk client: %w", err) } uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{ @@ -47,7 +47,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { SecretKey: config.SecretKey, }) if err != nil { - return nil, xerrors.Wrap(err, "failed to create ssl uploader") + return nil, fmt.Errorf("failed to create ssl uploader: %w", err) } return &DeployerProvider{ @@ -72,7 +72,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE // 上传证书到 SSL upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM) if err != nil { - return nil, xerrors.Wrap(err, "failed to upload certificate file") + return nil, fmt.Errorf("failed to upload certificate file: %w", err) } else { d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } @@ -90,7 +90,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE modifyLiveDomainCertBindingsResp, err := d.sdkClient.ModifyLiveDomainCertBindings(modifyLiveDomainCertBindingsReq) d.logger.Debug("sdk request 'live.ModifyLiveDomainCertBindings'", slog.Any("request", modifyLiveDomainCertBindingsReq), slog.Any("response", modifyLiveDomainCertBindingsResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'live.ModifyLiveDomainCertBindings'") + return nil, fmt.Errorf("failed to execute sdk request 'live.ModifyLiveDomainCertBindings': %w", err) } return &deployer.DeployResult{}, nil diff --git a/internal/pkg/core/deployer/providers/tencentcloud-ecdn/tencentcloud_ecdn.go b/internal/pkg/core/deployer/providers/tencentcloud-ecdn/tencentcloud_ecdn.go index 43896e77..ebe87025 100644 --- a/internal/pkg/core/deployer/providers/tencentcloud-ecdn/tencentcloud_ecdn.go +++ b/internal/pkg/core/deployer/providers/tencentcloud-ecdn/tencentcloud_ecdn.go @@ -2,10 +2,10 @@ package tencentcloudecdn import ( "context" + "fmt" "log/slog" "strings" - xerrors "github.com/pkg/errors" tccdn "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn/v20180606" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" @@ -46,7 +46,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { clients, err := createSdkClients(config.SecretId, config.SecretKey) if err != nil { - return nil, xerrors.Wrap(err, "failed to create sdk clients") + return nil, fmt.Errorf("failed to create sdk clients: %w", err) } uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{ @@ -54,7 +54,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { SecretKey: config.SecretKey, }) if err != nil { - return nil, xerrors.Wrap(err, "failed to create ssl uploader") + return nil, fmt.Errorf("failed to create ssl uploader: %w", err) } return &DeployerProvider{ @@ -79,7 +79,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE // 上传证书到 SSL upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM) if err != nil { - return nil, xerrors.Wrap(err, "failed to upload certificate file") + return nil, fmt.Errorf("failed to upload certificate file: %w", err) } else { d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } @@ -113,7 +113,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE deployCertificateInstanceResp, err := d.sdkClients.SSL.DeployCertificateInstance(deployCertificateInstanceReq) d.logger.Debug("sdk request 'ssl.DeployCertificateInstance'", slog.Any("request", deployCertificateInstanceReq), slog.Any("response", deployCertificateInstanceResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'ssl.DeployCertificateInstance'") + return nil, fmt.Errorf("failed to execute sdk request 'ssl.DeployCertificateInstance': %w", err) } } @@ -129,7 +129,7 @@ func (d *DeployerProvider) getDomainsByCertificateId(cloudCertId string) ([]stri describeCertDomainsResp, err := d.sdkClients.CDN.DescribeCertDomains(describeCertDomainsReq) d.logger.Debug("sdk request 'cdn.DescribeCertDomains'", slog.Any("request", describeCertDomainsReq), slog.Any("response", describeCertDomainsResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'cdn.DescribeCertDomains'") + return nil, fmt.Errorf("failed to execute sdk request 'cdn.DescribeCertDomains': %w", err) } domains := make([]string, 0) diff --git a/internal/pkg/core/deployer/providers/tencentcloud-eo/tencentcloud_eo.go b/internal/pkg/core/deployer/providers/tencentcloud-eo/tencentcloud_eo.go index ec1dc86d..919339bb 100644 --- a/internal/pkg/core/deployer/providers/tencentcloud-eo/tencentcloud_eo.go +++ b/internal/pkg/core/deployer/providers/tencentcloud-eo/tencentcloud_eo.go @@ -3,9 +3,9 @@ package tencentcloudeo import ( "context" "errors" + "fmt" "log/slog" - xerrors "github.com/pkg/errors" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" tcssl "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl/v20191205" @@ -48,7 +48,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { clients, err := createSdkClients(config.SecretId, config.SecretKey) if err != nil { - return nil, xerrors.Wrap(err, "failed to create sdk clients") + return nil, fmt.Errorf("failed to create sdk clients: %w", err) } uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{ @@ -56,7 +56,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { SecretKey: config.SecretKey, }) if err != nil { - return nil, xerrors.Wrap(err, "failed to create ssl uploader") + return nil, fmt.Errorf("failed to create ssl uploader: %w", err) } return &DeployerProvider{ @@ -85,7 +85,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE // 上传证书到 SSL upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM) if err != nil { - return nil, xerrors.Wrap(err, "failed to upload certificate file") + return nil, fmt.Errorf("failed to upload certificate file: %w", err) } else { d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } @@ -100,7 +100,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE modifyHostsCertificateResp, err := d.sdkClients.TEO.ModifyHostsCertificate(modifyHostsCertificateReq) d.logger.Debug("sdk request 'teo.ModifyHostsCertificate'", slog.Any("request", modifyHostsCertificateReq), slog.Any("response", modifyHostsCertificateResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'teo.ModifyHostsCertificate'") + return nil, fmt.Errorf("failed to execute sdk request 'teo.ModifyHostsCertificate': %w", err) } return &deployer.DeployResult{}, nil diff --git a/internal/pkg/core/deployer/providers/tencentcloud-scf/tencentcloud_scf.go b/internal/pkg/core/deployer/providers/tencentcloud-scf/tencentcloud_scf.go index d9eb8080..bc8d8696 100644 --- a/internal/pkg/core/deployer/providers/tencentcloud-scf/tencentcloud_scf.go +++ b/internal/pkg/core/deployer/providers/tencentcloud-scf/tencentcloud_scf.go @@ -2,9 +2,9 @@ package tencentcloudscf import ( "context" + "fmt" "log/slog" - xerrors "github.com/pkg/errors" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" tcscf "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/scf/v20180416" @@ -41,7 +41,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { client, err := createSdkClient(config.SecretId, config.SecretKey, config.Region) if err != nil { - return nil, xerrors.Wrap(err, "failed to create sdk client") + return nil, fmt.Errorf("failed to create sdk client: %w", err) } uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{ @@ -49,7 +49,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { SecretKey: config.SecretKey, }) if err != nil { - return nil, xerrors.Wrap(err, "failed to create ssl uploader") + return nil, fmt.Errorf("failed to create ssl uploader: %w", err) } return &DeployerProvider{ @@ -78,13 +78,13 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE getCustomDomainResp, err := d.sdkClient.GetCustomDomain(getCustomDomainReq) d.logger.Debug("sdk request 'scf.GetCustomDomain'", slog.Any("request", getCustomDomainReq), slog.Any("response", getCustomDomainResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'scf.GetCustomDomain'") + return nil, fmt.Errorf("failed to execute sdk request 'scf.GetCustomDomain': %w", err) } // 上传证书到 SSL upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM) if err != nil { - return nil, xerrors.Wrap(err, "failed to upload certificate file") + return nil, fmt.Errorf("failed to upload certificate file: %w", err) } else { d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } @@ -100,7 +100,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE updateCustomDomainResp, err := d.sdkClient.UpdateCustomDomain(updateCustomDomainReq) d.logger.Debug("sdk request 'scf.UpdateCustomDomain'", slog.Any("request", updateCustomDomainReq), slog.Any("response", updateCustomDomainResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'scf.UpdateCustomDomain'") + return nil, fmt.Errorf("failed to execute sdk request 'scf.UpdateCustomDomain': %w", err) } return &deployer.DeployResult{}, nil diff --git a/internal/pkg/core/deployer/providers/tencentcloud-ssl-deploy/tencentcloud_ssl_deploy.go b/internal/pkg/core/deployer/providers/tencentcloud-ssl-deploy/tencentcloud_ssl_deploy.go index 0f2a0d29..f6090190 100644 --- a/internal/pkg/core/deployer/providers/tencentcloud-ssl-deploy/tencentcloud_ssl_deploy.go +++ b/internal/pkg/core/deployer/providers/tencentcloud-ssl-deploy/tencentcloud_ssl_deploy.go @@ -7,7 +7,6 @@ import ( "log/slog" "time" - xerrors "github.com/pkg/errors" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" tcssl "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl/v20191205" @@ -46,7 +45,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { client, err := createSdkClient(config.SecretId, config.SecretKey, config.Region) if err != nil { - return nil, xerrors.Wrap(err, "failed to create sdk client") + return nil, fmt.Errorf("failed to create sdk client: %w", err) } uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{ @@ -54,7 +53,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { SecretKey: config.SecretKey, }) if err != nil { - return nil, xerrors.Wrap(err, "failed to create ssl uploader") + return nil, fmt.Errorf("failed to create ssl uploader: %w", err) } return &DeployerProvider{ @@ -86,7 +85,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE // 上传证书到 SSL upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM) if err != nil { - return nil, xerrors.Wrap(err, "failed to upload certificate file") + return nil, fmt.Errorf("failed to upload certificate file: %w", err) } else { d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } @@ -101,7 +100,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE deployCertificateInstanceResp, err := d.sdkClient.DeployCertificateInstance(deployCertificateInstanceReq) d.logger.Debug("sdk request 'ssl.DeployCertificateInstance'", slog.Any("request", deployCertificateInstanceReq), slog.Any("response", deployCertificateInstanceResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'ssl.DeployCertificateInstance'") + return nil, fmt.Errorf("failed to execute sdk request 'ssl.DeployCertificateInstance': %w", err) } else if deployCertificateInstanceResp.Response == nil || deployCertificateInstanceResp.Response.DeployRecordId == nil { return nil, errors.New("failed to create deploy record") } @@ -119,7 +118,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE describeHostDeployRecordDetailResp, err := d.sdkClient.DescribeHostDeployRecordDetail(describeHostDeployRecordDetailReq) d.logger.Debug("sdk request 'ssl.DescribeHostDeployRecordDetail'", slog.Any("request", describeHostDeployRecordDetailReq), slog.Any("response", describeHostDeployRecordDetailResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'ssl.DescribeHostDeployRecordDetail'") + return nil, fmt.Errorf("failed to execute sdk request 'ssl.DescribeHostDeployRecordDetail': %w", err) } if describeHostDeployRecordDetailResp.Response.TotalCount == nil { diff --git a/internal/pkg/core/deployer/providers/tencentcloud-ssl/tencentcloud_ssl.go b/internal/pkg/core/deployer/providers/tencentcloud-ssl/tencentcloud_ssl.go index 0378f567..5fbdb7c6 100644 --- a/internal/pkg/core/deployer/providers/tencentcloud-ssl/tencentcloud_ssl.go +++ b/internal/pkg/core/deployer/providers/tencentcloud-ssl/tencentcloud_ssl.go @@ -2,10 +2,9 @@ package tencentcloudssl import ( "context" + "fmt" "log/slog" - xerrors "github.com/pkg/errors" - "github.com/usual2970/certimate/internal/pkg/core/deployer" "github.com/usual2970/certimate/internal/pkg/core/uploader" uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/tencentcloud-ssl" @@ -36,7 +35,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { SecretKey: config.SecretKey, }) if err != nil { - return nil, xerrors.Wrap(err, "failed to create ssl uploader") + return nil, fmt.Errorf("failed to create ssl uploader: %w", err) } return &DeployerProvider{ @@ -60,7 +59,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE // 上传证书到 SSL upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM) if err != nil { - return nil, xerrors.Wrap(err, "failed to upload certificate file") + return nil, fmt.Errorf("failed to upload certificate file: %w", err) } else { d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } diff --git a/internal/pkg/core/deployer/providers/tencentcloud-vod/tencentcloud_vod.go b/internal/pkg/core/deployer/providers/tencentcloud-vod/tencentcloud_vod.go index f9374b7d..1b8553c5 100644 --- a/internal/pkg/core/deployer/providers/tencentcloud-vod/tencentcloud_vod.go +++ b/internal/pkg/core/deployer/providers/tencentcloud-vod/tencentcloud_vod.go @@ -2,9 +2,9 @@ package tencentcloudvod import ( "context" + "fmt" "log/slog" - xerrors "github.com/pkg/errors" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" tcvod "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vod/v20180717" @@ -41,7 +41,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { client, err := createSdkClient(config.SecretId, config.SecretKey) if err != nil { - return nil, xerrors.Wrap(err, "failed to create sdk client") + return nil, fmt.Errorf("failed to create sdk client: %w", err) } uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{ @@ -49,7 +49,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { SecretKey: config.SecretKey, }) if err != nil { - return nil, xerrors.Wrap(err, "failed to create ssl uploader") + return nil, fmt.Errorf("failed to create ssl uploader: %w", err) } return &DeployerProvider{ @@ -74,7 +74,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE // 上传证书到 SSL upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM) if err != nil { - return nil, xerrors.Wrap(err, "failed to upload certificate file") + return nil, fmt.Errorf("failed to upload certificate file: %w", err) } else { d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } @@ -91,7 +91,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE setVodDomainCertificateResp, err := d.sdkClient.SetVodDomainCertificate(setVodDomainCertificateReq) d.logger.Debug("sdk request 'vod.SetVodDomainCertificate'", slog.Any("request", setVodDomainCertificateReq), slog.Any("response", setVodDomainCertificateResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'vod.SetVodDomainCertificate'") + return nil, fmt.Errorf("failed to execute sdk request 'vod.SetVodDomainCertificate': %w", err) } return &deployer.DeployResult{}, nil diff --git a/internal/pkg/core/deployer/providers/tencentcloud-waf/tencentcloud_waf.go b/internal/pkg/core/deployer/providers/tencentcloud-waf/tencentcloud_waf.go index 015f693a..18380289 100644 --- a/internal/pkg/core/deployer/providers/tencentcloud-waf/tencentcloud_waf.go +++ b/internal/pkg/core/deployer/providers/tencentcloud-waf/tencentcloud_waf.go @@ -3,9 +3,9 @@ package tencentcloudwaf import ( "context" "errors" + "fmt" "log/slog" - xerrors "github.com/pkg/errors" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" tcwaf "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf/v20180125" @@ -46,7 +46,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { client, err := createSdkClient(config.SecretId, config.SecretKey, config.Region) if err != nil { - return nil, xerrors.Wrap(err, "failed to create sdk client") + return nil, fmt.Errorf("failed to create sdk client: %w", err) } uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{ @@ -54,7 +54,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { SecretKey: config.SecretKey, }) if err != nil { - return nil, xerrors.Wrap(err, "failed to create ssl uploader") + return nil, fmt.Errorf("failed to create ssl uploader: %w", err) } return &DeployerProvider{ @@ -89,7 +89,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE // 上传证书到 SSL upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM) if err != nil { - return nil, xerrors.Wrap(err, "failed to upload certificate file") + return nil, fmt.Errorf("failed to upload certificate file: %w", err) } else { d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } @@ -103,7 +103,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE describeDomainDetailsSaasResp, err := d.sdkClient.DescribeDomainDetailsSaas(describeDomainDetailsSaasReq) d.logger.Debug("sdk request 'waf.DescribeDomainDetailsSaas'", slog.Any("request", describeDomainDetailsSaasReq), slog.Any("response", describeDomainDetailsSaasResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'waf.DescribeDomainDetailsSaas'") + return nil, fmt.Errorf("failed to execute sdk request 'waf.DescribeDomainDetailsSaas': %w", err) } // 编辑 SaaS 型 WAF 域名 @@ -117,7 +117,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE modifySpartaProtectionResp, err := d.sdkClient.ModifySpartaProtection(modifySpartaProtectionReq) d.logger.Debug("sdk request 'waf.ModifySpartaProtection'", slog.Any("request", modifySpartaProtectionReq), slog.Any("response", modifySpartaProtectionResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'waf.ModifySpartaProtection'") + return nil, fmt.Errorf("failed to execute sdk request 'waf.ModifySpartaProtection': %w", err) } return &deployer.DeployResult{}, nil diff --git a/internal/pkg/core/deployer/providers/ucloud-ucdn/ucloud_ucdn.go b/internal/pkg/core/deployer/providers/ucloud-ucdn/ucloud_ucdn.go index 10552363..5f90b943 100644 --- a/internal/pkg/core/deployer/providers/ucloud-ucdn/ucloud_ucdn.go +++ b/internal/pkg/core/deployer/providers/ucloud-ucdn/ucloud_ucdn.go @@ -3,10 +3,10 @@ package uclouducdn import ( "context" "errors" + "fmt" "log/slog" "strconv" - xerrors "github.com/pkg/errors" "github.com/ucloud/ucloud-sdk-go/services/ucdn" "github.com/ucloud/ucloud-sdk-go/ucloud" "github.com/ucloud/ucloud-sdk-go/ucloud/auth" @@ -43,7 +43,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { client, err := createSdkClient(config.PrivateKey, config.PublicKey) if err != nil { - return nil, xerrors.Wrap(err, "failed to create sdk client") + return nil, fmt.Errorf("failed to create sdk client: %w", err) } uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{ @@ -52,7 +52,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { ProjectId: config.ProjectId, }) if err != nil { - return nil, xerrors.Wrap(err, "failed to create ssl uploader") + return nil, fmt.Errorf("failed to create ssl uploader: %w", err) } return &DeployerProvider{ @@ -77,7 +77,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE // 上传证书到 USSL upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM) if err != nil { - return nil, xerrors.Wrap(err, "failed to upload certificate file") + return nil, fmt.Errorf("failed to upload certificate file: %w", err) } else { d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } @@ -92,7 +92,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE getUcdnDomainConfigResp, err := d.sdkClient.GetUcdnDomainConfig(getUcdnDomainConfigReq) d.logger.Debug("sdk request 'ucdn.GetUcdnDomainConfig'", slog.Any("request", getUcdnDomainConfigReq), slog.Any("response", getUcdnDomainConfigResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'ucdn.GetUcdnDomainConfig'") + return nil, fmt.Errorf("failed to execute sdk request 'ucdn.GetUcdnDomainConfig': %w", err) } else if len(getUcdnDomainConfigResp.DomainList) == 0 { return nil, errors.New("no domain found") } @@ -114,7 +114,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE updateUcdnDomainHttpsConfigV2Resp, err := d.sdkClient.UpdateUcdnDomainHttpsConfigV2(updateUcdnDomainHttpsConfigV2Req) d.logger.Debug("sdk request 'ucdn.UpdateUcdnDomainHttpsConfigV2'", slog.Any("request", updateUcdnDomainHttpsConfigV2Req), slog.Any("response", updateUcdnDomainHttpsConfigV2Resp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'ucdn.UpdateUcdnDomainHttpsConfigV2'") + return nil, fmt.Errorf("failed to execute sdk request 'ucdn.UpdateUcdnDomainHttpsConfigV2': %w", err) } return &deployer.DeployResult{}, nil diff --git a/internal/pkg/core/deployer/providers/ucloud-us3/ucloud_us3.go b/internal/pkg/core/deployer/providers/ucloud-us3/ucloud_us3.go index cd5db4b3..5564e6a8 100644 --- a/internal/pkg/core/deployer/providers/ucloud-us3/ucloud_us3.go +++ b/internal/pkg/core/deployer/providers/ucloud-us3/ucloud_us3.go @@ -2,9 +2,9 @@ package ucloudus3 import ( "context" + "fmt" "log/slog" - xerrors "github.com/pkg/errors" "github.com/ucloud/ucloud-sdk-go/ucloud" "github.com/ucloud/ucloud-sdk-go/ucloud/auth" @@ -45,7 +45,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { client, err := createSdkClient(config.PrivateKey, config.PublicKey, config.Region) if err != nil { - return nil, xerrors.Wrap(err, "failed to create sdk client") + return nil, fmt.Errorf("failed to create sdk client: %w", err) } uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{ @@ -54,7 +54,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { ProjectId: config.ProjectId, }) if err != nil { - return nil, xerrors.Wrap(err, "failed to create ssl uploader") + return nil, fmt.Errorf("failed to create ssl uploader: %w", err) } return &DeployerProvider{ @@ -79,7 +79,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE // 上传证书到 USSL upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM) if err != nil { - return nil, xerrors.Wrap(err, "failed to upload certificate file") + return nil, fmt.Errorf("failed to upload certificate file: %w", err) } else { d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } @@ -97,7 +97,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE addUFileSSLCertResp, err := d.sdkClient.AddUFileSSLCert(addUFileSSLCertReq) d.logger.Debug("sdk request 'us3.AddUFileSSLCert'", slog.Any("request", addUFileSSLCertReq), slog.Any("response", addUFileSSLCertResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'us3.AddUFileSSLCert'") + return nil, fmt.Errorf("failed to execute sdk request 'us3.AddUFileSSLCert': %w", err) } return &deployer.DeployResult{}, nil diff --git a/internal/pkg/core/deployer/providers/upyun-cdn/upyun_cdn.go b/internal/pkg/core/deployer/providers/upyun-cdn/upyun_cdn.go index d2487204..4c9987a3 100644 --- a/internal/pkg/core/deployer/providers/upyun-cdn/upyun_cdn.go +++ b/internal/pkg/core/deployer/providers/upyun-cdn/upyun_cdn.go @@ -3,9 +3,9 @@ package upyuncdn import ( "context" "errors" + "fmt" "log/slog" - xerrors "github.com/pkg/errors" "golang.org/x/exp/slices" "github.com/usual2970/certimate/internal/pkg/core/deployer" @@ -39,7 +39,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { client, err := createSdkClient(config.Username, config.Password) if err != nil { - return nil, xerrors.Wrap(err, "failed to create sdk client") + return nil, fmt.Errorf("failed to create sdk client: %w", err) } uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{ @@ -47,7 +47,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { Password: config.Password, }) if err != nil { - return nil, xerrors.Wrap(err, "failed to create ssl uploader") + return nil, fmt.Errorf("failed to create ssl uploader: %w", err) } return &DeployerProvider{ @@ -72,7 +72,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE // 上传证书到 SSL upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM) if err != nil { - return nil, xerrors.Wrap(err, "failed to upload certificate file") + return nil, fmt.Errorf("failed to upload certificate file: %w", err) } else { d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } @@ -81,7 +81,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE getHttpsServiceManagerResp, err := d.sdkClient.GetHttpsServiceManager(d.config.Domain) d.logger.Debug("sdk request 'console.GetHttpsServiceManager'", slog.String("request.domain", d.config.Domain), slog.Any("response", getHttpsServiceManagerResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'console.GetHttpsServiceManager'") + return nil, fmt.Errorf("failed to execute sdk request 'console.GetHttpsServiceManager': %w", err) } // 判断域名是否已启用 HTTPS。如果已启用，迁移域名证书；否则，设置新证书 @@ -98,7 +98,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE updateHttpsCertificateManagerResp, err := d.sdkClient.UpdateHttpsCertificateManager(updateHttpsCertificateManagerReq) d.logger.Debug("sdk request 'console.EnableDomainHttps'", slog.Any("request", updateHttpsCertificateManagerReq), slog.Any("response", updateHttpsCertificateManagerResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'console.UpdateHttpsCertificateManager'") + return nil, fmt.Errorf("failed to execute sdk request 'console.UpdateHttpsCertificateManager': %w", err) } } else if getHttpsServiceManagerResp.Data.Domains[lastCertIndex].CertificateId != upres.CertId { migrateHttpsDomainReq := &upyunsdk.MigrateHttpsDomainRequest{ @@ -108,7 +108,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE migrateHttpsDomainResp, err := d.sdkClient.MigrateHttpsDomain(migrateHttpsDomainReq) d.logger.Debug("sdk request 'console.MigrateHttpsDomain'", slog.Any("request", migrateHttpsDomainReq), slog.Any("response", migrateHttpsDomainResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'console.MigrateHttpsDomain'") + return nil, fmt.Errorf("failed to execute sdk request 'console.MigrateHttpsDomain': %w", err) } } diff --git a/internal/pkg/core/deployer/providers/volcengine-alb/volcengine_alb.go b/internal/pkg/core/deployer/providers/volcengine-alb/volcengine_alb.go index 28017d20..c3d0a2d6 100644 --- a/internal/pkg/core/deployer/providers/volcengine-alb/volcengine_alb.go +++ b/internal/pkg/core/deployer/providers/volcengine-alb/volcengine_alb.go @@ -6,7 +6,6 @@ import ( "fmt" "log/slog" - xerrors "github.com/pkg/errors" vealb "github.com/volcengine/volcengine-go-sdk/service/alb" ve "github.com/volcengine/volcengine-go-sdk/volcengine" vesession "github.com/volcengine/volcengine-go-sdk/volcengine/session" @@ -53,7 +52,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { client, err := createSdkClient(config.AccessKeyId, config.AccessKeySecret, config.Region) if err != nil { - return nil, xerrors.Wrap(err, "failed to create sdk client") + return nil, fmt.Errorf("failed to create sdk client: %w", err) } uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{ @@ -62,7 +61,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { Region: config.Region, }) if err != nil { - return nil, xerrors.Wrap(err, "failed to create ssl uploader") + return nil, fmt.Errorf("failed to create ssl uploader: %w", err) } return &DeployerProvider{ @@ -87,7 +86,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE // 上传证书到证书中心 upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM) if err != nil { - return nil, xerrors.Wrap(err, "failed to upload certificate file") + return nil, fmt.Errorf("failed to upload certificate file: %w", err) } else { d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } @@ -105,7 +104,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE } default: - return nil, fmt.Errorf("unsupported resource type: %s", d.config.ResourceType) + return nil, fmt.Errorf("unsupported resource type '%s'", d.config.ResourceType) } return &deployer.DeployResult{}, nil @@ -124,7 +123,7 @@ func (d *DeployerProvider) deployToLoadbalancer(ctx context.Context, cloudCertId describeLoadBalancerAttributesResp, err := d.sdkClient.DescribeLoadBalancerAttributes(describeLoadBalancerAttributesReq) d.logger.Debug("sdk request 'alb.DescribeLoadBalancerAttributes'", slog.Any("request", describeLoadBalancerAttributesReq), slog.Any("response", describeLoadBalancerAttributesResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'alb.DescribeLoadBalancerAttributes'") + return fmt.Errorf("failed to execute sdk request 'alb.DescribeLoadBalancerAttributes': %w", err) } // 查询 HTTPS 监听器列表 @@ -142,7 +141,7 @@ func (d *DeployerProvider) deployToLoadbalancer(ctx context.Context, cloudCertId describeListenersResp, err := d.sdkClient.DescribeListeners(describeListenersReq) d.logger.Debug("sdk request 'alb.DescribeListeners'", slog.Any("request", describeListenersReq), slog.Any("response", describeListenersResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'alb.DescribeListeners'") + return fmt.Errorf("failed to execute sdk request 'alb.DescribeListeners': %w", err) } for _, listener := range describeListenersResp.Listeners { @@ -198,7 +197,7 @@ func (d *DeployerProvider) updateListenerCertificate(ctx context.Context, cloudL describeListenerAttributesResp, err := d.sdkClient.DescribeListenerAttributes(describeListenerAttributesReq) d.logger.Debug("sdk request 'alb.DescribeListenerAttributes'", slog.Any("request", describeListenerAttributesReq), slog.Any("response", describeListenerAttributesResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'alb.DescribeListenerAttributes'") + return fmt.Errorf("failed to execute sdk request 'alb.DescribeListenerAttributes': %w", err) } if d.config.Domain == "" { @@ -214,7 +213,7 @@ func (d *DeployerProvider) updateListenerCertificate(ctx context.Context, cloudL modifyListenerAttributesResp, err := d.sdkClient.ModifyListenerAttributes(modifyListenerAttributesReq) d.logger.Debug("sdk request 'alb.ModifyListenerAttributes'", slog.Any("request", modifyListenerAttributesReq), slog.Any("response", modifyListenerAttributesResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'alb.ModifyListenerAttributes'") + return fmt.Errorf("failed to execute sdk request 'alb.ModifyListenerAttributes': %w", err) } } else { // 指定 SNI，需部署到扩展域名 @@ -243,7 +242,7 @@ func (d *DeployerProvider) updateListenerCertificate(ctx context.Context, cloudL modifyListenerAttributesResp, err := d.sdkClient.ModifyListenerAttributes(modifyListenerAttributesReq) d.logger.Debug("sdk request 'alb.ModifyListenerAttributes'", slog.Any("request", modifyListenerAttributesReq), slog.Any("response", modifyListenerAttributesResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'alb.ModifyListenerAttributes'") + return fmt.Errorf("failed to execute sdk request 'alb.ModifyListenerAttributes': %w", err) } } diff --git a/internal/pkg/core/deployer/providers/volcengine-cdn/volcengine_cdn.go b/internal/pkg/core/deployer/providers/volcengine-cdn/volcengine_cdn.go index 20ecbfdb..f8642b7f 100644 --- a/internal/pkg/core/deployer/providers/volcengine-cdn/volcengine_cdn.go +++ b/internal/pkg/core/deployer/providers/volcengine-cdn/volcengine_cdn.go @@ -3,10 +3,10 @@ package volcenginecdn import ( "context" "errors" + "fmt" "log/slog" "strings" - xerrors "github.com/pkg/errors" vecdn "github.com/volcengine/volc-sdk-golang/service/cdn" "github.com/usual2970/certimate/internal/pkg/core/deployer" @@ -46,7 +46,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { AccessKeySecret: config.AccessKeySecret, }) if err != nil { - return nil, xerrors.Wrap(err, "failed to create ssl uploader") + return nil, fmt.Errorf("failed to create ssl uploader: %w", err) } return &DeployerProvider{ @@ -71,7 +71,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE // 上传证书到 CDN upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM) if err != nil { - return nil, xerrors.Wrap(err, "failed to upload certificate file") + return nil, fmt.Errorf("failed to upload certificate file: %w", err) } else { d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } @@ -86,7 +86,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE describeCertConfigResp, err := d.sdkClient.DescribeCertConfig(describeCertConfigReq) d.logger.Debug("sdk request 'cdn.DescribeCertConfig'", slog.Any("request", describeCertConfigReq), slog.Any("response", describeCertConfigResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'cdn.DescribeCertConfig'") + return nil, fmt.Errorf("failed to execute sdk request 'cdn.DescribeCertConfig': %w", err) } if describeCertConfigResp.Result.CertNotConfig != nil { diff --git a/internal/pkg/core/deployer/providers/volcengine-certcenter/volcengine_certcenter.go b/internal/pkg/core/deployer/providers/volcengine-certcenter/volcengine_certcenter.go index 5a889f99..3989a000 100644 --- a/internal/pkg/core/deployer/providers/volcengine-certcenter/volcengine_certcenter.go +++ b/internal/pkg/core/deployer/providers/volcengine-certcenter/volcengine_certcenter.go @@ -2,10 +2,9 @@ package volcenginecertcenter import ( "context" + "fmt" "log/slog" - xerrors "github.com/pkg/errors" - "github.com/usual2970/certimate/internal/pkg/core/deployer" "github.com/usual2970/certimate/internal/pkg/core/uploader" uploadersp "github.com/usual2970/certimate/internal/pkg/core/uploader/providers/volcengine-certcenter" @@ -39,7 +38,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { Region: config.Region, }) if err != nil { - return nil, xerrors.Wrap(err, "failed to create ssl uploader") + return nil, fmt.Errorf("failed to create ssl uploader: %w", err) } return &DeployerProvider{ @@ -63,7 +62,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE // 上传证书到证书中心 upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM) if err != nil { - return nil, xerrors.Wrap(err, "failed to upload certificate file") + return nil, fmt.Errorf("failed to upload certificate file: %w", err) } else { d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } diff --git a/internal/pkg/core/deployer/providers/volcengine-clb/volcengine_clb.go b/internal/pkg/core/deployer/providers/volcengine-clb/volcengine_clb.go index 4a389a6a..e95aac0e 100644 --- a/internal/pkg/core/deployer/providers/volcengine-clb/volcengine_clb.go +++ b/internal/pkg/core/deployer/providers/volcengine-clb/volcengine_clb.go @@ -6,7 +6,6 @@ import ( "fmt" "log/slog" - xerrors "github.com/pkg/errors" veclb "github.com/volcengine/volcengine-go-sdk/service/clb" ve "github.com/volcengine/volcengine-go-sdk/volcengine" vesession "github.com/volcengine/volcengine-go-sdk/volcengine/session" @@ -49,7 +48,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { client, err := createSdkClient(config.AccessKeyId, config.AccessKeySecret, config.Region) if err != nil { - return nil, xerrors.Wrap(err, "failed to create sdk client") + return nil, fmt.Errorf("failed to create sdk client: %w", err) } uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{ @@ -58,7 +57,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { Region: config.Region, }) if err != nil { - return nil, xerrors.Wrap(err, "failed to create ssl uploader") + return nil, fmt.Errorf("failed to create ssl uploader: %w", err) } return &DeployerProvider{ @@ -83,7 +82,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE // 上传证书到证书中心 upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM) if err != nil { - return nil, xerrors.Wrap(err, "failed to upload certificate file") + return nil, fmt.Errorf("failed to upload certificate file: %w", err) } else { d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } @@ -101,7 +100,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE } default: - return nil, fmt.Errorf("unsupported resource type: %s", d.config.ResourceType) + return nil, fmt.Errorf("unsupported resource type '%s'", d.config.ResourceType) } return &deployer.DeployResult{}, nil @@ -120,7 +119,7 @@ func (d *DeployerProvider) deployToLoadbalancer(ctx context.Context, cloudCertId describeLoadBalancerAttributesResp, err := d.sdkClient.DescribeLoadBalancerAttributes(describeLoadBalancerAttributesReq) d.logger.Debug("sdk request 'clb.DescribeLoadBalancerAttributes'", slog.Any("request", describeLoadBalancerAttributesReq), slog.Any("response", describeLoadBalancerAttributesResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'clb.DescribeLoadBalancerAttributes'") + return fmt.Errorf("failed to execute sdk request 'clb.DescribeLoadBalancerAttributes': %w", err) } // 查询 HTTPS 监听器列表 @@ -138,7 +137,7 @@ func (d *DeployerProvider) deployToLoadbalancer(ctx context.Context, cloudCertId describeListenersResp, err := d.sdkClient.DescribeListeners(describeListenersReq) d.logger.Debug("sdk request 'clb.DescribeListeners'", slog.Any("request", describeListenersReq), slog.Any("response", describeListenersResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'clb.DescribeListeners'") + return fmt.Errorf("failed to execute sdk request 'clb.DescribeListeners': %w", err) } for _, listener := range describeListenersResp.Listeners { @@ -196,7 +195,7 @@ func (d *DeployerProvider) updateListenerCertificate(ctx context.Context, cloudL modifyListenerAttributesResp, err := d.sdkClient.ModifyListenerAttributes(modifyListenerAttributesReq) d.logger.Debug("sdk request 'clb.ModifyListenerAttributes'", slog.Any("request", modifyListenerAttributesReq), slog.Any("response", modifyListenerAttributesResp)) if err != nil { - return xerrors.Wrap(err, "failed to execute sdk request 'clb.ModifyListenerAttributes'") + return fmt.Errorf("failed to execute sdk request 'clb.ModifyListenerAttributes': %w", err) } return nil diff --git a/internal/pkg/core/deployer/providers/volcengine-dcdn/volcengine_dcdn.go b/internal/pkg/core/deployer/providers/volcengine-dcdn/volcengine_dcdn.go index 4b1eda7a..707ccde3 100644 --- a/internal/pkg/core/deployer/providers/volcengine-dcdn/volcengine_dcdn.go +++ b/internal/pkg/core/deployer/providers/volcengine-dcdn/volcengine_dcdn.go @@ -2,10 +2,10 @@ package volcenginedcdn import ( "context" + "fmt" "log/slog" "strings" - xerrors "github.com/pkg/errors" vedcdn "github.com/volcengine/volcengine-go-sdk/service/dcdn" ve "github.com/volcengine/volcengine-go-sdk/volcengine" vesession "github.com/volcengine/volcengine-go-sdk/volcengine/session" @@ -42,7 +42,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { client, err := createSdkClient(config.AccessKeyId, config.AccessKeySecret, config.Region) if err != nil { - return nil, xerrors.Wrap(err, "failed to create sdk client") + return nil, fmt.Errorf("failed to create sdk client: %w", err) } uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{ @@ -51,7 +51,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { Region: config.Region, }) if err != nil { - return nil, xerrors.Wrap(err, "failed to create ssl uploader") + return nil, fmt.Errorf("failed to create ssl uploader: %w", err) } return &DeployerProvider{ @@ -76,7 +76,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE // 上传证书到证书中心 upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM) if err != nil { - return nil, xerrors.Wrap(err, "failed to upload certificate file") + return nil, fmt.Errorf("failed to upload certificate file: %w", err) } else { d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } @@ -94,7 +94,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE createCertBindResp, err := d.sdkClient.CreateCertBind(createCertBindReq) d.logger.Debug("sdk request 'dcdn.CreateCertBind'", slog.Any("request", createCertBindReq), slog.Any("response", createCertBindResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'dcdn.CreateCertBind'") + return nil, fmt.Errorf("failed to execute sdk request 'dcdn.CreateCertBind': %w", err) } return &deployer.DeployResult{}, nil diff --git a/internal/pkg/core/deployer/providers/volcengine-imagex/volcengine_imagex.go b/internal/pkg/core/deployer/providers/volcengine-imagex/volcengine_imagex.go index 7de39b6d..2f419752 100644 --- a/internal/pkg/core/deployer/providers/volcengine-imagex/volcengine_imagex.go +++ b/internal/pkg/core/deployer/providers/volcengine-imagex/volcengine_imagex.go @@ -3,9 +3,9 @@ package volcengineimagex import ( "context" "errors" + "fmt" "log/slog" - xerrors "github.com/pkg/errors" vebase "github.com/volcengine/volc-sdk-golang/base" veimagex "github.com/volcengine/volc-sdk-golang/service/imagex/v2" @@ -43,7 +43,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { client, err := createSdkClient(config.AccessKeyId, config.AccessKeySecret, config.Region) if err != nil { - return nil, xerrors.Wrap(err, "failed to create sdk client") + return nil, fmt.Errorf("failed to create sdk client: %w", err) } uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{ @@ -52,7 +52,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { Region: config.Region, }) if err != nil { - return nil, xerrors.Wrap(err, "failed to create ssl uploader") + return nil, fmt.Errorf("failed to create ssl uploader: %w", err) } return &DeployerProvider{ @@ -84,7 +84,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE // 上传证书到证书中心 upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM) if err != nil { - return nil, xerrors.Wrap(err, "failed to upload certificate file") + return nil, fmt.Errorf("failed to upload certificate file: %w", err) } else { d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } @@ -98,7 +98,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE getDomainConfigResp, err := d.sdkClient.GetDomainConfig(context.TODO(), getDomainConfigReq) d.logger.Debug("sdk request 'imagex.GetDomainConfig'", slog.Any("request", getDomainConfigReq), slog.Any("response", getDomainConfigResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'imagex.GetDomainConfig'") + return nil, fmt.Errorf("failed to execute sdk request 'imagex.GetDomainConfig': %w", err) } // 更新 HTTPS 配置 @@ -127,7 +127,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE updateHttpsResp, err := d.sdkClient.UpdateHTTPS(context.TODO(), updateHttpsReq) d.logger.Debug("sdk request 'imagex.UpdateHttps'", slog.Any("request", updateHttpsReq), slog.Any("response", updateHttpsResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'imagex.UpdateHttps'") + return nil, fmt.Errorf("failed to execute sdk request 'imagex.UpdateHttps': %w", err) } return &deployer.DeployResult{}, nil diff --git a/internal/pkg/core/deployer/providers/volcengine-live/volcengine_live.go b/internal/pkg/core/deployer/providers/volcengine-live/volcengine_live.go index cd75bed9..1b1336b6 100644 --- a/internal/pkg/core/deployer/providers/volcengine-live/volcengine_live.go +++ b/internal/pkg/core/deployer/providers/volcengine-live/volcengine_live.go @@ -3,10 +3,10 @@ package volcenginelive import ( "context" "errors" + "fmt" "log/slog" "strings" - xerrors "github.com/pkg/errors" velive "github.com/volcengine/volc-sdk-golang/service/live/v20230101" ve "github.com/volcengine/volcengine-go-sdk/volcengine" @@ -47,7 +47,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { AccessKeySecret: config.AccessKeySecret, }) if err != nil { - return nil, xerrors.Wrap(err, "failed to create ssl uploader") + return nil, fmt.Errorf("failed to create ssl uploader: %w", err) } return &DeployerProvider{ @@ -72,7 +72,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE // 上传证书到 Live upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM) if err != nil { - return nil, xerrors.Wrap(err, "failed to upload certificate file") + return nil, fmt.Errorf("failed to upload certificate file: %w", err) } else { d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } @@ -92,7 +92,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE listDomainDetailResp, err := d.sdkClient.ListDomainDetail(ctx, listDomainDetailReq) d.logger.Debug("sdk request 'live.ListDomainDetail'", slog.Any("request", listDomainDetailReq), slog.Any("response", listDomainDetailResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'live.ListDomainDetail'") + return nil, fmt.Errorf("failed to execute sdk request 'live.ListDomainDetail': %w", err) } if listDomainDetailResp.Result.DomainList != nil { diff --git a/internal/pkg/core/deployer/providers/volcengine-tos/volcengine_tos.go b/internal/pkg/core/deployer/providers/volcengine-tos/volcengine_tos.go index 9b7f6d08..365d95f2 100644 --- a/internal/pkg/core/deployer/providers/volcengine-tos/volcengine_tos.go +++ b/internal/pkg/core/deployer/providers/volcengine-tos/volcengine_tos.go @@ -6,7 +6,6 @@ import ( "fmt" "log/slog" - xerrors "github.com/pkg/errors" "github.com/volcengine/ve-tos-golang-sdk/v2/tos" "github.com/usual2970/certimate/internal/pkg/core/deployer" @@ -43,7 +42,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { client, err := createSdkClient(config.AccessKeyId, config.AccessKeySecret, config.Region) if err != nil { - return nil, xerrors.Wrap(err, "failed to create sdk client") + return nil, fmt.Errorf("failed to create sdk client: %w", err) } uploader, err := uploadersp.NewUploader(&uploadersp.UploaderConfig{ @@ -52,7 +51,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { Region: config.Region, }) if err != nil { - return nil, xerrors.Wrap(err, "failed to create ssl uploader") + return nil, fmt.Errorf("failed to create ssl uploader: %w", err) } return &DeployerProvider{ @@ -84,7 +83,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE // 上传证书到证书中心 upres, err := d.sslUploader.Upload(ctx, certPEM, privkeyPEM) if err != nil { - return nil, xerrors.Wrap(err, "failed to upload certificate file") + return nil, fmt.Errorf("failed to upload certificate file: %w", err) } else { d.logger.Info("ssl certificate uploaded", slog.Any("result", upres)) } @@ -101,7 +100,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE putBucketCustomDomainResp, err := d.sdkClient.PutBucketCustomDomain(context.TODO(), putBucketCustomDomainReq) d.logger.Debug("sdk request 'tos.PutBucketCustomDomain'", slog.Any("request", putBucketCustomDomainReq), slog.Any("response", putBucketCustomDomainResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'tos.PutBucketCustomDomain'") + return nil, fmt.Errorf("failed to execute sdk request 'tos.PutBucketCustomDomain': %w", err) } return &deployer.DeployResult{}, nil diff --git a/internal/pkg/core/deployer/providers/wangsu-cdnpro/wangsu_cdnpro.go b/internal/pkg/core/deployer/providers/wangsu-cdnpro/wangsu_cdnpro.go index ae80180c..f09cfb92 100644 --- a/internal/pkg/core/deployer/providers/wangsu-cdnpro/wangsu_cdnpro.go +++ b/internal/pkg/core/deployer/providers/wangsu-cdnpro/wangsu_cdnpro.go @@ -16,8 +16,6 @@ import ( "strconv" "time" - xerrors "github.com/pkg/errors" - "github.com/usual2970/certimate/internal/pkg/core/deployer" wangsucdn "github.com/usual2970/certimate/internal/pkg/sdk3rd/wangsu/cdn" certutil "github.com/usual2970/certimate/internal/pkg/utils/cert" @@ -58,7 +56,7 @@ func NewDeployer(config *DeployerConfig) (*DeployerProvider, error) { client, err := createSdkClient(config.AccessKeyId, config.AccessKeySecret) 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 &DeployerProvider{ @@ -92,13 +90,13 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE getHostnameDetailResp, err := d.sdkClient.GetHostnameDetail(d.config.Domain) d.logger.Debug("sdk request 'cdn.GetHostnameDetail'", slog.String("hostname", d.config.Domain), slog.Any("response", getHostnameDetailResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'cdn.GetHostnameDetail'") + return nil, fmt.Errorf("failed to execute sdk request 'cdn.GetHostnameDetail': %w", err) } // 生成网宿云证书参数 encryptedPrivateKey, err := encryptPrivateKey(privkeyPEM, d.config.ApiKey, time.Now().Unix()) if err != nil { - return nil, xerrors.Wrap(err, "failed to encrypt private key") + return nil, fmt.Errorf("failed to encrypt private key: %w", err) } certificateNewVersionInfo := &wangsucdn.CertificateVersion{ PrivateKey: typeutil.ToPtr(encryptedPrivateKey), @@ -130,7 +128,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE createCertificateResp, err := d.sdkClient.CreateCertificate(createCertificateReq) d.logger.Debug("sdk request 'cdn.CreateCertificate'", slog.Any("request", createCertificateReq), slog.Any("response", createCertificateResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'cdn.CreateCertificate'") + return nil, fmt.Errorf("failed to execute sdk request 'cdn.CreateCertificate': %w", err) } wangsuCertUrl = createCertificateResp.CertificateUrl @@ -153,7 +151,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE updateCertificateResp, err := d.sdkClient.UpdateCertificate(d.config.CertificateId, updateCertificateReq) d.logger.Debug("sdk request 'cdn.CreateCertificate'", slog.Any("certificateId", d.config.CertificateId), slog.Any("request", updateCertificateReq), slog.Any("response", updateCertificateResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'cdn.UpdateCertificate'") + return nil, fmt.Errorf("failed to execute sdk request 'cdn.UpdateCertificate': %w", err) } wangsuCertUrl = updateCertificateResp.CertificateUrl @@ -190,7 +188,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE createDeploymentTaskResp, err := d.sdkClient.CreateDeploymentTask(createDeploymentTaskReq) d.logger.Debug("sdk request 'cdn.CreateCertificate'", slog.Any("request", createDeploymentTaskReq), slog.Any("response", createDeploymentTaskResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'cdn.CreateDeploymentTask'") + return nil, fmt.Errorf("failed to execute sdk request 'cdn.CreateDeploymentTask': %w", err) } // 循环获取部署任务详细信息，等待任务状态变更 @@ -208,7 +206,7 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE getDeploymentTaskDetailResp, err := d.sdkClient.GetDeploymentTaskDetail(wangsuTaskId) d.logger.Info("sdk request 'cdn.GetDeploymentTaskDetail'", slog.Any("taskId", wangsuTaskId), slog.Any("response", getDeploymentTaskDetailResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'cdn.GetDeploymentTaskDetail'") + return nil, fmt.Errorf("failed to execute sdk request 'cdn.GetDeploymentTaskDetail': %w", err) } if getDeploymentTaskDetailResp.Status == "failed" { diff --git a/internal/pkg/core/deployer/providers/webhook/webhook.go b/internal/pkg/core/deployer/providers/webhook/webhook.go index ae7648dc..28e0bd7d 100644 --- a/internal/pkg/core/deployer/providers/webhook/webhook.go +++ b/internal/pkg/core/deployer/providers/webhook/webhook.go @@ -4,12 +4,12 @@ import ( "context" "crypto/tls" "encoding/json" + "fmt" "log/slog" "strings" "time" "github.com/go-resty/resty/v2" - xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/deployer" certutil "github.com/usual2970/certimate/internal/pkg/utils/cert" @@ -64,13 +64,13 @@ func (d *DeployerProvider) WithLogger(logger *slog.Logger) deployer.Deployer { func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPEM string) (*deployer.DeployResult, error) { certX509, err := certutil.ParseCertificateFromPEM(certPEM) if err != nil { - return nil, xerrors.Wrap(err, "failed to parse x509") + return nil, fmt.Errorf("failed to parse x509: %w", err) } var webhookData interface{} err = json.Unmarshal([]byte(d.config.WebhookData), &webhookData) if err != nil { - return nil, xerrors.Wrap(err, "failed to unmarshall webhook data") + return nil, fmt.Errorf("failed to unmarshall webhook data: %w", err) } replaceJsonValueRecursively(webhookData, "${DOMAIN}", certX509.Subject.CommonName) @@ -85,9 +85,9 @@ func (d *DeployerProvider) Deploy(ctx context.Context, certPEM string, privkeyPE SetBody(webhookData). Post(d.config.WebhookUrl) if err != nil { - return nil, xerrors.Wrap(err, "failed to send webhook request") + return nil, fmt.Errorf("failed to send webhook request: %w", err) } else if resp.StatusCode() != 200 { - return nil, xerrors.Errorf("unexpected webhook response status code: %d", resp.StatusCode()) + return nil, fmt.Errorf("unexpected webhook response status code: %d", resp.StatusCode()) } d.logger.Debug("webhook responded", slog.Any("response", resp.String())) diff --git a/internal/pkg/core/uploader/providers/1panel-ssl/1panel_ssl.go b/internal/pkg/core/uploader/providers/1panel-ssl/1panel_ssl.go index d8fe51e0..e4817ff8 100644 --- a/internal/pkg/core/uploader/providers/1panel-ssl/1panel_ssl.go +++ b/internal/pkg/core/uploader/providers/1panel-ssl/1panel_ssl.go @@ -9,8 +9,6 @@ import ( "strings" "time" - xerrors "github.com/pkg/errors" - "github.com/usual2970/certimate/internal/pkg/core/uploader" opsdk "github.com/usual2970/certimate/internal/pkg/sdk3rd/1panel" ) @@ -37,7 +35,7 @@ func NewUploader(config *UploaderConfig) (*UploaderProvider, error) { client, err := createSdkClient(config.ApiUrl, 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{ @@ -78,7 +76,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE uploadWebsiteSSLResp, err := u.sdkClient.UploadWebsiteSSL(uploadWebsiteSSLReq) u.logger.Debug("sdk request '1panel.UploadWebsiteSSL'", slog.Any("request", uploadWebsiteSSLReq), slog.Any("response", uploadWebsiteSSLResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request '1panel.UploadWebsiteSSL'") + return nil, fmt.Errorf("failed to execute sdk request '1panel.UploadWebsiteSSL': %w", err) } // 遍历证书列表，获取刚刚上传证书 ID @@ -102,7 +100,7 @@ func (u *UploaderProvider) getCertIfExists(ctx context.Context, certPEM string, searchWebsiteSSLResp, err := u.sdkClient.SearchWebsiteSSL(searchWebsiteSSLReq) u.logger.Debug("sdk request '1panel.SearchWebsiteSSL'", slog.Any("request", searchWebsiteSSLReq), slog.Any("response", searchWebsiteSSLResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request '1panel.SearchWebsiteSSL'") + return nil, fmt.Errorf("failed to execute sdk request '1panel.SearchWebsiteSSL': %w", err) } for _, sslItem := range searchWebsiteSSLResp.Data.Items { diff --git a/internal/pkg/core/uploader/providers/aliyun-cas/aliyun_cas.go b/internal/pkg/core/uploader/providers/aliyun-cas/aliyun_cas.go index 3ed18447..487ee8b5 100644 --- a/internal/pkg/core/uploader/providers/aliyun-cas/aliyun_cas.go +++ b/internal/pkg/core/uploader/providers/aliyun-cas/aliyun_cas.go @@ -10,7 +10,6 @@ import ( alicas "github.com/alibabacloud-go/cas-20200407/v3/client" aliopen "github.com/alibabacloud-go/darabonba-openapi/v2/client" "github.com/alibabacloud-go/tea/tea" - xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/uploader" certutil "github.com/usual2970/certimate/internal/pkg/utils/cert" @@ -40,7 +39,7 @@ func NewUploader(config *UploaderConfig) (*UploaderProvider, error) { client, err := createSdkClient(config.AccessKeyId, config.AccessKeySecret, config.Region) 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{ @@ -80,7 +79,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE listUserCertificateOrderResp, err := u.sdkClient.ListUserCertificateOrder(listUserCertificateOrderReq) u.logger.Debug("sdk request 'cas.ListUserCertificateOrder'", slog.Any("request", listUserCertificateOrderReq), slog.Any("response", listUserCertificateOrderResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'cas.ListUserCertificateOrder'") + return nil, fmt.Errorf("failed to execute sdk request 'cas.ListUserCertificateOrder': %w", err) } if listUserCertificateOrderResp.Body.CertificateOrderList != nil { @@ -95,7 +94,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE getUserCertificateDetailResp, err := u.sdkClient.GetUserCertificateDetail(getUserCertificateDetailReq) u.logger.Debug("sdk request 'cas.GetUserCertificateDetail'", slog.Any("request", getUserCertificateDetailReq), slog.Any("response", getUserCertificateDetailResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'cas.GetUserCertificateDetail'") + return nil, fmt.Errorf("failed to execute sdk request 'cas.GetUserCertificateDetail': %w", err) } var isSameCert bool @@ -145,7 +144,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE uploadUserCertificateResp, err := u.sdkClient.UploadUserCertificate(uploadUserCertificateReq) u.logger.Debug("sdk request 'cas.UploadUserCertificate'", slog.Any("request", uploadUserCertificateReq), slog.Any("response", uploadUserCertificateResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'cas.UploadUserCertificate'") + return nil, fmt.Errorf("failed to execute sdk request 'cas.UploadUserCertificate': %w", err) } // 获取证书详情 @@ -157,7 +156,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE getUserCertificateDetailResp, err := u.sdkClient.GetUserCertificateDetail(getUserCertificateDetailReq) u.logger.Debug("sdk request 'cas.GetUserCertificateDetail'", slog.Any("request", getUserCertificateDetailReq), slog.Any("response", getUserCertificateDetailResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'cas.GetUserCertificateDetail'") + return nil, fmt.Errorf("failed to execute sdk request 'cas.GetUserCertificateDetail': %w", err) } return &uploader.UploadResult{ diff --git a/internal/pkg/core/uploader/providers/aliyun-slb/aliyun_slb.go b/internal/pkg/core/uploader/providers/aliyun-slb/aliyun_slb.go index f9e0131d..cc1544c1 100644 --- a/internal/pkg/core/uploader/providers/aliyun-slb/aliyun_slb.go +++ b/internal/pkg/core/uploader/providers/aliyun-slb/aliyun_slb.go @@ -13,7 +13,6 @@ import ( aliopen "github.com/alibabacloud-go/darabonba-openapi/v2/client" alislb "github.com/alibabacloud-go/slb-20140515/v4/client" "github.com/alibabacloud-go/tea/tea" - xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/uploader" certutil "github.com/usual2970/certimate/internal/pkg/utils/cert" @@ -43,7 +42,7 @@ func NewUploader(config *UploaderConfig) (*UploaderProvider, error) { client, err := createSdkClient(config.AccessKeyId, config.AccessKeySecret, config.Region) 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{ @@ -77,7 +76,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE describeServerCertificatesResp, err := u.sdkClient.DescribeServerCertificates(describeServerCertificatesReq) u.logger.Debug("sdk request 'slb.DescribeServerCertificates'", slog.Any("request", describeServerCertificatesReq), slog.Any("response", describeServerCertificatesResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'slb.DescribeServerCertificates'") + return nil, fmt.Errorf("failed to execute sdk request 'slb.DescribeServerCertificates': %w", err) } if describeServerCertificatesResp.Body.ServerCertificates != nil && describeServerCertificatesResp.Body.ServerCertificates.ServerCertificate != nil { @@ -119,7 +118,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE uploadServerCertificateResp, err := u.sdkClient.UploadServerCertificate(uploadServerCertificateReq) u.logger.Debug("sdk request 'slb.UploadServerCertificate'", slog.Any("request", uploadServerCertificateReq), slog.Any("response", uploadServerCertificateResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'slb.UploadServerCertificate'") + return nil, fmt.Errorf("failed to execute sdk request 'slb.UploadServerCertificate': %w", err) } certId = *uploadServerCertificateResp.Body.ServerCertificateId diff --git a/internal/pkg/core/uploader/providers/aws-acm/aws_acm.go b/internal/pkg/core/uploader/providers/aws-acm/aws_acm.go index ccc3b152..8babb671 100644 --- a/internal/pkg/core/uploader/providers/aws-acm/aws_acm.go +++ b/internal/pkg/core/uploader/providers/aws-acm/aws_acm.go @@ -2,13 +2,13 @@ package awsacm import ( "context" + "fmt" "log/slog" aws "github.com/aws/aws-sdk-go-v2/aws" awscfg "github.com/aws/aws-sdk-go-v2/config" awscred "github.com/aws/aws-sdk-go-v2/credentials" awsacm "github.com/aws/aws-sdk-go-v2/service/acm" - xerrors "github.com/pkg/errors" "golang.org/x/exp/slices" "github.com/usual2970/certimate/internal/pkg/core/uploader" @@ -39,7 +39,7 @@ func NewUploader(config *UploaderConfig) (*UploaderProvider, error) { client, err := createSdkClient(config.AccessKeyId, config.SecretAccessKey, config.Region) 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{ @@ -81,7 +81,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE listCertificatesResp, err := u.sdkClient.ListCertificates(context.TODO(), listCertificatesReq) u.logger.Debug("sdk request 'acm.ListCertificates'", slog.Any("request", listCertificatesReq), slog.Any("response", listCertificatesResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'acm.ListCertificates'") + return nil, fmt.Errorf("failed to execute sdk request 'acm.ListCertificates': %w", err) } for _, certSummary := range listCertificatesResp.CertificateSummaryList { @@ -105,7 +105,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE } getCertificateResp, err := u.sdkClient.GetCertificate(context.TODO(), getCertificateReq) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'acm.GetCertificate'") + return nil, fmt.Errorf("failed to execute sdk request 'acm.GetCertificate': %w", err) } else { oldCertPEM := aws.ToString(getCertificateResp.CertificateChain) if oldCertPEM == "" { @@ -146,7 +146,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE importCertificateResp, err := u.sdkClient.ImportCertificate(context.TODO(), importCertificateReq) u.logger.Debug("sdk request 'acm.ImportCertificate'", slog.Any("request", importCertificateReq), slog.Any("response", importCertificateResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'acm.ImportCertificate'") + return nil, fmt.Errorf("failed to execute sdk request 'acm.ImportCertificate': %w", err) } return &uploader.UploadResult{ diff --git a/internal/pkg/core/uploader/providers/azure-keyvault/azure_keyvault.go b/internal/pkg/core/uploader/providers/azure-keyvault/azure_keyvault.go index 75af095e..5ac68d69 100644 --- a/internal/pkg/core/uploader/providers/azure-keyvault/azure_keyvault.go +++ b/internal/pkg/core/uploader/providers/azure-keyvault/azure_keyvault.go @@ -12,7 +12,6 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/azidentity" "github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azcertificates" - xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/uploader" azcommon "github.com/usual2970/certimate/internal/pkg/sdk3rd/azure/common" @@ -47,7 +46,7 @@ func NewUploader(config *UploaderConfig) (*UploaderProvider, error) { client, err := createSdkClient(config.TenantId, config.ClientId, config.ClientSecret, config.CloudName, config.KeyVaultName) 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{ @@ -85,7 +84,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE for listCertificatesPager.More() { page, err := listCertificatesPager.NextPage(context.TODO()) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'keyvault.GetCertificates'") + return nil, fmt.Errorf("failed to execute sdk request 'keyvault.GetCertificates': %w", err) } for _, certProp := range page.Value { @@ -118,7 +117,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE getCertificateResp, err := u.sdkClient.GetCertificate(context.TODO(), certProp.ID.Name(), certProp.ID.Version(), nil) u.logger.Debug("sdk request 'keyvault.GetCertificate'", slog.String("request.certificateName", certProp.ID.Name()), slog.String("request.certificateVersion", certProp.ID.Version()), slog.Any("response", getCertificateResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'keyvault.GetCertificate'") + return nil, fmt.Errorf("failed to execute sdk request 'keyvault.GetCertificate': %w", err) } else { oldCertX509, err := x509.ParseCertificate(getCertificateResp.CER) if err != nil { @@ -147,7 +146,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE // 暂时的解决方法是，将 PEM 证书转换成 PFX 格式，然后再导入。 certPFX, err := certutil.TransformCertificateFromPEMToPFX(certPEM, privkeyPEM, "") if err != nil { - return nil, xerrors.Wrap(err, "failed to transform certificate from PEM to PFX") + return nil, fmt.Errorf("failed to transform certificate from PEM to PFX: %w", err) } // 导入证书 @@ -167,7 +166,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE importCertificateResp, err := u.sdkClient.ImportCertificate(context.TODO(), certName, importCertificateParams, nil) u.logger.Debug("sdk request 'keyvault.ImportCertificate'", slog.String("request.certificateName", certName), slog.Any("request.parameters", importCertificateParams), slog.Any("response", importCertificateResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'keyvault.ImportCertificate'") + return nil, fmt.Errorf("failed to execute sdk request 'keyvault.ImportCertificate': %w", err) } return &uploader.UploadResult{ diff --git a/internal/pkg/core/uploader/providers/baiducloud-cert/baiducloud_cert.go b/internal/pkg/core/uploader/providers/baiducloud-cert/baiducloud_cert.go index 9e4776dc..727aa03f 100644 --- a/internal/pkg/core/uploader/providers/baiducloud-cert/baiducloud_cert.go +++ b/internal/pkg/core/uploader/providers/baiducloud-cert/baiducloud_cert.go @@ -7,8 +7,6 @@ import ( "strings" "time" - xerrors "github.com/pkg/errors" - "github.com/usual2970/certimate/internal/pkg/core/uploader" bdsdk "github.com/usual2970/certimate/internal/pkg/sdk3rd/baiducloud/cert" certutil "github.com/usual2970/certimate/internal/pkg/utils/cert" @@ -36,7 +34,7 @@ func NewUploader(config *UploaderConfig) (*UploaderProvider, error) { client, err := createSdkClient(config.AccessKeyId, config.SecretAccessKey) 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{ @@ -67,7 +65,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE listCertDetail, err := u.sdkClient.ListCertDetail() u.logger.Debug("sdk request 'cert.ListCertDetail'", slog.Any("response", listCertDetail)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'cert.ListCertDetail'") + return nil, fmt.Errorf("failed to execute sdk request 'cert.ListCertDetail': %w", err) } else { for _, certDetail := range listCertDetail.Certs { // 先对比证书通用名称 @@ -91,7 +89,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE getCertDetailResp, err := u.sdkClient.GetCertRawData(certDetail.CertId) u.logger.Debug("sdk request 'cert.GetCertRawData'", slog.Any("certId", certDetail.CertId), slog.Any("response", getCertDetailResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'cert.GetCertRawData'") + return nil, fmt.Errorf("failed to execute sdk request 'cert.GetCertRawData': %w", err) } else { oldCertX509, err := certutil.ParseCertificateFromPEM(getCertDetailResp.CertServerData) if err != nil { @@ -120,7 +118,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE createCertResp, err := u.sdkClient.CreateCert(createCertReq) u.logger.Debug("sdk request 'cert.CreateCert'", slog.Any("request", createCertReq), slog.Any("response", createCertResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'cert.CreateCert'") + return nil, fmt.Errorf("failed to execute sdk request 'cert.CreateCert': %w", err) } return &uploader.UploadResult{ diff --git a/internal/pkg/core/uploader/providers/byteplus-cdn/byteplus_cdn.go b/internal/pkg/core/uploader/providers/byteplus-cdn/byteplus_cdn.go index d69bcc15..e94655df 100644 --- a/internal/pkg/core/uploader/providers/byteplus-cdn/byteplus_cdn.go +++ b/internal/pkg/core/uploader/providers/byteplus-cdn/byteplus_cdn.go @@ -11,7 +11,6 @@ import ( "time" bytepluscdn "github.com/byteplus-sdk/byteplus-sdk-golang/service/cdn" - xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/uploader" certutil "github.com/usual2970/certimate/internal/pkg/utils/cert" @@ -78,7 +77,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE listCertInfoResp, err := u.sdkClient.ListCertInfo(listCertInfoReq) u.logger.Debug("sdk request 'cdn.ListCertInfo'", slog.Any("request", listCertInfoReq), slog.Any("response", listCertInfoResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'cdn.ListCertInfo'") + return nil, fmt.Errorf("failed to execute sdk request 'cdn.ListCertInfo': %w", err) } if listCertInfoResp.Result.CertInfo != nil { @@ -122,7 +121,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE addCertificateResp, err := u.sdkClient.AddCertificate(addCertificateReq) u.logger.Debug("sdk request 'cdn.AddCertificate'", slog.Any("request", addCertificateReq), slog.Any("response", addCertificateResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'cdn.AddCertificate'") + return nil, fmt.Errorf("failed to execute sdk request 'cdn.AddCertificate': %w", err) } certId = addCertificateResp.Result.CertId diff --git a/internal/pkg/core/uploader/providers/dogecloud/dogecloud.go b/internal/pkg/core/uploader/providers/dogecloud/dogecloud.go index 78364908..ca98fc90 100644 --- a/internal/pkg/core/uploader/providers/dogecloud/dogecloud.go +++ b/internal/pkg/core/uploader/providers/dogecloud/dogecloud.go @@ -6,8 +6,6 @@ import ( "log/slog" "time" - xerrors "github.com/pkg/errors" - "github.com/usual2970/certimate/internal/pkg/core/uploader" dogesdk "github.com/usual2970/certimate/internal/pkg/sdk3rd/dogecloud" ) @@ -34,7 +32,7 @@ func NewUploader(config *UploaderConfig) (*UploaderProvider, error) { client, err := createSdkClient(config.AccessKey, config.SecretKey) 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{ @@ -63,7 +61,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE uploadSslCertResp, err := u.sdkClient.UploadCdnCert(certName, certPEM, privkeyPEM) u.logger.Debug("sdk request 'cdn.UploadCdnCert'", slog.Any("response", uploadSslCertResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'cdn.UploadCdnCert'") + return nil, fmt.Errorf("failed to execute sdk request 'cdn.UploadCdnCert': %w", err) } certId = fmt.Sprintf("%d", uploadSslCertResp.Data.Id) diff --git a/internal/pkg/core/uploader/providers/gcore-cdn/gcore_cdn.go b/internal/pkg/core/uploader/providers/gcore-cdn/gcore_cdn.go index c941e9aa..c5dc5296 100644 --- a/internal/pkg/core/uploader/providers/gcore-cdn/gcore_cdn.go +++ b/internal/pkg/core/uploader/providers/gcore-cdn/gcore_cdn.go @@ -9,7 +9,6 @@ import ( gprovider "github.com/G-Core/gcorelabscdn-go/gcore/provider" gsslcerts "github.com/G-Core/gcorelabscdn-go/sslcerts" - xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/uploader" gcoresdk "github.com/usual2970/certimate/internal/pkg/sdk3rd/gcore/common" @@ -35,7 +34,7 @@ func NewUploader(config *UploaderConfig) (*UploaderProvider, error) { client, err := createSdkClient(config.ApiToken) 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{ @@ -71,7 +70,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE createCertificateResp, err := u.sdkClient.Create(context.TODO(), createCertificateReq) u.logger.Debug("sdk request 'sslcerts.Create'", slog.Any("request", createCertificateReq), slog.Any("response", createCertificateResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'sslcerts.Create'") + return nil, fmt.Errorf("failed to execute sdk request 'sslcerts.Create': %w", err) } certId = fmt.Sprintf("%d", createCertificateResp.ID) diff --git a/internal/pkg/core/uploader/providers/huaweicloud-elb/huaweicloud_elb.go b/internal/pkg/core/uploader/providers/huaweicloud-elb/huaweicloud_elb.go index 59474b6d..9a7d74b1 100644 --- a/internal/pkg/core/uploader/providers/huaweicloud-elb/huaweicloud_elb.go +++ b/internal/pkg/core/uploader/providers/huaweicloud-elb/huaweicloud_elb.go @@ -15,7 +15,6 @@ import ( hciam "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/iam/v3" hciammodel "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/iam/v3/model" hciamregion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/iam/v3/region" - xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/uploader" certutil "github.com/usual2970/certimate/internal/pkg/utils/cert" @@ -46,7 +45,7 @@ func NewUploader(config *UploaderConfig) (*UploaderProvider, error) { client, err := createSdkClient(config.AccessKeyId, config.SecretAccessKey, config.Region) 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{ @@ -85,7 +84,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE listCertificatesResp, err := u.sdkClient.ListCertificates(listCertificatesReq) u.logger.Debug("sdk request 'elb.ListCertificates'", slog.Any("request", listCertificatesReq), slog.Any("response", listCertificatesResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'elb.ListCertificates'") + return nil, fmt.Errorf("failed to execute sdk request 'elb.ListCertificates': %w", err) } if listCertificatesResp.Certificates != nil { @@ -124,7 +123,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE // REF: https://support.huaweicloud.com/api-iam/iam_06_0001.html projectId, err := getSdkProjectId(u.config.AccessKeyId, u.config.SecretAccessKey, u.config.Region) if err != nil { - return nil, xerrors.Wrap(err, "failed to get SDK project id") + return nil, fmt.Errorf("failed to get SDK project id: %w", err) } // 生成新证书名（需符合华为云命名规则） @@ -146,7 +145,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE createCertificateResp, err := u.sdkClient.CreateCertificate(createCertificateReq) u.logger.Debug("sdk request 'elb.CreateCertificate'", slog.Any("request", createCertificateReq), slog.Any("response", createCertificateResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'elb.CreateCertificate'") + return nil, fmt.Errorf("failed to execute sdk request 'elb.CreateCertificate': %w", err) } certId = createCertificateResp.Certificate.Id diff --git a/internal/pkg/core/uploader/providers/huaweicloud-scm/huaweicloud_scm.go b/internal/pkg/core/uploader/providers/huaweicloud-scm/huaweicloud_scm.go index e49f7dd5..a26b471a 100644 --- a/internal/pkg/core/uploader/providers/huaweicloud-scm/huaweicloud_scm.go +++ b/internal/pkg/core/uploader/providers/huaweicloud-scm/huaweicloud_scm.go @@ -10,7 +10,6 @@ import ( hcscm "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/scm/v3" hcscmmodel "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/scm/v3/model" hcscmregion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/scm/v3/region" - xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/uploader" certutil "github.com/usual2970/certimate/internal/pkg/utils/cert" @@ -41,7 +40,7 @@ func NewUploader(config *UploaderConfig) (*UploaderProvider, error) { client, err := createSdkClient(config.AccessKeyId, config.SecretAccessKey, config.Region) 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{ @@ -82,7 +81,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE listCertificatesResp, err := u.sdkClient.ListCertificates(listCertificatesReq) u.logger.Debug("sdk request 'scm.ListCertificates'", slog.Any("request", listCertificatesReq), slog.Any("response", listCertificatesResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'scm.ListCertificates'") + return nil, fmt.Errorf("failed to execute sdk request 'scm.ListCertificates': %w", err) } if listCertificatesResp.Certificates != nil { @@ -96,7 +95,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE if exportCertificateResp != nil && exportCertificateResp.HttpStatusCode == 404 { continue } - return nil, xerrors.Wrap(err, "failed to execute sdk request 'scm.ExportCertificate'") + return nil, fmt.Errorf("failed to execute sdk request 'scm.ExportCertificate': %w", err) } var isSameCert bool @@ -145,7 +144,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE importCertificateResp, err := u.sdkClient.ImportCertificate(importCertificateReq) u.logger.Debug("sdk request 'scm.ImportCertificate'", slog.Any("request", importCertificateReq), slog.Any("response", importCertificateResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'scm.ImportCertificate'") + return nil, fmt.Errorf("failed to execute sdk request 'scm.ImportCertificate': %w", err) } certId = *importCertificateResp.CertificateId diff --git a/internal/pkg/core/uploader/providers/huaweicloud-waf/huaweicloud_waf.go b/internal/pkg/core/uploader/providers/huaweicloud-waf/huaweicloud_waf.go index 4998a072..9e3bbd59 100644 --- a/internal/pkg/core/uploader/providers/huaweicloud-waf/huaweicloud_waf.go +++ b/internal/pkg/core/uploader/providers/huaweicloud-waf/huaweicloud_waf.go @@ -15,7 +15,6 @@ import ( hcwaf "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/waf/v1" hcwafmodel "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/waf/v1/model" hcwafregion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/waf/v1/region" - xerrors "github.com/pkg/errors" "github.com/usual2970/certimate/internal/pkg/core/uploader" certutil "github.com/usual2970/certimate/internal/pkg/utils/cert" @@ -46,7 +45,7 @@ func NewUploader(config *UploaderConfig) (*UploaderProvider, error) { client, err := createSdkClient(config.AccessKeyId, config.SecretAccessKey, config.Region) 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{ @@ -85,7 +84,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE listCertificatesResp, err := u.sdkClient.ListCertificates(listCertificatesReq) u.logger.Debug("sdk request 'waf.ShowCertificate'", slog.Any("request", listCertificatesReq), slog.Any("response", listCertificatesResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'waf.ListCertificates'") + return nil, fmt.Errorf("failed to execute sdk request 'waf.ListCertificates': %w", err) } if listCertificatesResp.Items != nil { @@ -96,7 +95,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE showCertificateResp, err := u.sdkClient.ShowCertificate(showCertificateReq) u.logger.Debug("sdk request 'waf.ShowCertificate'", slog.Any("request", showCertificateReq), slog.Any("response", showCertificateResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'waf.ShowCertificate'") + return nil, fmt.Errorf("failed to execute sdk request 'waf.ShowCertificate': %w", err) } var isSameCert bool @@ -145,7 +144,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE createCertificateResp, err := u.sdkClient.CreateCertificate(createCertificateReq) u.logger.Debug("sdk request 'waf.CreateCertificate'", slog.Any("request", createCertificateReq), slog.Any("response", createCertificateResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'waf.CreateCertificate'") + return nil, fmt.Errorf("failed to execute sdk request 'waf.CreateCertificate': %w", err) } certId = *createCertificateResp.Id diff --git a/internal/pkg/core/uploader/providers/jdcloud-ssl/jdcloud_ssl.go b/internal/pkg/core/uploader/providers/jdcloud-ssl/jdcloud_ssl.go index c9389273..a0cbb1d9 100644 --- a/internal/pkg/core/uploader/providers/jdcloud-ssl/jdcloud_ssl.go +++ b/internal/pkg/core/uploader/providers/jdcloud-ssl/jdcloud_ssl.go @@ -12,7 +12,6 @@ import ( jdcore "github.com/jdcloud-api/jdcloud-sdk-go/core" jdsslapi "github.com/jdcloud-api/jdcloud-sdk-go/services/ssl/apis" jdsslclient "github.com/jdcloud-api/jdcloud-sdk-go/services/ssl/client" - xerrors "github.com/pkg/errors" "golang.org/x/exp/slices" "github.com/usual2970/certimate/internal/pkg/core/uploader" @@ -41,7 +40,7 @@ func NewUploader(config *UploaderConfig) (*UploaderProvider, error) { client, err := createSdkClient(config.AccessKeyId, config.AccessKeySecret) 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{ @@ -85,7 +84,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE describeCertsResp, err := u.sdkClient.DescribeCerts(describeCertsReq) u.logger.Debug("sdk request 'ssl.DescribeCerts'", slog.Any("request", describeCertsReq), slog.Any("response", describeCertsResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'ssl.DescribeCerts'") + return nil, fmt.Errorf("failed to execute sdk request 'ssl.DescribeCerts': %w", err) } for _, certDetail := range describeCertsResp.Result.CertListDetails { @@ -137,7 +136,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE uploadCertResp, err := u.sdkClient.UploadCert(uploadCertReq) u.logger.Debug("sdk request 'ssl.UploadCertificate'", slog.Any("request", uploadCertReq), slog.Any("response", uploadCertResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'ssl.UploadCertificate'") + return nil, fmt.Errorf("failed to execute sdk request 'ssl.UploadCertificate': %w", err) } return &uploader.UploadResult{ diff --git a/internal/pkg/core/uploader/providers/qiniu-sslcert/qiniu_sslcert.go b/internal/pkg/core/uploader/providers/qiniu-sslcert/qiniu_sslcert.go index 594c8fd7..8dc2fefe 100644 --- a/internal/pkg/core/uploader/providers/qiniu-sslcert/qiniu_sslcert.go +++ b/internal/pkg/core/uploader/providers/qiniu-sslcert/qiniu_sslcert.go @@ -7,7 +7,6 @@ import ( "log/slog" "time" - xerrors "github.com/pkg/errors" "github.com/qiniu/go-sdk/v7/auth" "github.com/usual2970/certimate/internal/pkg/core/uploader" @@ -37,7 +36,7 @@ func NewUploader(config *UploaderConfig) (*UploaderProvider, error) { client, err := createSdkClient(config.AccessKey, config.SecretKey) 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{ @@ -72,7 +71,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE uploadSslCertResp, err := u.sdkClient.UploadSslCert(context.TODO(), certName, certX509.Subject.CommonName, certPEM, privkeyPEM) u.logger.Debug("sdk request 'cdn.UploadSslCert'", slog.Any("response", uploadSslCertResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'cdn.UploadSslCert'") + return nil, fmt.Errorf("failed to execute sdk request 'cdn.UploadSslCert': %w", err) } certId = uploadSslCertResp.CertID diff --git a/internal/pkg/core/uploader/providers/rainyun-sslcenter/rainyun_sslcenter.go b/internal/pkg/core/uploader/providers/rainyun-sslcenter/rainyun_sslcenter.go index 3991d07f..1cfdecc7 100644 --- a/internal/pkg/core/uploader/providers/rainyun-sslcenter/rainyun_sslcenter.go +++ b/internal/pkg/core/uploader/providers/rainyun-sslcenter/rainyun_sslcenter.go @@ -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 diff --git a/internal/pkg/core/uploader/providers/tencentcloud-ssl/tencentcloud_ssl.go b/internal/pkg/core/uploader/providers/tencentcloud-ssl/tencentcloud_ssl.go index a117607b..59067de4 100644 --- a/internal/pkg/core/uploader/providers/tencentcloud-ssl/tencentcloud_ssl.go +++ b/internal/pkg/core/uploader/providers/tencentcloud-ssl/tencentcloud_ssl.go @@ -2,9 +2,9 @@ package tencentcloudssl import ( "context" + "fmt" "log/slog" - xerrors "github.com/pkg/errors" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" tcssl "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl/v20191205" @@ -34,7 +34,7 @@ func NewUploader(config *UploaderConfig) (*UploaderProvider, error) { client, err := createSdkClient(config.SecretId, config.SecretKey) 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{ @@ -63,7 +63,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE uploadCertificateResp, err := u.sdkClient.UploadCertificate(uploadCertificateReq) u.logger.Debug("sdk request 'ssl.UploadCertificate'", slog.Any("request", uploadCertificateReq), slog.Any("response", uploadCertificateResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'ssl.UploadCertificate'") + return nil, fmt.Errorf("failed to execute sdk request 'ssl.UploadCertificate': %w", err) } certId := *uploadCertificateResp.Response.CertificateId diff --git a/internal/pkg/core/uploader/providers/ucloud-ussl/ucloud_ussl.go b/internal/pkg/core/uploader/providers/ucloud-ussl/ucloud_ussl.go index d74f9a38..eb4ce1bf 100644 --- a/internal/pkg/core/uploader/providers/ucloud-ussl/ucloud_ussl.go +++ b/internal/pkg/core/uploader/providers/ucloud-ussl/ucloud_ussl.go @@ -12,7 +12,6 @@ import ( "strings" "time" - xerrors "github.com/pkg/errors" "github.com/ucloud/ucloud-sdk-go/ucloud" ucloudauth "github.com/ucloud/ucloud-sdk-go/ucloud/auth" @@ -45,7 +44,7 @@ func NewUploader(config *UploaderConfig) (*UploaderProvider, error) { client, err := createSdkClient(config.PrivateKey, config.PublicKey) 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{ @@ -99,7 +98,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE } } - return nil, xerrors.Wrap(err, "failed to execute sdk request 'ussl.UploadNormalCertificate'") + return nil, fmt.Errorf("failed to execute sdk request 'ussl.UploadNormalCertificate': %w", err) } certId = fmt.Sprintf("%d", uploadNormalCertificateResp.CertificateID) @@ -137,7 +136,7 @@ func (u *UploaderProvider) getCertIfExists(ctx context.Context, certPEM string) getCertificateListResp, err := u.sdkClient.GetCertificateList(getCertificateListReq) u.logger.Debug("sdk request 'ussl.GetCertificateList'", slog.Any("request", getCertificateListReq), slog.Any("response", getCertificateListResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'ussl.GetCertificateList'") + return nil, fmt.Errorf("failed to execute sdk request 'ussl.GetCertificateList': %w", err) } if getCertificateListResp.CertificateList != nil { @@ -164,7 +163,7 @@ func (u *UploaderProvider) getCertIfExists(ctx context.Context, certPEM string) } getCertificateDetailInfoResp, err := u.sdkClient.GetCertificateDetailInfo(getCertificateDetailInfoReq) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'ussl.GetCertificateDetailInfo'") + return nil, fmt.Errorf("failed to execute sdk request 'ussl.GetCertificateDetailInfo': %w", err) } switch certX509.SignatureAlgorithm { diff --git a/internal/pkg/core/uploader/providers/upyun-ssl/upyun_ssl.go b/internal/pkg/core/uploader/providers/upyun-ssl/upyun_ssl.go index 10eb5dbf..7a8bd3a0 100644 --- a/internal/pkg/core/uploader/providers/upyun-ssl/upyun_ssl.go +++ b/internal/pkg/core/uploader/providers/upyun-ssl/upyun_ssl.go @@ -3,10 +3,9 @@ package upyunssl import ( "context" "errors" + "fmt" "log/slog" - xerrors "github.com/pkg/errors" - "github.com/usual2970/certimate/internal/pkg/core/uploader" upyunsdk "github.com/usual2970/certimate/internal/pkg/sdk3rd/upyun/console" ) @@ -33,7 +32,7 @@ func NewUploader(config *UploaderConfig) (*UploaderProvider, error) { client, err := createSdkClient(config.Username, config.Password) 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{ @@ -61,7 +60,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE uploadHttpsCertificateResp, err := u.sdkClient.UploadHttpsCertificate(uploadHttpsCertificateReq) u.logger.Debug("sdk request 'console.UploadHttpsCertificate'", slog.Any("response", uploadHttpsCertificateResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'console.UploadHttpsCertificate'") + return nil, fmt.Errorf("failed to execute sdk request 'console.UploadHttpsCertificate': %w", err) } return &uploader.UploadResult{ diff --git a/internal/pkg/core/uploader/providers/volcengine-cdn/volcengine_cdn.go b/internal/pkg/core/uploader/providers/volcengine-cdn/volcengine_cdn.go index 9fb0cd23..48e03722 100644 --- a/internal/pkg/core/uploader/providers/volcengine-cdn/volcengine_cdn.go +++ b/internal/pkg/core/uploader/providers/volcengine-cdn/volcengine_cdn.go @@ -10,7 +10,6 @@ import ( "strings" "time" - xerrors "github.com/pkg/errors" vecdn "github.com/volcengine/volc-sdk-golang/service/cdn" ve "github.com/volcengine/volcengine-go-sdk/volcengine" @@ -79,7 +78,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE listCertInfoResp, err := u.sdkClient.ListCertInfo(listCertInfoReq) u.logger.Debug("sdk request 'cdn.ListCertInfo'", slog.Any("request", listCertInfoReq), slog.Any("response", listCertInfoResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'cdn.ListCertInfo'") + return nil, fmt.Errorf("failed to execute sdk request 'cdn.ListCertInfo': %w", err) } if listCertInfoResp.Result.CertInfo != nil { @@ -123,7 +122,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE addCertificateResp, err := u.sdkClient.AddCertificate(addCertificateReq) u.logger.Debug("sdk request 'cdn.AddCertificate'", slog.Any("request", addCertificateResp), slog.Any("response", addCertificateResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'cdn.AddCertificate'") + return nil, fmt.Errorf("failed to execute sdk request 'cdn.AddCertificate': %w", err) } certId = addCertificateResp.Result.CertId diff --git a/internal/pkg/core/uploader/providers/volcengine-certcenter/volcengine_certcenter.go b/internal/pkg/core/uploader/providers/volcengine-certcenter/volcengine_certcenter.go index f04e9e53..99511ebf 100644 --- a/internal/pkg/core/uploader/providers/volcengine-certcenter/volcengine_certcenter.go +++ b/internal/pkg/core/uploader/providers/volcengine-certcenter/volcengine_certcenter.go @@ -2,9 +2,10 @@ package volcenginecertcenter import ( "context" + "errors" + "fmt" "log/slog" - xerrors "github.com/pkg/errors" ve "github.com/volcengine/volcengine-go-sdk/volcengine" vesession "github.com/volcengine/volcengine-go-sdk/volcengine/session" @@ -36,7 +37,7 @@ func NewUploader(config *UploaderConfig) (*UploaderProvider, error) { client, err := createSdkClient(config.AccessKeyId, config.AccessKeySecret, config.Region) 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{ @@ -68,7 +69,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE importCertificateResp, err := u.sdkClient.ImportCertificate(importCertificateReq) u.logger.Debug("sdk request 'certcenter.ImportCertificate'", slog.Any("request", importCertificateReq), slog.Any("response", importCertificateResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'certcenter.ImportCertificate'") + return nil, fmt.Errorf("failed to execute sdk request 'certcenter.ImportCertificate': %w", err) } var certId string @@ -80,7 +81,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE } if certId == "" { - return nil, xerrors.New("failed to get certificate id, both `InstanceId` and `RepeatId` are empty") + return nil, errors.New("failed to get certificate id from response, both `InstanceId` and `RepeatId` are empty") } return &uploader.UploadResult{ diff --git a/internal/pkg/core/uploader/providers/volcengine-live/volcengine_live.go b/internal/pkg/core/uploader/providers/volcengine-live/volcengine_live.go index bd8d905e..de5ec27d 100644 --- a/internal/pkg/core/uploader/providers/volcengine-live/volcengine_live.go +++ b/internal/pkg/core/uploader/providers/volcengine-live/volcengine_live.go @@ -7,7 +7,6 @@ import ( "strings" "time" - xerrors "github.com/pkg/errors" velive "github.com/volcengine/volc-sdk-golang/service/live/v20230101" ve "github.com/volcengine/volcengine-go-sdk/volcengine" @@ -68,7 +67,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE listCertResp, err := u.sdkClient.ListCertV2(ctx, listCertReq) u.logger.Debug("sdk request 'live.ListCertV2'", slog.Any("request", listCertReq), slog.Any("response", listCertResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'live.ListCertV2'") + return nil, fmt.Errorf("failed to execute sdk request 'live.ListCertV2': %w", err) } if listCertResp.Result.CertList != nil { for _, certDetail := range listCertResp.Result.CertList { @@ -125,7 +124,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPEM string, privkeyPE createCertResp, err := u.sdkClient.CreateCert(ctx, createCertReq) u.logger.Debug("sdk request 'live.CreateCert'", slog.Any("request", createCertReq), slog.Any("response", createCertResp)) if err != nil { - return nil, xerrors.Wrap(err, "failed to execute sdk request 'live.CreateCert'") + return nil, fmt.Errorf("failed to execute sdk request 'live.CreateCert': %w", err) } certId = *createCertResp.Result.ChainID diff --git a/internal/pkg/utils/cert/converter.go b/internal/pkg/utils/cert/converter.go index 86c3c3d8..b726e86d 100644 --- a/internal/pkg/utils/cert/converter.go +++ b/internal/pkg/utils/cert/converter.go @@ -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{ diff --git a/internal/pkg/utils/cert/parser.go b/internal/pkg/utils/cert/parser.go index e8281b12..eb743f78 100644 --- a/internal/pkg/utils/cert/parser.go +++ b/internal/pkg/utils/cert/parser.go @@ -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 diff --git a/internal/pkg/utils/file/io.go b/internal/pkg/utils/file/io.go index 12844b58..58b5b970 100644 --- a/internal/pkg/utils/file/io.go +++ b/internal/pkg/utils/file/io.go @@ -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