@cloudbase/cli 1.12.7-alpha.4 → 2.0.0

package/src/commands/run/standalonegateway/package.ts

@@ -1,62 +1,62 @@
-import { Command, ICommand } from '../../common'
-import { listPackageStandalonegateway } from '../../../run'
-import { loadingFactory } from '@cloudbase/toolbox'
-import { EnvId, ArgsOptions, ArgsParams, InjectParams } from '../../../decorators'
-import { standalonegatewayCommonOptions } from './common'
-import { CloudBaseError } from '../../../error'
-import { printHorizontalTable } from '../../../utils'
-
-@ICommand()
-export class PackageStandalonegateway extends Command {
-    get options() {
-        return {
-            ...standalonegatewayCommonOptions('package <operation>'),
-            options: [
-                {
-                    flags: '-e, --envId <envId>',
-                    desc: '环境 Id'
-                },
-                {
-                    flags: '-p, --packageVersion <packageVersion>',
-                    desc: '套餐版本'
-                }
-            ],
-            desc: '套餐操作'
-        }
-    }
-
-    @InjectParams()
-    async execute(@EnvId() envId, @ArgsParams() params, @ArgsOptions() options) {
-        const operation = params?.[0]
-        if (!operation || ['list'].indexOf(operation) === -1) {
-            throw new CloudBaseError('请输入具体操作')
-        }
-
-        switch (operation) {
-            case 'list':
-                {
-                    let { appId, packageVersion = '' } = options
-                    appId = String(appId)
-                    packageVersion = String(packageVersion)
-
-                    const loading = loadingFactory()
-
-                    loading.start('数据加载中...')
-
-                    const data = await listPackageStandalonegateway({
-                        envId,
-                        packageVersion
-                    })
-
-                    loading.stop()
-
-                    const head = ['CPU', '内存', '版本']
-
-                    printHorizontalTable(head, data)
-                }
-                break
-            default:
-                break
-        }
-    }
-}
+import { Command, ICommand } from '../../common'
+import { listPackageStandalonegateway } from '../../../run'
+import { loadingFactory } from '@cloudbase/toolbox'
+import { EnvId, ArgsOptions, ArgsParams, InjectParams } from '../../../decorators'
+import { standalonegatewayCommonOptions } from './common'
+import { CloudBaseError } from '../../../error'
+import { printHorizontalTable } from '../../../utils'
+
+@ICommand()
+export class PackageStandalonegateway extends Command {
+    get options() {
+        return {
+            ...standalonegatewayCommonOptions('package <operation>'),
+            options: [
+                {
+                    flags: '-e, --envId <envId>',
+                    desc: '环境 Id'
+                },
+                {
+                    flags: '-p, --packageVersion <packageVersion>',
+                    desc: '套餐版本'
+                }
+            ],
+            desc: '套餐操作'
+        }
+    }
+
+    @InjectParams()
+    async execute(@EnvId() envId, @ArgsParams() params, @ArgsOptions() options) {
+        const operation = params?.[0]
+        if (!operation || ['list'].indexOf(operation) === -1) {
+            throw new CloudBaseError('请输入具体操作')
+        }
+
+        switch (operation) {
+            case 'list':
+                {
+                    let { appId, packageVersion = '' } = options
+                    appId = String(appId)
+                    packageVersion = String(packageVersion)
+
+                    const loading = loadingFactory()
+
+                    loading.start('数据加载中...')
+
+                    const data = await listPackageStandalonegateway({
+                        envId,
+                        packageVersion
+                    })
+
+                    loading.stop()
+
+                    const head = ['CPU', '内存', '版本']
+
+                    printHorizontalTable(head, data)
+                }
+                break
+            default:
+                break
+        }
+    }
+}

package/src/commands/run/standalonegateway/turn.ts

@@ -1,63 +1,63 @@
-import { Command, ICommand } from '../../common'
-import { turnOffStandalonegateway, turnOnStandalonegateway } from '../../../run'
-import { loadingFactory } from '@cloudbase/toolbox'
-import { ArgsOptions, ArgsParams, EnvId, InjectParams } from '../../../decorators'
-import { standalonegatewayCommonOptions } from './common'
-import { CloudBaseError } from '../../../error'
-
-@ICommand()
-export class TurnStandalonegateway extends Command {
-    get options() {
-        return {
-            ...standalonegatewayCommonOptions('turn <status>'),
-            options: [
-                {
-                    flags: '-e, --envId <envId>',
-                    desc: '环境 Id'
-                },
-                {
-                    flags: '-gN, --gatewayName <gatewayName>',
-                    desc: '网关名'
-                },
-                {
-                    flags: '-sL, --serviceList <serviceList...>',
-                    desc: '云托管服务列表'
-                }
-            ],
-            desc: '启停小租户网关'
-        }
-    }
-
-    @InjectParams()
-    async execute(@EnvId() envId, @ArgsParams() params, @ArgsOptions() options) {
-        const status = params?.[0]
-        if (!status || ['on', 'off'].indexOf(status) === -1) {
-            throw new CloudBaseError('请输入启停状态')
-        }
-
-        let { gatewayName = '', serviceList = [] } = options
-        gatewayName = String(gatewayName)
-
-        if (gatewayName === '') {
-            throw new CloudBaseError('请输入网关名')
-        }
-
-        if (serviceList.length === 0) {
-            throw new CloudBaseError('请输入云托管服务列表')
-        }
-
-        const loading = loadingFactory()
-
-        loading.start('数据加载中...')
-
-        await (status === 'on' ? turnOnStandalonegateway : turnOffStandalonegateway)({
-            envId,
-            gatewayName,
-            serviceList
-        })
-
-        loading.stop()
-
-        console.log('操作执行成功')
-    }
-}
+import { Command, ICommand } from '../../common'
+import { turnOffStandalonegateway, turnOnStandalonegateway } from '../../../run'
+import { loadingFactory } from '@cloudbase/toolbox'
+import { ArgsOptions, ArgsParams, EnvId, InjectParams } from '../../../decorators'
+import { standalonegatewayCommonOptions } from './common'
+import { CloudBaseError } from '../../../error'
+
+@ICommand()
+export class TurnStandalonegateway extends Command {
+    get options() {
+        return {
+            ...standalonegatewayCommonOptions('turn <status>'),
+            options: [
+                {
+                    flags: '-e, --envId <envId>',
+                    desc: '环境 Id'
+                },
+                {
+                    flags: '-gN, --gatewayName <gatewayName>',
+                    desc: '网关名'
+                },
+                {
+                    flags: '-sL, --serviceList <serviceList...>',
+                    desc: '云托管服务列表'
+                }
+            ],
+            desc: '启停小租户网关'
+        }
+    }
+
+    @InjectParams()
+    async execute(@EnvId() envId, @ArgsParams() params, @ArgsOptions() options) {
+        const status = params?.[0]
+        if (!status || ['on', 'off'].indexOf(status) === -1) {
+            throw new CloudBaseError('请输入启停状态')
+        }
+
+        let { gatewayName = '', serviceList = [] } = options
+        gatewayName = String(gatewayName)
+
+        if (gatewayName === '') {
+            throw new CloudBaseError('请输入网关名')
+        }
+
+        if (serviceList.length === 0) {
+            throw new CloudBaseError('请输入云托管服务列表')
+        }
+
+        const loading = loadingFactory()
+
+        loading.start('数据加载中...')
+
+        await (status === 'on' ? turnOnStandalonegateway : turnOffStandalonegateway)({
+            envId,
+            gatewayName,
+            serviceList
+        })
+
+        loading.stop()
+
+        console.log('操作执行成功')
+    }
+}

package/src/commands/run/version/common.ts

@@ -1,5 +1,5 @@
 export const versionCommonOptions = (sub: string) => ({
-    cmd: 'run',
+    cmd: 'run:deprecated',
     childCmd: {
         cmd: 'version',
         desc: '云托管版本管理'

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

@@ -13,9 +13,10 @@ import {
     basicOperate,
     logCreate
 } from '../../../run'
-import { loadingFactory, pagingSelectPromp, random } from '../../../utils'
+import { checkTcbrEnv, loadingFactory, logEnvCheck, pagingSelectPromp, random } from '../../../utils'
 import { InjectParams, EnvId, ArgsOptions } from '../../../decorators'
 import { versionCommonOptions } from './common'
+import { EnumEnvCheck } from '../../../constant'
 
 const uploadTypeMap = {
     本地代码: 'package',
@@ -111,6 +112,12 @@ export class CreateVersion extends Command {
     /* eslint complexity: ["error", 40] */
     @InjectParams()
     async execute(@EnvId() envId, @ArgsOptions() options) {
+        let envCheckType = await checkTcbrEnv(options.envId, false)
+        if(envCheckType !== EnumEnvCheck.EnvFit) {
+            logEnvCheck(envId, envCheckType)
+            return
+        }
+        
         let {
             serviceName = '',
             path: _path = '',

package/src/commands/run/version/delete.ts

@@ -1,9 +1,10 @@
 import { Command, ICommand } from '../../common'
 import { CloudBaseError } from '../../../error'
 import { deleteVersion } from '../../../run'
-import { loadingFactory } from '../../../utils'
+import { checkTcbrEnv, loadingFactory, logEnvCheck } from '../../../utils'
 import { InjectParams, EnvId, ArgsOptions } from '../../../decorators'
 import { versionCommonOptions } from './common'
+import { EnumEnvCheck } from '../../../constant'
 
 @ICommand()
 export class DeleteVersion extends Command {
@@ -30,7 +31,12 @@ export class DeleteVersion extends Command {
 
     @InjectParams()
     async execute(@EnvId() envId, @ArgsOptions() options) {
-
+        let envCheckType = await checkTcbrEnv(options.envId, false)
+        if(envCheckType !== EnumEnvCheck.EnvFit) {
+            logEnvCheck(envId, envCheckType)
+            return
+        }
+        
         let { serviceName = '', versionName = '' } = options
 
         if (versionName.length === 0 || serviceName.length === 0) {

package/src/commands/run/version/index.ts

@@ -1,5 +1,5 @@
-export * from './list'
-export * from './delete'
-export * from './modify'
-export * from './create'
+export * from './list'
+export * from './delete'
+export * from './modify'
+export * from './create'
 export * from './update'

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

@@ -1,9 +1,10 @@
 import { Command, ICommand } from '../../common'
 import { CloudBaseError } from '../../../error'
 import { listVersion } from '../../../run'
-import { printHorizontalTable, loadingFactory } from '../../../utils'
+import { printHorizontalTable, loadingFactory, checkTcbrEnv, logEnvCheck } from '../../../utils'
 import { InjectParams, EnvId, ArgsOptions } from '../../../decorators'
 import { versionCommonOptions } from './common'
+import { EnumEnvCheck } from '../../../constant'
 
 const StatusMap = {
     normal: '正常',
@@ -39,6 +40,11 @@ export class ListVersion extends Command {
 
     @InjectParams()
     async execute(@EnvId() envId, @ArgsOptions() options) {
+        let envCheckType = await checkTcbrEnv(options.envId, false)
+        if(envCheckType !== EnumEnvCheck.EnvFit) {
+            logEnvCheck(envId, envCheckType)
+            return
+        }
 
         let { limit = 20, offset = 0, serviceName = '' } = options
         limit = Number(limit)

package/src/commands/run/version/modify.ts

@@ -2,9 +2,10 @@ import { prompt } from 'enquirer'
 import { Command, ICommand } from '../../common'
 import { CloudBaseError } from '../../../error'
 import { listVersion, modifyVersion } from '../../../run'
-import { loadingFactory, pagingSelectPromp } from '../../../utils'
+import { checkTcbrEnv, loadingFactory, logEnvCheck, pagingSelectPromp } from '../../../utils'
 import { InjectParams, EnvId, ArgsOptions } from '../../../decorators'
 import { versionCommonOptions } from './common'
+import { EnumEnvCheck } from '../../../constant'
 
 // 按百分比配置
 const modifyByFlow = async (envId: any, serviceName: string, mode: string) => {
@@ -118,6 +119,12 @@ export class ModifyVersion extends Command {
 
     @InjectParams()
     async execute(@EnvId() envId, @ArgsOptions() options) {
+        let envCheckType = await checkTcbrEnv(options.envId, false)
+        if(envCheckType !== EnumEnvCheck.EnvFit) {
+            logEnvCheck(envId, envCheckType)
+            return
+        }
+        
         let { serviceName = '', traffic: _traffic = 'FLOW' } = options
         if (serviceName.length === 0) throw new CloudBaseError('请填入有效云托管服务名')
 

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

@@ -14,9 +14,10 @@ import {
     logCreate,
     describeRunVersion
 } from '../../../run'
-import { loadingFactory, pagingSelectPromp, random } from '../../../utils'
+import { checkTcbrEnv, loadingFactory, logEnvCheck, pagingSelectPromp, random } from '../../../utils'
 import { InjectParams, EnvId, ArgsOptions } from '../../../decorators'
 import { versionCommonOptions } from './common'
+import { EnumEnvCheck } from '../../../constant'
 
 const uploadTypeMap = {
     本地代码: 'package',
@@ -136,6 +137,12 @@ export class UpdateVersion extends Command {
 
     @InjectParams()
     async execute(@EnvId() envId, @ArgsOptions() options) {
+        let envCheckType = await checkTcbrEnv(options.envId, false)
+        if(envCheckType !== EnumEnvCheck.EnvFit) {
+            logEnvCheck(envId, envCheckType)
+            return
+        }
+        
         let {
             serviceName = '',
             versionName = '',

package/src/commands/smart.ts

@@ -1,132 +1,132 @@
-import fs from 'fs'
-import os from 'os'
-import _ from 'lodash'
-import path from 'path'
-import chalk from 'chalk'
-import { prompt } from 'enquirer'
-import { run } from '@cloudbase/framework-core'
-import { ConfigParser, getRegion } from '@cloudbase/toolbox'
-import {
-    logger,
-    getSelectedEnv,
-    authSupevisor,
-    loadingFactory,
-    getSelectRegion,
-    checkTcbService,
-    getCloudBaseConfig,
-    downloadTemplate,
-    initProjectConfig
-} from '../utils'
-import * as Hosting from '../hosting'
-import * as Function from '../function'
-import { checkLogin } from '../auth'
-
-/**
- * 智能命令
- */
-export async function smartDeploy() {
-    const loading = loadingFactory()
-    loading.start('环境检测中')
-
-    // 检查登录
-    await checkLogin()
-
-    // 检查是否开通 TCB 服务
-    await checkTcbService()
-
-    const files = fs.readdirSync(process.cwd())
-
-    loading.stop()
-
-    // 获取当前目录
-    const home = os.homedir()
-    const current = process.cwd()
-    let relative = current
-    if (current.indexOf(home) > -1) {
-        relative = path.relative(home, current)
-    }
-
-    // 当期区域
-    let region = await getRegion(true)
-
-    // 当前目录为空，执行初始化项目操作
-    if (!files.length) {
-        logger.info('当前目录为空，初始化云开发项目\n')
-        // 先选择 region，再选择环境
-        region = await getSelectRegion()
-        const envId = await getSelectedEnv()
-        // 下载模板
-        const projectPath = await downloadTemplate()
-        await initProjectConfig(envId, region, projectPath)
-        // 成功提示
-        logger.success('初始化项目成功！\n')
-    }
-
-    // 初始化项目成功，或当前目录已经存在项目，继续使用 Framework 执行部署
-    const { setup } = await prompt<any>({
-        type: 'confirm',
-        name: 'setup',
-        message: `是否使用云开发部署当前项目 <${chalk.bold.cyan(relative)}> ？`,
-        initial: true
-    })
-
-    if (!setup) {
-        return
-    }
-
-    // 检测是否有 cloudbase 配置
-    const config = await getCloudBaseConfig()
-    let envId = config?.envId
-
-    // 配置文件中不存在 region，选择 region
-    if (!config?.region && !region) {
-        region = await getSelectRegion()
-    }
-
-    // 配置文件不存在
-    if (!envId) {
-        envId = await getSelectedEnv()
-        fs.writeFileSync(
-            path.join(process.cwd(), 'cloudbaserc.json'),
-            JSON.stringify({
-                envId,
-                region,
-                version: '2.0',
-                $schema: 'https://framework-1258016615.tcloudbaseapp.com/schema/latest.json'
-            })
-        )
-    }
-
-    // 把 region 写入到配置文件中
-    const parser = new ConfigParser()
-    parser.update('region', region)
-
-    // 调用 Framework
-    await callFramework(envId)
-}
-
-async function callFramework(envId: string) {
-    const loginState = await authSupevisor.getLoginState()
-    const { token, secretId, secretKey } = loginState
-    const config = await getCloudBaseConfig()
-
-    await run(
-        {
-            projectPath: process.cwd(),
-            cloudbaseConfig: {
-                secretId,
-                secretKey,
-                token,
-                envId
-            },
-            config,
-            logLevel: process.argv.includes('--verbose') ? 'debug' : 'info',
-            resourceProviders: {
-                hosting: Hosting,
-                function: Function
-            }
-        },
-        'deploy',
-        ''
-    )
-}
+import fs from 'fs'
+import os from 'os'
+import _ from 'lodash'
+import path from 'path'
+import chalk from 'chalk'
+import { prompt } from 'enquirer'
+import { run } from '@cloudbase/framework-core'
+import { ConfigParser, getRegion } from '@cloudbase/toolbox'
+import {
+    logger,
+    getSelectedEnv,
+    authSupevisor,
+    loadingFactory,
+    getSelectRegion,
+    checkTcbService,
+    getCloudBaseConfig,
+    downloadTemplate,
+    initProjectConfig
+} from '../utils'
+import * as Hosting from '../hosting'
+import * as Function from '../function'
+import { checkLogin } from '../auth'
+
+/**
+ * 智能命令
+ */
+export async function smartDeploy() {
+    const loading = loadingFactory()
+    loading.start('环境检测中')
+
+    // 检查登录
+    await checkLogin()
+
+    // 检查是否开通 TCB 服务
+    await checkTcbService()
+
+    const files = fs.readdirSync(process.cwd())
+
+    loading.stop()
+
+    // 获取当前目录
+    const home = os.homedir()
+    const current = process.cwd()
+    let relative = current
+    if (current.indexOf(home) > -1) {
+        relative = path.relative(home, current)
+    }
+
+    // 当期区域
+    let region = await getRegion(true)
+
+    // 当前目录为空，执行初始化项目操作
+    if (!files.length) {
+        logger.info('当前目录为空，初始化云开发项目\n')
+        // 先选择 region，再选择环境
+        region = await getSelectRegion()
+        const envId = await getSelectedEnv()
+        // 下载模板
+        const projectPath = await downloadTemplate()
+        await initProjectConfig(envId, region, projectPath)
+        // 成功提示
+        logger.success('初始化项目成功！\n')
+    }
+
+    // 初始化项目成功，或当前目录已经存在项目，继续使用 Framework 执行部署
+    const { setup } = await prompt<any>({
+        type: 'confirm',
+        name: 'setup',
+        message: `是否使用云开发部署当前项目 <${chalk.bold.cyan(relative)}> ？`,
+        initial: true
+    })
+
+    if (!setup) {
+        return
+    }
+
+    // 检测是否有 cloudbase 配置
+    const config = await getCloudBaseConfig()
+    let envId = config?.envId
+
+    // 配置文件中不存在 region，选择 region
+    if (!config?.region && !region) {
+        region = await getSelectRegion()
+    }
+
+    // 配置文件不存在
+    if (!envId) {
+        envId = await getSelectedEnv()
+        fs.writeFileSync(
+            path.join(process.cwd(), 'cloudbaserc.json'),
+            JSON.stringify({
+                envId,
+                region,
+                version: '2.0',
+                $schema: 'https://framework-1258016615.tcloudbaseapp.com/schema/latest.json'
+            })
+        )
+    }
+
+    // 把 region 写入到配置文件中
+    const parser = new ConfigParser()
+    parser.update('region', region)
+
+    // 调用 Framework
+    await callFramework(envId)
+}
+
+async function callFramework(envId: string) {
+    const loginState = await authSupevisor.getLoginState()
+    const { token, secretId, secretKey } = loginState
+    const config = await getCloudBaseConfig()
+
+    await run(
+        {
+            projectPath: process.cwd(),
+            cloudbaseConfig: {
+                secretId,
+                secretKey,
+                token,
+                envId
+            },
+            config,
+            logLevel: process.argv.includes('--verbose') ? 'debug' : 'info',
+            resourceProviders: {
+                hosting: Hosting,
+                function: Function
+            }
+        },
+        'deploy',
+        ''
+    )
+}