Merge remote-tracking branch 'origin/master'

# Conflicts: # ui/certd-ui/src/api/util.input.handler.js
2025-11-25 09:10:11 +08:00 · 2021-02-04 20:32:34 +08:00
parent a8f41d3c48 a25a15ca6e
commit cca33478e4
101 changed files with 4065 additions and 3078 deletions
--- a/packages/plugins/package-lock.json
+++ b/packages/plugins/package-lock.json
@@ -131,18 +131,6 @@
        "to-fast-properties": "^2.0.0"
      }
    },
-    "@certd/api": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/@certd/api/-/api-0.1.7.tgz",
-      "integrity": "sha512-2spEdF9A6Tpe5KwkbWV1zE9Zwql04DrG5KlWRUsn8kLvwY6qfdDsdCsNoFf1+XDytn4OYH5nfrMGZBi8TpG84w==",
-      "requires": {
-        "axios": "^0.21.1",
-        "dayjs": "^1.9.7",
-        "lodash-es": "^4.17.20",
-        "log4js": "^6.3.0",
-        "qs": "^6.9.4"
-      }
-    },
    "@eslint/eslintrc": {
      "version": "0.2.2",
      "resolved": "https://registry.npm.taobao.org/@eslint/eslintrc/download/@eslint/eslintrc-0.2.2.tgz?cache=0&sync_timestamp=1607145629875&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40eslint%2Feslintrc%2Fdownload%2F%40eslint%2Feslintrc-0.2.2.tgz",
@@ -488,14 +476,6 @@
      "resolved": "https://registry.npm.taobao.org/aws4/download/aws4-1.11.0.tgz?cache=0&sync_timestamp=1604101166484&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Faws4%2Fdownload%2Faws4-1.11.0.tgz",
      "integrity": "sha1-1h9G2DslGSUOJ4Ta9bCUeai0HFk="
    },
-    "axios": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz",
-      "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==",
-      "requires": {
-        "follow-redirects": "^1.10.0"
-      }
-    },
    "babel-eslint": {
      "version": "10.1.0",
      "resolved": "https://registry.npm.taobao.org/babel-eslint/download/babel-eslint-10.1.0.tgz?cache=0&sync_timestamp=1599054223324&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbabel-eslint%2Fdownload%2Fbabel-eslint-10.1.0.tgz",
@@ -782,11 +762,6 @@
        "assert-plus": "^1.0.0"
      }
    },
-    "date-format": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/date-format/-/date-format-3.0.0.tgz",
-      "integrity": "sha512-eyTcpKOcamdhWJXj56DpQMo1ylSQpcGtGKXcU0Tb97+K56/CF5amAqqqNj0+KvA0iw2ynxtHWFsPDSClCxe48w=="
-    },
    "dayjs": {
      "version": "1.10.2",
      "resolved": "https://registry.npm.taobao.org/dayjs/download/dayjs-1.10.2.tgz?cache=0&sync_timestamp=1609889274763&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdayjs%2Fdownload%2Fdayjs-1.10.2.tgz",
@@ -1431,16 +1406,6 @@
        }
      }
    },
-    "flatted": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz",
-      "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA=="
-    },
-    "follow-redirects": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.1.tgz",
-      "integrity": "sha512-SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg=="
-    },
    "forever-agent": {
      "version": "0.6.1",
      "resolved": "https://registry.npm.taobao.org/forever-agent/download/forever-agent-0.6.1.tgz",
@@ -1456,16 +1421,6 @@
        "mime-types": "^2.1.12"
      }
    },
-    "fs-extra": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
-      "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
-      "requires": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^4.0.0",
-        "universalify": "^0.1.0"
-      }
-    },
    "fs.realpath": {
      "version": "1.0.0",
      "resolved": "https://registry.npm.taobao.org/fs.realpath/download/fs.realpath-1.0.0.tgz",
@@ -1582,7 +1537,8 @@
    "graceful-fs": {
      "version": "4.2.4",
      "resolved": "https://registry.npm.taobao.org/graceful-fs/download/graceful-fs-4.2.4.tgz",
-      "integrity": "sha1-Ila94U02MpWMRl68ltxGfKB6Kfs="
+      "integrity": "sha1-Ila94U02MpWMRl68ltxGfKB6Kfs=",
+      "dev": true
    },
    "growl": {
      "version": "1.10.5",
@@ -1967,14 +1923,6 @@
        "minimist": "^1.2.0"
      }
    },
-    "jsonfile": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
-      "requires": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
    "jsonpath-plus": {
      "version": "0.19.0",
      "resolved": "https://registry.npm.taobao.org/jsonpath-plus/download/jsonpath-plus-0.19.0.tgz",
@@ -2135,33 +2083,6 @@
        }
      }
    },
-    "log4js": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/log4js/-/log4js-6.3.0.tgz",
-      "integrity": "sha512-Mc8jNuSFImQUIateBFwdOQcmC6Q5maU0VVvdC2R6XMb66/VnT+7WS4D/0EeNMZu1YODmJe5NIn2XftCzEocUgw==",
-      "requires": {
-        "date-format": "^3.0.0",
-        "debug": "^4.1.1",
-        "flatted": "^2.0.1",
-        "rfdc": "^1.1.4",
-        "streamroller": "^2.2.4"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-        }
-      }
-    },
    "loose-envify": {
      "version": "1.4.0",
      "resolved": "https://registry.npm.taobao.org/loose-envify/download/loose-envify-1.4.0.tgz",
@@ -2874,11 +2795,6 @@
        "lowercase-keys": "^1.0.0"
      }
    },
-    "rfdc": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.1.4.tgz",
-      "integrity": "sha512-5C9HXdzK8EAqN7JDif30jqsBzavB7wLpaubisuQIGHWf2gUXSpzy6ArX/+Da8RjFpagWsCn+pIgxTMAmKw9Zug=="
-    },
    "rimraf": {
      "version": "3.0.2",
      "resolved": "https://registry.npm.taobao.org/rimraf/download/rimraf-3.0.2.tgz?cache=0&sync_timestamp=1599054104695&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frimraf%2Fdownload%2Frimraf-3.0.2.tgz",
@@ -3075,36 +2991,6 @@
        "tweetnacl": "~0.14.0"
      }
    },
-    "streamroller": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-2.2.4.tgz",
-      "integrity": "sha512-OG79qm3AujAM9ImoqgWEY1xG4HX+Lw+yY6qZj9R1K2mhF5bEmQ849wvrb+4vt4jLMLzwXttJlQbOdPOQVRv7DQ==",
-      "requires": {
-        "date-format": "^2.1.0",
-        "debug": "^4.1.1",
-        "fs-extra": "^8.1.0"
-      },
-      "dependencies": {
-        "date-format": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/date-format/-/date-format-2.1.0.tgz",
-          "integrity": "sha512-bYQuGLeFxhkxNOF3rcMtiZxvCBAquGzZm6oWA1oZ0g2THUzivaRhv8uOhdr19LmoobSOLoIAxeUK2RdbM8IFTA=="
-        },
-        "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-        }
-      }
-    },
    "streamsearch": {
      "version": "0.1.2",
      "resolved": "https://registry.npm.taobao.org/streamsearch/download/streamsearch-0.1.2.tgz",
@@ -3329,11 +3215,6 @@
      "resolved": "https://registry.npm.taobao.org/underscore/download/underscore-1.12.0.tgz?cache=0&sync_timestamp=1606179462980&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Funderscore%2Fdownload%2Funderscore-1.12.0.tgz",
      "integrity": "sha1-SBSUBVH8gFh873hA0euw8WRTvpc="
    },
-    "universalify": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
-    },
    "uri-js": {
      "version": "4.4.0",
      "resolved": "https://registry.npm.taobao.org/uri-js/download/uri-js-4.4.0.tgz",
--- a/packages/plugins/src/aliyun/deploy-to-cdn/index.js
+++ b/packages/plugins/src/aliyun/deploy-to-cdn/index.js
@@ -20,7 +20,7 @@ const define = {
      }
    },
    from: {
-      value: 'upload',
+      default: 'upload',
      label: '证书来源',
      component: {
        required: true,
@@ -31,7 +31,7 @@ const define = {
          { value: 'cas', label: '从证书库', title: '需要uploadCertToAliyun作为前置任务' }
        ]
      },
-      desc: '如果选择cas类型，则需要以《上传证书到阿里云》作为前置任务'
+      desc: '如果选择‘从证书库’类型，则需要以《上传证书到阿里云》作为前置任务'

    },
    // serverCertificateStatus: {
--- a/packages/plugins/src/aliyun/upload-to-aliyun/index.js
+++ b/packages/plugins/src/aliyun/upload-to-aliyun/index.js
@@ -6,17 +6,22 @@ const define = {
  label: '上传证书到阿里云',
  input: {
    name: {
-      label: '证书名称'
+      label: '证书名称',
+      desc: '证书上传后将以此参数作为名称前缀'
    },
    regionId: {
      label: '大区',
-      value: 'cn-hangzhou'
+      default: 'cn-hangzhou'
    },
    accessProvider: {
      label: 'Access提供者',
      type: [String, Object],
      desc: 'AccessProviders的key 或 一个包含accessKeyId与accessKeySecret的对象',
-      options: 'accessProviders[type=aliyun]'
+      component: {
+        name: 'provider-selector',
+        filter: 'aliyun'
+      },
+      required: true
    }
  },
  output: {
--- a/packages/plugins/src/tencent/deploy-to-cdn/index.js
+++ b/packages/plugins/src/tencent/deploy-to-cdn/index.js
@@ -19,30 +19,27 @@ export class DeployCertToTencentCDN extends AbstractTencentPlugin {
          required: true
        },
        certName: {
-          label: '证书名称'
+          label: '证书名称',
+          desc: '证书上传后将以此参数作为名称前缀'
        },
        certType: {
-          value: 'upload',
+          default: 'upload',
          label: '证书来源',
          options: [
            { value: 'upload', label: '直接上传' },
            { value: 'cloud', label: '从证书库', desc: '需要uploadCertToTencent作为前置任务' }
          ],
+          desc: '如果选择‘从证书库’类型，则需要以《上传证书到腾讯云》作为前置任务',
          required: true
        },
-        // serverCertificateStatus: {
-        //   label: '启用https',
-        //   options: [
-        //     { value: 'on', label: '开启HTTPS，并更新证书' },
-        //     { value: 'auto', label: '若HTTPS开启则更新，未开启不更新' }
-        //   ],
-        //   required:true
-        // },
        accessProvider: {
          label: 'Access提供者',
          type: [String, Object],
          desc: 'AccessProviders的key 或 一个包含accessKeyId与accessKeySecret的对象',
-          options: 'accessProviders[type=aliyun]',
+          component: {
+            name: 'provider-selector',
+            filter: 'tencent'
+          },
          required: true
        }
      },
--- a/packages/plugins/src/tencent/deploy-to-clb/index.js
+++ b/packages/plugins/src/tencent/deploy-to-clb/index.js
@@ -15,7 +15,7 @@ export class DeployCertToTencentCLB extends AbstractTencentPlugin {
      input: {
        region: {
          label: '大区',
-          value: 'ap-guangzhou'
+          default: 'ap-guangzhou'
        },
        domain: {
          label: '域名',
--- a/packages/plugins/src/tencent/deploy-to-tke-ingress/index.js
+++ b/packages/plugins/src/tencent/deploy-to-tke-ingress/index.js
@@ -16,7 +16,7 @@ export class DeployCertToTencentTKEIngress extends AbstractTencentPlugin {
      input: {
        region: {
          label: '大区',
-          value: 'ap-guangzhou'
+          default: 'ap-guangzhou'
        },
        clusterId: {
          label: '集群ID',
@@ -25,7 +25,7 @@ export class DeployCertToTencentTKEIngress extends AbstractTencentPlugin {
        },
        namespace: {
          label: '集群的namespace',
-          value: 'default'
+          default: 'default'
        },
        secreteName: {
          type: [String, Array],