@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
|
@@ -67,6 +67,54 @@ const getContentType = (filePath) => {
|
|
|
67
67
|
return contentTypes[ext] || 'application/octet-stream';
|
|
68
68
|
};
|
|
69
69
|
const createTosOperations = (client, _region) => {
|
|
70
|
+
// Map every field GetBucketInfo returns so state keeps maximum resource
|
|
71
|
+
// detail (owner, project, bucket type, AZ redundancy, S3 endpoints,
|
|
72
|
+
// versioning/acceleration toggles, server-side encryption config).
|
|
73
|
+
const mapBucketInfo = (bucketName, bucketData) => {
|
|
74
|
+
const owner = bucketData.Owner;
|
|
75
|
+
const sse = bucketData.ServerSideEncryptionConfiguration;
|
|
76
|
+
const sseRules = sse?.Rule;
|
|
77
|
+
return {
|
|
78
|
+
name: bucketName,
|
|
79
|
+
location: bucketData.Location,
|
|
80
|
+
creationDate: bucketData.CreationDate,
|
|
81
|
+
storageClass: bucketData.StorageClass,
|
|
82
|
+
extranetEndpoint: bucketData.ExtranetEndpoint,
|
|
83
|
+
intranetEndpoint: bucketData.IntranetEndpoint,
|
|
84
|
+
acl: bucketData.ACL,
|
|
85
|
+
owner: owner
|
|
86
|
+
? {
|
|
87
|
+
id: owner.ID,
|
|
88
|
+
displayName: owner.DisplayName,
|
|
89
|
+
}
|
|
90
|
+
: undefined,
|
|
91
|
+
projectName: bucketData.ProjectName,
|
|
92
|
+
type: bucketData.Type,
|
|
93
|
+
azRedundancy: bucketData.AzRedundancy,
|
|
94
|
+
extranetS3Endpoint: bucketData.ExtranetS3Endpoint,
|
|
95
|
+
intranetS3Endpoint: bucketData.IntranetS3Endpoint,
|
|
96
|
+
versioning: bucketData.Versioning,
|
|
97
|
+
crossRegionReplication: bucketData.CrossRegionReplication,
|
|
98
|
+
transferAcceleration: bucketData.TransferAcceleration,
|
|
99
|
+
accessMonitor: bucketData.AccessMonitor,
|
|
100
|
+
serverSideEncryptionConfiguration: sseRules
|
|
101
|
+
? {
|
|
102
|
+
rule: sseRules.map((rule) => {
|
|
103
|
+
const applyDefault = rule.ApplyServerSideEncryptionByDefault;
|
|
104
|
+
return {
|
|
105
|
+
applyServerSideEncryptionByDefault: applyDefault
|
|
106
|
+
? {
|
|
107
|
+
sseAlgorithm: applyDefault.SSEAlgorithm,
|
|
108
|
+
kmsMasterKeyId: applyDefault.KMSMasterKeyID ??
|
|
109
|
+
applyDefault.KMSMasterKeyId,
|
|
110
|
+
}
|
|
111
|
+
: undefined,
|
|
112
|
+
};
|
|
113
|
+
}),
|
|
114
|
+
}
|
|
115
|
+
: undefined,
|
|
116
|
+
};
|
|
117
|
+
};
|
|
70
118
|
return {
|
|
71
119
|
createBucket: async (config) => {
|
|
72
120
|
if (!client) {
|
|
@@ -81,13 +129,19 @@ const createTosOperations = (client, _region) => {
|
|
|
81
129
|
if (config.storageClass) {
|
|
82
130
|
params.StorageClass = config.storageClass;
|
|
83
131
|
}
|
|
132
|
+
// TOS CreateBucket accepts bucket tags via the x-tos-tagging HTTP header,
|
|
133
|
+
// formatted as URL-encoded key=value pairs joined by '&' (S3-compatible).
|
|
134
|
+
const headers = {
|
|
135
|
+
'content-type': 'application/xml',
|
|
136
|
+
};
|
|
137
|
+
if (config.Tags && config.Tags.length > 0) {
|
|
138
|
+
headers['x-tos-tagging'] = config.Tags.map((t) => `${encodeURIComponent(t.Key)}=${encodeURIComponent(t.Value)}`).join('&');
|
|
139
|
+
}
|
|
84
140
|
await client.fetchOpenAPI({
|
|
85
141
|
Action: 'CreateBucket',
|
|
86
142
|
Version: '2018-08-01',
|
|
87
143
|
method: 'PUT',
|
|
88
|
-
headers
|
|
89
|
-
'content-type': 'application/xml',
|
|
90
|
-
},
|
|
144
|
+
headers,
|
|
91
145
|
query: params,
|
|
92
146
|
});
|
|
93
147
|
logger_1.logger.info(lang_1.lang.__('TOS_BUCKET_CREATED', { bucketName: config.bucketName }));
|
|
@@ -126,15 +180,7 @@ const createTosOperations = (client, _region) => {
|
|
|
126
180
|
});
|
|
127
181
|
const result = (response.Result || {});
|
|
128
182
|
const bucketData = (result.BucketInfo || {});
|
|
129
|
-
return
|
|
130
|
-
name: config.bucketName,
|
|
131
|
-
location: bucketData.Location,
|
|
132
|
-
creationDate: bucketData.CreationDate,
|
|
133
|
-
storageClass: bucketData.StorageClass,
|
|
134
|
-
extranetEndpoint: bucketData.ExtranetEndpoint,
|
|
135
|
-
intranetEndpoint: bucketData.IntranetEndpoint,
|
|
136
|
-
acl: bucketData.ACL,
|
|
137
|
-
};
|
|
183
|
+
return mapBucketInfo(config.bucketName, bucketData);
|
|
138
184
|
})();
|
|
139
185
|
return bucketInfo;
|
|
140
186
|
},
|
|
@@ -178,15 +224,28 @@ const createTosOperations = (client, _region) => {
|
|
|
178
224
|
catch {
|
|
179
225
|
// Website config may not exist
|
|
180
226
|
}
|
|
227
|
+
let tags;
|
|
228
|
+
try {
|
|
229
|
+
const taggingResponse = await client.fetchOpenAPI({
|
|
230
|
+
Action: 'GetBucketTagging',
|
|
231
|
+
Version: '2018-08-01',
|
|
232
|
+
method: 'GET',
|
|
233
|
+
query: {
|
|
234
|
+
Bucket: bucketName,
|
|
235
|
+
},
|
|
236
|
+
});
|
|
237
|
+
const taggingResult = (taggingResponse.Result || {});
|
|
238
|
+
const tagSet = (taggingResult.TagSet || {});
|
|
239
|
+
const tagList = (tagSet.Tags || []);
|
|
240
|
+
tags = tagList.map((t) => ({ Key: t.Key, Value: t.Value }));
|
|
241
|
+
}
|
|
242
|
+
catch {
|
|
243
|
+
// Bucket tagging may not be configured
|
|
244
|
+
}
|
|
181
245
|
return {
|
|
182
|
-
|
|
183
|
-
location: bucketData.Location,
|
|
184
|
-
creationDate: bucketData.CreationDate,
|
|
185
|
-
storageClass: bucketData.StorageClass,
|
|
186
|
-
extranetEndpoint: bucketData.ExtranetEndpoint,
|
|
187
|
-
intranetEndpoint: bucketData.IntranetEndpoint,
|
|
188
|
-
acl: bucketData.ACL,
|
|
246
|
+
...mapBucketInfo(bucketName, bucketData),
|
|
189
247
|
websiteConfig,
|
|
248
|
+
Tags: tags,
|
|
190
249
|
};
|
|
191
250
|
}
|
|
192
251
|
catch (error) {
|
|
@@ -37,11 +37,15 @@ exports.createVefaasOperations = void 0;
|
|
|
37
37
|
const openapi_1 = require("@volcengine/openapi");
|
|
38
38
|
const logger_1 = require("../../common/logger");
|
|
39
39
|
const lang_1 = require("../../lang");
|
|
40
|
+
const polling_1 = require("../polling");
|
|
41
|
+
const constants_1 = require("../constants");
|
|
40
42
|
const fs = __importStar(require("node:fs"));
|
|
41
43
|
const MAX_ZIP_SIZE_MB = 50;
|
|
42
44
|
const MAX_ZIP_SIZE_BYTES = MAX_ZIP_SIZE_MB * 1024 * 1024;
|
|
43
45
|
const MAX_TOS_SIZE_MB = 500;
|
|
44
46
|
const MAX_TOS_SIZE_BYTES = MAX_TOS_SIZE_MB * 1024 * 1024;
|
|
47
|
+
const RELEASE_POLL_INTERVAL_MS = 2000;
|
|
48
|
+
const RELEASE_POLL_MAX_ATTEMPTS = 60;
|
|
45
49
|
const buildEnvVariables = (envs) => {
|
|
46
50
|
if (!envs)
|
|
47
51
|
return undefined;
|
|
@@ -126,13 +130,109 @@ const createVefaasOperations = (client) => {
|
|
|
126
130
|
const tosClient = new openapi_1.Service({
|
|
127
131
|
serviceName: 'tos',
|
|
128
132
|
defaultVersion: '2018-08-01',
|
|
129
|
-
|
|
130
|
-
host: 'tos-cn-beijing.volces.com',
|
|
133
|
+
host: `tos-${client.region}.volces.com`,
|
|
131
134
|
accessKeyId: client.accessKeyId,
|
|
132
135
|
secretKey: client.secretKey,
|
|
133
136
|
region: client.region,
|
|
134
137
|
});
|
|
135
|
-
|
|
138
|
+
// veFaaS identifies functions by their generated Id (not Name) for
|
|
139
|
+
// GetFunction/Update/Delete; callers probe by name, so list + match on Name.
|
|
140
|
+
const listAllFunctions = async () => {
|
|
141
|
+
const items = [];
|
|
142
|
+
let pageNumber = 1;
|
|
143
|
+
const pageSize = 100;
|
|
144
|
+
for (;;) {
|
|
145
|
+
const response = await client.fetchOpenAPI({
|
|
146
|
+
Action: 'ListFunctions',
|
|
147
|
+
Version: '2024-06-06',
|
|
148
|
+
method: 'POST',
|
|
149
|
+
headers: { 'content-type': 'application/json' },
|
|
150
|
+
data: { PageSize: pageSize, PageNumber: pageNumber },
|
|
151
|
+
});
|
|
152
|
+
const result = (response.Result || {});
|
|
153
|
+
const page = (result.Items || []);
|
|
154
|
+
items.push(...page);
|
|
155
|
+
if (page.length < pageSize)
|
|
156
|
+
break;
|
|
157
|
+
pageNumber += 1;
|
|
158
|
+
}
|
|
159
|
+
return items;
|
|
160
|
+
};
|
|
161
|
+
const resolveFunctionIdByName = async (functionName) => {
|
|
162
|
+
const functions = await listAllFunctions();
|
|
163
|
+
const match = functions.find((fn) => fn.Name === functionName);
|
|
164
|
+
return match?.Id ?? null;
|
|
165
|
+
};
|
|
166
|
+
const operations = {
|
|
167
|
+
// veFaaS 函数代码/配置更新后需发布(Release)才生效;API 网关上游
|
|
168
|
+
// 引用函数时要求函数已发布(OperationDenied.FunctionNotPublished)。
|
|
169
|
+
// RevisionNumber=0 表示发布 Latest 代码并创建新版本(官方 SDK 语义)。
|
|
170
|
+
// Release 是异步的:返回的 Status 可能仍是 inprogress,调用方(如
|
|
171
|
+
// CreateUpstream)必须等发布真正 done 才能引用函数,否则会拿到
|
|
172
|
+
// FunctionNotPublished。这里轮询 GetReleaseStatus 直到 done/failed。
|
|
173
|
+
releaseFunction: async (functionId) => {
|
|
174
|
+
const response = await client.fetchOpenAPI({
|
|
175
|
+
Action: 'Release',
|
|
176
|
+
Version: '2024-06-06',
|
|
177
|
+
method: 'POST',
|
|
178
|
+
headers: { 'content-type': 'application/json' },
|
|
179
|
+
data: {
|
|
180
|
+
FunctionId: functionId,
|
|
181
|
+
RevisionNumber: 0,
|
|
182
|
+
},
|
|
183
|
+
});
|
|
184
|
+
const result = (response.Result || {});
|
|
185
|
+
logger_1.logger.info(lang_1.lang.__('FUNCTION_RELEASED', { functionId }));
|
|
186
|
+
const releaseRecordId = result.ReleaseRecordId ?? undefined;
|
|
187
|
+
const releaseStatus = await (0, polling_1.pollUntil)({
|
|
188
|
+
description: `veFaaS function ${functionId} release to finish`,
|
|
189
|
+
fetch: async () => {
|
|
190
|
+
const statusResponse = await client.fetchOpenAPI({
|
|
191
|
+
Action: 'GetReleaseStatus',
|
|
192
|
+
Version: '2024-06-06',
|
|
193
|
+
method: 'POST',
|
|
194
|
+
headers: { 'content-type': 'application/json' },
|
|
195
|
+
data: { FunctionId: functionId },
|
|
196
|
+
});
|
|
197
|
+
const statusResult = (statusResponse.Result || {});
|
|
198
|
+
return statusResult.Status;
|
|
199
|
+
},
|
|
200
|
+
isDone: (status) => status === 'done' || status === 'failed',
|
|
201
|
+
intervalMs: RELEASE_POLL_INTERVAL_MS,
|
|
202
|
+
maxAttempts: RELEASE_POLL_MAX_ATTEMPTS,
|
|
203
|
+
onProgress: (status, attempt, maxAttempts) => {
|
|
204
|
+
logger_1.logger.info(lang_1.lang.__('WAITING_FOR_FUNCTION_RELEASE', {
|
|
205
|
+
functionId,
|
|
206
|
+
status: status ?? 'unknown',
|
|
207
|
+
attempt: String(attempt),
|
|
208
|
+
maxAttempts: String(maxAttempts),
|
|
209
|
+
}));
|
|
210
|
+
},
|
|
211
|
+
});
|
|
212
|
+
if (releaseStatus === 'failed') {
|
|
213
|
+
throw new Error(`veFaaS function ${functionId} release failed`);
|
|
214
|
+
}
|
|
215
|
+
return releaseRecordId;
|
|
216
|
+
},
|
|
217
|
+
waitForFunctionDeleted: async (functionId) => {
|
|
218
|
+
try {
|
|
219
|
+
await (0, polling_1.pollUntil)({
|
|
220
|
+
description: `veFaaS function ${functionId} to be deleted`,
|
|
221
|
+
fetch: () => operations.getFunctionById(functionId),
|
|
222
|
+
isDone: (info) => info === null,
|
|
223
|
+
intervalMs: constants_1.SCF_STATUS_POLL_INTERVAL_MS,
|
|
224
|
+
maxAttempts: constants_1.SCF_STATUS_POLL_MAX_ATTEMPTS,
|
|
225
|
+
});
|
|
226
|
+
}
|
|
227
|
+
catch (e) {
|
|
228
|
+
if (e instanceof polling_1.PollingTimeoutError) {
|
|
229
|
+
throw new Error(`Timed out waiting for veFaaS function ${functionId} to be deleted`, {
|
|
230
|
+
cause: e,
|
|
231
|
+
});
|
|
232
|
+
}
|
|
233
|
+
throw e;
|
|
234
|
+
}
|
|
235
|
+
},
|
|
136
236
|
createFunction: async (config, codePath) => {
|
|
137
237
|
const { size, sizeMB } = await validateCodePackage(codePath);
|
|
138
238
|
let codeSource;
|
|
@@ -164,16 +264,17 @@ const createVefaasOperations = (client) => {
|
|
|
164
264
|
};
|
|
165
265
|
}
|
|
166
266
|
const params = {
|
|
167
|
-
|
|
267
|
+
Name: config.functionName,
|
|
168
268
|
Runtime: config.runtime,
|
|
169
269
|
Handler: config.handler,
|
|
170
|
-
|
|
270
|
+
MemoryMB: config.memoryMb,
|
|
171
271
|
RequestTimeout: config.requestTimeout,
|
|
172
272
|
...(config.description && { Description: config.description }),
|
|
173
273
|
...(config.environmentVariables && {
|
|
174
274
|
Envs: buildEnvVariables(config.environmentVariables),
|
|
175
275
|
}),
|
|
176
276
|
...(config.role && { Role: config.role }),
|
|
277
|
+
...(config.Tags && { Tags: config.Tags }),
|
|
177
278
|
...codeSource,
|
|
178
279
|
...(config.vpcConfig && {
|
|
179
280
|
VpcConfig: {
|
|
@@ -195,38 +296,63 @@ const createVefaasOperations = (client) => {
|
|
|
195
296
|
},
|
|
196
297
|
}),
|
|
197
298
|
...(config.logConfig && {
|
|
198
|
-
|
|
299
|
+
TlsConfig: {
|
|
199
300
|
EnableLog: true,
|
|
200
|
-
|
|
201
|
-
|
|
301
|
+
TlsProjectId: config.logConfig.project,
|
|
302
|
+
TlsTopicId: config.logConfig.topic,
|
|
202
303
|
},
|
|
203
304
|
}),
|
|
204
305
|
};
|
|
205
|
-
await client.fetchOpenAPI({
|
|
306
|
+
const response = await client.fetchOpenAPI({
|
|
206
307
|
Action: 'CreateFunction',
|
|
207
308
|
Version: '2024-06-06',
|
|
208
309
|
method: 'POST',
|
|
209
310
|
headers: { 'content-type': 'application/json' },
|
|
210
311
|
data: params,
|
|
211
312
|
});
|
|
313
|
+
const result = (response.Result || {});
|
|
314
|
+
const functionId = result.Id ?? result.FunctionId;
|
|
315
|
+
if (!functionId) {
|
|
316
|
+
throw new Error(`CreateFunction did not return a function Id for ${config.functionName}`);
|
|
317
|
+
}
|
|
318
|
+
const releaseRecordId = await operations.releaseFunction(functionId);
|
|
212
319
|
logger_1.logger.info(lang_1.lang.__('FUNCTION_CREATED', { functionName: config.functionName }));
|
|
320
|
+
return { functionId, releaseRecordId };
|
|
213
321
|
},
|
|
214
322
|
getFunction: async (functionName) => {
|
|
215
323
|
try {
|
|
216
|
-
const
|
|
324
|
+
const functionId = await resolveFunctionIdByName(functionName);
|
|
325
|
+
if (!functionId) {
|
|
326
|
+
return null;
|
|
327
|
+
}
|
|
328
|
+
return operations.getFunctionById(functionId);
|
|
329
|
+
}
|
|
330
|
+
catch (error) {
|
|
331
|
+
if (error && typeof error === 'object' && 'code' in error) {
|
|
332
|
+
if (error.code === 'ResourceNotFound' || error.code === 'FunctionNotFound') {
|
|
333
|
+
return null;
|
|
334
|
+
}
|
|
335
|
+
}
|
|
336
|
+
throw error;
|
|
337
|
+
}
|
|
338
|
+
},
|
|
339
|
+
getFunctionById: async (functionId) => {
|
|
340
|
+
let response;
|
|
341
|
+
try {
|
|
342
|
+
response = await client.fetchOpenAPI({
|
|
217
343
|
Action: 'GetFunction',
|
|
218
344
|
Version: '2024-06-06',
|
|
219
345
|
method: 'POST',
|
|
220
346
|
headers: { 'content-type': 'application/json' },
|
|
221
|
-
data: {
|
|
347
|
+
data: { Id: functionId },
|
|
222
348
|
});
|
|
223
349
|
const data = (response.Result || {});
|
|
224
350
|
return {
|
|
225
|
-
functionId: data.FunctionId,
|
|
226
|
-
functionName: data.FunctionName,
|
|
351
|
+
functionId: data.Id ?? data.FunctionId,
|
|
352
|
+
functionName: data.Name ?? data.FunctionName,
|
|
227
353
|
runtime: data.Runtime,
|
|
228
354
|
handler: data.Handler,
|
|
229
|
-
memoryMb: data.MemoryMb,
|
|
355
|
+
memoryMb: data.MemoryMB ?? data.MemoryMb,
|
|
230
356
|
requestTimeout: data.RequestTimeout,
|
|
231
357
|
description: data.Description,
|
|
232
358
|
environmentVariables: parseEnvVariables(data.Envs),
|
|
@@ -234,19 +360,106 @@ const createVefaasOperations = (client) => {
|
|
|
234
360
|
createdTime: data.CreationTime,
|
|
235
361
|
lastModifiedTime: data.LastUpdateTime,
|
|
236
362
|
role: data.Role,
|
|
237
|
-
vpcConfig:
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
363
|
+
vpcConfig: (() => {
|
|
364
|
+
const raw = data.VpcConfig;
|
|
365
|
+
if (!raw || Object.keys(raw).length === 0)
|
|
366
|
+
return undefined;
|
|
367
|
+
return {
|
|
368
|
+
vpcId: raw.VpcId,
|
|
369
|
+
subnetIds: raw.SubnetIds,
|
|
370
|
+
securityGroupIds: raw.SecurityGroupIds,
|
|
371
|
+
enableVpc: raw.EnableVpc,
|
|
372
|
+
enableSharedInternetAccess: raw.EnableSharedInternetAccess,
|
|
373
|
+
};
|
|
374
|
+
})(),
|
|
375
|
+
logConfig: (() => {
|
|
376
|
+
const raw = data.TlsConfig ??
|
|
377
|
+
data.LogConfig;
|
|
378
|
+
if (!raw || Object.keys(raw).length === 0)
|
|
379
|
+
return undefined;
|
|
380
|
+
return {
|
|
381
|
+
project: raw.TlsProjectId,
|
|
382
|
+
topic: raw.TlsTopicId,
|
|
383
|
+
enableLog: raw.EnableLog,
|
|
384
|
+
};
|
|
385
|
+
})(),
|
|
386
|
+
Tags: data.Tags?.map((t) => ({
|
|
387
|
+
Key: t.Key,
|
|
388
|
+
Value: t.Value,
|
|
389
|
+
})),
|
|
390
|
+
// Maximum-detail fields — retain everything GetFunction returns so
|
|
391
|
+
// state keeps full resource detail (CPU strategy, concurrency,
|
|
392
|
+
// network/storage/log toggles, async tasks, triggers count, tags).
|
|
393
|
+
exclusiveMode: data.ExclusiveMode,
|
|
394
|
+
maxConcurrency: data.MaxConcurrency,
|
|
395
|
+
codeSize: data.CodeSize,
|
|
396
|
+
codeSizeLimit: data.CodeSizeLimit,
|
|
397
|
+
sourceLocation: data.SourceLocation,
|
|
398
|
+
sourceType: data.SourceType,
|
|
399
|
+
owner: data.Owner,
|
|
400
|
+
triggersCount: data.TriggersCount,
|
|
401
|
+
instanceType: data.InstanceType,
|
|
402
|
+
initializerSec: data.InitializerSec,
|
|
403
|
+
command: data.Command,
|
|
404
|
+
port: data.Port,
|
|
405
|
+
cpuStrategy: data.CpuStrategy,
|
|
406
|
+
projectName: data.ProjectName,
|
|
407
|
+
functionType: data.FunctionType,
|
|
408
|
+
cell: data.Cell,
|
|
409
|
+
enableApmplus: data.EnableApmplus,
|
|
410
|
+
nasStorage: (() => {
|
|
411
|
+
const raw = data.NasStorage;
|
|
412
|
+
if (!raw || Object.keys(raw).length === 0)
|
|
413
|
+
return undefined;
|
|
414
|
+
return {
|
|
415
|
+
enableNas: raw.EnableNas,
|
|
416
|
+
nasConfigs: raw.NasConfigs?.map((c) => ({
|
|
417
|
+
gid: c.Gid,
|
|
418
|
+
uid: c.Uid,
|
|
419
|
+
remotePath: c.RemotePath,
|
|
420
|
+
fileSystemId: c.FileSystemId,
|
|
421
|
+
mountPointId: c.MountPointId,
|
|
422
|
+
localMountPath: c.LocalMountPath,
|
|
423
|
+
})),
|
|
424
|
+
};
|
|
425
|
+
})(),
|
|
426
|
+
tosMountConfig: (() => {
|
|
427
|
+
const raw = data.TosMountConfig;
|
|
428
|
+
if (!raw || Object.keys(raw).length === 0)
|
|
429
|
+
return undefined;
|
|
430
|
+
return {
|
|
431
|
+
enableTos: raw.EnableTos,
|
|
432
|
+
mountPoints: raw.MountPoints?.map((m) => ({
|
|
433
|
+
endpoint: m.Endpoint,
|
|
434
|
+
readOnly: m.ReadOnly,
|
|
435
|
+
bucketName: m.BucketName,
|
|
436
|
+
bucketPath: m.BucketPath,
|
|
437
|
+
localMountPath: m.LocalMountPath,
|
|
438
|
+
})),
|
|
439
|
+
};
|
|
440
|
+
})(),
|
|
441
|
+
asyncTaskConfig: (() => {
|
|
442
|
+
const raw = data.AsyncTaskConfig;
|
|
443
|
+
if (!raw || Object.keys(raw).length === 0)
|
|
444
|
+
return undefined;
|
|
445
|
+
const destination = raw.DestinationConfig;
|
|
446
|
+
const mapDestination = (d) => {
|
|
447
|
+
const obj = d;
|
|
448
|
+
if (!obj)
|
|
449
|
+
return undefined;
|
|
450
|
+
return { destination: obj.Destination };
|
|
451
|
+
};
|
|
452
|
+
return {
|
|
453
|
+
enableAsyncTask: raw.EnableAsyncTask,
|
|
454
|
+
maxRetry: raw.MaxRetry,
|
|
455
|
+
destinationConfig: destination
|
|
456
|
+
? {
|
|
457
|
+
onSuccess: mapDestination(destination.OnSuccess),
|
|
458
|
+
onFailure: mapDestination(destination.OnFailure),
|
|
459
|
+
}
|
|
460
|
+
: undefined,
|
|
461
|
+
};
|
|
462
|
+
})(),
|
|
250
463
|
};
|
|
251
464
|
}
|
|
252
465
|
catch (error) {
|
|
@@ -258,12 +471,12 @@ const createVefaasOperations = (client) => {
|
|
|
258
471
|
throw error;
|
|
259
472
|
}
|
|
260
473
|
},
|
|
261
|
-
updateFunctionConfiguration: async (config) => {
|
|
474
|
+
updateFunctionConfiguration: async (functionId, config) => {
|
|
262
475
|
const params = {
|
|
263
|
-
|
|
476
|
+
Id: functionId,
|
|
264
477
|
Handler: config.handler,
|
|
265
478
|
Runtime: config.runtime,
|
|
266
|
-
|
|
479
|
+
MemoryMB: config.memoryMb,
|
|
267
480
|
RequestTimeout: config.requestTimeout,
|
|
268
481
|
...(config.description !== undefined && { Description: config.description }),
|
|
269
482
|
...(config.environmentVariables && {
|
|
@@ -290,10 +503,10 @@ const createVefaasOperations = (client) => {
|
|
|
290
503
|
},
|
|
291
504
|
}),
|
|
292
505
|
...(config.logConfig && {
|
|
293
|
-
|
|
506
|
+
TlsConfig: {
|
|
294
507
|
EnableLog: true,
|
|
295
|
-
|
|
296
|
-
|
|
508
|
+
TlsProjectId: config.logConfig.project,
|
|
509
|
+
TlsTopicId: config.logConfig.topic,
|
|
297
510
|
},
|
|
298
511
|
}),
|
|
299
512
|
};
|
|
@@ -304,16 +517,23 @@ const createVefaasOperations = (client) => {
|
|
|
304
517
|
headers: { 'content-type': 'application/json' },
|
|
305
518
|
data: params,
|
|
306
519
|
});
|
|
520
|
+
// UpdateFunction only edits the draft config — veFaaS serves the last
|
|
521
|
+
// published revision until Release is called. Without it the function
|
|
522
|
+
// stays in an unpublished intermediate state and API Gateway invocations
|
|
523
|
+
// fail. Mirror the create/code-update paths and release after config
|
|
524
|
+
// changes too.
|
|
525
|
+
const releaseRecordId = await operations.releaseFunction(functionId);
|
|
307
526
|
logger_1.logger.info(lang_1.lang.__('FUNCTION_CONFIGURATION_UPDATED', { functionName: config.functionName }));
|
|
527
|
+
return releaseRecordId;
|
|
308
528
|
},
|
|
309
|
-
updateFunctionCode: async (
|
|
529
|
+
updateFunctionCode: async (functionId, codePath) => {
|
|
310
530
|
const { size, sizeMB } = await validateCodePackage(codePath);
|
|
311
531
|
let codeSource;
|
|
312
532
|
if (size <= MAX_ZIP_SIZE_BYTES) {
|
|
313
533
|
const codeContent = await fs.promises.readFile(codePath);
|
|
314
534
|
const codeBase64 = codeContent.toString('base64');
|
|
315
535
|
logger_1.logger.info(lang_1.lang.__('UPDATING_FUNCTION_CODE_WITH_ZIP', {
|
|
316
|
-
functionName,
|
|
536
|
+
functionName: functionId,
|
|
317
537
|
size: sizeMB,
|
|
318
538
|
}));
|
|
319
539
|
codeSource = {
|
|
@@ -323,9 +543,9 @@ const createVefaasOperations = (client) => {
|
|
|
323
543
|
}
|
|
324
544
|
else {
|
|
325
545
|
const tosBucket = `vefaas-codes-${client.region || 'cn-beijing'}`;
|
|
326
|
-
const { bucket, key } = await uploadCodeToTos(tosClient, tosBucket, codePath,
|
|
546
|
+
const { bucket, key } = await uploadCodeToTos(tosClient, tosBucket, codePath, functionId);
|
|
327
547
|
logger_1.logger.info(lang_1.lang.__('UPDATING_FUNCTION_CODE_WITH_TOS', {
|
|
328
|
-
functionName,
|
|
548
|
+
functionName: functionId,
|
|
329
549
|
size: sizeMB,
|
|
330
550
|
bucket,
|
|
331
551
|
key,
|
|
@@ -342,38 +562,35 @@ const createVefaasOperations = (client) => {
|
|
|
342
562
|
method: 'POST',
|
|
343
563
|
headers: { 'content-type': 'application/json' },
|
|
344
564
|
data: {
|
|
345
|
-
|
|
565
|
+
Id: functionId,
|
|
346
566
|
...codeSource,
|
|
347
567
|
},
|
|
348
568
|
});
|
|
349
|
-
|
|
569
|
+
const releaseRecordId = await operations.releaseFunction(functionId);
|
|
570
|
+
logger_1.logger.info(lang_1.lang.__('FUNCTION_CODE_UPDATED', { functionName: functionId }));
|
|
571
|
+
return { releaseRecordId };
|
|
350
572
|
},
|
|
351
|
-
deleteFunction: async (
|
|
573
|
+
deleteFunction: async (functionId) => {
|
|
352
574
|
await client.fetchOpenAPI({
|
|
353
575
|
Action: 'DeleteFunction',
|
|
354
576
|
Version: '2024-06-06',
|
|
355
577
|
method: 'POST',
|
|
356
578
|
headers: { 'content-type': 'application/json' },
|
|
357
|
-
data: {
|
|
579
|
+
data: { Id: functionId },
|
|
358
580
|
});
|
|
359
|
-
|
|
581
|
+
// DeleteFunction returns immediately — wait for the function to be gone so
|
|
582
|
+
// a subsequent create (retry) does not collide with a still-deleting function.
|
|
583
|
+
await operations.waitForFunctionDeleted(functionId);
|
|
584
|
+
logger_1.logger.info(lang_1.lang.__('FUNCTION_DELETED', { functionName: functionId }));
|
|
360
585
|
},
|
|
361
586
|
listFunctions: async () => {
|
|
362
|
-
const
|
|
363
|
-
Action: 'ListFunctions',
|
|
364
|
-
Version: '2024-06-06',
|
|
365
|
-
method: 'POST',
|
|
366
|
-
headers: { 'content-type': 'application/json' },
|
|
367
|
-
data: {},
|
|
368
|
-
});
|
|
369
|
-
const result = (response.Result || {});
|
|
370
|
-
const functions = (result.Functions || []);
|
|
587
|
+
const functions = await listAllFunctions();
|
|
371
588
|
return functions.map((fn) => ({
|
|
372
|
-
functionId: fn.FunctionId,
|
|
373
|
-
functionName: fn.FunctionName,
|
|
589
|
+
functionId: fn.Id ?? fn.FunctionId,
|
|
590
|
+
functionName: fn.Name ?? fn.FunctionName,
|
|
374
591
|
runtime: fn.Runtime,
|
|
375
592
|
handler: fn.Handler,
|
|
376
|
-
memoryMb: fn.MemoryMb,
|
|
593
|
+
memoryMb: fn.MemoryMB ?? fn.MemoryMb,
|
|
377
594
|
requestTimeout: fn.RequestTimeout,
|
|
378
595
|
description: fn.Description,
|
|
379
596
|
status: fn.Status,
|
|
@@ -382,5 +599,6 @@ const createVefaasOperations = (client) => {
|
|
|
382
599
|
}));
|
|
383
600
|
},
|
|
384
601
|
};
|
|
602
|
+
return operations;
|
|
385
603
|
};
|
|
386
604
|
exports.createVefaasOperations = createVefaasOperations;
|