From 43629992cfbe0b4126b2d059df964f1bd8ce97e2 Mon Sep 17 00:00:00 2001 From: "tao.yang" Date: Thu, 8 Aug 2024 09:50:34 +0800 Subject: [PATCH] fix: failed to upload codecov Signed-off-by: tao.yang --- .github/codespell-ignorewords | 1 + .github/workflows/lint-golang.yaml | 2 +- .../kdoctor/kdoctorreport/strategy.go | 4 +- pkg/fileManager/manager.go | 8 +- pkg/fileManager/manager_test.go | 3 +- pkg/grpcManager/server_implement.go | 10 +-- pkg/k8ObjManager/daemonset.go | 6 +- pkg/k8ObjManager/deployment.go | 6 +- pkg/k8ObjManager/pod.go | 7 +- pkg/k8ObjManager/service.go | 6 +- pkg/lease/lease.go | 9 ++- pkg/loadRequest/loadDns/dns.go | 3 +- .../apphttphealthy/agentExecuteTask.go | 29 ++++--- pkg/pluginManager/controllerReconciler.go | 5 +- pkg/pluginManager/netdns/agentExecuteTask.go | 6 +- .../netreach/agentExecuteTask.go | 6 +- pkg/pluginManager/tools/tools.go | 18 +++-- pkg/pluginManager/utils.go | 4 +- pkg/reportManager/worker.go | 15 ++-- pkg/utils/os.go | 7 +- test/e2e/common/tools.go | 75 ++++++++++--------- 21 files changed, 125 insertions(+), 105 deletions(-) diff --git a/.github/codespell-ignorewords b/.github/codespell-ignorewords index e69de29b..add1f5af 100644 --- a/.github/codespell-ignorewords +++ b/.github/codespell-ignorewords @@ -0,0 +1 @@ +NotIn diff --git a/.github/workflows/lint-golang.yaml b/.github/workflows/lint-golang.yaml index 394e9b28..3b999db6 100644 --- a/.github/workflows/lint-golang.yaml +++ b/.github/workflows/lint-golang.yaml @@ -201,7 +201,7 @@ jobs: # ============= upload coverage report - name: Upload to Codecov if: ${{ steps.unitest.outcome != 'failure' }} - uses: codecov/codecov-action@v4.0.1 + uses: codecov/codecov-action@v4 with: directory: './' files: '${{ env.COVERAGE_REPORT_PATH }}' diff --git a/pkg/apiserver/registry/kdoctor/kdoctorreport/strategy.go b/pkg/apiserver/registry/kdoctor/kdoctorreport/strategy.go index 0a3bf33e..2ae8b676 100644 --- a/pkg/apiserver/registry/kdoctor/kdoctorreport/strategy.go +++ b/pkg/apiserver/registry/kdoctor/kdoctorreport/strategy.go @@ -5,7 +5,7 @@ package kdoctorreport import ( "context" - "fmt" + "errors" "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" @@ -74,7 +74,7 @@ func (p kdoctorReportStrategy) ValidateUpdate(ctx context.Context, obj, old runt func GetAttrs(obj runtime.Object) (labels.Set, fields.Set, error) { kdoctorReport, ok := obj.(*v1beta1.KdoctorReport) if !ok { - return nil, nil, fmt.Errorf("given object is not a KdoctorReport") + return nil, nil, errors.New("given object is not a KdoctorReport") } return labels.Set(kdoctorReport.ObjectMeta.Labels), SelectableFields(kdoctorReport), nil } diff --git a/pkg/fileManager/manager.go b/pkg/fileManager/manager.go index 91555b1a..96f8499a 100644 --- a/pkg/fileManager/manager.go +++ b/pkg/fileManager/manager.go @@ -4,12 +4,14 @@ package fileManager import ( + "errors" "fmt" - "go.uber.org/zap" "os" "path" "strings" "time" + + "go.uber.org/zap" ) type FileManager interface { @@ -28,7 +30,7 @@ var _ FileManager = &fileManager{} func NewManager(logger *zap.Logger, reportDir string, cleanInterval time.Duration) (FileManager, error) { if logger == nil || len(reportDir) == 0 { - return nil, fmt.Errorf("bad request") + return nil, errors.New("bad request") } // create directory if not exist @@ -58,7 +60,7 @@ func NewManager(logger *zap.Logger, reportDir string, cleanInterval time.Duratio func getTaskFileEndTime(filePath string) (endTime time.Time, err error) { name := path.Base(filePath) if len(name) == 0 { - return time.Time{}, fmt.Errorf("failed to get file name") + return time.Time{}, errors.New("failed to get file name") } v := strings.Split(name, "_") if len(v) < 3 { diff --git a/pkg/fileManager/manager_test.go b/pkg/fileManager/manager_test.go index 4da7a726..3a10b397 100644 --- a/pkg/fileManager/manager_test.go +++ b/pkg/fileManager/manager_test.go @@ -11,9 +11,10 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "time" + "github.com/kdoctor-io/kdoctor/pkg/fileManager" "github.com/kdoctor-io/kdoctor/pkg/logger" - "time" ) var _ = Describe("test fileManager", Label("fileManager"), func() { diff --git a/pkg/grpcManager/server_implement.go b/pkg/grpcManager/server_implement.go index d0de4e9f..97127d3c 100644 --- a/pkg/grpcManager/server_implement.go +++ b/pkg/grpcManager/server_implement.go @@ -6,13 +6,14 @@ package grpcManager import ( "context" "fmt" + "io" + "time" + "github.com/kdoctor-io/kdoctor/api/v1/agentGrpc" "github.com/kdoctor-io/kdoctor/pkg/utils" "go.uber.org/zap" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "io" - "time" ) // ------ implement @@ -82,9 +83,8 @@ func (s *myGrpcServer) ExecRemoteCmd(stream agentGrpc.CmdService_ExecRemoteCmdSe } if e := stream.Send(re); e != nil { - c := fmt.Sprintf("grpc server failed to send msg: %v", err) - logger.Error(c) - finalError = fmt.Errorf(c) + finalError := fmt.Errorf("grpc server failed to send msg: %v", e) + logger.Error(finalError.Error()) break } } diff --git a/pkg/k8ObjManager/daemonset.go b/pkg/k8ObjManager/daemonset.go index 1fbbf7a8..7e11d3c5 100644 --- a/pkg/k8ObjManager/daemonset.go +++ b/pkg/k8ObjManager/daemonset.go @@ -6,7 +6,9 @@ package k8sObjManager import ( "context" "encoding/json" + "errors" "fmt" + "github.com/kdoctor-io/kdoctor/pkg/types" "github.com/kdoctor-io/kdoctor/pkg/utils" appsv1 "k8s.io/api/apps/v1" @@ -121,7 +123,7 @@ func (nm *k8sObjManager) ListDaemonsetPodMultusIPs(ctx context.Context, daemonse return nil, e } if len(podlist) == 0 { - return nil, fmt.Errorf("failed to get any pods") + return nil, errors.New("failed to get any pods") } return parseMultusIP(podlist) } @@ -133,7 +135,7 @@ func (nm *k8sObjManager) ListDaemonsetPodIPs(ctx context.Context, daemonsetName, return nil, e } if len(podlist) == 0 { - return nil, fmt.Errorf("failed to get any pods") + return nil, errors.New("failed to get any pods") } result := PodIps{} diff --git a/pkg/k8ObjManager/deployment.go b/pkg/k8ObjManager/deployment.go index f6141437..eeb189db 100644 --- a/pkg/k8ObjManager/deployment.go +++ b/pkg/k8ObjManager/deployment.go @@ -5,7 +5,9 @@ package k8sObjManager import ( "context" + "errors" "fmt" + "github.com/kdoctor-io/kdoctor/pkg/utils" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" @@ -51,7 +53,7 @@ func (nm *k8sObjManager) ListDeploymentPodIPs(ctx context.Context, deploymentNam return nil, e } if len(podList) == 0 { - return nil, fmt.Errorf("failed to get any pods") + return nil, errors.New("failed to get any pods") } result := PodIps{} @@ -77,7 +79,7 @@ func (nm *k8sObjManager) ListDeployPodMultusIPs(ctx context.Context, deploymentN return nil, e } if len(podlist) == 0 { - return nil, fmt.Errorf("failed to get any pods") + return nil, errors.New("failed to get any pods") } return parseMultusIP(podlist) } diff --git a/pkg/k8ObjManager/pod.go b/pkg/k8ObjManager/pod.go index 74db4d29..05a631b9 100644 --- a/pkg/k8ObjManager/pod.go +++ b/pkg/k8ObjManager/pod.go @@ -5,7 +5,8 @@ package k8sObjManager import ( "context" - "fmt" + "errors" + "github.com/kdoctor-io/kdoctor/pkg/utils" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -40,7 +41,7 @@ func (nm *k8sObjManager) ListSelectedPodIPs(ctx context.Context, labelSelector * return nil, e } if len(podlist) == 0 { - return nil, fmt.Errorf("failed to get any pods") + return nil, errors.New("failed to get any pods") } result := PodIps{} @@ -66,7 +67,7 @@ func (nm *k8sObjManager) ListSelectedPodMultusIPs(ctx context.Context, labelSele return nil, e } if len(podlist) == 0 { - return nil, fmt.Errorf("failed to get any pods") + return nil, errors.New("failed to get any pods") } return parseMultusIP(podlist) diff --git a/pkg/k8ObjManager/service.go b/pkg/k8ObjManager/service.go index c7abfb94..93b46d4f 100644 --- a/pkg/k8ObjManager/service.go +++ b/pkg/k8ObjManager/service.go @@ -5,12 +5,14 @@ package k8sObjManager import ( "context" + "errors" "fmt" + "net" + "github.com/kdoctor-io/kdoctor/pkg/types" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" - "net" "sigs.k8s.io/controller-runtime/pkg/client" ) @@ -54,7 +56,7 @@ func (nm *k8sObjManager) GetServiceAccessUrl(ctx context.Context, name, namespac return nil, fmt.Errorf("variable portName is empty, but service has multiple ports: %v", s.Spec.Ports) } if t == 0 { - return nil, fmt.Errorf("service has empty ports ") + return nil, errors.New("service has empty ports ") } portIndex = 0 } else { diff --git a/pkg/lease/lease.go b/pkg/lease/lease.go index 3244e208..f4b3412a 100644 --- a/pkg/lease/lease.go +++ b/pkg/lease/lease.go @@ -4,6 +4,7 @@ package lease import ( "context" + "errors" "fmt" "time" @@ -25,16 +26,16 @@ var ( func NewLeaseElector(ctx context.Context, leaseNamespace, leaseName, leaseID string, logger *zap.Logger) (getLease chan struct{}, lossLease chan struct{}, err error) { if len(leaseNamespace) == 0 { - return nil, nil, fmt.Errorf("failed to new lease elector: Lease Namespace must be specified") + return nil, nil, errors.New("failed to new lease elector: Lease Namespace must be specified") } if len(leaseName) == 0 { - return nil, nil, fmt.Errorf("failed to new lease elector: Lease Name must be specified") + return nil, nil, errors.New("failed to new lease elector: Lease Name must be specified") } if len(leaseID) == 0 { - return nil, nil, fmt.Errorf("failed to new lease elector: Lease Identity must be specified") + return nil, nil, errors.New("failed to new lease elector: Lease Identity must be specified") } if logger == nil { - return nil, nil, fmt.Errorf("miss logger") + return nil, nil, errors.New("miss logger") } getLease = make(chan struct{}) diff --git a/pkg/loadRequest/loadDns/dns.go b/pkg/loadRequest/loadDns/dns.go index 6ad3d1fc..2885bd88 100644 --- a/pkg/loadRequest/loadDns/dns.go +++ b/pkg/loadRequest/loadDns/dns.go @@ -24,10 +24,11 @@ package loadDns import ( "fmt" + "time" + "github.com/kdoctor-io/kdoctor/pkg/k8s/apis/system/v1beta1" "github.com/miekg/dns" "go.uber.org/zap" - "time" ) type RequestProtocol string diff --git a/pkg/pluginManager/apphttphealthy/agentExecuteTask.go b/pkg/pluginManager/apphttphealthy/agentExecuteTask.go index 3e140974..d34f9ef1 100644 --- a/pkg/pluginManager/apphttphealthy/agentExecuteTask.go +++ b/pkg/pluginManager/apphttphealthy/agentExecuteTask.go @@ -9,6 +9,8 @@ import ( "crypto/x509" "encoding/json" "fmt" + "strings" + k8sObjManager "github.com/kdoctor-io/kdoctor/pkg/k8ObjManager" crd "github.com/kdoctor-io/kdoctor/pkg/k8s/apis/kdoctor.io/v1beta1" "github.com/kdoctor-io/kdoctor/pkg/k8s/apis/system/v1beta1" @@ -19,7 +21,6 @@ import ( "go.uber.org/zap" "k8s.io/apimachinery/pkg/runtime" "k8s.io/utils/pointer" - "strings" ) func ParseSuccessCondition(successCondition *crd.NetSuccessCondition, metricResult *v1beta1.HttpMetrics) (failureReason string) { @@ -82,7 +83,7 @@ func (s *PluginAppHttpHealthy) AgentExecuteTask(logger *zap.Logger, ctx context. if !ok { msg := "failed to get instance" logger.Error(msg) - err = fmt.Errorf(msg) + err = fmt.Errorf("error: %v", msg) return finalfailureReason, task, err } @@ -111,9 +112,8 @@ func (s *PluginAppHttpHealthy) AgentExecuteTask(logger *zap.Logger, ctx context. tlsData, err := k8sObjManager.GetK8sObjManager().GetSecret(context.Background(), *target.TlsSecretName, *target.TlsSecretNamespace) if err != nil { - msg := fmt.Sprintf("failed get [%s/%s] secret err : %v", *target.TlsSecretNamespace, *target.TlsSecretName, err) - logger.Sugar().Errorf(msg) - err = fmt.Errorf(msg) + err = fmt.Errorf("failed get [%s/%s] secret err : %v", *target.TlsSecretNamespace, *target.TlsSecretName, err) + logger.Sugar().Errorf(err.Error()) return finalfailureReason, task, err } ca, caOk := tlsData.Data["ca.crt"] @@ -127,9 +127,8 @@ func (s *PluginAppHttpHealthy) AgentExecuteTask(logger *zap.Logger, ctx context. if crtOk && keyOk { cert, err := tls.X509KeyPair(crt, key) if err != nil { - msg := fmt.Sprintf("failed to load certificate and key: %v", err) - logger.Sugar().Errorf(msg) - err = fmt.Errorf(msg) + err := fmt.Errorf("failed to load certificate and key: %v", err) + logger.Sugar().Errorf(err.Error()) return finalfailureReason, task, err } d.ClientCert = cert @@ -141,17 +140,15 @@ func (s *PluginAppHttpHealthy) AgentExecuteTask(logger *zap.Logger, ctx context. if target.BodyConfigName != nil { bodyCM, err := k8sObjManager.GetK8sObjManager().GetConfigMap(context.Background(), *target.BodyConfigName, *target.BodyConfigNamespace) if err != nil { - msg := fmt.Sprintf("failed get [%s/%s] configmap err : %v", *target.BodyConfigNamespace, *target.BodyConfigName, err) - logger.Sugar().Errorf(msg) - err = fmt.Errorf(msg) - return finalfailureReason, task, err + errMsg := fmt.Errorf("failed get [%s/%s] configmap err : %v", *target.BodyConfigNamespace, *target.BodyConfigName, err) + logger.Sugar().Errorf(errMsg.Error()) + return finalfailureReason, task, errMsg } body, err := json.Marshal(bodyCM.Data) if err != nil { - msg := fmt.Sprintf("failed get body from [%s/%s] configmap err : %v", *target.BodyConfigNamespace, *target.BodyConfigName, err) - logger.Sugar().Errorf(msg) - err = fmt.Errorf(msg) - return finalfailureReason, task, err + errMsg := fmt.Errorf("failed get body from [%s/%s] configmap err : %v", *target.BodyConfigNamespace, *target.BodyConfigName, err) + logger.Sugar().Errorf(errMsg.Error()) + return finalfailureReason, task, errMsg } d.Body = body } diff --git a/pkg/pluginManager/controllerReconciler.go b/pkg/pluginManager/controllerReconciler.go index fc9a0c37..41337325 100644 --- a/pkg/pluginManager/controllerReconciler.go +++ b/pkg/pluginManager/controllerReconciler.go @@ -5,10 +5,11 @@ package pluginManager import ( "context" - "github.com/kdoctor-io/kdoctor/pkg/types" "reflect" "time" + "github.com/kdoctor-io/kdoctor/pkg/types" + "go.uber.org/zap" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -37,7 +38,7 @@ type pluginControllerReconciler struct { // controller reconcile // (1) schedule all task time -// (2) update stauts result +// (2) update status result // (3) collect report from agent func (s *pluginControllerReconciler) Reconcile(ctx context.Context, req reconcile.Request) (reconcile.Result, error) { diff --git a/pkg/pluginManager/netdns/agentExecuteTask.go b/pkg/pluginManager/netdns/agentExecuteTask.go index 1b03601a..bfe96349 100644 --- a/pkg/pluginManager/netdns/agentExecuteTask.go +++ b/pkg/pluginManager/netdns/agentExecuteTask.go @@ -5,12 +5,14 @@ package netdns import ( "context" + "errors" "fmt" - "github.com/kdoctor-io/kdoctor/pkg/runningTask" "net" "strconv" "sync" + "github.com/kdoctor-io/kdoctor/pkg/runningTask" + "github.com/miekg/dns" "go.uber.org/zap" "k8s.io/apimachinery/pkg/runtime" @@ -89,7 +91,7 @@ func (s *PluginNetDns) AgentExecuteTask(logger *zap.Logger, ctx context.Context, if !ok { msg := "failed to get instance" logger.Error(msg) - err = fmt.Errorf(msg) + err = errors.New(msg) return } diff --git a/pkg/pluginManager/netreach/agentExecuteTask.go b/pkg/pluginManager/netreach/agentExecuteTask.go index 0353c7c1..81acce64 100644 --- a/pkg/pluginManager/netreach/agentExecuteTask.go +++ b/pkg/pluginManager/netreach/agentExecuteTask.go @@ -5,11 +5,13 @@ package netreach import ( "context" + "errors" "fmt" + "sync" + "github.com/kdoctor-io/kdoctor/pkg/resource" "github.com/kdoctor-io/kdoctor/pkg/runningTask" networkingv1 "k8s.io/api/networking/v1" - "sync" "go.uber.org/zap" "k8s.io/apimachinery/pkg/runtime" @@ -85,7 +87,7 @@ func (s *PluginNetReach) AgentExecuteTask(logger *zap.Logger, ctx context.Contex if !ok { msg := "failed to get instance" logger.Error(msg) - err = fmt.Errorf(msg) + err = errors.New(msg) return } diff --git a/pkg/pluginManager/tools/tools.go b/pkg/pluginManager/tools/tools.go index 4881570d..cf674a3b 100644 --- a/pkg/pluginManager/tools/tools.go +++ b/pkg/pluginManager/tools/tools.go @@ -13,15 +13,17 @@ package tools import ( + "errors" "fmt" - crd "github.com/kdoctor-io/kdoctor/pkg/k8s/apis/kdoctor.io/v1beta1" - "github.com/robfig/cron" - apierrors "k8s.io/apimachinery/pkg/api/errors" "net" "net/url" "regexp" "strconv" "strings" + + crd "github.com/kdoctor-io/kdoctor/pkg/k8s/apis/kdoctor.io/v1beta1" + "github.com/robfig/cron" + apierrors "k8s.io/apimachinery/pkg/api/errors" ) var DomainRegex = regexp.MustCompile(`^[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)*\.[a-zA-Z]{2,}$`) @@ -29,7 +31,7 @@ var DomainRegex = regexp.MustCompile(`^[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)*\.[a-zA- func ValidataCrdSchedule(plan *crd.SchedulePlan) error { if plan == nil { - return fmt.Errorf("Schedule is empty ") + return errors.New("schedule is empty") } args := strings.Split(*plan.Schedule, " ") @@ -37,11 +39,11 @@ func ValidataCrdSchedule(plan *crd.SchedulePlan) error { if len(args) == 2 { startAfterMinute, err := strconv.Atoi(args[0]) if err != nil { - return fmt.Errorf("The format of the schedule is incorrect, it should be number ") + return errors.New("the format of the schedule is incorrect, it should be number") } intervalMinute, err := strconv.Atoi(args[1]) if err != nil { - return fmt.Errorf("The format of the schedule is incorrect, it should be number ") + return errors.New("the format of the schedule is incorrect, it should be number") } if startAfterMinute < 0 { return fmt.Errorf("Schedule.StartAfterMinute %v must not be smaller than 0 ", startAfterMinute) @@ -58,11 +60,11 @@ func ValidataCrdSchedule(plan *crd.SchedulePlan) error { } else if len(args) == 5 { _, err := cron.ParseStandard(*plan.Schedule) if err != nil { - return fmt.Errorf("Crontab configuration error,err: %v ", err) + return fmt.Errorf("crontab configuration error,err: %v", err) } } else { - return fmt.Errorf("The format of the schedule is incorrect, it should be two or five ") + return errors.New("the format of the schedule is incorrect, it should be two or five") } if plan.RoundTimeoutMinute < 1 { diff --git a/pkg/pluginManager/utils.go b/pkg/pluginManager/utils.go index e6ac6773..f4520df2 100644 --- a/pkg/pluginManager/utils.go +++ b/pkg/pluginManager/utils.go @@ -4,7 +4,7 @@ package pluginManager import ( - "fmt" + "errors" "time" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -32,7 +32,7 @@ func NewStatusHistoryRecord(startTime time.Time, RoundNumber int, schedulePlan * func CheckItemInList(item string, checklist []string) (bool, error) { if len(item) == 0 { - return false, fmt.Errorf("empty item") + return false, errors.New("empty item") } if len(checklist) == 0 { return false, nil diff --git a/pkg/reportManager/worker.go b/pkg/reportManager/worker.go index a120db50..05a357e7 100644 --- a/pkg/reportManager/worker.go +++ b/pkg/reportManager/worker.go @@ -6,16 +6,17 @@ package reportManager import ( "context" "fmt" + "net" + "path" + "strings" + "time" + "github.com/kdoctor-io/kdoctor/pkg/grpcManager" k8sObjManager "github.com/kdoctor-io/kdoctor/pkg/k8ObjManager" "github.com/kdoctor-io/kdoctor/pkg/scheduler" "github.com/kdoctor-io/kdoctor/pkg/types" "github.com/kdoctor-io/kdoctor/pkg/utils" "go.uber.org/zap" - "net" - "path" - "strings" - "time" ) func GetMissRemoteReport(remoteFileList []string, localFileList []string) []string { @@ -116,10 +117,10 @@ func (s *reportManager) runControllerAggregateReportOnce(ctx context.Context, lo podIP, err = k8sObjManager.GetK8sObjManager().ListDeploymentPodIPs(context.Background(), task.RuntimeName, types.ControllerConfig.PodNamespace) } if err != nil { - m := fmt.Sprintf("failed to get kind %s name %s agent ip, error=%v", task.RuntimeKind, task.RuntimeName, err) - logger.Error(m) + errMsg := fmt.Errorf("failed to get kind %s name %s agent ip, error=%v", task.RuntimeKind, task.RuntimeName, err) + logger.Error(errMsg.Error()) // retry - return fmt.Errorf(m) + return errMsg } logger.Sugar().Debugf("podIP : %v", podIP) diff --git a/pkg/utils/os.go b/pkg/utils/os.go index 09af0d5d..a2121442 100644 --- a/pkg/utils/os.go +++ b/pkg/utils/os.go @@ -6,6 +6,7 @@ package utils import ( "bytes" "context" + "errors" "fmt" "os" "os/exec" @@ -14,7 +15,7 @@ import ( func SearchExecutable(name string) (string, error) { if len(name) == 0 { - return "", fmt.Errorf("error, empty name") + return "", errors.New("error, empty name") } if path, err := exec.LookPath(name); err != nil { @@ -32,7 +33,7 @@ func RunFrondendCmd(ctx context.Context, cmdName string, env []string, stdin_msg var cmd *exec.Cmd if len(cmdName) == 0 { - e = fmt.Errorf("error, empty cmd") + e = errors.New("error, empty cmd") return } @@ -48,7 +49,7 @@ func RunFrondendCmd(ctx context.Context, cmdName string, env []string, stdin_msg goto EXE } - e = fmt.Errorf("error, no sh or bash installed") + e = errors.New("error, no sh or bash installed") return EXE: diff --git a/test/e2e/common/tools.go b/test/e2e/common/tools.go index 598487d0..cb06993b 100644 --- a/test/e2e/common/tools.go +++ b/test/e2e/common/tools.go @@ -7,6 +7,7 @@ import ( "context" "crypto/tls" "encoding/json" + "errors" "fmt" "io" "math" @@ -22,7 +23,7 @@ import ( frame "github.com/spidernet-io/e2eframework/framework" corev1 "k8s.io/api/core/v1" networkingv1 "k8s.io/api/networking/v1" - "k8s.io/apimachinery/pkg/api/errors" + api_errors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/yaml" @@ -161,7 +162,7 @@ func GetPluginReportResult(f *frame.Framework, name string, n int) (*kdoctor_rep } if resp.StatusCode != 200 { - return nil, fmt.Errorf("plugin report not found ") + return nil, errors.New("plugin report not found") } body, err := io.ReadAll(resp.Body) @@ -177,7 +178,7 @@ func GetPluginReportResult(f *frame.Framework, name string, n int) (*kdoctor_rep } if len(*report.Report.LatestRoundReport) != n { - return nil, fmt.Errorf("have agent not upload report") + return nil, errors.New("have agent not upload report") } return report, nil @@ -253,20 +254,20 @@ func CompareResult(f *frame.Framework, name, taskKind string, podIPs []string, n return GetResultFromReport(r), fmt.Errorf("the error in the number of requests is greater than %.2f ,real request count: %d,expect request count:%d", RequestFaultRate, int(realRequestCount), int(expectRequestCount)) } if float64(m.Metrics.SuccessCounts)/float64(m.Metrics.RequestCounts) != m.SucceedRate { - return GetResultFromReport(r), fmt.Errorf("succeedRate not equal") + return GetResultFromReport(r), errors.New("succeedRate not equal") } if float64(m.Metrics.SuccessCounts)/float64(m.Metrics.RequestCounts) != m.SucceedRate { - return GetResultFromReport(r), fmt.Errorf("succeedRate not equal") + return GetResultFromReport(r), errors.New("succeedRate not equal") } if float64(m.Metrics.SuccessCounts)/float64(m.Metrics.RequestCounts) != m.SucceedRate { - return GetResultFromReport(r), fmt.Errorf("succeedRate not equal") + return GetResultFromReport(r), errors.New("succeedRate not equal") } } // startTime - shcedule := pluginManager.NewSchedule(*rs.Spec.Schedule.Schedule) - startTime := shcedule.StartTime(rs.CreationTimestamp.Time) + schedule := pluginManager.NewSchedule(*rs.Spec.Schedule.Schedule) + startTime := schedule.StartTime(rs.CreationTimestamp.Time) if v.StartTimeStamp.Time.Compare(startTime) > 5 { - return GetResultFromReport(r), fmt.Errorf("The task start time error is greater than 5 seconds ") + return GetResultFromReport(r), errors.New("the task start time error is greater than 5 seconds") } } @@ -276,7 +277,7 @@ func CompareResult(f *frame.Framework, name, taskKind string, podIPs []string, n for i := 0; i < len(rounds); i++ { for j := i + 1; j < len(rounds); j++ { if rounds[i] != rounds[j] { - return GetResultFromReport(r), fmt.Errorf("roundNumber not equal ") + return GetResultFromReport(r), errors.New("roundNumber not equal ") } } } @@ -308,23 +309,23 @@ func CompareResult(f *frame.Framework, name, taskKind string, podIPs []string, n // report request count reportRequestCount += m.Metrics.RequestCounts if math.Abs(realCount-expectCount)/expectCount > RequestFaultRate { - return GetResultFromReport(r), fmt.Errorf("The error in the number of requests is greater than %.2f ,real request count: %d,expect request count:%d", RequestFaultRate, int(realCount), int(expectCount)) + return GetResultFromReport(r), fmt.Errorf("the error in the number of requests is greater than %.2f ,real request count: %d,expect request count:%d", RequestFaultRate, int(realCount), int(expectCount)) } if float64(m.Metrics.SuccessCounts)/float64(m.Metrics.RequestCounts) != m.SucceedRate { - return GetResultFromReport(r), fmt.Errorf("succeedRate not equal") + return GetResultFromReport(r), errors.New("succeedRate not equal") } if float64(m.Metrics.SuccessCounts)/float64(m.Metrics.RequestCounts) != m.SucceedRate { - return GetResultFromReport(r), fmt.Errorf("succeedRate not equal") + return GetResultFromReport(r), errors.New("succeedRate not equal") } if float64(m.Metrics.SuccessCounts)/float64(m.Metrics.RequestCounts) != m.SucceedRate { - return GetResultFromReport(r), fmt.Errorf("succeedRate not equal") + return GetResultFromReport(r), errors.New("succeedRate not equal") } } // startTime - shcedule := pluginManager.NewSchedule(*rs.Spec.Schedule.Schedule) - startTime := shcedule.StartTime(rs.CreationTimestamp.Time) + schedule := pluginManager.NewSchedule(*rs.Spec.Schedule.Schedule) + startTime := schedule.StartTime(rs.CreationTimestamp.Time) if v.StartTimeStamp.Time.Compare(startTime) > 5 { - return GetResultFromReport(r), fmt.Errorf("The task start time error is greater than 5 seconds ") + return GetResultFromReport(r), errors.New("the task start time error is greater than 5 seconds") } } // real request count @@ -347,7 +348,7 @@ func CompareResult(f *frame.Framework, name, taskKind string, podIPs []string, n for i := 0; i < len(rounds); i++ { for j := i + 1; j < len(rounds); j++ { if rounds[i] != rounds[j] { - return GetResultFromReport(r), fmt.Errorf("roundNumber not equal ") + return GetResultFromReport(r), errors.New("roundNumber not equal") } } } @@ -379,23 +380,23 @@ func CompareResult(f *frame.Framework, name, taskKind string, podIPs []string, n // report request count reportRequestCount += m.Metrics.RequestCounts if math.Abs(realCount-expectCount)/expectCount > RequestFaultRate { - return GetResultFromReport(r), fmt.Errorf("The error in the number of requests is greater than %.2f, real request count: %d,expect request count:%d ", RequestFaultRate, int(realCount), int(expectCount)) + return GetResultFromReport(r), fmt.Errorf("the error in the number of requests is greater than %.2f, real request count: %d,expect request count:%d", RequestFaultRate, int(realCount), int(expectCount)) } if float64(m.Metrics.SuccessCounts)/float64(m.Metrics.RequestCounts) != m.SucceedRate { - return GetResultFromReport(r), fmt.Errorf("succeedRate not equal") + return GetResultFromReport(r), errors.New("succeedRate not equal") } if float64(m.Metrics.SuccessCounts)/float64(m.Metrics.RequestCounts) != m.SucceedRate { - return GetResultFromReport(r), fmt.Errorf("succeedRate not equal") + return GetResultFromReport(r), errors.New("succeedRate not equal") } if float64(m.Metrics.SuccessCounts)/float64(m.Metrics.RequestCounts) != m.SucceedRate { - return GetResultFromReport(r), fmt.Errorf("succeedRate not equal") + return GetResultFromReport(r), errors.New("succeedRate not equal") } } // startTime - shcedule := pluginManager.NewSchedule(*rs.Spec.Schedule.Schedule) - startTime := shcedule.StartTime(rs.CreationTimestamp.Time) + schedule := pluginManager.NewSchedule(*rs.Spec.Schedule.Schedule) + startTime := schedule.StartTime(rs.CreationTimestamp.Time) if v.StartTimeStamp.Time.Compare(startTime) > 5 { - return GetResultFromReport(r), fmt.Errorf("The task start time error is greater than 5 seconds ") + return GetResultFromReport(r), errors.New("the task start time error is greater than 5 seconds") } } // real request count @@ -418,7 +419,7 @@ func CompareResult(f *frame.Framework, name, taskKind string, podIPs []string, n for i := 0; i < len(rounds); i++ { for j := i + 1; j < len(rounds); j++ { if rounds[i] != rounds[j] { - return GetResultFromReport(r), fmt.Errorf("roundNumber not equal ") + return GetResultFromReport(r), errors.New("roundNumber not equal") } } } @@ -809,7 +810,7 @@ func CheckRuntimeDeadLine(f *frame.Framework, taskName, taskKind string, timeout if runtimeResource.RuntimeType == kdoctor_types.KindDaemonSet { _, err := f.GetDaemonSet(runtimeResource.RuntimeName, TestNameSpace) if err != nil { - if errors.IsNotFound(err) { + if api_errors.IsNotFound(err) { ginkgo.GinkgoWriter.Printf("task runtime daemonSet %s deleted \n", runtimeResource.RuntimeName) runtimeDeleted = true break @@ -820,7 +821,7 @@ func CheckRuntimeDeadLine(f *frame.Framework, taskName, taskKind string, timeout } else { _, err := f.GetDeployment(runtimeResource.RuntimeName, TestNameSpace) if err != nil { - if errors.IsNotFound(err) { + if api_errors.IsNotFound(err) { ginkgo.GinkgoWriter.Printf("task runtime deployment %s deleted \n", runtimeResource.RuntimeName) runtimeDeleted = true break @@ -845,7 +846,7 @@ func CheckRuntimeDeadLine(f *frame.Framework, taskName, taskKind string, timeout if TestIPv4 { _, err := f.GetService(*runtimeResource.ServiceNameV4, TestNameSpace) if err != nil { - if errors.IsNotFound(err) { + if api_errors.IsNotFound(err) { ginkgo.GinkgoWriter.Printf("task runtime service v4 %s deleted \n", *runtimeResource.ServiceNameV4) serviceV4Deleted = true } else { @@ -863,7 +864,7 @@ func CheckRuntimeDeadLine(f *frame.Framework, taskName, taskKind string, timeout key := client.ObjectKeyFromObject(fake) err = f.GetResource(key, ig) if err != nil { - if errors.IsNotFound(err) { + if api_errors.IsNotFound(err) { ginkgo.GinkgoWriter.Printf("task runtime ingress %s deleted \n", *runtimeResource.ServiceNameV4) ingressDeleted = true } else { @@ -879,7 +880,7 @@ func CheckRuntimeDeadLine(f *frame.Framework, taskName, taskKind string, timeout if TestIPv6 { _, err := f.GetService(*runtimeResource.ServiceNameV6, TestNameSpace) if err != nil { - if errors.IsNotFound(err) { + if api_errors.IsNotFound(err) { ginkgo.GinkgoWriter.Printf("task runtime service v6 %s deleted \n", *runtimeResource.ServiceNameV6) serviceV6Deleted = true break @@ -899,7 +900,7 @@ func CheckRuntimeDeadLine(f *frame.Framework, taskName, taskKind string, timeout func GetRuntimeResource(f *frame.Framework, resource *v1beta1.TaskResource, ingress bool) error { if resource == nil { - return fmt.Errorf("runtime resource is nil") + return errors.New("runtime resource is nil") } c := time.After(time.Minute) @@ -909,19 +910,19 @@ func GetRuntimeResource(f *frame.Framework, resource *v1beta1.TaskResource, ingr case kdoctor_types.KindDaemonSet: _, err := f.GetDaemonSet(resource.RuntimeName, TestNameSpace) - if !errors.IsNotFound(err) { + if !api_errors.IsNotFound(err) { return fmt.Errorf("after 1 min runtime daemonset %s not delete", resource.RuntimeName) } case kdoctor_types.KindDeployment: _, err := f.GetDeployment(resource.RuntimeName, TestNameSpace) - if !errors.IsNotFound(err) { + if !api_errors.IsNotFound(err) { return fmt.Errorf("after 1 min runtime deployment %s not delete", resource.RuntimeName) } } if resource.ServiceNameV4 != nil { _, err := f.GetService(*resource.ServiceNameV4, TestNameSpace) - if !errors.IsNotFound(err) { + if !api_errors.IsNotFound(err) { return fmt.Errorf("after 1 min runtime service %s not delete", *resource.ServiceNameV4) } @@ -935,7 +936,7 @@ func GetRuntimeResource(f *frame.Framework, resource *v1beta1.TaskResource, ingr } key := client.ObjectKeyFromObject(fake) err := f.GetResource(key, ig) - if !errors.IsNotFound(err) { + if !api_errors.IsNotFound(err) { return fmt.Errorf("after 1 min runtime ingress %s not delete", *resource.ServiceNameV4) } } @@ -943,7 +944,7 @@ func GetRuntimeResource(f *frame.Framework, resource *v1beta1.TaskResource, ingr if resource.ServiceNameV6 != nil { _, err := f.GetService(*resource.ServiceNameV6, TestNameSpace) - if !errors.IsNotFound(err) { + if !api_errors.IsNotFound(err) { return fmt.Errorf("after 1 min runtime service %s not delete", *resource.ServiceNameV6) } }