fix(cos): support disableErrorStatus config for website

Author: yugasun

__tests__/cos.test.js

@@ -1,6 +1,6 @@
 const { Cos } = require('../src');
 const path = require('path');
-const request = require('request-promise-native');
+const axios = require('axios');
 const { sleep } = require('@ygkit/request');
 
 describe('Cos', () => {
@@ -55,6 +55,8 @@ describe('Cos', () => {
   const websiteInputs = {
     code: {
       src: staticPath,
+      index: 'index.html',
+      error: 'index.html',
     },
     bucket: bucket,
     src: staticPath,
@@ -71,19 +73,37 @@ describe('Cos', () => {
     const res = await cos.deploy(inputs);
     await sleep(1000);
     const reqUrl = `https://${bucket}.cos.${process.env.REGION}.myqcloud.com/index.html`;
-    const content = await request.get(reqUrl);
+    const { data } = await axios.get(reqUrl);
     expect(res).toEqual(inputs);
-    expect(content).toMatch(/Serverless\sFramework/gi);
+    expect(data).toMatch(/Serverless\sFramework/gi);
   });
 
   test('should deploy website success', async () => {
     const res = await cos.website(websiteInputs);
     await sleep(1000);
     const websiteUrl = `${inputs.bucket}.cos-website.${process.env.REGION}.myqcloud.com`;
     const reqUrl = `${websiteInputs.protocol}://${websiteUrl}`;
-    const content = await request.get(reqUrl);
+    const { data } = await axios.get(reqUrl);
+    try {
+      await axios.get(`${reqUrl}/error.html`);
+    } catch (e) {
+      expect(e.response.status).toBe(404);
+      expect(e.response.data).toMatch(/Serverless\sFramework/gi);
+    }
+    expect(res).toBe(websiteUrl);
+    expect(data).toMatch(/Serverless\sFramework/gi);
+  });
+
+  test('should deploy website and error code with 200', async () => {
+    websiteInputs.disableErrorStatus = true;
+    const res = await cos.website(websiteInputs);
+    await sleep(1000);
+    const websiteUrl = `${inputs.bucket}.cos-website.${process.env.REGION}.myqcloud.com`;
+    const reqUrl = `${websiteInputs.protocol}://${websiteUrl}`;
+    const { data, status } = await axios.get(`${reqUrl}/error.html`);
     expect(res).toBe(websiteUrl);
-    expect(content).toMatch(/Serverless\sFramework/gi);
+    expect(data).toMatch(/Serverless\sFramework/gi);
+    expect(status).toBe(200);
   });
 
   test('should deploy Cos success with policy', async () => {
@@ -92,9 +112,9 @@ describe('Cos', () => {
     const res = await cos.deploy(inputs);
     await sleep(1000);
     const reqUrl = `https://${bucket}.cos.${process.env.REGION}.myqcloud.com/index.html`;
-    const content = await request.get(reqUrl);
+    const { data } = await axios.get(reqUrl);
     expect(res).toEqual(inputs);
-    expect(content).toMatch(/Serverless\sFramework/gi);
+    expect(data).toMatch(/Serverless\sFramework/gi);
   });
 
   test('should deploy website success with policy', async () => {
@@ -104,9 +124,9 @@ describe('Cos', () => {
     await sleep(1000);
     const websiteUrl = `${inputs.bucket}.cos-website.${process.env.REGION}.myqcloud.com`;
     const reqUrl = `${websiteInputs.protocol}://${websiteUrl}`;
-    const content = await request.get(reqUrl);
+    const { data } = await axios.get(reqUrl);
     expect(res).toBe(websiteUrl);
-    expect(content).toMatch(/Serverless\sFramework/gi);
+    expect(data).toMatch(/Serverless\sFramework/gi);
   });
 
   test('should remove Cos success', async () => {

package.json

@@ -61,6 +61,7 @@
     "@semantic-release/npm": "^7.0.4",
     "@semantic-release/release-notes-generator": "^9.0.1",
     "@ygkit/secure": "^0.0.3",
+    "axios": "^0.21.0",
     "babel-eslint": "^10.1.0",
     "dotenv": "^8.2.0",
     "eslint": "^6.8.0",

src/modules/cos/index.js

@@ -1,8 +1,6 @@
 const COS = require('cos-nodejs-sdk-v5');
-const util = require('util');
 const path = require('path');
 const fs = require('fs');
-const exec = util.promisify(require('child_process').exec);
 const { traverseDirSync } = require('../../utils');
 const { TypeError, ApiError } = require('../../utils/error');
 
@@ -438,6 +436,7 @@ class Cos {
         },
         ErrorDocument: {
           Key: inputs.code.error || 'error.html',
+          OriginalHttpStatus: inputs.disableErrorStatus === true ? 'Disabled' : 'Enabled',
         },
         RedirectAllRequestsTo: {
           Protocol: inputs.protocol || 'http',
@@ -664,20 +663,6 @@ class Cos {
       }
     }
 
-    // If a hook is provided, build the website
-    if (inputs.code.hook) {
-      const options = { cwd: inputs.code.root };
-      try {
-        await exec(inputs.code.hook, options);
-      } catch (err) {
-        throw new TypeError(
-          `DEPLOY_COS_EXEC_HOOK`,
-          `Failed building website via "${inputs.code.hook}" due to the following error: "${err.stderr}"`,
-          err.stack,
-        );
-      }
-    }
-
     // upload
     const dirToUploadPath = inputs.code.src || inputs.code.root;
     const uploadDict = {