fix(AWS ALB): Recognize CIDR format at ip configuration (serverless#11889)

Author: Inqnuam

lib/plugins/aws/package/compile/events/alb/index.js

@@ -7,8 +7,8 @@ const compileTargetGroups = require('./lib/target-groups');
 const compileListenerRules = require('./lib/listener-rules');
 const compilePermissions = require('./lib/permissions');
 
-function defineArray(schema) {
-  return { type: 'array', items: schema };
+function defineArray(schema, options = {}) {
+  return { type: 'array', items: schema, ...options };
 }
 
 const ALB_HTTP_HEADER_SCHEMA = {
@@ -55,12 +55,7 @@ class AwsCompileAlbEvents {
               pattern: '^[A-Za-z0-9*?.-]+$',
               maxLength: 128,
             }),
-            ip: defineArray({
-              anyOf: [
-                { type: 'string', format: 'ipv4' },
-                { type: 'string', format: 'ipv6' },
-              ],
-            }),
+            ip: defineArray({ type: 'string' }, { uniqueItems: true }),
             method: defineArray({ type: 'string', pattern: '^[A-Z_-]+$', maxLength: 40 }),
             path: defineArray({
               type: 'string',

test/unit/lib/plugins/aws/package/compile/events/alb/index.test.js

@@ -123,6 +123,20 @@ describe('test/unit/lib/plugins/aws/package/compile/events/alb/index.test.js', (
               },
             ],
           },
+          fnIpCondition: {
+            handler: 'index.handler',
+            events: [
+              {
+                alb: {
+                  ...validBaseEventConfig,
+                  priority: 10,
+                  conditions: {
+                    ip: ['fe80:0000:0000:0000:0204:61ff:fe9d:f156/6', '192.168.0.1/0'],
+                  },
+                },
+              },
+            ],
+          },
         },
       },
     });
@@ -347,4 +361,18 @@ describe('test/unit/lib/plugins/aws/package/compile/events/alb/index.test.js', (
       expect(config3.Values[1]).to.equal('dummyMultiValue2');
     });
   });
+
+  describe('should set alb ip conditions', () => {
+    it('should allow IP CIDR format', () => {
+      const albListenerRuleLogicalId = naming.getAlbListenerRuleLogicalId('fnIpCondition', 10);
+      const conditions = cfResources[albListenerRuleLogicalId].Properties.Conditions;
+
+      expect(conditions).to.have.length(1);
+      const config = conditions[0].SourceIpConfig;
+      expect(config.Values).to.deep.equal([
+        'fe80:0000:0000:0000:0204:61ff:fe9d:f156/6',
+        '192.168.0.1/0',
+      ]);
+    });
+  });
 });