Implement arn and type definition only in oneOf descriptions

serverless · Sep 14, 2020 · 3b17faf · 3b17faf
1 parent 7766524
commit 3b17faf
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/lib/plugins/aws/package/compile/events/stream/index.js b/lib/plugins/aws/package/compile/events/stream/index.js
@@ -17,7 +17,8 @@ class AwsCompileStreamEvents {
         {
           type: 'object',
           properties: {
-            arn: { $ref: '#/definitions/awsArn' },
+            // arn constraints are listed in oneOf property of this schema
+            arn: {},
             type: { enum: ['dynamodb', 'kinesis'] },
             batchSize: { type: 'integer', minimum: 1, maximum: 10000 },
             parallelizationFactor: { type: 'integer', minimum: 1, maximum: 10 },
@@ -42,22 +43,23 @@ class AwsCompileStreamEvents {
                     {
                       type: 'object',
                       properties: {
-                        arn: { $ref: '#/definitions/awsArn' },
+                        // arn constraints are listed in oneOf property of this schema
+                        arn: {},
                         type: { enum: ['sns', 'sqs'] },
                       },
                       additionalProperties: false,
-                      required: ['arn'],
                       oneOf: [
                         {
                           properties: {
                             arn: { $ref: '#/definitions/awsCfFunction' },
                           },
-                          required: ['type'],
+                          required: ['arn', 'type'],
                         },
                         {
                           properties: {
                             arn: { $ref: '#/definitions/awsArnString' },
                           },
+                          required: ['arn'],
                         },
                       ],
                     },
@@ -69,18 +71,18 @@ class AwsCompileStreamEvents {
             },
           },
           additionalProperties: false,
-          required: ['arn'],
           oneOf: [
             {
               properties: {
                 arn: { $ref: '#/definitions/awsCfFunction' },
               },
-              required: ['type'],
+              required: ['arn', 'type'],
             },
             {
               properties: {
                 arn: { $ref: '#/definitions/awsArnString' },
               },
+              required: ['arn'],
             },
           ],
         },