@cloudbase/cli 2.0.3 → 2.0.5

package/src/commands/functions/layer/download.ts

@@ -1,92 +1,92 @@
-import path from 'path'
-import fse from 'fs-extra'
-import { prompt } from 'enquirer'
-import { loadingFactory } from '../../../utils'
-import { CloudBaseError } from '../../../error'
-import { Command, ICommand } from '../../common'
-import { InjectParams, EnvId, ArgsOptions } from '../../../decorators'
-import { downloadLayer, listLayers, listLayerVersions } from '../../../function'
-import { layerCommonOptions } from './common'
-
-@ICommand()
-export class DownloadFileLayer extends Command {
-    get options() {
-        return {
-            ...layerCommonOptions('download'),
-            deprecateCmd: 'functions:layer:download',
-            options: [
-                {
-                    flags: '-e, --envId <envId>',
-                    desc: '环境 Id'
-                },
-                {
-                    flags: '--dest <dest>',
-                    desc: '下载文件存放的地址'
-                }
-            ],
-            desc: '下载云函数文件层'
-        }
-    }
-
-    @InjectParams()
-    async execute(@EnvId() envId, @ArgsOptions() options) {
-        const { dest } = options
-
-        const loading = loadingFactory()
-        loading.start('数据加载中...')
-
-        let layers: any[] = await listLayers({
-            offset: 0,
-            limit: 200
-        })
-
-        loading.stop()
-
-        // 只能下载当前环境的文件层
-        layers = layers
-            .filter((item) => item.LayerName.includes(`_${envId}`))
-            .map((item) => item.LayerName)
-
-        if (!layers.length) {
-            throw new CloudBaseError('当前环境没有可用的文件层，请先创建文件层！')
-        }
-
-        const { layer } = await prompt<any>({
-            type: 'select',
-            name: 'layer',
-            message: '选择文件层名称',
-            choices: layers
-        })
-
-        let versions = await listLayerVersions({
-            name: layer
-        })
-
-        versions = versions.map((item) => String(item.LayerVersion))
-
-        const { version } = await prompt<any>({
-            type: 'select',
-            name: 'version',
-            message: '选择文件层版本',
-            choices: versions
-        })
-
-        let destPath
-
-        if (!dest) {
-            destPath = path.resolve(process.cwd(), 'layers')
-        }
-
-        loading.start('文件下载中...')
-
-        await fse.ensureDir(destPath)
-        await downloadLayer({
-            destPath,
-            version: Number(version),
-            name: layer,
-            unzip: true
-        })
-
-        loading.succeed('文件下载成功！')
-    }
-}
+import path from 'path'
+import fse from 'fs-extra'
+import { prompt } from 'enquirer'
+import { loadingFactory } from '../../../utils'
+import { CloudBaseError } from '../../../error'
+import { Command, ICommand } from '../../common'
+import { InjectParams, EnvId, ArgsOptions } from '../../../decorators'
+import { downloadLayer, listLayers, listLayerVersions } from '../../../function'
+import { layerCommonOptions } from './common'
+
+@ICommand()
+export class DownloadFileLayer extends Command {
+    get options() {
+        return {
+            ...layerCommonOptions('download'),
+            deprecateCmd: 'functions:layer:download',
+            options: [
+                {
+                    flags: '-e, --envId <envId>',
+                    desc: '环境 Id'
+                },
+                {
+                    flags: '--dest <dest>',
+                    desc: '下载文件存放的地址'
+                }
+            ],
+            desc: '下载云函数文件层'
+        }
+    }
+
+    @InjectParams()
+    async execute(@EnvId() envId, @ArgsOptions() options) {
+        const { dest } = options
+
+        const loading = loadingFactory()
+        loading.start('数据加载中...')
+
+        let layers: any[] = await listLayers({
+            offset: 0,
+            limit: 200
+        })
+
+        loading.stop()
+
+        // 只能下载当前环境的文件层
+        layers = layers
+            .filter((item) => item.LayerName.includes(`_${envId}`))
+            .map((item) => item.LayerName)
+
+        if (!layers.length) {
+            throw new CloudBaseError('当前环境没有可用的文件层，请先创建文件层！')
+        }
+
+        const { layer } = await prompt<any>({
+            type: 'select',
+            name: 'layer',
+            message: '选择文件层名称',
+            choices: layers
+        })
+
+        let versions = await listLayerVersions({
+            name: layer
+        })
+
+        versions = versions.map((item) => String(item.LayerVersion))
+
+        const { version } = await prompt<any>({
+            type: 'select',
+            name: 'version',
+            message: '选择文件层版本',
+            choices: versions
+        })
+
+        let destPath
+
+        if (!dest) {
+            destPath = path.resolve(process.cwd(), 'layers')
+        }
+
+        loading.start('文件下载中...')
+
+        await fse.ensureDir(destPath)
+        await downloadLayer({
+            destPath,
+            version: Number(version),
+            name: layer,
+            unzip: true
+        })
+
+        loading.succeed('文件下载成功！')
+    }
+}

package/src/commands/functions/layer/index.ts

@@ -1,7 +1,7 @@
-export * from './list'
-export * from './bind'
-export * from './delete'
-export * from './create'
-export * from './download'
-export * from './list'
-export * from './sort'
+export * from './list'
+export * from './bind'
+export * from './delete'
+export * from './create'
+export * from './download'
+export * from './list'
+export * from './sort'

package/src/commands/functions/layer/list.ts

@@ -1,94 +1,94 @@
-import { Command, ICommand } from '../../common'
-import { loadingFactory, printHorizontalTable } from '../../../utils'
-import { InjectParams, EnvId, ArgsOptions, Log, Logger } from '../../../decorators'
-import { listLayers, getFunctionDetail, listLayerVersions } from '../../../function'
-import { layerCommonOptions } from './common'
-
-/**
- * 展示文件层列表
- * 1. 当不传入函数名时，展示所有文件层
- * 2. 当传入函数名时，展示函数绑定的文件层
- * 3. 当传入文件层别名时，展示文件层的版本信息
- */
-@ICommand()
-export class ListFileLayer extends Command {
-    get options() {
-        return {
-            ...layerCommonOptions('list'),
-            deprecateCmd: 'functions:layer:list',
-            options: [
-                {
-                    flags: '-e, --envId <envId>',
-                    desc: '环境 Id'
-                },
-                {
-                    flags: '--name, <name>',
-                    desc: '函数名称'
-                },
-                {
-                    flags: '--layer, <layer>',
-                    desc: '文件层别名'
-                },
-                {
-                    flags: '--code-secret, <codeSecret>',
-                    desc: '代码加密的函数的 CodeSecret'
-                }
-            ],
-            desc: '展示文件层列表'
-        }
-    }
-
-    @InjectParams()
-    async execute(@EnvId() envId, @ArgsOptions() options, @Log() log: Logger) {
-        const { name, layer, codeSecret } = options
-
-        const loading = loadingFactory()
-        loading.start('数据加载中...')
-
-        let data
-
-        // 展示文件层的版本信息
-        if (layer && typeof layer === 'string') {
-            const layerName = `${layer}_${envId}`
-            data = await listLayerVersions({
-                name: layerName
-            })
-        } else if (name && typeof name === 'string') {
-            // 展示函数绑定的文件层
-            const res = await getFunctionDetail({
-                envId,
-                functionName: name,
-                codeSecret
-            })
-            data = res?.Layers || []
-        } else if (envId) {
-            // 展示所有文件层
-            data = await listLayers({
-                offset: 0,
-                limit: 200
-            })
-            data = data.filter((item) => item.LayerName.includes(`_${envId}`))
-        } else {
-            // 展示所有文件层
-            data = await listLayers({
-                offset: 0,
-                limit: 200
-            })
-        }
-
-        loading.stop()
-
-        const head = ['优先级', '名称', '状态', '版本', '证书', '支持运行时', '创建时间']
-        const tableData = data.map((item, index) => [
-            index + 1,
-            item.LayerName,
-            item.Status,
-            item.LayerVersion,
-            item.LicenseInfo || '空',
-            item.CompatibleRuntimes.join(' | '),
-            item.AddTime
-        ])
-        printHorizontalTable(head, tableData)
-        log.info('Tips：函数绑定多个版本时，同名文件将按优先级从小到大的顺序进行覆盖执行。')
-    }
-}
+import { Command, ICommand } from '../../common'
+import { loadingFactory, printHorizontalTable } from '../../../utils'
+import { InjectParams, EnvId, ArgsOptions, Log, Logger } from '../../../decorators'
+import { listLayers, getFunctionDetail, listLayerVersions } from '../../../function'
+import { layerCommonOptions } from './common'
+
+/**
+ * 展示文件层列表
+ * 1. 当不传入函数名时，展示所有文件层
+ * 2. 当传入函数名时，展示函数绑定的文件层
+ * 3. 当传入文件层别名时，展示文件层的版本信息
+ */
+@ICommand()
+export class ListFileLayer extends Command {
+    get options() {
+        return {
+            ...layerCommonOptions('list'),
+            deprecateCmd: 'functions:layer:list',
+            options: [
+                {
+                    flags: '-e, --envId <envId>',
+                    desc: '环境 Id'
+                },
+                {
+                    flags: '--name, <name>',
+                    desc: '函数名称'
+                },
+                {
+                    flags: '--layer, <layer>',
+                    desc: '文件层别名'
+                },
+                {
+                    flags: '--code-secret, <codeSecret>',
+                    desc: '代码加密的函数的 CodeSecret'
+                }
+            ],
+            desc: '展示文件层列表'
+        }
+    }
+
+    @InjectParams()
+    async execute(@EnvId() envId, @ArgsOptions() options, @Log() log: Logger) {
+        const { name, layer, codeSecret } = options
+
+        const loading = loadingFactory()
+        loading.start('数据加载中...')
+
+        let data
+
+        // 展示文件层的版本信息
+        if (layer && typeof layer === 'string') {
+            const layerName = `${layer}_${envId}`
+            data = await listLayerVersions({
+                name: layerName
+            })
+        } else if (name && typeof name === 'string') {
+            // 展示函数绑定的文件层
+            const res = await getFunctionDetail({
+                envId,
+                functionName: name,
+                codeSecret
+            })
+            data = res?.Layers || []
+        } else if (envId) {
+            // 展示所有文件层
+            data = await listLayers({
+                offset: 0,
+                limit: 200
+            })
+            data = data.filter((item) => item.LayerName.includes(`_${envId}`))
+        } else {
+            // 展示所有文件层
+            data = await listLayers({
+                offset: 0,
+                limit: 200
+            })
+        }
+
+        loading.stop()
+
+        const head = ['优先级', '名称', '状态', '版本', '证书', '支持运行时', '创建时间']
+        const tableData = data.map((item, index) => [
+            index + 1,
+            item.LayerName,
+            item.Status,
+            item.LayerVersion,
+            item.LicenseInfo || '空',
+            item.CompatibleRuntimes.join(' | '),
+            item.AddTime
+        ])
+        printHorizontalTable(head, tableData)
+        log.info('Tips：函数绑定多个版本时，同名文件将按优先级从小到大的顺序进行覆盖执行。')
+    }
+}

package/src/commands/functions/layer/sort.ts

@@ -1,76 +1,76 @@
-import _ from 'lodash'
-import { prompt } from 'enquirer'
-
-import { Command, ICommand } from '../../common'
-import { loadingFactory } from '../../../utils'
-import { CloudBaseError } from '../../../error'
-import { getFunctionDetail, sortLayer } from '../../../function'
-import { InjectParams, CmdContext } from '../../../decorators'
-import { layerCommonOptions } from './common'
-
-@ICommand()
-export class SortFileLayer extends Command {
-    get options() {
-        return {
-            ...layerCommonOptions('sort <name>'),
-            deprecateCmd: 'functions:layer:sort <name>',
-            options: [
-                {
-                    flags: '-e, --envId <envId>',
-                    desc: '环境 Id'
-                },
-                {
-                    flags: '--code-secret, <codeSecret>',
-                    desc: '代码加密的函数的 CodeSecret'
-                }
-            ],
-            desc: '重新排列云函数绑定的文件层的顺序'
-        }
-    }
-
-    @InjectParams()
-    async execute(@CmdContext() ctx) {
-        const { envId, options, params } = ctx
-        const { codeSecret } = options
-        const fnName = params?.[0]
-
-        const loading = loadingFactory()
-        loading.start('数据加载中...')
-        const detail = await getFunctionDetail({
-            envId,
-            codeSecret,
-            functionName: fnName
-        })
-        loading.stop()
-
-        const layers = detail.Layers.map((item) => ({
-            name: `${item.LayerName} - ${item.LayerVersion}`,
-            value: item
-        }))
-
-        if (!layers.length) {
-            throw new CloudBaseError('没有可用的文件层，请先创建文件层！')
-        }
-
-        let { sortLayers } = await prompt<any>({
-            type: 'sort',
-            name: 'sortLayers',
-            message: '选择文件层',
-            numbered: true,
-            choices: layers,
-            result(choices) {
-                return Object.values(this.map(choices)) as any
-            }
-        })
-
-        sortLayers = sortLayers.map((item) => _.pick(item, ['LayerName', 'LayerVersion']))
-
-        loading.start('文件层排序中...')
-        await sortLayer({
-            envId,
-            functionName: fnName,
-            layers: sortLayers
-        })
-        loading.succeed('文件层排序成功！')
-    }
-}
+import _ from 'lodash'
+import { prompt } from 'enquirer'
+
+import { Command, ICommand } from '../../common'
+import { loadingFactory } from '../../../utils'
+import { CloudBaseError } from '../../../error'
+import { getFunctionDetail, sortLayer } from '../../../function'
+import { InjectParams, CmdContext } from '../../../decorators'
+import { layerCommonOptions } from './common'
+
+@ICommand()
+export class SortFileLayer extends Command {
+    get options() {
+        return {
+            ...layerCommonOptions('sort <name>'),
+            deprecateCmd: 'functions:layer:sort <name>',
+            options: [
+                {
+                    flags: '-e, --envId <envId>',
+                    desc: '环境 Id'
+                },
+                {
+                    flags: '--code-secret, <codeSecret>',
+                    desc: '代码加密的函数的 CodeSecret'
+                }
+            ],
+            desc: '重新排列云函数绑定的文件层的顺序'
+        }
+    }
+
+    @InjectParams()
+    async execute(@CmdContext() ctx) {
+        const { envId, options, params } = ctx
+        const { codeSecret } = options
+        const fnName = params?.[0]
+
+        const loading = loadingFactory()
+        loading.start('数据加载中...')
+        const detail = await getFunctionDetail({
+            envId,
+            codeSecret,
+            functionName: fnName
+        })
+        loading.stop()
+
+        const layers = detail.Layers.map((item) => ({
+            name: `${item.LayerName} - ${item.LayerVersion}`,
+            value: item
+        }))
+
+        if (!layers.length) {
+            throw new CloudBaseError('没有可用的文件层，请先创建文件层！')
+        }
+
+        let { sortLayers } = await prompt<any>({
+            type: 'sort',
+            name: 'sortLayers',
+            message: '选择文件层',
+            numbered: true,
+            choices: layers,
+            result(choices) {
+                return Object.values(this.map(choices)) as any
+            }
+        })
+
+        sortLayers = sortLayers.map((item) => _.pick(item, ['LayerName', 'LayerVersion']))
+
+        loading.start('文件层排序中...')
+        await sortLayer({
+            envId,
+            functionName: fnName,
+            layers: sortLayers
+        })
+        loading.succeed('文件层排序成功！')
+    }
+}