fun nas init with auto nas config (alibaba#313)

dcy10000 · Aug 5, 2019 · 593ea03 · 593ea03
1 parent bb07095
commit 593ea03
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/lib/nas.js b/lib/nas.js
@@ -9,7 +9,7 @@ const { sleep } = require('./time');
 const fs = require('fs-extra');
 const definition = require('./definition');
 const path = require('path');
-
+const constants = require('./nas/constants');
 const requestOption = {
   method: 'POST'
 };
@@ -189,6 +189,11 @@ async function createNasFileSystem(nasClient, region) {
 async function generateAutoNasConfig(serviceName, vpcId, vswitchId) {
   const mountPointDomain = await createDefaultNasIfNotExist(vpcId, vswitchId);
 
+  //fun nas 创建的服务名比其对应的服务多了 '_FUN_NAS_' 前缀
+  //对于 nas 的挂载目录，要去掉这个前缀，保证 fun nas 的服务与对应的服务使用的是同样的挂载目录
+  if (serviceName.startsWith(constants.FUN_NAS_SERVICE_PREFIX)) {
+    serviceName = serviceName.substring(constants.FUN_NAS_SERVICE_PREFIX.length);
+  }
   return {
     UserId: 10003,
     GroupId: 10003,

diff --git a/lib/nas/constants.js b/lib/nas/constants.js
@@ -1,7 +1,7 @@
 'use strict';
 
 module.exports = {
-  FUN_NAS_SERVICE_PREFIX: 'fun-nas-',
+  FUN_NAS_SERVICE_PREFIX: '_FUN_NAS_',
   FUN_NAS_FUNCTION: 'fun-nas-function',
   FUN_NAS_TIMEOUT: 600 * 1000,
   FUN_NAS_UPLOAD_POOL_SIZE: 1

diff --git a/test/nas/cp.test.js b/test/nas/cp.test.js
@@ -3,6 +3,7 @@
 const sinon = require('sinon');
 const proxyquire = require('proxyquire');
 const path = require('path');
+const constants = require('../../lib/nas/constants');
 const sandbox = sinon.createSandbox();
 const assert = sinon.assert;
 
@@ -31,8 +32,8 @@ describe('nas cp test', () => {
 
     await cpStub(srcPath, dstPath, false);
     const mntDir = path.join('/', 'mnt', 'nas');
-
-    assert.calledWith(upload, srcPath, mntDir, '/proxy/fun-nas-fun-nas-test/fun-nas-function/', false);
+    const nasHttpTriggerPath = `/proxy/${constants.FUN_NAS_SERVICE_PREFIX}fun-nas-test/fun-nas-function/`;
+    assert.calledWith(upload, srcPath, mntDir, nasHttpTriggerPath, false);
   });
 
   it('src path undefined test', async () => {

diff --git a/test/nas/init.test.js b/test/nas/init.test.js
@@ -4,6 +4,7 @@ const fs = require('fs-extra');
 const path = require('path');
 const sinon = require('sinon');
 const proxyquire = require('proxyquire');
+const constants = require('../../lib/nas/constants');
 const sandbox = sinon.createSandbox();
 const assert = sinon.assert;
 
@@ -71,7 +72,7 @@ describe('test fun nas init', () => {
       }
     };
     const serviceName = 'fun-nas-test';
-    const nasServiceName = 'fun-nas-' + serviceName;
+    const nasServiceName = constants.FUN_NAS_SERVICE_PREFIX + serviceName;
     const nasFunctionName = 'fun-nas-function';
 
     const zipCodePath = path.resolve(__dirname, '../../lib/fc-utils/fc-fun-nas-server/dist/fun-nas-server.zip');