diff --git a/.github/workflows/ci-pr-build-test.yml b/.github/workflows/ci-pr-build-test.yml index 73727839f8..a489c4f40b 100644 --- a/.github/workflows/ci-pr-build-test.yml +++ b/.github/workflows/ci-pr-build-test.yml @@ -13,7 +13,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v4 with: - go-version: '1.21' + go-version: '1.25' - name: Install check tools shell: bash diff --git a/.github/workflows/docker_apigateway.yml b/.github/workflows/docker_apigateway.yml index 186a1b6d7f..df136a9506 100644 --- a/.github/workflows/docker_apigateway.yml +++ b/.github/workflows/docker_apigateway.yml @@ -22,7 +22,7 @@ jobs: - uses: actions/setup-go@v4 with: - go-version: '1.21' + go-version: '1.25' - name: Set up QEMU uses: docker/setup-qemu-action@v2 diff --git a/.github/workflows/docker_climc.yml b/.github/workflows/docker_climc.yml index 1ceab6a236..34492f649c 100644 --- a/.github/workflows/docker_climc.yml +++ b/.github/workflows/docker_climc.yml @@ -20,7 +20,7 @@ jobs: - uses: actions/setup-go@v4 with: - go-version: '1.21' + go-version: '1.25' - name: Set up QEMU uses: docker/setup-qemu-action@v2 diff --git a/.github/workflows/docker_cloudmon.yml b/.github/workflows/docker_cloudmon.yml index 5e1da22a48..a33976507b 100644 --- a/.github/workflows/docker_cloudmon.yml +++ b/.github/workflows/docker_cloudmon.yml @@ -21,7 +21,7 @@ jobs: - uses: actions/setup-go@v4 with: - go-version: '1.21' + go-version: '1.25' - name: Set up QEMU uses: docker/setup-qemu-action@v2 diff --git a/.github/workflows/docker_esxi_agent.yml b/.github/workflows/docker_esxi_agent.yml index 0a058175fc..8514065460 100644 --- a/.github/workflows/docker_esxi_agent.yml +++ b/.github/workflows/docker_esxi_agent.yml @@ -19,7 +19,7 @@ jobs: - uses: actions/setup-go@v4 with: - go-version: '1.21' + go-version: '1.25' - name: Set up QEMU uses: docker/setup-qemu-action@v2 diff --git a/.github/workflows/docker_glance.yml b/.github/workflows/docker_glance.yml index 1a0da576f8..dc2e5aed64 100644 --- a/.github/workflows/docker_glance.yml +++ b/.github/workflows/docker_glance.yml @@ -23,7 +23,7 @@ jobs: - uses: actions/setup-go@v4 with: - go-version: '1.21' + go-version: '1.25' - name: Set up QEMU uses: docker/setup-qemu-action@v2 diff --git a/.github/workflows/docker_host.yml b/.github/workflows/docker_host.yml index 45ba40894b..a4f780cef9 100644 --- a/.github/workflows/docker_host.yml +++ b/.github/workflows/docker_host.yml @@ -19,7 +19,7 @@ jobs: - uses: actions/setup-go@v4 with: - go-version: '1.21' + go-version: '1.25' - name: Set up QEMU uses: docker/setup-qemu-action@v2 diff --git a/.github/workflows/docker_keystone.yml b/.github/workflows/docker_keystone.yml index de0c68a270..b436c3d840 100644 --- a/.github/workflows/docker_keystone.yml +++ b/.github/workflows/docker_keystone.yml @@ -23,7 +23,7 @@ jobs: - uses: actions/setup-go@v4 with: - go-version: '1.21' + go-version: '1.25' - name: Set up QEMU uses: docker/setup-qemu-action@v2 diff --git a/.github/workflows/docker_logger.yml b/.github/workflows/docker_logger.yml index 58071bb716..a5e8ee2a9b 100644 --- a/.github/workflows/docker_logger.yml +++ b/.github/workflows/docker_logger.yml @@ -23,7 +23,7 @@ jobs: - uses: actions/setup-go@v4 with: - go-version: '1.21' + go-version: '1.25' - name: Set up QEMU uses: docker/setup-qemu-action@v2 diff --git a/.github/workflows/docker_notify.yml b/.github/workflows/docker_notify.yml index f8cd3edb97..835f1e2977 100644 --- a/.github/workflows/docker_notify.yml +++ b/.github/workflows/docker_notify.yml @@ -23,7 +23,7 @@ jobs: - uses: actions/setup-go@v4 with: - go-version: '1.21' + go-version: '1.25' - name: Set up QEMU uses: docker/setup-qemu-action@v2 diff --git a/.github/workflows/docker_region.yml b/.github/workflows/docker_region.yml index ac81e2ec07..fcb4e9c628 100644 --- a/.github/workflows/docker_region.yml +++ b/.github/workflows/docker_region.yml @@ -24,7 +24,7 @@ jobs: - uses: actions/setup-go@v4 with: - go-version: '1.21' + go-version: '1.25' - name: Set up QEMU uses: docker/setup-qemu-action@v2 diff --git a/.github/workflows/docker_scheduler.yml b/.github/workflows/docker_scheduler.yml index 214814ac45..65017b0cad 100644 --- a/.github/workflows/docker_scheduler.yml +++ b/.github/workflows/docker_scheduler.yml @@ -20,7 +20,7 @@ jobs: - uses: actions/setup-go@v4 with: - go-version: '1.21' + go-version: '1.25' - name: Set up QEMU uses: docker/setup-qemu-action@v2 diff --git a/.github/workflows/docker_webconsole.yml b/.github/workflows/docker_webconsole.yml index 26c6d861b9..82d960ecc4 100644 --- a/.github/workflows/docker_webconsole.yml +++ b/.github/workflows/docker_webconsole.yml @@ -23,7 +23,7 @@ jobs: - uses: actions/setup-go@v4 with: - go-version: '1.21' + go-version: '1.25' - name: Set up QEMU uses: docker/setup-qemu-action@v2 diff --git a/Makefile.common.mk b/Makefile.common.mk index 98b31cf335..ec1136cbf3 100644 --- a/Makefile.common.mk +++ b/Makefile.common.mk @@ -8,7 +8,7 @@ endif ModBaseName:=$(notdir $(ModName)) DockerImageRegistry?=registry.cn-beijing.aliyuncs.com -DockerImageAlpineBuild?=$(DockerImageRegistry)/yunionio/alpine-build:3.19.0-go-1.21.10-0 +DockerImageAlpineBuild?=$(DockerImageRegistry)/yunionio/alpine-build:3.22.0-go-1.24.6-0 DockerImageCentOSBuild?=$(DockerImageRegistry)/yunionio/centos-build:go-1.21.10-0 EnvIf=$(if $($(1)),$(1)=$($(1))) diff --git a/build/docker/multi-arch/Dockerfile.host b/build/docker/multi-arch/Dockerfile.host index ec158cbc92..deb1a4c226 100644 --- a/build/docker/multi-arch/Dockerfile.host +++ b/build/docker/multi-arch/Dockerfile.host @@ -1,4 +1,4 @@ -FROM registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:3.19.0-go-1.21.10-0 as build +FROM registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:3.22.0-go-1.24.6-0 as build ARG TARGETPLATFORM ARG BUILDPLATFORM RUN mkdir -p /root/go/src/yunion.io/x/onecloud diff --git a/cmd/mps-daemon/main.go b/cmd/mps-daemon/main.go index aee45f6294..e640661d05 100644 --- a/cmd/mps-daemon/main.go +++ b/cmd/mps-daemon/main.go @@ -200,7 +200,7 @@ func main() { options.HostOptions.CudaMPSReplicas, ) if err != nil { - log.Fatalf(err.Error()) + log.Fatalf("%s", err.Error()) return } @@ -214,7 +214,7 @@ func main() { signalutils.StartTrap() if err = daemon.Start(); err != nil { - log.Fatalf(err.Error()) + log.Fatalf("%s", err.Error()) } log.Infof("MPS daemon started ......") diff --git a/go.mod b/go.mod index c076876330..3296ffd38e 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module yunion.io/x/onecloud -go 1.21 +go 1.24 require ( bazil.org/fuse v0.0.0-20180421153158-65cc252bf669 @@ -51,7 +51,7 @@ require ( github.com/miekg/dns v1.1.25 github.com/minio/minio-go v6.0.14+incompatible github.com/mitchellh/go-wordwrap v1.0.1 - github.com/petermattis/goid v0.0.0-20250508124226-395b08cebbdb + github.com/petermattis/goid v0.0.0-20250904145737-900bdf8bb490 github.com/pierrec/lz4/v4 v4.1.15 github.com/pkg/errors v0.9.1 github.com/pkg/sftp v1.13.6 @@ -96,7 +96,7 @@ require ( k8s.io/cri-api v0.22.17 k8s.io/klog/v2 v2.20.0 moul.io/http2curl/v2 v2.3.0 - yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250902085702-cb118fc37e8a + yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250904062553-2e7d040a1d28 yunion.io/x/executor v0.0.0-20250518005516-5402e9e0bed0 yunion.io/x/jsonutils v1.0.1-0.20250507052344-1abcf4f443b1 yunion.io/x/log v1.0.1-0.20240305175729-7cf2d6cd5a91 diff --git a/go.sum b/go.sum index c37955c907..e9e029cbfe 100644 --- a/go.sum +++ b/go.sum @@ -716,8 +716,8 @@ github.com/openzipkin/zipkin-go-opentracing v0.3.4/go.mod h1:js2AbwmHW0YD9DwIw2J github.com/oracle/oci-go-sdk v24.3.0+incompatible h1:x4mcfb4agelf1O4/1/auGlZ1lr97jXRSSN5MxTgG/zU= github.com/oracle/oci-go-sdk v24.3.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= -github.com/petermattis/goid v0.0.0-20250508124226-395b08cebbdb h1:3PrKuO92dUTMrQ9dx0YNejC6U/Si6jqKmyQ9vWjwqR4= -github.com/petermattis/goid v0.0.0-20250508124226-395b08cebbdb/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4= +github.com/petermattis/goid v0.0.0-20250904145737-900bdf8bb490 h1:QTvNkZ5ylY0PGgA+Lih+GdboMLY/G9SEGLMEGVjTVA4= +github.com/petermattis/goid v0.0.0-20250904145737-900bdf8bb490/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4= github.com/philhofer/fwd v1.0.0 h1:UbZqGr5Y38ApvM/V/jEljVxwocdweyH+vmYvRPBnbqQ= github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= @@ -1409,8 +1409,8 @@ sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= -yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250902085702-cb118fc37e8a h1:v2TsC0peqfQv993Gc6YOVU1rzyZkr48RiNzIShFmXa8= -yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250902085702-cb118fc37e8a/go.mod h1:FXxAEbdNfWXX9gjME3K2nJhkydHY5EKEUZb+RLEzVwQ= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250904062553-2e7d040a1d28 h1:4PDFt1V4ti4pbWfh7VEhX/5tfhA+1jcn9qTIE6je3Fs= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250904062553-2e7d040a1d28/go.mod h1:FXxAEbdNfWXX9gjME3K2nJhkydHY5EKEUZb+RLEzVwQ= yunion.io/x/executor v0.0.0-20250518005516-5402e9e0bed0 h1:msG4SiDSVU7CrXH06WuHlNEZXIooTcmNbfrIGHuIHBU= yunion.io/x/executor v0.0.0-20250518005516-5402e9e0bed0/go.mod h1:Uxuou9WQIeJXNpy7t2fPLL0BYLvLiMvGQwY7Qc6aSws= yunion.io/x/jsonutils v0.0.0-20190625054549-a964e1e8a051/go.mod h1:4N0/RVzsYL3kH3WE/H1BjUQdFiWu50JGCFQuuy+Z634= diff --git a/pkg/apigateway/handler/auth.go b/pkg/apigateway/handler/auth.go index 5fce7d5d47..6f0d0069f3 100644 --- a/pkg/apigateway/handler/auth.go +++ b/pkg/apigateway/handler/auth.go @@ -252,7 +252,7 @@ func (h *AuthHandlers) getScopedPolicyBindings(ctx context.Context, w http.Respo func (h *AuthHandlers) getUser(ctx context.Context, w http.ResponseWriter, req *http.Request) { data, err := getUserInfo(ctx, req) if err != nil { - httperrors.NotFoundError(ctx, w, err.Error()) + httperrors.NotFoundError(ctx, w, "%s", err.Error()) return } body := jsonutils.NewDict() diff --git a/pkg/apigateway/handler/auth_totp.go b/pkg/apigateway/handler/auth_totp.go index 86c166a5b7..b2222ffad7 100644 --- a/pkg/apigateway/handler/auth_totp.go +++ b/pkg/apigateway/handler/auth_totp.go @@ -54,7 +54,7 @@ func toQrcode(secret string, token mcclient.TokenCredential) (string, error) { c, err := qrcode.Encode(uri, qrcode.High, 256) if err != nil { - log.Errorf(err.Error()) + log.Errorf("%s", err.Error()) return "", httperrors.NewInternalServerError("generate totp qrcode failed") } diff --git a/pkg/apigateway/handler/csrfexempt.go b/pkg/apigateway/handler/csrfexempt.go index 7b3220f30e..2d0ad5ab51 100644 --- a/pkg/apigateway/handler/csrfexempt.go +++ b/pkg/apigateway/handler/csrfexempt.go @@ -16,7 +16,6 @@ package handler import ( "context" - "fmt" "net/http" "yunion.io/x/jsonutils" @@ -71,7 +70,7 @@ func fetchEnv3Csrf(ctx context.Context, w http.ResponseWriter, r *http.Request) } module3, e := modulebase.GetModule(session, params[ResName3]) if e != nil || module == nil { - httperrors.NotFoundError(ctx, w, fmt.Sprintf("resource %s not found", params[ResName3])) + httperrors.NotFoundError(ctx, w, "resource %s not found", params[ResName3]) return nil, nil, nil, nil, nil, nil, nil } return module, module2, module3, session, params, query, body @@ -84,7 +83,7 @@ func fetchEnv2Csrf(ctx context.Context, w http.ResponseWriter, r *http.Request) } module2, e := modulebase.GetModule(session, params[ResName2]) if e != nil || module == nil { - httperrors.NotFoundError(ctx, w, fmt.Sprintf("resource %s not found", params[ResName2])) + httperrors.NotFoundError(ctx, w, "resource %s not found", params[ResName2]) return nil, nil, nil, nil, nil, nil } return module, module2, session, params, query, body @@ -94,7 +93,7 @@ func fetchEnvCsrf(ctx context.Context, w http.ResponseWriter, r *http.Request) ( session, params, query, body := fetchEnvCsrf0(ctx, w, r) module, e := modulebase.GetModule(session, params[ResName]) if e != nil || module == nil { - httperrors.NotFoundError(ctx, w, fmt.Sprintf("resource %s not found", params[ResName])) + httperrors.NotFoundError(ctx, w, "resource %s not found", params[ResName]) return nil, nil, nil, nil, nil } return module, session, params, query, body @@ -105,7 +104,7 @@ func fetchEnvCsrf0(ctx context.Context, w http.ResponseWriter, r *http.Request) region := r.URL.Query().Get("region") log.Println("csrf region from url:", region) if len(region) < 1 { - httperrors.NotFoundError(ctx, w, fmt.Sprintf("region %s is empty", region)) + httperrors.NotFoundError(ctx, w, "region %s is empty", region) return nil, nil, nil, nil } log.Infof("csrf region from url: %s", region) diff --git a/pkg/apigateway/handler/misc.go b/pkg/apigateway/handler/misc.go index f35ff5cd60..df81be50b7 100644 --- a/pkg/apigateway/handler/misc.go +++ b/pkg/apigateway/handler/misc.go @@ -177,7 +177,7 @@ func (mh *MiscHandler) DoBatchHostRegister(ctx context.Context, w http.ResponseW file, err := hostfiles[0].Open() defer file.Close() if err != nil { - log.Errorf(err.Error()) + log.Errorf("%s", err.Error()) e := httperrors.NewInternalServerError("can't open file") httperrors.JsonClientError(ctx, w, e) return @@ -185,7 +185,7 @@ func (mh *MiscHandler) DoBatchHostRegister(ctx context.Context, w http.ResponseW xlsx, err := excelize.OpenReader(file) if err != nil { - log.Errorf(err.Error()) + log.Errorf("%s", err.Error()) e := httperrors.NewInternalServerError("can't parse file") httperrors.JsonClientError(ctx, w, e) return @@ -245,7 +245,7 @@ func (mh *MiscHandler) DoBatchHostRegister(ctx context.Context, w http.ResponseW // skipped header row if len(rows) > BATCH_HOST_REGISTER_QUANTITY_LIMITATION { - e := httperrors.NewInputParameterError(fmt.Sprintf("beyond limitation. excel file rows must less than %d", BATCH_HOST_REGISTER_QUANTITY_LIMITATION)) + e := httperrors.NewInputParameterError("beyond limitation. excel file rows must less than %d", BATCH_HOST_REGISTER_QUANTITY_LIMITATION) httperrors.JsonClientError(ctx, w, e) return } @@ -330,7 +330,7 @@ func (mh *MiscHandler) DoBatchUserRegister(ctx context.Context, w http.ResponseW file, err := userfiles[0].Open() defer file.Close() if err != nil { - log.Errorf(err.Error()) + log.Errorf("%s", err.Error()) e := httperrors.NewInternalServerError("can't open file") httperrors.JsonClientError(ctx, w, e) return @@ -338,7 +338,7 @@ func (mh *MiscHandler) DoBatchUserRegister(ctx context.Context, w http.ResponseW xlsx, err := excelize.OpenReader(file) if err != nil { - log.Errorf(err.Error()) + log.Errorf("%s", err.Error()) e := httperrors.NewInternalServerError("can't parse file") httperrors.JsonClientError(ctx, w, e) return @@ -351,7 +351,7 @@ func (mh *MiscHandler) DoBatchUserRegister(ctx context.Context, w http.ResponseW httperrors.JsonClientError(ctx, w, e) return } else if len(rows) > BATCH_USER_REGISTER_QUANTITY_LIMITATION { - e := httperrors.NewInputParameterError(fmt.Sprintf("beyond limitation.excel file rows must less than %d", BATCH_USER_REGISTER_QUANTITY_LIMITATION)) + e := httperrors.NewInputParameterError("beyond limitation.excel file rows must less than %d", BATCH_USER_REGISTER_QUANTITY_LIMITATION) httperrors.JsonClientError(ctx, w, e) return } diff --git a/pkg/apigateway/handler/resource.go b/pkg/apigateway/handler/resource.go index c212f1ddbc..e010537f4e 100644 --- a/pkg/apigateway/handler/resource.go +++ b/pkg/apigateway/handler/resource.go @@ -242,7 +242,7 @@ func (f *ResourceHandlers) fetchExportQuery(query jsonutils.JSONObject) (jsonuti func (f *ResourceHandlers) doList(ctx context.Context, session *mcclient.ClientSession, module modulebase.IBaseManager, query jsonutils.JSONObject, w http.ResponseWriter, r *http.Request) { query, export, err := f.fetchExportQuery(query) if err != nil { - httperrors.InvalidInputError(ctx, w, err.Error()) + httperrors.InvalidInputError(ctx, w, "%s", err.Error()) return } @@ -323,7 +323,7 @@ func (f *ResourceHandlers) getSpecHandler(ctx context.Context, w http.ResponseWr // list in 1 context query, export, err := f.fetchExportQuery(query) if err != nil { - httperrors.InvalidInputError(ctx, w, err.Error()) + httperrors.InvalidInputError(ctx, w, "%s", err.Error()) return } jmod, e := modulebase.GetJointModule2(session, module, module2) @@ -367,7 +367,7 @@ func (f *ResourceHandlers) getJointHandler(ctx context.Context, w http.ResponseW jmod, e := modulebase.GetJointModule2(session, module, module2) if e != nil { - httperrors.NotFoundError(ctx, w, fmt.Sprintf("resource %s-%s not exist", req.ResName(), req.ResName2())) + httperrors.NotFoundError(ctx, w, "resource %s-%s not exist", req.ResName(), req.ResName2()) return } obj, e := jmod.Get(session, req.ResID(), req.ResID2(), req.Query()) @@ -525,7 +525,7 @@ func (f *ResourceHandlers) attachHandler(ctx context.Context, w http.ResponseWri jmod, e := modulebase.GetJointModule2(session, module, module2) if e != nil { - httperrors.NotFoundError(ctx, w, fmt.Sprintf("resource %s-%s not exists", req.ResName(), req.ResName2())) + httperrors.NotFoundError(ctx, w, "resource %s-%s not exists", req.ResName(), req.ResName2()) return } obj, e := jmod.Attach(session, req.ResID(), req.ResID2(), body) diff --git a/pkg/apigateway/handler/rpc.go b/pkg/apigateway/handler/rpc.go index 09a8c44c1e..674c0a0ace 100644 --- a/pkg/apigateway/handler/rpc.go +++ b/pkg/apigateway/handler/rpc.go @@ -16,7 +16,6 @@ package handler import ( "context" - "fmt" "net/http" "reflect" @@ -79,7 +78,7 @@ func RpcHandler(ctx context.Context, w http.ResponseWriter, req *http.Request) { log.Errorf("Error get JSON body: %s", e) } default: - httperrors.InvalidInputError(ctx, w, fmt.Sprintf("Unsupported RPC method %s", req.Method)) + httperrors.InvalidInputError(ctx, w, "Unsupported RPC method %s", req.Method) return } token := AppContextToken(ctx) @@ -90,13 +89,13 @@ func RpcHandler(ctx context.Context, w http.ResponseWriter, req *http.Request) { if e != nil { log.Debugf("module %s not found %s", resType, e) } - httperrors.NotFoundError(ctx, w, fmt.Sprintf("resource %s not exists", resType)) + httperrors.NotFoundError(ctx, w, "resource %s not exists", resType) return } modvalue := reflect.ValueOf(mod) funcvalue := modvalue.MethodByName(funcname) if !funcvalue.IsValid() || funcvalue.IsNil() { - httperrors.NotFoundError(ctx, w, fmt.Sprintf("RPC method %s not found", funcname)) + httperrors.NotFoundError(ctx, w, "RPC method %s not found", funcname) return } callParams := make([]reflect.Value, 0) @@ -137,5 +136,5 @@ func RpcHandler(ctx context.Context, w http.ResponseWriter, req *http.Request) { httperrors.GeneralServerError(ctx, w, je) return } - httperrors.BadGatewayError(ctx, w, fmt.Sprintf("%s", reterr.Interface())) + httperrors.BadGatewayError(ctx, w, "%s", reterr.Interface()) } diff --git a/pkg/apigateway/handler/service_setting.go b/pkg/apigateway/handler/service_setting.go index 7c31ce2a2e..c37ed14ae3 100644 --- a/pkg/apigateway/handler/service_setting.go +++ b/pkg/apigateway/handler/service_setting.go @@ -48,7 +48,7 @@ func (mh *MiscHandler) getServiceSettings(ctx context.Context, w http.ResponseWr } resp, err := identity.ServicesV3.List(s, jsonutils.Marshal(params)) if err != nil { - e := httperrors.NewInternalServerError(err.Error()) + e := httperrors.NewInternalServerError("%s", err.Error()) httperrors.JsonClientError(ctx, w, e) return } @@ -58,7 +58,7 @@ func (mh *MiscHandler) getServiceSettings(ctx context.Context, w http.ResponseWr }{} err = jsonutils.Update(&services, resp.Data) if err != nil { - e := httperrors.NewInternalServerError(err.Error()) + e := httperrors.NewInternalServerError("%s", err.Error()) httperrors.JsonClientError(ctx, w, e) return } @@ -67,7 +67,7 @@ func (mh *MiscHandler) getServiceSettings(ctx context.Context, w http.ResponseWr result[service.Type] = map[string]interface{}{} data, err := identity.ServicesV3.GetSpecific(s, service.Id, "config", nil) if err != nil { - e := httperrors.NewInternalServerError(err.Error()) + e := httperrors.NewInternalServerError("%s", err.Error()) httperrors.JsonClientError(ctx, w, e) return } diff --git a/pkg/appsrv/appsrv.go b/pkg/appsrv/appsrv.go index fed1bb9406..56c5ac06db 100644 --- a/pkg/appsrv/appsrv.go +++ b/pkg/appsrv/appsrv.go @@ -303,7 +303,7 @@ func (app *Application) ServeHTTP(w http.ResponseWriter, r *http.Request) { } if lrw.status >= 500 && app.exception != nil { url := fmt.Sprintf("%d %s (%s) %.2fms", lrw.status, r.URL.String(), remote, duration) - app.exception(r.Method, url, params.Body, errors.Errorf(string(lrw.data))) + app.exception(r.Method, url, params.Body, errors.Errorf("%s", string(lrw.data))) } } diff --git a/pkg/appsrv/handlers.go b/pkg/appsrv/handlers.go index 04897f3e8d..033f75ee31 100644 --- a/pkg/appsrv/handlers.go +++ b/pkg/appsrv/handlers.go @@ -30,7 +30,7 @@ type FilterHandler func(ctx context.Context, w http.ResponseWriter, r *http.Requ type TMiddleware func(handler FilterHandler) FilterHandler func VersionHandler(ctx context.Context, w http.ResponseWriter, r *http.Request) { - fmt.Fprintf(w, version.GetShortString()) + fmt.Fprintf(w, "%s", version.GetShortString()) } func PingHandler(ctx context.Context, w http.ResponseWriter, r *http.Request) { diff --git a/pkg/appsrv/process.go b/pkg/appsrv/process.go index 434bed5afc..a088921308 100644 --- a/pkg/appsrv/process.go +++ b/pkg/appsrv/process.go @@ -38,10 +38,10 @@ func ProcessStatsHandler(ctx context.Context, w http.ResponseWriter, r *http.Req ret.ProcessStat.MemSize = m.Alloc process, err := process.NewProcess(int32(os.Getpid())) if err != nil { - fmt.Fprintf(w, jsonutils.Marshal(ret).String()) + fmt.Fprintf(w, "%s", jsonutils.Marshal(ret).String()) return } ret.ProcessStat.CpuPercent, _ = process.CPUPercent() ret.ProcessStat.MemPercent, _ = process.MemoryPercent() - fmt.Fprintf(w, jsonutils.Marshal(ret).String()) + fmt.Fprintf(w, "%s", jsonutils.Marshal(ret).String()) } diff --git a/pkg/appsrv/stats.go b/pkg/appsrv/stats.go index aed5496d16..fd45557c1e 100644 --- a/pkg/appsrv/stats.go +++ b/pkg/appsrv/stats.go @@ -61,5 +61,5 @@ func StatisticHandler(ctx context.Context, w http.ResponseWriter, r *http.Reques result.Add(jsonutils.NewFloat64(total.counter4XX.duration), "duration.4XX") result.Add(jsonutils.NewInt(total.counter5XX.hit), "hit.5XX") result.Add(jsonutils.NewFloat64(total.counter5XX.duration), "duration.5XX") - fmt.Fprintf(w, result.String()) + fmt.Fprintf(w, "%s", result.String()) } diff --git a/pkg/appsrv/workers.go b/pkg/appsrv/workers.go index 17c1739ca3..3741b21c9c 100644 --- a/pkg/appsrv/workers.go +++ b/pkg/appsrv/workers.go @@ -381,7 +381,7 @@ func WorkerStatsHandler(ctx context.Context, w http.ResponseWriter, r *http.Requ } result := jsonutils.NewDict() result.Add(jsonutils.Marshal(&stats), "workers") - fmt.Fprintf(w, result.String()) + fmt.Fprintf(w, "%s", result.String()) } func GetDBConnectionCount() int { diff --git a/pkg/baremetal/manager.go b/pkg/baremetal/manager.go index b24cd33bd1..d428bcc101 100644 --- a/pkg/baremetal/manager.go +++ b/pkg/baremetal/manager.go @@ -285,7 +285,7 @@ type BmRegisterInput struct { } func (i *BmRegisterInput) responseSucc(bmId string) { - fmt.Fprintf(i.W, bmId) + fmt.Fprintf(i.W, "%s", bmId) close(i.C) } diff --git a/pkg/baremetal/tasks/ipmiprobe.go b/pkg/baremetal/tasks/ipmiprobe.go index b548c40f79..c523798fbe 100644 --- a/pkg/baremetal/tasks/ipmiprobe.go +++ b/pkg/baremetal/tasks/ipmiprobe.go @@ -208,11 +208,11 @@ func (self *SBaremetalIpmiProbeTask) doRawIpmiProbe(ctx context.Context, cli ipm // ignore error err := errors.Wrapf(err, "ipmitool.GetLanConfig for channel %d failed", lanChannel) errs = append(errs, err) - log.Warningf(err.Error()) + log.Warningf("%s", err.Error()) } else if conf.IPAddr == "0.0.0.0" { err := errors.Errorf("get 0.0.0.0 ip address of channel %d", lanChannel) errs = append(errs, err) - log.Warningf(err.Error()) + log.Warningf("%s", err.Error()) continue } else { channel = lanChannel diff --git a/pkg/cloudcommon/db/database.go b/pkg/cloudcommon/db/database.go index 4831ad492c..207a4fa73a 100644 --- a/pkg/cloudcommon/db/database.go +++ b/pkg/cloudcommon/db/database.go @@ -77,7 +77,7 @@ func DBStatsHandler(ctx context.Context, w http.ResponseWriter, r *http.Request) stats := dbConn.DB().Stats() result.Add(jsonutils.Marshal(&stats), "db_stats") } - fmt.Fprintf(w, result.String()) + fmt.Fprintf(w, "%s", result.String()) } func AutoPurgeSplitable(ctx context.Context, userCred mcclient.TokenCredential, startRun bool) { diff --git a/pkg/cloudcommon/db/db_dispatcher.go b/pkg/cloudcommon/db/db_dispatcher.go index 81f71fe571..b42bd40186 100644 --- a/pkg/cloudcommon/db/db_dispatcher.go +++ b/pkg/cloudcommon/db/db_dispatcher.go @@ -1401,7 +1401,7 @@ func (dispatcher *DBModelDispatcher) Create(ctx context.Context, query jsonutils } failErr := manager.OnCreateFailed(ctx, userCred, ownerId, query, data) if failErr != nil { - err = errors.Wrapf(err, failErr.Error()) + err = errors.Wrapf(err, "%s", failErr.Error()) } return nil, httperrors.NewGeneralError(err) } @@ -1565,7 +1565,7 @@ func (dispatcher *DBModelDispatcher) BatchCreate(ctx context.Context, query json if err != nil { failErr := manager.OnCreateFailed(ctx, userCred, ownerId, query, data) if failErr != nil { - err = errors.Wrapf(err, failErr.Error()) + err = errors.Wrapf(err, "%s", failErr.Error()) } return nil, httperrors.NewGeneralError(errors.Wrap(err, "createResults")) } diff --git a/pkg/cloudcommon/db/jointbase.go b/pkg/cloudcommon/db/jointbase.go index 20dbfb345f..b352680adb 100644 --- a/pkg/cloudcommon/db/jointbase.go +++ b/pkg/cloudcommon/db/jointbase.go @@ -52,12 +52,12 @@ func NewJointResourceBaseManager(dt interface{}, tableName string, keyword strin log.Debugf("Initialize %s", keywordPlural) if master == nil { msg := fmt.Sprintf("%s master is nil, retry initialization later...", keywordPlural) - log.Errorf(msg) + log.Errorf("%s", msg) panic(msg) } if slave == nil { msg := fmt.Sprintf("%s slave is nil, retry initialization later...", keywordPlural) - log.Errorf(msg) + log.Errorf("%s", msg) panic(msg) } return SJointResourceBaseManager{ diff --git a/pkg/cloudcommon/db/lockman/inmemory_test.go b/pkg/cloudcommon/db/lockman/inmemory_test.go index e56f17efeb..8e430e1cb1 100644 --- a/pkg/cloudcommon/db/lockman/inmemory_test.go +++ b/pkg/cloudcommon/db/lockman/inmemory_test.go @@ -51,7 +51,7 @@ func TestRunManu(t *testing.T) { ctx := context.Background() now := time.Now() ms := now.UnixMilli() - ctx = context.WithValue(ctx, "Time", ms) + ctx = context.WithValue(ctx, "time", ms) lockman.LockKey(ctx, "test") defer lockman.UnlockKey(ctx, "test") counter++ diff --git a/pkg/cloudcommon/db/taskman/tasks.go b/pkg/cloudcommon/db/taskman/tasks.go index a9be70e7b5..b1ed1ca73a 100644 --- a/pkg/cloudcommon/db/taskman/tasks.go +++ b/pkg/cloudcommon/db/taskman/tasks.go @@ -524,10 +524,10 @@ func execITask(taskValue reflect.Value, task *STask, odata jsonutils.JSONObject, msg := fmt.Sprintf("Stage %s not found", stageName) if taskFailed { // failed handler is optional, ignore the error - log.Warningf(msg) + log.Warningf("%s", msg) msg, _ = data.GetString() } else { - log.Errorf(msg) + log.Errorf("%s", msg) } task.SetStageFailed(ctx, jsonutils.NewString(msg)) task.SaveRequestContext(&ctxData) @@ -537,7 +537,7 @@ func execITask(taskValue reflect.Value, task *STask, odata jsonutils.JSONObject, objManager := db.GetModelManager(task.ObjType) if objManager == nil { msg := fmt.Sprintf("model %s %s(%s) not found??? ...", task.ObjType, task.Object, task.ObjId) - log.Errorf(msg) + log.Errorf("%s", msg) task.SetStageFailed(ctx, jsonutils.NewString(msg)) task.SaveRequestContext(&ctxData) return @@ -546,7 +546,7 @@ func execITask(taskValue reflect.Value, task *STask, odata jsonutils.JSONObject, objResManager, ok := objManager.(db.IStandaloneModelManager) if !ok { msg := fmt.Sprintf("model %s %s(%s) is not a resource??? ...", task.ObjType, task.Object, task.ObjId) - log.Errorf(msg) + log.Errorf("%s", msg) task.SetStageFailed(ctx, jsonutils.NewString(msg)) task.SaveRequestContext(&ctxData) return @@ -562,7 +562,7 @@ func execITask(taskValue reflect.Value, task *STask, odata jsonutils.JSONObject, obj, err := objResManager.FetchById(objId) if err != nil { msg := fmt.Sprintf("fail to find %s object %s", task.ObjType, objId) - log.Errorf(msg) + log.Errorf("%s", msg) task.SetStageFailed(ctx, jsonutils.NewString(msg)) task.SaveRequestContext(&ctxData) return @@ -584,7 +584,7 @@ func execITask(taskValue reflect.Value, task *STask, odata jsonutils.JSONObject, obj, err := objResManager.FetchById(task.ObjId) if err != nil { msg := fmt.Sprintf("fail to find %s object %s", task.ObjType, task.ObjId) - log.Errorf(msg) + log.Errorf("%s", msg) task.SetStageFailed(ctx, jsonutils.NewString(msg)) task.SaveRequestContext(&ctxData) return diff --git a/pkg/cloudcommon/etcd/handler/dispatcher.go b/pkg/cloudcommon/etcd/handler/dispatcher.go index 03b69c1cfa..8775496180 100644 --- a/pkg/cloudcommon/etcd/handler/dispatcher.go +++ b/pkg/cloudcommon/etcd/handler/dispatcher.go @@ -146,7 +146,7 @@ func (disp *SEtcdModelHandler) GetSpecific(ctx context.Context, idstr string, sp funcName := fmt.Sprintf("GetDetails%s", specCamel) funcValue := modelValue.MethodByName(funcName) if !funcValue.IsValid() || funcValue.IsNil() { - return nil, httperrors.NewSpecNotFoundError(fmt.Sprintf("%s %s %s not found", disp.Keyword(), idstr, spec)) + return nil, httperrors.NewSpecNotFoundError("%s %s %s not found", disp.Keyword(), idstr, spec) } outs := funcValue.Call(params) diff --git a/pkg/cloudid/models/cloudgroup.go b/pkg/cloudid/models/cloudgroup.go index 816c3e03b1..322273cdf8 100644 --- a/pkg/cloudid/models/cloudgroup.go +++ b/pkg/cloudid/models/cloudgroup.go @@ -857,7 +857,7 @@ func (group *SCloudgroup) GetICloudgroup() (cloudprovider.ICloudgroup, error) { return groups[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, group.ExternalId) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%v", group.ExternalId) } func (group *SCloudgroup) SyncWithCloudgroup(ctx context.Context, userCred mcclient.TokenCredential, iGroup cloudprovider.ICloudgroup) error { diff --git a/pkg/cloudid/models/saml_provider.go b/pkg/cloudid/models/saml_provider.go index 621045d48f..d5fabdb5d9 100644 --- a/pkg/cloudid/models/saml_provider.go +++ b/pkg/cloudid/models/saml_provider.go @@ -163,7 +163,7 @@ func (self *SSAMLProvider) GetISAMLProvider() (cloudprovider.ICloudSAMLProvider, return samlProviders[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, self.ExternalId) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%v", self.ExternalId) } func (self *SSAMLProvider) Delete(ctx context.Context, userCred mcclient.TokenCredential) error { diff --git a/pkg/cloudmon/resources/resources.go b/pkg/cloudmon/resources/resources.go index c18b5733e5..1a8420ad09 100644 --- a/pkg/cloudmon/resources/resources.go +++ b/pkg/cloudmon/resources/resources.go @@ -771,7 +771,7 @@ func (res *SResources) CollectMetrics(ctx context.Context, userCred mcclient.Tok err = driver.CollectServerMetrics(ctx, manager, provider, servers, startTime, endTime) if err != nil && errors.Cause(err) != cloudprovider.ErrNotImplemented && errors.Cause(err) != cloudprovider.ErrNotSupported { logmsg := fmt.Sprintf("CollectServerMetrics for %s(%s) error: %v", manager.Name, manager.Provider, err) - log.Errorf(logmsg) + log.Errorf("%s", logmsg) msgs = append(msgs, logmsg) succ = false } @@ -791,7 +791,7 @@ func (res *SResources) CollectMetrics(ctx context.Context, userCred mcclient.Tok err = driver.CollectHostMetrics(ctx, manager, provider, hosts, startTime, endTime) if err != nil && errors.Cause(err) != cloudprovider.ErrNotImplemented && errors.Cause(err) != cloudprovider.ErrNotSupported { logmsg := fmt.Sprintf("CollectHostMetrics for %s(%s) error: %v", manager.Name, manager.Provider, err) - log.Errorln(logmsg) + log.Errorf("%s", logmsg) msgs = append(msgs, logmsg) succ = false } @@ -802,7 +802,7 @@ func (res *SResources) CollectMetrics(ctx context.Context, userCred mcclient.Tok err = jsonutils.Update(&storages, resources) if err != nil { logmsg := fmt.Sprintf("unmarsha storage resources error: %v", err) - log.Errorln(logmsg) + log.Errorf("%s", logmsg) msgs = append(msgs, logmsg) succ = false } @@ -810,7 +810,7 @@ func (res *SResources) CollectMetrics(ctx context.Context, userCred mcclient.Tok err = driver.CollectStorageMetrics(ctx, manager, provider, storages, startTime, endTime) if err != nil && errors.Cause(err) != cloudprovider.ErrNotImplemented && errors.Cause(err) != cloudprovider.ErrNotSupported { logmsg := fmt.Sprintf("CollectStorageMetrics for %s(%s) error: %v", manager.Name, manager.Provider, err) - log.Errorln(logmsg) + log.Errorf("%s", logmsg) msgs = append(msgs, logmsg) succ = false } @@ -821,7 +821,7 @@ func (res *SResources) CollectMetrics(ctx context.Context, userCred mcclient.Tok err = jsonutils.Update(&caches, resources) if err != nil { logmsg := fmt.Sprintf("unmarsha redis resources error: %v", err) - log.Errorln(logmsg) + log.Errorf("%s", logmsg) msgs = append(msgs, logmsg) succ = false } @@ -830,7 +830,7 @@ func (res *SResources) CollectMetrics(ctx context.Context, userCred mcclient.Tok err = driver.CollectRedisMetrics(ctx, manager, provider, caches, startTime, endTime) if err != nil && errors.Cause(err) != cloudprovider.ErrNotImplemented && errors.Cause(err) != cloudprovider.ErrNotSupported { logmsg := fmt.Sprintf("CollectRedisMetrics for %s(%s) error: %v", manager.Name, manager.Provider, err) - log.Errorf(logmsg) + log.Errorf("%s", logmsg) msgs = append(msgs, logmsg) succ = false } @@ -841,7 +841,7 @@ func (res *SResources) CollectMetrics(ctx context.Context, userCred mcclient.Tok err = jsonutils.Update(&lbs, resources) if err != nil { logmsg := fmt.Sprintf("unmarsha lb resources error: %v", err) - log.Errorln(logmsg) + log.Errorf("%s", logmsg) msgs = append(msgs, logmsg) succ = false } @@ -850,7 +850,7 @@ func (res *SResources) CollectMetrics(ctx context.Context, userCred mcclient.Tok err = driver.CollectLoadbalancerMetrics(ctx, manager, provider, lbs, startTime, endTime) if err != nil && errors.Cause(err) != cloudprovider.ErrNotImplemented && errors.Cause(err) != cloudprovider.ErrNotSupported { logmsg := fmt.Sprintf("CollectLoadbalancerMetrics for %s(%s) error: %v", manager.Name, manager.Provider, err) - log.Errorf(logmsg) + log.Errorf("%s", logmsg) msgs = append(msgs, logmsg) succ = false } @@ -861,7 +861,7 @@ func (res *SResources) CollectMetrics(ctx context.Context, userCred mcclient.Tok err = jsonutils.Update(&buckets, resources) if err != nil { logmsg := fmt.Sprintf("unmarsha bucket resources error: %v", err) - log.Errorln(logmsg) + log.Errorf("%s", logmsg) msgs = append(msgs, logmsg) succ = false } @@ -870,7 +870,7 @@ func (res *SResources) CollectMetrics(ctx context.Context, userCred mcclient.Tok err = driver.CollectBucketMetrics(ctx, manager, provider, buckets, startTime, endTime) if err != nil && errors.Cause(err) != cloudprovider.ErrNotImplemented && errors.Cause(err) != cloudprovider.ErrNotSupported { logmsg := fmt.Sprintf("CollectBucketMetrics for %s(%s) error: %v", manager.Name, manager.Provider, err) - log.Errorln(logmsg) + log.Errorf("%s", logmsg) msgs = append(msgs, logmsg) succ = false } diff --git a/pkg/cloudproxy/models/proxy_endpoints_remote_check_make.go b/pkg/cloudproxy/models/proxy_endpoints_remote_check_make.go index c56aa5e457..6b600154d9 100644 --- a/pkg/cloudproxy/models/proxy_endpoints_remote_check_make.go +++ b/pkg/cloudproxy/models/proxy_endpoints_remote_check_make.go @@ -33,7 +33,8 @@ import ( ) func (proxyendpoint *SProxyEndpoint) remoteCheckMake(ctx context.Context, userCred mcclient.TokenCredential) error { - ctx, _ = context.WithTimeout(ctx, 7*time.Second) + ctx, cancel := context.WithTimeout(ctx, 7*time.Second) + defer cancel() conf := ssh_util.ClientConfig{ Username: proxyendpoint.User, Host: proxyendpoint.Host, diff --git a/pkg/compute/guestdrivers/base.go b/pkg/compute/guestdrivers/base.go index 0fc7b4c5ea..31dd27937e 100644 --- a/pkg/compute/guestdrivers/base.go +++ b/pkg/compute/guestdrivers/base.go @@ -689,7 +689,7 @@ func (base *SBaseGuestDriver) ValidateGuestChangeConfigInput(ctx context.Context return nil, errors.Wrap(err, "SchedManager.DoScheduleForecast") } if !canChangeConf { - return nil, httperrors.NewInsufficientResourceError(res.String()) + return nil, httperrors.NewInsufficientResourceError("%s", res.String()) } confs.SchedDesc = jsonutils.Marshal(schedDesc) diff --git a/pkg/compute/guestdrivers/google.go b/pkg/compute/guestdrivers/google.go index ebabff6ba4..08c7333a22 100644 --- a/pkg/compute/guestdrivers/google.go +++ b/pkg/compute/guestdrivers/google.go @@ -228,7 +228,7 @@ func (self *SGoogleGuestDriver) RequestStartOnHost(ctx context.Context, guest *m } log.Debugf("wait for google startup scripts finish") if strings.Contains(output, keyword) { - log.Debugf(keyword) + log.Debugf("%s", keyword) return true, nil } return false, nil @@ -261,7 +261,7 @@ func (self *SGoogleGuestDriver) RemoteActionAfterGuestCreated(ctx context.Contex } log.Debugf("wait for google sysprep finish") if strings.Contains(output, keyword) { - log.Debugf(keyword) + log.Debugf("%s", keyword) return true, nil } return false, nil diff --git a/pkg/compute/guestdrivers/managedvirtual.go b/pkg/compute/guestdrivers/managedvirtual.go index 461d596f51..ceeee9d5e2 100644 --- a/pkg/compute/guestdrivers/managedvirtual.go +++ b/pkg/compute/guestdrivers/managedvirtual.go @@ -1261,7 +1261,7 @@ func (drv *SManagedVirtualizedGuestDriver) OnGuestDeployTaskDataReceived(ctx con }) if err != nil { msg := fmt.Sprintf("save disk info failed %s", err) - log.Errorf(msg) + log.Errorf("%s", msg) break } db.OpsLog.LogEvent(disk, db.ACT_ALLOCATE, disk.GetShortDesc(ctx), task.GetUserCred()) @@ -1273,7 +1273,7 @@ func (drv *SManagedVirtualizedGuestDriver) OnGuestDeployTaskDataReceived(ctx con }) if err != nil { msg := fmt.Sprintf("save disk info failed %s", err) - log.Errorf(msg) + log.Errorf("%s", msg) break } } @@ -1475,7 +1475,7 @@ func (self *SManagedVirtualizedGuestDriver) requestMigrate(ctx context.Context, vmStatus := iVM.GetStatus() log.Debugf("vm %s migrate status: %s", guest.Name, vmStatus) if vmStatus == api.VM_UNKNOWN || strings.Contains(vmStatus, "fail") { - return false, errors.Wrapf(cloudprovider.ErrInvalidStatus, vmStatus) + return false, errors.Wrapf(cloudprovider.ErrInvalidStatus, "%s", vmStatus) } if !utils.IsInStringArray(vmStatus, []string{api.VM_RUNNING, api.VM_READY}) { return false, nil diff --git a/pkg/compute/hostdrivers/cas.go b/pkg/compute/hostdrivers/cas.go index e0bcc6c29a..b947fd8c14 100644 --- a/pkg/compute/hostdrivers/cas.go +++ b/pkg/compute/hostdrivers/cas.go @@ -112,7 +112,7 @@ func (self *SCasHostDriver) CheckAndSetCacheImage(ctx context.Context, userCred } } if !find { - return nil, errors.Wrapf(cloudprovider.ErrNotFound, image.ExternalId) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", image.ExternalId) } opts.ExternalId = image.ExternalId } else { diff --git a/pkg/compute/hostdrivers/esxi.go b/pkg/compute/hostdrivers/esxi.go index 17b7465022..fab3f4ae0c 100644 --- a/pkg/compute/hostdrivers/esxi.go +++ b/pkg/compute/hostdrivers/esxi.go @@ -119,7 +119,7 @@ func (self *SESXiHostDriver) CheckAndSetCacheImage(ctx context.Context, userCred storage := host.GetStorageByFilePath(storageCache.Path) if storage == nil { msg := fmt.Sprintf("fail to find storage for storageCache %s", storageCache.Path) - log.Errorf(msg) + log.Errorf("%s", msg) return errors.Error(msg) } diff --git a/pkg/compute/hostdrivers/proxmox.go b/pkg/compute/hostdrivers/proxmox.go index e6e584f85d..6cc978f917 100644 --- a/pkg/compute/hostdrivers/proxmox.go +++ b/pkg/compute/hostdrivers/proxmox.go @@ -116,7 +116,7 @@ func (self *SProxmoxHostDriver) CheckAndSetCacheImage(ctx context.Context, userC } } if !find { - return nil, errors.Wrapf(cloudprovider.ErrNotFound, image.ExternalId) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", image.ExternalId) } opts.ExternalId = image.ExternalId } else { diff --git a/pkg/compute/hostdrivers/uis.go b/pkg/compute/hostdrivers/uis.go index 81a3a89769..4902f7566a 100644 --- a/pkg/compute/hostdrivers/uis.go +++ b/pkg/compute/hostdrivers/uis.go @@ -112,7 +112,7 @@ func (self *SUisHostDriver) CheckAndSetCacheImage(ctx context.Context, userCred } } if !find { - return nil, errors.Wrapf(cloudprovider.ErrNotFound, image.ExternalId) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", image.ExternalId) } opts.ExternalId = image.ExternalId } else { diff --git a/pkg/compute/misc/handler.go b/pkg/compute/misc/handler.go index bfa7f71b9a..2c96d9d7a8 100644 --- a/pkg/compute/misc/handler.go +++ b/pkg/compute/misc/handler.go @@ -67,7 +67,7 @@ func getBmAgentUrl(ctx context.Context, w http.ResponseWriter, r *http.Request) return } - fmt.Fprintf(w, bmAgent.ManagerUri) + fmt.Fprintf(w, "%s", bmAgent.ManagerUri) } func getBmPrepareScript(ctx context.Context, w http.ResponseWriter, r *http.Request) { @@ -88,5 +88,5 @@ func getBmPrepareScript(ctx context.Context, w http.ResponseWriter, r *http.Requ script += "tar -zxf ./baremetal_prepare.tar.gz -C ./baremetal_prepare;" script += fmt.Sprintf("./baremetal_prepare/prepare.sh %s %s", userCred.GetTokenString(), regionUrl) - fmt.Fprintf(w, script) + fmt.Fprintf(w, "%s", script) } diff --git a/pkg/compute/models/ai_gateway.go b/pkg/compute/models/ai_gateway.go index f12f370d56..034047cff4 100644 --- a/pkg/compute/models/ai_gateway.go +++ b/pkg/compute/models/ai_gateway.go @@ -66,7 +66,7 @@ type SAiGateway struct { CacheTTL int `default:"0" list:"user" create:"optional"` CollectLogs bool `default:"false" list:"user" create:"optional"` RateLimitingInterval int `default:"0" list:"user" create:"optional"` - RateLimitingLimit int `default:"0" list:"user" create:"optional` + RateLimitingLimit int `default:"0" list:"user" create:"optional"` RateLimitingTechnique string `width:"32" charset:"ascii" default:"" list:"user" create:"optional"` } diff --git a/pkg/compute/models/cloudaccounts.go b/pkg/compute/models/cloudaccounts.go index add46deb9e..4da4436ec5 100644 --- a/pkg/compute/models/cloudaccounts.go +++ b/pkg/compute/models/cloudaccounts.go @@ -1107,10 +1107,10 @@ func (acnt *SCloudaccount) getDefaultExternalProject(id string) (*SExternalProje return nil, errors.Wrapf(err, "db.FetchModelObjects") } if len(projects) > 1 { - return nil, errors.Wrapf(cloudprovider.ErrDuplicateId, id) + return nil, errors.Wrapf(cloudprovider.ErrDuplicateId, "%s", id) } if len(projects) == 0 { - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } return &projects[0], nil } @@ -1662,8 +1662,8 @@ func migrateCloudprovider(cloudprovider *SCloudprovider) error { } } else { msg := fmt.Sprintf("error azure provider account format %s", cloudprovider.Account) - log.Errorf(msg) - return fmt.Errorf(msg) + log.Errorf("%s", msg) + return fmt.Errorf("%s", msg) } } diff --git a/pkg/compute/models/cloudaccounts_test.go b/pkg/compute/models/cloudaccounts_test.go index 549690ef1f..849a04b15c 100644 --- a/pkg/compute/models/cloudaccounts_test.go +++ b/pkg/compute/models/cloudaccounts_test.go @@ -27,7 +27,7 @@ import ( func TestParseAndSuggest(t *testing.T) { _, err := structureTestData() if err != nil { - t.Fatalf(err.Error()) + t.Fatalf("%v", err) } /*out := CloudaccountManager.parseAndSuggestSingleWire(param) for _, net := range out.CAWireNets[0].GuestSuggestedNetworks { diff --git a/pkg/compute/models/cloudregionresource.go b/pkg/compute/models/cloudregionresource.go index 8aa6b3ffc2..8ebada6307 100644 --- a/pkg/compute/models/cloudregionresource.go +++ b/pkg/compute/models/cloudregionresource.go @@ -85,10 +85,10 @@ func (self *SCloudregionResourceBase) GetZoneBySuffix(suffix string) (*SZone, er return nil, err } if count == 0 { - return nil, errors.Wrapf(cloudprovider.ErrNotFound, suffix) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", suffix) } if count > 1 { - return nil, errors.Wrapf(cloudprovider.ErrDuplicateId, suffix) + return nil, errors.Wrapf(cloudprovider.ErrDuplicateId, "%s", suffix) } zone := &SZone{} zone.SetModelManager(ZoneManager, zone) diff --git a/pkg/compute/models/cloudregions.go b/pkg/compute/models/cloudregions.go index 3a4a4ede45..7597da0428 100644 --- a/pkg/compute/models/cloudregions.go +++ b/pkg/compute/models/cloudregions.go @@ -156,11 +156,12 @@ func (self *SCloudregion) GetZoneBySuffix(suffix string) (*SZone, error) { if err != nil { return nil, err } + msg := suffix if count == 0 { - return nil, errors.Wrapf(cloudprovider.ErrNotFound, suffix) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", msg) } if count > 1 { - return nil, errors.Wrapf(cloudprovider.ErrDuplicateId, suffix) + return nil, errors.Wrapf(cloudprovider.ErrDuplicateId, "%s", msg) } zone := &SZone{} zone.SetModelManager(ZoneManager, zone) diff --git a/pkg/compute/models/cloudsync.go b/pkg/compute/models/cloudsync.go index 15ee0f0815..a329c947b5 100644 --- a/pkg/compute/models/cloudsync.go +++ b/pkg/compute/models/cloudsync.go @@ -108,7 +108,7 @@ func syncRegionQuotas(ctx context.Context, userCred mcclient.TokenCredential, sy return nil } msg := fmt.Sprintf("GetICloudQuotas for region %s failed %s", remoteRegion.GetName(), err) - log.Errorf(msg) + log.Errorf("%s", msg) return err } result := func() compare.SyncResult { @@ -119,9 +119,9 @@ func syncRegionQuotas(ctx context.Context, userCred mcclient.TokenCredential, sy msg := result.Result() notes := fmt.Sprintf("SyncQuotas for region %s result: %s", localRegion.Name, msg) provider.SyncError(result, notes, userCred) - log.Infof(notes) + log.Infof("%s", notes) if result.IsError() { - return fmt.Errorf(msg) + return fmt.Errorf("%s", msg) } return nil } @@ -133,7 +133,7 @@ func syncRegionZones(ctx context.Context, userCred mcclient.TokenCredential, syn }() if err != nil { msg := fmt.Sprintf("GetZones for region %s failed %s", remoteRegion.GetName(), err) - log.Errorf(msg) + log.Errorf("%s", msg) return nil, nil, err } localZones, remoteZones, result := func() ([]SZone, []cloudprovider.ICloudZone, compare.SyncResult) { @@ -143,7 +143,7 @@ func syncRegionZones(ctx context.Context, userCred mcclient.TokenCredential, syn syncResults.Add(ZoneManager, result) msg := result.Result() notes := fmt.Sprintf("SyncZones for region %s result: %s", localRegion.Name, msg) - log.Infof(notes) + log.Infof("%s", notes) provider.SyncError(result, notes, userCred) db.OpsLog.LogEvent(provider, db.ACT_SYNC_HOST_COMPLETE, msg, userCred) return localZones, remoteZones, nil @@ -216,7 +216,7 @@ func syncRegionEips( return } msg := fmt.Sprintf("GetIEips for region %s failed %s", remoteRegion.GetName(), err) - log.Errorf(msg) + log.Errorf("%s", msg) return } @@ -229,7 +229,7 @@ func syncRegionEips( msg := result.Result() notes := fmt.Sprintf("SyncEips for region %s result: %s", localRegion.Name, msg) - log.Infof(msg) + log.Infof("%s", msg) provider.SyncError(result, notes, userCred) if result.IsError() { return @@ -246,7 +246,7 @@ func syncRegionBuckets(ctx context.Context, userCred mcclient.TokenCredential, s return } msg := fmt.Sprintf("GetIBuckets for region %s failed %s", remoteRegion.GetName(), err) - log.Errorf(msg) + log.Errorf("%s", msg) return } @@ -259,7 +259,7 @@ func syncRegionBuckets(ctx context.Context, userCred mcclient.TokenCredential, s msg := result.Result() notes := fmt.Sprintf("GetIBuckets for region %s result: %s", localRegion.Name, msg) - log.Infof(notes) + log.Infof("%s", notes) provider.SyncError(result, notes, userCred) if result.IsError() { return @@ -285,7 +285,7 @@ func syncRegionVPCs( return } msg := fmt.Sprintf("GetVpcs for region %s failed %s", remoteRegion.GetName(), err) - log.Errorf(msg) + log.Errorf("%s", msg) return } @@ -298,7 +298,7 @@ func syncRegionVPCs( msg := result.Result() notes := fmt.Sprintf("SyncVPCs for region %s result: %s", localRegion.Name, msg) - log.Infof(notes) + log.Infof("%s", notes) provider.SyncError(result, notes, userCred) if result.IsError() { return @@ -348,7 +348,7 @@ func syncRegionAccessGroups(ctx context.Context, userCred mcclient.TokenCredenti syncResults.Add(AccessGroupManager, result) msg := result.Result() notes := fmt.Sprintf("Sync Access Group for region %s result: %s", localRegion.Name, msg) - log.Infof(notes) + log.Infof("%s", notes) provider.SyncError(result, notes, userCred) } @@ -381,7 +381,7 @@ func syncRegionFileSystems( msg := result.Result() notes := fmt.Sprintf("Sync FileSystem for region %s result: %s", localRegion.Name, msg) - log.Infof(msg) + log.Infof("%s", notes) provider.SyncError(result, notes, userCred) for j := 0; j < len(localFSs); j += 1 { @@ -416,7 +416,7 @@ func syncFileSystemMountTargets( } result := localFs.SyncMountTargets(ctx, userCred, mountTargets, xor) notes := fmt.Sprintf("SyncMountTargets for FileSystem %s result: %s", localFs.Name, result.Result()) - log.Infof(notes) + log.Infof("%s", notes) } func syncVpcPeerConnections( @@ -464,7 +464,7 @@ func syncVpcPeerConnections( syncResults.Add(VpcPeeringConnectionManager, backSyncResult) notes := fmt.Sprintf("SyncVpcPeeringConnections for vpc %s result: %s", localVpc.Name, result.Result()) - log.Infof(notes) + log.Infof("%s", notes) provider.SyncError(result, notes, userCred) if result.IsError() { return @@ -486,7 +486,7 @@ func syncRegionSecGroup( }() if err != nil { msg := fmt.Sprintf("GetISecurityGroups for region %s failed %s", localRegion.Name, err) - log.Errorf(msg) + log.Errorf("%s", msg) return } groups := []cloudprovider.ICloudSecurityGroup{} @@ -506,7 +506,7 @@ func syncRegionSecGroup( msg := result.Result() notes := fmt.Sprintf("SyncSecurityGroup for region %s result: %s", localRegion.Name, msg) - log.Infof(notes) + log.Infof("%s", notes) provider.SyncError(result, notes, userCred) if result.IsError() { return @@ -529,7 +529,7 @@ func syncVpcSecGroup( }() if err != nil { msg := fmt.Sprintf("GetISecurityGroups for vpc %s failed %s", remoteVpc.GetId(), err) - log.Errorf(msg) + log.Errorf("%s", msg) return } @@ -550,7 +550,7 @@ func syncVpcSecGroup( msg := result.Result() notes := fmt.Sprintf("SyncSecurityGroup for VPC %s result: %s", localVpc.Name, msg) - log.Infof(notes) + log.Infof("%s", notes) provider.SyncError(result, notes, userCred) if result.IsError() { return @@ -564,7 +564,7 @@ func syncVpcRouteTables(ctx context.Context, userCred mcclient.TokenCredential, }() if err != nil { msg := fmt.Sprintf("GetIRouteTables for vpc %s failed %s", remoteVpc.GetId(), err) - log.Errorf(msg) + log.Errorf("%s", msg) return } localRouteTables, remoteRouteTables, result := func() ([]SRouteTable, []cloudprovider.ICloudRouteTable, compare.SyncResult) { @@ -576,7 +576,7 @@ func syncVpcRouteTables(ctx context.Context, userCred mcclient.TokenCredential, msg := result.Result() notes := fmt.Sprintf("SyncRouteTables for VPC %s result: %s", localVpc.Name, msg) - log.Infof(notes) + log.Infof("%s", notes) provider.SyncError(result, notes, userCred) if result.IsError() { return @@ -602,7 +602,7 @@ func syncIPv6Gateways(ctx context.Context, userCred mcclient.TokenCredential, sy }() if err != nil { msg := fmt.Sprintf("GetICloudIPv6Gateways for vpc %s failed %s", remoteVpc.GetId(), err) - log.Errorf(msg) + log.Errorf("%s", msg) return } result := func() compare.SyncResult { @@ -614,7 +614,7 @@ func syncIPv6Gateways(ctx context.Context, userCred mcclient.TokenCredential, sy msg := result.Result() notes := fmt.Sprintf("SyncIPv6Gateways for VPC %s result: %s", localVpc.Name, msg) - log.Infof(notes) + log.Infof("%s", notes) provider.SyncError(result, notes, userCred) if result.IsError() { return @@ -631,7 +631,7 @@ func syncVpcNatgateways(ctx context.Context, userCred mcclient.TokenCredential, return } msg := fmt.Sprintf("GetINatGateways for vpc %s failed %s", remoteVpc.GetId(), err) - log.Errorf(msg) + log.Errorf("%s", msg) return } localNatGateways, remoteNatGateways, result := func() ([]SNatGateway, []cloudprovider.ICloudNatGateway, compare.SyncResult) { @@ -643,7 +643,7 @@ func syncVpcNatgateways(ctx context.Context, userCred mcclient.TokenCredential, msg := result.Result() notes := fmt.Sprintf("SyncNatGateways for VPC %s result: %s", localVpc.Name, msg) - log.Infof(notes) + log.Infof("%s", notes) provider.SyncError(result, notes, userCred) if result.IsError() { return @@ -671,13 +671,13 @@ func syncNatGatewayEips(ctx context.Context, userCred mcclient.TokenCredential, eips, err := remoteNatGateway.GetIEips() if err != nil { msg := fmt.Sprintf("GetIEIPs for NatGateway %s failed %s", remoteNatGateway.GetName(), err) - log.Errorf(msg) + log.Errorf("%s", msg) return } result := localNatGateway.SyncNatGatewayEips(ctx, userCred, provider, eips) msg := result.Result() notes := fmt.Sprintf("SyncNatGatewayEips for NatGateway %s result: %s", localNatGateway.Name, msg) - log.Infof(notes) + log.Infof("%s", notes) provider.SyncError(result, notes, userCred) if result.IsError() { return @@ -696,13 +696,13 @@ func syncNatDTable( dtable, err := remoteNatGateway.GetINatDTable() if err != nil { msg := fmt.Sprintf("GetINatDTable for NatGateway %s failed %s", remoteNatGateway.GetName(), err) - log.Errorf(msg) + log.Errorf("%s", msg) return } result := NatDEntryManager.SyncNatDTable(ctx, userCred, provider, localNatGateway, dtable, xor) msg := result.Result() notes := fmt.Sprintf("SyncNatDTable for NatGateway %s result: %s", localNatGateway.Name, msg) - log.Infof(notes) + log.Infof("%s", notes) provider.SyncError(result, notes, userCred) if result.IsError() { return @@ -721,13 +721,13 @@ func syncNatSTable( stable, err := remoteNatGateway.GetINatSTable() if err != nil { msg := fmt.Sprintf("GetINatSTable for NatGateway %s failed %s", remoteNatGateway.GetName(), err) - log.Errorf(msg) + log.Errorf("%s", msg) return } result := NatSEntryManager.SyncNatSTable(ctx, userCred, provider, localNatGateway, stable, xor) msg := result.Result() notes := fmt.Sprintf("SyncNatSTable for NatGateway %s result: %s", localNatGateway.Name, msg) - log.Infof(notes) + log.Infof("%s", notes) provider.SyncError(result, notes, userCred) if result.IsError() { return @@ -746,7 +746,7 @@ func syncVpcWires(ctx context.Context, userCred mcclient.TokenCredential, syncRe }() if err != nil { msg := fmt.Sprintf("GetIWires for vpc %s failed %s", remoteVpc.GetId(), err) - log.Errorf(msg) + log.Errorf("%s", msg) return } localWires, remoteWires, result := func() ([]SWire, []cloudprovider.ICloudWire, compare.SyncResult) { @@ -764,7 +764,7 @@ func syncVpcWires(ctx context.Context, userCred mcclient.TokenCredential, syncRe msg := result.Result() notes := fmt.Sprintf("SyncWires for VPC %s result: %s", localVpc.Name, msg) - log.Infof(notes) + log.Infof("%s", notes) provider.SyncError(result, notes, userCred) if result.IsError() { return @@ -799,7 +799,7 @@ func syncWireNetworks(ctx context.Context, userCred mcclient.TokenCredential, sy }() if err != nil { msg := fmt.Sprintf("GetINetworks for wire %s failed %s", remoteWire.GetId(), err) - log.Errorf(msg) + log.Errorf("%s", msg) return } _, _, result := func() ([]SNetwork, []cloudprovider.ICloudNetwork, compare.SyncResult) { @@ -817,7 +817,7 @@ func syncWireNetworks(ctx context.Context, userCred mcclient.TokenCredential, sy msg := result.Result() notes := fmt.Sprintf("SyncNetworks for wire %s result: %s", localWire.Name, msg) - log.Infof(notes) + log.Infof("%s", notes) provider.SyncError(result, notes, userCred) if result.IsError() { return @@ -841,7 +841,7 @@ func syncZoneStorages( }() if err != nil { msg := fmt.Sprintf("GetIStorages for zone %s failed %s", remoteZone.GetName(), err) - log.Errorf(msg) + log.Errorf("%s", msg) return nil } localStorages, remoteStorages, result := func() ([]SStorage, []cloudprovider.ICloudStorage, compare.SyncResult) { @@ -853,7 +853,7 @@ func syncZoneStorages( msg := result.Result() notes := fmt.Sprintf("SyncStorages for zone %s result: %s", localZone.Name, msg) - log.Infof(notes) + log.Infof("%s", notes) provider.SyncError(result, notes, userCred) if result.IsError() { return nil @@ -920,7 +920,7 @@ func syncStorageDisks(ctx context.Context, userCred mcclient.TokenCredential, sy }() if err != nil { msg := fmt.Sprintf("GetIDisks for storage %s failed %s", remoteStorage.GetName(), err) - log.Errorf(msg) + log.Errorf("%s", msg) return } _, _, result := func() ([]SDisk, []cloudprovider.ICloudDisk, compare.SyncResult) { @@ -932,7 +932,7 @@ func syncStorageDisks(ctx context.Context, userCred mcclient.TokenCredential, sy msg := result.Result() notes := fmt.Sprintf("SyncDisks for storage %s result: %s", localStorage.Name, msg) - log.Infof(notes) + log.Infof("%s", notes) provider.SyncError(result, notes, userCred) if result.IsError() { return @@ -956,7 +956,7 @@ func syncZoneHosts( }() if err != nil { msg := fmt.Sprintf("GetIHosts for zone %s failed %s", remoteZone.GetName(), err) - log.Errorf(msg) + log.Errorf("%s", msg) return nil } localHosts, remoteHosts, result := func() ([]SHost, []cloudprovider.ICloudHost, compare.SyncResult) { @@ -968,7 +968,7 @@ func syncZoneHosts( msg := result.Result() notes := fmt.Sprintf("SyncHosts for zone %s result: %s", localZone.Name, msg) - log.Infof(notes) + log.Infof("%s", notes) provider.SyncError(result, notes, userCred) if result.IsError() { return nil @@ -1007,7 +1007,7 @@ func syncHostStorages(ctx context.Context, userCred mcclient.TokenCredential, sy }() if err != nil { msg := fmt.Sprintf("GetIStorages for host %s failed %s", remoteHost.GetName(), err) - log.Errorf(msg) + log.Errorf("%s", msg) return nil } localStorages, remoteStorages, result := func() ([]SStorage, []cloudprovider.ICloudStorage, compare.SyncResult) { @@ -1019,7 +1019,7 @@ func syncHostStorages(ctx context.Context, userCred mcclient.TokenCredential, sy msg := result.Result() notes := fmt.Sprintf("SyncHostStorages for host %s result: %s", localHost.Name, msg) - log.Infof(notes) + log.Infof("%s", notes) provider.SyncError(result, notes, userCred) if result.IsError() { return nil @@ -1053,7 +1053,7 @@ func syncHostStorages(ctx context.Context, userCred mcclient.TokenCredential, sy }() if err != nil { msg := fmt.Sprintf("GetIWires for host %s failed %s", remoteHost.GetName(), err) - log.Errorf(msg) + log.Errorf("%s", msg) return } result := func() compare.SyncResult { @@ -1071,7 +1071,7 @@ func syncHostStorages(ctx context.Context, userCred mcclient.TokenCredential, sy msg := result.Result() notes := fmt.Sprintf("SyncHostWires/NetInterfaces for host %s result: %s", localHost.Name, msg) - log.Infof(notes) + log.Infof("%s", notes) provider.SyncError(result, notes, userCred) if result.IsError() { return @@ -1086,7 +1086,7 @@ func syncHostVMs(ctx context.Context, userCred mcclient.TokenCredential, syncRes }() if err != nil { msg := fmt.Sprintf("GetIVMs for host %s failed %s", remoteHost.GetName(), err) - log.Errorf(msg) + log.Errorf("%s", msg) return } @@ -1099,7 +1099,7 @@ func syncHostVMs(ctx context.Context, userCred mcclient.TokenCredential, syncRes msg := result.Result() notes := fmt.Sprintf("SyncHostVMs for host %s result: %s", localHost.Name, msg) - log.Infof(notes) + log.Infof("%s", notes) provider.SyncError(result, notes, userCred) for i := 0; i < len(syncVMPairs); i += 1 { @@ -1136,7 +1136,7 @@ func syncHostIsolateDevices(ctx context.Context, userCred mcclient.TokenCredenti return } msg := fmt.Sprintf("GetIsolateDevices for host %s failed %s", remoteHost.GetName(), err) - log.Errorf(msg) + log.Errorf("%s", msg) return } @@ -1149,7 +1149,7 @@ func syncHostIsolateDevices(ctx context.Context, userCred mcclient.TokenCredenti msg := result.Result() notes := fmt.Sprintf("SyncHostIsolateDevices for host %s result: %s", localHost.Name, msg) - log.Infof(notes) + log.Infof("%s", notes) provider.SyncError(result, notes, userCred) } @@ -1209,7 +1209,7 @@ func syncVMNics( result := localVM.SyncVMNics(ctx, userCred, host, nics, nil) msg := result.Result() notes := fmt.Sprintf("syncVMNics for VM %s result: %s", localVM.Name, msg) - log.Infof(notes) + log.Infof("%s", notes) if result.IsError() { return result.AllError() } @@ -1232,7 +1232,7 @@ func syncVMDisks( result := localVM.SyncVMDisks(ctx, userCred, driver, host, disks, provider.GetOwnerId()) msg := result.Result() notes := fmt.Sprintf("syncVMDisks for VM %s result: %s", localVM.Name, msg) - log.Infof(notes) + log.Infof("%s", notes) if result.IsError() { return result.AllError() } @@ -1310,7 +1310,7 @@ func (self *SGuest) SyncVMIsolateDevices(ctx context.Context, userCred mcclient. } msg := result.Result() notes := fmt.Sprintf("syncHostIsolateDevices for VM %s result: %s", self.Name, msg) - log.Infof(notes) + log.Infof("%s", notes) return nil } @@ -1325,7 +1325,7 @@ func syncSkusFromPrivateCloud( skus, err := remoteRegion.GetISkus() if err != nil { msg := fmt.Sprintf("GetISkus for region %s(%s) failed %v", region.Name, region.Id, err) - log.Errorf(msg) + log.Errorf("%s", msg) return } @@ -1359,7 +1359,7 @@ func syncRegionDBInstances( }() if err != nil { msg := fmt.Sprintf("GetIDBInstances for region %s failed %s", remoteRegion.GetName(), err) - log.Errorf(msg) + log.Errorf("%s", msg) return } localInstances, remoteInstances, result := func() ([]SDBInstance, []cloudprovider.ICloudDBInstance, compare.SyncResult) { @@ -1372,7 +1372,7 @@ func syncRegionDBInstances( msg := result.Result() notes := fmt.Sprintf("SyncDBInstances for region %s result: %s", localRegion.Name, msg) - log.Infof(notes) + log.Infof("%s", notes) provider.SyncError(result, notes, userCred) if result.IsError() { return @@ -1402,7 +1402,7 @@ func syncDBInstanceSkus(ctx context.Context, userCred mcclient.TokenCredential, return } msg := fmt.Sprintf("GetIDBInstanceSkus for region %s failed %s", remoteRegion.GetName(), err) - log.Errorf(msg) + log.Errorf("%s", msg) return } result := func() compare.SyncResult { @@ -1414,7 +1414,7 @@ func syncDBInstanceSkus(ctx context.Context, userCred mcclient.TokenCredential, msg := result.Result() notes := fmt.Sprintf("sync rds sku for region %s result: %s", localRegion.Name, msg) - log.Infof(notes) + log.Infof("%s", notes) provider.SyncError(result, notes, userCred) if result.IsError() { return @@ -1431,7 +1431,7 @@ func syncNATSkus(ctx context.Context, userCred mcclient.TokenCredential, syncRes return } msg := fmt.Sprintf("GetINatSkus for region %s failed %s", remoteRegion.GetName(), err) - log.Errorf(msg) + log.Errorf("%s", msg) return } result := func() compare.SyncResult { @@ -1443,7 +1443,7 @@ func syncNATSkus(ctx context.Context, userCred mcclient.TokenCredential, syncRes msg := result.Result() notes := fmt.Sprintf("SyncNatSkus for region %s result: %s", localRegion.Name, msg) - log.Infof(notes) + log.Infof("%s", notes) provider.SyncError(result, notes, userCred) if result.IsError() { return @@ -1460,7 +1460,7 @@ func syncCacheSkus(ctx context.Context, userCred mcclient.TokenCredential, syncR return } msg := fmt.Sprintf("GetIElasticcacheSkus for region %s failed %s", remoteRegion.GetName(), err) - log.Errorf(msg) + log.Errorf("%s", msg) return } result := func() compare.SyncResult { @@ -1472,7 +1472,7 @@ func syncCacheSkus(ctx context.Context, userCred mcclient.TokenCredential, syncR msg := result.Result() notes := fmt.Sprintf("SyncRedisSkus for region %s result: %s", localRegion.Name, msg) - log.Infof(notes) + log.Infof("%s", notes) provider.SyncError(result, notes, userCred) if result.IsError() { return @@ -1708,7 +1708,7 @@ func syncWafIPSets( return nil } msg := fmt.Sprintf("GetICloudWafIPSets for region %s failed %s", remoteRegion.GetName(), err) - log.Errorf(msg) + log.Errorf("%s", msg) return err } @@ -1719,7 +1719,7 @@ func syncWafIPSets( syncResults.Add(WafIPSetManager, result) notes := fmt.Sprintf("SyncWafIPSets for region %s result: %s", localRegion.Name, result.Result()) - log.Infof(notes) + log.Infof("%s", notes) provider.SyncError(result, notes, userCred) if result.IsError() { return result.AllError() @@ -1745,7 +1745,7 @@ func syncWafRegexSets( return nil } msg := fmt.Sprintf("GetICloudWafRegexSets for region %s failed %s", remoteRegion.GetName(), err) - log.Errorf(msg) + log.Errorf("%s", msg) return err } result := func() compare.SyncResult { @@ -1754,7 +1754,7 @@ func syncWafRegexSets( }() syncResults.Add(WafRegexSetManager, result) notes := fmt.Sprintf("SyncWafRegexSets for region %s result: %s", localRegion.Name, result.Result()) - log.Infof(notes) + log.Infof("%s", notes) provider.SyncError(result, notes, userCred) if result.IsError() { return result.AllError() @@ -1777,7 +1777,7 @@ func syncMongoDBs( }() if err != nil { msg := fmt.Sprintf("GetICloudMongoDBs for region %s failed %s", remoteRegion.GetName(), err) - log.Errorf(msg) + log.Errorf("%s", msg) return err } @@ -1788,7 +1788,7 @@ func syncMongoDBs( syncResults.Add(MongoDBManager, result) msg := result.Result() notes := fmt.Sprintf("SyncMongoDBs for region %s result: %s", localRegion.Name, msg) - log.Infof(notes) + log.Infof("%s", notes) provider.SyncError(result, notes, userCred) if result.IsError() { return result.AllError() @@ -1812,7 +1812,7 @@ func syncElasticSearchs( }() if err != nil { msg := fmt.Sprintf("GetIElasticSearchs for region %s failed %s", remoteRegion.GetName(), err) - log.Errorf(msg) + log.Errorf("%s", msg) return err } @@ -1823,7 +1823,7 @@ func syncElasticSearchs( syncResults.Add(ElasticSearchManager, result) msg := result.Result() notes := fmt.Sprintf("SyncElasticSearchs for region %s result: %s", localRegion.Name, msg) - log.Infof(notes) + log.Infof("%s", notes) provider.SyncError(result, notes, userCred) if result.IsError() { return result.AllError() @@ -1846,7 +1846,7 @@ func syncKafkas( }() if err != nil { msg := fmt.Sprintf("GetICloudKafkas for region %s failed %s", remoteRegion.GetName(), err) - log.Errorf(msg) + log.Errorf("%s", msg) return err } @@ -1857,7 +1857,7 @@ func syncKafkas( syncResults.Add(KafkaManager, result) msg := result.Result() notes := fmt.Sprintf("SyncKafkas for region %s result: %s", localRegion.Name, msg) - log.Infof(notes) + log.Infof("%s", notes) provider.SyncError(result, notes, userCred) if result.IsError() { return result.AllError() @@ -1880,7 +1880,7 @@ func syncApps( }() if err != nil { msg := fmt.Sprintf("GetICloudApps for region %s failed %s", remoteRegion.GetName(), err) - log.Errorf(msg) + log.Errorf("%s", msg) return err } result := func() compare.SyncResult { @@ -1890,7 +1890,7 @@ func syncApps( syncResults.Add(AppManager, result) msg := result.Result() notes := fmt.Sprintf("SyncApps for region %s result: %s", localRegion.Name, msg) - log.Infof(notes) + log.Infof("%s", notes) provider.SyncError(result, notes, userCred) if result.IsError() { return result.AllError() @@ -1913,7 +1913,7 @@ func syncKubeClusters( }() if err != nil { msg := fmt.Sprintf("GetICloudKubeClusters for region %s failed %s", remoteRegion.GetName(), err) - log.Errorf(msg) + log.Errorf("%s", msg) return err } localClusters, remoteClusters, result := func() ([]SKubeCluster, []cloudprovider.ICloudKubeCluster, compare.SyncResult) { @@ -1923,7 +1923,7 @@ func syncKubeClusters( syncResults.Add(KubeClusterManager, result) msg := result.Result() notes := fmt.Sprintf("SyncKubeClusters for region %s result: %s", localRegion.Name, msg) - log.Infof(notes) + log.Infof("%s", notes) provider.SyncError(result, notes, userCred) if result.IsError() { return result.AllError() @@ -1962,7 +1962,7 @@ func syncKubeClusterNodePools(ctx context.Context, userCred mcclient.TokenCreden }() if err != nil { msg := fmt.Sprintf("GetICloudKubeNodePools for cluster %s failed %s", cluster.GetName(), err) - log.Errorf(msg) + log.Errorf("%s", msg) return err } @@ -1973,7 +1973,7 @@ func syncKubeClusterNodePools(ctx context.Context, userCred mcclient.TokenCreden syncResults.Add(KubeNodePoolManager, result) msg := result.Result() notes := fmt.Sprintf("SyncKubeNodePools for cluster %s result: %s", cluster.Name, msg) - log.Infof(notes) + log.Infof("%s", notes) if result.IsError() { return result.AllError() } @@ -1988,7 +1988,7 @@ func syncKubeClusterNodes(ctx context.Context, userCred mcclient.TokenCredential }() if err != nil { msg := fmt.Sprintf("GetICloudKubeNodes for cluster %s failed %s", cluster.GetName(), err) - log.Errorf(msg) + log.Errorf("%s", msg) return err } @@ -1997,8 +1997,8 @@ func syncKubeClusterNodes(ctx context.Context, userCred mcclient.TokenCredential return cluster.SyncKubeNodes(ctx, userCred, iNodes) }() syncResults.Add(KubeNodeManager, result) - msg := result.Result() - log.Infof("SyncKubeNodes for cluster %s result: %s", cluster.Name, msg) + notes := fmt.Sprintf("SyncKubeNodes for cluster %s result: %s", cluster.Name, result.Result()) + log.Infof("%s", notes) if result.IsError() { return result.AllError() } @@ -2021,7 +2021,7 @@ func syncWafInstances( }() if err != nil { msg := fmt.Sprintf("GetICloudWafInstances for region %s failed %s", remoteRegion.GetName(), err) - log.Errorf(msg) + log.Errorf("%s", msg) return err } @@ -2032,7 +2032,7 @@ func syncWafInstances( syncResults.Add(WafInstanceManager, result) msg := result.Result() notes := fmt.Sprintf("SyncWafInstances for region %s result: %s", localRegion.Name, msg) - log.Infof(notes) + log.Infof("%s", notes) provider.SyncError(result, notes, userCred) if result.IsError() { return result.AllError() @@ -2049,7 +2049,7 @@ func syncWafInstances( err = syncWafRules(ctx, userCred, syncResults, &localWafs[i], remoteWafs[i]) if err != nil { - log.Errorf("syncDBInstanceAccountPrivileges error: %v", err) + log.Errorf("syncWafRules error: %v", err) } }() @@ -2068,7 +2068,7 @@ func syncWafRules(ctx context.Context, userCred mcclient.TokenCredential, syncRe return nil } msg := fmt.Sprintf("GetRules for waf instance %s failed %s", localWaf.Name, err) - log.Errorf(msg) + log.Errorf("%s", msg) return err } result := func() compare.SyncResult { @@ -2077,7 +2077,8 @@ func syncWafRules(ctx context.Context, userCred mcclient.TokenCredential, syncRe }() syncResults.Add(WafRuleManager, result) msg := result.Result() - log.Infof("SyncWafRules for waf %s result: %s", localWaf.Name, msg) + notes := fmt.Sprintf("SyncWafRules for waf %s result: %s", localWaf.Name, msg) + log.Infof("%s", notes) if result.IsError() { return result.AllError() } @@ -2102,7 +2103,7 @@ func syncRegionSnapshots( return } msg := fmt.Sprintf("GetISnapshots for region %s failed %s", remoteRegion.GetName(), err) - log.Errorf(msg) + log.Errorf("%s", msg) return } @@ -2115,7 +2116,7 @@ func syncRegionSnapshots( msg := result.Result() notes := fmt.Sprintf("SyncSnapshots for region %s result: %s", localRegion.Name, msg) - log.Infof(notes) + log.Infof("%s", notes) provider.SyncError(result, notes, userCred) if result.IsError() { return @@ -2139,7 +2140,8 @@ func syncRegionSnapshotPolicies( if errors.Cause(err) == cloudprovider.ErrNotImplemented || errors.Cause(err) == cloudprovider.ErrNotSupported { return } - log.Errorf("GetISnapshotPolicies for region %s failed %s", remoteRegion.GetName(), err) + msg := fmt.Sprintf("GetISnapshotPolicies for region %s failed %s", remoteRegion.GetName(), err) + log.Errorf("%s", msg) return } @@ -2150,7 +2152,7 @@ func syncRegionSnapshotPolicies( syncResults.Add(SnapshotPolicyManager, result) msg := result.Result() notes := fmt.Sprintf("SyncSnapshotPolicies for region %s result: %s", localRegion.Name, msg) - log.Infof(notes) + log.Infof("%s", notes) provider.SyncError(result, notes, userCred) if result.IsError() { return @@ -2175,7 +2177,7 @@ func syncRegionNetworkInterfaces( return } msg := fmt.Sprintf("GetINetworkInterfaces for region %s failed %s", remoteRegion.GetName(), err) - log.Errorf(msg) + log.Errorf("%s", msg) return } @@ -2187,7 +2189,7 @@ func syncRegionNetworkInterfaces( msg := result.Result() notes := fmt.Sprintf("SyncNetworkInterfaces for region %s result: %s", localRegion.Name, msg) - log.Infof(notes) + log.Infof("%s", notes) provider.SyncError(result, notes, userCred) if result.IsError() { return @@ -2214,14 +2216,14 @@ func syncInterfaceAddresses(ctx context.Context, userCred mcclient.TokenCredenti return } msg := fmt.Sprintf("GetICloudInterfaceAddresses for networkinterface %s failed %s", remoteInterface.GetName(), err) - log.Errorf(msg) + log.Errorf("%s", msg) return } result := NetworkinterfacenetworkManager.SyncInterfaceAddresses(ctx, userCred, localInterface, addresses) msg := result.Result() notes := fmt.Sprintf("SyncInterfaceAddresses for networkinterface %s result: %s", localInterface.Name, msg) - log.Infof(notes) + log.Infof("%s", notes) if result.IsError() { return } @@ -2456,9 +2458,8 @@ func syncPublicCloudProviderInfo( syncResults.Add(CachedimageManager, result) - msg := result.Result() - notes := fmt.Sprintf("syncCloudImages for %s result: %s", storageCachePairs[i].local.GetName(), msg) - log.Infof(notes) + notes := fmt.Sprintf("syncCloudImages for %s result: %s", storageCachePairs[i].local.GetName(), result.Result()) + log.Infof("%s", notes) provider.SyncError(result, notes, userCred) } } @@ -2478,14 +2479,14 @@ func getZoneForOnPremiseCloudRegion(ctx context.Context, userCred mcclient.Token accessIp := extHost.GetAccessIp() if len(accessIp) == 0 { msg := fmt.Sprintf("fail to find wire for host %s: empty host access ip", extHost.GetName()) - log.Errorf(msg) + log.Errorf("%s", msg) continue } ips = append(ips, accessIp) wire, err := WireManager.GetOnPremiseWireOfIp(accessIp) if err != nil { msg := fmt.Sprintf("fail to find wire for host %s %s: %s", extHost.GetName(), accessIp, err) - log.Errorf(msg) + log.Errorf("%s", msg) continue } return wire.GetZone() @@ -2497,7 +2498,7 @@ func syncOnPremiseCloudProviderStorage(ctx context.Context, userCred mcclient.To istorages, err := iregion.GetIStorages() if err != nil { msg := fmt.Sprintf("GetIStorages for provider %s failed %s", provider.GetName(), err) - log.Errorf(msg) + log.Errorf("%s", msg) return nil } localStorages, remoteStorages, result := StorageManager.SyncStorages(ctx, userCred, provider, zone, istorages, syncRange.Xor) @@ -2505,7 +2506,7 @@ func syncOnPremiseCloudProviderStorage(ctx context.Context, userCred mcclient.To msg := result.Result() notes := fmt.Sprintf("SyncStorages for provider %s result: %s", provider.Name, msg) - log.Infof(notes) + log.Infof("%s", notes) provider.SyncError(result, notes, userCred) if result.IsError() { return nil @@ -2553,7 +2554,7 @@ func syncOnPremiseCloudProviderInfo( iregion, err := driver.GetOnPremiseIRegion() if err != nil { msg := fmt.Sprintf("GetOnPremiseIRegion for provider %s failed %s", provider.GetName(), err) - log.Errorf(msg) + log.Errorf("%s", msg) return err } @@ -2580,7 +2581,7 @@ func syncOnPremiseCloudProviderInfo( zone, err := getZoneForOnPremiseCloudRegion(ctx, userCred, iregion) if err != nil { msg := fmt.Sprintf("Can't get zone for Premise cloud region %s error: %v", iregion.GetName(), err) - log.Errorf(msg) + log.Errorf("%s", msg) return errors.Wrap(err, "getZoneForOnPremiseCloudRegion") } @@ -2588,7 +2589,7 @@ func syncOnPremiseCloudProviderInfo( remoteVpcs, err := iregion.GetIVpcs() if err != nil { msg := fmt.Sprintf("GetIVpcs for provider %s failed %s", provider.GetName(), err) - log.Errorf(msg) + log.Errorf("%s", msg) return err } { @@ -2607,7 +2608,7 @@ func syncOnPremiseCloudProviderInfo( }() if err != nil { msg := fmt.Sprintf("GetIHosts for provider %s failed %s", provider.GetName(), err) - log.Errorf(msg) + log.Errorf("%s", msg) return err } @@ -2618,9 +2619,8 @@ func syncOnPremiseCloudProviderInfo( syncResults.Add(HostManager, result) - msg := result.Result() - notes := fmt.Sprintf("SyncHosts for provider %s result: %s", provider.Name, msg) - log.Infof(notes) + notes := fmt.Sprintf("SyncHosts for provider %s result: %s", provider.Name, result.Result()) + log.Infof("%s", notes) provider.SyncError(result, notes, userCred) for i := 0; i < len(localHosts); i += 1 { @@ -2648,9 +2648,8 @@ func syncOnPremiseCloudProviderInfo( }() syncResults.Add(CachedimageManager, result) - msg := result.Result() - notes := fmt.Sprintf("syncCloudImages for stroagecache %s result: %s", storageCachePairs[i].local.GetId(), msg) - log.Infof(notes) + notes := fmt.Sprintf("syncCloudImages for stroagecache %s result: %s", storageCachePairs[i].local.GetId(), result.Result()) + log.Infof("%s", notes) provider.SyncError(result, notes, userCred) // } } @@ -2669,14 +2668,8 @@ func syncHostNics(ctx context.Context, userCred mcclient.TokenCredential, syncRe if syncResults != nil { syncResults.Add(NetInterfaceManager, result) } - msg := result.Result() - notes := fmt.Sprintf("SyncHostExternalNics for host %s result: %s", localHost.Name, msg) - log.Infof(notes) - if result.IsError() { - return - } else { - log.Infof(notes) - } + notes := fmt.Sprintf("SyncHostExternalNics for host %s result: %s", localHost.Name, result.Result()) + log.Infof("%s", notes) } func (manager *SCloudproviderregionManager) fetchRecordsByQuery(q *sqlchemy.SQuery) []SCloudproviderregion { @@ -2791,9 +2784,8 @@ func syncProjects(ctx context.Context, userCred mcclient.TokenCredential, syncRe syncResults.Add(ExternalProjectManager, result) - msg := result.Result() - notes := fmt.Sprintf("SyncProjects for manager %s result: %s", cp.Name, msg) - log.Infof(notes) + notes := fmt.Sprintf("SyncProjects for manager %s result: %s", cp.Name, result.Result()) + log.Infof("%s", notes) cp.SyncError(result, notes, userCred) if result.IsError() { return err @@ -2864,7 +2856,7 @@ func syncCdnDomains(ctx context.Context, userCred mcclient.TokenCredential, sync result := provider.SyncCDNDomains(ctx, userCred, domains, xor) notes := fmt.Sprintf("Sync CDN for provider %s result: %s", provider.Name, result.Result()) - log.Infof(notes) + log.Infof("%s", notes) provider.SyncError(result, notes, userCred) return nil } @@ -2876,7 +2868,7 @@ func syncInterVpcNetworks(ctx context.Context, userCred mcclient.TokenCredential } localNetwork, remoteNetwork, result := provider.SyncInterVpcNetwork(ctx, userCred, networks, xor) notes := fmt.Sprintf("Sync inter vpc network for cloudprovider %s result: %s", provider.GetName(), result.Result()) - log.Infof(notes) + log.Infof("%s", notes) provider.SyncError(result, notes, userCred) for i := range localNetwork { lockman.LockObject(ctx, &localNetwork[i]) @@ -2897,7 +2889,7 @@ func syncDnsZones(ctx context.Context, userCred mcclient.TokenCredential, syncRe } localZones, remoteZones, result := provider.SyncDnsZones(ctx, userCred, dnsZones, xor) notes := fmt.Sprintf("Sync dns zones for cloudaccount %s result: %s", provider.Name, result.Result()) - log.Infof(notes) + log.Infof("%s", notes) provider.SyncError(result, notes, userCred) for i := range localZones { lockman.LockObject(ctx, &localZones[i]) @@ -2922,7 +2914,7 @@ func syncAiGateways(ctx context.Context, userCred mcclient.TokenCredential, sync }() syncResults.Add(AiGatewayManager, result) notes := fmt.Sprintf("Sync ai gateways for cloudprovider %s result: %s", provider.GetName(), result.Result()) - log.Infof(notes) + log.Infof("%s", notes) provider.SyncError(result, notes, userCred) return nil } @@ -2938,7 +2930,7 @@ func syncGlobalVpcs(ctx context.Context, userCred mcclient.TokenCredential, sync localVpcs, remoteVpcs, result := provider.SyncGlobalVpcs(ctx, userCred, gvpcs, xor) notes := fmt.Sprintf("Sync global vpcs for cloudprovider %s result: %s", provider.GetName(), result.Result()) - log.Infof(notes) + log.Infof("%s", notes) provider.SyncError(result, notes, userCred) for i := range localVpcs { @@ -2958,7 +2950,7 @@ func syncGlobalVpcs(ctx context.Context, userCred mcclient.TokenCredential, sync } result := localVpcs[i].SyncSecgroups(ctx, userCred, secgroups, xor) notes := fmt.Sprintf("Sync security group for global vpc %s result: %s", localVpcs[i].Name, result.Result()) - log.Infof(notes) + log.Infof("%s", notes) } return nil @@ -2972,7 +2964,7 @@ func syncSSLCertificates(ctx context.Context, userCred mcclient.TokenCredential, result := provider.SyncSSLCertificates(ctx, userCred, iEss) notes := fmt.Sprintf("SyncSSLCertificates for provider %s result: %s", provider.Name, result.Result()) - log.Infof(notes) + log.Infof("%s", notes) provider.SyncError(result, notes, userCred) return nil } @@ -2995,7 +2987,7 @@ func syncTablestore( return nil } msg := fmt.Sprintf("GetICloudTablestores for region %s failed %s", remoteRegion.GetName(), err) - log.Errorf(msg) + log.Errorf("%s", msg) return err } result := func() compare.SyncResult { @@ -3005,7 +2997,7 @@ func syncTablestore( syncResults.Add(TablestoreManager, result) msg := result.Result() notes := fmt.Sprintf("SyncTablestores for region %s result: %s", localRegion.Name, msg) - log.Infof(notes) + log.Infof("%s", notes) provider.SyncError(result, notes, userCred) if result.IsError() { return result.AllError() @@ -3028,12 +3020,12 @@ func syncModelartsPools( return nil } msg := fmt.Sprintf("GetIModelartsPools for provider %s failed %s", err, ipools) - log.Errorf(msg) + log.Errorf("%s", msg) return err } result := localRegion.SyncModelartsPools(ctx, userCred, provider, ipools, xor) notes := fmt.Sprintf("SyncModelartsPools for region %s result: %s", provider.GetName(), result.Result()) - log.Infof(notes) + log.Infof("%s", notes) provider.SyncError(result, notes, userCred) return nil } @@ -3053,12 +3045,12 @@ func syncModelartsPoolSkus( return nil } msg := fmt.Sprintf("GetIModelartsPoolSku for provider %s failed %s", err, ipools) - log.Errorf(msg) + log.Errorf("%s", msg) return err } result := localRegion.SyncModelartsPoolSkus(ctx, userCred, provider, ipools, xor) notes := fmt.Sprintf("SyncModelartsPoolSkus for region %s result: %s", provider.GetName(), result.Result()) - log.Infof(notes) + log.Infof("%s", notes) provider.SyncError(result, notes, userCred) return nil } @@ -3078,12 +3070,12 @@ func syncMiscResources( return nil } msg := fmt.Sprintf("GetIMiscResources for provider %s failed %v", provider.Name, err) - log.Errorf(msg) + log.Errorf("%s", msg) return err } result := localRegion.SyncMiscResources(ctx, userCred, provider, exts, xor) notes := fmt.Sprintf("SyncMiscResources for provider %s result: %s", provider.GetName(), result.Result()) - log.Infof(notes) + log.Infof("%s", notes) provider.SyncError(result, notes, userCred) return nil } diff --git a/pkg/compute/models/cloudsyncelasticcache.go b/pkg/compute/models/cloudsyncelasticcache.go index 9021e2edba..4d820035d9 100644 --- a/pkg/compute/models/cloudsyncelasticcache.go +++ b/pkg/compute/models/cloudsyncelasticcache.go @@ -44,7 +44,7 @@ func syncElasticcaches( }() if err != nil { msg := fmt.Sprintf("GetIElasticcaches for region %s failed %s", remoteRegion.GetName(), err) - log.Errorf(msg) + log.Errorf("%s", msg) return } @@ -82,7 +82,7 @@ func syncElasticcacheParameters(ctx context.Context, userCred mcclient.TokenCred }() if err != nil { msg := fmt.Sprintf("GetIElasticcacheParameters for dbinstance %s failed %s", remoteInstance.GetName(), err) - log.Errorf(msg) + log.Errorf("%s", msg) return } @@ -91,8 +91,8 @@ func syncElasticcacheParameters(ctx context.Context, userCred mcclient.TokenCred result := ElasticcacheParameterManager.SyncElasticcacheParameters(ctx, userCred, localInstance, parameters) syncResults.Add(ElasticcacheParameterManager, result) - msg := result.Result() - log.Infof("SyncElasticcacheParameters for dbinstance %s result: %s", localInstance.Name, msg) + msg := fmt.Sprintf("SyncElasticcacheParameters for dbinstance %s result: %s", localInstance.Name, result.Result()) + log.Infof("%s", msg) if result.IsError() { return } @@ -106,7 +106,7 @@ func syncElasticcacheAccounts(ctx context.Context, userCred mcclient.TokenCreden }() if err != nil { msg := fmt.Sprintf("GetIElasticcacheAccounts for dbinstance %s failed %s", remoteInstance.GetName(), err) - log.Errorf(msg) + log.Errorf("%s", msg) return } @@ -115,11 +115,8 @@ func syncElasticcacheAccounts(ctx context.Context, userCred mcclient.TokenCreden result := ElasticcacheAccountManager.SyncElasticcacheAccounts(ctx, userCred, localInstance, accounts) syncResults.Add(ElasticcacheAccountManager, result) - msg := result.Result() - log.Infof("SyncElasticcacheAccounts for dbinstance %s result: %s", localInstance.Name, msg) - if result.IsError() { - return - } + msg := fmt.Sprintf("SyncElasticcacheAccounts for dbinstance %s result: %s", localInstance.Name, result.Result()) + log.Infof("%s", msg) }() } @@ -129,11 +126,11 @@ func syncElasticcacheAcls(ctx context.Context, userCred mcclient.TokenCredential return remoteInstance.GetICloudElasticcacheAcls() }() if err != nil { - msg := fmt.Sprintf("GetIElasticcacheAcls for dbinstance %s failed %s", remoteInstance.GetName(), err) + msg := fmt.Sprintf("GetIElasticcacheAcls for dbinstance %s failed %v", remoteInstance.GetName(), err) if errors.Cause(err) == cloudprovider.ErrNotSupported { - log.Warningf(msg) + log.Warningf("%s", msg) } else { - log.Errorf(msg) + log.Errorf("%s", msg) } return } @@ -143,11 +140,8 @@ func syncElasticcacheAcls(ctx context.Context, userCred mcclient.TokenCredential result := ElasticcacheAclManager.SyncElasticcacheAcls(ctx, userCred, localInstance, acls) syncResults.Add(ElasticcacheAclManager, result) - msg := result.Result() - log.Infof("SyncElasticcacheAcls for dbinstance %s result: %s", localInstance.Name, msg) - if result.IsError() { - return - } + msg := fmt.Sprintf("SyncElasticcacheAcls for dbinstance %s result: %s", localInstance.Name, result.Result()) + log.Infof("%s", msg) }() } @@ -158,7 +152,7 @@ func syncElasticcacheBackups(ctx context.Context, userCred mcclient.TokenCredent }() if err != nil { msg := fmt.Sprintf("GetIElasticcacheBackups for dbinstance %s failed %s", remoteInstance.GetName(), err) - log.Errorf(msg) + log.Errorf("%s", msg) return } @@ -167,11 +161,8 @@ func syncElasticcacheBackups(ctx context.Context, userCred mcclient.TokenCredent result := ElasticcacheBackupManager.SyncElasticcacheBackups(ctx, userCred, localInstance, backups) syncResults.Add(ElasticcacheBackupManager, result) - msg := result.Result() - log.Infof("SyncElasticcacheBackups for dbinstance %s result: %s", localInstance.Name, msg) - if result.IsError() { - return - } + msg := fmt.Sprintf("SyncElasticcacheBackups for dbinstance %s result: %s", localInstance.Name, result.Result()) + log.Infof("%s", msg) }() } @@ -183,9 +174,9 @@ func syncElasticcacheSecgroups(ctx context.Context, userCred mcclient.TokenCrede if err != nil { msg := fmt.Sprintf("Elasticcache.GetSecurityGroupIds for dbinstance %s failed %s", remoteInstance.GetName(), err) if errors.Cause(err) == cloudprovider.ErrNotSupported { - log.Warningf(msg) + log.Warningf("%s", msg) } else { - log.Errorf(msg) + log.Errorf("%s", msg) } return } @@ -195,10 +186,7 @@ func syncElasticcacheSecgroups(ctx context.Context, userCred mcclient.TokenCrede result := localInstance.SyncElasticcacheSecgroups(ctx, userCred, secgroupIds) syncResults.Add(ElasticcachesecgroupManager, result) - msg := result.Result() - log.Infof("SyncElasticcacheSecgroups for dbinstance %s result: %s", localInstance.Name, msg) - if result.IsError() { - return - } + msg := fmt.Sprintf("SyncElasticcacheSecgroups for dbinstance %s result: %s", localInstance.Name, result.Result()) + log.Infof("%s", msg) }() } diff --git a/pkg/compute/models/containers.go b/pkg/compute/models/containers.go index ba7b643138..692b36afdc 100644 --- a/pkg/compute/models/containers.go +++ b/pkg/compute/models/containers.go @@ -349,7 +349,7 @@ func (m *SContainerManager) validateSpecProbe(ctx context.Context, userCred mccl "failure_threshold": probe.FailureThreshold, } { if val < 0 { - return httperrors.NewInputParameterError(key + " is negative") + return httperrors.NewInputParameterError("%s is negative", key) } } diff --git a/pkg/compute/models/dbinstance_skus.go b/pkg/compute/models/dbinstance_skus.go index 4f5cced14a..908d360194 100644 --- a/pkg/compute/models/dbinstance_skus.go +++ b/pkg/compute/models/dbinstance_skus.go @@ -687,9 +687,8 @@ func SyncRegionDBInstanceSkus(ctx context.Context, userCred mcclient.TokenCreden db.Metadata.SetValue(ctx, skuMeta, db.SKU_METADAT_KEY, newMd5, userCred) result := DBInstanceSkuManager.SyncDBInstanceSkus(ctx, userCred, ®ion, xor) - msg := result.Result() - notes := fmt.Sprintf("sync rds sku for region %s result: %s", region.Name, msg) - log.Debugf(notes) + notes := fmt.Sprintf("sync rds sku for region %s result: %s", region.Name, result.Result()) + log.Debugf("%s", notes) } } diff --git a/pkg/compute/models/elasticcache_skus.go b/pkg/compute/models/elasticcache_skus.go index 05e5fa78cd..2aa7575569 100644 --- a/pkg/compute/models/elasticcache_skus.go +++ b/pkg/compute/models/elasticcache_skus.go @@ -846,7 +846,7 @@ func SyncElasticCacheSkus(ctx context.Context, userCred mcclient.TokenCredential result := ElasticcacheSkuManager.SyncElasticcacheSkus(ctx, userCred, region, false) notes := fmt.Sprintf("SyncElasticCacheSkusByRegion %s result: %s", region.Name, result.Result()) - log.Debugf(notes) + log.Debugf("%s", notes) } } @@ -854,12 +854,12 @@ func SyncElasticCacheSkus(ctx context.Context, userCred mcclient.TokenCredential func SyncElasticCacheSkusByRegion(ctx context.Context, userCred mcclient.TokenCredential, region *SCloudregion, xor bool) error { if !region.GetDriver().IsSupportedElasticcache() { notes := fmt.Sprintf("SyncElasticCacheSkusByRegion %s not support elasticcache", region.Name) - log.Infof(notes) + log.Infof("%s", notes) return nil } result := ElasticcacheSkuManager.SyncElasticcacheSkus(ctx, userCred, region, xor) notes := fmt.Sprintf("SyncElasticCacheSkusByRegion %s result: %s", region.Name, result.Result()) - log.Infof(notes) + log.Infof("%s", notes) return nil } diff --git a/pkg/compute/models/filesystem.go b/pkg/compute/models/filesystem.go index 2a4e3a5575..1c7ab72ef0 100644 --- a/pkg/compute/models/filesystem.go +++ b/pkg/compute/models/filesystem.go @@ -532,7 +532,8 @@ func (region *SCloudregion) getZoneIdBySuffix(zoneId string) (string, error) { return zone.Id, nil } } - return "", errors.Wrapf(cloudprovider.ErrNotFound, zoneId) + msg := zoneId + return "", errors.Wrapf(cloudprovider.ErrNotFound, "%s", msg) } func (region *SCloudregion) newFromCloudFileSystem(ctx context.Context, userCred mcclient.TokenCredential, provider *SCloudprovider, fs cloudprovider.ICloudFileSystem) (*SFileSystem, error) { diff --git a/pkg/compute/models/guest_actions.go b/pkg/compute/models/guest_actions.go index ba638d62f4..7e1fe7485a 100644 --- a/pkg/compute/models/guest_actions.go +++ b/pkg/compute/models/guest_actions.go @@ -78,7 +78,7 @@ func (self *SGuest) GetDetailsVnc(ctx context.Context, userCred mcclient.TokenCr utils.IsInStringArray(self.Status, []string{api.VM_RUNNING, api.VM_BLOCK_STREAM, api.VM_MIGRATING}) { host, err := self.GetHost() if err != nil { - return nil, httperrors.NewInternalServerError(errors.Wrapf(err, "GetHost").Error()) + return nil, httperrors.NewInternalServerError("get host %v", err) } if options.Options.ForceUseOriginVnc { input.Origin = true @@ -2165,12 +2165,12 @@ func (self *SGuest) DetachIsolatedDevices(ctx context.Context, userCred mcclient if devModel, err := IsolatedDeviceModelManager.GetByDevType(dev.DevType); err != nil { msg := fmt.Sprintf("Can't separately detach dev type %s", dev.DevType) logclient.AddActionLogWithContext(ctx, self, logclient.ACT_GUEST_DETACH_ISOLATED_DEVICE, msg, userCred, false) - return httperrors.NewBadRequestError(msg) + return httperrors.NewBadRequestError("%s", msg) } else { if !devModel.HotPluggable.Bool() && self.GetStatus() == api.VM_RUNNING { msg := fmt.Sprintf("dev type %s model %s unhotpluggable", dev.DevType, devModel.Model) logclient.AddActionLogWithContext(ctx, self, logclient.ACT_GUEST_DETACH_ISOLATED_DEVICE, msg, userCred, false) - return httperrors.NewBadRequestError(msg) + return httperrors.NewBadRequestError("%s", msg) } } } @@ -2193,7 +2193,7 @@ func (self *SGuest) PerformDetachIsolatedDevice(ctx context.Context, userCred mc (self.Hypervisor == api.HYPERVISOR_POD && self.GetStatus() != api.VM_READY) { msg := fmt.Sprintf("Can't detach isolated device when guest is %s", self.GetStatus()) logclient.AddActionLogWithContext(ctx, self, logclient.ACT_GUEST_DETACH_ISOLATED_DEVICE, msg, userCred, false) - return nil, httperrors.NewInvalidStatusError(msg) + return nil, httperrors.NewInvalidStatusError("%s", msg) } var detachAllDevice = jsonutils.QueryBoolean(data, "detach_all", false) devs := make([]SIsolatedDevice, 0) @@ -2202,7 +2202,7 @@ func (self *SGuest) PerformDetachIsolatedDevice(ctx context.Context, userCred mc if err != nil { msg := "Missing isolated device" logclient.AddActionLogWithContext(ctx, self, logclient.ACT_GUEST_DETACH_ISOLATED_DEVICE, msg, userCred, false) - return nil, httperrors.NewBadRequestError(msg) + return nil, httperrors.NewBadRequestError("%s", msg) } iDev, err := IsolatedDeviceManager.FetchByIdOrName(ctx, userCred, device) if err != nil { @@ -2237,7 +2237,7 @@ func (self *SGuest) detachIsolateDevice(ctx context.Context, userCred mcclient.T if dev.GuestId != self.Id { msg := "Isolated device is not attached to this guest" logclient.AddActionLogWithContext(ctx, self, logclient.ACT_GUEST_DETACH_ISOLATED_DEVICE, msg, userCred, false) - return httperrors.NewBadRequestError(msg) + return httperrors.NewBadRequestError("%s", msg) } drv, _ := self.GetDriver() if err := drv.BeforeDetachIsolatedDevice(ctx, userCred, self, dev); err != nil { @@ -2263,9 +2263,9 @@ func (self *SGuest) PerformAttachIsolatedDevice(ctx context.Context, userCred mc } if !utils.IsInStringArray(self.GetStatus(), []string{api.VM_READY, api.VM_RUNNING}) || (self.Hypervisor == api.HYPERVISOR_POD && self.GetStatus() != api.VM_READY) { - msg := fmt.Sprintf("Can't attach isolated device when guest is %s", self.GetStatus()) + msg := fmt.Sprintf("Can't attach isolated device when guest is %v", self.GetStatus()) logclient.AddActionLogWithContext(ctx, self, logclient.ACT_GUEST_ATTACH_ISOLATED_DEVICE, msg, userCred, false) - return nil, httperrors.NewInvalidStatusError(msg) + return nil, httperrors.NewInvalidStatusError("%s", msg) } var err error autoStart := jsonutils.QueryBoolean(data, "auto_start", false) diff --git a/pkg/compute/models/guest_convert.go b/pkg/compute/models/guest_convert.go index 0d34ef9288..2a81896a2a 100644 --- a/pkg/compute/models/guest_convert.go +++ b/pkg/compute/models/guest_convert.go @@ -261,7 +261,7 @@ func (self *SGuest) createConvertedServer(ctx context.Context, userCred mcclient return nil, nil, errors.Wrap(err, "Do schedule migrate forecast") } if !succ { - return nil, nil, httperrors.NewInsufficientResourceError(res.String()) + return nil, nil, httperrors.NewInsufficientResourceError("%s", res.String()) } lockman.LockClass(ctx, GuestManager, userCred.GetProjectId()) diff --git a/pkg/compute/models/guest_sshable.go b/pkg/compute/models/guest_sshable.go index 643fe2c6ff..0d1b5868ab 100644 --- a/pkg/compute/models/guest_sshable.go +++ b/pkg/compute/models/guest_sshable.go @@ -352,7 +352,8 @@ func (guest *SGuest) sshableTry( return true } - ctx, _ = context.WithTimeout(ctx, 7*time.Second) + ctx, cancel := context.WithTimeout(ctx, 7*time.Second) + defer cancel() conf := ssh_util.ClientConfig{ Username: tryData.User, Host: methodData.Host, diff --git a/pkg/compute/models/host_recycle.go b/pkg/compute/models/host_recycle.go index b87dfdf3ec..07361e24f7 100644 --- a/pkg/compute/models/host_recycle.go +++ b/pkg/compute/models/host_recycle.go @@ -153,9 +153,9 @@ func (self *SGuest) doPrepaidRecycleNoLock(ctx context.Context, userCred mcclien guestnics, err := self.GetNetworks("") if err != nil || len(guestnics) == 0 { - msg := fmt.Sprintf("no network info on guest???? %s", err) - log.Errorf(msg) - return fmt.Errorf(msg) + msg := fmt.Sprintf("no network info on guest???? %v", err) + log.Errorf("%s", msg) + return fmt.Errorf("%s", msg) } fakeHost.AccessIp = guestnics[0].IpAddr fakeHost.AccessMac = guestnics[0].MacAddr @@ -229,7 +229,7 @@ func (self *SGuest) doPrepaidRecycleNoLock(ctx context.Context, userCred mcclien } else { if externalId != storage.ExternalId { msg := "inconsistent storage !!!!" - log.Errorf(msg) + log.Errorf("%s", msg) fakeHost.RealDelete(ctx, userCred) return errors.Wrap(httperrors.ErrConflict, msg) } @@ -406,7 +406,7 @@ func doUndoPrepaidRecycleLockHost(ctx context.Context, userCred mcclient.TokenCr func doUndoPrepaidRecycleNoLock(ctx context.Context, userCred mcclient.TokenCredential, host *SHost, server *SGuest) error { if host.RealExternalId != server.ExternalId { msg := "host and server external id not match!!!!" - log.Errorf(msg) + log.Errorf("%v", msg) return errors.Wrap(httperrors.ErrConflict, msg) } @@ -426,12 +426,12 @@ func doUndoPrepaidRecycleNoLock(ctx context.Context, userCred mcclient.TokenCred if oHostCnt == 0 { msg := "orthordox host not found???" - log.Errorf(msg) + log.Errorf("%s", msg) return errors.Wrap(httperrors.ErrConflict, msg) } if oHostCnt > 1 { msg := fmt.Sprintf("more than 1 (%d) orthordox host found???", oHostCnt) - log.Errorf(msg) + log.Errorf("%s", msg) return errors.Wrap(httperrors.ErrConflict, msg) } @@ -440,8 +440,8 @@ func doUndoPrepaidRecycleNoLock(ctx context.Context, userCred mcclient.TokenCred err = q.First(&oHost) if err != nil { - msg := fmt.Sprintf("fail to query orthordox host %s", err) - log.Errorf(msg) + msg := fmt.Sprintf("fail to query orthordox host %v", err) + log.Errorf("%s", msg) return errors.Wrap(err, msg) } @@ -455,7 +455,7 @@ func doUndoPrepaidRecycleNoLock(ctx context.Context, userCred mcclient.TokenCred oHostStorage := oHost.GetHoststorageByExternalId(storage.ExternalId) if oHostStorage == nil { msg := fmt.Sprintf("oHost.GetHoststorageByExternalId not found %s", storage.ExternalId) - log.Errorf(msg) + log.Errorf("%s", msg) return errors.Wrap(httperrors.ErrConflict, msg) } } @@ -484,7 +484,7 @@ func doUndoPrepaidRecycleNoLock(ctx context.Context, userCred mcclient.TokenCred oHostStorage := oHost.GetHoststorageByExternalId(storage.ExternalId) if oHostStorage == nil { msg := fmt.Sprintf("oHost.GetHoststorageByExternalId not found %s", storage.ExternalId) - log.Errorf(msg) + log.Errorf("%s", msg) return errors.Wrap(httperrors.ErrConflict, msg) } oStorage := oHostStorage.GetStorage() @@ -546,8 +546,8 @@ func (self *SHost) BorrowIpAddrsFromGuest(ctx context.Context, userCred mcclient netif := self.GetNetInterface(guestnics[i].MacAddr, 1) if netif == nil { msg := fmt.Sprintf("fail to find netinterface for mac %s", guestnics[i].MacAddr) - log.Errorf(msg) - return fmt.Errorf(msg) + log.Errorf("%s", msg) + return fmt.Errorf("%s", msg) } err = self.EnableNetif(ctx, userCred, netif, "", guestnics[i].IpAddr, guestnics[i].Ip6Addr, "", "", false, false, false, false) diff --git a/pkg/compute/models/hosts.go b/pkg/compute/models/hosts.go index ca4f7b6756..6fb1650afe 100644 --- a/pkg/compute/models/hosts.go +++ b/pkg/compute/models/hosts.go @@ -2543,7 +2543,7 @@ func (manager *SHostManager) NewFromCloudHost(ctx context.Context, userCred mccl accessIp := extHost.GetAccessIp() if len(accessIp) == 0 { msg := fmt.Sprintf("fail to find wire for host %s: empty host access ip", extHost.GetName()) - return nil, fmt.Errorf(msg) + return nil, fmt.Errorf("%s", msg) } wire, err := WireManager.GetOnPremiseWireOfIp(accessIp) if err != nil { @@ -4848,8 +4848,8 @@ func fetchIpmiInfo(data api.HostIpmiAttributes, hostId string) (types.SIPMIInfo, } } if len(data.IpmiIpAddr) > 0 && !regutils.MatchIP4Addr(data.IpmiIpAddr) { - msg := fmt.Sprintf("ipmi_ip_addr: %s not valid ipv4 address", data.IpmiIpAddr) - log.Errorf(msg) + msg := fmt.Sprintf("ipmi_ip_addr: %v not valid ipv4 address", data.IpmiIpAddr) + log.Errorf("%s", msg) return info, errors.Wrap(httperrors.ErrInvalidFormat, msg) } info.IpAddr = data.IpmiIpAddr diff --git a/pkg/compute/models/kube_node_pools.go b/pkg/compute/models/kube_node_pools.go index 6faa9f1a80..85f7061353 100644 --- a/pkg/compute/models/kube_node_pools.go +++ b/pkg/compute/models/kube_node_pools.go @@ -148,7 +148,7 @@ func (self *SKubeNodePool) GetIKubeNodePool(ctx context.Context) (cloudprovider. return pools[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, self.ExternalId) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", self.ExternalId) } func (manager *SKubeNodePoolManager) FetchOwnerId(ctx context.Context, data jsonutils.JSONObject) (mcclient.IIdentityProvider, error) { diff --git a/pkg/compute/models/kube_nodes.go b/pkg/compute/models/kube_nodes.go index 6c1a10f482..918752ee19 100644 --- a/pkg/compute/models/kube_nodes.go +++ b/pkg/compute/models/kube_nodes.go @@ -322,9 +322,9 @@ func (self *SKubeCluster) GetNodePoolIdByExternalId(id string) (*SKubeNodePool, return &pools[0], nil } if len(pools) == 0 { - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%v", id) } - return nil, errors.Wrapf(cloudprovider.ErrDuplicateId, id) + return nil, errors.Wrapf(cloudprovider.ErrDuplicateId, "%v", id) } func (self *SKubeCluster) newFromCloudKubeNode(ctx context.Context, userCred mcclient.TokenCredential, ext cloudprovider.ICloudKubeNode) (*SKubeNode, error) { diff --git a/pkg/compute/models/nas_skus.go b/pkg/compute/models/nas_skus.go index 89f5673898..dc89309e44 100644 --- a/pkg/compute/models/nas_skus.go +++ b/pkg/compute/models/nas_skus.go @@ -382,9 +382,8 @@ func SyncRegionNasSkus(ctx context.Context, userCred mcclient.TokenCredential, r db.Metadata.SetValue(ctx, skuMeta, db.SKU_METADAT_KEY, newMd5, userCred) result := regions[i].SyncNasSkus(ctx, userCred, xor) - msg := result.Result() - notes := fmt.Sprintf("SyncNasSkus for region %s result: %s", regions[i].Name, msg) - log.Debugf(notes) + notes := fmt.Sprintf("SyncNasSkus for region %s result: %v", regions[i].Name, result.Result()) + log.Debugf("%s", notes) } return nil } diff --git a/pkg/compute/models/nat_skus.go b/pkg/compute/models/nat_skus.go index e56cea3c04..fb3f2c5323 100644 --- a/pkg/compute/models/nat_skus.go +++ b/pkg/compute/models/nat_skus.go @@ -385,9 +385,8 @@ func SyncRegionNatSkus(ctx context.Context, userCred mcclient.TokenCredential, r db.Metadata.SetValue(ctx, skuMeta, db.SKU_METADAT_KEY, newMd5, userCred) result := regions[i].SyncNatSkus(ctx, userCred, xor) - msg := result.Result() - notes := fmt.Sprintf("SyncNatSkus for region %s result: %s", regions[i].Name, msg) - log.Infof(notes) + notes := fmt.Sprintf("SyncNatSkus for region %s result: %v", regions[i].Name, result.Result()) + log.Infof("%s", notes) } return nil } diff --git a/pkg/compute/models/natdtable.go b/pkg/compute/models/natdtable.go index 21b0a1eecc..91b20de9e1 100644 --- a/pkg/compute/models/natdtable.go +++ b/pkg/compute/models/natdtable.go @@ -382,7 +382,7 @@ func (self *SNatDEntry) GetEip() (*SElasticip, error) { return &eips[0], nil } if len(eips) == 0 { - return nil, errors.Wrapf(cloudprovider.ErrNotFound, self.ExternalIP) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%v", self.ExternalIP) } - return nil, errors.Wrapf(cloudprovider.ErrDuplicateId, self.ExternalIP) + return nil, errors.Wrapf(cloudprovider.ErrDuplicateId, "%v", self.ExternalIP) } diff --git a/pkg/compute/models/natgateways.go b/pkg/compute/models/natgateways.go index 2abca8f077..88b3b5b289 100644 --- a/pkg/compute/models/natgateways.go +++ b/pkg/compute/models/natgateways.go @@ -771,7 +771,7 @@ func (self *SNatGateway) GetINatGateway(ctx context.Context) (cloudprovider.IClo return iNats[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, self.ExternalId) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%v", self.ExternalId) } func (self *SNatGateway) Delete(ctx context.Context, userCred mcclient.TokenCredential) error { diff --git a/pkg/compute/models/natstable.go b/pkg/compute/models/natstable.go index 0233e097d3..1e49fa98ba 100644 --- a/pkg/compute/models/natstable.go +++ b/pkg/compute/models/natstable.go @@ -472,7 +472,7 @@ func (self *SNatSEntry) GetEip() (*SElasticip, error) { return &eips[0], nil } if len(eips) == 0 { - return nil, errors.Wrapf(cloudprovider.ErrNotFound, self.IP) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%v", self.IP) } - return nil, errors.Wrapf(cloudprovider.ErrDuplicateId, self.IP) + return nil, errors.Wrapf(cloudprovider.ErrDuplicateId, "%v", self.IP) } diff --git a/pkg/compute/models/networks.go b/pkg/compute/models/networks.go index 5d29950ecb..93eb2d8e26 100644 --- a/pkg/compute/models/networks.go +++ b/pkg/compute/models/networks.go @@ -3611,7 +3611,7 @@ func (network *SNetwork) GetUsedAddressDetails(ctx context.Context, addr string) return &address[i], nil } } - return nil, errors.Wrapf(errors.ErrNotFound, addr) + return nil, errors.Wrapf(errors.ErrNotFound, "%s", addr) } func (network *SNetwork) GetAddressDetails(ctx context.Context, userCred mcclient.TokenCredential, owner mcclient.IIdentityProvider, scope rbacscope.TRbacScope) ([]api.SNetworkUsedAddress, error) { diff --git a/pkg/compute/models/secgroups.go b/pkg/compute/models/secgroups.go index 891b164d35..bb8681a910 100644 --- a/pkg/compute/models/secgroups.go +++ b/pkg/compute/models/secgroups.go @@ -947,7 +947,7 @@ func (self *SSecurityGroup) GetISecurityGroup(ctx context.Context) (cloudprovide return securityGroups[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, self.ExternalId) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%v", self.ExternalId) } iRegion, err := self.GetIRegion(ctx) if err != nil { diff --git a/pkg/compute/models/server_skus.go b/pkg/compute/models/server_skus.go index 224d398dc6..4abfd1082c 100644 --- a/pkg/compute/models/server_skus.go +++ b/pkg/compute/models/server_skus.go @@ -1202,7 +1202,7 @@ func (region *SCloudregion) newPublicCloudSku(ctx context.Context, userCred mccl zoneId := sku.ZoneId sku.ZoneId = yunionmeta.GetZoneIdBySuffix(zoneMaps, zoneId) if len(sku.ZoneId) == 0 { - return errors.Wrapf(cloudprovider.ErrNotFound, zoneId) + return errors.Wrapf(cloudprovider.ErrNotFound, "%v", zoneId) } } @@ -1489,7 +1489,7 @@ func (self *SServerSku) GetICloudSku(ctx context.Context) (cloudprovider.ICloudS } } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, self.ExternalId) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%v", self.ExternalId) } func fetchSkuSyncCloudregions() []SCloudregion { @@ -1555,8 +1555,8 @@ func SyncServerSkus(ctx context.Context, userCred mcclient.TokenCredential, isSt db.Metadata.SetValue(ctx, skuMeta, db.SKU_METADAT_KEY, newMd5, userCred) result := ServerSkuManager.SyncServerSkus(ctx, userCred, region, false) - notes := fmt.Sprintf("SyncServerSkusByRegion %s result: %s", region.Name, result.Result()) - log.Debugf(notes) + notes := fmt.Sprintf("SyncServerSkusByRegion %s result: %v", region.Name, result.Result()) + log.Debugf("%s", notes) } } @@ -1565,7 +1565,7 @@ func SyncServerSkus(ctx context.Context, userCred mcclient.TokenCredential, isSt func SyncServerSkusByRegion(ctx context.Context, userCred mcclient.TokenCredential, region *SCloudregion, xor bool) compare.SyncResult { result := compare.SyncResult{} result = ServerSkuManager.SyncServerSkus(ctx, userCred, region, xor) - notes := fmt.Sprintf("SyncServerSkusByRegion %s result: %s", region.Name, result.Result()) - log.Infof(notes) + notes := fmt.Sprintf("SyncServerSkusByRegion %s result: %v", region.Name, result.Result()) + log.Infof("%s", notes) return result } diff --git a/pkg/compute/models/storagecaches.go b/pkg/compute/models/storagecaches.go index 4e8db605b5..4959b48f8e 100644 --- a/pkg/compute/models/storagecaches.go +++ b/pkg/compute/models/storagecaches.go @@ -449,8 +449,8 @@ func (sc *SStoragecache) GetIStorageCache(ctx context.Context) (cloudprovider.IC storages := sc.getValidStorages() if len(storages) == 0 { msg := fmt.Sprintf("no storages for this storagecache %s(%s)???", sc.Name, sc.Id) - log.Errorf(msg) - return nil, fmt.Errorf(msg) + log.Errorf("%v", msg) + return nil, fmt.Errorf("%v", msg) } istorage, err := storages[0].GetIStorage(ctx) if err != nil { diff --git a/pkg/compute/models/storages.go b/pkg/compute/models/storages.go index a6ff0c3691..2ff40c4f4c 100644 --- a/pkg/compute/models/storages.go +++ b/pkg/compute/models/storages.go @@ -1611,8 +1611,8 @@ func (self *SStorage) GetIStorage(ctx context.Context) (cloudprovider.ICloudStor region, _ := self.GetRegion() if region == nil { msg := "cannot find region for storage???" - log.Errorf(msg) - return nil, fmt.Errorf(msg) + log.Errorf("%s", msg) + return nil, fmt.Errorf("%s", msg) } iRegion, err = provider.GetIRegionById(region.ExternalId) } @@ -1913,8 +1913,8 @@ func (self *SStorage) ClearSchedDescCache() error { hosts := self.GetAllAttachingHosts() if hosts == nil { msg := "get attaching host error" - log.Errorf(msg) - return fmt.Errorf(msg) + log.Errorf("%s", msg) + return fmt.Errorf("%s", msg) } for i := 0; i < len(hosts); i += 1 { err := hosts[i].ClearSchedDescCache() diff --git a/pkg/compute/models/waf_ipsets.go b/pkg/compute/models/waf_ipsets.go index 23958b43d4..19ee40087f 100644 --- a/pkg/compute/models/waf_ipsets.go +++ b/pkg/compute/models/waf_ipsets.go @@ -352,5 +352,5 @@ func (self *SWafIPSet) GetICloudWafIPSet(ctx context.Context) (cloudprovider.ICl return caches[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, self.ExternalId) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%v", self.ExternalId) } diff --git a/pkg/compute/models/waf_regexsets.go b/pkg/compute/models/waf_regexsets.go index a488d2f18c..21abf62b95 100644 --- a/pkg/compute/models/waf_regexsets.go +++ b/pkg/compute/models/waf_regexsets.go @@ -249,7 +249,7 @@ func (self *SWafRegexSet) GetICloudWafRegexSet(ctx context.Context) (cloudprovid return caches[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, self.ExternalId) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%v", self.ExternalId) } func (self *SWafRegexSet) syncWithCloudRegexSet(ctx context.Context, userCred mcclient.TokenCredential, ext cloudprovider.ICloudWafRegexSet) error { diff --git a/pkg/compute/models/waf_rule_groups.go b/pkg/compute/models/waf_rule_groups.go index cc4d30412a..5a31588784 100644 --- a/pkg/compute/models/waf_rule_groups.go +++ b/pkg/compute/models/waf_rule_groups.go @@ -243,7 +243,7 @@ func (self *SWafRuleGroup) GetICloudWafRuleGroup(ctx context.Context) (cloudprov return caches[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, self.ExternalId) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%v", self.ExternalId) } func (self *SWafRuleGroup) syncWithCloudRuleGroup(ctx context.Context, userCred mcclient.TokenCredential, ext cloudprovider.ICloudWafRuleGroup) error { diff --git a/pkg/compute/models/waf_rules.go b/pkg/compute/models/waf_rules.go index 06aa253f6f..5d17b32cfc 100644 --- a/pkg/compute/models/waf_rules.go +++ b/pkg/compute/models/waf_rules.go @@ -592,7 +592,7 @@ func (self *SWafRule) GetICloudWafRule(ctx context.Context) (cloudprovider.IClou return rules[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, self.ExternalId) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", self.ExternalId) } return nil, errors.Wrapf(cloudprovider.ErrNotFound, "") } diff --git a/pkg/compute/regiondrivers/managedvirtual.go b/pkg/compute/regiondrivers/managedvirtual.go index 041042586d..b1f13ee31f 100644 --- a/pkg/compute/regiondrivers/managedvirtual.go +++ b/pkg/compute/regiondrivers/managedvirtual.go @@ -116,7 +116,7 @@ func validateUniqueById(ctx context.Context, userCred mcclient.TokenCredential, } if count > 1 { - return httperrors.NewDuplicateResourceError(id) + return httperrors.NewDuplicateResourceError("%s", id) } return nil @@ -1405,7 +1405,7 @@ func (self *SManagedVirtualizationRegionDriver) RequestCreateDBInstance(ctx cont return iRds, nil } if len(errMsgs) > 0 { - return nil, fmt.Errorf(strings.Join(errMsgs, "\n")) + return nil, fmt.Errorf("%s", strings.Join(errMsgs, "\n")) } return nil, fmt.Errorf("no avaiable skus %s(%dC%d) for create", dbinstance.InstanceType, desc.VcpuCount, desc.VmemSizeMb) } @@ -1577,7 +1577,7 @@ func (self *SManagedVirtualizationRegionDriver) RequestCreateDBInstanceFromBacku return iRds, nil } if len(errMsgs) > 0 { - return nil, fmt.Errorf(strings.Join(errMsgs, "\n")) + return nil, fmt.Errorf("%s", strings.Join(errMsgs, "\n")) } return nil, fmt.Errorf("no avaiable skus %s(%dC%d) for create", rds.InstanceType, desc.VcpuCount, desc.VmemSizeMb) } diff --git a/pkg/compute/tasks/backup/instance_backup_recovery_task.go b/pkg/compute/tasks/backup/instance_backup_recovery_task.go index 5d1933ba24..4516a0c299 100644 --- a/pkg/compute/tasks/backup/instance_backup_recovery_task.go +++ b/pkg/compute/tasks/backup/instance_backup_recovery_task.go @@ -128,7 +128,7 @@ func (self *InstanceBackupRecoveryTask) OnCreateGuest(ctx context.Context, ib *m sysDisk := &disks[0] backups, err := ib.GetBackups() if err != nil { - self.taskFailed(ctx, ib, jsonutils.NewString(fmt.Sprintf(err.Error()))) + self.taskFailed(ctx, ib, jsonutils.NewString(fmt.Sprintf("%v", err))) return } db.Update(sysDisk, func() error { diff --git a/pkg/compute/tasks/baremetal/baremetal_create_task.go b/pkg/compute/tasks/baremetal/baremetal_create_task.go index 7e00bc7c8e..b8610d4118 100644 --- a/pkg/compute/tasks/baremetal/baremetal_create_task.go +++ b/pkg/compute/tasks/baremetal/baremetal_create_task.go @@ -68,7 +68,7 @@ func (self *BaremetalCreateTask) OnIpmiProbeComplete(ctx context.Context, obj db } if baremetal.AccessMac == "" && baremetal.Uuid == "" && !ipmiInfo.CdromBoot { msg := "Fail to find access_mac or uuid, host-prepare aborted. Please supply either access_mac or uuid and try host-prepare" - log.Errorf(msg) + log.Errorf("%s", msg) self.taskFailed(ctx, baremetal, msg) baremetal.SetStatus(ctx, self.UserCred, api.BAREMETAL_PREPARE_FAIL, msg) return diff --git a/pkg/compute/tasks/baremetal/baremetal_sync_status_task.go b/pkg/compute/tasks/baremetal/baremetal_sync_status_task.go index e048955f70..248528b23e 100644 --- a/pkg/compute/tasks/baremetal/baremetal_sync_status_task.go +++ b/pkg/compute/tasks/baremetal/baremetal_sync_status_task.go @@ -63,7 +63,7 @@ func (self *BaremetalSyncStatusTask) OnSyncstatusComplete(ctx context.Context, b } func (self *BaremetalSyncStatusTask) OnSyncstatusCompleteFailed(ctx context.Context, baremetal *models.SHost, body jsonutils.JSONObject) { - self.taskFailed(ctx, baremetal, errors.Errorf(body.String())) + self.taskFailed(ctx, baremetal, errors.Errorf("%s", body.String())) } func init() { diff --git a/pkg/compute/tasks/bucket/bucket_syncstatus_task.go b/pkg/compute/tasks/bucket/bucket_syncstatus_task.go index 4b1a6ee150..e1d8ecc597 100644 --- a/pkg/compute/tasks/bucket/bucket_syncstatus_task.go +++ b/pkg/compute/tasks/bucket/bucket_syncstatus_task.go @@ -65,5 +65,5 @@ func (self *BucketSyncstatusTask) OnBucketSyncStatusComplete(ctx context.Context } func (self *BucketSyncstatusTask) OnBucketSyncStatusCompleteFailed(ctx context.Context, bucket *models.SBucket, data jsonutils.JSONObject) { - self.taskFailed(ctx, bucket, fmt.Errorf(data.String())) + self.taskFailed(ctx, bucket, fmt.Errorf("%s", data.String())) } diff --git a/pkg/compute/tasks/dbinstance/dbinstance_backup_syncstatus_task.go b/pkg/compute/tasks/dbinstance/dbinstance_backup_syncstatus_task.go index 98c188ce22..d6aa980088 100644 --- a/pkg/compute/tasks/dbinstance/dbinstance_backup_syncstatus_task.go +++ b/pkg/compute/tasks/dbinstance/dbinstance_backup_syncstatus_task.go @@ -65,5 +65,5 @@ func (self *DBInstanceBackupSyncstatusTask) OnDBInstanceBackupSyncStatusComplete } func (self *DBInstanceBackupSyncstatusTask) OnDBInstanceBackupSyncStatusCompleteFailed(ctx context.Context, backup *models.SDBInstanceBackup, data jsonutils.JSONObject) { - self.taskFailed(ctx, backup, fmt.Errorf(data.String())) + self.taskFailed(ctx, backup, fmt.Errorf("%s", data.String())) } diff --git a/pkg/compute/tasks/dbinstance/dbinstance_remote_update_task.go b/pkg/compute/tasks/dbinstance/dbinstance_remote_update_task.go index a5a7895f98..53276dedb2 100644 --- a/pkg/compute/tasks/dbinstance/dbinstance_remote_update_task.go +++ b/pkg/compute/tasks/dbinstance/dbinstance_remote_update_task.go @@ -62,7 +62,7 @@ func (self *DBInstanceRemoteUpdateTask) OnRemoteUpdateComplete(ctx context.Conte } func (self *DBInstanceRemoteUpdateTask) OnRemoteUpdateCompleteFailed(ctx context.Context, rds *models.SDBInstance, data jsonutils.JSONObject) { - self.taskFail(ctx, rds, errors.Errorf(data.String())) + self.taskFail(ctx, rds, errors.Errorf("%s", data.String())) } func (self *DBInstanceRemoteUpdateTask) OnSyncStatusComplete(ctx context.Context, rds *models.SDBInstance, data jsonutils.JSONObject) { diff --git a/pkg/compute/tasks/disk/disk_remote_update_tags_task.go b/pkg/compute/tasks/disk/disk_remote_update_tags_task.go index 14e40ca3aa..47de9e66a6 100644 --- a/pkg/compute/tasks/disk/disk_remote_update_tags_task.go +++ b/pkg/compute/tasks/disk/disk_remote_update_tags_task.go @@ -87,7 +87,7 @@ func (self *DiskRemoteUpdateTask) OnRemoteUpdateComplete(ctx context.Context, di } func (self *DiskRemoteUpdateTask) OnRemoteUpdateCompleteFailed(ctx context.Context, disk *models.SDisk, data jsonutils.JSONObject) { - self.taskFail(ctx, disk, errors.Errorf(data.String())) + self.taskFail(ctx, disk, errors.Errorf("%s", data.String())) } func (self *DiskRemoteUpdateTask) OnSyncStatusComplete(ctx context.Context, disk *models.SDisk, data jsonutils.JSONObject) { diff --git a/pkg/compute/tasks/disk/disk_reset_task.go b/pkg/compute/tasks/disk/disk_reset_task.go index 6644ad85f2..6fc0377542 100644 --- a/pkg/compute/tasks/disk/disk_reset_task.go +++ b/pkg/compute/tasks/disk/disk_reset_task.go @@ -149,7 +149,7 @@ func (self *DiskResetTask) RequestResetDisk(ctx context.Context, disk *models.SD } func (self *DiskResetTask) OnRequestResetDiskFailed(ctx context.Context, disk *models.SDisk, data jsonutils.JSONObject) { - self.TaskFailed(ctx, disk, fmt.Errorf(data.String())) + self.TaskFailed(ctx, disk, fmt.Errorf("%s", data.String())) } func (self *DiskResetTask) OnRequestResetDisk(ctx context.Context, disk *models.SDisk, data jsonutils.JSONObject) { diff --git a/pkg/compute/tasks/disk/disk_save_task.go b/pkg/compute/tasks/disk/disk_save_task.go index faef8f4cfd..565db283ad 100644 --- a/pkg/compute/tasks/disk/disk_save_task.go +++ b/pkg/compute/tasks/disk/disk_save_task.go @@ -142,5 +142,5 @@ func (self *DiskSaveTask) OnUploadDiskComplete(ctx context.Context, disk *models } func (self *DiskSaveTask) OnUploadDiskCompleteFailed(ctx context.Context, disk *models.SDisk, data jsonutils.JSONObject) { - self.taskFailed(ctx, disk, fmt.Errorf(data.String())) + self.taskFailed(ctx, disk, fmt.Errorf("%s", data.String())) } diff --git a/pkg/compute/tasks/disk/disk_syncstatus_task.go b/pkg/compute/tasks/disk/disk_syncstatus_task.go index f9c3320ecf..a39831d3f9 100644 --- a/pkg/compute/tasks/disk/disk_syncstatus_task.go +++ b/pkg/compute/tasks/disk/disk_syncstatus_task.go @@ -71,5 +71,5 @@ func (self *DiskSyncstatusTask) OnDiskSyncStatusComplete(ctx context.Context, ob } func (self *DiskSyncstatusTask) OnDiskSyncStatusCompleteFailed(ctx context.Context, disk *models.SDisk, data jsonutils.JSONObject) { - self.taskFailed(ctx, disk, fmt.Errorf(data.String())) + self.taskFailed(ctx, disk, fmt.Errorf("%s", data.String())) } diff --git a/pkg/compute/tasks/eip/eip_associate_task.go b/pkg/compute/tasks/eip/eip_associate_task.go index abd47a9a2a..2992c47a21 100644 --- a/pkg/compute/tasks/eip/eip_associate_task.go +++ b/pkg/compute/tasks/eip/eip_associate_task.go @@ -156,5 +156,5 @@ func (self *EipAssociateTask) OnAssociateEipComplete(ctx context.Context, obj db func (self *EipAssociateTask) OnAssociateEipCompleteFailed(ctx context.Context, obj db.IStandaloneModel, data jsonutils.JSONObject) { eip := obj.(*models.SElasticip) ins, _, _ := self.GetAssociateObj(ctx) - self.taskFail(ctx, eip, ins, errors.Errorf(data.String())) + self.taskFail(ctx, eip, ins, errors.Errorf("%s", data.String())) } diff --git a/pkg/compute/tasks/elasticcache/elasticcache_allocate_public_connection_task.go b/pkg/compute/tasks/elasticcache/elasticcache_allocate_public_connection_task.go index eb31aa9416..ba0eac7bf0 100644 --- a/pkg/compute/tasks/elasticcache/elasticcache_allocate_public_connection_task.go +++ b/pkg/compute/tasks/elasticcache/elasticcache_allocate_public_connection_task.go @@ -67,5 +67,5 @@ func (self *ElasticcacheAllocatePublicConnectionTask) OnElasticcacheAllocatePubl } func (self *ElasticcacheAllocatePublicConnectionTask) OnElasticcacheAllocatePublicConnectionCompleteFailed(ctx context.Context, elasticcache *models.SElasticcache, reason jsonutils.JSONObject) { - self.taskFail(ctx, elasticcache, fmt.Errorf(reason.String())) + self.taskFail(ctx, elasticcache, fmt.Errorf("%s", reason.String())) } diff --git a/pkg/compute/tasks/elasticcache/elasticcache_create_task.go b/pkg/compute/tasks/elasticcache/elasticcache_create_task.go index 1dfe028941..19edf7d51c 100644 --- a/pkg/compute/tasks/elasticcache/elasticcache_create_task.go +++ b/pkg/compute/tasks/elasticcache/elasticcache_create_task.go @@ -93,7 +93,7 @@ func (self *ElasticcacheCreateTask) OnSyncSecurityGroupComplete(ctx context.Cont } func (self *ElasticcacheCreateTask) OnSyncSecurityGroupCompleteFailed(ctx context.Context, elasticcache *models.SElasticcache, reason jsonutils.JSONObject) { - self.taskFail(ctx, elasticcache, fmt.Errorf(reason.String())) + self.taskFail(ctx, elasticcache, fmt.Errorf("%s", reason.String())) } func (self *ElasticcacheCreateTask) OnElasticcacheCreateComplete(ctx context.Context, elasticcache *models.SElasticcache, data jsonutils.JSONObject) { @@ -107,5 +107,5 @@ func (self *ElasticcacheCreateTask) OnElasticcacheCreateComplete(ctx context.Con } func (self *ElasticcacheCreateTask) OnElasticcacheCreateCompleteFailed(ctx context.Context, elasticcache *models.SElasticcache, reason jsonutils.JSONObject) { - self.taskFail(ctx, elasticcache, fmt.Errorf(reason.String())) + self.taskFail(ctx, elasticcache, fmt.Errorf("%s", reason.String())) } diff --git a/pkg/compute/tasks/elasticcache/elasticcache_release_public_connection_task.go b/pkg/compute/tasks/elasticcache/elasticcache_release_public_connection_task.go index a6d5eca4b4..67196a96e6 100644 --- a/pkg/compute/tasks/elasticcache/elasticcache_release_public_connection_task.go +++ b/pkg/compute/tasks/elasticcache/elasticcache_release_public_connection_task.go @@ -67,5 +67,5 @@ func (self *ElasticcacheReleasePublicConnectionTask) OnElasticcacheReleasePublic } func (self *ElasticcacheReleasePublicConnectionTask) OnElasticcacheReleasePublicConnectionCompleteFailed(ctx context.Context, elasticcache *models.SElasticcache, reason jsonutils.JSONObject) { - self.taskFail(ctx, elasticcache, fmt.Errorf(reason.String())) + self.taskFail(ctx, elasticcache, fmt.Errorf("%s", reason.String())) } diff --git a/pkg/compute/tasks/elasticcache/elasticcache_syncsecgroups_task.go b/pkg/compute/tasks/elasticcache/elasticcache_syncsecgroups_task.go index afabf8d91f..357ea630d8 100644 --- a/pkg/compute/tasks/elasticcache/elasticcache_syncsecgroups_task.go +++ b/pkg/compute/tasks/elasticcache/elasticcache_syncsecgroups_task.go @@ -93,5 +93,5 @@ func (self *ElasticcacheSyncsecgroupsTask) OnElasticcacheSyncSecgroupsComplete(c } func (self *ElasticcacheSyncsecgroupsTask) OnElasticcacheSyncSecgroupsCompleteFailed(ctx context.Context, cache *models.SElasticcache, data jsonutils.JSONObject) { - self.taskFailed(ctx, cache, fmt.Errorf(data.String())) + self.taskFailed(ctx, cache, fmt.Errorf("%s", data.String())) } diff --git a/pkg/compute/tasks/filesystem/file_system_remote_update_task.go b/pkg/compute/tasks/filesystem/file_system_remote_update_task.go index ea401d9f91..a5412bc207 100644 --- a/pkg/compute/tasks/filesystem/file_system_remote_update_task.go +++ b/pkg/compute/tasks/filesystem/file_system_remote_update_task.go @@ -84,7 +84,7 @@ func (self *FileSystemRemoteUpdateTask) OnRemoteUpdateComplete(ctx context.Conte } func (self *FileSystemRemoteUpdateTask) OnRemoteUpdateCompleteFailed(ctx context.Context, fs *models.SFileSystem, data jsonutils.JSONObject) { - self.taskFail(ctx, fs, errors.Errorf(data.String())) + self.taskFail(ctx, fs, errors.Errorf("%s", data.String())) } func (self *FileSystemRemoteUpdateTask) OnSyncStatusComplete(ctx context.Context, fs *models.SFileSystem, data jsonutils.JSONObject) { diff --git a/pkg/compute/tasks/filesystem/mount_target_syncstatus_task.go b/pkg/compute/tasks/filesystem/mount_target_syncstatus_task.go index b9e2276c6f..0f2aa8d63b 100644 --- a/pkg/compute/tasks/filesystem/mount_target_syncstatus_task.go +++ b/pkg/compute/tasks/filesystem/mount_target_syncstatus_task.go @@ -69,5 +69,5 @@ func (self *MountTargetSyncstatusTask) OnInit(ctx context.Context, obj db.IStand } } - self.taskFail(ctx, mt, errors.Wrapf(cloudprovider.ErrNotFound, mt.ExternalId)) + self.taskFail(ctx, mt, errors.Wrapf(cloudprovider.ErrNotFound, "%s", mt.ExternalId)) } diff --git a/pkg/compute/tasks/guest/guest_delete_task.go b/pkg/compute/tasks/guest/guest_delete_task.go index 7ac44f02a0..2a38327fa0 100644 --- a/pkg/compute/tasks/guest/guest_delete_task.go +++ b/pkg/compute/tasks/guest/guest_delete_task.go @@ -315,7 +315,7 @@ func (self *GuestDeleteTask) DoDeleteGuest(ctx context.Context, guest *models.SG err := host.BorrowIpAddrsFromGuest(ctx, self.UserCred, guest) if err != nil { msg := fmt.Sprintf("host.BorrowIpAddrsFromGuest fail %s", err) - log.Errorf(msg) + log.Errorf("%v", msg) self.OnGuestDeleteFailed(ctx, guest, jsonutils.NewString(msg)) return } diff --git a/pkg/compute/tasks/guest/guest_qga_restart_network_task.go b/pkg/compute/tasks/guest/guest_qga_restart_network_task.go index 937356c3e2..d096cdd298 100644 --- a/pkg/compute/tasks/guest/guest_qga_restart_network_task.go +++ b/pkg/compute/tasks/guest/guest_qga_restart_network_task.go @@ -87,7 +87,7 @@ func (self *GuestQgaRestartNetworkTask) OnSetNetwork(ctx context.Context, guest } func (self *GuestQgaRestartNetworkTask) OnSetNetworkFailed(ctx context.Context, guest *models.SGuest, data jsonutils.JSONObject) { - self.taskFailed(ctx, guest, errors.Errorf(data.String())) + self.taskFailed(ctx, guest, errors.Errorf("%s", data.String())) } func (self *GuestQgaRestartNetworkTask) taskFailed(ctx context.Context, guest *models.SGuest, err error) { diff --git a/pkg/compute/tasks/guest/guest_renew_task.go b/pkg/compute/tasks/guest/guest_renew_task.go index 94b3565ac9..926c3b7dd0 100644 --- a/pkg/compute/tasks/guest/guest_renew_task.go +++ b/pkg/compute/tasks/guest/guest_renew_task.go @@ -68,7 +68,7 @@ func (self *GuestRenewTask) OnInit(ctx context.Context, obj db.IStandaloneModel, err = models.SaveRenewInfo(ctx, self.UserCred, guest, &bc, &exp, "") if err != nil { msg := fmt.Sprintf("SaveRenewInfo fail %s", err) - log.Errorf(msg) + log.Errorf("%v", msg) self.SetStageFailed(ctx, jsonutils.NewString(msg)) return } @@ -92,7 +92,7 @@ func (self *PrepaidRecycleHostRenewTask) OnInit(ctx context.Context, obj db.ISta ihost, err := host.GetIHost(ctx) if err != nil { msg := fmt.Sprintf("host.GetIHost fail %s", err) - log.Errorf(msg) + log.Errorf("%v", msg) self.SetStageFailed(ctx, jsonutils.NewString(msg)) return } @@ -100,7 +100,7 @@ func (self *PrepaidRecycleHostRenewTask) OnInit(ctx context.Context, obj db.ISta iVM, err := ihost.GetIVMById(host.RealExternalId) if err != nil { msg := fmt.Sprintf("ihost.GetIVMById fail %s", err) - log.Errorf(msg) + log.Errorf("%v", msg) self.SetStageFailed(ctx, jsonutils.NewString(msg)) return } @@ -110,7 +110,7 @@ func (self *PrepaidRecycleHostRenewTask) OnInit(ctx context.Context, obj db.ISta err = iVM.Renew(bc) if err != nil { msg := fmt.Sprintf("iVM.Renew fail %s", err) - log.Errorf(msg) + log.Errorf("%v", msg) self.SetStageFailed(ctx, jsonutils.NewString(msg)) return } @@ -118,7 +118,7 @@ func (self *PrepaidRecycleHostRenewTask) OnInit(ctx context.Context, obj db.ISta err = iVM.Refresh() if err != nil { msg := fmt.Sprintf("refresh after renew fail %s", err) - log.Errorf(msg) + log.Errorf("%v", msg) self.SetStageFailed(ctx, jsonutils.NewString(msg)) return } @@ -130,7 +130,7 @@ func (self *PrepaidRecycleHostRenewTask) OnInit(ctx context.Context, obj db.ISta err = host.DoSaveRenewInfo(ctx, self.UserCred, &bc, &exp) if err != nil { msg := fmt.Sprintf("SaveRenewInfo fail %s", err) - log.Errorf(msg) + log.Errorf("%v", msg) self.SetStageFailed(ctx, jsonutils.NewString(msg)) return } diff --git a/pkg/compute/tasks/host/host_storage_attach_task.go b/pkg/compute/tasks/host/host_storage_attach_task.go index d1b99c27a9..9933efc4e9 100644 --- a/pkg/compute/tasks/host/host_storage_attach_task.go +++ b/pkg/compute/tasks/host/host_storage_attach_task.go @@ -89,5 +89,5 @@ func (self *HostStorageAttachTask) OnAttachStorageComplete(ctx context.Context, } func (self *HostStorageAttachTask) OnAttachStorageCompleteFailed(ctx context.Context, host *models.SHost, reason jsonutils.JSONObject) { - self.taskFail(ctx, host, errors.Errorf(reason.String())) + self.taskFail(ctx, host, errors.Errorf("%s", reason.String())) } diff --git a/pkg/compute/tasks/host/host_storage_detach_task.go b/pkg/compute/tasks/host/host_storage_detach_task.go index 9d6fc4b9a7..1994e68b4a 100644 --- a/pkg/compute/tasks/host/host_storage_detach_task.go +++ b/pkg/compute/tasks/host/host_storage_detach_task.go @@ -81,5 +81,5 @@ func (self *HostStorageDetachTask) OnDetachStorageComplete(ctx context.Context, } func (self *HostStorageDetachTask) OnDetachStorageCompleteFailed(ctx context.Context, host *models.SHost, reason jsonutils.JSONObject) { - self.taskFail(ctx, host, errors.Errorf(reason.String())) + self.taskFail(ctx, host, errors.Errorf("%s", reason.String())) } diff --git a/pkg/compute/tasks/kube/kube_cluster_create_task.go b/pkg/compute/tasks/kube/kube_cluster_create_task.go index 0ab1ea7e75..54d78741a3 100644 --- a/pkg/compute/tasks/kube/kube_cluster_create_task.go +++ b/pkg/compute/tasks/kube/kube_cluster_create_task.go @@ -64,5 +64,5 @@ func (self *KubeClusterCreateTask) OnKubeClusterCreateComplate(ctx context.Conte } func (self *KubeClusterCreateTask) OnKubeClusterCreateComplateFailed(ctx context.Context, cluster *models.SKubeCluster, reason jsonutils.JSONObject) { - self.taskFail(ctx, cluster, errors.Errorf(reason.String())) + self.taskFail(ctx, cluster, errors.Errorf("%s", reason.String())) } diff --git a/pkg/compute/tasks/kube/kube_node_pool_create_task.go b/pkg/compute/tasks/kube/kube_node_pool_create_task.go index 11fd03ce66..ad37e56493 100644 --- a/pkg/compute/tasks/kube/kube_node_pool_create_task.go +++ b/pkg/compute/tasks/kube/kube_node_pool_create_task.go @@ -64,5 +64,5 @@ func (self *KubeNodePoolCreateTask) OnKubeNodePoolCreateComplate(ctx context.Con } func (self *KubeNodePoolCreateTask) OnKubeNodePoolCreateComplateFailed(ctx context.Context, pool *models.SKubeNodePool, reason jsonutils.JSONObject) { - self.taskFail(ctx, pool, errors.Errorf(reason.String())) + self.taskFail(ctx, pool, errors.Errorf("%s", reason.String())) } diff --git a/pkg/compute/tasks/loadbalancer/loadbalancer_acl_create_task.go b/pkg/compute/tasks/loadbalancer/loadbalancer_acl_create_task.go index 81a8a3a07d..9e79193548 100644 --- a/pkg/compute/tasks/loadbalancer/loadbalancer_acl_create_task.go +++ b/pkg/compute/tasks/loadbalancer/loadbalancer_acl_create_task.go @@ -67,5 +67,5 @@ func (self *LoadbalancerAclCreateTask) OnLoadbalancerAclCreateComplete(ctx conte } func (self *LoadbalancerAclCreateTask) OnLoadbalancerAclCreateCompleteFailed(ctx context.Context, lbacl *models.SLoadbalancerAcl, reason jsonutils.JSONObject) { - self.taskFail(ctx, lbacl, errors.Errorf(reason.String())) + self.taskFail(ctx, lbacl, errors.Errorf("%s", reason.String())) } diff --git a/pkg/compute/tasks/loadbalancer/loadbalancer_acl_delete_task.go b/pkg/compute/tasks/loadbalancer/loadbalancer_acl_delete_task.go index a050e84da7..6060f6f10d 100644 --- a/pkg/compute/tasks/loadbalancer/loadbalancer_acl_delete_task.go +++ b/pkg/compute/tasks/loadbalancer/loadbalancer_acl_delete_task.go @@ -66,5 +66,5 @@ func (self *LoadbalancerAclDeleteTask) OnLoadbalancerAclDeleteComplete(ctx conte } func (self *LoadbalancerAclDeleteTask) OnLoadbalancerAclDeleteCompleteFailed(ctx context.Context, lbacl *models.SLoadbalancerAcl, reason jsonutils.JSONObject) { - self.taskFail(ctx, lbacl, errors.Errorf(reason.String())) + self.taskFail(ctx, lbacl, errors.Errorf("%s", reason.String())) } diff --git a/pkg/compute/tasks/loadbalancer/loadbalancer_acl_syncstatus_task.go b/pkg/compute/tasks/loadbalancer/loadbalancer_acl_syncstatus_task.go index d852455103..4b9633aca5 100644 --- a/pkg/compute/tasks/loadbalancer/loadbalancer_acl_syncstatus_task.go +++ b/pkg/compute/tasks/loadbalancer/loadbalancer_acl_syncstatus_task.go @@ -58,5 +58,5 @@ func (self *LoadbalancerAclSyncstatusTask) OnLoadbalancerAclSyncstatusComplete(c } func (self *LoadbalancerAclSyncstatusTask) OnLoadbalancerAclSyncstatusCompleteFailed(ctx context.Context, lbacl *models.SLoadbalancerAcl, reason jsonutils.JSONObject) { - self.taskFail(ctx, lbacl, errors.Errorf(reason.String())) + self.taskFail(ctx, lbacl, errors.Errorf("%s", reason.String())) } diff --git a/pkg/compute/tasks/loadbalancer/loadbalancer_acl_update_task.go b/pkg/compute/tasks/loadbalancer/loadbalancer_acl_update_task.go index c8dcd46db6..9c0e3a72c5 100644 --- a/pkg/compute/tasks/loadbalancer/loadbalancer_acl_update_task.go +++ b/pkg/compute/tasks/loadbalancer/loadbalancer_acl_update_task.go @@ -67,5 +67,5 @@ func (self *LoadbalancerAclUpdateTask) OnLoadbalancerAclUpdateComplete(ctx conte } func (self *LoadbalancerAclUpdateTask) OnLoadbalancerAclUpdateCompleteFailed(ctx context.Context, lbacl *models.SLoadbalancerAcl, reason jsonutils.JSONObject) { - self.taskFail(ctx, lbacl, errors.Errorf(reason.String())) + self.taskFail(ctx, lbacl, errors.Errorf("%s", reason.String())) } diff --git a/pkg/compute/tasks/loadbalancer/loadbalancer_backend_create_task.go b/pkg/compute/tasks/loadbalancer/loadbalancer_backend_create_task.go index 284a082489..02d855d418 100644 --- a/pkg/compute/tasks/loadbalancer/loadbalancer_backend_create_task.go +++ b/pkg/compute/tasks/loadbalancer/loadbalancer_backend_create_task.go @@ -78,5 +78,5 @@ func (self *LoadbalancerBackendCreateTask) OnLoadbalancerBackendCreateComplete(c } func (self *LoadbalancerBackendCreateTask) OnLoadbalancerBackendCreateCompleteFailed(ctx context.Context, lbb *models.SLoadbalancerBackend, reason jsonutils.JSONObject) { - self.taskFail(ctx, lbb, errors.Errorf(reason.String())) + self.taskFail(ctx, lbb, errors.Errorf("%s", reason.String())) } diff --git a/pkg/compute/tasks/loadbalancer/loadbalancer_backendgroup_create_task.go b/pkg/compute/tasks/loadbalancer/loadbalancer_backendgroup_create_task.go index a7662a33ef..083557f4ed 100644 --- a/pkg/compute/tasks/loadbalancer/loadbalancer_backendgroup_create_task.go +++ b/pkg/compute/tasks/loadbalancer/loadbalancer_backendgroup_create_task.go @@ -70,5 +70,5 @@ func (self *LoadbalancerLoadbalancerBackendGroupCreateTask) OnLoadbalancerBacken } func (self *LoadbalancerLoadbalancerBackendGroupCreateTask) OnLoadbalancerBackendGroupCreateCompleteFailed(ctx context.Context, lbbg *models.SLoadbalancerBackendGroup, reason jsonutils.JSONObject) { - self.taskFail(ctx, lbbg, errors.Errorf(reason.String())) + self.taskFail(ctx, lbbg, errors.Errorf("%s", reason.String())) } diff --git a/pkg/compute/tasks/loadbalancer/loadbalancer_backendgroup_delete_task.go b/pkg/compute/tasks/loadbalancer/loadbalancer_backendgroup_delete_task.go index 078047fcb8..a2fdda96a1 100644 --- a/pkg/compute/tasks/loadbalancer/loadbalancer_backendgroup_delete_task.go +++ b/pkg/compute/tasks/loadbalancer/loadbalancer_backendgroup_delete_task.go @@ -70,5 +70,5 @@ func (self *LoadbalancerBackendGroupDeleteTask) OnLoadbalancerBackendGroupDelete } func (self *LoadbalancerBackendGroupDeleteTask) OnLoadbalancerBackendGroupDeleteCompleteFailed(ctx context.Context, lbbg *models.SLoadbalancerBackendGroup, reason jsonutils.JSONObject) { - self.taskFail(ctx, lbbg, errors.Errorf(reason.String())) + self.taskFail(ctx, lbbg, errors.Errorf("%s", reason.String())) } diff --git a/pkg/compute/tasks/loadbalancer/loadbalancer_certificate_create_task.go b/pkg/compute/tasks/loadbalancer/loadbalancer_certificate_create_task.go index 26c7b61efc..6ac66f9423 100644 --- a/pkg/compute/tasks/loadbalancer/loadbalancer_certificate_create_task.go +++ b/pkg/compute/tasks/loadbalancer/loadbalancer_certificate_create_task.go @@ -67,5 +67,5 @@ func (self *LoadbalancerCertificateCreateTask) OnLoadbalancerCertificateCreateCo } func (self *LoadbalancerCertificateCreateTask) OnLoadbalancerCertificateCreateCompleteFailed(ctx context.Context, lbcert *models.SLoadbalancerCertificate, reason jsonutils.JSONObject) { - self.taskFail(ctx, lbcert, errors.Errorf(reason.String())) + self.taskFail(ctx, lbcert, errors.Errorf("%s", reason.String())) } diff --git a/pkg/compute/tasks/loadbalancer/loadbalancer_certificate_delete_task.go b/pkg/compute/tasks/loadbalancer/loadbalancer_certificate_delete_task.go index 0c99c9e50a..31186a8a1e 100644 --- a/pkg/compute/tasks/loadbalancer/loadbalancer_certificate_delete_task.go +++ b/pkg/compute/tasks/loadbalancer/loadbalancer_certificate_delete_task.go @@ -66,5 +66,5 @@ func (self *LoadbalancerCertificateDeleteTask) OnLoadbalancerCertificateDeleteCo } func (self *LoadbalancerCertificateDeleteTask) OnLoadbalancerCertificateDeleteCompleteFailed(ctx context.Context, lbcert *models.SLoadbalancerCertificate, reason jsonutils.JSONObject) { - self.taskFail(ctx, lbcert, errors.Errorf(reason.String())) + self.taskFail(ctx, lbcert, errors.Errorf("%s", reason.String())) } diff --git a/pkg/compute/tasks/loadbalancer/loadbalancer_certificate_syncstatus_task.go b/pkg/compute/tasks/loadbalancer/loadbalancer_certificate_syncstatus_task.go index 9d19adcc97..56a2b151d1 100644 --- a/pkg/compute/tasks/loadbalancer/loadbalancer_certificate_syncstatus_task.go +++ b/pkg/compute/tasks/loadbalancer/loadbalancer_certificate_syncstatus_task.go @@ -58,5 +58,5 @@ func (self *LoadbalancerCertificateSyncstatusTask) OnLoadbalancerCertificateSync } func (self *LoadbalancerCertificateSyncstatusTask) OnLoadbalancerCertificateSyncstatusCompleteFailed(ctx context.Context, lbcert *models.SLoadbalancerCertificate, reason jsonutils.JSONObject) { - self.taskFail(ctx, lbcert, errors.Errorf(reason.String())) + self.taskFail(ctx, lbcert, errors.Errorf("%s", reason.String())) } diff --git a/pkg/compute/tasks/loadbalancer/loadbalancer_create_task.go b/pkg/compute/tasks/loadbalancer/loadbalancer_create_task.go index b1cc1a70ae..3703b8818b 100644 --- a/pkg/compute/tasks/loadbalancer/loadbalancer_create_task.go +++ b/pkg/compute/tasks/loadbalancer/loadbalancer_create_task.go @@ -74,7 +74,7 @@ func (self *LoadbalancerCreateTask) OnLoadbalancerCreateComplete(ctx context.Con } func (self *LoadbalancerCreateTask) OnLoadbalancerCreateCompleteFailed(ctx context.Context, lb *models.SLoadbalancer, reason jsonutils.JSONObject) { - self.taskFail(ctx, lb, errors.Errorf(reason.String())) + self.taskFail(ctx, lb, errors.Errorf("%s", reason.String())) } func (self *LoadbalancerCreateTask) OnLoadbalancerStartComplete(ctx context.Context, lb *models.SLoadbalancer, data jsonutils.JSONObject) { diff --git a/pkg/compute/tasks/loadbalancer/loadbalancer_listener_create_task.go b/pkg/compute/tasks/loadbalancer/loadbalancer_listener_create_task.go index 45600a4461..8728f2ed4f 100644 --- a/pkg/compute/tasks/loadbalancer/loadbalancer_listener_create_task.go +++ b/pkg/compute/tasks/loadbalancer/loadbalancer_listener_create_task.go @@ -68,7 +68,7 @@ func (self *LoadbalancerListenerCreateTask) OnLoadbalancerListenerCreateComplete } func (self *LoadbalancerListenerCreateTask) OnLoadbalancerListenerCreateCompleteFailed(ctx context.Context, lblis *models.SLoadbalancerListener, reason jsonutils.JSONObject) { - self.taskFail(ctx, lblis, errors.Errorf(reason.String())) + self.taskFail(ctx, lblis, errors.Errorf("%s", reason.String())) } func (self *LoadbalancerListenerCreateTask) OnLoadbalancerListenerStartComplete(ctx context.Context, lblis *models.SLoadbalancerListener, data jsonutils.JSONObject) { diff --git a/pkg/compute/tasks/loadbalancer/loadbalancer_listener_delete_task.go b/pkg/compute/tasks/loadbalancer/loadbalancer_listener_delete_task.go index 9dc625136e..f876a25ee7 100644 --- a/pkg/compute/tasks/loadbalancer/loadbalancer_listener_delete_task.go +++ b/pkg/compute/tasks/loadbalancer/loadbalancer_listener_delete_task.go @@ -74,5 +74,5 @@ func (self *LoadbalancerListenerDeleteTask) OnLoadbalancerListenerDeleteComplete } func (self *LoadbalancerListenerDeleteTask) OnLoadbalancerListenerDeleteCompleteFailed(ctx context.Context, lblis *models.SLoadbalancerListener, reason jsonutils.JSONObject) { - self.taskFail(ctx, lblis, errors.Errorf(reason.String())) + self.taskFail(ctx, lblis, errors.Errorf("%s", reason.String())) } diff --git a/pkg/compute/tasks/loadbalancer/loadbalancer_listener_rule_create_task.go b/pkg/compute/tasks/loadbalancer/loadbalancer_listener_rule_create_task.go index 2c20915524..ba6a1e5b75 100644 --- a/pkg/compute/tasks/loadbalancer/loadbalancer_listener_rule_create_task.go +++ b/pkg/compute/tasks/loadbalancer/loadbalancer_listener_rule_create_task.go @@ -64,7 +64,7 @@ func (self *LoadbalancerListenerRuleCreateTask) OnInit(ctx context.Context, obj } func (self *LoadbalancerListenerRuleCreateTask) OnCreateLoadbalancerListenerRuleFailed(ctx context.Context, lbr *models.SLoadbalancerListenerRule, reason jsonutils.JSONObject) { - self.taskFail(ctx, lbr, errors.Errorf(reason.String())) + self.taskFail(ctx, lbr, errors.Errorf("%s", reason.String())) } func (self *LoadbalancerListenerRuleCreateTask) OnLoadbalancerListenerRuleCreateComplete(ctx context.Context, lbr *models.SLoadbalancerListenerRule, data jsonutils.JSONObject) { @@ -83,5 +83,5 @@ func (self *LoadbalancerListenerRuleCreateTask) OnLoadbalancerListenerRuleCreate } func (self *LoadbalancerListenerRuleCreateTask) OnLoadbalancerListenerRuleCreateCompleteFailed(ctx context.Context, lbr *models.SLoadbalancerListenerRule, reason jsonutils.JSONObject) { - self.taskFail(ctx, lbr, errors.Errorf(reason.String())) + self.taskFail(ctx, lbr, errors.Errorf("%s", reason.String())) } diff --git a/pkg/compute/tasks/loadbalancer/loadbalancer_listener_rule_delete_task.go b/pkg/compute/tasks/loadbalancer/loadbalancer_listener_rule_delete_task.go index 962073d72a..53159d0f08 100644 --- a/pkg/compute/tasks/loadbalancer/loadbalancer_listener_rule_delete_task.go +++ b/pkg/compute/tasks/loadbalancer/loadbalancer_listener_rule_delete_task.go @@ -74,5 +74,5 @@ func (self *LoadbalancerListenerRuleDeleteTask) OnLoadbalancerListenerRuleDelete } func (self *LoadbalancerListenerRuleDeleteTask) OnLoadbalancerListenerRuleDeleteCompleteFailed(ctx context.Context, lbr *models.SLoadbalancerListenerRule, reason jsonutils.JSONObject) { - self.taskFail(ctx, lbr, errors.Errorf(reason.String())) + self.taskFail(ctx, lbr, errors.Errorf("%s", reason.String())) } diff --git a/pkg/compute/tasks/loadbalancer/loadbalancer_listener_start_task.go b/pkg/compute/tasks/loadbalancer/loadbalancer_listener_start_task.go index cac57cccfd..9faaea68b1 100644 --- a/pkg/compute/tasks/loadbalancer/loadbalancer_listener_start_task.go +++ b/pkg/compute/tasks/loadbalancer/loadbalancer_listener_start_task.go @@ -66,5 +66,5 @@ func (self *LoadbalancerListenerStartTask) OnLoadbalancerListenerStartComplete(c } func (self *LoadbalancerListenerStartTask) OnLoadbalancerListenerStartCompleteFailed(ctx context.Context, lblis *models.SLoadbalancerListener, reason jsonutils.JSONObject) { - self.taskFail(ctx, lblis, errors.Errorf(reason.String())) + self.taskFail(ctx, lblis, errors.Errorf("%s", reason.String())) } diff --git a/pkg/compute/tasks/loadbalancer/loadbalancer_listener_stop_task.go b/pkg/compute/tasks/loadbalancer/loadbalancer_listener_stop_task.go index b56a7b650e..9e6fa6e92e 100644 --- a/pkg/compute/tasks/loadbalancer/loadbalancer_listener_stop_task.go +++ b/pkg/compute/tasks/loadbalancer/loadbalancer_listener_stop_task.go @@ -66,5 +66,5 @@ func (self *LoadbalancerListenerStopTask) OnLoadbalancerListenerStopComplete(ctx } func (self *LoadbalancerListenerStopTask) OnLoadbalancerListenerStopCompleteFailed(ctx context.Context, lblis *models.SLoadbalancerListener, reason jsonutils.JSONObject) { - self.taskFail(ctx, lblis, errors.Errorf(reason.String())) + self.taskFail(ctx, lblis, errors.Errorf("%s", reason.String())) } diff --git a/pkg/compute/tasks/loadbalancer/loadbalancer_listener_sync_task.go b/pkg/compute/tasks/loadbalancer/loadbalancer_listener_sync_task.go index 5bf05a0630..c4dbce81db 100644 --- a/pkg/compute/tasks/loadbalancer/loadbalancer_listener_sync_task.go +++ b/pkg/compute/tasks/loadbalancer/loadbalancer_listener_sync_task.go @@ -70,7 +70,7 @@ func (self *LoadbalancerListenerSyncTask) OnLoadbalancerListenerSyncComplete(ctx } func (self *LoadbalancerListenerSyncTask) OnLoadbalancerListenerSyncCompleteFailed(ctx context.Context, lblis *models.SLoadbalancerListener, reason jsonutils.JSONObject) { - self.taskFail(ctx, lblis, errors.Errorf(reason.String())) + self.taskFail(ctx, lblis, errors.Errorf("%s", reason.String())) } func (self *LoadbalancerListenerSyncTask) OnLoadbalancerListenerSyncStatusComplete(ctx context.Context, lblis *models.SLoadbalancerListener, data jsonutils.JSONObject) { diff --git a/pkg/compute/tasks/loadbalancer/loadbalancer_listener_syncstatus_task.go b/pkg/compute/tasks/loadbalancer/loadbalancer_listener_syncstatus_task.go index a2b7b81391..bc221a4949 100644 --- a/pkg/compute/tasks/loadbalancer/loadbalancer_listener_syncstatus_task.go +++ b/pkg/compute/tasks/loadbalancer/loadbalancer_listener_syncstatus_task.go @@ -65,5 +65,5 @@ func (self *LoadbalancerListenerSyncstatusTask) OnLoadbalancerListenerSyncstatus } func (self *LoadbalancerListenerSyncstatusTask) OnLoadbalancerListenerSyncstatusCompleteFailed(ctx context.Context, lblis *models.SLoadbalancerListener, reason jsonutils.JSONObject) { - self.taskFail(ctx, lblis, errors.Errorf(reason.String())) + self.taskFail(ctx, lblis, errors.Errorf("%s", reason.String())) } diff --git a/pkg/compute/tasks/loadbalancer/loadbalancer_remote_update_task.go b/pkg/compute/tasks/loadbalancer/loadbalancer_remote_update_task.go index f559b7053d..34ff554fd0 100644 --- a/pkg/compute/tasks/loadbalancer/loadbalancer_remote_update_task.go +++ b/pkg/compute/tasks/loadbalancer/loadbalancer_remote_update_task.go @@ -60,7 +60,7 @@ func (self *LoadbalancerRemoteUpdateTask) OnRemoteUpdateComplete(ctx context.Con } func (self *LoadbalancerRemoteUpdateTask) OnRemoteUpdateCompleteFailed(ctx context.Context, lb *models.SLoadbalancer, data jsonutils.JSONObject) { - self.taskFail(ctx, lb, errors.Errorf(data.String())) + self.taskFail(ctx, lb, errors.Errorf("%s", data.String())) } func (self *LoadbalancerRemoteUpdateTask) OnSyncStatusComplete(ctx context.Context, lb *models.SLoadbalancer, data jsonutils.JSONObject) { diff --git a/pkg/compute/tasks/loadbalancer/loadbalancer_syncstatus_task.go b/pkg/compute/tasks/loadbalancer/loadbalancer_syncstatus_task.go index df4721aadf..51b457edeb 100644 --- a/pkg/compute/tasks/loadbalancer/loadbalancer_syncstatus_task.go +++ b/pkg/compute/tasks/loadbalancer/loadbalancer_syncstatus_task.go @@ -66,5 +66,5 @@ func (self *LoadbalancerSyncstatusTask) OnLoadbalancerSyncstatusComplete(ctx con } func (self *LoadbalancerSyncstatusTask) OnLoadbalancerSyncstatusCompleteFailed(ctx context.Context, lb *models.SLoadbalancer, reason jsonutils.JSONObject) { - self.taskFail(ctx, lb, errors.Errorf(reason.String())) + self.taskFail(ctx, lb, errors.Errorf("%s", reason.String())) } diff --git a/pkg/compute/tasks/modelarts/modelarts_pool_create_task.go b/pkg/compute/tasks/modelarts/modelarts_pool_create_task.go index 7e597dbaf9..b52d8c52cf 100644 --- a/pkg/compute/tasks/modelarts/modelarts_pool_create_task.go +++ b/pkg/compute/tasks/modelarts/modelarts_pool_create_task.go @@ -86,9 +86,9 @@ func (modelartsCreateTask *ModelartsPoolCreateTask) WaitStatus(ctx context.Conte case api.MODELARTS_POOL_STATUS_RUNNING: return nil, nil case api.MODELARTS_POOL_STATUS_CREATE_FAILED: - return nil, errors.Errorf(ipool.GetStatusMessage()) + return nil, errors.Errorf("%s", ipool.GetStatusMessage()) default: - return nil, errors.Errorf(ipool.GetStatus()) + return nil, errors.Errorf("%s", ipool.GetStatus()) } }) return nil @@ -96,9 +96,9 @@ func (modelartsCreateTask *ModelartsPoolCreateTask) WaitStatus(ctx context.Conte func (modelartsCreateTask *ModelartsPoolCreateTask) OnModelartsPoolCreateCompleteFailed(ctx context.Context, modelarts *models.SModelartsPool, err jsonutils.JSONObject) { if strings.Contains(err.String(), errors.ErrTimeout.Error()) { - modelartsCreateTask.taskFailed(ctx, modelarts, api.MODELARTS_POOL_STATUS_TIMEOUT, errors.Errorf(err.String())) + modelartsCreateTask.taskFailed(ctx, modelarts, api.MODELARTS_POOL_STATUS_TIMEOUT, errors.Errorf("%s", err.String())) } else { - modelartsCreateTask.taskFailed(ctx, modelarts, api.MODELARTS_POOL_STATUS_CREATE_FAILED, errors.Errorf(err.String())) + modelartsCreateTask.taskFailed(ctx, modelarts, api.MODELARTS_POOL_STATUS_CREATE_FAILED, errors.Errorf("%s", err.String())) } } diff --git a/pkg/compute/tasks/nat/nat_create_task.go b/pkg/compute/tasks/nat/nat_create_task.go index d9d3a2fd86..25b0fafc0c 100644 --- a/pkg/compute/tasks/nat/nat_create_task.go +++ b/pkg/compute/tasks/nat/nat_create_task.go @@ -169,7 +169,7 @@ func (self *NatGatewayCreateTask) OnCreateNatGatewayCreateComplete(ctx context.C } func (self *NatGatewayCreateTask) OnCreateNatGatewayCreateCompleteFailed(ctx context.Context, nat *models.SNatGateway, body jsonutils.JSONObject) { - self.taskFailed(ctx, nat, errors.Errorf(body.String())) + self.taskFailed(ctx, nat, errors.Errorf("%s", body.String())) } func (self *NatGatewayCreateTask) OnDeployEipCompleteFailed(ctx context.Context, nat *models.SNatGateway, data jsonutils.JSONObject) { diff --git a/pkg/compute/tasks/nat/natdentry_create_task.go b/pkg/compute/tasks/nat/natdentry_create_task.go index 11981bf46c..ab522ba505 100644 --- a/pkg/compute/tasks/nat/natdentry_create_task.go +++ b/pkg/compute/tasks/nat/natdentry_create_task.go @@ -78,7 +78,7 @@ func (self *SNatDEntryCreateTask) OnInit(ctx context.Context, obj db.IStandalone } func (self *SNatDEntryCreateTask) OnAssociateEipCompleteFailed(ctx context.Context, dnat *models.SNatDEntry, reason jsonutils.JSONObject) { - self.taskFailed(ctx, dnat, errors.Errorf(reason.String())) + self.taskFailed(ctx, dnat, errors.Errorf("%s", reason.String())) } func (self *SNatDEntryCreateTask) OnAssociateEipComplete(ctx context.Context, dnat *models.SNatDEntry, body jsonutils.JSONObject) { diff --git a/pkg/compute/tasks/nat/natgateway_syncstatus_task.go b/pkg/compute/tasks/nat/natgateway_syncstatus_task.go index 7768872ed1..bc98516820 100644 --- a/pkg/compute/tasks/nat/natgateway_syncstatus_task.go +++ b/pkg/compute/tasks/nat/natgateway_syncstatus_task.go @@ -64,5 +64,5 @@ func (self *NatGatewaySyncstatusTask) OnNatGatewaySyncStatusComplete(ctx context } func (self *NatGatewaySyncstatusTask) OnNatGatewaySyncStatusCompleteFailed(ctx context.Context, natgateway *models.SNatGateway, data jsonutils.JSONObject) { - self.taskFailed(ctx, natgateway, errors.Errorf(data.String())) + self.taskFailed(ctx, natgateway, errors.Errorf("%s", data.String())) } diff --git a/pkg/compute/tasks/nat/natsentry_create_task.go b/pkg/compute/tasks/nat/natsentry_create_task.go index fdd780b4e6..dc3ee019e1 100644 --- a/pkg/compute/tasks/nat/natsentry_create_task.go +++ b/pkg/compute/tasks/nat/natsentry_create_task.go @@ -78,7 +78,7 @@ func (self *SNatSEntryCreateTask) OnInit(ctx context.Context, obj db.IStandalone } func (self *SNatSEntryCreateTask) OnAssociateEipCompleteFailed(ctx context.Context, snatEntry *models.SNatSEntry, reason jsonutils.JSONObject) { - self.taskFailed(ctx, snatEntry, errors.Errorf(reason.String())) + self.taskFailed(ctx, snatEntry, errors.Errorf("%s", reason.String())) } func (self *SNatSEntryCreateTask) OnAssociateEipComplete(ctx context.Context, snat *models.SNatSEntry, body jsonutils.JSONObject) { diff --git a/pkg/compute/tasks/network/network_remote_update_tags_task.go b/pkg/compute/tasks/network/network_remote_update_tags_task.go index e0b1e30b30..66aa179fd4 100644 --- a/pkg/compute/tasks/network/network_remote_update_tags_task.go +++ b/pkg/compute/tasks/network/network_remote_update_tags_task.go @@ -61,7 +61,7 @@ func (self *NetworkRemoteUpdateTask) OnRemoteUpdateComplete(ctx context.Context, } func (self *NetworkRemoteUpdateTask) OnRemoteUpdateCompleteFailed(ctx context.Context, net *models.SNetwork, data jsonutils.JSONObject) { - self.taskFail(ctx, net, errors.Errorf(data.String())) + self.taskFail(ctx, net, errors.Errorf("%s", data.String())) } func (self *NetworkRemoteUpdateTask) OnSyncStatusComplete(ctx context.Context, net *models.SNetwork, data jsonutils.JSONObject) { diff --git a/pkg/compute/tasks/security_group/security_group_delete_task.go b/pkg/compute/tasks/security_group/security_group_delete_task.go index e2b780dfe2..b67ad6b134 100644 --- a/pkg/compute/tasks/security_group/security_group_delete_task.go +++ b/pkg/compute/tasks/security_group/security_group_delete_task.go @@ -70,5 +70,5 @@ func (self *SecurityGroupDeleteTask) OnSecurityGroupDeleteComplete(ctx context.C } func (self *SecurityGroupDeleteTask) OnSecurityGroupDeleteCompleteFailed(ctx context.Context, secgroup *models.SSecurityGroup, data jsonutils.JSONObject) { - self.taskFailed(ctx, secgroup, errors.Errorf(data.String())) + self.taskFailed(ctx, secgroup, errors.Errorf("%s", data.String())) } diff --git a/pkg/compute/tasks/snapshot/instance_snapshot_and_clone_task.go b/pkg/compute/tasks/snapshot/instance_snapshot_and_clone_task.go index ec7c85affd..c78b79be79 100644 --- a/pkg/compute/tasks/snapshot/instance_snapshot_and_clone_task.go +++ b/pkg/compute/tasks/snapshot/instance_snapshot_and_clone_task.go @@ -132,7 +132,7 @@ func (self *InstanceSnapshotAndCloneTask) doGuestCreate( models.GuestManager.OnCreateComplete(ctx, []db.IModel{newGuest}, self.UserCred, self.UserCred, nil, []jsonutils.JSONObject{params}) } if len(errStr) > 0 { - return fmt.Errorf(errStr) + return fmt.Errorf("%s", errStr) } return nil } diff --git a/pkg/compute/tasks/snapshotpolicy/snapshotpolicy_bind_disks_task.go b/pkg/compute/tasks/snapshotpolicy/snapshotpolicy_bind_disks_task.go index f4f1300406..a09ad5a6ba 100644 --- a/pkg/compute/tasks/snapshotpolicy/snapshotpolicy_bind_disks_task.go +++ b/pkg/compute/tasks/snapshotpolicy/snapshotpolicy_bind_disks_task.go @@ -74,5 +74,5 @@ func (self *SnapshotpolicyBindDisksTask) OnSnapshotPolicyBindDisksComplete(ctx c } func (self *SnapshotpolicyBindDisksTask) OnSnapshotPolicyBindDisksCompleteFailed(ctx context.Context, sp *models.SSnapshotPolicy, data jsonutils.JSONObject) { - self.taskFailed(ctx, sp, errors.Errorf(data.String())) + self.taskFailed(ctx, sp, errors.Errorf("%s", data.String())) } diff --git a/pkg/compute/tasks/snapshotpolicy/snapshotpolicy_create_task.go b/pkg/compute/tasks/snapshotpolicy/snapshotpolicy_create_task.go index 528053810a..cc399bcce7 100644 --- a/pkg/compute/tasks/snapshotpolicy/snapshotpolicy_create_task.go +++ b/pkg/compute/tasks/snapshotpolicy/snapshotpolicy_create_task.go @@ -69,5 +69,5 @@ func (self *SnapshotPolicyCreateTask) OnCreateSnapshotPolicyComplete(ctx context } func (self *SnapshotPolicyCreateTask) OnCreateSnapshotPolicyCompleteFailed(ctx context.Context, sp *models.SSnapshotPolicy, data jsonutils.JSONObject) { - self.taskFailed(ctx, sp, errors.Errorf(data.String())) + self.taskFailed(ctx, sp, errors.Errorf("%s", data.String())) } diff --git a/pkg/compute/tasks/snapshotpolicy/snapshotpolicy_delete_task.go b/pkg/compute/tasks/snapshotpolicy/snapshotpolicy_delete_task.go index 57ce2e1e89..db40fabad7 100644 --- a/pkg/compute/tasks/snapshotpolicy/snapshotpolicy_delete_task.go +++ b/pkg/compute/tasks/snapshotpolicy/snapshotpolicy_delete_task.go @@ -73,5 +73,5 @@ func (self *SnapshotPolicyDeleteTask) OnSnapshotPolicyDeleteComplete(ctx context } func (self *SnapshotPolicyDeleteTask) OnSnapshotPolicyDeleteCompleteFailed(ctx context.Context, sp *models.SSnapshotPolicy, data jsonutils.JSONObject) { - self.taskFail(ctx, sp, errors.Errorf(data.String())) + self.taskFail(ctx, sp, errors.Errorf("%s", data.String())) } diff --git a/pkg/compute/tasks/snapshotpolicy/snapshotpolicy_unbind_disks_task.go b/pkg/compute/tasks/snapshotpolicy/snapshotpolicy_unbind_disks_task.go index 72ee3a038b..1c189c0bc6 100644 --- a/pkg/compute/tasks/snapshotpolicy/snapshotpolicy_unbind_disks_task.go +++ b/pkg/compute/tasks/snapshotpolicy/snapshotpolicy_unbind_disks_task.go @@ -73,5 +73,5 @@ func (self *SnapshotpolicyUnbindDisksTask) OnSnapshotPolicyUnbindDisksComplete(c } func (self *SnapshotpolicyUnbindDisksTask) OnSnapshotPolicyUnbindDisksCompleteFailed(ctx context.Context, sp *models.SSnapshotPolicy, data jsonutils.JSONObject) { - self.taskFailed(ctx, sp, errors.Errorf(data.String())) + self.taskFailed(ctx, sp, errors.Errorf("%s", data.String())) } diff --git a/pkg/compute/tasks/storage/storage_uncache_image_task.go b/pkg/compute/tasks/storage/storage_uncache_image_task.go index 3a0770ffd5..548234fc22 100644 --- a/pkg/compute/tasks/storage/storage_uncache_image_task.go +++ b/pkg/compute/tasks/storage/storage_uncache_image_task.go @@ -141,7 +141,7 @@ func (uncacheTask *StorageUncacheImageTask) OnTaskFailed(ctx context.Context, st func (uncacheTask *StorageUncacheImageTask) OnImageUncacheCompleteFailed(ctx context.Context, obj db.IStandaloneModel, data jsonutils.JSONObject) { storageCache := obj.(*models.SStoragecache) - uncacheTask.OnTaskFailed(ctx, storageCache, errors.Errorf(data.String())) + uncacheTask.OnTaskFailed(ctx, storageCache, errors.Errorf("%s", data.String())) } func (uncacheTask *StorageUncacheImageTask) OnImageUncacheComplete(ctx context.Context, obj db.IStandaloneModel, data jsonutils.JSONObject) { diff --git a/pkg/compute/tasks/vpc/vpc_create_task.go b/pkg/compute/tasks/vpc/vpc_create_task.go index fc5db75f96..22f7901ac4 100644 --- a/pkg/compute/tasks/vpc/vpc_create_task.go +++ b/pkg/compute/tasks/vpc/vpc_create_task.go @@ -70,5 +70,5 @@ func (self *VpcCreateTask) OnCreateVpcComplete(ctx context.Context, vpc *models. } func (self *VpcCreateTask) OnCreateVpcCompleteFailed(ctx context.Context, vpc *models.SVpc, data jsonutils.JSONObject) { - self.taskFailed(ctx, vpc, errors.Errorf(data.String())) + self.taskFailed(ctx, vpc, errors.Errorf("%s", data.String())) } diff --git a/pkg/compute/tasks/vpc/vpc_delete_task.go b/pkg/compute/tasks/vpc/vpc_delete_task.go index fa1041bda1..5c9776e06e 100644 --- a/pkg/compute/tasks/vpc/vpc_delete_task.go +++ b/pkg/compute/tasks/vpc/vpc_delete_task.go @@ -76,5 +76,5 @@ func (self *VpcDeleteTask) OnDeleteVpcComplete(ctx context.Context, vpc *models. } func (self *VpcDeleteTask) OnDeleteVpcCompleteFailed(ctx context.Context, vpc *models.SVpc, reason jsonutils.JSONObject) { - self.taskFailed(ctx, vpc, errors.Errorf(reason.String())) + self.taskFailed(ctx, vpc, errors.Errorf("%s", reason.String())) } diff --git a/pkg/controller/autoscaling/controller.go b/pkg/controller/autoscaling/controller.go index b0d0d497d6..b78a9fc3cb 100644 --- a/pkg/controller/autoscaling/controller.go +++ b/pkg/controller/autoscaling/controller.go @@ -389,7 +389,7 @@ Loop: log.Debugf("finish all check jobs when removing servers") err = nil if len(failedList) != 0 { - err = fmt.Errorf(strings.Join(failedList, "; ")) + err = fmt.Errorf("%s", strings.Join(failedList, "; ")) } instanceRet := make([]SInstance, 0, succeedList.Len()) for _, id := range succeedList.UnsortedList() { @@ -568,7 +568,7 @@ func (asc *SASController) CreateInstances( for _, id := range succeedInstances { instances = append(instances, instanceMap[id]) } - return instances, fmt.Errorf(failRecord.String()) + return instances, fmt.Errorf("%s", failRecord.String()) } type SCreateRet struct { diff --git a/pkg/hostman/container/prober/prober.go b/pkg/hostman/container/prober/prober.go index bfb7375021..57326435ef 100644 --- a/pkg/hostman/container/prober/prober.go +++ b/pkg/hostman/container/prober/prober.go @@ -91,17 +91,17 @@ func (pb *prober) probe(probeType apis.ContainerProbeType, pod IPod, container * // Probe failed in one way or another if err != nil { msg = fmt.Sprintf("%s probe for %q errored: %v", probeType, ctrName, err) - log.Errorf(msg) + log.Errorf("%s", msg) } else { // result != probe.Success msg = fmt.Sprintf("%s probe for %q failed (%v): %s", probeType, ctrName, result, output) - log.Debugf(msg) + log.Debugf("%s", msg) } return results.NewFailure(msg), err } if result == probe.Warning { msg = fmt.Sprintf("%s probe for %q succeeded with a warning: %s", probeType, ctrName, output) - log.Warningf(msg) + log.Warningf("%s", msg) } else { msg = fmt.Sprintf("%s probe for %q succeeded", probeType, ctrName) //log.Debugf(msg) @@ -148,7 +148,7 @@ func (pb *prober) runProbe(probeType apis.ContainerProbeType, p *apis.ContainerP return pb.tcp.Probe(host, port, timeout) } errMsg := fmt.Sprintf("Failed to find probe builder for pod %v, container: %v", pod.GetName(), container.Name) - log.Warningf(errMsg) + log.Warningf("%s", errMsg) return probe.Unknown, "", errors.Error(errMsg) } diff --git a/pkg/hostman/container/status/status_manager.go b/pkg/hostman/container/status/status_manager.go index c29dc937b7..dc0a074a85 100644 --- a/pkg/hostman/container/status/status_manager.go +++ b/pkg/hostman/container/status/status_manager.go @@ -63,7 +63,7 @@ func (m *manager) SetContainerStartup(podId string, containerId string, started if err := statusman.GetManager().UpdateStatus(input); err != nil { err = errors.Wrapf(err, "set container(%s/%s) status failed, input: %s", podId, containerId, jsonutils.Marshal(input.ToServerPerformStatusInput())) - log.Warningf(err.Error()) + log.Warningf("%s", err.Error()) errMsg := []string{ "can't set container status", } @@ -96,7 +96,7 @@ func (m *manager) SetContainerStartupOld(podId string, containerId string, start } if _, err := hostutils.UpdateContainerStatus(context.Background(), containerId, input); err != nil { err = errors.Wrapf(err, "set container(%s/%s) status failed, input: %s", podId, containerId, jsonutils.Marshal(input)) - log.Warningf(err.Error()) + log.Warningf("%s", err.Error()) errMsg := []string{ "can't set container status", } diff --git a/pkg/hostman/diskutils/fsutils/fsutils.go b/pkg/hostman/diskutils/fsutils/fsutils.go index 304ac39d97..51157ebb59 100644 --- a/pkg/hostman/diskutils/fsutils/fsutils.go +++ b/pkg/hostman/diskutils/fsutils/fsutils.go @@ -522,7 +522,7 @@ func MountRootfs(readonly bool, partitions []fsdriver.IDiskPartition) (fsdriver. } var err error = errors.ErrNotFound if len(errs) > 0 { - err = errors.Wrapf(errors.ErrNotFound, errors.NewAggregate(errs).Error()) + err = errors.Wrapf(errors.ErrNotFound, "%s", errors.NewAggregate(errs).Error()) } return nil, err } diff --git a/pkg/hostman/diskutils/libguestfs/guestfish/guestfish.go b/pkg/hostman/diskutils/libguestfs/guestfish/guestfish.go index c829d97368..168719a33c 100644 --- a/pkg/hostman/diskutils/libguestfs/guestfish/guestfish.go +++ b/pkg/hostman/diskutils/libguestfs/guestfish/guestfish.go @@ -142,7 +142,7 @@ func (fish *Guestfish) fetch() ([]string, error) { } var stderrErr error if len(output) > 0 { - stderrErr = errors.Errorf(string(output)) + stderrErr = errors.Errorf("%s", string(output)) } return stdout, stderrErr } diff --git a/pkg/hostman/diskutils/qemu_kvm/driver.go b/pkg/hostman/diskutils/qemu_kvm/driver.go index a420d6942f..ec4f6c25d0 100644 --- a/pkg/hostman/diskutils/qemu_kvm/driver.go +++ b/pkg/hostman/diskutils/qemu_kvm/driver.go @@ -428,7 +428,7 @@ func (d *QemuKvmDriver) DeployGuestfs(req *apis.DeployParams) (*apis.DeployGuest log.Infof("deploy error str %v", errStrs) var retErr error = nil if len(errStrs[0]) > 0 { - retErr = errors.Errorf(errStrs[0]) + retErr = errors.Errorf("%s", errStrs[0]) } responseStrs, err := d.sshRun("test -f /response && cat /response || true") @@ -466,7 +466,7 @@ func (d *QemuKvmDriver) ResizeFs() (*apis.Empty, error) { } var retErr error = nil if len(errStrs[0]) > 0 { - retErr = errors.Errorf(errStrs[0]) + retErr = errors.Errorf("%s", errStrs[0]) } return new(apis.Empty), retErr } @@ -491,7 +491,7 @@ func (d *QemuKvmDriver) FormatFs(req *apis.FormatFsParams) (*apis.Empty, error) } var retErr error = nil if len(errStrs[0]) > 0 { - retErr = errors.Errorf(errStrs[0]) + retErr = errors.Errorf("%s", errStrs[0]) } return new(apis.Empty), retErr } @@ -528,7 +528,7 @@ func (d *QemuKvmDriver) SaveToGlance(req *apis.SaveToGlanceParams) (*apis.SaveTo } var retErr error = nil if len(errStrs[0]) > 0 { - retErr = errors.Errorf(errStrs[0]) + retErr = errors.Errorf("%s", errStrs[0]) } return res, retErr } @@ -565,7 +565,7 @@ func (d *QemuKvmDriver) ProbeImageInfo(req *apis.ProbeImageInfoPramas) (*apis.Im } var retErr error = nil if len(errStrs[0]) > 0 { - retErr = errors.Errorf(errStrs[0]) + retErr = errors.Errorf("%s", errStrs[0]) } return res, retErr } diff --git a/pkg/hostman/diskutils/vddk.go b/pkg/hostman/diskutils/vddk.go index d0fc87e87b..3167497d1d 100644 --- a/pkg/hostman/diskutils/vddk.go +++ b/pkg/hostman/diskutils/vddk.go @@ -362,7 +362,7 @@ Loop: } backup := vd.Proc.stdouterr.String() - log.Debugf(backup) + log.Debugf("%s", backup) err := vd.ParsePartitions(backup) if err != nil { return errors.Wrap(err, "VDDKDisk.ParsePartitions") diff --git a/pkg/hostman/guestman/guest_create_from_remote.go b/pkg/hostman/guestman/guest_create_from_remote.go index e06f5c2e7b..7adf541502 100644 --- a/pkg/hostman/guestman/guest_create_from_remote.go +++ b/pkg/hostman/guestman/guest_create_from_remote.go @@ -96,7 +96,7 @@ func (m *SGuestManager) GuestCreateFromEsxi( diskInfo, err = iDisk.CreateRaw(ctx, 0, "qcow2", "", nil, nil, "", connections.Disks[i].DiskPath) if err != nil { err = errors.Wrapf(err, "create disk %s failed", diskId) - log.Errorf(err.Error()) + log.Errorf("%s", err.Error()) break } diskInfo.(*jsonutils.JSONDict).Set("esxi_flat_filepath", diff --git a/pkg/hostman/guestman/qemu-kvm.go b/pkg/hostman/guestman/qemu-kvm.go index 7ad0283c27..211740901e 100644 --- a/pkg/hostman/guestman/qemu-kvm.go +++ b/pkg/hostman/guestman/qemu-kvm.go @@ -1395,7 +1395,7 @@ func (s *SKVMGuestInstance) getHotpluggableCPUList() ([]monitor.HotpluggableCPU, var errChan = make(chan error) cb := func(cpuList []monitor.HotpluggableCPU, err string) { if err != "" { - errChan <- errors.Errorf(err) + errChan <- errors.Errorf("%s", err) } else { res = cpuList errChan <- nil @@ -1497,7 +1497,7 @@ func (s *SKVMGuestInstance) getPciDevices() ([]monitor.PCIInfo, error) { var errChan = make(chan error) cb := func(pciInfoList []monitor.PCIInfo, err string) { if err != "" { - errChan <- errors.Errorf(err) + errChan <- errors.Errorf("%s", err) } else { res = pciInfoList errChan <- nil @@ -1513,7 +1513,7 @@ func (s *SKVMGuestInstance) getMemoryDevs() ([]monitor.Memdev, error) { var errChan = make(chan error) cb := func(memDevs []monitor.Memdev, err string) { if err != "" { - errChan <- errors.Errorf(err) + errChan <- errors.Errorf("%s", err) } else { res = memDevs errChan <- nil @@ -1529,7 +1529,7 @@ func (s *SKVMGuestInstance) getMemoryDevices() ([]monitor.MemoryDeviceInfo, erro var errChan = make(chan error) cb := func(memoryDevicesInfoList []monitor.MemoryDeviceInfo, err string) { if err != "" { - errChan <- errors.Errorf(err) + errChan <- errors.Errorf("%s", err) } else { res = memoryDevicesInfoList errChan <- nil @@ -2242,7 +2242,7 @@ func (s *SKVMGuestInstance) scriptStart(ctx context.Context) error { err = proc.Signal(syscall.Signal(0)) if err != nil { // qemu process exited log.Errorf("Guest %s check qemu(%d) process failed: %s", s.Id, pid, err) - return errors.Errorf(s.readQemuLogFileEnd(64)) + return errors.Errorf("%s", s.readQemuLogFileEnd(64)) } if err = s.StartMonitor(ctx, nil, true); err == nil { return nil diff --git a/pkg/hostman/monitor/qga/qga.go b/pkg/hostman/monitor/qga/qga.go index 30502129d1..edf4c58166 100644 --- a/pkg/hostman/monitor/qga/qga.go +++ b/pkg/hostman/monitor/qga/qga.go @@ -292,7 +292,7 @@ func (qga *QemuGuestAgent) execCmd(cmd *monitor.Command, expectResp bool, readTi if err := json.Unmarshal(*val, res); err != nil { return nil, errors.Wrapf(err, "unmarshal qemu error resp: %s", *val) } - return nil, errors.Errorf(res.Error()) + return nil, errors.Errorf("%s", res.Error()) } else { return nil, nil } diff --git a/pkg/hostman/monitor/qmp.go b/pkg/hostman/monitor/qmp.go index 57faade937..4cfa432599 100644 --- a/pkg/hostman/monitor/qmp.go +++ b/pkg/hostman/monitor/qmp.go @@ -679,7 +679,7 @@ func (m *QmpMonitor) GetMigrateStats(callback MigrateStatsCallback) { cmd = &Command{Execute: "query-migrate"} cb = func(res *Response) { if res.ErrorVal != nil { - callback(nil, errors.Errorf(res.ErrorVal.Error())) + callback(nil, errors.Errorf("%s", res.ErrorVal.Error())) } else { migStats := new(MigrationInfo) err := json.Unmarshal(res.Return, migStats) diff --git a/pkg/hostman/storageman/core.go b/pkg/hostman/storageman/core.go index e1dc63058c..a715727e2b 100644 --- a/pkg/hostman/storageman/core.go +++ b/pkg/hostman/storageman/core.go @@ -242,7 +242,7 @@ func (s *SStorageManager) GetStoragesByPath(sPath string) ([]IStorage, error) { } } if len(ret) == 0 { - return nil, errors.Wrapf(cloudprovider.ErrNotFound, sPath) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", sPath) } return ret, nil } @@ -253,7 +253,7 @@ func (s *SStorageManager) GetStorageByPath(sPath string) (IStorage, error) { return storage, nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, sPath) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", sPath) } func (s *SStorageManager) GetDiskById(diskId string) (IDisk, error) { @@ -266,7 +266,7 @@ func (s *SStorageManager) GetDiskById(diskId string) (IDisk, error) { return disk, nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, diskId) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", diskId) } func (s *SStorageManager) GetDiskByPath(diskPath string) (IDisk, error) { @@ -283,7 +283,7 @@ func (s *SStorageManager) GetDiskByPath(diskPath string) (IDisk, error) { } storages, err := s.GetStoragesByPath(sPath) if err != nil { - return nil, errors.Wrapf(err, "GetStoragesByPath") + return nil, errors.Wrapf(err, "%s", "GetStoragesByPath") } for i := range storages { disk, err := storages[i].GetDiskById(diskId) @@ -294,7 +294,7 @@ func (s *SStorageManager) GetDiskByPath(diskPath string) (IDisk, error) { return disk, nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, diskId) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", diskId) } func (s *SStorageManager) GetTotalCapacity() int { diff --git a/pkg/hostman/storageman/imagecache_local.go b/pkg/hostman/storageman/imagecache_local.go index 11f7b23bf8..a2be7bbd3e 100644 --- a/pkg/hostman/storageman/imagecache_local.go +++ b/pkg/hostman/storageman/imagecache_local.go @@ -159,7 +159,7 @@ func (l *SLocalImageCache) Load() error { if fileutils2.Exists(tmpPath) { syscall.Unlink(tmpPath) } - return errors.Wrapf(cloudprovider.ErrNotFound, imgPath) + return errors.Wrap(cloudprovider.ErrNotFound, imgPath) } func (l *SLocalImageCache) needCheck() bool { diff --git a/pkg/hostman/storageman/storagehandler/storagehandler.go b/pkg/hostman/storageman/storagehandler/storagehandler.go index 7c7444566a..057aa8b22c 100644 --- a/pkg/hostman/storageman/storagehandler/storagehandler.go +++ b/pkg/hostman/storageman/storagehandler/storagehandler.go @@ -125,7 +125,7 @@ func storageIsVgExist(ctx context.Context, w http.ResponseWriter, r *http.Reques } if err := lvmutils.VgDisplay(vgName); err != nil { log.Errorf("vg %s display failed %s", vgName, err) - hostutils.Response(ctx, w, httperrors.NewInternalServerError(err.Error())) + hostutils.Response(ctx, w, httperrors.NewInternalServerError("%s", err.Error())) return } hostutils.ResponseOk(ctx, w) @@ -341,7 +341,7 @@ func storagePackInstanceBackup(ctx context.Context, w http.ResponseWriter, r *ht pb := storageman.SStoragePackInstanceBackup{} err := body.Unmarshal(&pb) if err != nil { - hostutils.Response(ctx, w, httperrors.NewInputParameterError(err.Error())) + hostutils.Response(ctx, w, httperrors.NewInputParameterError("%s", err.Error())) return } @@ -357,7 +357,7 @@ func storageUnpackInstanceBackup(ctx context.Context, w http.ResponseWriter, r * pb := storageman.SStorageUnpackInstanceBackup{} err := body.Unmarshal(&pb) if err != nil { - hostutils.Response(ctx, w, httperrors.NewInputParameterError(err.Error())) + hostutils.Response(ctx, w, httperrors.NewInputParameterError("%s", err.Error())) return } diff --git a/pkg/httperrors/errors.go b/pkg/httperrors/errors.go index 52f40ac116..c02c52e225 100644 --- a/pkg/httperrors/errors.go +++ b/pkg/httperrors/errors.go @@ -27,8 +27,8 @@ func NewNotImplementedError(msg string, params ...interface{}) *httputils.JSONCl return httputils.NewJsonClientError(httpErrorCode[ErrNotImplemented], string(ErrNotImplemented), msg, params...) } -func NewInternalServerError(msg string, params ...interface{}) *httputils.JSONClientError { - return httputils.NewJsonClientError(httpErrorCode[ErrInternalError], string(ErrInternalError), msg, params...) +func NewInternalServerError(format string, params ...interface{}) *httputils.JSONClientError { + return httputils.NewJsonClientError(httpErrorCode[ErrInternalError], string(ErrInternalError), format, params...) } func NewResourceNotReadyError(msg string, params ...interface{}) *httputils.JSONClientError { @@ -75,8 +75,8 @@ func NewUserNotFoundError(msg string, params ...interface{}) *httputils.JSONClie return httputils.NewJsonClientError(httpErrorCode[ErrUserNotFound], string(ErrUserNotFound), msg, params...) } -func NewInvalidStatusError(msg string, params ...interface{}) *httputils.JSONClientError { - return httputils.NewJsonClientError(httpErrorCode[ErrInvalidStatus], string(ErrInvalidStatus), msg, params...) +func NewInvalidStatusError(format string, params ...interface{}) *httputils.JSONClientError { + return httputils.NewJsonClientError(httpErrorCode[ErrInvalidStatus], string(ErrInvalidStatus), format, params...) } func NewInputParameterError(msg string, params ...interface{}) *httputils.JSONClientError { @@ -85,7 +85,7 @@ func NewInputParameterError(msg string, params ...interface{}) *httputils.JSONCl func NewWeakPasswordError() *httputils.JSONClientError { msg := ("password must be 12 chars of at least one digit, letter, uppercase letter and punctuate") - return httputils.NewJsonClientError(httpErrorCode[ErrWeakPassword], string(ErrWeakPassword), msg) + return httputils.NewJsonClientError(httpErrorCode[ErrWeakPassword], string(ErrWeakPassword), "%s", msg) } func NewMissingParameterError(paramName string) *httputils.JSONClientError { @@ -129,16 +129,16 @@ func NewNotEmptyError(msg string, params ...interface{}) *httputils.JSONClientEr return httputils.NewJsonClientError(httpErrorCode[ErrNotEmpty], string(ErrNotEmpty), msg, params...) } -func NewBadRequestError(msg string, params ...interface{}) *httputils.JSONClientError { - return httputils.NewJsonClientError(httpErrorCode[ErrBadRequest], string(ErrBadRequest), msg, params...) +func NewBadRequestError(format string, params ...interface{}) *httputils.JSONClientError { + return httputils.NewJsonClientError(httpErrorCode[ErrBadRequest], string(ErrBadRequest), format, params...) } func NewUnauthorizedError(msg string, params ...interface{}) *httputils.JSONClientError { return httputils.NewJsonClientError(httpErrorCode[ErrUnauthorized], string(ErrUnauthorized), msg, params...) } -func NewInvalidCredentialError(msg string, params ...interface{}) *httputils.JSONClientError { - return httputils.NewJsonClientError(httpErrorCode[ErrInvalidCredential], string(ErrInvalidCredential), msg, params...) +func NewInvalidCredentialError(format string, params ...interface{}) *httputils.JSONClientError { + return httputils.NewJsonClientError(httpErrorCode[ErrInvalidCredential], string(ErrInvalidCredential), format, params...) } func NewForbiddenError(msg string, params ...interface{}) *httputils.JSONClientError { diff --git a/pkg/httperrors/general.go b/pkg/httperrors/general.go index 30e81124c9..f7e2de69de 100644 --- a/pkg/httperrors/general.go +++ b/pkg/httperrors/general.go @@ -28,7 +28,7 @@ func NewGeneralError(err error) *httputils.JSONClientError { if !ok { code = 500 } - return httputils.NewJsonClientError(code, string(nerr), err.Error()) + return httputils.NewJsonClientError(code, string(nerr), "%s", err.Error()) default: root := errors.Cause(err) switch nerr := root.(type) { @@ -40,9 +40,9 @@ func NewGeneralError(err error) *httputils.JSONClientError { if !ok { code = 500 } - return httputils.NewJsonClientError(code, string(nerr), err.Error()) + return httputils.NewJsonClientError(code, string(nerr), "%s", err.Error()) default: - return NewUnclassifiedError(err.Error()) + return NewUnclassifiedError("%s", err.Error()) } } } diff --git a/pkg/image/tasks/image_delete_task.go b/pkg/image/tasks/image_delete_task.go index dcbcaa876f..105881810c 100644 --- a/pkg/image/tasks/image_delete_task.go +++ b/pkg/image/tasks/image_delete_task.go @@ -66,7 +66,7 @@ func (self *ImageDeleteTask) startDeleteImage(ctx context.Context, image *models err := image.Remove(ctx, self.UserCred) if err != nil { msg := fmt.Sprintf("fail to remove %s %s", image.Name, err) - log.Errorf(msg) + log.Errorf("%v", msg) self.SetStageFailed(ctx, jsonutils.NewString(msg)) return } diff --git a/pkg/keystone/cronjobs/project_resources.go b/pkg/keystone/cronjobs/project_resources.go index d44212cff2..68f6f93d03 100644 --- a/pkg/keystone/cronjobs/project_resources.go +++ b/pkg/keystone/cronjobs/project_resources.go @@ -225,5 +225,5 @@ func refreshHandler(ctx context.Context, w http.ResponseWriter, r *http.Request) "status": "ok", }, } - fmt.Fprintf(w, jsonutils.Marshal(ret).String()) + fmt.Fprintf(w, "%s", jsonutils.Marshal(ret).String()) } diff --git a/pkg/keystone/tokens/handlers.go b/pkg/keystone/tokens/handlers.go index 01ac3cd245..4b1edbde3a 100644 --- a/pkg/keystone/tokens/handlers.go +++ b/pkg/keystone/tokens/handlers.go @@ -269,7 +269,7 @@ func verifyCommon(ctx context.Context, w http.ResponseWriter, tokenStr string) ( } token, err := TokenStrDecode(ctx, tokenStr) if err != nil { - return nil, httperrors.NewInvalidCredentialError(errors.Wrapf(err, "invalid token").Error()) + return nil, httperrors.NewInvalidCredentialError("invalid token: %v", err) } return token, nil } diff --git a/pkg/keystone/tokens/invalidate.go b/pkg/keystone/tokens/invalidate.go index 36c39a6cd9..0d37749933 100644 --- a/pkg/keystone/tokens/invalidate.go +++ b/pkg/keystone/tokens/invalidate.go @@ -52,7 +52,7 @@ func invalidateToken(ctx context.Context, tokenStr string) error { } token, err := TokenStrDecode(ctx, tokenStr) if err != nil { - return httperrors.NewInvalidCredentialError(errors.Wrapf(err, "invalid token").Error()) + return httperrors.NewInvalidCredentialError("invalid token: %v", err) } if adminToken.GetUserId() != token.UserId && policy.PolicyManager.Allow(rbacscope.ScopeSystem, adminToken, api.SERVICE_TYPE, "tokens", "delete").Result.IsDeny() { return httperrors.NewForbiddenError("%s not allow to delete token", adminToken.GetUserName()) diff --git a/pkg/keystone/tokens/token.go b/pkg/keystone/tokens/token.go index a05b3b72c7..64725900b7 100644 --- a/pkg/keystone/tokens/token.go +++ b/pkg/keystone/tokens/token.go @@ -246,7 +246,7 @@ func TokenStrDecode(ctx context.Context, tokenStr string) (*SAuthToken, error) { func (t *SAuthToken) parseFernetToken(tokenStr string) error { tk := keys.TokenKeysManager.Decrypt([]byte(tokenStr)) // , time.Duration(options.Options.TokenExpirationSeconds)*time.Second) if tk == nil { - return errors.Wrapf(ErrInvalidFernetToken, tokenStr) + return errors.Wrapf(ErrInvalidFernetToken, "%v", tokenStr) } err := t.Decode(tk) if err != nil { diff --git a/pkg/mcclient/cloudpods/cloudpods.go b/pkg/mcclient/cloudpods/cloudpods.go index 9de9a69307..e5bd3f511e 100644 --- a/pkg/mcclient/cloudpods/cloudpods.go +++ b/pkg/mcclient/cloudpods/cloudpods.go @@ -114,7 +114,7 @@ func (self *SCloudpodsClient) auth() error { token, err := client.AuthenticateByAccessKey(self.accessKey, self.accessSecret, "cli") if err != nil { if errors.Cause(err) == cloudprovider.ErrUnauthorized { - return errors.Wrapf(cloudprovider.ErrInvalidAccessKey, err.Error()) + return errors.Wrapf(cloudprovider.ErrInvalidAccessKey, "%v", err) } return err } @@ -161,7 +161,7 @@ func (self *SCloudpodsClient) get(manager ModelManager, id string, params map[st resp, err := manager.Get(self.s, id, body) if err != nil { if strings.Contains(err.Error(), "NotFoundError") { - return errors.Wrapf(cloudprovider.ErrNotFound, err.Error()) + return errors.Wrapf(cloudprovider.ErrNotFound, "%v", err) } return errors.Wrapf(err, "Get(%s)", id) } @@ -265,7 +265,7 @@ func (self *SCloudpodsClient) GetIRegionById(id string) (cloudprovider.ICloudReg return ®ions[i], nil } } - return nil, errors.Wrapf(cloudprovider.ErrNotFound, id) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%s", id) } func (self *SCloudpodsClient) GetIRegions() ([]cloudprovider.ICloudRegion, error) { diff --git a/pkg/mcclient/cloudpods/instance.go b/pkg/mcclient/cloudpods/instance.go index 37c6e131b3..09ed56c406 100644 --- a/pkg/mcclient/cloudpods/instance.go +++ b/pkg/mcclient/cloudpods/instance.go @@ -398,7 +398,7 @@ func (self *SInstance) GetError() error { actions := []apis.OpsLogDetails{} self.host.zone.region.list(&logger.Actions, params, &actions) if len(actions) > 0 { - return fmt.Errorf(actions[0].Notes) + return fmt.Errorf("%s", actions[0].Notes) } return fmt.Errorf("vm create failed with status %s", self.Status) } diff --git a/pkg/mcclient/modules/compute/mod_hosts.go b/pkg/mcclient/modules/compute/mod_hosts.go index 772de87495..c6645a50d9 100644 --- a/pkg/mcclient/modules/compute/mod_hosts.go +++ b/pkg/mcclient/modules/compute/mod_hosts.go @@ -96,7 +96,7 @@ func parseHosts(titles []string, data string) []*jsonutils.JSONDict { for i, host := range hosts { host = strings.TrimSpace(host) if len(host) == 0 { - log.Warningf(fmt.Sprintf("DoBatchRegister 第%d行： 空白行（已忽略）\n", i)) + log.Warningf("DoBatchRegister 第%d行： 空白行（已忽略）\n", i) continue } diff --git a/pkg/monitor/alerting/notifiers/dingding.go b/pkg/monitor/alerting/notifiers/dingding.go index a4d176267d..91fae3dc9a 100644 --- a/pkg/monitor/alerting/notifiers/dingding.go +++ b/pkg/monitor/alerting/notifiers/dingding.go @@ -126,7 +126,7 @@ func (dd *DingDingNotifier) genBody(ctx *alerting.EvalContext, matches []*monito // Refer: https://open-doc.dingtalk.com/docs/doc.htm?treeId=385&articleId=104972&docType=1#s9 messageURL := "dingtalk://dingtalkclient/page/link?" + q.Encode() - log.Infof("messageUrl: " + messageURL) + log.Infof("messageUrl: %s", messageURL) config := GetNotifyTemplateConfig(ctx, isRecoverd, matches) contentConfig := templates.NewTemplateConfig(config) diff --git a/pkg/monitor/models/datasource.go b/pkg/monitor/models/datasource.go index dfc105d2ce..dad6e1173c 100644 --- a/pkg/monitor/models/datasource.go +++ b/pkg/monitor/models/datasource.go @@ -521,7 +521,8 @@ func (m *SDataSourceManager) filterRtnTags(output *monitor.InfluxMeasurement) { func (m *SDataSourceManager) filterTagValue(measurement monitor.InfluxMeasurement, timeF timeFilter, db *influxdb.SInfluxdb, tagValChan *influxdbTagValueChan, tagFilter string) error { - ctx, _ := context.WithTimeout(context.Background(), time.Second*15) + ctx, cancel := context.WithTimeout(context.Background(), time.Second*15) + defer cancel() tagValGroup2, _ := errgroup.WithContext(ctx) tagValChan2 := influxdbTagValueChan{ rtnChan: make(chan map[string][]string, len(measurement.TagKey)), diff --git a/pkg/monitor/models/monitor_resource.go b/pkg/monitor/models/monitor_resource.go index 1c5cd1e612..716af2231c 100644 --- a/pkg/monitor/models/monitor_resource.go +++ b/pkg/monitor/models/monitor_resource.go @@ -16,7 +16,6 @@ package models import ( "context" - "fmt" "reflect" "sync" "time" @@ -170,7 +169,7 @@ func (manager *SMonitorResourceManager) DeleteMonitorResources(ctx context.Conte func (manager *SMonitorResourceManager) GetMonitorResourceById(id string) (*SMonitorResource, error) { iModel, err := db.FetchById(manager, id) if err != nil { - return nil, errors.Wrapf(err, fmt.Sprintf("GetMonitorResourceById:%s err", id)) + return nil, errors.Wrapf(err, "GetMonitorResourceById:%s err", id) } return iModel.(*SMonitorResource), nil } diff --git a/pkg/monitor/models/monitor_resource_sync.go b/pkg/monitor/models/monitor_resource_sync.go index 49ad46e721..2f8853016b 100644 --- a/pkg/monitor/models/monitor_resource_sync.go +++ b/pkg/monitor/models/monitor_resource_sync.go @@ -48,7 +48,7 @@ func RegistryResourceSync(sync IResourceSync) error { resourceSyncMap = make(map[string]IResourceSync) } if _, ok := resourceSyncMap[sync.SyncType()]; ok { - return errors.Errorf(fmt.Sprintf("syncType:%s has registered", sync.SyncType())) + return errors.Errorf("syncType:%s has registered", sync.SyncType()) } resourceSyncMap[sync.SyncType()] = sync return nil @@ -218,7 +218,7 @@ func (self *SyncObject) SyncResources(ctx context.Context, userCred mcclient.Tok log.Errorf("start sync %s", self.sync.SyncType()) resources, err := GetOnecloudResources(self.sync.SyncType()) if err != nil { - return errors.Wrapf(err, fmt.Sprintf("syncType:%s GetOnecloudResources err", self.sync.SyncType())) + return errors.Wrapf(err, "syncType:%s GetOnecloudResources err", self.sync.SyncType()) } input := monitor.MonitorResourceListInput{ OnlyResId: true, diff --git a/pkg/monitor/notifydrivers/feishu/client.go b/pkg/monitor/notifydrivers/feishu/client.go index e95a5da5ee..bbbe9a71d0 100644 --- a/pkg/monitor/notifydrivers/feishu/client.go +++ b/pkg/monitor/notifydrivers/feishu/client.go @@ -89,7 +89,7 @@ type Tenant struct { func BuildTokenHeader(token string) http.Header { h := http.Header{} - h.Add("Authorization", fmt.Sprintf("Bearer "+token)) + h.Add("Authorization", fmt.Sprintf("Bearer %s", token)) return h } diff --git a/pkg/monitor/service/service.go b/pkg/monitor/service/service.go index d7b3465d03..dd97e6f285 100644 --- a/pkg/monitor/service/service.go +++ b/pkg/monitor/service/service.go @@ -120,7 +120,7 @@ func startServices() { continue } - log.Infof("Initializing " + svc.Name) + log.Infof("Initializing %s", svc.Name) if err := svc.Instance.Init(); err != nil { log.Fatalf("Service %s init failed: %v", svc.Name, err) } diff --git a/pkg/notify/models/config.go b/pkg/notify/models/config.go index 97e62b0fc2..227ad82d17 100644 --- a/pkg/notify/models/config.go +++ b/pkg/notify/models/config.go @@ -96,7 +96,7 @@ func (cm *SConfigManager) ValidateCreateData(ctx context.Context, userCred mccli DomainId: input.ProjectDomainId, }) if err != nil { - return input, errors.Wrapf(err, message) + return input, errors.Wrapf(err, "%s", message) } } if len(input.Name) == 0 { @@ -175,7 +175,7 @@ func (c *SConfig) ValidateUpdateData(ctx context.Context, userCred mcclient.Toke DomainId: c.DomainId, }) if err != nil { - return input, errors.Wrapf(err, message) + return input, errors.Wrapf(err, "%s", message) } } } @@ -376,7 +376,7 @@ func (cm *SConfigManager) PerformValidate(ctx context.Context, userCred mcclient DomainId: userCred.GetDomainId(), }) if err != nil { - return output, errors.Wrapf(err, message) + return output, errors.Wrapf(err, "%s", message) } output.IsValid = true output.Message = message diff --git a/pkg/notify/models/template.go b/pkg/notify/models/template.go index b824d4ca51..74a39aa67b 100644 --- a/pkg/notify/models/template.go +++ b/pkg/notify/models/template.go @@ -380,7 +380,7 @@ func (tm *STemplateManager) ValidateCreateData(ctx context.Context, userCred mcc } if input.TemplateType != api.TEMPLATE_TYPE_REMOTE { if err := tm.validate(input.Content, input.Example); err != nil { - return input, httperrors.NewInputParameterError(err.Error()) + return input, httperrors.NewInputParameterError("%s", err.Error()) } } if input.Lang == "" { @@ -441,7 +441,7 @@ func (t *STemplate) ValidateUpdateData(ctx context.Context, userCred mcclient.To return input, nil } if err := TemplateManager.validate(input.Content, input.Example); err != nil { - return input, httperrors.NewInputParameterError(err.Error()) + return input, httperrors.NewInputParameterError("%s", err.Error()) } return input, nil } diff --git a/pkg/notify/sender/dingtalk_robot.go b/pkg/notify/sender/dingtalk_robot.go index cfe9c630e6..b24ed8bbcd 100644 --- a/pkg/notify/sender/dingtalk_robot.go +++ b/pkg/notify/sender/dingtalk_robot.go @@ -98,7 +98,7 @@ func (dingRobotSender *SDingTalkRobotSender) Send(ctx context.Context, args api. if strings.Contains(ret.Errmsg, "whitelist") { return errors.Wrap(ErrIPWhiteList, ret.Errmsg) } else { - return errors.Errorf(resp.String()) + return errors.Errorf("%s", resp.String()) } } if ret.Errcode == 300001 && strings.Contains(ret.Errmsg, "token") { diff --git a/pkg/notify/sender/workwx.go b/pkg/notify/sender/workwx.go index 7c9954876c..d22ed2706f 100644 --- a/pkg/notify/sender/workwx.go +++ b/pkg/notify/sender/workwx.go @@ -65,10 +65,10 @@ func (workwxSender *SWorkwxSender) Send(ctx context.Context, args api.SendParams if err == nil && resp.ErrCode == 0 { return nil } else { - return errors.Errorf(resp.ErrMsg) + return errors.Errorf("%s", resp.ErrMsg) } } - return errors.Errorf(resp.ErrMsg) + return errors.Errorf("%s", resp.ErrMsg) } return nil } diff --git a/pkg/notify/sender/workwx_robot.go b/pkg/notify/sender/workwx_robot.go index d05a28ebaa..3398fe26a1 100644 --- a/pkg/notify/sender/workwx_robot.go +++ b/pkg/notify/sender/workwx_robot.go @@ -52,7 +52,7 @@ func (workwxRobotSender *SWorkwxRobotSender) Send(ctx context.Context, args api. return errors.Wrap(err, "req.GetString") } if errCode != "0" { - errs = append(errs, errors.Errorf(req.PrettyString())) + errs = append(errs, errors.Errorf("%s", req.PrettyString())) } return errors.NewAggregate(errs) } diff --git a/pkg/util/pod/remotecommand/v4.go b/pkg/util/pod/remotecommand/v4.go index c14b881307..1972a8c0dd 100644 --- a/pkg/util/pod/remotecommand/v4.go +++ b/pkg/util/pod/remotecommand/v4.go @@ -127,7 +127,7 @@ func (d *errorDecoderV4) decode(message []byte) error { return errors.New("error stream protocol error: unknown error") } - return fmt.Errorf(status.Message) + return fmt.Errorf("%s", status.Message) } // ExitError is an interface that presents an API similar to os.ProcessState, which is diff --git a/pkg/util/qemutils/qemutils_test.go b/pkg/util/qemutils/qemutils_test.go index 01fecdcd42..4b1325e7bf 100644 --- a/pkg/util/qemutils/qemutils_test.go +++ b/pkg/util/qemutils/qemutils_test.go @@ -25,6 +25,6 @@ func TestGetQemu(t *testing.T) { log.Infof("2.9.1: %s", GetQemu("2.9.1")) log.Infof("2.12.1: %s", GetQemu("2.12.1")) log.Infof("2.12.2: %s", GetQemu("2.12.2")) - log.Infof(GetQemuImg()) - log.Infof(GetQemuNbd()) + log.Infof("%s", GetQemuImg()) + log.Infof("%s", GetQemuNbd()) } diff --git a/pkg/util/yunionmeta/meta.go b/pkg/util/yunionmeta/meta.go index 98764291a8..f045056a2a 100644 --- a/pkg/util/yunionmeta/meta.go +++ b/pkg/util/yunionmeta/meta.go @@ -167,7 +167,7 @@ func (self *SSkuResourcesMeta) Index(resType string) (map[string]string, error) case "cloudrate": url = fmt.Sprintf("%s/index.json", self.RateBase) default: - return nil, errors.Wrapf(cloudprovider.ErrNotFound, resType) + return nil, errors.Wrapf(cloudprovider.ErrNotFound, "%v", resType) } ret := map[string]string{} resp, err := self.request(url) @@ -201,11 +201,11 @@ func (self *SSkuResourcesMeta) List(resType string, regionId string, retVal inte case "cloudpolicy": url = fmt.Sprintf("%s/%s.json", self.CloudpolicyBase, regionId) default: - return errors.Wrapf(cloudprovider.ErrNotFound, resType) + return errors.Wrapf(cloudprovider.ErrNotFound, "%v", resType) } resp, err := self._get(url) if err != nil { - return errors.Wrapf(err, resType) + return errors.Wrapf(err, "%v", resType) } return jsonutils.Update(retVal, resp) } diff --git a/pkg/webconsole/guac/tunnel.go b/pkg/webconsole/guac/tunnel.go index d8a5fd4af3..b749d58f2a 100644 --- a/pkg/webconsole/guac/tunnel.go +++ b/pkg/webconsole/guac/tunnel.go @@ -133,7 +133,7 @@ func (self *GuacamoleTunnel) Handshake() error { } if args.Opcode != "args" { - return errors.Wrapf(InvalidInstruction, args.String()) + return errors.Wrapf(InvalidInstruction, "%v", args.String()) } for i, arg := range args.Args { @@ -172,7 +172,7 @@ func (self *GuacamoleTunnel) Handshake() error { } if ready.Opcode != "ready" { - return errors.Wrapf(InvalidInstruction, ready.String()) + return errors.Wrapf(InvalidInstruction, "%v", ready.String()) } if len(ready.Args) == 0 { diff --git a/pkg/webconsole/server/ssh_server.go b/pkg/webconsole/server/ssh_server.go index 84492553e1..2414185514 100644 --- a/pkg/webconsole/server/ssh_server.go +++ b/pkg/webconsole/server/ssh_server.go @@ -81,7 +81,6 @@ func writeToWebsocket(reader io.Reader, s *WebsocketServer) error { return errors.Wrapf(err, "write data to websocket, out: %s", string(out)) } } - return nil } func (s *WebsocketServer) initWs(w http.ResponseWriter, r *http.Request) error { diff --git a/pkg/webconsole/service/handlers.go b/pkg/webconsole/service/handlers.go index 1fe6f0bd43..2a2350102d 100644 --- a/pkg/webconsole/service/handlers.go +++ b/pkg/webconsole/service/handlers.go @@ -470,7 +470,7 @@ func handleAdbShell(ctx context.Context, w http.ResponseWriter, r *http.Request) errMsgs = append(errMsgs, "adb port not found") } if len(errMsgs) > 0 { - httperrors.GeneralServerError(ctx, w, httperrors.NewNotSupportedError(strings.Join(errMsgs, ";"))) + httperrors.GeneralServerError(ctx, w, httperrors.NewNotSupportedError("%s", strings.Join(errMsgs, ";"))) return } } else { diff --git a/vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/client_intermediate_cert.der b/vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/client_intermediate_cert.der deleted file mode 100644 index 958f3cfadd..0000000000 Binary files a/vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/client_intermediate_cert.der and /dev/null differ diff --git a/vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/client_leaf_cert.der b/vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/client_leaf_cert.der deleted file mode 100644 index d2817641ba..0000000000 Binary files a/vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/client_leaf_cert.der and /dev/null differ diff --git a/vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/client_root_cert.der b/vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/client_root_cert.der deleted file mode 100644 index d8c3710c85..0000000000 Binary files a/vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/client_root_cert.der and /dev/null differ diff --git a/vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/server_intermediate_cert.der b/vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/server_intermediate_cert.der deleted file mode 100644 index dae619c097..0000000000 Binary files a/vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/server_intermediate_cert.der and /dev/null differ diff --git a/vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/server_leaf_cert.der b/vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/server_leaf_cert.der deleted file mode 100644 index ce7f8d31d6..0000000000 Binary files a/vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/server_leaf_cert.der and /dev/null differ diff --git a/vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/server_root_cert.der b/vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/server_root_cert.der deleted file mode 100644 index 04b0d73600..0000000000 Binary files a/vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/server_root_cert.der and /dev/null differ diff --git a/vendor/github.com/google/s2a-go/internal/v2/remotesigner/testdata/client_cert.der b/vendor/github.com/google/s2a-go/internal/v2/remotesigner/testdata/client_cert.der deleted file mode 100644 index d8c3710c85..0000000000 Binary files a/vendor/github.com/google/s2a-go/internal/v2/remotesigner/testdata/client_cert.der and /dev/null differ diff --git a/vendor/github.com/google/s2a-go/internal/v2/remotesigner/testdata/client_cert.pem b/vendor/github.com/google/s2a-go/internal/v2/remotesigner/testdata/client_cert.pem deleted file mode 100644 index 493a5a2648..0000000000 --- a/vendor/github.com/google/s2a-go/internal/v2/remotesigner/testdata/client_cert.pem +++ /dev/null @@ -1,24 +0,0 @@ ------BEGIN CERTIFICATE----- -MIID8TCCAtmgAwIBAgIUKXNlBRVe6UepjQUijIFPZBd/4qYwDQYJKoZIhvcNAQEL -BQAwgYcxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTESMBAGA1UEBwwJU3Vubnl2 -YWxlMRAwDgYDVQQKDAdDb21wYW55MREwDwYDVQQLDAhEaXZpc2lvbjEWMBQGA1UE -AwwNczJhX3Rlc3RfY2VydDEaMBgGCSqGSIb3DQEJARYLeHl6QHh5ei5jb20wHhcN -MjIwNTMxMjAwMzE1WhcNNDIwNTI2MjAwMzE1WjCBhzELMAkGA1UEBhMCVVMxCzAJ -BgNVBAgMAkNBMRIwEAYDVQQHDAlTdW5ueXZhbGUxEDAOBgNVBAoMB0NvbXBhbnkx -ETAPBgNVBAsMCERpdmlzaW9uMRYwFAYDVQQDDA1zMmFfdGVzdF9jZXJ0MRowGAYJ -KoZIhvcNAQkBFgt4eXpAeHl6LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC -AQoCggEBAOOFuIucH7XXfohGxKd3uR/ihUA/LdduR9I8kfpUEbq5BOt8xZe5/Yn9 -a1ozEHVW6cOAbHbnwAR8tkSgZ/t42QIA2k77HWU1Jh2xiEIsJivo3imm4/kZWuR0 -OqPh7MhzxpR/hvNwpI5mJsAVBWFMa5KtecFZLnyZtwHylrRN1QXzuLrOxuKFufK3 -RKbTABScn5RbZL976H/jgfSeXrbt242NrIoBnVe6fRbekbq2DQ6zFArbQMUgHjHK -P0UqBgdr1QmHfi9KytFyx9BTP3gXWnWIu+bY7/v7qKJMHFwGETo+dCLWYevJL316 -HnLfhApDMfP8U+Yv/y1N/YvgaSOSlEcCAwEAAaNTMFEwHQYDVR0OBBYEFKhAU4nu -0h/lrnggbIGvx4ej0WklMB8GA1UdIwQYMBaAFKhAU4nu0h/lrnggbIGvx4ej0Wkl -MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAE/6NghzQ5fu6yR6 -EHKbj/YMrFdT7aGn5n2sAf7wJ33LIhiFHkpWBsVlm7rDtZtwhe891ZK/P60anlg9 -/P0Ua53tSRVRmCvTnEbXWOVMN4is6MsR7BlmzUxl4AtIn7jbeifEwRL7B4xDYmdA -QrQnsqoz45dLgS5xK4WDqXATP09Q91xQDuhud/b+A4jrvgwFASmL7rMIZbp4f1JQ -nlnl/9VoTBQBvJiWkDUtQDMpRLtauddEkv4AGz75p5IspXWD6cOemuh2iQec11xD -X20rs2WZbAcAiUa3nmy8OKYw435vmpj8gp39WYbX/Yx9TymrFFbVY92wYn+quTco -pKklVz0= ------END CERTIFICATE----- diff --git a/vendor/github.com/google/s2a-go/internal/v2/remotesigner/testdata/client_key.pem b/vendor/github.com/google/s2a-go/internal/v2/remotesigner/testdata/client_key.pem deleted file mode 100644 index 55a7f10c74..0000000000 --- a/vendor/github.com/google/s2a-go/internal/v2/remotesigner/testdata/client_key.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEogIBAAKCAQEA44W4i5wftdd+iEbEp3e5H+KFQD8t125H0jyR+lQRurkE63zF -l7n9if1rWjMQdVbpw4BsdufABHy2RKBn+3jZAgDaTvsdZTUmHbGIQiwmK+jeKabj -+Rla5HQ6o+HsyHPGlH+G83CkjmYmwBUFYUxrkq15wVkufJm3AfKWtE3VBfO4us7G -4oW58rdEptMAFJyflFtkv3vof+OB9J5etu3bjY2sigGdV7p9Ft6RurYNDrMUCttA -xSAeMco/RSoGB2vVCYd+L0rK0XLH0FM/eBdadYi75tjv+/uookwcXAYROj50ItZh -68kvfXoect+ECkMx8/xT5i//LU39i+BpI5KURwIDAQABAoIBABgyjo/6iLzUMFbZ -/+w3pW6orrdIgN2akvTfED9pVYFgUA+jc3hRhY95bkNnjuaL2cy7Cc4Tk65mfRQL -Y0OxdJLr+EvSFSxAXM9npDA1ddHRsF8JqtFBSxNk8R+g1Yf0GDiO35Fgd3/ViWWA -VtQkRoSRApP3oiQKTRZd8H04keFR+PvmDk/Lq11l3Kc24A1PevKIPX1oI990ggw9 -9i4uSV+cnuMxmcI9xxJtgwdDFdjr39l2arLOHr4s6LGoV2IOdXHNlv5xRqWUZ0FH -MDHowkLgwDrdSTnNeaVNkce14Gqx+bd4hNaLCdKXMpedBTEmrut3f3hdV1kKjaKt -aqRYr8ECgYEA/YDGZY2jvFoHHBywlqmEMFrrCvQGH51m5R1Ntpkzr+Rh3YCmrpvq -xgwJXING0PUw3dz+xrH5lJICrfNE5Kt3fPu1rAEy+13mYsNowghtUq2Rtu0Hsjjx -2E3Bf8vEB6RNBMmGkUpTTIAroGF5tpJoRvfnWax+k4pFdrKYFtyZdNcCgYEA5cNv -EPltvOobjTXlUmtVP3n27KZN2aXexTcagLzRxE9CV4cYySENl3KuOMmccaZpIl6z -aHk6BT4X+M0LqElNUczrInfVqI+SGAFLGy7W6CJaqSr6cpyFUP/fosKpm6wKGgLq -udHfpvz5rckhKd8kJxFLvhGOK9yN5qpzih0gfhECgYAJfwRvk3G5wYmYpP58dlcs -VIuPenqsPoI3PPTHTU/hW+XKnWIhElgmGRdUrto9Q6IT/Y5RtSMLTLjq+Tzwb/fm -56rziYv2XJsfwgAvnI8z1Kqrto9ePsHYf3krJ1/thVsZPc9bq/QY3ohD1sLvcuaT -GgBBnLOVJU3a12/ZE2RwOwKBgF0csWMAoj8/5IB6if+3ral2xOGsl7oPZVMo/J2V -Z7EVqb4M6rd/pKFugTpUQgkwtkSOekhpcGD1hAN5HTNK2YG/+L5UMAsKe9sskwJm -HgOfAHy0BSDzW3ey6i9skg2bT9Cww+0gJ3Hl7U1HSCBO5LjMYpSZSrNtwzfqdb5Q -BX3xAoGARZdR28Ej3+/+0+fz47Yu2h4z0EI/EbrudLOWY936jIeAVwHckI3+BuqH -qR4poj1gfbnMxNuI9UzIXzjEmGewx9kDZ7IYnvloZKqoVQODO5GlKF2ja6IcMNlh -GCNdD6PSAS6HcmalmWo9sj+1YMkrl+GJikKZqVBHrHNwMGAG67w= ------END RSA PRIVATE KEY----- diff --git a/vendor/github.com/google/s2a-go/internal/v2/remotesigner/testdata/server_cert.der b/vendor/github.com/google/s2a-go/internal/v2/remotesigner/testdata/server_cert.der deleted file mode 100644 index 04b0d73600..0000000000 Binary files a/vendor/github.com/google/s2a-go/internal/v2/remotesigner/testdata/server_cert.der and /dev/null differ diff --git a/vendor/github.com/google/s2a-go/internal/v2/remotesigner/testdata/server_cert.pem b/vendor/github.com/google/s2a-go/internal/v2/remotesigner/testdata/server_cert.pem deleted file mode 100644 index 0f98322c72..0000000000 --- a/vendor/github.com/google/s2a-go/internal/v2/remotesigner/testdata/server_cert.pem +++ /dev/null @@ -1,24 +0,0 @@ ------BEGIN CERTIFICATE----- -MIID8TCCAtmgAwIBAgIUKCoDuLtiZXvhsBY2RoDm0ugizJ8wDQYJKoZIhvcNAQEL -BQAwgYcxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTESMBAGA1UEBwwJU3Vubnl2 -YWxlMRAwDgYDVQQKDAdDb21wYW55MREwDwYDVQQLDAhEaXZpc2lvbjEWMBQGA1UE -AwwNczJhX3Rlc3RfY2VydDEaMBgGCSqGSIb3DQEJARYLeHl6QHh5ei5jb20wHhcN -MjIwNTMxMjAwODI1WhcNNDIwNTI2MjAwODI1WjCBhzELMAkGA1UEBhMCVVMxCzAJ -BgNVBAgMAkNBMRIwEAYDVQQHDAlTdW5ueXZhbGUxEDAOBgNVBAoMB0NvbXBhbnkx -ETAPBgNVBAsMCERpdmlzaW9uMRYwFAYDVQQDDA1zMmFfdGVzdF9jZXJ0MRowGAYJ -KoZIhvcNAQkBFgt4eXpAeHl6LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC -AQoCggEBAKK1++PXQ+M3hjYH/v0K4UEYl5ljzpNM1i52eQM+gFooojT87PDSaphT -fs0PXy/PTAjHBEvPhWpOpmQXfJNYzjwcCvg66hbqkv++/VTZiFLAsHagzkEz+FRJ -qT5Eq7G5FLyw1izX1uxyPN7tAEWEEg7eqsiaXD3Cq8+TYN9cjirPeF7RZF8yFCYE -xqvbo+Yc6RL6xw19iXVTfctRgQe581KQuIY5/LXo3dWDEilFdsADAe8XAEcO64es -Ow0g1UvXLnpXSE151kXBFb3sKH/ZjCecDYMCIMEb4sWLSblkSxJ5sNSmXIG4wtr2 -Qnii7CXZgnVYraQE/Jyh+NMQANuoSdMCAwEAAaNTMFEwHQYDVR0OBBYEFAyQQQuM -ab+YUQqjK8dVVOoHVFmXMB8GA1UdIwQYMBaAFAyQQQuMab+YUQqjK8dVVOoHVFmX -MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBADj0vQ6ykWhicoqR -e6VZMwlEJV7/DSvWWKBd9MUjfKye0A4565ya5lmnzP3DiD3nqGe3miqmLsXKDs+X -POqlPXTWIamP7D4MJ32XtSLwZB4ru+I+Ao/P/VngPepoRPQoBnzHe7jww0rokqxl -AZERjlbTUwUAy/BPWPSzSJZ2j0tcs6ZLDNyYzpK4ao8R9/1VmQ92Tcp3feJs1QTg -odRQc3om/AkWOwsll+oyX0UbJeHkFHiLanUPXbdh+/BkSvZJ8ynL+feSDdaurPe+ -PSfnqLtQft9/neecGRdEaQzzzSFVQUVQzTdK1Q7hA7b55b2HvIa3ktDiks+sJsYN -Dhm6uZM= ------END CERTIFICATE----- diff --git a/vendor/github.com/google/s2a-go/internal/v2/remotesigner/testdata/server_key.pem b/vendor/github.com/google/s2a-go/internal/v2/remotesigner/testdata/server_key.pem deleted file mode 100644 index 81afea783d..0000000000 --- a/vendor/github.com/google/s2a-go/internal/v2/remotesigner/testdata/server_key.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpAIBAAKCAQEAorX749dD4zeGNgf+/QrhQRiXmWPOk0zWLnZ5Az6AWiiiNPzs -8NJqmFN+zQ9fL89MCMcES8+Fak6mZBd8k1jOPBwK+DrqFuqS/779VNmIUsCwdqDO -QTP4VEmpPkSrsbkUvLDWLNfW7HI83u0ARYQSDt6qyJpcPcKrz5Ng31yOKs94XtFk -XzIUJgTGq9uj5hzpEvrHDX2JdVN9y1GBB7nzUpC4hjn8tejd1YMSKUV2wAMB7xcA -Rw7rh6w7DSDVS9cueldITXnWRcEVvewof9mMJ5wNgwIgwRvixYtJuWRLEnmw1KZc -gbjC2vZCeKLsJdmCdVitpAT8nKH40xAA26hJ0wIDAQABAoIBACaNR+lsD8G+XiZf -LqN1+HkcAo9tfnyYMAdCOtnx7SdviT9Uzi8hK/B7mAeuJLeHPlS2EuaDfPD7QaFl -jza6S+MiIdc+3kgfvESsVAnOoOY6kZUJ9NSuI6CU82y1iJjLaYZrv9NQMLRFPPb0 -4KOX709mosB1EnXvshW0rbc+jtDFhrm1SxMt+k9TuzmMxjbOeW4LOLXPgU8X1T3Q -Xy0hMZZtcgBs9wFIo8yCtmOixax9pnFE8rRltgDxTodn9LLdz1FieyntNgDksZ0P -nt4kV7Mqly7ELaea+Foaj244mKsesic2e3GhAlMRLun/VSunSf7mOCxfpITB8dp1 -drDhOYECgYEA19151dVxRcviuovN6Dar+QszMTnU8pDJ8BjLFjXjP/hNBBwMTHDE -duMuWk2qnwZqMooI/shxrF/ufmTgS0CFrh2+ANBZu27vWConJNXcyNtdigI4wt50 -L0Y2qcZn2mg67qFXHwoR3QNwrwnPwEjRXA09at9CSRZzcwDQ0ETXhYsCgYEAwPaG -06QdK8Zyly7TTzZJwxzv9uGiqzodmGtX6NEKjgij2JaCxHpukqZBJoqa0jKeK1cm -eNVkOvT5ff9TMzarSHQLr3pZen2/oVLb5gaFkbcJt/klv9Fd+ZRilHY3i6QwS6pD -uMiPOWS4DrLHDRVoVlAZTDjT1RVwwTs+P2NhJdkCgYEAsriXysbxBYyMp05gqEW7 -lHIFbFgpSrs9th+Q5U6wW6JEgYaHWDJ1NslY80MiZI93FWjbkbZ7BvBWESeL3EIL -a+EMErht0pVCbIhZ6FF4foPAqia0wAJVx14mm+G80kNBp5jE/NnleEsE3KcO7nBb -hg8gLn+x7bk81JZ0TDrzBYkCgYEAuQKluv47SeF3tSScTfKLPpvcKCWmxe1uutkQ -7JShPhVioyOMNb39jnYBOWbjkm4d4QgqRuiytSR0oi3QI+Ziy5EYMyNn713qAk9j -r2TJZDDPDKnBW+zt4YI4EohWMXk3JRUW4XDKggjjwJQA7bZ812TtHHvP/xoThfG7 -eSNb3eECgYBw6ssgCtMrdvQiEmjKVX/9yI38mvC2kSGyzbrQnGUfgqRGomRpeZuD -B5E3kysA4td5pT5lvcLgSW0TbOz+YbiriXjwOihPIelCvc9gE2eOUI71/byUWPFz -7u5F/xQ4NaGr5suLF+lBC6h7pSbM4El9lIHQAQadpuEdzHqrw+hs3g== ------END RSA PRIVATE KEY----- diff --git a/vendor/github.com/google/s2a-go/internal/v2/testdata/client_cert.pem b/vendor/github.com/google/s2a-go/internal/v2/testdata/client_cert.pem deleted file mode 100644 index 493a5a2648..0000000000 --- a/vendor/github.com/google/s2a-go/internal/v2/testdata/client_cert.pem +++ /dev/null @@ -1,24 +0,0 @@ ------BEGIN CERTIFICATE----- -MIID8TCCAtmgAwIBAgIUKXNlBRVe6UepjQUijIFPZBd/4qYwDQYJKoZIhvcNAQEL -BQAwgYcxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTESMBAGA1UEBwwJU3Vubnl2 -YWxlMRAwDgYDVQQKDAdDb21wYW55MREwDwYDVQQLDAhEaXZpc2lvbjEWMBQGA1UE -AwwNczJhX3Rlc3RfY2VydDEaMBgGCSqGSIb3DQEJARYLeHl6QHh5ei5jb20wHhcN -MjIwNTMxMjAwMzE1WhcNNDIwNTI2MjAwMzE1WjCBhzELMAkGA1UEBhMCVVMxCzAJ -BgNVBAgMAkNBMRIwEAYDVQQHDAlTdW5ueXZhbGUxEDAOBgNVBAoMB0NvbXBhbnkx -ETAPBgNVBAsMCERpdmlzaW9uMRYwFAYDVQQDDA1zMmFfdGVzdF9jZXJ0MRowGAYJ -KoZIhvcNAQkBFgt4eXpAeHl6LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC -AQoCggEBAOOFuIucH7XXfohGxKd3uR/ihUA/LdduR9I8kfpUEbq5BOt8xZe5/Yn9 -a1ozEHVW6cOAbHbnwAR8tkSgZ/t42QIA2k77HWU1Jh2xiEIsJivo3imm4/kZWuR0 -OqPh7MhzxpR/hvNwpI5mJsAVBWFMa5KtecFZLnyZtwHylrRN1QXzuLrOxuKFufK3 -RKbTABScn5RbZL976H/jgfSeXrbt242NrIoBnVe6fRbekbq2DQ6zFArbQMUgHjHK -P0UqBgdr1QmHfi9KytFyx9BTP3gXWnWIu+bY7/v7qKJMHFwGETo+dCLWYevJL316 -HnLfhApDMfP8U+Yv/y1N/YvgaSOSlEcCAwEAAaNTMFEwHQYDVR0OBBYEFKhAU4nu -0h/lrnggbIGvx4ej0WklMB8GA1UdIwQYMBaAFKhAU4nu0h/lrnggbIGvx4ej0Wkl -MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAE/6NghzQ5fu6yR6 -EHKbj/YMrFdT7aGn5n2sAf7wJ33LIhiFHkpWBsVlm7rDtZtwhe891ZK/P60anlg9 -/P0Ua53tSRVRmCvTnEbXWOVMN4is6MsR7BlmzUxl4AtIn7jbeifEwRL7B4xDYmdA -QrQnsqoz45dLgS5xK4WDqXATP09Q91xQDuhud/b+A4jrvgwFASmL7rMIZbp4f1JQ -nlnl/9VoTBQBvJiWkDUtQDMpRLtauddEkv4AGz75p5IspXWD6cOemuh2iQec11xD -X20rs2WZbAcAiUa3nmy8OKYw435vmpj8gp39WYbX/Yx9TymrFFbVY92wYn+quTco -pKklVz0= ------END CERTIFICATE----- diff --git a/vendor/github.com/google/s2a-go/internal/v2/testdata/client_key.pem b/vendor/github.com/google/s2a-go/internal/v2/testdata/client_key.pem deleted file mode 100644 index 55a7f10c74..0000000000 --- a/vendor/github.com/google/s2a-go/internal/v2/testdata/client_key.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEogIBAAKCAQEA44W4i5wftdd+iEbEp3e5H+KFQD8t125H0jyR+lQRurkE63zF -l7n9if1rWjMQdVbpw4BsdufABHy2RKBn+3jZAgDaTvsdZTUmHbGIQiwmK+jeKabj -+Rla5HQ6o+HsyHPGlH+G83CkjmYmwBUFYUxrkq15wVkufJm3AfKWtE3VBfO4us7G -4oW58rdEptMAFJyflFtkv3vof+OB9J5etu3bjY2sigGdV7p9Ft6RurYNDrMUCttA -xSAeMco/RSoGB2vVCYd+L0rK0XLH0FM/eBdadYi75tjv+/uookwcXAYROj50ItZh -68kvfXoect+ECkMx8/xT5i//LU39i+BpI5KURwIDAQABAoIBABgyjo/6iLzUMFbZ -/+w3pW6orrdIgN2akvTfED9pVYFgUA+jc3hRhY95bkNnjuaL2cy7Cc4Tk65mfRQL -Y0OxdJLr+EvSFSxAXM9npDA1ddHRsF8JqtFBSxNk8R+g1Yf0GDiO35Fgd3/ViWWA -VtQkRoSRApP3oiQKTRZd8H04keFR+PvmDk/Lq11l3Kc24A1PevKIPX1oI990ggw9 -9i4uSV+cnuMxmcI9xxJtgwdDFdjr39l2arLOHr4s6LGoV2IOdXHNlv5xRqWUZ0FH -MDHowkLgwDrdSTnNeaVNkce14Gqx+bd4hNaLCdKXMpedBTEmrut3f3hdV1kKjaKt -aqRYr8ECgYEA/YDGZY2jvFoHHBywlqmEMFrrCvQGH51m5R1Ntpkzr+Rh3YCmrpvq -xgwJXING0PUw3dz+xrH5lJICrfNE5Kt3fPu1rAEy+13mYsNowghtUq2Rtu0Hsjjx -2E3Bf8vEB6RNBMmGkUpTTIAroGF5tpJoRvfnWax+k4pFdrKYFtyZdNcCgYEA5cNv -EPltvOobjTXlUmtVP3n27KZN2aXexTcagLzRxE9CV4cYySENl3KuOMmccaZpIl6z -aHk6BT4X+M0LqElNUczrInfVqI+SGAFLGy7W6CJaqSr6cpyFUP/fosKpm6wKGgLq -udHfpvz5rckhKd8kJxFLvhGOK9yN5qpzih0gfhECgYAJfwRvk3G5wYmYpP58dlcs -VIuPenqsPoI3PPTHTU/hW+XKnWIhElgmGRdUrto9Q6IT/Y5RtSMLTLjq+Tzwb/fm -56rziYv2XJsfwgAvnI8z1Kqrto9ePsHYf3krJ1/thVsZPc9bq/QY3ohD1sLvcuaT -GgBBnLOVJU3a12/ZE2RwOwKBgF0csWMAoj8/5IB6if+3ral2xOGsl7oPZVMo/J2V -Z7EVqb4M6rd/pKFugTpUQgkwtkSOekhpcGD1hAN5HTNK2YG/+L5UMAsKe9sskwJm -HgOfAHy0BSDzW3ey6i9skg2bT9Cww+0gJ3Hl7U1HSCBO5LjMYpSZSrNtwzfqdb5Q -BX3xAoGARZdR28Ej3+/+0+fz47Yu2h4z0EI/EbrudLOWY936jIeAVwHckI3+BuqH -qR4poj1gfbnMxNuI9UzIXzjEmGewx9kDZ7IYnvloZKqoVQODO5GlKF2ja6IcMNlh -GCNdD6PSAS6HcmalmWo9sj+1YMkrl+GJikKZqVBHrHNwMGAG67w= ------END RSA PRIVATE KEY----- diff --git a/vendor/github.com/google/s2a-go/internal/v2/testdata/server_cert.pem b/vendor/github.com/google/s2a-go/internal/v2/testdata/server_cert.pem deleted file mode 100644 index 0f98322c72..0000000000 --- a/vendor/github.com/google/s2a-go/internal/v2/testdata/server_cert.pem +++ /dev/null @@ -1,24 +0,0 @@ ------BEGIN CERTIFICATE----- -MIID8TCCAtmgAwIBAgIUKCoDuLtiZXvhsBY2RoDm0ugizJ8wDQYJKoZIhvcNAQEL -BQAwgYcxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTESMBAGA1UEBwwJU3Vubnl2 -YWxlMRAwDgYDVQQKDAdDb21wYW55MREwDwYDVQQLDAhEaXZpc2lvbjEWMBQGA1UE -AwwNczJhX3Rlc3RfY2VydDEaMBgGCSqGSIb3DQEJARYLeHl6QHh5ei5jb20wHhcN -MjIwNTMxMjAwODI1WhcNNDIwNTI2MjAwODI1WjCBhzELMAkGA1UEBhMCVVMxCzAJ -BgNVBAgMAkNBMRIwEAYDVQQHDAlTdW5ueXZhbGUxEDAOBgNVBAoMB0NvbXBhbnkx -ETAPBgNVBAsMCERpdmlzaW9uMRYwFAYDVQQDDA1zMmFfdGVzdF9jZXJ0MRowGAYJ -KoZIhvcNAQkBFgt4eXpAeHl6LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC -AQoCggEBAKK1++PXQ+M3hjYH/v0K4UEYl5ljzpNM1i52eQM+gFooojT87PDSaphT -fs0PXy/PTAjHBEvPhWpOpmQXfJNYzjwcCvg66hbqkv++/VTZiFLAsHagzkEz+FRJ -qT5Eq7G5FLyw1izX1uxyPN7tAEWEEg7eqsiaXD3Cq8+TYN9cjirPeF7RZF8yFCYE -xqvbo+Yc6RL6xw19iXVTfctRgQe581KQuIY5/LXo3dWDEilFdsADAe8XAEcO64es -Ow0g1UvXLnpXSE151kXBFb3sKH/ZjCecDYMCIMEb4sWLSblkSxJ5sNSmXIG4wtr2 -Qnii7CXZgnVYraQE/Jyh+NMQANuoSdMCAwEAAaNTMFEwHQYDVR0OBBYEFAyQQQuM -ab+YUQqjK8dVVOoHVFmXMB8GA1UdIwQYMBaAFAyQQQuMab+YUQqjK8dVVOoHVFmX -MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBADj0vQ6ykWhicoqR -e6VZMwlEJV7/DSvWWKBd9MUjfKye0A4565ya5lmnzP3DiD3nqGe3miqmLsXKDs+X -POqlPXTWIamP7D4MJ32XtSLwZB4ru+I+Ao/P/VngPepoRPQoBnzHe7jww0rokqxl -AZERjlbTUwUAy/BPWPSzSJZ2j0tcs6ZLDNyYzpK4ao8R9/1VmQ92Tcp3feJs1QTg -odRQc3om/AkWOwsll+oyX0UbJeHkFHiLanUPXbdh+/BkSvZJ8ynL+feSDdaurPe+ -PSfnqLtQft9/neecGRdEaQzzzSFVQUVQzTdK1Q7hA7b55b2HvIa3ktDiks+sJsYN -Dhm6uZM= ------END CERTIFICATE----- diff --git a/vendor/github.com/google/s2a-go/internal/v2/testdata/server_key.pem b/vendor/github.com/google/s2a-go/internal/v2/testdata/server_key.pem deleted file mode 100644 index 81afea783d..0000000000 --- a/vendor/github.com/google/s2a-go/internal/v2/testdata/server_key.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpAIBAAKCAQEAorX749dD4zeGNgf+/QrhQRiXmWPOk0zWLnZ5Az6AWiiiNPzs -8NJqmFN+zQ9fL89MCMcES8+Fak6mZBd8k1jOPBwK+DrqFuqS/779VNmIUsCwdqDO -QTP4VEmpPkSrsbkUvLDWLNfW7HI83u0ARYQSDt6qyJpcPcKrz5Ng31yOKs94XtFk -XzIUJgTGq9uj5hzpEvrHDX2JdVN9y1GBB7nzUpC4hjn8tejd1YMSKUV2wAMB7xcA -Rw7rh6w7DSDVS9cueldITXnWRcEVvewof9mMJ5wNgwIgwRvixYtJuWRLEnmw1KZc -gbjC2vZCeKLsJdmCdVitpAT8nKH40xAA26hJ0wIDAQABAoIBACaNR+lsD8G+XiZf -LqN1+HkcAo9tfnyYMAdCOtnx7SdviT9Uzi8hK/B7mAeuJLeHPlS2EuaDfPD7QaFl -jza6S+MiIdc+3kgfvESsVAnOoOY6kZUJ9NSuI6CU82y1iJjLaYZrv9NQMLRFPPb0 -4KOX709mosB1EnXvshW0rbc+jtDFhrm1SxMt+k9TuzmMxjbOeW4LOLXPgU8X1T3Q -Xy0hMZZtcgBs9wFIo8yCtmOixax9pnFE8rRltgDxTodn9LLdz1FieyntNgDksZ0P -nt4kV7Mqly7ELaea+Foaj244mKsesic2e3GhAlMRLun/VSunSf7mOCxfpITB8dp1 -drDhOYECgYEA19151dVxRcviuovN6Dar+QszMTnU8pDJ8BjLFjXjP/hNBBwMTHDE -duMuWk2qnwZqMooI/shxrF/ufmTgS0CFrh2+ANBZu27vWConJNXcyNtdigI4wt50 -L0Y2qcZn2mg67qFXHwoR3QNwrwnPwEjRXA09at9CSRZzcwDQ0ETXhYsCgYEAwPaG -06QdK8Zyly7TTzZJwxzv9uGiqzodmGtX6NEKjgij2JaCxHpukqZBJoqa0jKeK1cm -eNVkOvT5ff9TMzarSHQLr3pZen2/oVLb5gaFkbcJt/klv9Fd+ZRilHY3i6QwS6pD -uMiPOWS4DrLHDRVoVlAZTDjT1RVwwTs+P2NhJdkCgYEAsriXysbxBYyMp05gqEW7 -lHIFbFgpSrs9th+Q5U6wW6JEgYaHWDJ1NslY80MiZI93FWjbkbZ7BvBWESeL3EIL -a+EMErht0pVCbIhZ6FF4foPAqia0wAJVx14mm+G80kNBp5jE/NnleEsE3KcO7nBb -hg8gLn+x7bk81JZ0TDrzBYkCgYEAuQKluv47SeF3tSScTfKLPpvcKCWmxe1uutkQ -7JShPhVioyOMNb39jnYBOWbjkm4d4QgqRuiytSR0oi3QI+Ziy5EYMyNn713qAk9j -r2TJZDDPDKnBW+zt4YI4EohWMXk3JRUW4XDKggjjwJQA7bZ812TtHHvP/xoThfG7 -eSNb3eECgYBw6ssgCtMrdvQiEmjKVX/9yI38mvC2kSGyzbrQnGUfgqRGomRpeZuD -B5E3kysA4td5pT5lvcLgSW0TbOz+YbiriXjwOihPIelCvc9gE2eOUI71/byUWPFz -7u5F/xQ4NaGr5suLF+lBC6h7pSbM4El9lIHQAQadpuEdzHqrw+hs3g== ------END RSA PRIVATE KEY----- diff --git a/vendor/github.com/google/s2a-go/internal/v2/tlsconfigstore/testdata/client_cert.pem b/vendor/github.com/google/s2a-go/internal/v2/tlsconfigstore/testdata/client_cert.pem deleted file mode 100644 index 493a5a2648..0000000000 --- a/vendor/github.com/google/s2a-go/internal/v2/tlsconfigstore/testdata/client_cert.pem +++ /dev/null @@ -1,24 +0,0 @@ ------BEGIN CERTIFICATE----- -MIID8TCCAtmgAwIBAgIUKXNlBRVe6UepjQUijIFPZBd/4qYwDQYJKoZIhvcNAQEL -BQAwgYcxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTESMBAGA1UEBwwJU3Vubnl2 -YWxlMRAwDgYDVQQKDAdDb21wYW55MREwDwYDVQQLDAhEaXZpc2lvbjEWMBQGA1UE -AwwNczJhX3Rlc3RfY2VydDEaMBgGCSqGSIb3DQEJARYLeHl6QHh5ei5jb20wHhcN -MjIwNTMxMjAwMzE1WhcNNDIwNTI2MjAwMzE1WjCBhzELMAkGA1UEBhMCVVMxCzAJ -BgNVBAgMAkNBMRIwEAYDVQQHDAlTdW5ueXZhbGUxEDAOBgNVBAoMB0NvbXBhbnkx -ETAPBgNVBAsMCERpdmlzaW9uMRYwFAYDVQQDDA1zMmFfdGVzdF9jZXJ0MRowGAYJ -KoZIhvcNAQkBFgt4eXpAeHl6LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC -AQoCggEBAOOFuIucH7XXfohGxKd3uR/ihUA/LdduR9I8kfpUEbq5BOt8xZe5/Yn9 -a1ozEHVW6cOAbHbnwAR8tkSgZ/t42QIA2k77HWU1Jh2xiEIsJivo3imm4/kZWuR0 -OqPh7MhzxpR/hvNwpI5mJsAVBWFMa5KtecFZLnyZtwHylrRN1QXzuLrOxuKFufK3 -RKbTABScn5RbZL976H/jgfSeXrbt242NrIoBnVe6fRbekbq2DQ6zFArbQMUgHjHK -P0UqBgdr1QmHfi9KytFyx9BTP3gXWnWIu+bY7/v7qKJMHFwGETo+dCLWYevJL316 -HnLfhApDMfP8U+Yv/y1N/YvgaSOSlEcCAwEAAaNTMFEwHQYDVR0OBBYEFKhAU4nu -0h/lrnggbIGvx4ej0WklMB8GA1UdIwQYMBaAFKhAU4nu0h/lrnggbIGvx4ej0Wkl -MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAE/6NghzQ5fu6yR6 -EHKbj/YMrFdT7aGn5n2sAf7wJ33LIhiFHkpWBsVlm7rDtZtwhe891ZK/P60anlg9 -/P0Ua53tSRVRmCvTnEbXWOVMN4is6MsR7BlmzUxl4AtIn7jbeifEwRL7B4xDYmdA -QrQnsqoz45dLgS5xK4WDqXATP09Q91xQDuhud/b+A4jrvgwFASmL7rMIZbp4f1JQ -nlnl/9VoTBQBvJiWkDUtQDMpRLtauddEkv4AGz75p5IspXWD6cOemuh2iQec11xD -X20rs2WZbAcAiUa3nmy8OKYw435vmpj8gp39WYbX/Yx9TymrFFbVY92wYn+quTco -pKklVz0= ------END CERTIFICATE----- diff --git a/vendor/github.com/google/s2a-go/internal/v2/tlsconfigstore/testdata/client_key.pem b/vendor/github.com/google/s2a-go/internal/v2/tlsconfigstore/testdata/client_key.pem deleted file mode 100644 index 55a7f10c74..0000000000 --- a/vendor/github.com/google/s2a-go/internal/v2/tlsconfigstore/testdata/client_key.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEogIBAAKCAQEA44W4i5wftdd+iEbEp3e5H+KFQD8t125H0jyR+lQRurkE63zF -l7n9if1rWjMQdVbpw4BsdufABHy2RKBn+3jZAgDaTvsdZTUmHbGIQiwmK+jeKabj -+Rla5HQ6o+HsyHPGlH+G83CkjmYmwBUFYUxrkq15wVkufJm3AfKWtE3VBfO4us7G -4oW58rdEptMAFJyflFtkv3vof+OB9J5etu3bjY2sigGdV7p9Ft6RurYNDrMUCttA -xSAeMco/RSoGB2vVCYd+L0rK0XLH0FM/eBdadYi75tjv+/uookwcXAYROj50ItZh -68kvfXoect+ECkMx8/xT5i//LU39i+BpI5KURwIDAQABAoIBABgyjo/6iLzUMFbZ -/+w3pW6orrdIgN2akvTfED9pVYFgUA+jc3hRhY95bkNnjuaL2cy7Cc4Tk65mfRQL -Y0OxdJLr+EvSFSxAXM9npDA1ddHRsF8JqtFBSxNk8R+g1Yf0GDiO35Fgd3/ViWWA -VtQkRoSRApP3oiQKTRZd8H04keFR+PvmDk/Lq11l3Kc24A1PevKIPX1oI990ggw9 -9i4uSV+cnuMxmcI9xxJtgwdDFdjr39l2arLOHr4s6LGoV2IOdXHNlv5xRqWUZ0FH -MDHowkLgwDrdSTnNeaVNkce14Gqx+bd4hNaLCdKXMpedBTEmrut3f3hdV1kKjaKt -aqRYr8ECgYEA/YDGZY2jvFoHHBywlqmEMFrrCvQGH51m5R1Ntpkzr+Rh3YCmrpvq -xgwJXING0PUw3dz+xrH5lJICrfNE5Kt3fPu1rAEy+13mYsNowghtUq2Rtu0Hsjjx -2E3Bf8vEB6RNBMmGkUpTTIAroGF5tpJoRvfnWax+k4pFdrKYFtyZdNcCgYEA5cNv -EPltvOobjTXlUmtVP3n27KZN2aXexTcagLzRxE9CV4cYySENl3KuOMmccaZpIl6z -aHk6BT4X+M0LqElNUczrInfVqI+SGAFLGy7W6CJaqSr6cpyFUP/fosKpm6wKGgLq -udHfpvz5rckhKd8kJxFLvhGOK9yN5qpzih0gfhECgYAJfwRvk3G5wYmYpP58dlcs -VIuPenqsPoI3PPTHTU/hW+XKnWIhElgmGRdUrto9Q6IT/Y5RtSMLTLjq+Tzwb/fm -56rziYv2XJsfwgAvnI8z1Kqrto9ePsHYf3krJ1/thVsZPc9bq/QY3ohD1sLvcuaT -GgBBnLOVJU3a12/ZE2RwOwKBgF0csWMAoj8/5IB6if+3ral2xOGsl7oPZVMo/J2V -Z7EVqb4M6rd/pKFugTpUQgkwtkSOekhpcGD1hAN5HTNK2YG/+L5UMAsKe9sskwJm -HgOfAHy0BSDzW3ey6i9skg2bT9Cww+0gJ3Hl7U1HSCBO5LjMYpSZSrNtwzfqdb5Q -BX3xAoGARZdR28Ej3+/+0+fz47Yu2h4z0EI/EbrudLOWY936jIeAVwHckI3+BuqH -qR4poj1gfbnMxNuI9UzIXzjEmGewx9kDZ7IYnvloZKqoVQODO5GlKF2ja6IcMNlh -GCNdD6PSAS6HcmalmWo9sj+1YMkrl+GJikKZqVBHrHNwMGAG67w= ------END RSA PRIVATE KEY----- diff --git a/vendor/github.com/google/s2a-go/internal/v2/tlsconfigstore/testdata/server_cert.pem b/vendor/github.com/google/s2a-go/internal/v2/tlsconfigstore/testdata/server_cert.pem deleted file mode 100644 index 0f98322c72..0000000000 --- a/vendor/github.com/google/s2a-go/internal/v2/tlsconfigstore/testdata/server_cert.pem +++ /dev/null @@ -1,24 +0,0 @@ ------BEGIN CERTIFICATE----- -MIID8TCCAtmgAwIBAgIUKCoDuLtiZXvhsBY2RoDm0ugizJ8wDQYJKoZIhvcNAQEL -BQAwgYcxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTESMBAGA1UEBwwJU3Vubnl2 -YWxlMRAwDgYDVQQKDAdDb21wYW55MREwDwYDVQQLDAhEaXZpc2lvbjEWMBQGA1UE -AwwNczJhX3Rlc3RfY2VydDEaMBgGCSqGSIb3DQEJARYLeHl6QHh5ei5jb20wHhcN -MjIwNTMxMjAwODI1WhcNNDIwNTI2MjAwODI1WjCBhzELMAkGA1UEBhMCVVMxCzAJ -BgNVBAgMAkNBMRIwEAYDVQQHDAlTdW5ueXZhbGUxEDAOBgNVBAoMB0NvbXBhbnkx -ETAPBgNVBAsMCERpdmlzaW9uMRYwFAYDVQQDDA1zMmFfdGVzdF9jZXJ0MRowGAYJ -KoZIhvcNAQkBFgt4eXpAeHl6LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC -AQoCggEBAKK1++PXQ+M3hjYH/v0K4UEYl5ljzpNM1i52eQM+gFooojT87PDSaphT -fs0PXy/PTAjHBEvPhWpOpmQXfJNYzjwcCvg66hbqkv++/VTZiFLAsHagzkEz+FRJ -qT5Eq7G5FLyw1izX1uxyPN7tAEWEEg7eqsiaXD3Cq8+TYN9cjirPeF7RZF8yFCYE -xqvbo+Yc6RL6xw19iXVTfctRgQe581KQuIY5/LXo3dWDEilFdsADAe8XAEcO64es -Ow0g1UvXLnpXSE151kXBFb3sKH/ZjCecDYMCIMEb4sWLSblkSxJ5sNSmXIG4wtr2 -Qnii7CXZgnVYraQE/Jyh+NMQANuoSdMCAwEAAaNTMFEwHQYDVR0OBBYEFAyQQQuM -ab+YUQqjK8dVVOoHVFmXMB8GA1UdIwQYMBaAFAyQQQuMab+YUQqjK8dVVOoHVFmX -MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBADj0vQ6ykWhicoqR -e6VZMwlEJV7/DSvWWKBd9MUjfKye0A4565ya5lmnzP3DiD3nqGe3miqmLsXKDs+X -POqlPXTWIamP7D4MJ32XtSLwZB4ru+I+Ao/P/VngPepoRPQoBnzHe7jww0rokqxl -AZERjlbTUwUAy/BPWPSzSJZ2j0tcs6ZLDNyYzpK4ao8R9/1VmQ92Tcp3feJs1QTg -odRQc3om/AkWOwsll+oyX0UbJeHkFHiLanUPXbdh+/BkSvZJ8ynL+feSDdaurPe+ -PSfnqLtQft9/neecGRdEaQzzzSFVQUVQzTdK1Q7hA7b55b2HvIa3ktDiks+sJsYN -Dhm6uZM= ------END CERTIFICATE----- diff --git a/vendor/github.com/google/s2a-go/internal/v2/tlsconfigstore/testdata/server_key.pem b/vendor/github.com/google/s2a-go/internal/v2/tlsconfigstore/testdata/server_key.pem deleted file mode 100644 index 81afea783d..0000000000 --- a/vendor/github.com/google/s2a-go/internal/v2/tlsconfigstore/testdata/server_key.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpAIBAAKCAQEAorX749dD4zeGNgf+/QrhQRiXmWPOk0zWLnZ5Az6AWiiiNPzs -8NJqmFN+zQ9fL89MCMcES8+Fak6mZBd8k1jOPBwK+DrqFuqS/779VNmIUsCwdqDO -QTP4VEmpPkSrsbkUvLDWLNfW7HI83u0ARYQSDt6qyJpcPcKrz5Ng31yOKs94XtFk -XzIUJgTGq9uj5hzpEvrHDX2JdVN9y1GBB7nzUpC4hjn8tejd1YMSKUV2wAMB7xcA -Rw7rh6w7DSDVS9cueldITXnWRcEVvewof9mMJ5wNgwIgwRvixYtJuWRLEnmw1KZc -gbjC2vZCeKLsJdmCdVitpAT8nKH40xAA26hJ0wIDAQABAoIBACaNR+lsD8G+XiZf -LqN1+HkcAo9tfnyYMAdCOtnx7SdviT9Uzi8hK/B7mAeuJLeHPlS2EuaDfPD7QaFl -jza6S+MiIdc+3kgfvESsVAnOoOY6kZUJ9NSuI6CU82y1iJjLaYZrv9NQMLRFPPb0 -4KOX709mosB1EnXvshW0rbc+jtDFhrm1SxMt+k9TuzmMxjbOeW4LOLXPgU8X1T3Q -Xy0hMZZtcgBs9wFIo8yCtmOixax9pnFE8rRltgDxTodn9LLdz1FieyntNgDksZ0P -nt4kV7Mqly7ELaea+Foaj244mKsesic2e3GhAlMRLun/VSunSf7mOCxfpITB8dp1 -drDhOYECgYEA19151dVxRcviuovN6Dar+QszMTnU8pDJ8BjLFjXjP/hNBBwMTHDE -duMuWk2qnwZqMooI/shxrF/ufmTgS0CFrh2+ANBZu27vWConJNXcyNtdigI4wt50 -L0Y2qcZn2mg67qFXHwoR3QNwrwnPwEjRXA09at9CSRZzcwDQ0ETXhYsCgYEAwPaG -06QdK8Zyly7TTzZJwxzv9uGiqzodmGtX6NEKjgij2JaCxHpukqZBJoqa0jKeK1cm -eNVkOvT5ff9TMzarSHQLr3pZen2/oVLb5gaFkbcJt/klv9Fd+ZRilHY3i6QwS6pD -uMiPOWS4DrLHDRVoVlAZTDjT1RVwwTs+P2NhJdkCgYEAsriXysbxBYyMp05gqEW7 -lHIFbFgpSrs9th+Q5U6wW6JEgYaHWDJ1NslY80MiZI93FWjbkbZ7BvBWESeL3EIL -a+EMErht0pVCbIhZ6FF4foPAqia0wAJVx14mm+G80kNBp5jE/NnleEsE3KcO7nBb -hg8gLn+x7bk81JZ0TDrzBYkCgYEAuQKluv47SeF3tSScTfKLPpvcKCWmxe1uutkQ -7JShPhVioyOMNb39jnYBOWbjkm4d4QgqRuiytSR0oi3QI+Ziy5EYMyNn713qAk9j -r2TJZDDPDKnBW+zt4YI4EohWMXk3JRUW4XDKggjjwJQA7bZ812TtHHvP/xoThfG7 -eSNb3eECgYBw6ssgCtMrdvQiEmjKVX/9yI38mvC2kSGyzbrQnGUfgqRGomRpeZuD -B5E3kysA4td5pT5lvcLgSW0TbOz+YbiriXjwOihPIelCvc9gE2eOUI71/byUWPFz -7u5F/xQ4NaGr5suLF+lBC6h7pSbM4El9lIHQAQadpuEdzHqrw+hs3g== ------END RSA PRIVATE KEY----- diff --git a/vendor/github.com/google/s2a-go/testdata/client_cert.pem b/vendor/github.com/google/s2a-go/testdata/client_cert.pem deleted file mode 100644 index 493a5a2648..0000000000 --- a/vendor/github.com/google/s2a-go/testdata/client_cert.pem +++ /dev/null @@ -1,24 +0,0 @@ ------BEGIN CERTIFICATE----- -MIID8TCCAtmgAwIBAgIUKXNlBRVe6UepjQUijIFPZBd/4qYwDQYJKoZIhvcNAQEL -BQAwgYcxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTESMBAGA1UEBwwJU3Vubnl2 -YWxlMRAwDgYDVQQKDAdDb21wYW55MREwDwYDVQQLDAhEaXZpc2lvbjEWMBQGA1UE -AwwNczJhX3Rlc3RfY2VydDEaMBgGCSqGSIb3DQEJARYLeHl6QHh5ei5jb20wHhcN -MjIwNTMxMjAwMzE1WhcNNDIwNTI2MjAwMzE1WjCBhzELMAkGA1UEBhMCVVMxCzAJ -BgNVBAgMAkNBMRIwEAYDVQQHDAlTdW5ueXZhbGUxEDAOBgNVBAoMB0NvbXBhbnkx -ETAPBgNVBAsMCERpdmlzaW9uMRYwFAYDVQQDDA1zMmFfdGVzdF9jZXJ0MRowGAYJ -KoZIhvcNAQkBFgt4eXpAeHl6LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC -AQoCggEBAOOFuIucH7XXfohGxKd3uR/ihUA/LdduR9I8kfpUEbq5BOt8xZe5/Yn9 -a1ozEHVW6cOAbHbnwAR8tkSgZ/t42QIA2k77HWU1Jh2xiEIsJivo3imm4/kZWuR0 -OqPh7MhzxpR/hvNwpI5mJsAVBWFMa5KtecFZLnyZtwHylrRN1QXzuLrOxuKFufK3 -RKbTABScn5RbZL976H/jgfSeXrbt242NrIoBnVe6fRbekbq2DQ6zFArbQMUgHjHK -P0UqBgdr1QmHfi9KytFyx9BTP3gXWnWIu+bY7/v7qKJMHFwGETo+dCLWYevJL316 -HnLfhApDMfP8U+Yv/y1N/YvgaSOSlEcCAwEAAaNTMFEwHQYDVR0OBBYEFKhAU4nu -0h/lrnggbIGvx4ej0WklMB8GA1UdIwQYMBaAFKhAU4nu0h/lrnggbIGvx4ej0Wkl -MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAE/6NghzQ5fu6yR6 -EHKbj/YMrFdT7aGn5n2sAf7wJ33LIhiFHkpWBsVlm7rDtZtwhe891ZK/P60anlg9 -/P0Ua53tSRVRmCvTnEbXWOVMN4is6MsR7BlmzUxl4AtIn7jbeifEwRL7B4xDYmdA -QrQnsqoz45dLgS5xK4WDqXATP09Q91xQDuhud/b+A4jrvgwFASmL7rMIZbp4f1JQ -nlnl/9VoTBQBvJiWkDUtQDMpRLtauddEkv4AGz75p5IspXWD6cOemuh2iQec11xD -X20rs2WZbAcAiUa3nmy8OKYw435vmpj8gp39WYbX/Yx9TymrFFbVY92wYn+quTco -pKklVz0= ------END CERTIFICATE----- diff --git a/vendor/github.com/google/s2a-go/testdata/client_key.pem b/vendor/github.com/google/s2a-go/testdata/client_key.pem deleted file mode 100644 index 55a7f10c74..0000000000 --- a/vendor/github.com/google/s2a-go/testdata/client_key.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEogIBAAKCAQEA44W4i5wftdd+iEbEp3e5H+KFQD8t125H0jyR+lQRurkE63zF -l7n9if1rWjMQdVbpw4BsdufABHy2RKBn+3jZAgDaTvsdZTUmHbGIQiwmK+jeKabj -+Rla5HQ6o+HsyHPGlH+G83CkjmYmwBUFYUxrkq15wVkufJm3AfKWtE3VBfO4us7G -4oW58rdEptMAFJyflFtkv3vof+OB9J5etu3bjY2sigGdV7p9Ft6RurYNDrMUCttA -xSAeMco/RSoGB2vVCYd+L0rK0XLH0FM/eBdadYi75tjv+/uookwcXAYROj50ItZh -68kvfXoect+ECkMx8/xT5i//LU39i+BpI5KURwIDAQABAoIBABgyjo/6iLzUMFbZ -/+w3pW6orrdIgN2akvTfED9pVYFgUA+jc3hRhY95bkNnjuaL2cy7Cc4Tk65mfRQL -Y0OxdJLr+EvSFSxAXM9npDA1ddHRsF8JqtFBSxNk8R+g1Yf0GDiO35Fgd3/ViWWA -VtQkRoSRApP3oiQKTRZd8H04keFR+PvmDk/Lq11l3Kc24A1PevKIPX1oI990ggw9 -9i4uSV+cnuMxmcI9xxJtgwdDFdjr39l2arLOHr4s6LGoV2IOdXHNlv5xRqWUZ0FH -MDHowkLgwDrdSTnNeaVNkce14Gqx+bd4hNaLCdKXMpedBTEmrut3f3hdV1kKjaKt -aqRYr8ECgYEA/YDGZY2jvFoHHBywlqmEMFrrCvQGH51m5R1Ntpkzr+Rh3YCmrpvq -xgwJXING0PUw3dz+xrH5lJICrfNE5Kt3fPu1rAEy+13mYsNowghtUq2Rtu0Hsjjx -2E3Bf8vEB6RNBMmGkUpTTIAroGF5tpJoRvfnWax+k4pFdrKYFtyZdNcCgYEA5cNv -EPltvOobjTXlUmtVP3n27KZN2aXexTcagLzRxE9CV4cYySENl3KuOMmccaZpIl6z -aHk6BT4X+M0LqElNUczrInfVqI+SGAFLGy7W6CJaqSr6cpyFUP/fosKpm6wKGgLq -udHfpvz5rckhKd8kJxFLvhGOK9yN5qpzih0gfhECgYAJfwRvk3G5wYmYpP58dlcs -VIuPenqsPoI3PPTHTU/hW+XKnWIhElgmGRdUrto9Q6IT/Y5RtSMLTLjq+Tzwb/fm -56rziYv2XJsfwgAvnI8z1Kqrto9ePsHYf3krJ1/thVsZPc9bq/QY3ohD1sLvcuaT -GgBBnLOVJU3a12/ZE2RwOwKBgF0csWMAoj8/5IB6if+3ral2xOGsl7oPZVMo/J2V -Z7EVqb4M6rd/pKFugTpUQgkwtkSOekhpcGD1hAN5HTNK2YG/+L5UMAsKe9sskwJm -HgOfAHy0BSDzW3ey6i9skg2bT9Cww+0gJ3Hl7U1HSCBO5LjMYpSZSrNtwzfqdb5Q -BX3xAoGARZdR28Ej3+/+0+fz47Yu2h4z0EI/EbrudLOWY936jIeAVwHckI3+BuqH -qR4poj1gfbnMxNuI9UzIXzjEmGewx9kDZ7IYnvloZKqoVQODO5GlKF2ja6IcMNlh -GCNdD6PSAS6HcmalmWo9sj+1YMkrl+GJikKZqVBHrHNwMGAG67w= ------END RSA PRIVATE KEY----- diff --git a/vendor/github.com/google/s2a-go/testdata/mds_client_cert.pem b/vendor/github.com/google/s2a-go/testdata/mds_client_cert.pem deleted file mode 100644 index 60c4cf0691..0000000000 --- a/vendor/github.com/google/s2a-go/testdata/mds_client_cert.pem +++ /dev/null @@ -1,19 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDCDCCAfACFFlYsYCFit01ZpYmfjxpo7/6wMEbMA0GCSqGSIb3DQEBCwUAMEgx -CzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEPMA0GA1UECgwGR29vZ2xlMRswGQYD -VQQDDBJ0ZXN0LXMyYS1tdGxzLXJvb3QwHhcNMjMwODIyMTY0NTE4WhcNNDMwODIy -MTY0NTE4WjA5MQswCQYDVQQGEwJVUzELMAkGA1UECAwCQ0ExHTAbBgNVBAMMFHRl -c3QtczJhLW10bHMtY2xpZW50MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC -AQEAqrQQMyxNtmdCB+uY3szgRsfPrKC+TV9Fusnd8PfaCVuGTGcSBKM018nV2TDn -3IYFQ1HgLpGwGwOFDBb3y0o9i2/l2VJySriX1GSNX6nDmVasQlO1wuOLCP7/LRmO -7b6Kise5W0IFhYaptKyWnekn2pS0tAjimqpfn2w0U6FDGtQUqg/trQQmGtTSJHjb -A+OFd0EFC18KGP8Q+jOMaMkJRmpeEiAPyHPDoMhqQNT26RApv9j2Uzo4SuXzHH6T -cAdm1+zG+EXY/UZKX9oDkSbwIJvN+gCmNyORLalJ12gsGYOCjMd8K0mlXBqrmmbO -VHVbUm9062lhE7x59AA8DK4DoQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQCPOvtL -dq2hxFHlIy0YUK8jp/DtwJZPwzx1id5FtWwd0CxBS1StIgmkHMxtkJGz1iyQLplI -je+Msd4sTsb5zZi/8kGKehi8Wj4lghp4oP30cpob41OvM68M9RC/wSOVk9igSww+ -l3zof6wKRIswsi5VHrL16ruIVVoDlyFbKr8yk+cp9OPOV8hNNN7ewY9xC8OgnTt8 -YtdaLe6uTplKBLW+j3GtshigRhyfkGJyPFYL4LAeDJCHlC1qmBnkyP0ijMp6vneM -E8TLavnMTMcpihWTWpyKeRkO6HDRsP4AofQAp7VAiAdSOplga+w2qgrVICV+m8MK -BTq2PBvc59T6OFLq ------END CERTIFICATE----- diff --git a/vendor/github.com/google/s2a-go/testdata/mds_client_key.pem b/vendor/github.com/google/s2a-go/testdata/mds_client_key.pem deleted file mode 100644 index 9d112d1e9f..0000000000 --- a/vendor/github.com/google/s2a-go/testdata/mds_client_key.pem +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCqtBAzLE22Z0IH -65jezOBGx8+soL5NX0W6yd3w99oJW4ZMZxIEozTXydXZMOfchgVDUeAukbAbA4UM -FvfLSj2Lb+XZUnJKuJfUZI1fqcOZVqxCU7XC44sI/v8tGY7tvoqKx7lbQgWFhqm0 -rJad6SfalLS0COKaql+fbDRToUMa1BSqD+2tBCYa1NIkeNsD44V3QQULXwoY/xD6 -M4xoyQlGal4SIA/Ic8OgyGpA1PbpECm/2PZTOjhK5fMcfpNwB2bX7Mb4Rdj9Rkpf -2gORJvAgm836AKY3I5EtqUnXaCwZg4KMx3wrSaVcGquaZs5UdVtSb3TraWETvHn0 -ADwMrgOhAgMBAAECggEAUccupZ1ZY4OHTi0PkNk8rpwFwTFGyeFVEf2ofkr24RnA -NnUAXEllxOUUNlcoFOz9s3kTeavg3qgqgpa0QmdAIb9LMXg+ec6CKkW7trMpGho8 -LxBUWNfSoU4sKEqAvyPT0lWJVo9D/up6/avbAi6TIbOw+Djzel4ZrlHTpabxc3WT -EilXzn4q54b3MzxCQeQjcnzTieW4Q5semG2kLiXFToHIY2di01P/O8awUjgrD+uW -/Cb6H49MnHm9VPkqea1iwZeMQd6Gh5FrC7RezsBjdB1JBcfsv6PFt2ySInjB8SF+ -XR5Gr3Cc5sh9s0LfprZ9Dq0rlSWmwasPMI1COK6SswKBgQDczgeWd3erQ1JX9LEI -wollawqC9y7uJhEsw1hrPqA3uqZYiLUc7Nmi4laZ12mcGoXNDS3R3XmD58qGmGaU -lxEVTb8KDVWBgw450VoBKzSMQnCP6zn4nZxTYxeqMKjDGf6TRB6TZc843qsG3eRC -k91yxrCQ/0HV6PT48C+lieDzLwKBgQDF6aNKiyrswr457undBnM1H8q/Y6xC5ZlK -UtiQdhuyBnicvz0U8WPxBY/8gha0OXWuSnBqq/z77iFVNv/zT6p9K7kM7nBGd8cB -8KO6FNbyaHWFrhCI5zNzRTH4oha0hfvUOoti09vqavCtWD4L+D/63ba1wNLKPO9o -4gWbCnUCLwKBgQC/vus372csgrnvR761LLrEJ8BpGt7WUJh5luoht7DKtHvgRleB -Vu1oVcV+s2Iy/ZVUDC3OIdZ0hcWKPK5YOxfKuEk+IXYvke+4peTTPwHTC59UW6Fs -FPK8N0FFuhvT0a8RlAY5WiAp8rPysp6WcnHMSl7qi8BQUozp4Sp/RsziYQKBgBXv -r4mzoy5a53rEYGd/L4XT4EUWZyGDEVqLlDVu4eL5lKTLDZokp08vrqXuRVX0iHap -CYzJQ2EpI8iuL/BoBB2bmwcz5n3pCMXORld5t9lmeqA2it6hwbIlGUTVsm6P6zm6 -w3hQwy9YaxTLkxUAjxbfPEEo/jQsTNzzMGve3NlBAoGAbgJExpDyMDnaD2Vi5eyr -63b54BsqeLHqxJmADifyRCj7G1SJMm3zMKkNNOS0vsXgoiId973STFf1XQiojiv8 -Slbxyv5rczcY0n3LOuQYcM5OzsjzpNFZsT2dDnMfNRUF3rx3Geu/FuJ9scF1b00r -fVMrcL3jSf/W1Xh4TgtyoU8= ------END PRIVATE KEY----- diff --git a/vendor/github.com/google/s2a-go/testdata/mds_root_cert.pem b/vendor/github.com/google/s2a-go/testdata/mds_root_cert.pem deleted file mode 100644 index 44e436f6ec..0000000000 --- a/vendor/github.com/google/s2a-go/testdata/mds_root_cert.pem +++ /dev/null @@ -1,21 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDcTCCAlmgAwIBAgIUDUkgI+2FZtuUHyUUi0ZBH7JvN00wDQYJKoZIhvcNAQEL -BQAwSDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQ8wDQYDVQQKDAZHb29nbGUx -GzAZBgNVBAMMEnRlc3QtczJhLW10bHMtcm9vdDAeFw0yMzA4MjEyMTI5MTVaFw00 -MzA4MjEyMTI5MTVaMEgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEPMA0GA1UE -CgwGR29vZ2xlMRswGQYDVQQDDBJ0ZXN0LXMyYS1tdGxzLXJvb3QwggEiMA0GCSqG -SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCbFEQfpvla27bATedrN4BAWsI9GSwSnJLW -QWzXcnAk6cKxQBAhnaKHRxHY8ttLhNTtxQeub894CLzJvHE/0xDhuMzjtCCCZ7i2 -r08tKZ1KcEzPJCPNlxlzAXPA45XU3LRlbGvju/PBPhm6n1hCEKTNI/KETJ5DEaYg -Cf2LcXVsl/zW20MwDZ+e2w/9a2a6n6DdpW1ekOR550hXAUOIxvmXRBeYeGLFvp1n -rQgZBhRaxP03UB+PQD2oMi/4mfsS96uGCXdzzX8qV46O8m132HUbnA/wagIwboEe -d7Bx237dERDyHw5GFnll7orgA0FOtoEufXdeQxWVvTjO0+PVPgsvAgMBAAGjUzBR -MB0GA1UdDgQWBBRyMtg/yutV8hw8vOq0i8x0eBQi7DAfBgNVHSMEGDAWgBRyMtg/ -yutV8hw8vOq0i8x0eBQi7DAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUA -A4IBAQArN/gdqWMxd5Rvq2eJMTp6I4RepJOT7Go4sMsRsy1caJqqcoS2EvREDZMN -XNEBcyQBB5kYd6TCcZGoLnEtWYXQ4jjEiXG1g7/+rWxyqw0ZYuP7FWzuHg3Uor/x -fApbEKwptP5ywVc+33h4qreGcqXkVCCn+sAcstGgrqubdGZW2T5gazUMyammOOuN -9IWL1PbvXmgEKD+80NUIrk09zanYyrElGdU/zw/kUbZ3Jf6WUBtJGhTzRQ1qZeKa -VnpCbLoG3vObEB8mxDUAlIzwAtfvw4U32BVIZA8xrocz6OOoAnSW1bTlo3EOIo/G -MTV7jmY9TBPtfhRuO/cG650+F+cw ------END CERTIFICATE----- diff --git a/vendor/github.com/google/s2a-go/testdata/mds_server_cert.pem b/vendor/github.com/google/s2a-go/testdata/mds_server_cert.pem deleted file mode 100644 index 68c6061345..0000000000 --- a/vendor/github.com/google/s2a-go/testdata/mds_server_cert.pem +++ /dev/null @@ -1,21 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDbjCCAlagAwIBAgIUbexZ5sZl86Al9dsI2PkOgtqKnkgwDQYJKoZIhvcNAQEL -BQAwSDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQ8wDQYDVQQKDAZHb29nbGUx -GzAZBgNVBAMMEnRlc3QtczJhLW10bHMtcm9vdDAeFw0yMzA4MjIwMDMyMDRaFw00 -MzA4MjIwMDMyMDRaMDkxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEdMBsGA1UE -AwwUdGVzdC1zMmEtbXRscy1zZXJ2ZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw -ggEKAoIBAQCMEzybsGPqfh92GLwy43mt8kQDF3ztr8y06RwU1hVnY7QqYK4obpvh -HkJVnTz9gwNBF3n5nUalqRzactlf2PCydN9oSYNCO8svVmo7vw1CleKAKFAiV5Qn -H76QlqD15oJreh7nSM8R4qj5KukIHvt0cN0gD6CJQzIURDtsKJwkW3yQjYyT/FAK -GYtFrB6buDn3Eg3Hsw6z7uj7CzLBsSl7BIGrQILbpbI9nFNT3rUTUhXZKY/3UtJA -Ob66AjTmMbD16RGYZR4JsPx6CstheifJ6YSI79r5KgD37zX0jMXFWimvb2SmZmFe -LoohtC8K7uTyjm/dROx6nHXdDt5TQYXHAgMBAAGjXzBdMBsGA1UdEQQUMBKHEAAA -AAAAAAAAAAAAAAAAAAAwHQYDVR0OBBYEFI3i2+tIk6YYn0MIxC0q93jk1VsUMB8G -A1UdIwQYMBaAFHIy2D/K61XyHDy86rSLzHR4FCLsMA0GCSqGSIb3DQEBCwUAA4IB -AQAUhk+s/lrIAULBbU7E22C8f93AzTxE1mhyHGNlfPPJP3t1Dl+h4X4WkFpkz5gT -EcNXB//Vvoq99HbEK5/92sxsIPexKdJBdcggeHXIgLDkOrEZEb0Nnh9eaAuU2QDn -JW44hMB+aF6mEaJvOHE6DRkQw3hwFYFisFKKHtlQ3TyOhw5CHGzSExPZusdSFNIe -2E7V/0QzGPJEFnEFUNe9N8nTH2P385Paoi+5+Iizlp/nztVXfzv0Cj/i+qGgtDUs -HB+gBU2wxMw8eYyuNzACH70wqGR1Parj8/JoyYhx0S4+Gjzy3JH3CcAMaxyfH/dI -4Wcvfz/isxgmH1UqIt3oc6ad ------END CERTIFICATE----- diff --git a/vendor/github.com/google/s2a-go/testdata/mds_server_key.pem b/vendor/github.com/google/s2a-go/testdata/mds_server_key.pem deleted file mode 100644 index b14ad0f724..0000000000 --- a/vendor/github.com/google/s2a-go/testdata/mds_server_key.pem +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCMEzybsGPqfh92 -GLwy43mt8kQDF3ztr8y06RwU1hVnY7QqYK4obpvhHkJVnTz9gwNBF3n5nUalqRza -ctlf2PCydN9oSYNCO8svVmo7vw1CleKAKFAiV5QnH76QlqD15oJreh7nSM8R4qj5 -KukIHvt0cN0gD6CJQzIURDtsKJwkW3yQjYyT/FAKGYtFrB6buDn3Eg3Hsw6z7uj7 -CzLBsSl7BIGrQILbpbI9nFNT3rUTUhXZKY/3UtJAOb66AjTmMbD16RGYZR4JsPx6 -CstheifJ6YSI79r5KgD37zX0jMXFWimvb2SmZmFeLoohtC8K7uTyjm/dROx6nHXd -Dt5TQYXHAgMBAAECggEAIB5zGdIG/yh/Z1GBqfuOFaxFGx5iJ5BVlLAVH9P9IXFz -yPnVRXEjbinFlSMSbqEBeIX9EpcVMXxHIPIP1RIGEy2IYr3kiqXyT771ahDDZh6/ -Spqz0UQatSPqyvW3H9uE0Uc12dvQm23JSCUmPRX5m7gbhDQBIChXzdzdcU4Yi59V -4xmJUvbsAcLw5CBM6kwV+1NGVH9+3mUdhrr9M6B6+sVB/xnaqMGEDfQGiwL8U7EY -QOuc46KXu3Pd/qCdVLn60IrdjSzDJKeC5UZZ+ejNAo+DfbtOovBj3qu3OCUg4XVy -0CDBJ1sTdLvUfF4Gb+crjPsd+qBbXcjVfqdadwhsoQKBgQDBF1Pys/NitW8okJwp -2fiDIASP3TiI+MthWHGyuoZGPvmXQ3H6iuLSm8c/iYI2WPTf53Xff1VcFm1GmQms -GCsYM8Ax94zCeO6Ei1sYYxwcBloEZfOeV37MPA4pjJF4Lt+n5nveNxP+lrsjksJz -wToSEgWPDT1b/xcdt4/5j9J85wKBgQC5tiLx+33mwH4DoaFRmSl0+VuSNYFw6DTQ -SQ+kWqWGH4NENc9wf4Dj2VUZQhpXNhXVSxj+aP2d/ck1NrTJAWqYEXCDtFQOGSa2 -cGPRr+Fhy5NIEaEvR7IXcMBZzx3koYmWVBHricyrXs5FvHrT3N14mGDUG8n24U3f -R799bau0IQKBgQC97UM+lHCPJCWNggiJRgSifcje9VtZp1btjoBvq/bNe74nYkjn -htsrC91Fiu1Qpdlfr50K1IXSyaB886VG6JLjAGxI+dUzqJ38M9LLvxj0G+9JKjsi -AbAQFfZcOg8QZxLJZPVsE0MQhZTXndC06VhEVAOxvPUg214Sde8hK61/+wKBgCRw -O10VhnePT2pw/VEgZ0T/ZFtEylgYB7zSiRIrgwzVBBGPKVueePC8BPmGwdpYz2Hh -cU8B1Ll6QU+Co2hJMdwSl+wPpup5PuJPHRbYlrV0lzpt0x2OyL/WrLcyb2Ab3f40 -EqwPhqwdVwXR3JvTW1U9OMqFhVQ+kuP7lPQMX8NhAoGBAJOgZ7Tokipc4Mi68Olw -SCaOPvjjy4sW2rTRuKyjc1wTAzy7SJ3vXHfGkkN99nTLJFwAyJhWUpnRdwAXGi+x -gyOa95ImsEfRSwEjbluWfF8/P0IU8GR+ZTqT4NnNCOsi8T/xst4Szd1ECJNnnZDe -1ChfPP1AH+/75MJCvu6wQBQv ------END PRIVATE KEY----- diff --git a/vendor/github.com/google/s2a-go/testdata/self_signed_cert.pem b/vendor/github.com/google/s2a-go/testdata/self_signed_cert.pem deleted file mode 100644 index ad1bad5984..0000000000 --- a/vendor/github.com/google/s2a-go/testdata/self_signed_cert.pem +++ /dev/null @@ -1,19 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDITCCAgkCFBS8mLoytMpMWBwpAtnRaq3eIKnsMA0GCSqGSIb3DQEBCwUAME0x -CzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTENMAsGA1UECgwEVGVzdDEiMCAGA1UE -AwwZdGVzdC1zMmEtbXRscy1zZWxmLXNpZ25lZDAeFw0yMzA4MjIyMTE2MDFaFw00 -MzA4MjIyMTE2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTENMAsGA1UE -CgwEVGVzdDEiMCAGA1UEAwwZdGVzdC1zMmEtbXRscy1zZWxmLXNpZ25lZDCCASIw -DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKFFPsYasKZeCFLEXl3RpE/ZOXFe -2lhutIalSpZvCmso+mQGoZ4cHK7At+kDjBi5CrnXkYcw7quQAhHgU0frhWdj7tsW -HUUtq7T8eaGWKBnVD9fl+MjtAl1BmhXwV9qRBbj4EesSKGDSGpKf66dOtzw83JbB -cU7XlPAH1c1zo2GXC1himcZ+SVGHVrOjn4NmeFs8g94/Dke8dWkHwv5YTMVugFK4 -5KxKgSOKkr4ka7PCBzgxCnW4wYSZNRHcxrqkiArO2HAQq0ACr7u+fVDYH//9mP2Z -ADo/zch7O5yhkiNbjXJIRrptDWEuVYMRloYDhT773h7bV/Q0Wo0NQGtasJ8CAwEA -ATANBgkqhkiG9w0BAQsFAAOCAQEAPjbH0TMyegF/MDvglkc0sXr6DqlmTxDCZZmG -lYPZ5Xy062+rxIHghMARbvO4BxepiG37KsP2agvOldm4TtU8nQ8LyswmSIFm4BQ+ -XQWwdsWyYyd8l0d5sXAdaN6AXwy50fvqCepmEqyreMY6dtLzlwo9gVCBFB7QuAPt -Nc14phpEUZt/KPNuY6cUlB7bz3tmnFbwxUrWj1p0KBEYsr7+KEVZxR+z0wtlU7S9 -ZBrmUvx0fq5Ef7JWtHW0w4ofg1op742sdYl+53C26GZ76ts4MmqVz2/94DScgRaU -gT0GLVuuCZXRDVeTXqTb4mditRCfzFPe9cCegYhGhSqBs8yh5A== ------END CERTIFICATE----- diff --git a/vendor/github.com/google/s2a-go/testdata/self_signed_key.pem b/vendor/github.com/google/s2a-go/testdata/self_signed_key.pem deleted file mode 100644 index bcf08e4f12..0000000000 --- a/vendor/github.com/google/s2a-go/testdata/self_signed_key.pem +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQChRT7GGrCmXghS -xF5d0aRP2TlxXtpYbrSGpUqWbwprKPpkBqGeHByuwLfpA4wYuQq515GHMO6rkAIR -4FNH64VnY+7bFh1FLau0/HmhligZ1Q/X5fjI7QJdQZoV8FfakQW4+BHrEihg0hqS -n+unTrc8PNyWwXFO15TwB9XNc6NhlwtYYpnGfklRh1azo5+DZnhbPIPePw5HvHVp -B8L+WEzFboBSuOSsSoEjipK+JGuzwgc4MQp1uMGEmTUR3Ma6pIgKzthwEKtAAq+7 -vn1Q2B///Zj9mQA6P83IezucoZIjW41ySEa6bQ1hLlWDEZaGA4U++94e21f0NFqN -DUBrWrCfAgMBAAECggEAR8e8YwyqJ8KezcgdgIC5M9kp2i4v3UCZFX0or8CI0J2S -pUbWVLuKgLXCpfIwPyjNf15Vpei/spkMcsx4BQDthdFTFSzIpmvni0z9DlD5VFYj -ESOJElV7wepbHPy2/c+izmuL/ic81aturGiFyRgeMq+cN3WuaztFTXkPTrzzsZGF -p/Mx3gqm7Hoc3d2xlv+8L5GjCtEJPlQgZJV+s3ennBjOAd8CC7d9qJetE3Er46pn -r5jedV3bQRZYBzmooYNHjbAs26++wYac/jTE0/U6nKS17eWq4BQZUtlMXUw5N81B -7LKn7C03rj2KCn+Nf5uin9ALmoy888LXCDdvL/NZkQKBgQDduv1Heu+tOZuNYUdQ -Hswmd8sVNAAWGZxdxixHMv58zrgbLFXSX6K89X2l5Sj9XON8TH46MuSFdjSwwWw5 -fBrhVEhA5srcqpvVWIBE05yqPpt0s1NQktMWJKELWlG8jOhVKwM5OYDpdxtwehpz -1g70XJz+nF/LTV8RdTK+OWDDpQKBgQC6MhdbGHUz/56dY3gZpE5TXnN2hkNbZCgk -emr6z85VHhQflZbedhCzB9PUnZnCKWOGQHQdxRTtRfd46LVboZqCdYO1ZNQv6toP -ysS7dTpZZFy7CpQaW0Y6/jS65jW6xIDKR1W40vgltZ3sfpG37JaowpzWdw2WuOnw -Bg0rcJAf8wKBgQCqE+p/z97UwuF8eufWnyj9QNo382E1koOMspv4KTdnyLETtthF -vDH6O1wbykG8xmmASLRyM+NyNA+KnXNETNvZh2q8zctBpGRQK8iIAsGjHM7ln0AD -B/x+ea5GJQuZU4RK/+lDFca6TjBwAFkWDVX/PqL18kDQkxKfM4SuwRhmOQKBgDGh -eoJIsa0LnP787Z2AI3Srf4F/ZmLs/ppCm1OBotEjdF+64v0nYWonUvqgi8SqfaHi -elEZIGvis4ViGj1zhRjzNAlc+AZRxpBhDzGcnNIJI4Kj3jhsTfsZmXqcNIQ1LtM8 -Uogyi/yZPaA1WKg7Aym2vlGYaGHdplXZdxc2KOSrAoGABRkD9l2OVcwK7RyNgFxo -mjxx0tfUdDBhHIi2igih1FiHpeP9E+4/kE/K7PnU9DoDrL1jW1MTpXaYV4seOylk -k9z/9QfcRa9ePD2N4FqbHWSYp5n3aLoIcGq/9jyjTwayZbbIhWO+vNuHE9wIvecZ -8x3gNkxJRb4NaLIoNzAhCoo= ------END PRIVATE KEY----- diff --git a/vendor/github.com/google/s2a-go/testdata/server_cert.pem b/vendor/github.com/google/s2a-go/testdata/server_cert.pem deleted file mode 100644 index 0f98322c72..0000000000 --- a/vendor/github.com/google/s2a-go/testdata/server_cert.pem +++ /dev/null @@ -1,24 +0,0 @@ ------BEGIN CERTIFICATE----- -MIID8TCCAtmgAwIBAgIUKCoDuLtiZXvhsBY2RoDm0ugizJ8wDQYJKoZIhvcNAQEL -BQAwgYcxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTESMBAGA1UEBwwJU3Vubnl2 -YWxlMRAwDgYDVQQKDAdDb21wYW55MREwDwYDVQQLDAhEaXZpc2lvbjEWMBQGA1UE -AwwNczJhX3Rlc3RfY2VydDEaMBgGCSqGSIb3DQEJARYLeHl6QHh5ei5jb20wHhcN -MjIwNTMxMjAwODI1WhcNNDIwNTI2MjAwODI1WjCBhzELMAkGA1UEBhMCVVMxCzAJ -BgNVBAgMAkNBMRIwEAYDVQQHDAlTdW5ueXZhbGUxEDAOBgNVBAoMB0NvbXBhbnkx -ETAPBgNVBAsMCERpdmlzaW9uMRYwFAYDVQQDDA1zMmFfdGVzdF9jZXJ0MRowGAYJ -KoZIhvcNAQkBFgt4eXpAeHl6LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC -AQoCggEBAKK1++PXQ+M3hjYH/v0K4UEYl5ljzpNM1i52eQM+gFooojT87PDSaphT -fs0PXy/PTAjHBEvPhWpOpmQXfJNYzjwcCvg66hbqkv++/VTZiFLAsHagzkEz+FRJ -qT5Eq7G5FLyw1izX1uxyPN7tAEWEEg7eqsiaXD3Cq8+TYN9cjirPeF7RZF8yFCYE -xqvbo+Yc6RL6xw19iXVTfctRgQe581KQuIY5/LXo3dWDEilFdsADAe8XAEcO64es -Ow0g1UvXLnpXSE151kXBFb3sKH/ZjCecDYMCIMEb4sWLSblkSxJ5sNSmXIG4wtr2 -Qnii7CXZgnVYraQE/Jyh+NMQANuoSdMCAwEAAaNTMFEwHQYDVR0OBBYEFAyQQQuM -ab+YUQqjK8dVVOoHVFmXMB8GA1UdIwQYMBaAFAyQQQuMab+YUQqjK8dVVOoHVFmX -MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBADj0vQ6ykWhicoqR -e6VZMwlEJV7/DSvWWKBd9MUjfKye0A4565ya5lmnzP3DiD3nqGe3miqmLsXKDs+X -POqlPXTWIamP7D4MJ32XtSLwZB4ru+I+Ao/P/VngPepoRPQoBnzHe7jww0rokqxl -AZERjlbTUwUAy/BPWPSzSJZ2j0tcs6ZLDNyYzpK4ao8R9/1VmQ92Tcp3feJs1QTg -odRQc3om/AkWOwsll+oyX0UbJeHkFHiLanUPXbdh+/BkSvZJ8ynL+feSDdaurPe+ -PSfnqLtQft9/neecGRdEaQzzzSFVQUVQzTdK1Q7hA7b55b2HvIa3ktDiks+sJsYN -Dhm6uZM= ------END CERTIFICATE----- diff --git a/vendor/github.com/google/s2a-go/testdata/server_key.pem b/vendor/github.com/google/s2a-go/testdata/server_key.pem deleted file mode 100644 index 81afea783d..0000000000 --- a/vendor/github.com/google/s2a-go/testdata/server_key.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpAIBAAKCAQEAorX749dD4zeGNgf+/QrhQRiXmWPOk0zWLnZ5Az6AWiiiNPzs -8NJqmFN+zQ9fL89MCMcES8+Fak6mZBd8k1jOPBwK+DrqFuqS/779VNmIUsCwdqDO -QTP4VEmpPkSrsbkUvLDWLNfW7HI83u0ARYQSDt6qyJpcPcKrz5Ng31yOKs94XtFk -XzIUJgTGq9uj5hzpEvrHDX2JdVN9y1GBB7nzUpC4hjn8tejd1YMSKUV2wAMB7xcA -Rw7rh6w7DSDVS9cueldITXnWRcEVvewof9mMJ5wNgwIgwRvixYtJuWRLEnmw1KZc -gbjC2vZCeKLsJdmCdVitpAT8nKH40xAA26hJ0wIDAQABAoIBACaNR+lsD8G+XiZf -LqN1+HkcAo9tfnyYMAdCOtnx7SdviT9Uzi8hK/B7mAeuJLeHPlS2EuaDfPD7QaFl -jza6S+MiIdc+3kgfvESsVAnOoOY6kZUJ9NSuI6CU82y1iJjLaYZrv9NQMLRFPPb0 -4KOX709mosB1EnXvshW0rbc+jtDFhrm1SxMt+k9TuzmMxjbOeW4LOLXPgU8X1T3Q -Xy0hMZZtcgBs9wFIo8yCtmOixax9pnFE8rRltgDxTodn9LLdz1FieyntNgDksZ0P -nt4kV7Mqly7ELaea+Foaj244mKsesic2e3GhAlMRLun/VSunSf7mOCxfpITB8dp1 -drDhOYECgYEA19151dVxRcviuovN6Dar+QszMTnU8pDJ8BjLFjXjP/hNBBwMTHDE -duMuWk2qnwZqMooI/shxrF/ufmTgS0CFrh2+ANBZu27vWConJNXcyNtdigI4wt50 -L0Y2qcZn2mg67qFXHwoR3QNwrwnPwEjRXA09at9CSRZzcwDQ0ETXhYsCgYEAwPaG -06QdK8Zyly7TTzZJwxzv9uGiqzodmGtX6NEKjgij2JaCxHpukqZBJoqa0jKeK1cm -eNVkOvT5ff9TMzarSHQLr3pZen2/oVLb5gaFkbcJt/klv9Fd+ZRilHY3i6QwS6pD -uMiPOWS4DrLHDRVoVlAZTDjT1RVwwTs+P2NhJdkCgYEAsriXysbxBYyMp05gqEW7 -lHIFbFgpSrs9th+Q5U6wW6JEgYaHWDJ1NslY80MiZI93FWjbkbZ7BvBWESeL3EIL -a+EMErht0pVCbIhZ6FF4foPAqia0wAJVx14mm+G80kNBp5jE/NnleEsE3KcO7nBb -hg8gLn+x7bk81JZ0TDrzBYkCgYEAuQKluv47SeF3tSScTfKLPpvcKCWmxe1uutkQ -7JShPhVioyOMNb39jnYBOWbjkm4d4QgqRuiytSR0oi3QI+Ziy5EYMyNn713qAk9j -r2TJZDDPDKnBW+zt4YI4EohWMXk3JRUW4XDKggjjwJQA7bZ812TtHHvP/xoThfG7 -eSNb3eECgYBw6ssgCtMrdvQiEmjKVX/9yI38mvC2kSGyzbrQnGUfgqRGomRpeZuD -B5E3kysA4td5pT5lvcLgSW0TbOz+YbiriXjwOihPIelCvc9gE2eOUI71/byUWPFz -7u5F/xQ4NaGr5suLF+lBC6h7pSbM4El9lIHQAQadpuEdzHqrw+hs3g== ------END RSA PRIVATE KEY----- diff --git a/vendor/github.com/petermattis/goid/runtime_go1.23.go b/vendor/github.com/petermattis/goid/runtime_go1.23.go index 146d81734a..45da87379f 100644 --- a/vendor/github.com/petermattis/goid/runtime_go1.23.go +++ b/vendor/github.com/petermattis/goid/runtime_go1.23.go @@ -1,5 +1,5 @@ -//go:build gc && go1.23 -// +build gc,go1.23 +//go:build gc && go1.23 && !go1.25 +// +build gc,go1.23,!go1.25 package goid diff --git a/vendor/github.com/petermattis/goid/runtime_go1.25.go b/vendor/github.com/petermattis/goid/runtime_go1.25.go new file mode 100644 index 0000000000..ae3ce8319b --- /dev/null +++ b/vendor/github.com/petermattis/goid/runtime_go1.25.go @@ -0,0 +1,37 @@ +//go:build gc && go1.25 +// +build gc,go1.25 + +package goid + +type stack struct { + lo uintptr + hi uintptr +} + +type gobuf struct { + sp uintptr + pc uintptr + g uintptr + ctxt uintptr + lr uintptr + bp uintptr +} + +type g struct { + stack stack + stackguard0 uintptr + stackguard1 uintptr + + _panic uintptr + _defer uintptr + m uintptr + sched gobuf + syscallsp uintptr + syscallpc uintptr + syscallbp uintptr + stktopsp uintptr + param uintptr + atomicstatus uint32 + stackLock uint32 + goid int64 // Here it is! +} diff --git a/vendor/modules.txt b/vendor/modules.txt index 1bbcf2a56a..e1432a2060 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1050,7 +1050,7 @@ github.com/openzipkin/zipkin-go-opentracing/wire # github.com/oracle/oci-go-sdk v24.3.0+incompatible ## explicit github.com/oracle/oci-go-sdk/common -# github.com/petermattis/goid v0.0.0-20250508124226-395b08cebbdb +# github.com/petermattis/goid v0.0.0-20250904145737-900bdf8bb490 ## explicit; go 1.17 github.com/petermattis/goid # github.com/philhofer/fwd v1.0.0 @@ -1852,7 +1852,7 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.2.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250902085702-cb118fc37e8a +# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250904062553-2e7d040a1d28 ## explicit; go 1.21 yunion.io/x/cloudmux/pkg/apis yunion.io/x/cloudmux/pkg/apis/billing diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/elastic_search_instance_types.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/elastic_search_instance_types.go index 8e371cd4c8..03452be074 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/elastic_search_instance_types.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/elastic_search_instance_types.go @@ -14,36 +14,116 @@ package aliyun -// https://help.aliyun.com/document_detail/132255.html +// https://help.aliyun.com/zh/es/product-overview/node-specifications var esSpec = map[string]struct { VcpuCount int VmemSizeGb int }{ - "elasticsearch.ic5.2xlarge": {VcpuCount: 8, VmemSizeGb: 8}, - "elasticsearch.ic5.3xlarge": {VcpuCount: 12, VmemSizeGb: 12}, - "elasticsearch.ic5.4xlarge": {VcpuCount: 16, VmemSizeGb: 16}, - "elasticsearch.ic5.large": {VcpuCount: 16, VmemSizeGb: 16}, - "elasticsearch.ic5.xlarge": {VcpuCount: 4, VmemSizeGb: 4}, + // 开发测试型规格 + "elasticsearch.t6.large": {VcpuCount: 2, VmemSizeGb: 4}, + + // 云盘型（1:1规格族） + "elasticsearch.ic5.large": {VcpuCount: 2, VmemSizeGb: 2}, + "elasticsearch.ic5.xlarge": {VcpuCount: 4, VmemSizeGb: 4}, + "elasticsearch.ic5.2xlarge": {VcpuCount: 8, VmemSizeGb: 8}, + "elasticsearch.ic5.3xlarge": {VcpuCount: 12, VmemSizeGb: 12}, + "elasticsearch.ic5.4xlarge": {VcpuCount: 16, VmemSizeGb: 16}, + + // 云盘型（1:2规格族） "elasticsearch.n4.small": {VcpuCount: 1, VmemSizeGb: 2}, + "elasticsearch.sn1ne.large": {VcpuCount: 2, VmemSizeGb: 4}, + "elasticsearch.sn1ne.xlarge": {VcpuCount: 4, VmemSizeGb: 8}, "elasticsearch.sn1ne.2xlarge": {VcpuCount: 8, VmemSizeGb: 16}, "elasticsearch.sn1ne.4xlarge": {VcpuCount: 16, VmemSizeGb: 32}, "elasticsearch.sn1ne.8xlarge": {VcpuCount: 32, VmemSizeGb: 64}, - "elasticsearch.sn1ne.large": {VcpuCount: 2, VmemSizeGb: 4}, - "elasticsearch.sn1ne.xlarge": {VcpuCount: 4, VmemSizeGb: 8}, + + // 云盘型（1:4规格族） + "elasticsearch.sn2ne.large": {VcpuCount: 2, VmemSizeGb: 8}, + "elasticsearch.sn2ne.xlarge": {VcpuCount: 4, VmemSizeGb: 16}, "elasticsearch.sn2ne.2xlarge": {VcpuCount: 8, VmemSizeGb: 32}, "elasticsearch.sn2ne.4xlarge": {VcpuCount: 16, VmemSizeGb: 64}, "elasticsearch.sn2ne.8xlarge": {VcpuCount: 32, VmemSizeGb: 128}, - "elasticsearch.sn2ne.large": {VcpuCount: 2, VmemSizeGb: 8}, - "elasticsearch.sn2ne.xlarge": {VcpuCount: 4, VmemSizeGb: 16}, - "elasticsearch.r6.8xlarge": {VcpuCount: 32, VmemSizeGb: 256}, - "elasticsearch.r6.4xlarge": {VcpuCount: 16, VmemSizeGb: 128}, - "elasticsearch.r5.2xlarge": {VcpuCount: 8, VmemSizeGb: 64}, - "elasticsearch.r5.large": {VcpuCount: 2, VmemSizeGb: 16}, - "elasticsearch.r5.xlarge": {VcpuCount: 4, VmemSizeGb: 32}, - "elasticsearch.d1.2xlarge": {VcpuCount: 8, VmemSizeGb: 32}, - "elasticsearch.d1.4xlarge": {VcpuCount: 16, VmemSizeGb: 64}, - "elasticsearch.i2g.2xlarge": {VcpuCount: 8, VmemSizeGb: 32}, - "elasticsearch.i2g.4xlarge": {VcpuCount: 16, VmemSizeGb: 64}, - "elasticsearch.i2g.8xlarge": {VcpuCount: 32, VmemSizeGb: 128}, - "elasticsearch.d2s.5xlarge": {VcpuCount: 20, VmemSizeGb: 88}, + + // 云盘型（1:8规格族） + "elasticsearch.r5.large": {VcpuCount: 2, VmemSizeGb: 16}, + "elasticsearch.r5.xlarge": {VcpuCount: 4, VmemSizeGb: 32}, + "elasticsearch.r5.2xlarge": {VcpuCount: 8, VmemSizeGb: 64}, + "elasticsearch.r6.4xlarge": {VcpuCount: 16, VmemSizeGb: 128}, + "elasticsearch.r6.8xlarge": {VcpuCount: 32, VmemSizeGb: 256}, + + // 大数据型 + "elasticsearch.c6.13xlarge": {VcpuCount: 52, VmemSizeGb: 96}, + + // 新一代云盘型（1:2规格族） + "elasticsearch.sn1ne.large.new": {VcpuCount: 2, VmemSizeGb: 4}, + "elasticsearch.sn1ne.xlarge.new": {VcpuCount: 4, VmemSizeGb: 8}, + "elasticsearch.sn1ne.2xlarge.new": {VcpuCount: 8, VmemSizeGb: 16}, + "elasticsearch.sn1ne.4xlarge.new": {VcpuCount: 16, VmemSizeGb: 32}, + "elasticsearch.sn1ne.8xlarge.new": {VcpuCount: 32, VmemSizeGb: 64}, + + // 新一代云盘型（1:4规格族） + "elasticsearch.sn2ne.large.new": {VcpuCount: 2, VmemSizeGb: 8}, + "elasticsearch.sn2ne.xlarge.new": {VcpuCount: 4, VmemSizeGb: 16}, + "elasticsearch.sn2ne.2xlarge.new": {VcpuCount: 8, VmemSizeGb: 32}, + "elasticsearch.sn2ne.4xlarge.new": {VcpuCount: 16, VmemSizeGb: 64}, + + // 本地SSD盘型 + "elasticsearch.i2g.2xlarge": {VcpuCount: 8, VmemSizeGb: 32}, + "elasticsearch.i2g.4xlarge": {VcpuCount: 16, VmemSizeGb: 64}, + "elasticsearch.i2.4xlarge": {VcpuCount: 16, VmemSizeGb: 128}, + "elasticsearch.i2g.8xlarge": {VcpuCount: 32, VmemSizeGb: 128}, + + // 大数据本地SATA盘型 + "elasticsearch.d1.2xlarge": {VcpuCount: 8, VmemSizeGb: 32}, + "elasticsearch.d1.4xlarge": {VcpuCount: 16, VmemSizeGb: 64}, + + // OpenStore存储型（存算分离型） + "openstore.hybrid.i2.2xlarge": {VcpuCount: 8, VmemSizeGb: 64}, + "openstore.hybrid.i2g.4xlarge": {VcpuCount: 16, VmemSizeGb: 64}, + + // AMD处理器 - 新一代云盘型（1:2规格族） + "elasticsearch.c7a.large": {VcpuCount: 2, VmemSizeGb: 4}, + "elasticsearch.c7a.xlarge": {VcpuCount: 4, VmemSizeGb: 8}, + "elasticsearch.c7a.2xlarge": {VcpuCount: 8, VmemSizeGb: 16}, + "elasticsearch.c7a.4xlarge": {VcpuCount: 16, VmemSizeGb: 32}, + "elasticsearch.c7a.8xlarge": {VcpuCount: 32, VmemSizeGb: 64}, + + // AMD处理器 - 新一代云盘型（1:4规格族） + "elasticsearch.g7a.large": {VcpuCount: 2, VmemSizeGb: 8}, + "elasticsearch.g7a.xlarge": {VcpuCount: 4, VmemSizeGb: 16}, + "elasticsearch.g7a.2xlarge": {VcpuCount: 8, VmemSizeGb: 32}, + "elasticsearch.g7a.4xlarge": {VcpuCount: 16, VmemSizeGb: 64}, + "elasticsearch.g7a.8xlarge": {VcpuCount: 32, VmemSizeGb: 128}, + + // AMD处理器 - 新一代云盘型（1:8规格族） + "elasticsearch.r7a.large": {VcpuCount: 2, VmemSizeGb: 16}, + "elasticsearch.r7a.xlarge": {VcpuCount: 4, VmemSizeGb: 32}, + "elasticsearch.r7a.2xlarge": {VcpuCount: 8, VmemSizeGb: 64}, + "elasticsearch.r7a.4xlarge": {VcpuCount: 16, VmemSizeGb: 128}, + "elasticsearch.r7a.8xlarge": {VcpuCount: 32, VmemSizeGb: 256}, + + // 新一代云盘型（1:2计算型-Turbo-1） + "elasticsearch.turbo1.ca.large": {VcpuCount: 2, VmemSizeGb: 4}, + "elasticsearch.turbo1.ca.xlarge": {VcpuCount: 4, VmemSizeGb: 8}, + "elasticsearch.turbo1.ca.2xlarge": {VcpuCount: 8, VmemSizeGb: 16}, + "elasticsearch.turbo1.ca.4xlarge": {VcpuCount: 16, VmemSizeGb: 32}, + "elasticsearch.turbo1.ca.8xlarge": {VcpuCount: 32, VmemSizeGb: 64}, + "elasticsearch.turbo1.ca.16xlarge": {VcpuCount: 64, VmemSizeGb: 128}, + + // 新一代云盘型（1:4通用型-Turbo-1） + "elasticsearch.turbo1.ga.large": {VcpuCount: 2, VmemSizeGb: 8}, + "elasticsearch.turbo1.ga.xlarge": {VcpuCount: 4, VmemSizeGb: 16}, + "elasticsearch.turbo1.ga.2xlarge": {VcpuCount: 8, VmemSizeGb: 32}, + "elasticsearch.turbo1.ga.4xlarge": {VcpuCount: 16, VmemSizeGb: 64}, + "elasticsearch.turbo1.ga.8xlarge": {VcpuCount: 32, VmemSizeGb: 128}, + + // 新一代云盘型（1:8内存型-Turbo-1） + "elasticsearch.turbo1.ra.large": {VcpuCount: 2, VmemSizeGb: 16}, + "elasticsearch.turbo1.ra.xlarge": {VcpuCount: 4, VmemSizeGb: 32}, + "elasticsearch.turbo1.ra.2xlarge": {VcpuCount: 8, VmemSizeGb: 64}, + "elasticsearch.turbo1.ra.4xlarge": {VcpuCount: 16, VmemSizeGb: 128}, + "elasticsearch.turbo1.ra.8xlarge": {VcpuCount: 32, VmemSizeGb: 256}, + + // 保留原有的d2s规格（如果仍在使用） + "elasticsearch.d2s.5xlarge": {VcpuCount: 20, VmemSizeGb: 88}, } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/instance.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/instance.go index fb69270363..c0d6ca540d 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/instance.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/instance.go @@ -253,8 +253,6 @@ func (self *SInstance) GetIDisks() ([]cloudprovider.ICloudDisk, error) { sort.Sort(byAttachedTime(disks)) - log.Debugf("%s", jsonutils.Marshal(&disks)) - idisks := make([]cloudprovider.ICloudDisk, len(disks)) for i := 0; i < len(disks); i += 1 { store, err := self.host.zone.getStorageByCategory(disks[i].Category) diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/dbinstance.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/dbinstance.go index 684bd05b3f..eb400bd102 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/dbinstance.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/dbinstance.go @@ -169,6 +169,21 @@ func (rds *SDBInstance) GetMasterInstanceId() string { } func (self *SDBInstance) GetCategory() string { + if len(self.DBClusterIdentifier) > 0 { + cluster, err := self.region.GetDBInstanceCluster(self.DBClusterIdentifier) + if err != nil { + return api.AWS_DBINSTANCE_CATEGORY_GENERAL_PURPOSE + } + for _, member := range cluster.DBClusterMembers { + if member.DBInstanceIdentifier == self.DBInstanceIdentifier { + if member.IsClusterWriter { + return api.AWS_DBINSTANCE_CATEGORY_MASTER + } + return api.AWS_DBINSTANCE_CATEGORY_SLAVE + } + } + return api.AWS_DBINSTANCE_CATEGORY_GENERAL_PURPOSE + } switch self.Engine { case "aurora", "aurora-mysql": return api.DBINSTANCE_TYPE_MYSQL @@ -184,20 +199,6 @@ func (self *SDBInstance) GetCategory() string { return api.AWS_DBINSTANCE_CATEGORY_EXPRESS_EDITION case "sqlserver-web": return api.AWS_DBINSTANCE_CATEGORY_WEB_EDITION - case "docdb": - cluster, err := self.region.GetDBInstanceCluster(self.DBClusterIdentifier) - if err != nil { - return api.AWS_DBINSTANCE_CATEGORY_GENERAL_PURPOSE - } - for _, member := range cluster.DBClusterMembers { - if member.DBInstanceIdentifier == self.DBInstanceIdentifier { - if member.IsClusterWriter { - return api.AWS_DBINSTANCE_CATEGORY_MASTER - } - return api.AWS_DBINSTANCE_CATEGORY_SLAVE - } - } - return api.AWS_DBINSTANCE_CATEGORY_GENERAL_PURPOSE default: if strings.HasPrefix(self.DBInstanceClass, "db.r") || strings.HasPrefix(self.DBInstanceClass, "db.x") || strings.HasPrefix(self.DBInstanceClass, "db.d") { return api.AWS_DBINSTANCE_CATEGORY_MEMORY_OPTIMIZED diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/google/dbinstance.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/google/dbinstance.go index 23b109256d..d00e9b1723 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/google/dbinstance.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/google/dbinstance.go @@ -35,13 +35,18 @@ import ( var ( EngineVersions = map[string]GoogleSQLVersion{ - "MYSQL_5_5": GoogleSQLVersion{Engine: api.DBINSTANCE_TYPE_MYSQL, Version: "5.5"}, - "MYSQL_5_6": GoogleSQLVersion{Engine: api.DBINSTANCE_TYPE_MYSQL, Version: "5.6"}, - "MYSQL_5_7": GoogleSQLVersion{Engine: api.DBINSTANCE_TYPE_MYSQL, Version: "5.7"}, - "POSTGRES_9_6": GoogleSQLVersion{Engine: api.DBINSTANCE_TYPE_POSTGRESQL, Version: "9.6"}, - "POSTGRES_10": GoogleSQLVersion{Engine: api.DBINSTANCE_TYPE_POSTGRESQL, Version: "10"}, - "POSTGRES_11": GoogleSQLVersion{Engine: api.DBINSTANCE_TYPE_POSTGRESQL, Version: "11"}, - "POSTGRES_12": GoogleSQLVersion{Engine: api.DBINSTANCE_TYPE_POSTGRESQL, Version: "12"}, + "MYSQL_5_5": GoogleSQLVersion{Engine: api.DBINSTANCE_TYPE_MYSQL, Version: "5.5"}, + "MYSQL_5_6": GoogleSQLVersion{Engine: api.DBINSTANCE_TYPE_MYSQL, Version: "5.6"}, + "MYSQL_5_7": GoogleSQLVersion{Engine: api.DBINSTANCE_TYPE_MYSQL, Version: "5.7"}, + "MYSQL_8_0_41": GoogleSQLVersion{Engine: api.DBINSTANCE_TYPE_MYSQL, Version: "8.0"}, + "MYSQL_8_0_40": GoogleSQLVersion{Engine: api.DBINSTANCE_TYPE_MYSQL, Version: "8.0"}, + + "POSTGRES_9_6": GoogleSQLVersion{Engine: api.DBINSTANCE_TYPE_POSTGRESQL, Version: "9.6"}, + "POSTGRES_10": GoogleSQLVersion{Engine: api.DBINSTANCE_TYPE_POSTGRESQL, Version: "10"}, + "POSTGRES_11": GoogleSQLVersion{Engine: api.DBINSTANCE_TYPE_POSTGRESQL, Version: "11"}, + "POSTGRES_12": GoogleSQLVersion{Engine: api.DBINSTANCE_TYPE_POSTGRESQL, Version: "12"}, + "POSTGRES_14": GoogleSQLVersion{Engine: api.DBINSTANCE_TYPE_POSTGRESQL, Version: "14"}, + "SQLSERVER_2017_STANDARD": GoogleSQLVersion{Engine: api.DBINSTANCE_TYPE_SQLSERVER, Version: "2017 Standard"}, "SQLSERVER_2017_ENTERPRISE": GoogleSQLVersion{Engine: api.DBINSTANCE_TYPE_SQLSERVER, Version: "2017 Enterprise"}, "SQLSERVER_2017_EXPRESS": GoogleSQLVersion{Engine: api.DBINSTANCE_TYPE_SQLSERVER, Version: "2017 Express"}, @@ -265,6 +270,15 @@ func (rds *SDBInstance) GetEngine() string { if e, ok := EngineVersions[rds.DatabaseVersion]; ok { return e.Engine } + if strings.Contains(rds.DatabaseVersion, "MYSQL") { + return api.DBINSTANCE_TYPE_MYSQL + } + if strings.Contains(rds.DatabaseVersion, "POSTGRES") { + return api.DBINSTANCE_TYPE_POSTGRESQL + } + if strings.Contains(rds.DatabaseVersion, "SQLSERVER") { + return api.DBINSTANCE_TYPE_SQLSERVER + } return rds.DatabaseVersion } @@ -272,7 +286,11 @@ func (rds *SDBInstance) GetEngineVersion() string { if e, ok := EngineVersions[rds.DatabaseVersion]; ok { return e.Version } - return rds.DatabaseVersion + version := strings.TrimPrefix(rds.DatabaseVersion, "MYSQL_") + version = strings.TrimPrefix(version, "POSTGRES_") + version = strings.TrimPrefix(version, "SQLSERVER_") + version = strings.ReplaceAll(version, "_", ".") + return version } func (rds *SDBInstance) GetInstanceType() string { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/rds_mysql.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/rds_mysql.go index 95ab931387..53b1e798a2 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/rds_mysql.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/rds_mysql.go @@ -154,6 +154,7 @@ type SMySQLInstance struct { VpcId int Vport int WanDomain string + DiskType string WanPort int WanStatus int Zone string @@ -354,6 +355,9 @@ func (self *SMySQLInstance) GetCategory() string { } func (self *SMySQLInstance) GetStorageType() string { + if len(self.DiskType) > 0 { + return strings.ToLower(self.DiskType) + } switch self.DeviceType { case "BASIC": return api.QCLOUD_DBINSTANCE_STORAGE_TYPE_CLOUD_SSD