fix(apigw): support base64 encode

Author: yugasun

__tests__/apigw.test.js

@@ -16,7 +16,7 @@ describe('apigw', () => {
     netTypes: ['OUTER'],
     // customDomains: [
     //   {
-    //     domain: 'test.yugasun.com',
+    //     domain: 'test.yuga.chat',
     //     // TODO: change to your certId
     //     certificateId: 'cWOJJjax',
     //     isDefaultMapping: false,
@@ -27,6 +27,7 @@ describe('apigw', () => {
     //       },
     //     ],
     //     protocols: ['http', 'https'],
+    //     isForcedHttps: true
     //   },
     // ],
     usagePlan: {
@@ -48,6 +49,18 @@ describe('apigw', () => {
         function: {
           functionName: 'serverless-unit-test',
         },
+        isBase64Encoded: true,
+        isBase64Trigger: true,
+        base64EncodedTriggerRules: [
+          {
+            name: 'Accept',
+            value: ['application/x-vpeg005', 'application/xhtml+xml'],
+          },
+          {
+            name: 'Content_Type',
+            value: ['application/x-vpeg005', 'application/xhtml+xml'],
+          },
+        ],
       },
       {
         path: '/mo',
@@ -162,6 +175,7 @@ describe('apigw', () => {
           created: true,
           authType: 'NONE',
           businessType: 'NORMAL',
+          isBase64Encoded: true,
         },
         {
           path: '/mo',
@@ -172,6 +186,7 @@ describe('apigw', () => {
           created: true,
           authType: 'NONE',
           businessType: 'NORMAL',
+          isBase64Encoded: false,
         },
         {
           path: '/auto',
@@ -182,6 +197,7 @@ describe('apigw', () => {
           created: true,
           authType: 'NONE',
           businessType: 'NORMAL',
+          isBase64Encoded: false,
         },
         {
           path: '/ws',
@@ -192,6 +208,7 @@ describe('apigw', () => {
           created: true,
           authType: 'NONE',
           businessType: 'NORMAL',
+          isBase64Encoded: false,
         },
         {
           path: '/wsf',
@@ -204,6 +221,7 @@ describe('apigw', () => {
           created: true,
           authType: 'NONE',
           businessType: 'NORMAL',
+          isBase64Encoded: false,
         },
         {
           path: '/oauth',
@@ -214,6 +232,7 @@ describe('apigw', () => {
           authType: 'OAUTH',
           businessType: 'OAUTH',
           internalDomain: expect.any(String),
+          isBase64Encoded: false,
         },
         {
           path: '/oauthwork',
@@ -225,6 +244,7 @@ describe('apigw', () => {
           businessType: 'NORMAL',
           authRelationApiId: expect.stringContaining('api-'),
           internalDomain: expect.any(String),
+          isBase64Encoded: false,
         },
       ],
     });
@@ -273,6 +293,7 @@ describe('apigw', () => {
             },
             usagePlanId: expect.stringContaining('usagePlan-'),
           },
+          isBase64Encoded: true,
         },
         {
           path: '/mo',
@@ -283,6 +304,7 @@ describe('apigw', () => {
           created: true,
           authType: 'NONE',
           businessType: 'NORMAL',
+          isBase64Encoded: false,
         },
         {
           path: '/auto',
@@ -293,6 +315,7 @@ describe('apigw', () => {
           created: true,
           authType: 'NONE',
           businessType: 'NORMAL',
+          isBase64Encoded: false,
         },
         {
           path: '/ws',
@@ -303,6 +326,7 @@ describe('apigw', () => {
           authType: 'NONE',
           businessType: 'NORMAL',
           created: true,
+          isBase64Encoded: false,
         },
         {
           path: '/wsf',
@@ -315,6 +339,7 @@ describe('apigw', () => {
           authType: 'NONE',
           businessType: 'NORMAL',
           created: true,
+          isBase64Encoded: false,
         },
         {
           path: '/oauth',
@@ -325,6 +350,7 @@ describe('apigw', () => {
           authType: 'OAUTH',
           businessType: 'OAUTH',
           internalDomain: expect.any(String),
+          isBase64Encoded: false,
         },
         {
           path: '/oauthwork',
@@ -336,6 +362,7 @@ describe('apigw', () => {
           businessType: 'NORMAL',
           authRelationApiId: expect.stringContaining('api-'),
           internalDomain: expect.any(String),
+          isBase64Encoded: false,
         },
       ],
     });

__tests__/scf.test.js

@@ -53,7 +53,7 @@ describe('Scf', () => {
     cls: {
       cls: {
         parameters: {
-          topicId: '31d3ce01-228b-42f5-aab5-7f740cc2fb11',
+          topicId: '6e60b6c7-a98e-4fc8-8ba8-bdfe4ab9c245',
           qualifier: '$DEFAULT',
           maxWait: 60,
           maxSize: 100,

src/modules/apigw/index.js

@@ -595,6 +595,7 @@ class Apigw {
       created: true,
       authType: authType,
       businessType: businessType,
+      isBase64Encoded: endpoint.isBase64Encoded === true,
     };
 
     const apiInputs = {
@@ -613,6 +614,7 @@ class Apigw {
       serviceTimeout: endpoint.serviceTimeout || 15,
       responseType: endpoint.responseType || 'HTML',
       enableCORS: endpoint.enableCORS === true,
+      isBase64Encoded: endpoint.isBase64Encoded === true,
     };
     if (endpoint.oauthConfig) {
       apiInputs.oauthConfig = endpoint.oauthConfig;
@@ -641,6 +643,11 @@ class Apigw {
       console.log(`Api method ${endpoint.method}, path ${endpoint.path} already exist`);
       endpoint.apiId = apiDetail.ApiId;
 
+      if (endpoint.isBase64Encoded && endpoint.isBase64Trigger) {
+        apiInputs.isBase64Trigger = endpoint.isBase64Trigger;
+        apiInputs.base64EncodedTriggerRules = endpoint.base64EncodedTriggerRules;
+      }
+
       await this.request({
         Action: 'ModifyApi',
         apiId: endpoint.apiId,
@@ -666,6 +673,17 @@ class Apigw {
         apiId: output.apiId,
       });
       output.internalDomain = apiDetail.InternalDomain || '';
+
+      if (endpoint.isBase64Encoded && endpoint.isBase64Trigger) {
+        apiInputs.isBase64Trigger = endpoint.isBase64Trigger;
+        apiInputs.base64EncodedTriggerRules = endpoint.base64EncodedTriggerRules;
+      }
+
+      await this.request({
+        Action: 'ModifyApi',
+        apiId: ApiId,
+        ...apiInputs,
+      });
     }
 
     output.apiName = apiInputs.apiName;