fix(Config Schema): Bring back non-array supported variants

They were removed by mistake with #8319. It's only primitive/array combinations where singular variant should be removed. object/array should be left intact
serverless · Oct 8, 2020 · d8adc11 · d8adc11
1 parent f235041
commit d8adc11
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/lib/plugins/aws/provider/awsProvider.js b/lib/plugins/aws/provider/awsProvider.js
@@ -304,7 +304,11 @@ class AwsProvider {
             ],
           },
           awsIamPolicyResource: {
-            anyOf: [{ const: '*' }, { type: 'array', items: { $ref: '#/definitions/awsArn' } }],
+            anyOf: [
+              { const: '*' },
+              { $ref: '#/definitions/awsArn' },
+              { type: 'array', items: { $ref: '#/definitions/awsArn' } },
+            ],
           },
           // Definition of Statement taken from https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_policies_grammar.html#policies-grammar-bnf
           awsIamPolicyStatements: {
@@ -473,8 +477,14 @@ class AwsProvider {
                       identitySource: { $ref: '#/definitions/awsCfInstruction' },
                       issuerUrl: { $ref: '#/definitions/awsCfInstruction' },
                       audience: {
-                        type: 'array',
-                        items: { $ref: '#/definitions/awsCfInstruction' },
+                        anyOf: [
+                          { $ref: '#/definitions/awsCfInstruction' },
+                          {
+                            type: 'array',
+                            items: { $ref: '#/definitions/awsCfInstruction' },
+                            additionalItems: false,
+                          },
+                        ],
                       },
                     },
                     required: ['identitySource', 'issuerUrl', 'audience'],