perf: 支持已跳过的步骤重新运行

2026-04-24 04:17:25 +08:00 · 2024-09-02 18:36:12 +08:00
parent 724a85028b
commit ea775adae1
20 changed files with 105 additions and 87 deletions
@@ -87,9 +87,9 @@ export class PipelineController extends CrudController<PipelineService> {
  }

  @Post('/trigger', { summary: Constants.per.authOnly })
-  async trigger(@Query('id') id: number) {
+  async trigger(@Query('id') id: number, @Query('stepId') stepId?: string) {
    await this.authService.checkEntityUserId(this.ctx, this.getService(), id);
-    await this.service.trigger(id);
+    await this.service.trigger(id, stepId);
    return this.ok({});
  }

@@ -197,14 +197,14 @@ export class PipelineService extends BaseService<PipelineEntity> {
    }
  }

-  async trigger(id) {
+  async trigger(id: any, stepId?: string) {
    this.cron.register({
      name: `pipeline.${id}.trigger.once`,
      cron: null,
      job: async () => {
        logger.info('用户手动启动job');
        try {
-          await this.run(id, null);
+          await this.run(id, null, stepId);
        } catch (e) {
          logger.error('手动job执行失败：', e);
        }
@@ -279,7 +279,7 @@ export class PipelineService extends BaseService<PipelineEntity> {
    logger.info('当前定时器数量：', this.cron.getTaskSize());
  }

-  async run(id: number, triggerId: string) {
+  async run(id: number, triggerId: string, stepId?: string) {
    const entity: PipelineEntity = await this.info(id);

    const pipeline = JSON.parse(entity.content);
@@ -333,6 +333,10 @@ export class PipelineService extends BaseService<PipelineEntity> {
    try {
      runningTasks.set(historyId, executor);
      await executor.init();
+      if (stepId) {
+        // 清除该step的状态
+        executor.clearLastStatus(stepId);
+      }
      await executor.run(historyId, triggerType);
    } catch (e) {
      logger.error('执行失败：', e);
@@ -1,30 +0,0 @@
-import { IsAccess, AccessInput } from '@certd/pipeline';
-
-@IsAccess({
-  name: 'aliyun',
-  title: '阿里云授权',
-  desc: '',
-})
-export class AliyunAccess {
-  @AccessInput({
-    title: 'accessKeyId',
-    component: {
-      placeholder: 'accessKeyId',
-    },
-    helper: '登录阿里云控制台->AccessKey管理页面获取。',
-    required: true,
-  })
-  accessKeyId = '';
-  @AccessInput({
-    title: 'accessKeySecret',
-    component: {
-      placeholder: 'accessKeySecret',
-    },
-    required: true,
-    encrypt: true,
-    helper: '注意：证书申请需要dns解析权限；其他阿里云插件，需要对应的权限，比如证书上传需要证书管理权限；嫌麻烦就用主账号的全量权限的accessKey',
-  })
-  accessKeySecret = '';
-}
-
-new AliyunAccess();
@@ -1 +0,0 @@
-export * from './aliyun-access.js';
@@ -1,12 +1,7 @@
 import Core from '@alicloud/pop-core';
-import {
-  AbstractDnsProvider,
-  CreateRecordOptions,
-  IsDnsProvider,
-  RemoveRecordOptions,
-} from '@certd/plugin-cert';
+import { AbstractDnsProvider, CreateRecordOptions, IsDnsProvider, RemoveRecordOptions } from '@certd/plugin-cert';
 import { Autowire, ILogger } from '@certd/pipeline';
-import { AliyunAccess } from '../access/index.js';
+import { AliyunAccess } from '@certd/plugin-plus';

@IsDnsProvider({
  name: 'aliyun',
@@ -110,11 +105,7 @@ export class AliyunDnsProvider extends AbstractDnsProvider {
    };

    try {
-      const ret = await this.client.request(
-        'AddDomainRecord',
-        params,
-        requestOption
-      );
+      const ret = await this.client.request('AddDomainRecord', params, requestOption);
      this.logger.info('添加域名解析成功:', value, value, ret.RecordId);
      return ret.RecordId;
    } catch (e: any) {
@@ -136,11 +127,7 @@ export class AliyunDnsProvider extends AbstractDnsProvider {
      method: 'POST',
    };

-    const ret = await this.client.request(
-      'DeleteDomainRecord',
-      params,
-      requestOption
-    );
+    const ret = await this.client.request('DeleteDomainRecord', params, requestOption);
    this.logger.info('删除域名解析成功:', fullRecord, value, ret.RecordId);
    return ret.RecordId;
  }
@@ -1,3 +1,2 @@
-export * from './access/index.js';
 export * from './dns-provider/index.js';
 export * from './plugin/index.js';
@@ -1,7 +1,5 @@
 import { AbstractTaskPlugin, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput, utils } from '@certd/pipeline';
-// @ts-ignore
-import { ROAClient } from '@alicloud/pop-core';
-import { AliyunAccess } from '../../access/index.js';
+import { AliyunAccess } from '@certd/plugin-plus';
 import { appendTimeSuffix } from '../../utils/index.js';
 import { CertInfo } from '@certd/plugin-cert';

@@ -113,7 +111,7 @@ export class DeployCertToAliyunAckIngressPlugin extends AbstractTaskPlugin {
    console.log('开始部署证书到阿里云cdn');
    const { regionId, ingressClass, clusterId, isPrivateIpAddress, cert } = this;
    const access = (await this.accessService.getById(this.accessId)) as AliyunAccess;
-    const client = this.getClient(access, regionId);
+    const client = await this.getClient(access, regionId);
    const kubeConfigStr = await this.getKubeConfig(client, clusterId, isPrivateIpAddress);

    this.logger.info('kubeconfig已成功获取');
@@ -200,8 +198,10 @@ export class DeployCertToAliyunAckIngressPlugin extends AbstractTaskPlugin {
    }
  }

-  getClient(aliyunProvider: any, regionId: string) {
-    return new ROAClient({
+  async getClient(aliyunProvider: any, regionId: string) {
+    const ROAClient = await import('@alicloud/pop-core');
+
+    return new ROAClient.default({
      accessKeyId: aliyunProvider.accessKeyId,
      accessKeySecret: aliyunProvider.accessKeySecret,
      endpoint: `https://cs.${regionId}.aliyuncs.com`,
@@ -1,9 +1,7 @@
 import { AbstractTaskPlugin, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from '@certd/pipeline';
 import dayjs from 'dayjs';
-import Core from '@alicloud/pop-core';
-import RPCClient from '@alicloud/pop-core';
-import { AliyunAccess } from '../../access/index.js';
-
+import { AliyunAccess } from '@certd/plugin-plus';
+import type RPCClient from '@alicloud/pop-core';
@IsTaskPlugin({
  name: 'DeployCertToAliyunCDN',
  title: '部署证书至阿里云CDN',
@@ -54,14 +52,16 @@ export class DeployCertToAliyunCDN extends AbstractTaskPlugin {
  async execute(): Promise<void> {
    console.log('开始部署证书到阿里云cdn');
    const access = (await this.accessService.getById(this.accessId)) as AliyunAccess;
-    const client = this.getClient(access);
+    const client = await this.getClient(access);
    const params = await this.buildParams();
    await this.doRequest(client, params);
    console.log('部署完成');
  }

-  getClient(access: AliyunAccess) {
-    return new Core({
+  async getClient(access: AliyunAccess) {
+    const Core = await import('@alicloud/pop-core');
+
+    return new Core.default({
      accessKeyId: access.accessKeyId,
      accessKeySecret: access.accessKeySecret,
      endpoint: 'https://cdn.aliyuncs.com',
@@ -1,6 +1,6 @@
 import { AbstractTaskPlugin, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput, TaskOutput } from '@certd/pipeline';
 import Core from '@alicloud/pop-core';
-import { AliyunAccess } from '../../access/index.js';
+import { AliyunAccess } from '@certd/plugin-plus';
 import { appendTimeSuffix, checkRet, ZoneOptions } from '../../utils/index.js';

@IsTaskPlugin({
@@ -29,6 +29,7 @@ export class HostShellExecutePlugin extends AbstractTaskPlugin {
    component: {
      name: 'a-textarea',
      vModel: 'value',
+      rows: 6,
    },
    required: true,
  })