fix(Config Schema): Revert invalid "oneOf" based validation

serverless · Oct 9, 2020 · a9b28b6 · a9b28b6
1 parent 2e26e07
commit a9b28b6
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 22 deletions.
diff --git a/lib/plugins/aws/package/compile/events/cloudWatchEvent/index.js b/lib/plugins/aws/package/compile/events/cloudWatchEvent/index.js
@@ -35,12 +35,6 @@ class AwsCompileCloudWatchEventEvents {
         name: { type: 'string', pattern: '[a-zA-Z0-9-_.]+', minLength: 1, maxLength: 64 },
         enabled: { type: 'boolean' },
       },
-      oneOf: [
-        { required: ['input'] },
-        { required: ['inputPath'] },
-        { required: ['inputTransformer'] },
-        { required: [] },
-      ],
       additionalProperties: false,
     });
   }
@@ -69,6 +63,16 @@ class AwsCompileCloudWatchEventEvents {
             Input = event.cloudwatchEvent.input;
             InputTransformer = event.cloudwatchEvent.inputTransformer;
 
+            if ([Input, InputPath, InputTransformer].filter(Boolean).length > 1) {
+              throw new this.serverless.classes.Error(
+                [
+                  'You can only set one of input, inputPath, or inputTransformer ',
+                  'properties at the same time for cloudwatch events. ',
+                  'Please check the AWS docs for more info',
+                ].join('')
+              );
+            }
+
             if (Input && typeof Input === 'object') {
               Input = JSON.stringify(Input);
             }

diff --git a/lib/plugins/aws/package/compile/events/eventBridge/index.js b/lib/plugins/aws/package/compile/events/eventBridge/index.js
@@ -49,17 +49,7 @@ class AwsCompileEventBridgeEvents {
           additionalProperties: false,
         },
       },
-      allOf: [
-        { anyOf: [{ required: ['pattern'] }, { required: ['schedule'] }] },
-        {
-          oneOf: [
-            { required: [] },
-            { required: ['input'] },
-            { required: ['inputPath'] },
-            { required: ['inputTransformer'] },
-          ],
-        },
-      ],
+      anyOf: [{ required: ['pattern'] }, { required: ['schedule'] }],
     });
   }
 
@@ -105,6 +95,15 @@ class AwsCompileEventBridgeEvents {
               idx
             );
 
+            if ([Input, InputPath, InputTransformer].filter(Boolean).length > 1) {
+              throw new this.serverless.classes.Error(
+                [
+                  'You can only set one of input, inputPath, or inputTransformer ',
+                  'properties for eventBridge events.',
+                ].join('')
+              );
+            }
+
             if (InputTransformer) {
               InputTransformer = _.mapKeys(
                 InputTransformer,

diff --git a/lib/plugins/aws/provider/awsProvider.js b/lib/plugins/aws/provider/awsProvider.js
@@ -555,11 +555,6 @@ class AwsProvider {
                         role: { $ref: '#/definitions/awsArn' },
                         roleManagedExternally: { type: 'boolean' },
                       },
-                      oneOf: [
-                        { required: [] },
-                        { required: ['role'] },
-                        { required: ['roleManagedExternally'] },
-                      ],
                       additionalProperties: false,
                     },
                   ],