@cloudbase/cli 2.3.5 → 2.3.7

package/lib/commands/functions/layer/bind.js

@@ -63,7 +63,8 @@ let AttachFileLayer = class AttachFileLayer extends common_1.Command {
             }
             let layers = yield (0, function_1.listLayers)({
                 offset: 0,
-                limit: 200
+                limit: 200,
+                searchSrc: `TCB_${envId}`
             });
             loading.stop();
             layers = layers.map((item) => ({

package/lib/commands/functions/layer/create.js

@@ -31,6 +31,7 @@ const function_1 = require("../../../function");
 const utils_1 = require("../../../utils");
 const decorators_1 = require("../../../decorators");
 const common_2 = require("./common");
+const toolbox_1 = require("@cloudbase/toolbox");
 let CreateFileLayer = class CreateFileLayer extends common_1.Command {
     get options() {
         return Object.assign(Object.assign({}, (0, common_2.layerCommonOptions)('create <alias>')), { deprecateCmd: 'functions:layer:create <alias>', options: [
@@ -49,11 +50,19 @@ let CreateFileLayer = class CreateFileLayer extends common_1.Command {
             const alias = params === null || params === void 0 ? void 0 : params[0];
             const { file } = options;
             const layerName = `${alias}_${envId}`;
+            const layers = yield (0, function_1.listLayers)({
+                offset: 0,
+                limit: 200
+            });
+            if (layers.find(({ LayerName }) => LayerName === layerName)) {
+                throw new toolbox_1.CloudBaseError(`层名称 ${layerName} 已被您的当前环境或其他环境占用，请换用别的名称`);
+            }
             const filePath = path_1.default.resolve(file);
             const runtimes = ['Nodejs12.16', 'Nodejs8.9', 'Php7', 'Java8'];
             const loading = (0, utils_1.loadingFactory)();
             loading.start('文件层创建中...');
             yield (0, function_1.createLayer)({
+                envId,
                 layerName,
                 runtimes,
                 contentPath: filePath

package/lib/commands/functions/layer/delete.js

@@ -42,14 +42,12 @@ let DeleteFileLayer = class DeleteFileLayer extends common_1.Command {
         return __awaiter(this, void 0, void 0, function* () {
             const loading = (0, utils_1.loadingFactory)();
             loading.start('数据加载中...');
-            let layers = yield (0, function_1.listLayers)({
+            const layers = yield (0, function_1.listLayers)({
                 offset: 0,
-                limit: 200
+                limit: 200,
+                searchSrc: `TCB_${envId}`
             });
             loading.stop();
-            layers = layers
-                .filter((item) => item.LayerName.includes(`_${envId}`))
-                .map((item) => item.LayerName);
             if (!layers.length) {
                 throw new error_1.CloudBaseError('当前环境没有可用的文件层，请先创建文件层！');
             }
@@ -57,7 +55,7 @@ let DeleteFileLayer = class DeleteFileLayer extends common_1.Command {
                 type: 'select',
                 name: 'layer',
                 message: '选择文件层名称',
-                choices: layers
+                choices: layers.map((item) => item.LayerName)
             });
             let versions = yield (0, function_1.listLayerVersions)({
                 name: layer

package/lib/commands/functions/layer/download.js

@@ -52,14 +52,12 @@ let DownloadFileLayer = class DownloadFileLayer extends common_1.Command {
             const { dest } = options;
             const loading = (0, utils_1.loadingFactory)();
             loading.start('数据加载中...');
-            let layers = yield (0, function_1.listLayers)({
+            const layers = yield (0, function_1.listLayers)({
                 offset: 0,
-                limit: 200
+                limit: 200,
+                searchSrc: `TCB_${envId}`
             });
             loading.stop();
-            layers = layers
-                .filter((item) => item.LayerName.includes(`_${envId}`))
-                .map((item) => item.LayerName);
             if (!layers.length) {
                 throw new error_1.CloudBaseError('当前环境没有可用的文件层，请先创建文件层！');
             }
@@ -67,7 +65,7 @@ let DownloadFileLayer = class DownloadFileLayer extends common_1.Command {
                 type: 'select',
                 name: 'layer',
                 message: '选择文件层名称',
-                choices: layers
+                choices: layers.map((item) => item.LayerName)
             });
             let versions = yield (0, function_1.listLayerVersions)({
                 name: layer

package/lib/commands/functions/layer/list.js

@@ -71,9 +71,9 @@ let ListFileLayer = class ListFileLayer extends common_1.Command {
             else if (envId) {
                 data = yield (0, function_1.listLayers)({
                     offset: 0,
-                    limit: 200
+                    limit: 200,
+                    searchSrc: `TCB_${envId}`
                 });
-                data = data.filter((item) => item.LayerName.includes(`_${envId}`));
             }
             else {
                 data = yield (0, function_1.listLayers)({

package/lib/function/layer/create.js

@@ -20,10 +20,10 @@ const utils_1 = require("../../utils");
 const scfService = new utils_1.CloudApiService('scf');
 function createLayer(options) {
     return __awaiter(this, void 0, void 0, function* () {
-        const { contentPath = '', layerName, base64Content = '', runtimes = [] } = options;
+        const { envId, contentPath = '', layerName, base64Content = '', runtimes = [] } = options;
         (0, utils_1.checkFullAccess)(contentPath);
         const validRuntime = ['Nodejs8.9', 'Php7', 'Java8', 'Nodejs12.16'];
-        if (runtimes.some(item => validRuntime.indexOf(item) === -1)) {
+        if (runtimes.some((item) => validRuntime.indexOf(item) === -1)) {
             throw new toolbox_1.CloudBaseError(`Invalid runtime value. Now only support: ${validRuntime.join(', ')}`);
         }
         let base64;
@@ -52,6 +52,7 @@ function createLayer(options) {
         return scfService.request('PublishLayerVersion', {
             LayerName: layerName,
             CompatibleRuntimes: runtimes,
+            Src: `TCB_${envId}`,
             Content: {
                 ZipFile: base64
             }

package/lib/function/layer/list.js

@@ -14,10 +14,11 @@ const utils_1 = require("../../utils");
 const scfService = new utils_1.CloudApiService('scf');
 function listLayers(options) {
     return __awaiter(this, void 0, void 0, function* () {
-        const { offset, limit } = options;
+        const { offset, limit, searchSrc } = options;
         const res = yield scfService.request('ListLayers', {
             Offset: offset,
-            Limit: limit
+            Limit: limit,
+            SearchSrc: searchSrc
         });
         return (res === null || res === void 0 ? void 0 : res.Layers) || [];
     });

package/package.json

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

package/types/function/layer/create.d.ts

@@ -1,4 +1,5 @@
 export interface IFunctionLayerOptions {
+    envId: string;
     contentPath?: string;
     base64Content?: string;
     layerName: string;

package/types/function/layer/list.d.ts

@@ -1,6 +1,7 @@
 export interface ILayerListOptions {
     offset: number;
     limit: number;
+    searchSrc?: string;
 }
 export interface IVersionListOptions {
     name: string;