@cloudbase/cli 2.0.10 → 2.0.11

package/lib/commands/run/service/create.js

@@ -97,6 +97,10 @@ let CreateServiceTcbr = class CreateServiceTcbr extends common_1.Command {
                     flags: '--dockerfile <dockerfile>',
                     desc: 'Dockerfile文件名，默认为 Dockerfile'
                 },
+                {
+                    flags: '--custom_image <custom_image>',
+                    desc: 'TCR 仓库镜像 URL'
+                },
                 {
                     flags: '--image <image>',
                     desc: '镜像标签或ID'

package/lib/commands/run/service/deploy.js

@@ -96,6 +96,10 @@ let DeployServiceTcbr = class DeployServiceTcbr extends common_1.Command {
                     flags: '--dockerfile <dockerfile>',
                     desc: 'Dockerfile文件名，默认为 Dockerfile'
                 },
+                {
+                    flags: '--custom_image <custom_image>',
+                    desc: 'TCR 仓库镜像 URL'
+                },
                 {
                     flags: '--library_image <library_image>',
                     desc: '线上镜像仓库的 tag，仅在服务已存在时可用'

package/lib/commands/run/service/update.js

@@ -92,6 +92,10 @@ let UpdateServiceTcbr = class UpdateServiceTcbr extends common_1.Command {
                     flags: '--dockerfile <dockerfile>',
                     desc: 'Dockerfile文件名，默认为 Dockerfile'
                 },
+                {
+                    flags: '--custom_image <custom_image>',
+                    desc: 'TCR 仓库镜像 URL'
+                },
                 {
                     flags: '--library_image <library_image>',
                     desc: '线上镜像仓库的 tag'

package/lib/run/service/common.js

@@ -9,13 +9,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.tcbrServiceOptions = exports.mergeEnvParams = exports.parseEnvParams = exports.extractPolicyDetails = exports.convertNumber = exports.describeWxCloudBaseRunReleaseOrder = void 0;
+exports.validateTcrImageURL = exports.getAuthorizedTcrInstance = exports.tcbrServiceOptions = exports.mergeEnvParams = exports.parseEnvParams = exports.extractPolicyDetails = exports.convertNumber = exports.describeWxCloudBaseRunReleaseOrder = void 0;
 const utils_1 = require("../../utils");
+const types_1 = require("../../types");
 const toolbox_1 = require("@cloudbase/toolbox");
 const index_1 = require("./index");
 const __1 = require("..");
 const constant_1 = require("../../constant");
 const tcbService = utils_1.CloudApiService.getInstance('tcb');
+const tcrCloudApiService = new utils_1.CloudApiService('tcr', {}, '2019-09-24');
 function describeWxCloudBaseRunReleaseOrder(options) {
     return __awaiter(this, void 0, void 0, function* () {
         const res = yield tcbService.request('DescribeWxCloudBaseRunReleaseOrder', {
@@ -76,31 +78,32 @@ function checkRequiredParams(options) {
     if (!options.containerPort) {
         throw new toolbox_1.CloudBaseError('必须使用 --containerPort 指定监听端口号');
     }
-    if (!options.isCreated && !options.path) {
-        throw new toolbox_1.CloudBaseError('请使用 --path 指定代码根目录');
+    if (!options.isCreated && !options.path && !options.custom_image) {
+        throw new toolbox_1.CloudBaseError('请使用 --path 指定代码根目录或 --custom_image 指定 TCR 镜像 URL');
     }
-    if (options.isCreated && !options.path && !options.library_image && !options.image) {
-        throw new toolbox_1.CloudBaseError('请使用 --path 指定代码根目录或 --library_image 指定线上镜像 tag ');
+    if (options.isCreated && !options.path && !options.custom_image && !options.library_image && !options.image) {
+        throw new toolbox_1.CloudBaseError('请使用 --path 指定代码根目录或 --custom_image 指定 TCR 镜像 URL 或 --library_image 指定线上镜像 tag ');
     }
 }
 function tcbrServiceOptions(options, isCreated, defaultOverride, previousServerConfig) {
     return __awaiter(this, void 0, void 0, function* () {
-        let { noConfirm: _noConfirm = false, override: _override = (defaultOverride || false), envId, serviceName, path, cpu, mem, minNum, maxNum, policyDetails, customLogs, envParams, containerPort, remark, targetDir, dockerfile, image, library_image, json: _json = false } = options;
+        let { noConfirm: _noConfirm = false, override: _override = (defaultOverride || false), envId, serviceName, path, cpu, mem, minNum, maxNum, policyDetails, customLogs, envParams, containerPort, remark, targetDir, dockerfile, image, custom_image, library_image, json: _json = false } = options;
         checkRequiredParams({
             envId,
             serviceName,
             containerPort,
             isCreated,
             path,
+            custom_image,
             library_image,
             image
         });
         containerPort = Number(containerPort);
+        const deployByImage = Boolean(custom_image || library_image || image);
         const DeployInfo = {
-            DeployType: library_image || image
-                ? 'image'
-                : 'package',
+            DeployType: deployByImage ? types_1.DEPLOY_TYPE.IMAGE : types_1.DEPLOY_TYPE.PACKAGE,
             DeployRemark: remark || '',
+            ReleaseType: 'FULL'
         };
         let { cpuConverted, memConverted, maxNumConverted, minNumConverted } = (0, utils_1.parseOptionalParams)({
             cpu,
@@ -108,6 +111,7 @@ function tcbrServiceOptions(options, isCreated, defaultOverride, previousServerC
             maxNum,
             minNum
         });
+        const defaultLogType = 'none';
         const newServiceOptions = {
             ServerName: serviceName,
             EnvId: envId,
@@ -128,10 +132,11 @@ function tcbrServiceOptions(options, isCreated, defaultOverride, previousServerC
                 Port: containerPort,
                 HasDockerfile: true,
                 Dockerfile: dockerfile || 'Dockerfile',
+                LogType: defaultLogType
             },
             DeployInfo: Object.assign({}, DeployInfo)
         };
-        if (DeployInfo.DeployType === 'package') {
+        if (DeployInfo.DeployType === types_1.DEPLOY_TYPE.PACKAGE) {
             const { PackageName, PackageVersion } = yield (0, index_1.packageDeploy)({
                 envId,
                 serviceName,
@@ -140,20 +145,31 @@ function tcbrServiceOptions(options, isCreated, defaultOverride, previousServerC
             DeployInfo.PackageName = PackageName;
             DeployInfo.PackageVersion = PackageVersion;
         }
-        else if (DeployInfo.DeployType === 'image') {
-            const imageList = yield (0, __1.listImage)({
-                envId,
-                serviceName
-            });
-            if (library_image) {
-                const imageInfo = imageList.find(({ Tag }) => Tag === library_image);
-                if (!imageInfo) {
-                    throw new toolbox_1.CloudBaseError(`镜像 ${library_image} 不存在`);
+        else if (DeployInfo.DeployType === types_1.DEPLOY_TYPE.IMAGE) {
+            if (custom_image) {
+                const authorizedTcrInstances = yield getAuthorizedTcrInstance(envId);
+                if (!authorizedTcrInstances) {
+                    const link = `https://console.cloud.tencent.com/tcbr/env?/tcbr/env=&envId=${envId}`;
+                    throw new toolbox_1.CloudBaseError(`您还未授权 tcr 实例，请先到控制台授权：${(0, utils_1.genClickableLink)(link)}`);
                 }
-                DeployInfo.ImageUrl = imageInfo.ImageUrl;
+                yield validateTcrImageURL(authorizedTcrInstances, custom_image);
+                DeployInfo.ImageUrl = custom_image;
             }
             else {
-                throw new toolbox_1.CloudBaseError('暂不支持 --image 参数，请使用 --library_image 指定线上镜像 tag');
+                const imageList = yield (0, __1.listImage)({
+                    envId,
+                    serviceName
+                });
+                if (library_image) {
+                    const imageInfo = imageList.find(({ Tag }) => Tag === library_image);
+                    if (!imageInfo) {
+                        throw new toolbox_1.CloudBaseError(`镜像 ${library_image} 不存在`);
+                    }
+                    DeployInfo.ImageUrl = imageInfo.ImageUrl;
+                }
+                else {
+                    throw new toolbox_1.CloudBaseError('暂不支持 --image 参数，请使用 --custom_image 指定 tcr 镜像 URL 或 --library_image 指定线上镜像 tag');
+                }
             }
         }
         newServiceOptions.DeployInfo = Object.assign({}, DeployInfo);
@@ -161,3 +177,81 @@ function tcbrServiceOptions(options, isCreated, defaultOverride, previousServerC
     });
 }
 exports.tcbrServiceOptions = tcbrServiceOptions;
+function getAuthorizedTcrInstance(envId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        let { data: { TcrInstances: authorizedTcrInstances } } = yield (0, utils_1.callTcbrApi)('DescribeTcrInstances', {
+            EnvId: envId
+        });
+        return authorizedTcrInstances;
+    });
+}
+exports.getAuthorizedTcrInstance = getAuthorizedTcrInstance;
+function validateTcrImageURL(authorizedTcrInstances, imageUrl) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const errMsg = '镜像URL解析失败，请检查输入的镜像URL是否正确';
+        try {
+            const host = imageUrl.split('/')[0];
+            const namespace = imageUrl.split('/')[1];
+            const name = `${namespace}/${imageUrl.split('/')[2].split(':')[0]}`;
+            const tag = imageUrl.split('/')[2].split(':')[1];
+            const filteredInstances = authorizedTcrInstances === null || authorizedTcrInstances === void 0 ? void 0 : authorizedTcrInstances.filter(({ Domain }) => host === Domain);
+            if (!(filteredInstances === null || filteredInstances === void 0 ? void 0 : filteredInstances.length)) {
+                throw new toolbox_1.CloudBaseError(errMsg);
+            }
+            const reposUnderSpecifiedRegistry = [];
+            for (const registry of filteredInstances) {
+                const repos = [];
+                let { Id: registryId, Domain: domain } = registry;
+                const limit = 100;
+                let curIndex = 1;
+                let totalCount = 0;
+                do {
+                    const rsp = yield tcrCloudApiService.request('DescribeRepositories', {
+                        RegistryId: registryId,
+                        Offset: curIndex,
+                        Limit: limit
+                    });
+                    repos.push(...rsp.RepositoryList);
+                    curIndex += 1;
+                    totalCount = rsp.TotalCount;
+                } while (repos.length < totalCount);
+                reposUnderSpecifiedRegistry.push({ registryId, domain, repos });
+            }
+            const filteredRepos = [];
+            for (const repo of reposUnderSpecifiedRegistry) {
+                const { registryId, repos } = repo;
+                filteredRepos.push(...repos.filter(({ Name }) => Name === name));
+                if (!(filteredRepos === null || filteredRepos === void 0 ? void 0 : filteredRepos.length)) {
+                    throw new toolbox_1.CloudBaseError(errMsg);
+                }
+                filteredRepos.forEach(item => { item.registryId = registryId; });
+            }
+            for (const repoItem of filteredRepos) {
+                const { Name, Namespace, registryId } = repoItem;
+                const images = [];
+                const limit = 100;
+                let curIndex = 1;
+                let totalCount = 0;
+                do {
+                    const rsp = yield tcrCloudApiService.request('DescribeImages', {
+                        RegistryId: registryId,
+                        NamespaceName: Namespace,
+                        RepositoryName: Name.split(`${Namespace}/`)[1],
+                        Offset: curIndex,
+                        Limit: limit
+                    });
+                    images.push(...rsp.ImageInfoList);
+                    curIndex += 1;
+                    totalCount = rsp.TotalCount;
+                } while (images.length < totalCount);
+                if (!images.some(({ ImageVersion }) => ImageVersion === tag)) {
+                    throw new toolbox_1.CloudBaseError(errMsg);
+                }
+            }
+        }
+        catch (e) {
+            throw new toolbox_1.CloudBaseError(errMsg);
+        }
+    });
+}
+exports.validateTcrImageURL = validateTcrImageURL;

package/lib/types.js

@@ -1,7 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ServerLanguageType = void 0;
+exports.DEPLOY_TYPE = exports.ServerLanguageType = void 0;
 var ServerLanguageType;
 (function (ServerLanguageType) {
     ServerLanguageType["node"] = "node";
 })(ServerLanguageType = exports.ServerLanguageType || (exports.ServerLanguageType = {}));
+var DEPLOY_TYPE;
+(function (DEPLOY_TYPE) {
+    DEPLOY_TYPE["PACKAGE"] = "package";
+    DEPLOY_TYPE["IMAGE"] = "image";
+})(DEPLOY_TYPE = exports.DEPLOY_TYPE || (exports.DEPLOY_TYPE = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudbase/cli",
-    "version": "2.0.10",
+    "version": "2.0.11",
     "description": "cli tool for cloudbase",
     "main": "lib/index.js",
     "scripts": {

package/src/commands/run/service/create.ts

@@ -82,6 +82,10 @@ export class CreateServiceTcbr extends Command {
                 //     flags: '--library_image <library_image>',
                 //     desc: '线上镜像仓库的 tag'
                 // },
+                {
+                  flags: '--custom_image <custom_image>',
+                  desc: 'TCR 仓库镜像 URL'  
+                },
                 {
                     flags: '--image <image>',
                     desc: '镜像标签或ID'

package/src/commands/run/service/deploy.ts

@@ -80,6 +80,10 @@ export class DeployServiceTcbr extends Command {
                     flags: '--dockerfile <dockerfile>',
                     desc: 'Dockerfile文件名，默认为 Dockerfile'
                 },
+                {
+                    flags: '--custom_image <custom_image>',
+                    desc: 'TCR 仓库镜像 URL'  
+                  },
                 {
                     flags: '--library_image <library_image>',
                     desc: '线上镜像仓库的 tag，仅在服务已存在时可用'

package/src/commands/run/service/list.ts

@@ -48,9 +48,9 @@ export class ListServiceTcbr extends Command {
             envId: envId
         })
         loading.stop()
-        
+
         const specificServer = serverList.filter(serverItem => serverItem.ServerName === serviceName)
-        
+
         // 打印 JSON 形式结果
         if (options.json) {
             console.log(JSON.stringify({
@@ -62,12 +62,12 @@ export class ListServiceTcbr extends Command {
             }, null, 2))
             return
         }
-        
+
         if (!serverList.length) {
             console.log('当前环境下没有服务')
             return
         }
-        
+
         // 如有指定服务名，则只打印指定服务的信息
         let tableData: (string | number)[][]
         if (specificServer.length) {

package/src/commands/run/service/update.ts

@@ -72,6 +72,10 @@ export class UpdateServiceTcbr extends Command {
                     flags: '--dockerfile <dockerfile>',
                     desc: 'Dockerfile文件名，默认为 Dockerfile'
                 },
+                {
+                    flags: '--custom_image <custom_image>',
+                    desc: 'TCR 仓库镜像 URL'  
+                },
                 {
                     flags: '--library_image <library_image>',
                     desc: '线上镜像仓库的 tag'

package/src/run/service/common.ts

@@ -1,11 +1,12 @@
-import { CloudApiService, parseOptionalParams, parseInputParam } from '../../utils'
-import { ITcbrServiceOptions, IDescribeWxCloudBaseRunReleaseOrder, ITcbrServiceRequiredOptions } from '../../types'
+import { CloudApiService, parseOptionalParams, parseInputParam, callTcbrApi, genClickableLink } from '../../utils'
+import { ITcbrServiceOptions, IDescribeWxCloudBaseRunReleaseOrder, ITcbrServiceRequiredOptions, DEPLOY_TYPE, IAuthorizedTcrInstance } from '../../types'
 import { CloudBaseError } from '@cloudbase/toolbox'
 import { packageDeploy } from './index'
 import { listImage } from '..'
 import { DEFAULT_CPU_MEM_SET } from '../../constant'
 
 const tcbService = CloudApiService.getInstance('tcb')
+const tcrCloudApiService = new CloudApiService('tcr', {}, '2019-09-24')
 
 export async function describeWxCloudBaseRunReleaseOrder(options: IDescribeWxCloudBaseRunReleaseOrder) {
     const res = await tcbService.request('DescribeWxCloudBaseRunReleaseOrder', {
@@ -74,12 +75,12 @@ function checkRequiredParams(options: ITcbrServiceRequiredOptions) {
         throw new CloudBaseError('必须使用 --containerPort 指定监听端口号')
     }
 
-    if (!options.isCreated && !options.path) {
-        throw new CloudBaseError('请使用 --path 指定代码根目录')
+    if (!options.isCreated && !options.path && !options.custom_image) {
+        throw new CloudBaseError('请使用 --path 指定代码根目录或 --custom_image 指定 TCR 镜像 URL')
     }
 
-    if (options.isCreated && !options.path && !options.library_image && !options.image) {
-        throw new CloudBaseError('请使用 --path 指定代码根目录或 --library_image 指定线上镜像 tag ')
+    if (options.isCreated && !options.path && !options.custom_image && !options.library_image && !options.image) {
+        throw new CloudBaseError('请使用 --path 指定代码根目录或 --custom_image 指定 TCR 镜像 URL 或 --library_image 指定线上镜像 tag ')
     }
 }
 
@@ -110,6 +111,7 @@ export async function tcbrServiceOptions(options: ITcbrServiceOptions, isCreated
         targetDir,
         dockerfile,
         image,
+        custom_image,
         library_image,
         json: _json = false
     } = options
@@ -121,18 +123,20 @@ export async function tcbrServiceOptions(options: ITcbrServiceOptions, isCreated
         containerPort,
         isCreated,
         path,
+        custom_image,
         library_image,
         image
     })
     containerPort = Number(containerPort)
 
-    // 处理用户输入的参数
+    // 处理用户传入参数
+    const deployByImage = Boolean(custom_image || library_image || image)
     const DeployInfo: any = {
-        DeployType: library_image || image
-            ? 'image'
-            : 'package',
+        DeployType: deployByImage ? DEPLOY_TYPE.IMAGE : DEPLOY_TYPE.PACKAGE,
         DeployRemark: remark || '',
+        ReleaseType: 'FULL'
     }
+
     // 可选参数进行校验和转换
     let {
         cpuConverted,
@@ -146,6 +150,7 @@ export async function tcbrServiceOptions(options: ITcbrServiceOptions, isCreated
         minNum
     })
 
+    const defaultLogType = 'none'
     const newServiceOptions = {
         ServerName: serviceName,
         EnvId: envId,
@@ -166,13 +171,14 @@ export async function tcbrServiceOptions(options: ITcbrServiceOptions, isCreated
             Port: containerPort,
             HasDockerfile: true,
             Dockerfile: dockerfile || 'Dockerfile',
+            LogType: defaultLogType
         },
         DeployInfo: {
             ...DeployInfo
         }
     }
 
-    if (DeployInfo.DeployType === 'package') {
+    if (DeployInfo.DeployType === DEPLOY_TYPE.PACKAGE) {
         // 本地上传
         const { PackageName, PackageVersion } = await packageDeploy({
             envId,
@@ -181,21 +187,34 @@ export async function tcbrServiceOptions(options: ITcbrServiceOptions, isCreated
         })
         DeployInfo.PackageName = PackageName
         DeployInfo.PackageVersion = PackageVersion
-    } else if (DeployInfo.DeployType === 'image') {
-        // 拉取镜像
-        const imageList = await listImage({
-            envId,
-            serviceName
-        })
-        if (library_image) {
-            const imageInfo = imageList.find(({ Tag }) => Tag === library_image)
-            if (!imageInfo) {
-                throw new CloudBaseError(`镜像 ${library_image} 不存在`)
+    } else if (DeployInfo.DeployType === DEPLOY_TYPE.IMAGE) {
+        // 传入 tcr 镜像实例
+        if (custom_image) {
+            const authorizedTcrInstances = await getAuthorizedTcrInstance(envId)
+            if (!authorizedTcrInstances) {
+                const link = `https://console.cloud.tencent.com/tcbr/env?/tcbr/env=&envId=${envId}`
+                throw new CloudBaseError(`您还未授权 tcr 实例，请先到控制台授权：${genClickableLink(link)}`)
             }
-            DeployInfo.ImageUrl = imageInfo.ImageUrl
+            // 检查传入的 URL 是否合法，不合法 throw error 阻止执行
+            await validateTcrImageURL(authorizedTcrInstances, custom_image)
+
+            DeployInfo.ImageUrl = custom_image
         } else {
-            // 暂时不支持 image 镜像
-            throw new CloudBaseError('暂不支持 --image 参数，请使用 --library_image 指定线上镜像 tag')
+            // 拉取镜像
+            const imageList = await listImage({
+                envId,
+                serviceName
+            })
+            if (library_image) {
+                const imageInfo = imageList.find(({ Tag }) => Tag === library_image)
+                if (!imageInfo) {
+                    throw new CloudBaseError(`镜像 ${library_image} 不存在`)
+                }
+                DeployInfo.ImageUrl = imageInfo.ImageUrl
+            } else {
+                // 暂时不支持 image 镜像
+                throw new CloudBaseError('暂不支持 --image 参数，请使用 --custom_image 指定 tcr 镜像 URL 或 --library_image 指定线上镜像 tag')
+            }
         }
     }
 
@@ -204,3 +223,89 @@ export async function tcbrServiceOptions(options: ITcbrServiceOptions, isCreated
     }
     return newServiceOptions
 }
+
+// 获取授权 tcr 实例
+export async function getAuthorizedTcrInstance(envId: string): Promise<IAuthorizedTcrInstance[] | null> {
+    let { data: { TcrInstances: authorizedTcrInstances } } = await callTcbrApi('DescribeTcrInstances', {
+        EnvId: envId
+    })
+    return authorizedTcrInstances
+}
+
+/**
+ * 
+ * @description 校验输入的 tcr 镜像 URL 是否合法（域名/仓库名:镜像tag）
+ * @param authorizedTcrInstances 已授权的 tcr 实例列表
+ * @param imageUrl 输入的镜像 URL 地址
+ */
+export async function validateTcrImageURL(authorizedTcrInstances: IAuthorizedTcrInstance[] | null, imageUrl: string) {
+    const errMsg = '镜像URL解析失败，请检查输入的镜像URL是否正确'
+    try {
+        const host = imageUrl.split('/')[0]
+        const namespace = imageUrl.split('/')[1]
+        const name = `${namespace}/${imageUrl.split('/')[2].split(':')[0]}`
+        const tag = imageUrl.split('/')[2].split(':')[1]
+        // 获取授权实例，校验域名
+        const filteredInstances = authorizedTcrInstances?.filter(({ Domain }) => host === Domain)
+
+        if (!filteredInstances?.length) {
+            throw new CloudBaseError(errMsg)
+        }
+        // 获取实例中仓库，校验仓库名
+        const reposUnderSpecifiedRegistry = []
+        for (const registry of filteredInstances) {
+            const repos = []
+            let { Id: registryId, Domain: domain } = registry
+            const limit = 100
+            let curIndex = 1
+            let totalCount = 0
+            do {
+                const rsp = await tcrCloudApiService.request('DescribeRepositories', {
+                    RegistryId: registryId,
+                    Offset: curIndex,
+                    Limit: limit
+                })
+                repos.push(...rsp.RepositoryList)
+                curIndex += 1
+                totalCount = rsp.TotalCount
+            } while (repos.length < totalCount)
+            reposUnderSpecifiedRegistry.push({ registryId, domain, repos })
+        }
+
+        const filteredRepos = []
+        for (const repo of reposUnderSpecifiedRegistry) {
+            const { registryId, repos } = repo
+            filteredRepos.push(...repos.filter(({ Name }) => Name === name))
+            if (!filteredRepos?.length) {
+                throw new CloudBaseError(errMsg)
+            }
+            filteredRepos.forEach(item => { item.registryId = registryId })   // 手动插入实例id，获取镜像接口用
+        }
+        // 获取仓库内镜像，校验tag
+        for (const repoItem of filteredRepos) {
+            const { Name, Namespace, registryId } = repoItem
+            const images = []
+            const limit = 100
+            let curIndex = 1
+            let totalCount = 0
+            do {
+                const rsp = await tcrCloudApiService.request('DescribeImages', {
+                    RegistryId: registryId,
+                    NamespaceName: Namespace,
+                    RepositoryName: Name.split(`${Namespace}/`)[1],
+                    Offset: curIndex,
+                    Limit: limit
+                })
+                images.push(...rsp.ImageInfoList)
+                curIndex += 1
+                totalCount = rsp.TotalCount
+            } while (images.length < totalCount)
+
+            if (!images.some(({ ImageVersion }) => ImageVersion === tag)) {
+                throw new CloudBaseError(errMsg)
+            }
+        }
+    } catch (e) {
+        throw new CloudBaseError(errMsg)
+    }
+}

package/src/run/service/create.ts

@@ -11,7 +11,7 @@ export const describeCloudRunServerDetail = async (options: { envId: string; ser
     })
 }
 
-export async function createCloudRunServer(serviceConfigOptions) {
+export async function createCloudRunServer(serviceConfigOptions: Record<string, any>) {
     return callTcbrApi('CreateCloudRunServer', serviceConfigOptions)
 }
 

package/src/run/service/update.ts

@@ -1,6 +1,7 @@
 import { CloudBaseError, logger } from '@cloudbase/toolbox'
 import inquirer from 'inquirer'
 import { describeCloudRunServerDetail } from '..'
+import { ITcbrServiceOptions } from '../../types'
 import { callTcbrApi } from '../../utils'
 import { tcbrServiceOptions } from './common'
 import { getBuildStatus, getLogs } from './showLogs'
@@ -14,7 +15,7 @@ export async function updateCloudRunServer(serviceConfigOptions) {
     }
 }
 
-export async function updateTcbrService(options) {
+export async function updateTcbrService(options: ITcbrServiceOptions) {
     const { data: serviceDetail } = await describeCloudRunServerDetail({
         envId: options.envId,
         serviceName: options.serviceName

package/src/types.ts

@@ -585,6 +585,7 @@ export interface ITcbrServiceOptions {
     targetDir: string,
     dockerfile: string,
     image: string,
+    custom_image: string,
     library_image: string,
     json: boolean
 }
@@ -640,6 +641,7 @@ export interface ITcbrServiceRequiredOptions {
     containerPort: number,
     isCreated: boolean,
     path: string,
+    custom_image: string,
     library_image: string,
     image: string
 }
@@ -656,4 +658,15 @@ export interface ITcbrServiceConvertedOptionalOptions {
     memConverted: number,
     maxNumConverted: number,
     minNumConverted: number
+}
+
+export interface IAuthorizedTcrInstance {
+    Id: string,
+    Name: string,
+    Domain: string
+}
+
+export enum DEPLOY_TYPE {
+    PACKAGE = 'package',
+    IMAGE = 'image'
 }

package/types/run/service/common.d.ts

@@ -1,4 +1,4 @@
-import { ITcbrServiceOptions, IDescribeWxCloudBaseRunReleaseOrder } from '../../types';
+import { ITcbrServiceOptions, IDescribeWxCloudBaseRunReleaseOrder, IAuthorizedTcrInstance } from '../../types';
 export declare function describeWxCloudBaseRunReleaseOrder(options: IDescribeWxCloudBaseRunReleaseOrder): Promise<any>;
 export declare const convertNumber: (item: any) => number;
 export declare const extractPolicyDetails: (policyDetails: string) => {
@@ -27,6 +27,9 @@ export declare function tcbrServiceOptions(options: ITcbrServiceOptions, isCreat
         Port: number;
         HasDockerfile: boolean;
         Dockerfile: string;
+        LogType: string;
     };
     DeployInfo: any;
 }>;
+export declare function getAuthorizedTcrInstance(envId: string): Promise<IAuthorizedTcrInstance[] | null>;
+export declare function validateTcrImageURL(authorizedTcrInstances: IAuthorizedTcrInstance[] | null, imageUrl: string): Promise<void>;

package/types/run/service/create.d.ts

@@ -3,5 +3,5 @@ export declare const describeCloudRunServerDetail: (options: {
     envId: string;
     serviceName: string;
 }) => Promise<any>;
-export declare function createCloudRunServer(serviceConfigOptions: any): Promise<any>;
+export declare function createCloudRunServer(serviceConfigOptions: Record<string, any>): Promise<any>;
 export declare function createTcbrService(options: ITcbrServiceOptions): Promise<void>;

package/types/run/service/update.d.ts

@@ -1,2 +1,3 @@
+import { ITcbrServiceOptions } from '../../types';
 export declare function updateCloudRunServer(serviceConfigOptions: any): Promise<any>;
-export declare function updateTcbrService(options: any): Promise<void>;
+export declare function updateTcbrService(options: ITcbrServiceOptions): Promise<void>;

package/types/types.d.ts

@@ -509,6 +509,7 @@ export interface ITcbrServiceOptions {
     targetDir: string;
     dockerfile: string;
     image: string;
+    custom_image: string;
     library_image: string;
     json: boolean;
 }
@@ -557,6 +558,7 @@ export interface ITcbrServiceRequiredOptions {
     containerPort: number;
     isCreated: boolean;
     path: string;
+    custom_image: string;
     library_image: string;
     image: string;
 }
@@ -572,3 +574,12 @@ export interface ITcbrServiceConvertedOptionalOptions {
     maxNumConverted: number;
     minNumConverted: number;
 }
+export interface IAuthorizedTcrInstance {
+    Id: string;
+    Name: string;
+    Domain: string;
+}
+export declare enum DEPLOY_TYPE {
+    PACKAGE = "package",
+    IMAGE = "image"
+}