fix some spelling error and upgrade fc-docker version

Author: 千风

package.json

@@ -24,7 +24,7 @@
     ]
   },
   "fc-docker": {
-    "version": "1.9.13",
+    "version": "1.9.17",
     "registry_default": "registry.cn-beijing.aliyuncs.com",
     "registry_mirrors": [
       "registry.cn-beijing.aliyuncs.com",

src/lib/docker-opts.js

@@ -70,7 +70,7 @@ async function resolveDockerRegistry() {
   return DOCKER_REGISTRY_CACHE;
 }
 
-const IMAGE_VERSION = process.env.FC_DOCKER_VERSION || pkg['fc-docker'].version || '1.9.13';
+const IMAGE_VERSION = process.env.FC_DOCKER_VERSION || pkg['fc-docker'].version || '1.9.17';
 
 async function resolveRuntimeToDockerImage(runtime, isBuild) {
   if (runtimeImageMap[runtime]) {

src/lib/docker.js

@@ -485,14 +485,14 @@ async function generateDockerEnvs(baseDir, serviceName, serviceProps, functionNa
     'FC_ACCESS_KEY_ID': profile.accessKeyId,
     'FC_ACCESS_KEY_SECRET': profile.accessKeySecret,
     'FC_SECURITY_TOKEN': profile.securityToken,
-    'FC_ACCOUND_ID': profile.accountId,
+    'FC_ACCOUNT_ID': profile.accountId,
     'FC_REGION': profile.defaultRegion,
     'FC_FUNCTION_NAME': functionName,
     'FC_HANDLER': functionProps.Handler,
     'FC_MEMORY_SIZE': functionProps.MemorySize || 128,
     'FC_TIMEOUT': functionProps.Timeout || 3,
     'FC_INITIALIZER': functionProps.Initializer,
-    'FC_INITIALIZATIONTIMEOUT': functionProps.InitializationTimeout || 3,
+    'FC_INITIALIZATION_TIMEOUT': functionProps.InitializationTimeout || 3,
     'FC_SERVICE_NAME': serviceName,
     'FC_SERVICE_LOG_PROJECT': ((serviceProps || {}).LogConfig || {}).Project,
     'FC_SERVICE_LOG_STORE': ((serviceProps || {}).LogConfig || {}).Logstore

src/lib/local/http.js

@@ -241,14 +241,14 @@ function getFcReqHeaders(headers, reqeustId, envs) {
   fcHeaders['x-fc-function-name'] = headers['x-fc-function-name'] ? headers['x-fc-function-name'] : envs['FC_FUNCTION_NAME'] || 'fc-docker';
   fcHeaders['x-fc-function-memory'] = headers['x-fc-function-memory'] ? headers['x-fc-function-memory'] : envs['FC_MEMORY_SIZE'];
   fcHeaders['x-fc-function-timeout'] = headers['x-fc-function-timeout'] ? headers['x-fc-function-timeout'] : envs['FC_TIMEOUT'];
-  fcHeaders['x-fc-initialization-timeout'] = headers['x-fc-initialization-timeout'] ? headers['x-fc-initialization-timeout'] : envs['FC_INITIALIZATIONTIMEOUT'];
+  fcHeaders['x-fc-initialization-timeout'] = headers['x-fc-initialization-timeout'] ? headers['x-fc-initialization-timeout'] : envs['FC_INITIALIZATION_TIMEOUT'];
   fcHeaders['x-fc-function-initializer'] = headers['x-fc-function-initializer'] ? headers['x-fc-function-initializer'] : envs['FC_INITIALIZER'];
   fcHeaders['x-fc-function-handler'] = headers['x-fc-function-handler'] ? headers['x-fc-function-handler'] : envs['FC_HANDLER'];
   fcHeaders['x-fc-access-key-id'] = headers['x-fc-access-key-id'] ? headers['x-fc-access-key-id'] : envs['FC_ACCESS_KEY_ID'];
   fcHeaders['x-fc-access-key-secret'] = headers['x-fc-access-key-secret'] ? headers['x-fc-access-key-secret'] : envs['FC_ACCESS_KEY_SECRET'];
   fcHeaders['x-fc-security-token'] = headers['x-fc-security-token'] ? headers['x-fc-security-token'] : envs['FC_SECURITY_TOKEN'];
   fcHeaders['x-fc-region'] = headers['x-fc-region'] ? headers['x-fc-region'] : envs['FC_REGION'];
-  fcHeaders['x-fc-account-id'] = headers['x-fc-account-id'] ? headers['x-fc-account-id'] : envs['FC_ACCOUND_ID'];
+  fcHeaders['x-fc-account-id'] = headers['x-fc-account-id'] ? headers['x-fc-account-id'] : envs['FC_ACCOUNT_ID'];
   fcHeaders['x-fc-service-name'] = headers['x-fc-service-name'] ? headers['x-fc-service-name'] : envs['FC_SERVICE_NAME'];
   fcHeaders['x-fc-service-logproject'] = headers['x-fc-service-logproject'] ? headers['x-fc-service-logproject'] : envs['FC_SERVICE_LOG_PROJECT'];
   fcHeaders['x-fc-service-logstore'] = headers['x-fc-service-logstore'] ? headers['x-fc-service-logstore'] : envs['FC_SERVICE_LOG_STORE'];

test/local/http-invoke.test.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const HttpInvoke = require('../../lib/local/http-invoke');
-
+const { ensureTmpDir } = require('../../lib/utils/path');
 const sinon = require('sinon');
 const assert = sinon.assert;
 
@@ -18,7 +18,7 @@ const httpx = require('httpx');
 const FC = require('@alicloud/fc2');
 
 const { serviceName, serviceRes, functionName, functionRes,
-  httptriggerServiceRes, httpTriggerFunctionRes
+  httpTriggerServiceRes, httpTriggerFunctionRes
 } = require('./mock-data');
 
 const { setProcess } = require('../test-utils');
@@ -106,8 +106,9 @@ describe('test http response', async () => {
   let server;
   let restoreProcess;
   let httpInvoke;
-  
+  let tmpDir;
   beforeEach(async () => {
+    tmpDir = await ensureTmpDir(null, projectDir, serviceName, functionName);
 
     await fs.mkdirp(projectDir);
 
@@ -147,18 +148,15 @@ def handler(environ, start_response):
     const endpointPrefix = `/2016-08-15/proxy/${serviceName}/${functionName}`;
     const endpoint = `${endpointPrefix}*`;
 
-    httpInvoke = new HttpInvoke(serviceName, httptriggerServiceRes,
-      functionName, httpTriggerFunctionRes, null, null, projectDir, 'ANONYMOUS', endpointPrefix);
-
+    httpInvoke = new HttpInvoke(serviceName, httpTriggerServiceRes,
+      functionName, httpTriggerFunctionRes, null, null, projectDir, tmpDir, 'ANONYMOUS', endpointPrefix);
     app.get(endpoint, async (req, res) => {
       await httpInvoke.invoke(req, res);
     });
-
     const resp = await httpx.request(`http://localhost:${serverPort}${endpointPrefix}`, {
       method: 'GET',
       timeout: '3000'
     });
-
     const body = await httpx.read(resp, 'utf8');
 
     expect(body).to.contain('Hello world!');
@@ -177,8 +175,8 @@ def handler(environ, start_response):
     const endpointPrefix = `/2016-08-15/proxy/${serviceName}/${functionName}`;
     const endpoint = `${endpointPrefix}*`;
 
-    httpInvoke = new HttpInvoke(serviceName, httptriggerServiceRes,
-      functionName, httpTriggerFunctionRes, null, null, projectDir, 'FUNCTION', endpointPrefix);
+    httpInvoke = new HttpInvoke(serviceName, httpTriggerServiceRes,
+      functionName, httpTriggerFunctionRes, null, null, projectDir, tmpDir, 'FUNCTION', endpointPrefix);
 
     app.get(endpoint, async (req, res) => {
       await httpInvoke.invoke(req, res);
@@ -207,8 +205,8 @@ def handler(environ, start_response):
     const endpointPrefix = `/2016-08-15/proxy/${serviceName}/${functionName}`;
     const endpoint = `${endpointPrefix}*`;
 
-    const httpInvoke = new HttpInvoke(serviceName, httptriggerServiceRes,
-      functionName, httpTriggerFunctionRes, null, null, projectDir, 'FUNCTION', endpointPrefix);
+    const httpInvoke = new HttpInvoke(serviceName, httpTriggerServiceRes,
+      functionName, httpTriggerFunctionRes, null, null, projectDir, tmpDir, 'FUNCTION', endpointPrefix);
 
     app.get(endpoint, async (req, res) => {
       await httpInvoke.invoke(req, res);