perf: aws route53

packages/core/acme-client/src/util.js

@@ -247,7 +247,7 @@ async function getAuthoritativeDnsResolver(recordName, logger = log) {
 
     try {
         /* Resolve root domain by SOA */
-        const domain = await resolveDomainBySoaRecord(recordNam,logger);
+        const domain = await resolveDomainBySoaRecord(recordName,logger);
 
         /* Resolve authoritative NS addresses */
         logger(`获取到权威NS服务器name: ${domain}`);

packages/ui/certd-client/src/views/certd/pipeline/components/change-trigger.vue

@@ -63,6 +63,9 @@ async function openFormDialog() {
         form: {
           value: true,
           helper: "是否给流水线随机设置一个时间",
+          show: compute(({ form }) => {
+            return form.clear !== true;
+          }),
           component: {
             name: "fs-dict-switch",
             vModel: "checked",

packages/ui/certd-server/src/plugins/plugin-aws/access.ts

@@ -1,9 +1,10 @@
 import { AccessInput, BaseAccess, IsAccess } from '@certd/pipeline';
 
 export const AwsRegions = [
-  { label: 'cn-north-1', value: 'cn-north-1' },
+  { label: '------中国区------', value: 'cn',disabled: true },
-  { label: 'cn-northwest-1', value: 'cn-northwest-1' },
+  { label: '北京', value: 'cn-north-1' },
-  { label: '---------------', value: '--',disabled: true },
+  { label: '宁夏', value: 'cn-northwest-1' },
+  { label: '------海外-----', value: 'out',disabled: true },
   { label: 'us-east-1', value: 'us-east-1' },
   { label: 'us-east-2', value: 'us-east-2' },
   { label: 'us-west-1', value: 'us-west-1' },
@@ -72,7 +73,7 @@ export class AwsAccess extends BaseAccess {
       options: AwsRegions,
     },
     required: true,
-    helper: '请选择您的默认AWS区域，默认us-east-1',
+    helper: '请选择您的默认AWS区域，主要区分中国区还是海外区即可',
     options: AwsRegions,
   })
   region = '';

packages/ui/certd-server/src/plugins/plugin-aws/aws-route53-provider.ts

@@ -32,7 +32,7 @@ export class AwsRoute53Provider extends AbstractDnsProvider {
       fullRecord: fullRecord,
       type: type,
       value: value,
-      action: 'CREATE',
+      action: 'UPSERT',
     });
     return {
       hostedZoneId: ZoneId,

packages/ui/certd-server/src/plugins/plugin-aws/libs/aws-client.ts

@@ -78,7 +78,8 @@ export class AwsClient {
   }
 
   async route53ChangeRecord(req: {
-    hostedZoneId:string,fullRecord:string,type:string, value:string, action:"CREATE"|"DELETE"}){
+    hostedZoneId: string, fullRecord: string, type: string, value: string, action: "UPSERT" | "DELETE"
+  }) {
     const { ChangeResourceRecordSetsCommand } = await import("@aws-sdk/client-route-53"); // ES Modules import
     // const { Route53Client, ChangeResourceRecordSetsCommand } = require("@aws-sdk/client-route-53"); // CommonJS import
     // import type { Route53ClientConfig } from "@aws-sdk/client-route-53";
@@ -90,7 +91,7 @@ export class AwsClient {
           { // Change
             Action: req.action as any, // required
             ResourceRecordSet: { // ResourceRecordSet
-              Name: req.fullRecord+".", // required
+              Name: req.fullRecord, // required
               Type: req.type.toUpperCase() as any,
               ResourceRecords: [ // ResourceRecords
                 { // ResourceRecord
@@ -103,7 +104,7 @@ export class AwsClient {
         ],
       },
     };
-    this.logger.info(`添加域名解析参数：${JSON.stringify(input)}`);
+    this.logger.info(`设置域名解析参数：${JSON.stringify(input)}`);
     const command = new ChangeResourceRecordSetsCommand(input);
     const response = await this.doRequest(() => client.send(command));
     console.log('Add record successful:', JSON.stringify(response));

pnpm-lock.yaml

@@ -783,19 +783,19 @@ importers:
   packages/pro/commercial-core:
     dependencies:
       '@certd/basic':
-        specifier: ^1.37.15
+        specifier: ^1.37.16
         version: link:../../core/basic
       '@certd/lib-server':
-        specifier: ^1.37.15
+        specifier: ^1.37.16
         version: link:../../libs/lib-server
       '@certd/pipeline':
-        specifier: ^1.37.15
+        specifier: ^1.37.16
         version: link:../../core/pipeline
       '@certd/plugin-plus':
-        specifier: ^1.37.15
+        specifier: ^1.37.16
         version: link:../plugin-plus
       '@certd/plus-core':
-        specifier: ^1.37.15
+        specifier: ^1.37.16
         version: link:../plus-core
       '@midwayjs/core':
         specifier: 3.20.11
@@ -880,22 +880,22 @@ importers:
         specifier: ^1.0.2
         version: 1.0.3
       '@certd/basic':
-        specifier: ^1.37.15
+        specifier: ^1.37.16
         version: link:../../core/basic
       '@certd/lib-k8s':
-        specifier: ^1.37.15
+        specifier: ^1.37.16
         version: link:../../libs/lib-k8s
       '@certd/pipeline':
-        specifier: ^1.37.15
+        specifier: ^1.37.16
         version: link:../../core/pipeline
       '@certd/plugin-cert':
-        specifier: ^1.37.15
+        specifier: ^1.37.16
         version: link:../../plugins/plugin-cert
       '@certd/plugin-lib':
-        specifier: ^1.37.15
+        specifier: ^1.37.16
         version: link:../../plugins/plugin-lib
       '@certd/plus-core':
-        specifier: ^1.37.15
+        specifier: ^1.37.16
         version: link:../plus-core
       ali-oss:
         specifier: ^6.21.0
@@ -998,7 +998,7 @@ importers:
   packages/pro/plus-core:
     dependencies:
       '@certd/basic':
-        specifier: ^1.37.15
+        specifier: ^1.37.16
         version: link:../../core/basic
       dayjs:
         specifier: ^1.11.7
@@ -21364,13 +21364,13 @@ snapshots:
       resolve: 1.22.10
       semver: 6.3.1
 
-  eslint-plugin-prettier@3.4.1(eslint-config-prettier@8.10.0(eslint@7.32.0))(eslint@7.32.0)(prettier@2.8.8):
+  eslint-plugin-prettier@3.4.1(eslint-config-prettier@8.10.0(eslint@8.57.0))(eslint@7.32.0)(prettier@2.8.8):
     dependencies:
       eslint: 7.32.0
       prettier: 2.8.8
       prettier-linter-helpers: 1.0.0
     optionalDependencies:
-      eslint-config-prettier: 8.10.0(eslint@7.32.0)
+      eslint-config-prettier: 8.10.0(eslint@8.57.0)
 
   eslint-plugin-prettier@4.2.1(eslint-config-prettier@8.10.0(eslint@8.57.0))(eslint@8.57.0)(prettier@2.8.8):
     dependencies:
@@ -23784,7 +23784,7 @@ snapshots:
       eslint: 7.32.0
       eslint-config-prettier: 8.10.0(eslint@7.32.0)
       eslint-plugin-node: 11.1.0(eslint@7.32.0)
-      eslint-plugin-prettier: 3.4.1(eslint-config-prettier@8.10.0(eslint@7.32.0))(eslint@7.32.0)(prettier@2.8.8)
+      eslint-plugin-prettier: 3.4.1(eslint-config-prettier@8.10.0(eslint@8.57.0))(eslint@7.32.0)(prettier@2.8.8)
       execa: 5.1.1
       inquirer: 7.3.3
       json5: 2.2.3