@cloudbase/cli 1.12.7-alpha.2 → 2.0.0

package/src/commands/gateway/delete.ts

@@ -1,81 +1,81 @@
-import { prompt } from 'enquirer'
-import { Command, ICommand } from '../common'
-import { loadingFactory } from '../../utils'
-import { InjectParams, EnvId, ArgsOptions } from '../../decorators'
-import { deleteGateway, queryGateway } from '../../gateway'
-
-@ICommand()
-export class DeleteServiceCommand extends Command {
-    get options() {
-        return {
-            cmd: 'service',
-            childCmd: 'delete',
-            deprecateCmd: 'service:delete',
-            options: [
-                {
-                    flags: '-e, --envId <envId>',
-                    desc: '环境 Id'
-                },
-                {
-                    flags: '-p, --service-path <servicePath>',
-                    desc: 'HTTP 访问服务路径，删除此路径对应的 HTTP 访问服务'
-                },
-                {
-                    flags: '-i, --service-id <serviceId>',
-                    desc: 'HTTP 访问服务 Id，删除此 Id 对应的 HTTP 访问服务'
-                },
-                {
-                    flags: '-n, --name <name>',
-                    desc: '云函数函数名称，删除此函数绑定的所有 HTTP 访问服务'
-                }
-            ],
-            desc: '删除 HTTP 访问服务'
-        }
-    }
-
-    @InjectParams()
-    async execute(@EnvId() envId, @ArgsOptions() options) {
-        let { servicePath, serviceId, name } = options
-
-        // 当没有指定要删除的服务时，获取所有服务列表，并提示
-        if (!servicePath && !serviceId && (!name || typeof name !== 'string')) {
-            const { APISet: allServices } = await queryGateway({
-                envId
-            })
-
-            const { selected } = await prompt<any>({
-                type: 'select',
-                name: 'selected',
-                message: '请选择需要删除的 Service',
-                choices: allServices.map((item) => ({
-                    name: `函数名：${item.Name}/路径：${item.Path}`,
-                    value: item.APIId
-                })),
-                result(choices) {
-                    return Object.values(this.map(choices)) as any
-                }
-            })
-            serviceId = selected?.[0]
-        }
-
-        if (servicePath) {
-            servicePath = servicePath[0] === '/' ? servicePath : `/${servicePath}`
-        }
-
-        const loading = loadingFactory()
-        loading.start('HTTP 访问服务删除中...')
-
-        try {
-            await deleteGateway({
-                envId,
-                name,
-                path: servicePath,
-                gatewayId: serviceId
-            })
-            loading.succeed('HTTP 访问服务删除成功！')
-        } catch (e) {
-            loading.stop()
-            throw e
-        }
-    }
-}
+import { prompt } from 'enquirer'
+import { Command, ICommand } from '../common'
+import { loadingFactory } from '../../utils'
+import { InjectParams, EnvId, ArgsOptions } from '../../decorators'
+import { deleteGateway, queryGateway } from '../../gateway'
+
+@ICommand()
+export class DeleteServiceCommand extends Command {
+    get options() {
+        return {
+            cmd: 'service',
+            childCmd: 'delete',
+            deprecateCmd: 'service:delete',
+            options: [
+                {
+                    flags: '-e, --envId <envId>',
+                    desc: '环境 Id'
+                },
+                {
+                    flags: '-p, --service-path <servicePath>',
+                    desc: 'HTTP 访问服务路径，删除此路径对应的 HTTP 访问服务'
+                },
+                {
+                    flags: '-i, --service-id <serviceId>',
+                    desc: 'HTTP 访问服务 Id，删除此 Id 对应的 HTTP 访问服务'
+                },
+                {
+                    flags: '-n, --name <name>',
+                    desc: '云函数函数名称，删除此函数绑定的所有 HTTP 访问服务'
+                }
+            ],
+            desc: '删除 HTTP 访问服务'
+        }
+    }
+
+    @InjectParams()
+    async execute(@EnvId() envId, @ArgsOptions() options) {
+        let { servicePath, serviceId, name } = options
+
+        // 当没有指定要删除的服务时，获取所有服务列表，并提示
+        if (!servicePath && !serviceId && (!name || typeof name !== 'string')) {
+            const { APISet: allServices } = await queryGateway({
+                envId
+            })
+
+            const { selected } = await prompt<any>({
+                type: 'select',
+                name: 'selected',
+                message: '请选择需要删除的 Service',
+                choices: allServices.map((item) => ({
+                    name: `函数名：${item.Name}/路径：${item.Path}`,
+                    value: item.APIId
+                })),
+                result(choices) {
+                    return Object.values(this.map(choices)) as any
+                }
+            })
+            serviceId = selected?.[0]
+        }
+
+        if (servicePath) {
+            servicePath = servicePath[0] === '/' ? servicePath : `/${servicePath}`
+        }
+
+        const loading = loadingFactory()
+        loading.start('HTTP 访问服务删除中...')
+
+        try {
+            await deleteGateway({
+                envId,
+                name,
+                path: servicePath,
+                gatewayId: serviceId
+            })
+            loading.succeed('HTTP 访问服务删除成功！')
+        } catch (e) {
+            loading.stop()
+            throw e
+        }
+    }
+}

package/src/commands/gateway/domain.ts

@@ -1,159 +1,159 @@
-import { Command, ICommand } from '../common'
-import { CloudBaseError } from '../../error'
-import { loadingFactory, printHorizontalTable, formatDate } from '../../utils'
-import { InjectParams, EnvId, ArgsParams, ArgsOptions, Log, Logger } from '../../decorators'
-import { bindGatewayDomain, queryGatewayDomain, unbindGatewayDomain } from '../../gateway'
-
-const SERVICE_STATUS_MAP = {
-    1: '部署中',
-    2: '部署失败',
-    3: '部署成功',
-    4: '删除中',
-    5: '删除失败'
-}
-
-// 暂时无法支持
-export class BindCustomDomainCommand extends Command {
-    get options() {
-        return {
-            cmd: 'service',
-            childCmd: { cmd: 'domain', desc: 'HTTP 访问服务域名管理' },
-            childSubCmd: 'bind <domain>',
-            deprecateCmd: 'service:domain:bind <domain>',
-            options: [
-                {
-                    flags: '-e, --envId <envId>',
-                    desc: '环境 Id'
-                }
-            ],
-            desc: '绑定自定义HTTP 访问服务域名'
-        }
-    }
-
-    @InjectParams()
-    async execute(@EnvId() envId, @ArgsParams() params) {
-        const domain = params?.[0]
-
-        console.log(domain)
-
-        if (!domain) {
-            throw new CloudBaseError('请指定需要绑定的HTTP 访问服务域名！')
-        }
-
-        const loading = loadingFactory()
-        loading.start(`HTTP 访问服务域名 [${domain}] 绑定中...`)
-
-        try {
-            await bindGatewayDomain({
-                envId,
-                domain
-            })
-            loading.succeed(`HTTP 访问服务域名[${domain}] 绑定成功！`)
-        } catch (e) {
-            loading.stop()
-            throw e
-        }
-    }
-}
-
-@ICommand()
-export class GetCustomDomainsCommand extends Command {
-    get options() {
-        return {
-            cmd: 'service',
-            childCmd: 'domain',
-            childSubCmd: 'list',
-            deprecateCmd: 'service:domain:list',
-            options: [
-                {
-                    flags: '-e, --envId <envId>',
-                    desc: '环境 Id'
-                },
-                {
-                    flags: '-d, --domain <domain>',
-                    desc: '域名'
-                }
-            ],
-            desc: '查询 HTTP 访问服务自定义域名'
-        }
-    }
-
-    @InjectParams()
-    async execute(@EnvId() envId, @ArgsOptions() options, @Log() log: Logger) {
-        const { domain: domainName } = options
-
-        if (!envId && !domainName) {
-            throw new CloudBaseError('请指定需要查询的环境 ID 或HTTP 访问服务域名！')
-        }
-
-        const loading = loadingFactory()
-        loading.start('查询HTTP 访问服务域名中...')
-
-        try {
-            const res = await queryGatewayDomain({
-                envId,
-                domain: domainName
-            })
-
-            loading.succeed('查询HTTP 访问服务域名成功！')
-
-            if (!res?.ServiceSet?.length) {
-                log.info('HTTP 访问服务域名为空！')
-                return
-            }
-
-            const head = ['域名', '状态', '创建时间']
-            const tableData = res.ServiceSet.map((item) => [
-                item.Domain,
-                SERVICE_STATUS_MAP[item.Status],
-                formatDate(item.OpenTime * 1000, 'yyyy-MM-dd hh:mm:ss')
-            ])
-            printHorizontalTable(head, tableData)
-        } catch (e) {
-            loading.stop()
-            throw e
-        }
-    }
-}
-
-@ICommand()
-export class UnbindCustomDomainCommand extends Command {
-    get options() {
-        return {
-            cmd: 'service',
-            childCmd: 'domain',
-            childSubCmd: 'unbind <domain>',
-            deprecateCmd: 'service:domain:unbind <domain>',
-            options: [
-                {
-                    flags: '-e, --envId <envId>',
-                    desc: '环境 Id'
-                }
-            ],
-            desc: '解绑自定义HTTP 访问服务域名'
-        }
-    }
-
-    @InjectParams()
-    async execute(@EnvId() envId, @ArgsParams() params) {
-        const domain = params?.[0]
-
-        if (!domain) {
-            throw new CloudBaseError('请指定需要解绑的HTTP 访问服务域名！')
-        }
-
-        const loading = loadingFactory()
-        loading.start(`HTTP Service域名 [${domain}] 解绑中...`)
-
-        try {
-            await unbindGatewayDomain({
-                envId,
-                domain
-            })
-            loading.succeed(`HTTP Service域名 [${domain}] 解绑成功！`)
-        } catch (e) {
-            loading.stop()
-            throw e
-        }
-    }
-}
+import { Command, ICommand } from '../common'
+import { CloudBaseError } from '../../error'
+import { loadingFactory, printHorizontalTable, formatDate } from '../../utils'
+import { InjectParams, EnvId, ArgsParams, ArgsOptions, Log, Logger } from '../../decorators'
+import { bindGatewayDomain, queryGatewayDomain, unbindGatewayDomain } from '../../gateway'
+
+const SERVICE_STATUS_MAP = {
+    1: '部署中',
+    2: '部署失败',
+    3: '部署成功',
+    4: '删除中',
+    5: '删除失败'
+}
+
+// 暂时无法支持
+export class BindCustomDomainCommand extends Command {
+    get options() {
+        return {
+            cmd: 'service',
+            childCmd: { cmd: 'domain', desc: 'HTTP 访问服务域名管理' },
+            childSubCmd: 'bind <domain>',
+            deprecateCmd: 'service:domain:bind <domain>',
+            options: [
+                {
+                    flags: '-e, --envId <envId>',
+                    desc: '环境 Id'
+                }
+            ],
+            desc: '绑定自定义HTTP 访问服务域名'
+        }
+    }
+
+    @InjectParams()
+    async execute(@EnvId() envId, @ArgsParams() params) {
+        const domain = params?.[0]
+
+        console.log(domain)
+
+        if (!domain) {
+            throw new CloudBaseError('请指定需要绑定的HTTP 访问服务域名！')
+        }
+
+        const loading = loadingFactory()
+        loading.start(`HTTP 访问服务域名 [${domain}] 绑定中...`)
+
+        try {
+            await bindGatewayDomain({
+                envId,
+                domain
+            })
+            loading.succeed(`HTTP 访问服务域名[${domain}] 绑定成功！`)
+        } catch (e) {
+            loading.stop()
+            throw e
+        }
+    }
+}
+
+@ICommand()
+export class GetCustomDomainsCommand extends Command {
+    get options() {
+        return {
+            cmd: 'service',
+            childCmd: 'domain',
+            childSubCmd: 'list',
+            deprecateCmd: 'service:domain:list',
+            options: [
+                {
+                    flags: '-e, --envId <envId>',
+                    desc: '环境 Id'
+                },
+                {
+                    flags: '-d, --domain <domain>',
+                    desc: '域名'
+                }
+            ],
+            desc: '查询 HTTP 访问服务自定义域名'
+        }
+    }
+
+    @InjectParams()
+    async execute(@EnvId() envId, @ArgsOptions() options, @Log() log: Logger) {
+        const { domain: domainName } = options
+
+        if (!envId && !domainName) {
+            throw new CloudBaseError('请指定需要查询的环境 ID 或HTTP 访问服务域名！')
+        }
+
+        const loading = loadingFactory()
+        loading.start('查询HTTP 访问服务域名中...')
+
+        try {
+            const res = await queryGatewayDomain({
+                envId,
+                domain: domainName
+            })
+
+            loading.succeed('查询HTTP 访问服务域名成功！')
+
+            if (!res?.ServiceSet?.length) {
+                log.info('HTTP 访问服务域名为空！')
+                return
+            }
+
+            const head = ['域名', '状态', '创建时间']
+            const tableData = res.ServiceSet.map((item) => [
+                item.Domain,
+                SERVICE_STATUS_MAP[item.Status],
+                formatDate(item.OpenTime * 1000, 'yyyy-MM-dd hh:mm:ss')
+            ])
+            printHorizontalTable(head, tableData)
+        } catch (e) {
+            loading.stop()
+            throw e
+        }
+    }
+}
+
+@ICommand()
+export class UnbindCustomDomainCommand extends Command {
+    get options() {
+        return {
+            cmd: 'service',
+            childCmd: 'domain',
+            childSubCmd: 'unbind <domain>',
+            deprecateCmd: 'service:domain:unbind <domain>',
+            options: [
+                {
+                    flags: '-e, --envId <envId>',
+                    desc: '环境 Id'
+                }
+            ],
+            desc: '解绑自定义HTTP 访问服务域名'
+        }
+    }
+
+    @InjectParams()
+    async execute(@EnvId() envId, @ArgsParams() params) {
+        const domain = params?.[0]
+
+        if (!domain) {
+            throw new CloudBaseError('请指定需要解绑的HTTP 访问服务域名！')
+        }
+
+        const loading = loadingFactory()
+        loading.start(`HTTP Service域名 [${domain}] 解绑中...`)
+
+        try {
+            await unbindGatewayDomain({
+                envId,
+                domain
+            })
+            loading.succeed(`HTTP Service域名 [${domain}] 解绑成功！`)
+        } catch (e) {
+            loading.stop()
+            throw e
+        }
+    }
+}

package/src/commands/gateway/index.ts

@@ -1,5 +1,5 @@
-export * from './create'
-export * from './delete'
-export * from './domain'
-export * from './list'
-export * from './switch'
+export * from './create'
+export * from './delete'
+export * from './domain'
+export * from './list'
+export * from './switch'

package/src/commands/gateway/list.ts

@@ -1,76 +1,76 @@
-import { Command, ICommand } from '../common'
-import { CloudBaseError } from '../../error'
-import { queryGateway } from '../../gateway'
-
-import { InjectParams, EnvId, ArgsOptions, Log, Logger } from '../../decorators'
-import { printHorizontalTable, loadingFactory, formatDate } from '../../utils'
-
-@ICommand()
-export class ListServiceCommand extends Command {
-    get options() {
-        return {
-            cmd: 'service',
-            childCmd: 'list',
-            deprecateCmd: 'service:list',
-            options: [
-                {
-                    flags: '-e, --envId <envId>',
-                    desc: '环境 Id'
-                },
-                {
-                    flags: '-d, --domain <domain>',
-                    desc: '自定义域名'
-                },
-                {
-                    flags: '-p, --service-path <servicePath>',
-                    desc: 'Service Path'
-                },
-                {
-                    flags: '-id, --service-id <serviceId>',
-                    desc: 'Service Id'
-                }
-            ],
-            desc: '获取 HTTP 访问服务列表'
-        }
-    }
-
-    @InjectParams()
-    async execute(@EnvId() envId, @ArgsOptions() options, @Log() log: Logger) {
-        const { domain: domainName, servicePath, serviceId } = options
-
-        if (!envId && !domainName) {
-            throw new CloudBaseError('请指定需要查询的环境 ID 或HTTP 访问服务自定义域名！')
-        }
-
-        const loading = loadingFactory()
-        loading.start('查询HTTP 访问服务中...')
-
-        try {
-            const res = await queryGateway({
-                envId,
-                domain: domainName,
-                path: servicePath,
-                gatewayId: serviceId
-            })
-
-            loading.stop()
-
-            if (res?.APISet?.length === 0) {
-                log.info('HTTP 访问服务为空')
-                return
-            }
-
-            const head = ['触发路径', '关联资源', '触发类型', '创建时间']
-            const tableData = res.APISet.map((item) => [
-                item.Path,
-                item.Name,
-                item.Type === 1 ? '云函数' : '云托管',
-                formatDate(item.CreateTime * 1000, 'yyyy-MM-dd hh:mm:ss')
-            ])
-            printHorizontalTable(head, tableData)
-        } catch (e) {
-            loading.stop()
-            throw e
-        }
-    }
-}
+import { Command, ICommand } from '../common'
+import { CloudBaseError } from '../../error'
+import { queryGateway } from '../../gateway'
+
+import { InjectParams, EnvId, ArgsOptions, Log, Logger } from '../../decorators'
+import { printHorizontalTable, loadingFactory, formatDate } from '../../utils'
+
+@ICommand()
+export class ListServiceCommand extends Command {
+    get options() {
+        return {
+            cmd: 'service',
+            childCmd: 'list',
+            deprecateCmd: 'service:list',
+            options: [
+                {
+                    flags: '-e, --envId <envId>',
+                    desc: '环境 Id'
+                },
+                {
+                    flags: '-d, --domain <domain>',
+                    desc: '自定义域名'
+                },
+                {
+                    flags: '-p, --service-path <servicePath>',
+                    desc: 'Service Path'
+                },
+                {
+                    flags: '-id, --service-id <serviceId>',
+                    desc: 'Service Id'
+                }
+            ],
+            desc: '获取 HTTP 访问服务列表'
+        }
+    }
+
+    @InjectParams()
+    async execute(@EnvId() envId, @ArgsOptions() options, @Log() log: Logger) {
+        const { domain: domainName, servicePath, serviceId } = options
+
+        if (!envId && !domainName) {
+            throw new CloudBaseError('请指定需要查询的环境 ID 或HTTP 访问服务自定义域名！')
+        }
+
+        const loading = loadingFactory()
+        loading.start('查询HTTP 访问服务中...')
+
+        try {
+            const res = await queryGateway({
+                envId,
+                domain: domainName,
+                path: servicePath,
+                gatewayId: serviceId
+            })
+
+            loading.stop()
+
+            if (res?.APISet?.length === 0) {
+                log.info('HTTP 访问服务为空')
+                return
+            }
+
+            const head = ['触发路径', '关联资源', '触发类型', '创建时间']
+            const tableData = res.APISet.map((item) => [
+                item.Path,
+                item.Name,
+                item.Type === 1 ? '云函数' : '云托管',
+                formatDate(item.CreateTime * 1000, 'yyyy-MM-dd hh:mm:ss')
+            ])
+            printHorizontalTable(head, tableData)
+        } catch (e) {
+            loading.stop()
+            throw e
+        }
+    }
+}