@geek-fun/serverlessinsight 0.8.2 → 0.8.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.serverlessinsight/state-cdn-flow-app-cdn-flow-service.json.backup +15 -0
- package/.serverlessinsight/state-iam-test-app-iam-test-service.json.backup +33 -0
- package/.serverlessinsight/state-insight-poc-deploy-app-insight-poc-deploy.json.backup +359 -0
- package/.serverlessinsight/state-insight-poc-destroy-app-insight-poc-destroy.json.backup +15 -0
- package/.serverlessinsight/state-insight-volc-app-insight-volc.json.backup +154 -0
- package/.serverlessinsight/state-insight-volc-destroy-app-insight-volc-destroy.json.backup +1 -0
- package/README.md +26 -18
- package/README.zh-CN.md +19 -6
- package/dist/package.json +5 -2
- package/dist/src/commands/deploy.js +87 -4
- package/dist/src/commands/destroy.js +61 -10
- package/dist/src/commands/forceUnlock.js +8 -0
- package/dist/src/commands/index.js +34 -2
- package/dist/src/commands/login.js +195 -0
- package/dist/src/commands/logout.js +17 -0
- package/dist/src/commands/show.js +15 -7
- package/dist/src/commands/whoami.js +20 -0
- package/dist/src/common/aliyunClient/apigwOperations.js +363 -30
- package/dist/src/common/aliyunClient/esOperations.js +43 -29
- package/dist/src/common/aliyunClient/fc3Operations.js +481 -207
- package/dist/src/common/aliyunClient/ossOperations.js +165 -13
- package/dist/src/common/aliyunClient/rdsOperations.js +143 -39
- package/dist/src/common/aliyunClient/slsOperations.js +90 -28
- package/dist/src/common/aliyunClient/tablestoreOperations.js +25 -22
- package/dist/src/common/apiClient.js +102 -0
- package/dist/src/common/constants.js +13 -4
- package/dist/src/common/credentialStore.js +94 -0
- package/dist/src/common/credentials.js +2 -0
- package/dist/src/common/eventQueue.js +208 -0
- package/dist/src/common/hashUtils.js +87 -11
- package/dist/src/common/imsClient.js +1 -0
- package/dist/src/common/index.js +3 -0
- package/dist/src/common/lockManager.js +61 -54
- package/dist/src/common/logger.js +2 -0
- package/dist/src/common/polling.js +54 -0
- package/dist/src/common/reportResourceEvent.js +8 -0
- package/dist/src/common/runtimeMapper.js +11 -12
- package/dist/src/common/stateBackend/index.js +10 -1
- package/dist/src/common/stateBackend/localStateBackend.js +4 -1
- package/dist/src/common/stateBackend/remoteStateBackend.js +10 -4
- package/dist/src/common/stateBackend/saasStateBackend.js +266 -0
- package/dist/src/common/stateManager.js +186 -14
- package/dist/src/common/tencentClient/clsOperations.js +137 -0
- package/dist/src/common/tencentClient/cosOperations.js +180 -3
- package/dist/src/common/tencentClient/esOperations.js +110 -46
- package/dist/src/common/tencentClient/index.js +43 -2
- package/dist/src/common/tencentClient/scfOperations.js +266 -133
- package/dist/src/common/tencentClient/tdsqlcClusterMapper.js +81 -0
- package/dist/src/common/tencentClient/tdsqlcOperations.js +93 -99
- package/dist/src/common/triggerMapper.js +36 -0
- package/dist/src/common/volcengineClient/apigwOperations.js +539 -159
- package/dist/src/common/volcengineClient/iamOperations.js +91 -48
- package/dist/src/common/volcengineClient/index.js +46 -21
- package/dist/src/common/volcengineClient/stsOperations.js +32 -0
- package/dist/src/common/volcengineClient/tlsOperations.js +305 -171
- package/dist/src/common/volcengineClient/tosOperations.js +78 -19
- package/dist/src/common/volcengineClient/vefaasOperations.js +272 -54
- package/dist/src/lang/en.js +107 -1
- package/dist/src/lang/zh-CN.js +107 -1
- package/dist/src/parser/eventParser.js +2 -0
- package/dist/src/parser/functionParser.js +96 -65
- package/dist/src/parser/index.js +7 -4
- package/dist/src/stack/aliyunStack/apigwExecutor.js +39 -1
- package/dist/src/stack/aliyunStack/apigwPlanner.js +16 -10
- package/dist/src/stack/aliyunStack/apigwResource.js +334 -125
- package/dist/src/stack/aliyunStack/apigwTypes.js +35 -4
- package/dist/src/stack/aliyunStack/databaseExecutor.js +39 -1
- package/dist/src/stack/aliyunStack/databasePlanner.js +13 -1
- package/dist/src/stack/aliyunStack/databaseResource.js +135 -40
- package/dist/src/stack/aliyunStack/deployer.js +2 -2
- package/dist/src/stack/aliyunStack/destroyer.js +27 -2
- package/dist/src/stack/aliyunStack/fc3Executor.js +25 -2
- package/dist/src/stack/aliyunStack/fc3Planner.js +11 -1
- package/dist/src/stack/aliyunStack/fc3Resource.js +416 -94
- package/dist/src/stack/aliyunStack/ossExecutor.js +39 -1
- package/dist/src/stack/aliyunStack/ossPlanner.js +15 -1
- package/dist/src/stack/aliyunStack/ossResource.js +267 -219
- package/dist/src/stack/aliyunStack/sharedLogProject.js +137 -0
- package/dist/src/stack/aliyunStack/tablestoreExecutor.js +39 -1
- package/dist/src/stack/aliyunStack/tablestorePlanner.js +13 -1
- package/dist/src/stack/aliyunStack/tablestoreResource.js +54 -20
- package/dist/src/stack/alreadyExists.js +26 -0
- package/dist/src/stack/ownershipTag.js +58 -0
- package/dist/src/stack/rfsStack/index.js +3 -1
- package/dist/src/stack/scfStack/cosExecutor.js +39 -1
- package/dist/src/stack/scfStack/cosPlanner.js +11 -1
- package/dist/src/stack/scfStack/cosResource.js +167 -64
- package/dist/src/stack/scfStack/deployer.js +2 -2
- package/dist/src/stack/scfStack/destroyer.js +15 -2
- package/dist/src/stack/scfStack/esServerlessExecutor.js +39 -1
- package/dist/src/stack/scfStack/esServerlessPlanner.js +11 -1
- package/dist/src/stack/scfStack/esServerlessResource.js +88 -23
- package/dist/src/stack/scfStack/scfExecutor.js +39 -1
- package/dist/src/stack/scfStack/scfPlanner.js +21 -3
- package/dist/src/stack/scfStack/scfResource.js +686 -24
- package/dist/src/stack/scfStack/scfTypes.js +6 -0
- package/dist/src/stack/scfStack/sharedLogset.js +126 -0
- package/dist/src/stack/scfStack/tdsqlcExecutor.js +39 -1
- package/dist/src/stack/scfStack/tdsqlcPlanner.js +12 -1
- package/dist/src/stack/scfStack/tdsqlcResource.js +95 -16
- package/dist/src/stack/scfStack/tdsqlcTypes.js +5 -1
- package/dist/src/stack/volcengineStack/apigwExecutor.js +39 -1
- package/dist/src/stack/volcengineStack/apigwPlanner.js +25 -53
- package/dist/src/stack/volcengineStack/apigwResource.js +434 -222
- package/dist/src/stack/volcengineStack/apigwTypes.js +85 -66
- package/dist/src/stack/volcengineStack/deployer.js +49 -14
- package/dist/src/stack/volcengineStack/destroyer.js +13 -1
- package/dist/src/stack/volcengineStack/index.js +1 -2
- package/dist/src/stack/volcengineStack/sharedLogProject.js +190 -0
- package/dist/src/stack/volcengineStack/tosExecutor.js +25 -2
- package/dist/src/stack/volcengineStack/tosPlanner.js +11 -1
- package/dist/src/stack/volcengineStack/tosResource.js +82 -27
- package/dist/src/stack/volcengineStack/tosTypes.js +12 -0
- package/dist/src/stack/volcengineStack/vefaasExecutor.js +25 -2
- package/dist/src/stack/volcengineStack/vefaasPlanner.js +78 -2
- package/dist/src/stack/volcengineStack/vefaasResource.js +194 -144
- package/dist/src/stack/volcengineStack/vefaasTypes.js +1 -3
- package/dist/src/types/domains/backend.js +1 -0
- package/dist/src/types/domains/state.js +32 -1
- package/dist/src/validator/eventSchema.js +10 -0
- package/dist/src/validator/functionSchema.js +37 -12
- package/dist/src/validator/iacSchema.js +1 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +5 -2
|
@@ -33,7 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
33
33
|
};
|
|
34
34
|
})();
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
-
exports.createApigwOperations = exports.isDomainAlreadyBoundError = exports.isNetworkTimeoutError = void 0;
|
|
36
|
+
exports.createApigwOperations = exports.isApigwNotFoundError = exports.isDomainAlreadyBoundError = exports.isNetworkTimeoutError = void 0;
|
|
37
37
|
const cloudapi = __importStar(require("@alicloud/cloudapi20160714"));
|
|
38
38
|
const node_dns_1 = require("node:dns");
|
|
39
39
|
const dnsOperations_1 = require("./dnsOperations");
|
|
@@ -71,6 +71,14 @@ const isDomainAlreadyBoundError = (error) => {
|
|
|
71
71
|
(err.message?.toLowerCase().includes('domain bindedbyother') ?? false));
|
|
72
72
|
};
|
|
73
73
|
exports.isDomainAlreadyBoundError = isDomainAlreadyBoundError;
|
|
74
|
+
const isApigwNotFoundError = (error) => {
|
|
75
|
+
if (!error || typeof error !== 'object')
|
|
76
|
+
return false;
|
|
77
|
+
const err = error;
|
|
78
|
+
return ((typeof err.code === 'string' && err.code.includes('NotFound')) ||
|
|
79
|
+
(typeof err.message === 'string' && err.message.includes('NotFound')));
|
|
80
|
+
};
|
|
81
|
+
exports.isApigwNotFoundError = isApigwNotFoundError;
|
|
74
82
|
/* istanbul ignore next */
|
|
75
83
|
const createApigwOperations = (apigwClient, dnsClient, _context) => {
|
|
76
84
|
const dnsOps = (0, dnsOperations_1.createDnsOperations)(dnsClient);
|
|
@@ -349,7 +357,7 @@ const createApigwOperations = (apigwClient, dnsClient, _context) => {
|
|
|
349
357
|
logger_1.logger.error(`\n${separator}\n${lang_1.lang.__('APIGW_VERIFICATION_HEADER')}\n${separator}\n${lang_1.lang.__('APIGW_VERIFICATION_DOMAIN', { domain: domainName })}\n\n${lang_1.lang.__('APIGW_VERIFICATION_INSTRUCTIONS')}\n\n${lang_1.lang.__('APIGW_VERIFICATION_OPTION1')}\n${lang_1.lang.__('APIGW_VERIFICATION_RECORD_NAME', { name: domainName })}\n${lang_1.lang.__('APIGW_VERIFICATION_RECORD_TYPE', { type: 'CNAME' })}\n${lang_1.lang.__('APIGW_VERIFICATION_RECORD_VALUE', { value: groupSubdomain })}\n\n${lang_1.lang.__('APIGW_VERIFICATION_OPTION2')}\n${lang_1.lang.__('APIGW_VERIFICATION_RECORD_NAME', { name: txtRecord.rr })}\n${lang_1.lang.__('APIGW_VERIFICATION_RECORD_TYPE', { type: 'TXT' })}\n${lang_1.lang.__('APIGW_VERIFICATION_RECORD_VALUE', { value: txtRecord.value })}`);
|
|
350
358
|
logger_1.logger.error(`\n${separator}\n${lang_1.lang.__('APIGW_VERIFICATION_NEXT_STEPS')}\n${lang_1.lang.__('APIGW_VERIFICATION_STEP1')}\n${lang_1.lang.__('APIGW_VERIFICATION_STEP2')}\n${separator}\n`);
|
|
351
359
|
};
|
|
352
|
-
|
|
360
|
+
const operations = {
|
|
353
361
|
/**
|
|
354
362
|
* Create an API Gateway group
|
|
355
363
|
*/
|
|
@@ -379,28 +387,103 @@ const createApigwOperations = (apigwClient, dnsClient, _context) => {
|
|
|
379
387
|
if (!response.body) {
|
|
380
388
|
return null;
|
|
381
389
|
}
|
|
382
|
-
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
395
|
-
|
|
396
|
-
|
|
390
|
+
const body = response.body;
|
|
391
|
+
const groupInfo = {
|
|
392
|
+
groupId: body.groupId,
|
|
393
|
+
groupName: body.groupName,
|
|
394
|
+
description: body.description,
|
|
395
|
+
basePath: body.basePath,
|
|
396
|
+
subDomain: body.subDomain,
|
|
397
|
+
instanceId: body.instanceId,
|
|
398
|
+
instanceType: body.instanceType,
|
|
399
|
+
regionId: body.regionId,
|
|
400
|
+
status: body.status,
|
|
401
|
+
createdTime: body.createdTime,
|
|
402
|
+
modifiedTime: body.modifiedTime,
|
|
403
|
+
billingStatus: body.billingStatus,
|
|
404
|
+
illegalStatus: body.illegalStatus,
|
|
405
|
+
trafficLimit: body.trafficLimit,
|
|
406
|
+
// Maximum-detail fields — retain everything DescribeApiGroup returns.
|
|
407
|
+
customDomains: body.customDomains?.domainItem?.map((d) => ({
|
|
408
|
+
bindStageAlias: d.bindStageAlias,
|
|
409
|
+
bindStageName: d.bindStageName,
|
|
410
|
+
certificateId: d.certificateId,
|
|
411
|
+
certificateName: d.certificateName,
|
|
412
|
+
certificateValidEnd: d.certificateValidEnd,
|
|
413
|
+
certificateValidStart: d.certificateValidStart,
|
|
414
|
+
clientCertSDnPassThrough: d.clientCertSDnPassThrough,
|
|
415
|
+
customDomainType: d.customDomainType,
|
|
416
|
+
domainBindingStatus: d.domainBindingStatus,
|
|
417
|
+
domainCNAMEStatus: d.domainCNAMEStatus,
|
|
418
|
+
domainLegalStatus: d.domainLegalStatus,
|
|
419
|
+
domainName: d.domainName,
|
|
420
|
+
domainRemark: d.domainRemark,
|
|
421
|
+
domainWebSocketStatus: d.domainWebSocketStatus,
|
|
422
|
+
isHttpRedirectToHttps: d.isHttpRedirectToHttps,
|
|
423
|
+
sslOcspCacheEnable: d.sslOcspCacheEnable,
|
|
424
|
+
sslOcspEnable: d.sslOcspEnable,
|
|
425
|
+
sslVerifyDepth: d.sslVerifyDepth,
|
|
426
|
+
wildcardDomainPatterns: d.wildcardDomainPatterns,
|
|
427
|
+
})),
|
|
428
|
+
stageItems: body.stageItems?.stageInfo?.map((s) => ({
|
|
429
|
+
description: s.description,
|
|
430
|
+
stageId: s.stageId,
|
|
431
|
+
stageName: s.stageName,
|
|
432
|
+
})),
|
|
433
|
+
defaultDomain: body.defaultDomain,
|
|
434
|
+
vpcDomain: body.vpcDomain,
|
|
435
|
+
vpcSlbIntranetDomain: body.vpcSlbIntranetDomain,
|
|
436
|
+
httpsPolicy: body.httpsPolicy,
|
|
437
|
+
ipv6Status: body.ipv6Status,
|
|
438
|
+
migrationStatus: body.migrationStatus,
|
|
439
|
+
migrationError: body.migrationError,
|
|
440
|
+
passthroughHeaders: body.passthroughHeaders,
|
|
441
|
+
userLogConfig: body.userLogConfig,
|
|
442
|
+
customTraceConfig: body.customTraceConfig,
|
|
443
|
+
customerConfigs: body.customerConfigs,
|
|
444
|
+
customAppCodeConfig: body.customAppCodeConfig,
|
|
445
|
+
dedicatedInstanceType: body.dedicatedInstanceType,
|
|
446
|
+
disableInnerDomain: body.disableInnerDomain,
|
|
447
|
+
cloudMarketCommodity: body.cloudMarketCommodity,
|
|
448
|
+
cmsMonitorGroup: body.cmsMonitorGroup,
|
|
449
|
+
compatibleFlags: body.compatibleFlags,
|
|
397
450
|
};
|
|
451
|
+
try {
|
|
452
|
+
const tags = await operations.getGroupTags(groupId);
|
|
453
|
+
if (tags) {
|
|
454
|
+
groupInfo.tags = tags;
|
|
455
|
+
}
|
|
456
|
+
}
|
|
457
|
+
catch {
|
|
458
|
+
// Tags are best-effort; group detail is still returned without them.
|
|
459
|
+
}
|
|
460
|
+
return groupInfo;
|
|
398
461
|
}
|
|
399
462
|
catch (error) {
|
|
400
|
-
if (error
|
|
401
|
-
|
|
402
|
-
|
|
403
|
-
|
|
463
|
+
if ((0, exports.isApigwNotFoundError)(error)) {
|
|
464
|
+
return null;
|
|
465
|
+
}
|
|
466
|
+
throw error;
|
|
467
|
+
}
|
|
468
|
+
},
|
|
469
|
+
/**
|
|
470
|
+
* Fetch resource tags for an API group (ListTagResources).
|
|
471
|
+
*/
|
|
472
|
+
getGroupTags: async (groupId) => {
|
|
473
|
+
try {
|
|
474
|
+
const request = new cloudapi.ListTagResourcesRequest({
|
|
475
|
+
resourceType: 'apiGroup',
|
|
476
|
+
resourceId: [groupId],
|
|
477
|
+
});
|
|
478
|
+
const response = await apigwClient.listTagResources(request);
|
|
479
|
+
const tagResources = response.body?.tagResources?.tagResource ?? [];
|
|
480
|
+
if (tagResources.length === 0) {
|
|
481
|
+
return null;
|
|
482
|
+
}
|
|
483
|
+
return tagResources.map((t) => ({ Key: t.tagKey, Value: t.tagValue }));
|
|
484
|
+
}
|
|
485
|
+
catch (error) {
|
|
486
|
+
if ((0, exports.isApigwNotFoundError)(error)) {
|
|
404
487
|
return null;
|
|
405
488
|
}
|
|
406
489
|
throw error;
|
|
@@ -433,9 +516,13 @@ const createApigwOperations = (apigwClient, dnsClient, _context) => {
|
|
|
433
516
|
instanceId: group.instanceId,
|
|
434
517
|
instanceType: group.instanceType,
|
|
435
518
|
regionId: group.regionId,
|
|
519
|
+
httpsPolicy: group.httpsPolicy,
|
|
520
|
+
createdTime: group.createdTime,
|
|
521
|
+
modifiedTime: group.modifiedTime,
|
|
436
522
|
billingStatus: group.billingStatus,
|
|
437
523
|
illegalStatus: group.illegalStatus,
|
|
438
524
|
trafficLimit: group.trafficLimit,
|
|
525
|
+
tags: group.tags?.tagInfo?.map((t) => ({ Key: t.key, Value: t.value })),
|
|
439
526
|
};
|
|
440
527
|
},
|
|
441
528
|
/**
|
|
@@ -457,7 +544,19 @@ const createApigwOperations = (apigwClient, dnsClient, _context) => {
|
|
|
457
544
|
const request = new cloudapi.DeleteApiGroupRequest({
|
|
458
545
|
groupId,
|
|
459
546
|
});
|
|
460
|
-
|
|
547
|
+
try {
|
|
548
|
+
await apigwClient.deleteApiGroup(request);
|
|
549
|
+
}
|
|
550
|
+
catch (error) {
|
|
551
|
+
if ((0, exports.isApigwNotFoundError)(error)) {
|
|
552
|
+
logger_1.logger.warn(lang_1.lang.__('RESOURCE_NOT_FOUND_PROVIDER', {
|
|
553
|
+
resourceType: 'API Gateway group',
|
|
554
|
+
name: groupId,
|
|
555
|
+
}));
|
|
556
|
+
return;
|
|
557
|
+
}
|
|
558
|
+
throw error;
|
|
559
|
+
}
|
|
461
560
|
},
|
|
462
561
|
/**
|
|
463
562
|
* Create an API in API Gateway
|
|
@@ -528,7 +627,7 @@ const createApigwOperations = (apigwClient, dnsClient, _context) => {
|
|
|
528
627
|
return null;
|
|
529
628
|
}
|
|
530
629
|
const body = response.body;
|
|
531
|
-
|
|
630
|
+
const apiInfo = {
|
|
532
631
|
apiId: body.apiId,
|
|
533
632
|
apiName: body.apiName,
|
|
534
633
|
groupId: body.groupId,
|
|
@@ -543,6 +642,9 @@ const createApigwOperations = (apigwClient, dnsClient, _context) => {
|
|
|
543
642
|
requestPath: body.requestConfig.requestPath,
|
|
544
643
|
requestMode: body.requestConfig.requestMode,
|
|
545
644
|
bodyFormat: body.requestConfig.bodyFormat,
|
|
645
|
+
bodyModel: body.requestConfig.bodyModel,
|
|
646
|
+
escapePathParam: body.requestConfig.escapePathParam,
|
|
647
|
+
postBodyDescription: body.requestConfig.postBodyDescription,
|
|
546
648
|
}
|
|
547
649
|
: undefined,
|
|
548
650
|
serviceConfig: body.serviceConfig
|
|
@@ -552,6 +654,41 @@ const createApigwOperations = (apigwClient, dnsClient, _context) => {
|
|
|
552
654
|
serviceHttpMethod: body.serviceConfig.serviceHttpMethod,
|
|
553
655
|
servicePath: body.serviceConfig.servicePath,
|
|
554
656
|
serviceTimeout: body.serviceConfig.serviceTimeout,
|
|
657
|
+
aoneAppName: body.serviceConfig.aoneAppName,
|
|
658
|
+
contentTypeCatagory: body.serviceConfig.contentTypeCatagory,
|
|
659
|
+
contentTypeValue: body.serviceConfig.contentTypeValue,
|
|
660
|
+
eventBridgeConfig: body.serviceConfig.eventBridgeConfig
|
|
661
|
+
? {
|
|
662
|
+
eventBridgeRegionId: body.serviceConfig.eventBridgeConfig.eventBridgeRegionId,
|
|
663
|
+
eventBus: body.serviceConfig.eventBridgeConfig.eventBus,
|
|
664
|
+
eventSource: body.serviceConfig.eventBridgeConfig.eventSource,
|
|
665
|
+
roleArn: body.serviceConfig.eventBridgeConfig.roleArn,
|
|
666
|
+
}
|
|
667
|
+
: undefined,
|
|
668
|
+
mock: body.serviceConfig.mock,
|
|
669
|
+
mockHeaders: body.serviceConfig.mockHeaders?.mockHeader?.map((h) => ({
|
|
670
|
+
headerName: h.headerName,
|
|
671
|
+
headerValue: h.headerValue,
|
|
672
|
+
})),
|
|
673
|
+
mockStatusCode: body.serviceConfig.mockStatusCode,
|
|
674
|
+
ossConfig: body.serviceConfig.ossConfig
|
|
675
|
+
? {
|
|
676
|
+
action: body.serviceConfig.ossConfig.action,
|
|
677
|
+
bucketName: body.serviceConfig.ossConfig.bucketName,
|
|
678
|
+
key: body.serviceConfig.ossConfig.key,
|
|
679
|
+
ossRegionId: body.serviceConfig.ossConfig.ossRegionId,
|
|
680
|
+
}
|
|
681
|
+
: undefined,
|
|
682
|
+
serviceVpcEnable: body.serviceConfig.serviceVpcEnable,
|
|
683
|
+
vpcConfig: body.serviceConfig.vpcConfig
|
|
684
|
+
? {
|
|
685
|
+
instanceId: body.serviceConfig.vpcConfig.instanceId,
|
|
686
|
+
name: body.serviceConfig.vpcConfig.name,
|
|
687
|
+
port: body.serviceConfig.vpcConfig.port,
|
|
688
|
+
vpcId: body.serviceConfig.vpcConfig.vpcId,
|
|
689
|
+
vpcScheme: body.serviceConfig.vpcConfig.vpcScheme,
|
|
690
|
+
}
|
|
691
|
+
: undefined,
|
|
555
692
|
functionComputeConfig: body.serviceConfig.functionComputeConfig
|
|
556
693
|
? {
|
|
557
694
|
fcRegionId: body.serviceConfig.functionComputeConfig.fcRegionId,
|
|
@@ -559,6 +696,16 @@ const createApigwOperations = (apigwClient, dnsClient, _context) => {
|
|
|
559
696
|
roleArn: body.serviceConfig.functionComputeConfig.roleArn,
|
|
560
697
|
fcVersion: body.serviceConfig.functionComputeConfig.fcVersion,
|
|
561
698
|
method: body.serviceConfig.functionComputeConfig.method,
|
|
699
|
+
contentTypeCatagory: body.serviceConfig.functionComputeConfig.contentTypeCatagory,
|
|
700
|
+
contentTypeValue: body.serviceConfig.functionComputeConfig.contentTypeValue,
|
|
701
|
+
fcBaseUrl: body.serviceConfig.functionComputeConfig.fcBaseUrl,
|
|
702
|
+
fcType: body.serviceConfig.functionComputeConfig.fcType,
|
|
703
|
+
onlyBusinessPath: body.serviceConfig.functionComputeConfig.onlyBusinessPath,
|
|
704
|
+
path: body.serviceConfig.functionComputeConfig.path,
|
|
705
|
+
qualifier: body.serviceConfig.functionComputeConfig.qualifier,
|
|
706
|
+
regionId: body.serviceConfig.functionComputeConfig.regionId,
|
|
707
|
+
serviceName: body.serviceConfig.functionComputeConfig.serviceName,
|
|
708
|
+
triggerName: body.serviceConfig.functionComputeConfig.triggerName,
|
|
562
709
|
}
|
|
563
710
|
: undefined,
|
|
564
711
|
mockResult: body.serviceConfig.mockResult,
|
|
@@ -566,6 +713,87 @@ const createApigwOperations = (apigwClient, dnsClient, _context) => {
|
|
|
566
713
|
: undefined,
|
|
567
714
|
resultType: body.resultType,
|
|
568
715
|
resultSample: body.resultSample,
|
|
716
|
+
failResultSample: body.failResultSample,
|
|
717
|
+
regionId: body.regionId,
|
|
718
|
+
tagList: body.tagList?.tag?.map((t) => ({ tagKey: t.tagKey, tagValue: t.tagValue })),
|
|
719
|
+
backendConfig: body.backendConfig
|
|
720
|
+
? {
|
|
721
|
+
backendId: body.backendConfig.backendId,
|
|
722
|
+
backendName: body.backendConfig.backendName,
|
|
723
|
+
backendType: body.backendConfig.backendType,
|
|
724
|
+
}
|
|
725
|
+
: undefined,
|
|
726
|
+
backendEnable: body.backendEnable,
|
|
727
|
+
openIdConnectConfig: body.openIdConnectConfig
|
|
728
|
+
? {
|
|
729
|
+
idTokenParamName: body.openIdConnectConfig.idTokenParamName,
|
|
730
|
+
openIdApiType: body.openIdConnectConfig.openIdApiType,
|
|
731
|
+
publicKey: body.openIdConnectConfig.publicKey,
|
|
732
|
+
publicKeyId: body.openIdConnectConfig.publicKeyId,
|
|
733
|
+
}
|
|
734
|
+
: undefined,
|
|
735
|
+
requestParameters: body.requestParameters?.requestParameter?.map((p) => ({
|
|
736
|
+
apiParameterName: p.apiParameterName,
|
|
737
|
+
arrayItemsType: p.arrayItemsType,
|
|
738
|
+
defaultValue: p.defaultValue,
|
|
739
|
+
demoValue: p.demoValue,
|
|
740
|
+
description: p.description,
|
|
741
|
+
docOrder: p.docOrder,
|
|
742
|
+
docShow: p.docShow,
|
|
743
|
+
enumValue: p.enumValue,
|
|
744
|
+
jsonScheme: p.jsonScheme,
|
|
745
|
+
location: p.location,
|
|
746
|
+
maxLength: p.maxLength,
|
|
747
|
+
maxValue: p.maxValue,
|
|
748
|
+
minLength: p.minLength,
|
|
749
|
+
minValue: p.minValue,
|
|
750
|
+
parameterType: p.parameterType,
|
|
751
|
+
regularExpression: p.regularExpression,
|
|
752
|
+
required: p.required,
|
|
753
|
+
})),
|
|
754
|
+
serviceParameters: body.serviceParameters?.serviceParameter?.map((p) => ({
|
|
755
|
+
location: p.location,
|
|
756
|
+
parameterType: p.parameterType,
|
|
757
|
+
serviceParameterName: p.serviceParameterName,
|
|
758
|
+
})),
|
|
759
|
+
serviceParametersMap: body.serviceParametersMap?.serviceParameterMap?.map((p) => ({
|
|
760
|
+
requestParameterName: p.requestParameterName,
|
|
761
|
+
serviceParameterName: p.serviceParameterName,
|
|
762
|
+
})),
|
|
763
|
+
systemParameters: body.systemParameters?.systemParameter?.map((p) => ({
|
|
764
|
+
demoValue: p.demoValue,
|
|
765
|
+
description: p.description,
|
|
766
|
+
location: p.location,
|
|
767
|
+
parameterName: p.parameterName,
|
|
768
|
+
serviceParameterName: p.serviceParameterName,
|
|
769
|
+
})),
|
|
770
|
+
customSystemParameters: body.customSystemParameters?.customSystemParameter?.map((p) => ({
|
|
771
|
+
demoValue: p.demoValue,
|
|
772
|
+
description: p.description,
|
|
773
|
+
location: p.location,
|
|
774
|
+
parameterName: p.parameterName,
|
|
775
|
+
serviceParameterName: p.serviceParameterName,
|
|
776
|
+
})),
|
|
777
|
+
constantParameters: body.constantParameters?.constantParameter?.map((p) => ({
|
|
778
|
+
constantValue: p.constantValue,
|
|
779
|
+
description: p.description,
|
|
780
|
+
location: p.location,
|
|
781
|
+
serviceParameterName: p.serviceParameterName,
|
|
782
|
+
})),
|
|
783
|
+
errorCodeSamples: body.errorCodeSamples?.errorCodeSample?.map((e) => ({
|
|
784
|
+
code: e.code,
|
|
785
|
+
description: e.description,
|
|
786
|
+
message: e.message,
|
|
787
|
+
model: e.model,
|
|
788
|
+
})),
|
|
789
|
+
resultBodyModel: body.resultBodyModel,
|
|
790
|
+
mock: body.mock,
|
|
791
|
+
mockResult: body.mockResult,
|
|
792
|
+
disableInternet: body.disableInternet,
|
|
793
|
+
forceNonceCheck: body.forceNonceCheck,
|
|
794
|
+
allowSignatureMethod: body.allowSignatureMethod,
|
|
795
|
+
appCodeAuthType: body.appCodeAuthType,
|
|
796
|
+
webSocketApiType: body.webSocketApiType,
|
|
569
797
|
createdTime: body.createdTime,
|
|
570
798
|
modifiedTime: body.modifiedTime,
|
|
571
799
|
deployedInfos: body.deployedInfos?.deployedInfo?.map((info) => ({
|
|
@@ -574,12 +802,44 @@ const createApigwOperations = (apigwClient, dnsClient, _context) => {
|
|
|
574
802
|
effectiveVersion: info.effectiveVersion,
|
|
575
803
|
})),
|
|
576
804
|
};
|
|
805
|
+
if (!apiInfo.tagList || apiInfo.tagList.length === 0) {
|
|
806
|
+
try {
|
|
807
|
+
const tags = await operations.getApiTags(groupId, apiId);
|
|
808
|
+
if (tags) {
|
|
809
|
+
apiInfo.tagList = tags;
|
|
810
|
+
}
|
|
811
|
+
}
|
|
812
|
+
catch {
|
|
813
|
+
// Tags are best-effort; API detail is still returned without them.
|
|
814
|
+
}
|
|
815
|
+
}
|
|
816
|
+
return apiInfo;
|
|
577
817
|
}
|
|
578
818
|
catch (error) {
|
|
579
|
-
if (error
|
|
580
|
-
|
|
581
|
-
|
|
582
|
-
|
|
819
|
+
if ((0, exports.isApigwNotFoundError)(error)) {
|
|
820
|
+
return null;
|
|
821
|
+
}
|
|
822
|
+
throw error;
|
|
823
|
+
}
|
|
824
|
+
},
|
|
825
|
+
/**
|
|
826
|
+
* Fetch resource tags for an API (ListTagResources).
|
|
827
|
+
*/
|
|
828
|
+
getApiTags: async (groupId, apiId) => {
|
|
829
|
+
try {
|
|
830
|
+
const request = new cloudapi.ListTagResourcesRequest({
|
|
831
|
+
resourceType: 'api',
|
|
832
|
+
resourceId: [apiId],
|
|
833
|
+
});
|
|
834
|
+
const response = await apigwClient.listTagResources(request);
|
|
835
|
+
const tagResources = response.body?.tagResources?.tagResource ?? [];
|
|
836
|
+
if (tagResources.length === 0) {
|
|
837
|
+
return null;
|
|
838
|
+
}
|
|
839
|
+
return tagResources.map((t) => ({ tagKey: t.tagKey, tagValue: t.tagValue }));
|
|
840
|
+
}
|
|
841
|
+
catch (error) {
|
|
842
|
+
if ((0, exports.isApigwNotFoundError)(error)) {
|
|
583
843
|
return null;
|
|
584
844
|
}
|
|
585
845
|
throw error;
|
|
@@ -656,7 +916,19 @@ const createApigwOperations = (apigwClient, dnsClient, _context) => {
|
|
|
656
916
|
groupId,
|
|
657
917
|
apiId,
|
|
658
918
|
});
|
|
659
|
-
|
|
919
|
+
try {
|
|
920
|
+
await apigwClient.deleteApi(request);
|
|
921
|
+
}
|
|
922
|
+
catch (error) {
|
|
923
|
+
if ((0, exports.isApigwNotFoundError)(error)) {
|
|
924
|
+
logger_1.logger.warn(lang_1.lang.__('RESOURCE_NOT_FOUND_PROVIDER', {
|
|
925
|
+
resourceType: 'API',
|
|
926
|
+
name: apiId,
|
|
927
|
+
}));
|
|
928
|
+
return;
|
|
929
|
+
}
|
|
930
|
+
throw error;
|
|
931
|
+
}
|
|
660
932
|
},
|
|
661
933
|
/**
|
|
662
934
|
* Deploy API to a stage
|
|
@@ -679,7 +951,19 @@ const createApigwOperations = (apigwClient, dnsClient, _context) => {
|
|
|
679
951
|
apiId,
|
|
680
952
|
stageName,
|
|
681
953
|
});
|
|
682
|
-
|
|
954
|
+
try {
|
|
955
|
+
await apigwClient.abolishApi(request);
|
|
956
|
+
}
|
|
957
|
+
catch (error) {
|
|
958
|
+
if ((0, exports.isApigwNotFoundError)(error)) {
|
|
959
|
+
logger_1.logger.warn(lang_1.lang.__('RESOURCE_NOT_FOUND_PROVIDER', {
|
|
960
|
+
resourceType: `API deployment ${apiId}`,
|
|
961
|
+
name: stageName,
|
|
962
|
+
}));
|
|
963
|
+
return;
|
|
964
|
+
}
|
|
965
|
+
throw error;
|
|
966
|
+
}
|
|
683
967
|
},
|
|
684
968
|
/**
|
|
685
969
|
* Per Aliyun docs: CNAME must exist BEFORE calling SetDomain.
|
|
@@ -814,8 +1098,57 @@ const createApigwOperations = (apigwClient, dnsClient, _context) => {
|
|
|
814
1098
|
groupId,
|
|
815
1099
|
domainName,
|
|
816
1100
|
});
|
|
817
|
-
|
|
1101
|
+
try {
|
|
1102
|
+
await apigwClient.deleteDomain(request);
|
|
1103
|
+
}
|
|
1104
|
+
catch (error) {
|
|
1105
|
+
if ((0, exports.isApigwNotFoundError)(error)) {
|
|
1106
|
+
logger_1.logger.warn(lang_1.lang.__('RESOURCE_NOT_FOUND_PROVIDER', {
|
|
1107
|
+
resourceType: 'custom domain',
|
|
1108
|
+
name: domainName,
|
|
1109
|
+
}));
|
|
1110
|
+
return;
|
|
1111
|
+
}
|
|
1112
|
+
throw error;
|
|
1113
|
+
}
|
|
1114
|
+
},
|
|
1115
|
+
/**
|
|
1116
|
+
* Describe the region-wide PROVIDER gateway log configuration (createLogConfig
|
|
1117
|
+
* is a regional singleton: one PROVIDER config per region, not per group).
|
|
1118
|
+
* Returns null when no PROVIDER config exists.
|
|
1119
|
+
*/
|
|
1120
|
+
describeGatewayLogConfig: async () => {
|
|
1121
|
+
const request = new cloudapi.DescribeLogConfigRequest({
|
|
1122
|
+
logType: 'PROVIDER',
|
|
1123
|
+
});
|
|
1124
|
+
const response = await apigwClient.describeLogConfig(request);
|
|
1125
|
+
const logInfos = response.body?.logInfos?.logInfo ?? [];
|
|
1126
|
+
const provider = logInfos.find((info) => info.logType === 'PROVIDER');
|
|
1127
|
+
if (!provider) {
|
|
1128
|
+
return null;
|
|
1129
|
+
}
|
|
1130
|
+
return {
|
|
1131
|
+
logType: provider.logType,
|
|
1132
|
+
regionId: provider.regionId,
|
|
1133
|
+
slsProject: provider.slsProject,
|
|
1134
|
+
slsLogStore: provider.slsLogStore,
|
|
1135
|
+
};
|
|
1136
|
+
},
|
|
1137
|
+
/**
|
|
1138
|
+
* Create the region-wide PROVIDER gateway log configuration. Intentionally no
|
|
1139
|
+
* modify/delete wrappers: a foreign PROVIDER config must never be mutated or
|
|
1140
|
+
* removed by ServerlessInsight — higher-level code decides via describe.
|
|
1141
|
+
*/
|
|
1142
|
+
createGatewayLogConfig: async (config) => {
|
|
1143
|
+
const request = new cloudapi.CreateLogConfigRequest({
|
|
1144
|
+
logType: 'PROVIDER',
|
|
1145
|
+
slsProject: config.slsProject,
|
|
1146
|
+
slsLogStore: config.slsLogStore,
|
|
1147
|
+
createSlr: true,
|
|
1148
|
+
});
|
|
1149
|
+
await apigwClient.createLogConfig(request);
|
|
818
1150
|
},
|
|
819
1151
|
};
|
|
1152
|
+
return operations;
|
|
820
1153
|
};
|
|
821
1154
|
exports.createApigwOperations = createApigwOperations;
|
|
@@ -37,6 +37,7 @@ exports.createEsOperations = exports.EsAppStatus = void 0;
|
|
|
37
37
|
const EsModels = __importStar(require("@alicloud/es-serverless20230627"));
|
|
38
38
|
const logger_1 = require("../logger");
|
|
39
39
|
const lang_1 = require("../../lang");
|
|
40
|
+
const polling_1 = require("../polling");
|
|
40
41
|
var EsAppStatus;
|
|
41
42
|
(function (EsAppStatus) {
|
|
42
43
|
EsAppStatus["ACTIVE"] = "ACTIVE";
|
|
@@ -46,25 +47,35 @@ var EsAppStatus;
|
|
|
46
47
|
EsAppStatus["FAILED"] = "FAILED";
|
|
47
48
|
})(EsAppStatus || (exports.EsAppStatus = EsAppStatus = {}));
|
|
48
49
|
const waitForEsAppReady = async (getApp, appId) => {
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
50
|
+
try {
|
|
51
|
+
await (0, polling_1.pollUntil)({
|
|
52
|
+
description: `ES app ${appId} to be ready`,
|
|
53
|
+
fetch: async () => {
|
|
54
|
+
const app = await getApp(appId);
|
|
55
|
+
if (!app) {
|
|
56
|
+
throw new Error(lang_1.lang.__('ES_APP_NOT_FOUND', { appId }));
|
|
57
|
+
}
|
|
58
|
+
if (app.status === EsAppStatus.DELETED || app.status === EsAppStatus.FAILED) {
|
|
59
|
+
throw new Error(lang_1.lang.__('ES_APP_ERROR_STATE', { status: app.status }));
|
|
60
|
+
}
|
|
61
|
+
return app;
|
|
62
|
+
},
|
|
63
|
+
isDone: (app) => app?.status === EsAppStatus.ACTIVE,
|
|
64
|
+
intervalMs: 10000,
|
|
65
|
+
maxAttempts: 60,
|
|
66
|
+
onProgress: (app) => {
|
|
67
|
+
if (app)
|
|
68
|
+
logger_1.logger.info(lang_1.lang.__('ES_APP_WAITING', { appId, status: app.status ?? 'unknown' }));
|
|
69
|
+
},
|
|
70
|
+
});
|
|
71
|
+
logger_1.logger.info(lang_1.lang.__('ES_APP_READY', { appId }));
|
|
72
|
+
}
|
|
73
|
+
catch (e) {
|
|
74
|
+
if (e instanceof polling_1.PollingTimeoutError) {
|
|
75
|
+
throw new Error(lang_1.lang.__('ES_APP_TIMEOUT_READY', { appId }), { cause: e });
|
|
62
76
|
}
|
|
63
|
-
|
|
64
|
-
await new Promise((resolve) => setTimeout(resolve, 10000));
|
|
65
|
-
attempts++;
|
|
77
|
+
throw e;
|
|
66
78
|
}
|
|
67
|
-
throw new Error(lang_1.lang.__('ES_APP_TIMEOUT_READY', { appId }));
|
|
68
79
|
};
|
|
69
80
|
const createEsOperations = (esClient, context) => {
|
|
70
81
|
const operations = {
|
|
@@ -185,20 +196,23 @@ const createEsOperations = (esClient, context) => {
|
|
|
185
196
|
try {
|
|
186
197
|
await esClient.deleteApp(appName);
|
|
187
198
|
logger_1.logger.info(lang_1.lang.__('ES_APP_DELETION_INITIATED', { appName }));
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
199
|
+
try {
|
|
200
|
+
await (0, polling_1.pollUntil)({
|
|
201
|
+
description: `ES app ${appName} to be deleted`,
|
|
202
|
+
fetch: () => operations.getApp(appName),
|
|
203
|
+
isDone: (app) => app === null,
|
|
204
|
+
intervalMs: 10000,
|
|
205
|
+
maxAttempts: 60,
|
|
206
|
+
onProgress: () => logger_1.logger.info(lang_1.lang.__('ES_APP_WAITING_DELETE', { appName })),
|
|
207
|
+
});
|
|
208
|
+
}
|
|
209
|
+
catch (e) {
|
|
210
|
+
if (e instanceof polling_1.PollingTimeoutError) {
|
|
211
|
+
throw new Error(lang_1.lang.__('ES_APP_TIMEOUT_DELETE', { appName }), { cause: e });
|
|
196
212
|
}
|
|
197
|
-
|
|
198
|
-
await new Promise((resolve) => setTimeout(resolve, 10000));
|
|
199
|
-
attempts++;
|
|
213
|
+
throw e;
|
|
200
214
|
}
|
|
201
|
-
|
|
215
|
+
logger_1.logger.info(lang_1.lang.__('ES_APP_DELETED', { appName }));
|
|
202
216
|
}
|
|
203
217
|
catch (error) {
|
|
204
218
|
// If app is not found, consider it deleted
|