feat: Recognize provider.apiGateway.resourcePolicy

Author: medikoo

lib/deploy/events/apiGateway/restApi.js

@@ -43,10 +43,13 @@ module.exports = {
       },
     });
 
-    if (!_.isEmpty(this.serverless.service.provider.resourcePolicy)) {
+    const resourcePolicy = _.get(this.serverless.service.provider.apiGateway, 'resourcePolicy')
+      || this.serverless.service.provider.resourcePolicy;
+
+    if (!_.isEmpty(resourcePolicy)) {
       const policy = {
         Version: '2012-10-17',
-        Statement: this.serverless.service.provider.resourcePolicy,
+        Statement: resourcePolicy,
       };
       _.merge(this.serverless.service.provider.compiledCloudFormationTemplate
         .Resources[this.apiGatewayRestApiLogicalId].Properties, {

lib/deploy/events/apiGateway/restApi.test.js

@@ -89,19 +89,21 @@ describe('#compileRestApi()', () => {
   }));
 
   it('should create a REST API resource with resource policy', () => {
-    serverlessStepFunctions.serverless.service.provider.resourcePolicy = [
-      {
-        Effect: 'Allow',
-        Principal: '*',
-        Action: 'execute-api:Invoke',
-        Resource: ['execute-api:/*/*/*'],
-        Condition: {
-          IpAddress: {
-            'aws:SourceIp': ['123.123.123.123'],
+    serverlessStepFunctions.serverless.service.provider.apiGateway = {
+      resourcePolicy: [
+        {
+          Effect: 'Allow',
+          Principal: '*',
+          Action: 'execute-api:Invoke',
+          Resource: ['execute-api:/*/*/*'],
+          Condition: {
+            IpAddress: {
+              'aws:SourceIp': ['123.123.123.123'],
+            },
           },
         },
-      },
-    ];
+      ],
+    };
     return serverlessStepFunctions.compileRestApi().then(() => {
       expect(serverlessStepFunctions.serverless.service.provider
         .compiledCloudFormationTemplate.Resources).to.deep.equal(