@cloudbase/manager-node 5.8.2 → 5.8.4

package/lib/deploy/function/artifact.js

@@ -5,12 +5,30 @@ exports.createImageArtifactFromConfig = createImageArtifactFromConfig;
 exports.createImageArtifactFromBuild = createImageArtifactFromBuild;
 exports.createImageArtifactFromCloudBuild = createImageArtifactFromCloudBuild;
 exports.toCloudFunction = toCloudFunction;
+const error_1 = require("../../error");
 const types_1 = require("../types");
 /**
- * 部署物构造与 SCF 参数映射
+ * 解析构建类镜像部署物的 SCF RegistryId
  *
- * 四种构建策略最终都产出统一的部署物，之后走同一条 SCF 创建或更新流程
+ * 个人版镜像（personal，如个人版 CCR）不携带 registryId；企业版优先取
+ * imageConfig.registryId，回退到构建配置 imageConfig.build.registryId。
+ * 正常流程下企业版 registryId 已由 prepareEnterpriseTcrTarget 在构建前解析补齐，
+ * 此处对缺失场景 fail-fast 并给出明确错误：避免产出缺少 RegistryId 的部署物，
+ * 导致后续 SCF 拉取企业版镜像时失败且难以排查。
  */
+function resolveBuildRegistryId(imageConfig) {
+    var _a, _b;
+    if (imageConfig.imageType !== 'enterprise') {
+        return undefined;
+    }
+    const registryId = (_a = imageConfig.registryId) !== null && _a !== void 0 ? _a : (_b = imageConfig.build) === null || _b === void 0 ? void 0 : _b.registryId;
+    if (!registryId) {
+        throw new error_1.CloudBaseError('企业版镜像缺少 TCR 实例 ID（registryId），无法生成镜像部署物。', {
+            code: types_1.FUNCTION_DEPLOY_ERROR.IMAGE_REGISTRY_ID_MISSING
+        });
+    }
+    return registryId;
+}
 /** 由本地代码来源构造代码类部署物 */
 function createCodeArtifact(config) {
     const functionRootPath = 'functionRootPath' in config ? config.functionRootPath : undefined;
@@ -28,28 +46,26 @@ function createCodeArtifact(config) {
 }
 /** 由已有镜像配置构造镜像类部署物 */
 function createImageArtifactFromConfig(config) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+    var _a;
     const { imageConfig } = config;
-    // imageType/registryId 的契约位置在配置顶层（IHttpImageRuntimeCommon），
-    // 与 local/cloud 策略一致；imageConfig 内的同名字段仅作向后兼容兜底。
+    // 直接读取 cloudbaserc 嵌套形状：镜像字段全部位于 imageConfig。
     // 个人版镜像（personal，如个人版 CCR）不应携带 registryId。
-    const configuredRegistryId = (_a = config.registryId) !== null && _a !== void 0 ? _a : imageConfig.registryId;
-    const imageType = (_c = (_b = config.imageType) !== null && _b !== void 0 ? _b : imageConfig.imageType) !== null && _c !== void 0 ? _c : (configuredRegistryId ? 'enterprise' : 'personal');
-    const registryId = imageType === 'enterprise' ? configuredRegistryId : undefined;
+    const imageType = imageConfig.imageType;
+    const registryId = imageType === 'enterprise' ? imageConfig.registryId : undefined;
     return {
         kind: 'image',
         deployMode: 'image',
         imageUri: imageConfig.imageUri,
         imageType,
         registryId,
-        imagePort: types_1.IMAGE_FUNCTION_PORT,
+        imagePort: (_a = imageConfig.imagePort) !== null && _a !== void 0 ? _a : types_1.IMAGE_FUNCTION_PORT,
         effectiveStrategy: 'image',
-        entryPoint: (_d = imageConfig.entryPoint) !== null && _d !== void 0 ? _d : config.entryPoint,
-        command: (_e = imageConfig.command) !== null && _e !== void 0 ? _e : config.command,
-        args: (_f = imageConfig.args) !== null && _f !== void 0 ? _f : config.args,
-        commandList: (_g = imageConfig.commandList) !== null && _g !== void 0 ? _g : config.commandList,
-        argsList: (_h = imageConfig.argsList) !== null && _h !== void 0 ? _h : config.argsList,
-        containerImageAccelerate: (_j = imageConfig.containerImageAccelerate) !== null && _j !== void 0 ? _j : config.containerImageAccelerate
+        entryPoint: imageConfig.entryPoint,
+        command: imageConfig.command,
+        args: imageConfig.args,
+        commandList: imageConfig.commandList,
+        argsList: imageConfig.argsList,
+        containerImageAccelerate: imageConfig.containerImageAccelerate
     };
 }
 /**
@@ -59,11 +75,10 @@ function createImageArtifactFromConfig(config) {
  * 此处仅承载最终 imageUri/digest 与容器启动配置，之后复用镜像部署链。
  */
 function createImageArtifactFromBuild(config, build) {
-    var _a, _b, _c;
-    const imageType = (_a = config.imageType) !== null && _a !== void 0 ? _a : (((_b = config.registryId) !== null && _b !== void 0 ? _b : config.build.registryId) ? 'enterprise' : 'personal');
-    const registryId = imageType === 'enterprise'
-        ? (_c = config.registryId) !== null && _c !== void 0 ? _c : config.build.registryId
-        : undefined;
+    var _a;
+    const { imageConfig } = config;
+    const imageType = imageConfig.imageType;
+    const registryId = resolveBuildRegistryId(imageConfig);
     return {
         kind: 'image',
         deployMode: 'image',
@@ -71,14 +86,14 @@ function createImageArtifactFromBuild(config, build) {
         imageDigest: build.imageDigest,
         imageType,
         registryId,
-        imagePort: types_1.IMAGE_FUNCTION_PORT,
+        imagePort: (_a = imageConfig.imagePort) !== null && _a !== void 0 ? _a : types_1.IMAGE_FUNCTION_PORT,
         effectiveStrategy: 'local',
-        entryPoint: config.entryPoint,
-        command: config.command,
-        args: config.args,
-        commandList: config.commandList,
-        argsList: config.argsList,
-        containerImageAccelerate: config.containerImageAccelerate
+        entryPoint: imageConfig.entryPoint,
+        command: imageConfig.command,
+        args: imageConfig.args,
+        commandList: imageConfig.commandList,
+        argsList: imageConfig.argsList,
+        containerImageAccelerate: imageConfig.containerImageAccelerate
     };
 }
 /**
@@ -89,30 +104,29 @@ function createImageArtifactFromBuild(config, build) {
  * effectiveStrategy 标记为 cloud，便于结果层如实回传实际生效的策略。
  */
 function createImageArtifactFromCloudBuild(config, build) {
-    var _a, _b;
-    const imageType = (_a = config.imageType) !== null && _a !== void 0 ? _a : (config.build.registryId ? 'enterprise' : 'personal');
-    const registryId = imageType === 'enterprise'
-        ? (_b = config.registryId) !== null && _b !== void 0 ? _b : config.build.registryId
-        : undefined;
+    var _a;
+    const { imageConfig } = config;
+    const imageType = imageConfig.imageType;
+    // 云端构建默认推送到个人版 TCR（CCR）；企业版实例 ID 位于 imageConfig.build.registryId，
+    // 需继续透传到 Stage B 的 SCF ImageConfig，避免构建成功后拉取镜像时丢失 RegistryId。
+    const registryId = resolveBuildRegistryId(imageConfig);
     return {
         kind: 'image',
         deployMode: 'image',
         imageUri: build.imageUri,
         imageDigest: build.imageDigest,
-        // 云端构建默认推送到个人版 TCR（CCR）；企业版实例 ID 位于 build.registryId，
-        // 需继续透传到 Stage B 的 SCF ImageConfig，避免构建成功后拉取镜像时丢失 RegistryId。
         imageType,
         registryId,
-        imagePort: types_1.IMAGE_FUNCTION_PORT,
+        imagePort: (_a = imageConfig.imagePort) !== null && _a !== void 0 ? _a : types_1.IMAGE_FUNCTION_PORT,
         effectiveStrategy: 'cloud',
         buildId: build.buildId,
         logsUrl: build.logsUrl,
-        entryPoint: config.entryPoint,
-        command: config.command,
-        args: config.args,
-        commandList: config.commandList,
-        argsList: config.argsList,
-        containerImageAccelerate: config.containerImageAccelerate
+        entryPoint: imageConfig.entryPoint,
+        command: imageConfig.command,
+        args: imageConfig.args,
+        commandList: imageConfig.commandList,
+        argsList: imageConfig.argsList,
+        containerImageAccelerate: imageConfig.containerImageAccelerate
     };
 }
 /** 将构建产出的 tag 地址与 digest 合成为 SCF 支持的不可变镜像引用 */