diff --git a/packages/core/pipeline/package.json b/packages/core/pipeline/package.json index 63b9a88c..1c18cc54 100644 --- a/packages/core/pipeline/package.json +++ b/packages/core/pipeline/package.json @@ -11,7 +11,7 @@ "preview": "vite preview" }, "dependencies": { - "@certd/acme-client": "^0.3.0", + "@certd/acme-client": "workspace:^0.3.0", "axios": "^0.21.1", "dayjs": "^1.11.6", "lodash": "^4.17.21", diff --git a/packages/plugins/plugin-all/package.json b/packages/plugins/plugin-all/package.json index 74300737..57b2a357 100644 --- a/packages/plugins/plugin-all/package.json +++ b/packages/plugins/plugin-all/package.json @@ -16,13 +16,13 @@ "preview": "vite preview" }, "dependencies": { - "@certd/plugin-aliyun": "^0.3.0", - "@certd/plugin-tencent": "^0.3.0", - "@certd/plugin-host": "^0.3.0", - "@certd/plugin-cert": "^0.3.0" + "@certd/plugin-aliyun": "workspace:^0.3.0", + "@certd/plugin-tencent": "workspace:^0.3.0", + "@certd/plugin-host": "workspace:^0.3.0", + "@certd/plugin-cert": "workspace:0.3.0" }, "devDependencies": { - "@certd/pipeline": "^0.3.0", + "@certd/pipeline": "workspace:0.3.0", "log4js": "^6.7.1", "@types/lodash": "^4.14.186", "vue-tsc": "^0.38.9", diff --git a/packages/plugins/plugin-all/test/pipeline/access-service-test.ts b/packages/plugins/plugin-all/test/pipeline/access-service-test.ts index 2b8c2915..c66c7fe7 100644 --- a/packages/plugins/plugin-all/test/pipeline/access-service-test.ts +++ b/packages/plugins/plugin-all/test/pipeline/access-service-test.ts @@ -1,8 +1,8 @@ -import { IAccessService } from "../../src/access/access-service"; -import { AbstractAccess, AliyunAccess } from "../../src"; +import { IAccessService } from "@certd/pipeline"; +import { AliyunAccess } from "@certd/plugin-aliyun"; import { aliyunSecret } from "../user.secret"; export class AccessServiceTest implements IAccessService { - async getById(id: any): Promise { + async getById(id: any): Promise { return { ...aliyunSecret, } as AliyunAccess; diff --git a/packages/plugins/plugin-all/test/pipeline/init.test.ts b/packages/plugins/plugin-all/test/pipeline/init.test.ts index d1e28763..102c5932 100644 --- a/packages/plugins/plugin-all/test/pipeline/init.test.ts +++ b/packages/plugins/plugin-all/test/pipeline/init.test.ts @@ -1,7 +1,5 @@ -import { ContextFactory } from "../../src/core/context"; -import { FileStorage } from "../../src/core/storage"; +import { ContextFactory, FileStorage, logger } from "@certd/pipeline"; import { AccessServiceTest } from "./access-service-test"; -import { logger } from "../../src/utils/util.log"; const contextFactory = new ContextFactory(new FileStorage()); diff --git a/packages/plugins/plugin-all/test/pipeline/pipeline.define.ts b/packages/plugins/plugin-all/test/pipeline/pipeline.define.ts index 1369d482..a4f327c5 100644 --- a/packages/plugins/plugin-all/test/pipeline/pipeline.define.ts +++ b/packages/plugins/plugin-all/test/pipeline/pipeline.define.ts @@ -1,4 +1,4 @@ -import { ConcurrencyStrategy, NextStrategy, Pipeline, RunStrategy } from "../../src"; +import { ConcurrencyStrategy, NextStrategy, Pipeline, RunStrategy } from "@certd/pipeline"; let idIndex = 0; function generateId() { diff --git a/packages/plugins/plugin-all/test/pipeline/pipeline.test.ts b/packages/plugins/plugin-all/test/pipeline/pipeline.test.ts index 494746e0..dd7706f8 100644 --- a/packages/plugins/plugin-all/test/pipeline/pipeline.test.ts +++ b/packages/plugins/plugin-all/test/pipeline/pipeline.test.ts @@ -1,9 +1,9 @@ //import { expect } from "chai"; import "mocha"; -import { Executor, RunHistory } from "../../src"; +import { Executor, RunHistory, FileStorage } from "@certd/pipeline"; import { pipeline } from "./pipeline.define"; import { AccessServiceTest } from "./access-service-test"; -import { FileStorage } from "../../src/core/storage"; +import * as all from "../../src"; describe("pipeline", function () { it("#pipeline", async function () { this.timeout(120000); diff --git a/packages/plugins/plugin-all/test/pipeline/plugins/cert-apply.test.ts b/packages/plugins/plugin-all/test/pipeline/plugins/cert-apply.test.ts deleted file mode 100644 index fa75e3a2..00000000 --- a/packages/plugins/plugin-all/test/pipeline/plugins/cert-apply.test.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { expect } from "chai"; -import "mocha"; -import { CertApplyPlugin } from "../../../src/plugin"; -import { pluginInitProps } from "../init.test"; -describe("CertApply", function () { - it("#execute", async function () { - this.timeout(120000); - const plugin = new CertApplyPlugin(); - // @ts-ignore - delete plugin.define; - await plugin.doInit(pluginInitProps); - const output = await plugin.execute({ - domains: ["*.docmirror.cn", "docmirror.cn"], - email: "xiaojunnuo@qq.com", - dnsProviderType: "aliyun", - accessId: "111", - forceUpdate: true, - }); - const cert = output.cert; - expect(plugin.getDefine().name).eq("CertApply"); - expect(cert.crt != null).eq(true); - }); -}); diff --git a/packages/plugins/plugin-all/test/pipeline/plugins/deploy-to-cdn.test.ts b/packages/plugins/plugin-all/test/pipeline/plugins/deploy-to-cdn.test.ts deleted file mode 100644 index c90b169b..00000000 --- a/packages/plugins/plugin-all/test/pipeline/plugins/deploy-to-cdn.test.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { expect } from "chai"; -import "mocha"; -import { DeployCertToAliyunCDN } from "../../../src/plugin"; -import { pluginInitProps } from "../init.test"; - -describe("DeployToAliyunCDN", function () { - it("#execute", async function () { - this.timeout(120000); - const plugin = new DeployCertToAliyunCDN(); - // @ts-ignore - delete plugin.define; - - await plugin.doInit(pluginInitProps); - - const cert = await pluginInitProps.pipelineContext.get("cert"); - - await plugin.execute({ - cert, - domainName: "certd-cdn-upload.docmirror.cn", - }); - expect(plugin.getDefine().name).eq("DeployCertToAliyunCDN"); - }); -}); diff --git a/packages/plugins/plugin-huawei/.eslintrc b/packages/plugins/plugin-huawei/.eslintrc new file mode 100644 index 00000000..751e28ba --- /dev/null +++ b/packages/plugins/plugin-huawei/.eslintrc @@ -0,0 +1,22 @@ +{ + "parser": "@typescript-eslint/parser", + "plugins": [ + "@typescript-eslint" + ], + "extends": [ + "plugin:@typescript-eslint/recommended", + "plugin:prettier/recommended", + "prettier" + ], + "env": { + "mocha": true + }, + "rules": { + "@typescript-eslint/ban-ts-comment": "off", + "@typescript-eslint/ban-ts-ignore": "off", + "@typescript-eslint/no-explicit-any": "off", + "@typescript-eslint/no-empty-function": "off", +// "no-unused-expressions": "off", + "max-len": [0, 160, 2, { "ignoreUrls": true }] + } +} diff --git a/packages/plugins/plugin-huawei/.gitignore b/packages/plugins/plugin-huawei/.gitignore new file mode 100644 index 00000000..5ee37c64 --- /dev/null +++ b/packages/plugins/plugin-huawei/.gitignore @@ -0,0 +1,26 @@ +# Logs +logs +*.log +npm-debug.log* +yarn-debug.log* +yarn-error.log* +pnpm-debug.log* +lerna-debug.log* + +node_modules +dist +dist-ssr +*.local + +# Editor directories and files +.vscode/* +!.vscode/extensions.json +.idea +.DS_Store +*.suo +*.ntvs* +*.njsproj +*.sln +*.sw? + +test/user.secret.ts \ No newline at end of file diff --git a/packages/plugins/plugin-huawei/.mocharc.json b/packages/plugins/plugin-huawei/.mocharc.json new file mode 100644 index 00000000..24b75f3e --- /dev/null +++ b/packages/plugins/plugin-huawei/.mocharc.json @@ -0,0 +1,5 @@ +{ + "extension": ["ts"], + "spec": "test/**/*.test.ts", + "require": "ts-node/register" +} \ No newline at end of file diff --git a/packages/plugins/plugin-huawei/.prettierrc b/packages/plugins/plugin-huawei/.prettierrc new file mode 100644 index 00000000..1d96ee86 --- /dev/null +++ b/packages/plugins/plugin-huawei/.prettierrc @@ -0,0 +1,3 @@ +{ + "printWidth": 160 +} \ No newline at end of file diff --git a/packages/plugins/plugin-huawei/README.md b/packages/plugins/plugin-huawei/README.md new file mode 100644 index 00000000..30b15e21 --- /dev/null +++ b/packages/plugins/plugin-huawei/README.md @@ -0,0 +1,16 @@ +# Vue 3 + TypeScript + Vite + +This template should help get you started developing with Vue 3 and TypeScript in Vite. The template uses Vue 3 `