From 77482a3706f6ba936823e9fbc6f57a93d4870a5f Mon Sep 17 00:00:00 2001 From: Mariusz Nowak Date: Thu, 8 Oct 2020 15:29:22 +0200 Subject: [PATCH] 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 --- lib/plugins/aws/provider/awsProvider.js | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/lib/plugins/aws/provider/awsProvider.js b/lib/plugins/aws/provider/awsProvider.js index 30824ddf800..bb89468c0e9 100644 --- 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,13 @@ 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' }, + }, + ], }, }, required: ['identitySource', 'issuerUrl', 'audience'],