From ee617095efa1171548cf52fd45f0f98a368555a3 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Fri, 30 Aug 2024 18:50:53 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E9=83=A8=E7=BD=B2=E6=8F=92=E4=BB=B6?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=AE=9D=E5=A1=94=E3=80=81=E6=98=93=E7=9B=BE?= =?UTF-8?q?=E4=BA=91=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/core/acme-client/src/auto.js | 78 ++++++++++--------- .../core/pipeline/src/core/run-history.ts | 2 +- packages/core/pipeline/src/plugin/api.ts | 2 + .../core/pipeline/src/utils/util.request.ts | 60 +++++++------- .../ui/certd-server/.env.development.yaml | 5 +- packages/ui/certd-server/package.json | 1 + .../controller/permission-controller.ts | 2 +- .../authority/controller/role-controller.ts | 16 +--- .../authority/controller/user-controller.ts | 2 +- .../controller/user-settings-controller.ts | 4 +- .../pipeline/controller/access-controller.ts | 6 +- .../controller/dns-provider-controller.ts | 2 +- .../pipeline/controller/history-controller.ts | 12 +-- .../controller/pipeline-controller.ts | 8 +- .../pipeline/controller/plugin-controller.ts | 4 +- .../pipeline/service/access-service.ts | 2 +- .../pipeline/service/history-service.ts | 2 +- .../controller/sys-settings-controller.ts | 4 +- packages/ui/certd-server/src/plugins/index.ts | 1 + .../dns-provider/tencent-dns-provider.ts | 4 +- .../plugin/deploy-to-clb/index.ts | 8 +- .../plugin/deploy-to-tke-ingress/index.ts | 7 +- 22 files changed, 120 insertions(+), 112 deletions(-) diff --git a/packages/core/acme-client/src/auto.js b/packages/core/acme-client/src/auto.js index 749f7a932..193a72ebc 100644 --- a/packages/core/acme-client/src/auto.js +++ b/packages/core/acme-client/src/auto.js @@ -13,8 +13,12 @@ const defaultOpts = { termsOfServiceAgreed: false, skipChallengeVerification: false, challengePriority: ['http-01', 'dns-01'], - challengeCreateFn: async () => { throw new Error('Missing challengeCreateFn()'); }, - challengeRemoveFn: async () => { throw new Error('Missing challengeRemoveFn()'); }, + challengeCreateFn: async () => { + throw new Error('Missing challengeCreateFn()'); + }, + challengeRemoveFn: async () => { + throw new Error('Missing challengeRemoveFn()'); + }, }; /** @@ -209,6 +213,7 @@ module.exports = async (client, userOpts) => { } log(`[auto] challengeGroups:${allChallengePromises.length}`); + function runAllPromise(tasks) { let promise = Promise.resolve(); tasks.forEach((task) => { @@ -228,47 +233,48 @@ module.exports = async (client, userOpts) => { return Promise.all(results); } - try { - log(`开始challenge，共${allChallengePromises.length}组`); - let i = 0; - // eslint-disable-next-line no-restricted-syntax - for (const challengePromises of allChallengePromises) { - i += 1; - log(`开始第${i}组`); - if (opts.signal && opts.signal.aborted) { - throw new Error('用户取消'); - } + log(`开始challenge，共${allChallengePromises.length}组`); + let i = 0; + // eslint-disable-next-line no-restricted-syntax + for (const challengePromises of allChallengePromises) { + i += 1; + log(`开始第${i}组`); + if (opts.signal && opts.signal.aborted) { + throw new Error('用户取消'); + } + + try { // eslint-disable-next-line no-await-in-loop await runPromisePa(challengePromises); } - log('challenge结束'); - - // log('[auto] Waiting for challenge valid status'); - // await Promise.all(challengePromises); - - /** - * Finalize order and download certificate - */ - - log('[auto] Finalizing order and downloading certificate'); - const finalized = await client.finalizeOrder(order, opts.csr); - return await client.getCertificate(finalized, opts.preferredChain); - } - catch (e) { - log(`证书申请失败${e.message}`); - throw e; - } - finally { - log(`清理challenge痕迹，length:${clearTasks.length}`); - try { - await runAllPromise(clearTasks); - } catch (e) { - log('清理challenge失败'); - log(e); + log(`证书申请失败${e.message}`); + throw e; + } + finally { + log(`清理challenge痕迹，length:${clearTasks.length}`); + try { + // eslint-disable-next-line no-await-in-loop + await runAllPromise(clearTasks); + } + catch (e) { + log('清理challenge失败'); + log(e); + } } } + log('challenge结束'); + // log('[auto] Waiting for challenge valid status'); + // await Promise.all(challengePromises); + /** + * Finalize order and download certificate + */ + + log('[auto] Finalizing order and downloading certificate'); + const finalized = await client.finalizeOrder(order, opts.csr); + const res = await client.getCertificate(finalized, opts.preferredChain); + return res; // try { // await Promise.allSettled(challengePromises); // } diff --git a/packages/core/pipeline/src/core/run-history.ts b/packages/core/pipeline/src/core/run-history.ts index 8288a362e..a3f634820 100644 --- a/packages/core/pipeline/src/core/run-history.ts +++ b/packages/core/pipeline/src/core/run-history.ts @@ -109,7 +109,7 @@ export class RunHistory { logError(runnable: Runnable, e: Error) { // @ts-ignore - this._loggers[runnable.id].error(`[${runnable.title}] [${runnable.runnableType}]`, e); + this._loggers[runnable.id].error(`[${runnable.title}] [${runnable.runnableType}]`, e.stack); } finally(runnable: Runnable) { diff --git a/packages/core/pipeline/src/plugin/api.ts b/packages/core/pipeline/src/plugin/api.ts index edc5b3b29..71ff2b3bc 100644 --- a/packages/core/pipeline/src/plugin/api.ts +++ b/packages/core/pipeline/src/plugin/api.ts @@ -40,6 +40,8 @@ export type PluginDefine = Registrable & { dest: string; type: "computed"; }[]; + + needPlus?: boolean; }; export type ITaskPlugin = { diff --git a/packages/core/pipeline/src/utils/util.request.ts b/packages/core/pipeline/src/utils/util.request.ts index 58e7ce353..70632ae52 100644 --- a/packages/core/pipeline/src/utils/util.request.ts +++ b/packages/core/pipeline/src/utils/util.request.ts @@ -1,8 +1,31 @@ import axios from "axios"; -// @ts-ignore -import qs from "qs"; import { logger } from "./util.log.js"; import { Logger } from "log4js"; + +export class HttpError extends Error { + request?: { url: string; method: string; data?: any }; + response?: { data: any }; + status?: number; + statusText?: string; + constructor(error: any) { + if (!error) { + return; + } + super(error.message); + this.name = error.name; + this.stack = error.stack; + this.status = error?.response?.status; + this.statusText = error?.response?.statusText; + this.request = { + url: error?.response?.config?.url, + method: error?.response?.config?.method, + data: error?.response?.config?.data, + }; + this.response = { + data: error?.response?.data, + }; + } +} /** * @description 创建请求实例 */ @@ -12,13 +35,6 @@ export function createAxiosService({ logger }: { logger: Logger }) { // 请求拦截 service.interceptors.request.use( (config: any) => { - if (config.formData) { - config.data = qs.stringify(config.formData, { - arrayFormat: "indices", - allowDots: true, - }); // 序列化请求参数 - delete config.formData; - } logger.info(`http request:${config.url}，method:${config.method}`); return config; }, @@ -50,26 +66,12 @@ export function createAxiosService({ logger }: { logger: Logger }) { // case 505: error.message = 'HTTP版本不受支持'; break // default: break // } - logger.error(`请求出错：url:${error?.response?.config.url},method:${error?.response?.config?.method},status:${error?.response?.status}`); - logger.info("返回数据:", JSON.stringify(error?.response?.data)); - delete error.config; - const data = error?.response?.data; - if (!data) { - error.message = data.message || data.msg || data.error || data; - } - if (error?.response) { - return Promise.reject({ - status: error?.response?.status, - statusText: error?.response?.statusText, - request: { - url: error?.response?.config?.url, - method: error?.response?.config?.method, - data: error?.response?.data, - }, - data: error?.response?.data, - }); - } - return Promise.reject(error); + logger.error( + `请求出错：status:${error?.response?.status},statusText:${error?.response?.statusText},url:${error?.config?.url},method:${error?.config?.method}。` + ); + logger.error("返回数据:", JSON.stringify(error?.response?.data)); + const err = new HttpError(error); + return Promise.reject(err); } ); return service; diff --git a/packages/ui/certd-server/.env.development.yaml b/packages/ui/certd-server/.env.development.yaml index 62d9e6794..1736ab034 100644 --- a/packages/ui/certd-server/.env.development.yaml +++ b/packages/ui/certd-server/.env.development.yaml @@ -1,6 +1,9 @@ koa: port: 7001 +#plus: +# server: +# baseUrl: 'http://127.0.0.1:11007' plus: server: - baseUrl: 'http://127.0.0.1:11007' + baseUrl: 'https://api.ai.handsfree.work' diff --git a/packages/ui/certd-server/package.json b/packages/ui/certd-server/package.json index 157d295f5..43c4d9aeb 100644 --- a/packages/ui/certd-server/package.json +++ b/packages/ui/certd-server/package.json @@ -28,6 +28,7 @@ "@certd/midway-flyway-js": "^1.22.6", "@certd/pipeline": "^1.24.0", "@certd/plugin-cert": "^1.24.0", + "@certd/plugin-plus": "^1.24.0", "@koa/cors": "^3.4.3", "@midwayjs/bootstrap": "^3.16.2", "@midwayjs/cache": "^3.14.0", diff --git a/packages/ui/certd-server/src/modules/authority/controller/permission-controller.ts b/packages/ui/certd-server/src/modules/authority/controller/permission-controller.ts index 0b678299b..b633639b6 100644 --- a/packages/ui/certd-server/src/modules/authority/controller/permission-controller.ts +++ b/packages/ui/certd-server/src/modules/authority/controller/permission-controller.ts @@ -49,7 +49,7 @@ export class PermissionController extends CrudController { @Post('/delete', { summary: 'sys:auth:per:remove' }) async delete( @Query('id') - id + id : number ) { return await super.delete(id); } diff --git a/packages/ui/certd-server/src/modules/authority/controller/role-controller.ts b/packages/ui/certd-server/src/modules/authority/controller/role-controller.ts index 6b4d0daf7..014cf6335 100644 --- a/packages/ui/certd-server/src/modules/authority/controller/role-controller.ts +++ b/packages/ui/certd-server/src/modules/authority/controller/role-controller.ts @@ -1,12 +1,4 @@ -import { - ALL, - Body, - Controller, - Inject, - Post, - Provide, - Query, -} from '@midwayjs/core'; +import { ALL, Body, Controller, Inject, Post, Provide, Query } from '@midwayjs/core'; import { CrudController } from '../../../basic/crud-controller.js'; import { RoleService } from '../service/role-service.js'; @@ -55,7 +47,7 @@ export class RoleController extends CrudController { @Post('/delete', { summary: 'sys:auth:role:remove' }) async delete( @Query('id') - id + id: number ) { return await super.delete(id); } @@ -63,7 +55,7 @@ export class RoleController extends CrudController { @Post('/getPermissionTree', { summary: 'sys:auth:role:view' }) async getPermissionTree( @Query('id') - id + id: number ) { const ret = await this.service.getPermissionTreeByRoleId(id); return this.ok(ret); @@ -72,7 +64,7 @@ export class RoleController extends CrudController { @Post('/getPermissionIds', { summary: 'sys:auth:role:view' }) async getPermissionIds( @Query('id') - id + id: number ) { const ret = await this.service.getPermissionIdsByRoleId(id); return this.ok(ret); diff --git a/packages/ui/certd-server/src/modules/authority/controller/user-controller.ts b/packages/ui/certd-server/src/modules/authority/controller/user-controller.ts index 8e535d541..edfba457b 100644 --- a/packages/ui/certd-server/src/modules/authority/controller/user-controller.ts +++ b/packages/ui/certd-server/src/modules/authority/controller/user-controller.ts @@ -73,7 +73,7 @@ export class UserController extends CrudController { @Post('/delete', { summary: 'sys:auth:user:remove' }) async delete( @Query('id') - id + id : number ) { return await super.delete(id); } diff --git a/packages/ui/certd-server/src/modules/mine/controller/user-settings-controller.ts b/packages/ui/certd-server/src/modules/mine/controller/user-settings-controller.ts index 509ec9aa3..a2798e1f0 100644 --- a/packages/ui/certd-server/src/modules/mine/controller/user-settings-controller.ts +++ b/packages/ui/certd-server/src/modules/mine/controller/user-settings-controller.ts @@ -49,13 +49,13 @@ export class UserSettingsController extends CrudController return super.update(bean); } @Post('/info', { summary: Constants.per.authOnly }) - async info(@Query('id') id) { + async info(@Query('id') id: number) { await this.service.checkUserId(id, this.ctx.user.id); return super.info(id); } @Post('/delete', { summary: Constants.per.authOnly }) - async delete(@Query('id') id) { + async delete(@Query('id') id: number) { await this.service.checkUserId(id, this.ctx.user.id); return super.delete(id); } diff --git a/packages/ui/certd-server/src/modules/pipeline/controller/access-controller.ts b/packages/ui/certd-server/src/modules/pipeline/controller/access-controller.ts index 42f6b6d3f..fab6be151 100644 --- a/packages/ui/certd-server/src/modules/pipeline/controller/access-controller.ts +++ b/packages/ui/certd-server/src/modules/pipeline/controller/access-controller.ts @@ -41,19 +41,19 @@ export class AccessController extends CrudController { return super.update(bean); } @Post('/info', { summary: Constants.per.authOnly }) - async info(@Query('id') id) { + async info(@Query('id') id: number) { await this.service.checkUserId(id, this.ctx.user.id); return super.info(id); } @Post('/delete', { summary: Constants.per.authOnly }) - async delete(@Query('id') id) { + async delete(@Query('id') id: number) { await this.service.checkUserId(id, this.ctx.user.id); return super.delete(id); } @Post('/define', { summary: Constants.per.authOnly }) - async define(@Query('type') type) { + async define(@Query('type') type:string) { const access = this.service.getDefineByType(type); return this.ok(access); } diff --git a/packages/ui/certd-server/src/modules/pipeline/controller/dns-provider-controller.ts b/packages/ui/certd-server/src/modules/pipeline/controller/dns-provider-controller.ts index e7e241c72..5b00abce5 100644 --- a/packages/ui/certd-server/src/modules/pipeline/controller/dns-provider-controller.ts +++ b/packages/ui/certd-server/src/modules/pipeline/controller/dns-provider-controller.ts @@ -13,7 +13,7 @@ export class DnsProviderController extends BaseController { service: DnsProviderService; @Post('/list', { summary: Constants.per.authOnly }) - async list(@Query(ALL) query) { + async list(@Query(ALL) query:any) { query.userId = this.ctx.user.id; const list = this.service.getList(); return this.ok(list); diff --git a/packages/ui/certd-server/src/modules/pipeline/controller/history-controller.ts b/packages/ui/certd-server/src/modules/pipeline/controller/history-controller.ts index 070e16750..c26e85832 100644 --- a/packages/ui/certd-server/src/modules/pipeline/controller/history-controller.ts +++ b/packages/ui/certd-server/src/modules/pipeline/controller/history-controller.ts @@ -99,14 +99,14 @@ export class HistoryController extends CrudController { } @Post('/delete', { summary: Constants.per.authOnly }) - async delete(@Query('id') id) { + async delete(@Query('id') id: number) { await this.authService.checkEntityUserId(this.ctx, this.getService(), id); await super.delete(id); return this.ok(); } @Post('/deleteByIds', { summary: Constants.per.authOnly }) - async deleteByIds(@Body(ALL) body) { + async deleteByIds(@Body(ALL) body: any) { await this.authService.checkEntityUserId(this.ctx, this.getService(), body.ids); const isAdmin = await this.authService.isAdmin(this.ctx); const userId = isAdmin ? null : this.ctx.user.id; @@ -115,21 +115,21 @@ export class HistoryController extends CrudController { } @Post('/detail', { summary: Constants.per.authOnly }) - async detail(@Query('id') id) { + async detail(@Query('id') id: number) { await this.authService.checkEntityUserId(this.ctx, this.getService(), id); const detail = await this.service.detail(id); return this.ok(detail); } @Post('/logs', { summary: Constants.per.authOnly }) - async logs(@Query('id') id) { + async logs(@Query('id') id: number) { await this.authService.checkEntityUserId(this.ctx, this.logService, id); const logInfo = await this.logService.info(id); return this.ok(logInfo); } @Post('/files', { summary: Constants.per.authOnly }) - async files(@Query('pipelineId') pipelineId, @Query('historyId') historyId) { + async files(@Query('pipelineId') pipelineId: number, @Query('historyId') historyId: number) { await this.authService.checkEntityUserId(this.ctx, this.service, historyId); const files = await this.getFiles(historyId, pipelineId); return this.ok(files); @@ -153,7 +153,7 @@ export class HistoryController extends CrudController { } @Get('/download', { summary: Constants.per.authOnly }) - async download(@Query('pipelineId') pipelineId, @Query('historyId') historyId, @Query('fileId') fileId) { + async download(@Query('pipelineId') pipelineId: number, @Query('historyId') historyId: number, @Query('fileId') fileId: string) { await this.authService.checkEntityUserId(this.ctx, this.service, historyId); const files = await this.getFiles(historyId, pipelineId); const file = files.find(f => f.id === fileId); diff --git a/packages/ui/certd-server/src/modules/pipeline/controller/pipeline-controller.ts b/packages/ui/certd-server/src/modules/pipeline/controller/pipeline-controller.ts index fb93e7f2b..5d9fe591d 100644 --- a/packages/ui/certd-server/src/modules/pipeline/controller/pipeline-controller.ts +++ b/packages/ui/certd-server/src/modules/pipeline/controller/pipeline-controller.ts @@ -73,28 +73,28 @@ export class PipelineController extends CrudController { } @Post('/delete', { summary: Constants.per.authOnly }) - async delete(@Query('id') id) { + async delete(@Query('id') id: number) { await this.authService.checkEntityUserId(this.ctx, this.getService(), id); await this.service.delete(id); return this.ok({}); } @Post('/detail', { summary: Constants.per.authOnly }) - async detail(@Query('id') id) { + async detail(@Query('id') id: number) { await this.authService.checkEntityUserId(this.ctx, this.getService(), id); const detail = await this.service.detail(id); return this.ok(detail); } @Post('/trigger', { summary: Constants.per.authOnly }) - async trigger(@Query('id') id) { + async trigger(@Query('id') id: number) { await this.authService.checkEntityUserId(this.ctx, this.getService(), id); await this.service.trigger(id); return this.ok({}); } @Post('/cancel', { summary: Constants.per.authOnly }) - async cancel(@Query('historyId') historyId) { + async cancel(@Query('historyId') historyId: number) { await this.authService.checkEntityUserId(this.ctx, this.historyService, historyId); await this.service.cancel(historyId); return this.ok({}); diff --git a/packages/ui/certd-server/src/modules/pipeline/controller/plugin-controller.ts b/packages/ui/certd-server/src/modules/pipeline/controller/plugin-controller.ts index d6f397501..b3ad3bf35 100644 --- a/packages/ui/certd-server/src/modules/pipeline/controller/plugin-controller.ts +++ b/packages/ui/certd-server/src/modules/pipeline/controller/plugin-controller.ts @@ -13,14 +13,14 @@ export class PluginController extends BaseController { service: PluginService; @Post('/list', { summary: Constants.per.authOnly }) - async list(@Query(ALL) query) { + async list(@Query(ALL) query: any) { query.userId = this.ctx.user.id; const list = this.service.getList(); return this.ok(list); } @Post('/groups', { summary: Constants.per.authOnly }) - async groups(@Query(ALL) query) { + async groups(@Query(ALL) query: any) { query.userId = this.ctx.user.id; const group = this.service.getGroups(); return this.ok(group); diff --git a/packages/ui/certd-server/src/modules/pipeline/service/access-service.ts b/packages/ui/certd-server/src/modules/pipeline/service/access-service.ts index 9644a51e3..246692043 100644 --- a/packages/ui/certd-server/src/modules/pipeline/service/access-service.ts +++ b/packages/ui/certd-server/src/modules/pipeline/service/access-service.ts @@ -50,7 +50,7 @@ export class AccessService extends BaseService implements IAccessS const json = JSON.parse(setting); let oldSetting = {}; let encryptSetting = {}; - const firstEncrypt = !oldSettingEntity.encryptSetting || oldSettingEntity.encryptSetting === '{}'; + const firstEncrypt = !oldSettingEntity || !oldSettingEntity.encryptSetting || oldSettingEntity.encryptSetting === '{}'; if (oldSettingEntity) { oldSetting = JSON.parse(oldSettingEntity.setting || '{}'); encryptSetting = JSON.parse(oldSettingEntity.encryptSetting || '{}'); diff --git a/packages/ui/certd-server/src/modules/pipeline/service/history-service.ts b/packages/ui/certd-server/src/modules/pipeline/service/history-service.ts index 5e38c095d..7a06ab7bc 100644 --- a/packages/ui/certd-server/src/modules/pipeline/service/history-service.ts +++ b/packages/ui/certd-server/src/modules/pipeline/service/history-service.ts @@ -44,7 +44,7 @@ export class HistoryService extends BaseService { } } - async detail(historyId: string) { + async detail(historyId: number) { const entity = await this.info(historyId); const log = await this.logService.info(historyId); return new HistoryDetail(entity, log); diff --git a/packages/ui/certd-server/src/modules/system/controller/sys-settings-controller.ts b/packages/ui/certd-server/src/modules/system/controller/sys-settings-controller.ts index 1f089c416..2e6a8434c 100644 --- a/packages/ui/certd-server/src/modules/system/controller/sys-settings-controller.ts +++ b/packages/ui/certd-server/src/modules/system/controller/sys-settings-controller.ts @@ -45,13 +45,13 @@ export class SysSettingsController extends CrudController { return super.update(bean); } @Post('/info', { summary: 'sys:settings:view' }) - async info(@Query('id') id) { + async info(@Query('id') id: number) { await this.service.checkUserId(id, this.ctx.user.id); return super.info(id); } @Post('/delete', { summary: 'sys:settings:edit' }) - async delete(@Query('id') id) { + async delete(@Query('id') id: number) { await this.service.checkUserId(id, this.ctx.user.id); return super.delete(id); } diff --git a/packages/ui/certd-server/src/plugins/index.ts b/packages/ui/certd-server/src/plugins/index.ts index 8cc824c33..8350d0b4a 100644 --- a/packages/ui/certd-server/src/plugins/index.ts +++ b/packages/ui/certd-server/src/plugins/index.ts @@ -1,4 +1,5 @@ export * from '@certd/plugin-cert'; +export * from '@certd/plugin-plus'; export * from './plugin-aliyun/index.js'; export * from './plugin-tencent/index.js'; export * from './plugin-host/index.js'; diff --git a/packages/ui/certd-server/src/plugins/plugin-tencent/dns-provider/tencent-dns-provider.ts b/packages/ui/certd-server/src/plugins/plugin-tencent/dns-provider/tencent-dns-provider.ts index 696ba4232..f4cf5714b 100644 --- a/packages/ui/certd-server/src/plugins/plugin-tencent/dns-provider/tencent-dns-provider.ts +++ b/packages/ui/certd-server/src/plugins/plugin-tencent/dns-provider/tencent-dns-provider.ts @@ -31,8 +31,8 @@ export class TencentDnsProvider extends AbstractDnsProvider { }, }, }; - const dnspodSdk: any = await import('tencentcloud-sdk-nodejs/tencentcloud/services/dnspod/v20210323/index.js'); - const DnspodClient = dnspodSdk.Client; + const dnspodSdk = await import('tencentcloud-sdk-nodejs/tencentcloud/services/dnspod/v20210323/index.js'); + const DnspodClient = dnspodSdk.v20210323.Client; // 实例化要请求产品的client对象,clientProfile是可选的 this.client = new DnspodClient(clientConfig); } diff --git a/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-clb/index.ts b/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-clb/index.ts index 3b8b9f7cc..7982c915a 100644 --- a/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-clb/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-clb/index.ts @@ -92,14 +92,14 @@ export class DeployToClbPlugin extends AbstractTaskPlugin { accessId!: string; client: any; - + ClbClient: any; async onInstance() { this.client = await this.getClient(); } async getClient() { - const sdk = await import('tencentcloud-sdk-nodejs/tencentcloud/services/clb/index.js'); - const ClbClient = sdk.clb.v20180317.Client; + const sdk = await import('tencentcloud-sdk-nodejs/tencentcloud/services/clb/v20180317/index.js'); + this.ClbClient = sdk.v20180317.Client; const accessProvider = (await this.accessService.getById(this.accessId)) as TencentAccess; @@ -117,7 +117,7 @@ export class DeployToClbPlugin extends AbstractTaskPlugin { }, }; - return new ClbClient(clientConfig); + return new this.ClbClient(clientConfig); } async execute(): Promise { diff --git a/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-tke-ingress/index.ts b/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-tke-ingress/index.ts index 5a62e7406..6d433bfaf 100644 --- a/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-tke-ingress/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-tke-ingress/index.ts @@ -88,12 +88,13 @@ export class DeployCertToTencentTKEIngressPlugin extends AbstractTaskPlugin { }) cert!: any; - sdk: any; + TkeClient: any; K8sClient: any; async onInstance() { // const TkeClient = this.tencentcloud.tke.v20180525.Client; - this.sdk = await import('tencentcloud-sdk-nodejs/tencentcloud/services/tke/v20220501/index.js'); + const sdk = await import('tencentcloud-sdk-nodejs/tencentcloud/services/tke/v20220501/index.js'); + this.TkeClient = sdk.v20220501.Client; const k8sSdk = await import('@certd/lib-k8s'); this.K8sClient = k8sSdk.K8sClient; } @@ -139,7 +140,7 @@ export class DeployCertToTencentTKEIngressPlugin extends AbstractTaskPlugin { }, }; - return new this.sdk.Client(clientConfig); + return new this.TkeClient(clientConfig); } async getTkeKubeConfig(client: any, clusterId: string) {