From 104a10447f1706d2dbe37e1ead7cbd6fe87de0e3 Mon Sep 17 00:00:00 2001 From: sambattalio Date: Tue, 9 Jul 2019 23:24:57 -0400 Subject: [PATCH 1/2] Added regex to match docs for IAM policy names --- src/cfnlint/data/CloudSpecs/ap-east-1.json | 32 ++++++++++++++--- .../data/CloudSpecs/ap-northeast-1.json | 32 ++++++++++++++--- .../data/CloudSpecs/ap-northeast-2.json | 32 ++++++++++++++--- .../data/CloudSpecs/ap-northeast-3.json | 32 ++++++++++++++--- src/cfnlint/data/CloudSpecs/ap-south-1.json | 32 ++++++++++++++--- .../data/CloudSpecs/ap-southeast-1.json | 32 ++++++++++++++--- .../data/CloudSpecs/ap-southeast-2.json | 32 ++++++++++++++--- src/cfnlint/data/CloudSpecs/ca-central-1.json | 32 ++++++++++++++--- src/cfnlint/data/CloudSpecs/eu-central-1.json | 32 ++++++++++++++--- src/cfnlint/data/CloudSpecs/eu-north-1.json | 32 ++++++++++++++--- src/cfnlint/data/CloudSpecs/eu-west-1.json | 32 ++++++++++++++--- src/cfnlint/data/CloudSpecs/eu-west-2.json | 32 ++++++++++++++--- src/cfnlint/data/CloudSpecs/eu-west-3.json | 32 ++++++++++++++--- src/cfnlint/data/CloudSpecs/sa-east-1.json | 32 ++++++++++++++--- src/cfnlint/data/CloudSpecs/us-east-1.json | 36 +++++++++++++++---- src/cfnlint/data/CloudSpecs/us-east-2.json | 32 ++++++++++++++--- .../data/CloudSpecs/us-gov-east-1.json | 32 ++++++++++++++--- .../data/CloudSpecs/us-gov-west-1.json | 32 ++++++++++++++--- src/cfnlint/data/CloudSpecs/us-west-1.json | 32 ++++++++++++++--- src/cfnlint/data/CloudSpecs/us-west-2.json | 32 ++++++++++++++--- 20 files changed, 542 insertions(+), 102 deletions(-) diff --git a/src/cfnlint/data/CloudSpecs/ap-east-1.json b/src/cfnlint/data/CloudSpecs/ap-east-1.json index 1855df39cf..c309d1687b 100644 --- a/src/cfnlint/data/CloudSpecs/ap-east-1.json +++ b/src/cfnlint/data/CloudSpecs/ap-east-1.json @@ -7894,7 +7894,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -7911,7 +7914,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -7945,7 +7951,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -17589,7 +17598,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } }, "Roles": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-roles", @@ -21777,6 +21789,16 @@ ] } }, + "IamPolicyName": { + "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", + "StringMax": 128, + "StringMin": 1, + "Ref": { + "Parameters": [ + "String" + ] + } + }, "IamPath": { "AllowedPatternRegex": "^/(.+/)*$", "Ref": { @@ -22562,4 +22584,4 @@ ] } } -} \ No newline at end of file +} diff --git a/src/cfnlint/data/CloudSpecs/ap-northeast-1.json b/src/cfnlint/data/CloudSpecs/ap-northeast-1.json index 18fd6a881f..519f50ddb9 100644 --- a/src/cfnlint/data/CloudSpecs/ap-northeast-1.json +++ b/src/cfnlint/data/CloudSpecs/ap-northeast-1.json @@ -15360,7 +15360,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -15377,7 +15380,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -15411,7 +15417,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -35404,7 +35413,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } }, "Roles": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-roles", @@ -44055,6 +44067,16 @@ ] } }, + "IamPolicyName": { + "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", + "StringMax": 128, + "StringMin": 1, + "Ref": { + "Parameters": [ + "String" + ] + } + }, "IamPath": { "AllowedPatternRegex": "^/(.+/)*$", "Ref": { @@ -44905,4 +44927,4 @@ ] } } -} \ No newline at end of file +} diff --git a/src/cfnlint/data/CloudSpecs/ap-northeast-2.json b/src/cfnlint/data/CloudSpecs/ap-northeast-2.json index c414e35a71..ed10eff66f 100644 --- a/src/cfnlint/data/CloudSpecs/ap-northeast-2.json +++ b/src/cfnlint/data/CloudSpecs/ap-northeast-2.json @@ -13789,7 +13789,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -13806,7 +13809,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -13840,7 +13846,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -31326,7 +31335,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } }, "Roles": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-roles", @@ -39063,6 +39075,16 @@ ] } }, + "IamPolicyName": { + "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", + "StringMax": 128, + "StringMin": 1, + "Ref": { + "Parameters": [ + "String" + ] + } + }, "IamPath": { "AllowedPatternRegex": "^/(.+/)*$", "Ref": { @@ -39887,4 +39909,4 @@ ] } } -} \ No newline at end of file +} diff --git a/src/cfnlint/data/CloudSpecs/ap-northeast-3.json b/src/cfnlint/data/CloudSpecs/ap-northeast-3.json index 2b5285cc81..e77fa0713f 100644 --- a/src/cfnlint/data/CloudSpecs/ap-northeast-3.json +++ b/src/cfnlint/data/CloudSpecs/ap-northeast-3.json @@ -8554,7 +8554,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -8571,7 +8574,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -8605,7 +8611,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -19129,7 +19138,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } }, "Roles": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-roles", @@ -24252,6 +24264,16 @@ ] } }, + "IamPolicyName": { + "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", + "StringMax": 128, + "StringMin": 1, + "Ref": { + "Parameters": [ + "String" + ] + } + }, "IamPath": { "AllowedPatternRegex": "^/(.+/)*$", "Ref": { @@ -25037,4 +25059,4 @@ ] } } -} \ No newline at end of file +} diff --git a/src/cfnlint/data/CloudSpecs/ap-south-1.json b/src/cfnlint/data/CloudSpecs/ap-south-1.json index 192eddd994..bdcaf8a130 100644 --- a/src/cfnlint/data/CloudSpecs/ap-south-1.json +++ b/src/cfnlint/data/CloudSpecs/ap-south-1.json @@ -13426,7 +13426,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -13443,7 +13446,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -13477,7 +13483,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -30201,7 +30210,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } }, "Roles": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-roles", @@ -38344,6 +38356,16 @@ ] } }, + "IamPolicyName": { + "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", + "StringMax": 128, + "StringMin": 1, + "Ref": { + "Parameters": [ + "String" + ] + } + }, "IamPath": { "AllowedPatternRegex": "^/(.+/)*$", "Ref": { @@ -39168,4 +39190,4 @@ ] } } -} \ No newline at end of file +} diff --git a/src/cfnlint/data/CloudSpecs/ap-southeast-1.json b/src/cfnlint/data/CloudSpecs/ap-southeast-1.json index 9c98e35768..c8a0e24a11 100644 --- a/src/cfnlint/data/CloudSpecs/ap-southeast-1.json +++ b/src/cfnlint/data/CloudSpecs/ap-southeast-1.json @@ -13810,7 +13810,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -13827,7 +13830,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -13861,7 +13867,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -31671,7 +31680,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } }, "Roles": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-roles", @@ -39543,6 +39555,16 @@ ] } }, + "IamPolicyName": { + "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", + "StringMax": 128, + "StringMin": 1, + "Ref": { + "Parameters": [ + "String" + ] + } + }, "IamPath": { "AllowedPatternRegex": "^/(.+/)*$", "Ref": { @@ -40387,4 +40409,4 @@ ] } } -} \ No newline at end of file +} diff --git a/src/cfnlint/data/CloudSpecs/ap-southeast-2.json b/src/cfnlint/data/CloudSpecs/ap-southeast-2.json index 04921a688b..83b0f4cb3b 100644 --- a/src/cfnlint/data/CloudSpecs/ap-southeast-2.json +++ b/src/cfnlint/data/CloudSpecs/ap-southeast-2.json @@ -15322,7 +15322,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -15339,7 +15342,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -15373,7 +15379,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -35069,7 +35078,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } }, "Roles": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-roles", @@ -43816,6 +43828,16 @@ ] } }, + "IamPolicyName": { + "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", + "StringMax": 128, + "StringMin": 1, + "Ref": { + "Parameters": [ + "String" + ] + } + }, "IamPath": { "AllowedPatternRegex": "^/(.+/)*$", "Ref": { @@ -44666,4 +44688,4 @@ ] } } -} \ No newline at end of file +} diff --git a/src/cfnlint/data/CloudSpecs/ca-central-1.json b/src/cfnlint/data/CloudSpecs/ca-central-1.json index 62a9505848..e5fc1790dc 100644 --- a/src/cfnlint/data/CloudSpecs/ca-central-1.json +++ b/src/cfnlint/data/CloudSpecs/ca-central-1.json @@ -12350,7 +12350,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -12367,7 +12370,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -12401,7 +12407,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -26381,7 +26390,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } }, "Roles": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-roles", @@ -33161,6 +33173,16 @@ ] } }, + "IamPolicyName": { + "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", + "StringMax": 128, + "StringMin": 1, + "Ref": { + "Parameters": [ + "String" + ] + } + }, "IamPath": { "AllowedPatternRegex": "^/(.+/)*$", "Ref": { @@ -33973,4 +33995,4 @@ ] } } -} \ No newline at end of file +} diff --git a/src/cfnlint/data/CloudSpecs/eu-central-1.json b/src/cfnlint/data/CloudSpecs/eu-central-1.json index 633c96eb63..134a20cd16 100644 --- a/src/cfnlint/data/CloudSpecs/eu-central-1.json +++ b/src/cfnlint/data/CloudSpecs/eu-central-1.json @@ -15161,7 +15161,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -15178,7 +15181,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -15212,7 +15218,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -35175,7 +35184,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } }, "Roles": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-roles", @@ -44057,6 +44069,16 @@ ] } }, + "IamPolicyName": { + "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", + "StringMax": 128, + "StringMin": 1, + "Ref": { + "Parameters": [ + "String" + ] + } + }, "IamPath": { "AllowedPatternRegex": "^/(.+/)*$", "Ref": { @@ -44893,4 +44915,4 @@ ] } } -} \ No newline at end of file +} diff --git a/src/cfnlint/data/CloudSpecs/eu-north-1.json b/src/cfnlint/data/CloudSpecs/eu-north-1.json index 282669e943..00dfbb5012 100644 --- a/src/cfnlint/data/CloudSpecs/eu-north-1.json +++ b/src/cfnlint/data/CloudSpecs/eu-north-1.json @@ -8589,7 +8589,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -8606,7 +8609,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -8640,7 +8646,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -19787,7 +19796,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } }, "Roles": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-roles", @@ -25056,6 +25068,16 @@ ] } }, + "IamPolicyName": { + "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", + "StringMax": 128, + "StringMin": 1, + "Ref": { + "Parameters": [ + "String" + ] + } + }, "IamPath": { "AllowedPatternRegex": "^/(.+/)*$", "Ref": { @@ -25852,4 +25874,4 @@ ] } } -} \ No newline at end of file +} diff --git a/src/cfnlint/data/CloudSpecs/eu-west-1.json b/src/cfnlint/data/CloudSpecs/eu-west-1.json index a45a39db3d..c6fd2ca4f7 100644 --- a/src/cfnlint/data/CloudSpecs/eu-west-1.json +++ b/src/cfnlint/data/CloudSpecs/eu-west-1.json @@ -15451,7 +15451,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -15468,7 +15471,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -15502,7 +15508,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -36946,7 +36955,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } }, "Roles": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-roles", @@ -46501,6 +46513,16 @@ ] } }, + "IamPolicyName": { + "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", + "StringMax": 128, + "StringMin": 1, + "Ref": { + "Parameters": [ + "String" + ] + } + }, "IamPath": { "AllowedPatternRegex": "^/(.+/)*$", "Ref": { @@ -47351,4 +47373,4 @@ ] } } -} \ No newline at end of file +} diff --git a/src/cfnlint/data/CloudSpecs/eu-west-2.json b/src/cfnlint/data/CloudSpecs/eu-west-2.json index 1a342b580e..e270641cc2 100644 --- a/src/cfnlint/data/CloudSpecs/eu-west-2.json +++ b/src/cfnlint/data/CloudSpecs/eu-west-2.json @@ -12900,7 +12900,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -12917,7 +12920,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -12951,7 +12957,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -29581,7 +29590,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } }, "Roles": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-roles", @@ -37239,6 +37251,16 @@ ] } }, + "IamPolicyName": { + "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", + "StringMax": 128, + "StringMin": 1, + "Ref": { + "Parameters": [ + "String" + ] + } + }, "IamPath": { "AllowedPatternRegex": "^/(.+/)*$", "Ref": { @@ -38063,4 +38085,4 @@ ] } } -} \ No newline at end of file +} diff --git a/src/cfnlint/data/CloudSpecs/eu-west-3.json b/src/cfnlint/data/CloudSpecs/eu-west-3.json index 523d75ed62..7de6cf4465 100644 --- a/src/cfnlint/data/CloudSpecs/eu-west-3.json +++ b/src/cfnlint/data/CloudSpecs/eu-west-3.json @@ -10746,7 +10746,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -10763,7 +10766,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -10797,7 +10803,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -23527,7 +23536,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } }, "Roles": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-roles", @@ -30048,6 +30060,16 @@ ] } }, + "IamPolicyName": { + "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", + "StringMax": 128, + "StringMin": 1, + "Ref": { + "Parameters": [ + "String" + ] + } + }, "IamPath": { "AllowedPatternRegex": "^/(.+/)*$", "Ref": { @@ -30847,4 +30869,4 @@ ] } } -} \ No newline at end of file +} diff --git a/src/cfnlint/data/CloudSpecs/sa-east-1.json b/src/cfnlint/data/CloudSpecs/sa-east-1.json index 5c40017a5f..e4b4962b51 100644 --- a/src/cfnlint/data/CloudSpecs/sa-east-1.json +++ b/src/cfnlint/data/CloudSpecs/sa-east-1.json @@ -10787,7 +10787,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -10804,7 +10807,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -10838,7 +10844,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -23843,7 +23852,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } }, "Roles": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-roles", @@ -30307,6 +30319,16 @@ ] } }, + "IamPolicyName": { + "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", + "StringMax": 128, + "StringMin": 1, + "Ref": { + "Parameters": [ + "String" + ] + } + }, "IamPath": { "AllowedPatternRegex": "^/(.+/)*$", "Ref": { @@ -31122,4 +31144,4 @@ ] } } -} \ No newline at end of file +} diff --git a/src/cfnlint/data/CloudSpecs/us-east-1.json b/src/cfnlint/data/CloudSpecs/us-east-1.json index b509b9944f..7c840d788b 100644 --- a/src/cfnlint/data/CloudSpecs/us-east-1.json +++ b/src/cfnlint/data/CloudSpecs/us-east-1.json @@ -15451,7 +15451,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -15468,7 +15471,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -15502,7 +15508,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -36979,7 +36988,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } }, "Roles": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-roles", @@ -46553,6 +46565,16 @@ ] } }, + "IamPolicyName": { + "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", + "StringMax": 128, + "StringMin": 1, + "Ref": { + "Parameters": [ + "String" + ] + } + }, "IamPath": { "AllowedPatternRegex": "^/(.+/)*$", "Ref": { @@ -46560,7 +46582,7 @@ "String" ] } - }, + }, "IamRole": { "GetAtt": {}, "Ref": { @@ -46595,7 +46617,7 @@ "AWS::IAM::Role" ] } - }, + }, "IamUser.Arn": { "GetAtt": { "AWS::IAM::User": "Arn" @@ -47403,4 +47425,4 @@ ] } } -} \ No newline at end of file +} diff --git a/src/cfnlint/data/CloudSpecs/us-east-2.json b/src/cfnlint/data/CloudSpecs/us-east-2.json index cae78ec8c5..6c971028a3 100644 --- a/src/cfnlint/data/CloudSpecs/us-east-2.json +++ b/src/cfnlint/data/CloudSpecs/us-east-2.json @@ -14079,7 +14079,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -14096,7 +14099,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -14130,7 +14136,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -32313,7 +32322,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } }, "Roles": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-roles", @@ -40367,6 +40379,16 @@ ] } }, + "IamPolicyName": { + "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", + "StringMax": 128, + "StringMin": 1, + "Ref": { + "Parameters": [ + "String" + ] + } + }, "IamPath": { "AllowedPatternRegex": "^/(.+/)*$", "Ref": { @@ -41191,4 +41213,4 @@ ] } } -} \ No newline at end of file +} diff --git a/src/cfnlint/data/CloudSpecs/us-gov-east-1.json b/src/cfnlint/data/CloudSpecs/us-gov-east-1.json index eaa0514dde..fa98c61ea5 100644 --- a/src/cfnlint/data/CloudSpecs/us-gov-east-1.json +++ b/src/cfnlint/data/CloudSpecs/us-gov-east-1.json @@ -7938,7 +7938,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -7955,7 +7958,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -7989,7 +7995,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -18317,7 +18326,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } }, "Roles": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-roles", @@ -22576,6 +22588,16 @@ ] } }, + "IamPolicyName": { + "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", + "StringMax": 128, + "StringMin": 1, + "Ref": { + "Parameters": [ + "String" + ] + } + }, "IamPath": { "AllowedPatternRegex": "^/(.+/)*$", "Ref": { @@ -23361,4 +23383,4 @@ ] } } -} \ No newline at end of file +} diff --git a/src/cfnlint/data/CloudSpecs/us-gov-west-1.json b/src/cfnlint/data/CloudSpecs/us-gov-west-1.json index 451d32e900..4be2aaf8a4 100644 --- a/src/cfnlint/data/CloudSpecs/us-gov-west-1.json +++ b/src/cfnlint/data/CloudSpecs/us-gov-west-1.json @@ -8072,7 +8072,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -8089,7 +8092,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -8123,7 +8129,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -19455,7 +19464,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } }, "Roles": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-roles", @@ -24541,6 +24553,16 @@ ] } }, + "IamPolicyName": { + "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", + "StringMax": 128, + "StringMin": 1, + "Ref": { + "Parameters": [ + "String" + ] + } + }, "IamPath": { "AllowedPatternRegex": "^/(.+/)*$", "Ref": { @@ -25361,4 +25383,4 @@ ] } } -} \ No newline at end of file +} diff --git a/src/cfnlint/data/CloudSpecs/us-west-1.json b/src/cfnlint/data/CloudSpecs/us-west-1.json index c66afb6495..42b6820d42 100644 --- a/src/cfnlint/data/CloudSpecs/us-west-1.json +++ b/src/cfnlint/data/CloudSpecs/us-west-1.json @@ -12410,7 +12410,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -12427,7 +12430,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -12461,7 +12467,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -26191,7 +26200,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } }, "Roles": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-roles", @@ -33180,6 +33192,16 @@ ] } }, + "IamPolicyName": { + "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", + "StringMax": 128, + "StringMin": 1, + "Ref": { + "Parameters": [ + "String" + ] + } + }, "IamPath": { "AllowedPatternRegex": "^/(.+/)*$", "Ref": { @@ -34008,4 +34030,4 @@ ] } } -} \ No newline at end of file +} diff --git a/src/cfnlint/data/CloudSpecs/us-west-2.json b/src/cfnlint/data/CloudSpecs/us-west-2.json index 8350a9d1a2..5a2701da23 100644 --- a/src/cfnlint/data/CloudSpecs/us-west-2.json +++ b/src/cfnlint/data/CloudSpecs/us-west-2.json @@ -15451,7 +15451,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -15468,7 +15471,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -15502,7 +15508,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -36929,7 +36938,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-policyname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "IamPolicyName" + } }, "Roles": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-roles", @@ -46478,6 +46490,16 @@ ] } }, + "IamPolicyName": { + "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", + "StringMax": 128, + "StringMin": 1, + "Ref": { + "Parameters": [ + "String" + ] + } + }, "IamPath": { "AllowedPatternRegex": "^/(.+/)*$", "Ref": { @@ -47328,4 +47350,4 @@ ] } } -} \ No newline at end of file +} From ea4d713b947cf42bad4109a1f168e585de84e318 Mon Sep 17 00:00:00 2001 From: kddejong Date: Wed, 10 Jul 2019 09:22:43 -0500 Subject: [PATCH 2/2] update json patches for iam policy names --- src/cfnlint/data/CloudSpecs/ap-east-1.json | 32 ++-- .../data/CloudSpecs/ap-northeast-1.json | 26 +-- .../data/CloudSpecs/ap-northeast-2.json | 32 ++-- .../data/CloudSpecs/ap-northeast-3.json | 32 ++-- src/cfnlint/data/CloudSpecs/ap-south-1.json | 32 ++-- .../data/CloudSpecs/ap-southeast-1.json | 32 ++-- .../data/CloudSpecs/ap-southeast-2.json | 32 ++-- src/cfnlint/data/CloudSpecs/ca-central-1.json | 32 ++-- src/cfnlint/data/CloudSpecs/eu-central-1.json | 32 ++-- src/cfnlint/data/CloudSpecs/eu-north-1.json | 32 ++-- src/cfnlint/data/CloudSpecs/eu-west-1.json | 32 ++-- src/cfnlint/data/CloudSpecs/eu-west-2.json | 32 ++-- src/cfnlint/data/CloudSpecs/eu-west-3.json | 32 ++-- src/cfnlint/data/CloudSpecs/sa-east-1.json | 32 ++-- src/cfnlint/data/CloudSpecs/us-east-1.json | 32 ++-- src/cfnlint/data/CloudSpecs/us-east-2.json | 34 ++-- .../data/CloudSpecs/us-gov-east-1.json | 32 ++-- .../data/CloudSpecs/us-gov-west-1.json | 32 ++-- src/cfnlint/data/CloudSpecs/us-west-1.json | 32 ++-- src/cfnlint/data/CloudSpecs/us-west-2.json | 32 ++-- .../ExtendedSpecs/all/03_value_types.json | 174 +++++++++--------- .../ExtendedSpecs/all/04_property_values.json | 28 +++ 22 files changed, 438 insertions(+), 400 deletions(-) diff --git a/src/cfnlint/data/CloudSpecs/ap-east-1.json b/src/cfnlint/data/CloudSpecs/ap-east-1.json index c309d1687b..1a248a53a6 100644 --- a/src/cfnlint/data/CloudSpecs/ap-east-1.json +++ b/src/cfnlint/data/CloudSpecs/ap-east-1.json @@ -7895,9 +7895,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } } } }, @@ -7915,9 +7915,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } } } }, @@ -7952,9 +7952,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } } } }, @@ -17599,9 +17599,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } }, "Roles": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-roles", @@ -21789,23 +21789,23 @@ ] } }, - "IamPolicyName": { - "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", - "StringMax": 128, - "StringMin": 1, + "IamPath": { + "AllowedPatternRegex": "^/(.+/)*$", "Ref": { "Parameters": [ "String" ] } }, - "IamPath": { - "AllowedPatternRegex": "^/(.+/)*$", + "IamPolicyName": { + "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", "Ref": { "Parameters": [ "String" ] - } + }, + "StringMax": 128, + "StringMin": 1 }, "IamRole": { "GetAtt": {}, @@ -22584,4 +22584,4 @@ ] } } -} +} \ No newline at end of file diff --git a/src/cfnlint/data/CloudSpecs/ap-northeast-1.json b/src/cfnlint/data/CloudSpecs/ap-northeast-1.json index 519f50ddb9..fbc8f538d3 100644 --- a/src/cfnlint/data/CloudSpecs/ap-northeast-1.json +++ b/src/cfnlint/data/CloudSpecs/ap-northeast-1.json @@ -15363,7 +15363,7 @@ "UpdateType": "Mutable", "Value": { "ValueType": "IamPolicyName" - } + } } } }, @@ -15383,7 +15383,7 @@ "UpdateType": "Mutable", "Value": { "ValueType": "IamPolicyName" - } + } } } }, @@ -15418,9 +15418,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } } } }, @@ -35416,7 +35416,7 @@ "UpdateType": "Mutable", "Value": { "ValueType": "IamPolicyName" - } + } }, "Roles": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-roles", @@ -44067,23 +44067,23 @@ ] } }, - "IamPolicyName": { - "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", - "StringMax": 128, - "StringMin": 1, + "IamPath": { + "AllowedPatternRegex": "^/(.+/)*$", "Ref": { "Parameters": [ "String" ] } }, - "IamPath": { - "AllowedPatternRegex": "^/(.+/)*$", + "IamPolicyName": { + "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", "Ref": { "Parameters": [ "String" ] - } + }, + "StringMax": 128, + "StringMin": 1 }, "IamRole": { "GetAtt": {}, @@ -44927,4 +44927,4 @@ ] } } -} +} \ No newline at end of file diff --git a/src/cfnlint/data/CloudSpecs/ap-northeast-2.json b/src/cfnlint/data/CloudSpecs/ap-northeast-2.json index ed10eff66f..9664f76020 100644 --- a/src/cfnlint/data/CloudSpecs/ap-northeast-2.json +++ b/src/cfnlint/data/CloudSpecs/ap-northeast-2.json @@ -13790,9 +13790,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } } } }, @@ -13810,9 +13810,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } } } }, @@ -13847,9 +13847,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } } } }, @@ -31336,9 +31336,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } }, "Roles": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-roles", @@ -39075,23 +39075,23 @@ ] } }, - "IamPolicyName": { - "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", - "StringMax": 128, - "StringMin": 1, + "IamPath": { + "AllowedPatternRegex": "^/(.+/)*$", "Ref": { "Parameters": [ "String" ] } }, - "IamPath": { - "AllowedPatternRegex": "^/(.+/)*$", + "IamPolicyName": { + "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", "Ref": { "Parameters": [ "String" ] - } + }, + "StringMax": 128, + "StringMin": 1 }, "IamRole": { "GetAtt": {}, @@ -39909,4 +39909,4 @@ ] } } -} +} \ No newline at end of file diff --git a/src/cfnlint/data/CloudSpecs/ap-northeast-3.json b/src/cfnlint/data/CloudSpecs/ap-northeast-3.json index e77fa0713f..aba978cd1c 100644 --- a/src/cfnlint/data/CloudSpecs/ap-northeast-3.json +++ b/src/cfnlint/data/CloudSpecs/ap-northeast-3.json @@ -8555,9 +8555,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } } } }, @@ -8575,9 +8575,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } } } }, @@ -8612,9 +8612,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } } } }, @@ -19139,9 +19139,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } }, "Roles": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-roles", @@ -24264,23 +24264,23 @@ ] } }, - "IamPolicyName": { - "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", - "StringMax": 128, - "StringMin": 1, + "IamPath": { + "AllowedPatternRegex": "^/(.+/)*$", "Ref": { "Parameters": [ "String" ] } }, - "IamPath": { - "AllowedPatternRegex": "^/(.+/)*$", + "IamPolicyName": { + "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", "Ref": { "Parameters": [ "String" ] - } + }, + "StringMax": 128, + "StringMin": 1 }, "IamRole": { "GetAtt": {}, @@ -25059,4 +25059,4 @@ ] } } -} +} \ No newline at end of file diff --git a/src/cfnlint/data/CloudSpecs/ap-south-1.json b/src/cfnlint/data/CloudSpecs/ap-south-1.json index bdcaf8a130..a22cee7667 100644 --- a/src/cfnlint/data/CloudSpecs/ap-south-1.json +++ b/src/cfnlint/data/CloudSpecs/ap-south-1.json @@ -13427,9 +13427,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } } } }, @@ -13447,9 +13447,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } } } }, @@ -13484,9 +13484,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } } } }, @@ -30211,9 +30211,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } }, "Roles": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-roles", @@ -38356,23 +38356,23 @@ ] } }, - "IamPolicyName": { - "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", - "StringMax": 128, - "StringMin": 1, + "IamPath": { + "AllowedPatternRegex": "^/(.+/)*$", "Ref": { "Parameters": [ "String" ] } }, - "IamPath": { - "AllowedPatternRegex": "^/(.+/)*$", + "IamPolicyName": { + "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", "Ref": { "Parameters": [ "String" ] - } + }, + "StringMax": 128, + "StringMin": 1 }, "IamRole": { "GetAtt": {}, @@ -39190,4 +39190,4 @@ ] } } -} +} \ No newline at end of file diff --git a/src/cfnlint/data/CloudSpecs/ap-southeast-1.json b/src/cfnlint/data/CloudSpecs/ap-southeast-1.json index c8a0e24a11..c98aa5ddd6 100644 --- a/src/cfnlint/data/CloudSpecs/ap-southeast-1.json +++ b/src/cfnlint/data/CloudSpecs/ap-southeast-1.json @@ -13811,9 +13811,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } } } }, @@ -13831,9 +13831,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } } } }, @@ -13868,9 +13868,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } } } }, @@ -31681,9 +31681,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } }, "Roles": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-roles", @@ -39555,23 +39555,23 @@ ] } }, - "IamPolicyName": { - "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", - "StringMax": 128, - "StringMin": 1, + "IamPath": { + "AllowedPatternRegex": "^/(.+/)*$", "Ref": { "Parameters": [ "String" ] } }, - "IamPath": { - "AllowedPatternRegex": "^/(.+/)*$", + "IamPolicyName": { + "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", "Ref": { "Parameters": [ "String" ] - } + }, + "StringMax": 128, + "StringMin": 1 }, "IamRole": { "GetAtt": {}, @@ -40409,4 +40409,4 @@ ] } } -} +} \ No newline at end of file diff --git a/src/cfnlint/data/CloudSpecs/ap-southeast-2.json b/src/cfnlint/data/CloudSpecs/ap-southeast-2.json index 83b0f4cb3b..619f257832 100644 --- a/src/cfnlint/data/CloudSpecs/ap-southeast-2.json +++ b/src/cfnlint/data/CloudSpecs/ap-southeast-2.json @@ -15323,9 +15323,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } } } }, @@ -15343,9 +15343,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } } } }, @@ -15380,9 +15380,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } } } }, @@ -35079,9 +35079,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } }, "Roles": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-roles", @@ -43828,23 +43828,23 @@ ] } }, - "IamPolicyName": { - "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", - "StringMax": 128, - "StringMin": 1, + "IamPath": { + "AllowedPatternRegex": "^/(.+/)*$", "Ref": { "Parameters": [ "String" ] } }, - "IamPath": { - "AllowedPatternRegex": "^/(.+/)*$", + "IamPolicyName": { + "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", "Ref": { "Parameters": [ "String" ] - } + }, + "StringMax": 128, + "StringMin": 1 }, "IamRole": { "GetAtt": {}, @@ -44688,4 +44688,4 @@ ] } } -} +} \ No newline at end of file diff --git a/src/cfnlint/data/CloudSpecs/ca-central-1.json b/src/cfnlint/data/CloudSpecs/ca-central-1.json index e5fc1790dc..0af88da0ab 100644 --- a/src/cfnlint/data/CloudSpecs/ca-central-1.json +++ b/src/cfnlint/data/CloudSpecs/ca-central-1.json @@ -12351,9 +12351,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } } } }, @@ -12371,9 +12371,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } } } }, @@ -12408,9 +12408,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } } } }, @@ -26391,9 +26391,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } }, "Roles": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-roles", @@ -33173,23 +33173,23 @@ ] } }, - "IamPolicyName": { - "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", - "StringMax": 128, - "StringMin": 1, + "IamPath": { + "AllowedPatternRegex": "^/(.+/)*$", "Ref": { "Parameters": [ "String" ] } }, - "IamPath": { - "AllowedPatternRegex": "^/(.+/)*$", + "IamPolicyName": { + "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", "Ref": { "Parameters": [ "String" ] - } + }, + "StringMax": 128, + "StringMin": 1 }, "IamRole": { "GetAtt": {}, @@ -33995,4 +33995,4 @@ ] } } -} +} \ No newline at end of file diff --git a/src/cfnlint/data/CloudSpecs/eu-central-1.json b/src/cfnlint/data/CloudSpecs/eu-central-1.json index 134a20cd16..a48ceac24d 100644 --- a/src/cfnlint/data/CloudSpecs/eu-central-1.json +++ b/src/cfnlint/data/CloudSpecs/eu-central-1.json @@ -15162,9 +15162,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } } } }, @@ -15182,9 +15182,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } } } }, @@ -15219,9 +15219,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } } } }, @@ -35185,9 +35185,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } }, "Roles": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-roles", @@ -44069,23 +44069,23 @@ ] } }, - "IamPolicyName": { - "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", - "StringMax": 128, - "StringMin": 1, + "IamPath": { + "AllowedPatternRegex": "^/(.+/)*$", "Ref": { "Parameters": [ "String" ] } }, - "IamPath": { - "AllowedPatternRegex": "^/(.+/)*$", + "IamPolicyName": { + "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", "Ref": { "Parameters": [ "String" ] - } + }, + "StringMax": 128, + "StringMin": 1 }, "IamRole": { "GetAtt": {}, @@ -44915,4 +44915,4 @@ ] } } -} +} \ No newline at end of file diff --git a/src/cfnlint/data/CloudSpecs/eu-north-1.json b/src/cfnlint/data/CloudSpecs/eu-north-1.json index 00dfbb5012..8ae0591b9e 100644 --- a/src/cfnlint/data/CloudSpecs/eu-north-1.json +++ b/src/cfnlint/data/CloudSpecs/eu-north-1.json @@ -8590,9 +8590,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } } } }, @@ -8610,9 +8610,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } } } }, @@ -8647,9 +8647,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } } } }, @@ -19797,9 +19797,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } }, "Roles": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-roles", @@ -25068,23 +25068,23 @@ ] } }, - "IamPolicyName": { - "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", - "StringMax": 128, - "StringMin": 1, + "IamPath": { + "AllowedPatternRegex": "^/(.+/)*$", "Ref": { "Parameters": [ "String" ] } }, - "IamPath": { - "AllowedPatternRegex": "^/(.+/)*$", + "IamPolicyName": { + "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", "Ref": { "Parameters": [ "String" ] - } + }, + "StringMax": 128, + "StringMin": 1 }, "IamRole": { "GetAtt": {}, @@ -25874,4 +25874,4 @@ ] } } -} +} \ No newline at end of file diff --git a/src/cfnlint/data/CloudSpecs/eu-west-1.json b/src/cfnlint/data/CloudSpecs/eu-west-1.json index c6fd2ca4f7..36a73e59aa 100644 --- a/src/cfnlint/data/CloudSpecs/eu-west-1.json +++ b/src/cfnlint/data/CloudSpecs/eu-west-1.json @@ -15452,9 +15452,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } } } }, @@ -15472,9 +15472,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } } } }, @@ -15509,9 +15509,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } } } }, @@ -36956,9 +36956,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } }, "Roles": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-roles", @@ -46513,23 +46513,23 @@ ] } }, - "IamPolicyName": { - "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", - "StringMax": 128, - "StringMin": 1, + "IamPath": { + "AllowedPatternRegex": "^/(.+/)*$", "Ref": { "Parameters": [ "String" ] } }, - "IamPath": { - "AllowedPatternRegex": "^/(.+/)*$", + "IamPolicyName": { + "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", "Ref": { "Parameters": [ "String" ] - } + }, + "StringMax": 128, + "StringMin": 1 }, "IamRole": { "GetAtt": {}, @@ -47373,4 +47373,4 @@ ] } } -} +} \ No newline at end of file diff --git a/src/cfnlint/data/CloudSpecs/eu-west-2.json b/src/cfnlint/data/CloudSpecs/eu-west-2.json index e270641cc2..86702fb35f 100644 --- a/src/cfnlint/data/CloudSpecs/eu-west-2.json +++ b/src/cfnlint/data/CloudSpecs/eu-west-2.json @@ -12901,9 +12901,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } } } }, @@ -12921,9 +12921,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } } } }, @@ -12958,9 +12958,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } } } }, @@ -29591,9 +29591,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } }, "Roles": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-roles", @@ -37251,23 +37251,23 @@ ] } }, - "IamPolicyName": { - "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", - "StringMax": 128, - "StringMin": 1, + "IamPath": { + "AllowedPatternRegex": "^/(.+/)*$", "Ref": { "Parameters": [ "String" ] } }, - "IamPath": { - "AllowedPatternRegex": "^/(.+/)*$", + "IamPolicyName": { + "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", "Ref": { "Parameters": [ "String" ] - } + }, + "StringMax": 128, + "StringMin": 1 }, "IamRole": { "GetAtt": {}, @@ -38085,4 +38085,4 @@ ] } } -} +} \ No newline at end of file diff --git a/src/cfnlint/data/CloudSpecs/eu-west-3.json b/src/cfnlint/data/CloudSpecs/eu-west-3.json index 7de6cf4465..dd20a8328f 100644 --- a/src/cfnlint/data/CloudSpecs/eu-west-3.json +++ b/src/cfnlint/data/CloudSpecs/eu-west-3.json @@ -10747,9 +10747,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } } } }, @@ -10767,9 +10767,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } } } }, @@ -10804,9 +10804,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } } } }, @@ -23537,9 +23537,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } }, "Roles": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-roles", @@ -30060,23 +30060,23 @@ ] } }, - "IamPolicyName": { - "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", - "StringMax": 128, - "StringMin": 1, + "IamPath": { + "AllowedPatternRegex": "^/(.+/)*$", "Ref": { "Parameters": [ "String" ] } }, - "IamPath": { - "AllowedPatternRegex": "^/(.+/)*$", + "IamPolicyName": { + "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", "Ref": { "Parameters": [ "String" ] - } + }, + "StringMax": 128, + "StringMin": 1 }, "IamRole": { "GetAtt": {}, @@ -30869,4 +30869,4 @@ ] } } -} +} \ No newline at end of file diff --git a/src/cfnlint/data/CloudSpecs/sa-east-1.json b/src/cfnlint/data/CloudSpecs/sa-east-1.json index e4b4962b51..57b6c6e108 100644 --- a/src/cfnlint/data/CloudSpecs/sa-east-1.json +++ b/src/cfnlint/data/CloudSpecs/sa-east-1.json @@ -10788,9 +10788,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } } } }, @@ -10808,9 +10808,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } } } }, @@ -10845,9 +10845,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } } } }, @@ -23853,9 +23853,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } }, "Roles": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-roles", @@ -30319,23 +30319,23 @@ ] } }, - "IamPolicyName": { - "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", - "StringMax": 128, - "StringMin": 1, + "IamPath": { + "AllowedPatternRegex": "^/(.+/)*$", "Ref": { "Parameters": [ "String" ] } }, - "IamPath": { - "AllowedPatternRegex": "^/(.+/)*$", + "IamPolicyName": { + "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", "Ref": { "Parameters": [ "String" ] - } + }, + "StringMax": 128, + "StringMin": 1 }, "IamRole": { "GetAtt": {}, @@ -31144,4 +31144,4 @@ ] } } -} +} \ No newline at end of file diff --git a/src/cfnlint/data/CloudSpecs/us-east-1.json b/src/cfnlint/data/CloudSpecs/us-east-1.json index 7c840d788b..1092efbdfb 100644 --- a/src/cfnlint/data/CloudSpecs/us-east-1.json +++ b/src/cfnlint/data/CloudSpecs/us-east-1.json @@ -15452,9 +15452,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { - "ValueType": "IamPolicyName" - } + "Value": { + "ValueType": "IamPolicyName" + } } } }, @@ -15472,7 +15472,7 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" } } @@ -15509,7 +15509,7 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" } } @@ -36989,7 +36989,7 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" } }, @@ -46565,24 +46565,24 @@ ] } }, - "IamPolicyName": { - "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", - "StringMax": 128, - "StringMin": 1, + "IamPath": { + "AllowedPatternRegex": "^/(.+/)*$", "Ref": { "Parameters": [ "String" ] } }, - "IamPath": { - "AllowedPatternRegex": "^/(.+/)*$", + "IamPolicyName": { + "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", "Ref": { "Parameters": [ "String" ] - } - }, + }, + "StringMax": 128, + "StringMin": 1 + }, "IamRole": { "GetAtt": {}, "Ref": { @@ -46617,7 +46617,7 @@ "AWS::IAM::Role" ] } - }, + }, "IamUser.Arn": { "GetAtt": { "AWS::IAM::User": "Arn" @@ -47425,4 +47425,4 @@ ] } } -} +} \ No newline at end of file diff --git a/src/cfnlint/data/CloudSpecs/us-east-2.json b/src/cfnlint/data/CloudSpecs/us-east-2.json index 6c971028a3..f9797a4001 100644 --- a/src/cfnlint/data/CloudSpecs/us-east-2.json +++ b/src/cfnlint/data/CloudSpecs/us-east-2.json @@ -14080,9 +14080,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } } } }, @@ -14100,9 +14100,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } } } }, @@ -14137,9 +14137,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } } } }, @@ -32323,9 +32323,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { - "ValueType": "IamPolicyName" - } + "Value": { + "ValueType": "IamPolicyName" + } }, "Roles": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-roles", @@ -40379,23 +40379,23 @@ ] } }, - "IamPolicyName": { - "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", - "StringMax": 128, - "StringMin": 1, + "IamPath": { + "AllowedPatternRegex": "^/(.+/)*$", "Ref": { "Parameters": [ "String" ] } }, - "IamPath": { - "AllowedPatternRegex": "^/(.+/)*$", + "IamPolicyName": { + "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", "Ref": { "Parameters": [ "String" ] - } + }, + "StringMax": 128, + "StringMin": 1 }, "IamRole": { "GetAtt": {}, @@ -41213,4 +41213,4 @@ ] } } -} +} \ No newline at end of file diff --git a/src/cfnlint/data/CloudSpecs/us-gov-east-1.json b/src/cfnlint/data/CloudSpecs/us-gov-east-1.json index fa98c61ea5..a06b79ef7c 100644 --- a/src/cfnlint/data/CloudSpecs/us-gov-east-1.json +++ b/src/cfnlint/data/CloudSpecs/us-gov-east-1.json @@ -7939,9 +7939,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } } } }, @@ -7959,9 +7959,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } } } }, @@ -7996,9 +7996,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } } } }, @@ -18327,9 +18327,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } }, "Roles": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-roles", @@ -22588,23 +22588,23 @@ ] } }, - "IamPolicyName": { - "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", - "StringMax": 128, - "StringMin": 1, + "IamPath": { + "AllowedPatternRegex": "^/(.+/)*$", "Ref": { "Parameters": [ "String" ] } }, - "IamPath": { - "AllowedPatternRegex": "^/(.+/)*$", + "IamPolicyName": { + "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", "Ref": { "Parameters": [ "String" ] - } + }, + "StringMax": 128, + "StringMin": 1 }, "IamRole": { "GetAtt": {}, @@ -23383,4 +23383,4 @@ ] } } -} +} \ No newline at end of file diff --git a/src/cfnlint/data/CloudSpecs/us-gov-west-1.json b/src/cfnlint/data/CloudSpecs/us-gov-west-1.json index 4be2aaf8a4..e53fea9562 100644 --- a/src/cfnlint/data/CloudSpecs/us-gov-west-1.json +++ b/src/cfnlint/data/CloudSpecs/us-gov-west-1.json @@ -8073,9 +8073,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } } } }, @@ -8093,9 +8093,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } } } }, @@ -8130,9 +8130,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } } } }, @@ -19465,9 +19465,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } }, "Roles": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-roles", @@ -24553,23 +24553,23 @@ ] } }, - "IamPolicyName": { - "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", - "StringMax": 128, - "StringMin": 1, + "IamPath": { + "AllowedPatternRegex": "^/(.+/)*$", "Ref": { "Parameters": [ "String" ] } }, - "IamPath": { - "AllowedPatternRegex": "^/(.+/)*$", + "IamPolicyName": { + "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", "Ref": { "Parameters": [ "String" ] - } + }, + "StringMax": 128, + "StringMin": 1 }, "IamRole": { "GetAtt": {}, @@ -25383,4 +25383,4 @@ ] } } -} +} \ No newline at end of file diff --git a/src/cfnlint/data/CloudSpecs/us-west-1.json b/src/cfnlint/data/CloudSpecs/us-west-1.json index 42b6820d42..eb9b332f68 100644 --- a/src/cfnlint/data/CloudSpecs/us-west-1.json +++ b/src/cfnlint/data/CloudSpecs/us-west-1.json @@ -12411,9 +12411,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } } } }, @@ -12431,9 +12431,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } } } }, @@ -12468,9 +12468,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } } } }, @@ -26201,9 +26201,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } }, "Roles": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-roles", @@ -33192,23 +33192,23 @@ ] } }, - "IamPolicyName": { - "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", - "StringMax": 128, - "StringMin": 1, + "IamPath": { + "AllowedPatternRegex": "^/(.+/)*$", "Ref": { "Parameters": [ "String" ] } }, - "IamPath": { - "AllowedPatternRegex": "^/(.+/)*$", + "IamPolicyName": { + "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", "Ref": { "Parameters": [ "String" ] - } + }, + "StringMax": 128, + "StringMin": 1 }, "IamRole": { "GetAtt": {}, @@ -34030,4 +34030,4 @@ ] } } -} +} \ No newline at end of file diff --git a/src/cfnlint/data/CloudSpecs/us-west-2.json b/src/cfnlint/data/CloudSpecs/us-west-2.json index 5a2701da23..de4b6e427a 100644 --- a/src/cfnlint/data/CloudSpecs/us-west-2.json +++ b/src/cfnlint/data/CloudSpecs/us-west-2.json @@ -15452,9 +15452,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } } } }, @@ -15472,9 +15472,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } } } }, @@ -15509,9 +15509,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } } } }, @@ -36939,9 +36939,9 @@ "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable", - "Value": { + "Value": { "ValueType": "IamPolicyName" - } + } }, "Roles": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-roles", @@ -46490,23 +46490,23 @@ ] } }, - "IamPolicyName": { - "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", - "StringMax": 128, - "StringMin": 1, + "IamPath": { + "AllowedPatternRegex": "^/(.+/)*$", "Ref": { "Parameters": [ "String" ] } }, - "IamPath": { - "AllowedPatternRegex": "^/(.+/)*$", + "IamPolicyName": { + "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", "Ref": { "Parameters": [ "String" ] - } + }, + "StringMax": 128, + "StringMin": 1 }, "IamRole": { "GetAtt": {}, @@ -47350,4 +47350,4 @@ ] } } -} +} \ No newline at end of file diff --git a/src/cfnlint/data/ExtendedSpecs/all/03_value_types.json b/src/cfnlint/data/ExtendedSpecs/all/03_value_types.json index 28dfae2ae2..bb09fb0a39 100644 --- a/src/cfnlint/data/ExtendedSpecs/all/03_value_types.json +++ b/src/cfnlint/data/ExtendedSpecs/all/03_value_types.json @@ -675,14 +675,6 @@ "OPTIONAL" ] }, - "CognitoSchemaAttributeDataType": { - "AllowedValues": [ - "Boolean", - "DateTime", - "Number", - "String" - ] - }, "CognitoRefreshTokenValidity": { "NumberMax": 3650, "NumberMin": 0, @@ -693,6 +685,14 @@ ] } }, + "CognitoSchemaAttributeDataType": { + "AllowedValues": [ + "Boolean", + "DateTime", + "Number", + "String" + ] + }, "ConfigFrequency": { "AllowedValues": [ "One_Hour", @@ -733,6 +733,14 @@ ] } }, + "DHCPOptionsNetbiosNodeType": { + "AllowedValues": [ + "1", + "2", + "4", + "8" + ] + }, "DLMPolicyResourceType": { "AllowedValues": [ "INSTANCE", @@ -998,14 +1006,6 @@ "ENABLED" ] }, - "DHCPOptionsNetbiosNodeType": { - "AllowedValues": [ - "1", - "2", - "4", - "8" - ] - }, "DmsEndpointEngineName": { "AllowedValues": [ "aurora-postgresql", @@ -1084,6 +1084,30 @@ "OLD_IMAGE" ] }, + "EC2CapacityReservationEndDateType": { + "AllowedValues": [ + "limited", + "unlimited" + ] + }, + "EC2CapacityReservationInstanceMatchCriteria": { + "AllowedValues": [ + "open", + "targeted" + ] + }, + "EC2CapacityReservationInstancePlatform": { + "AllowedValues": [ + "Linux/UNIX", + "Red Hat Enterprise Linux", + "SUSE Linux", + "Windows with SQL Server Enterprise", + "Windows with SQL Server Standard", + "Windows with SQL Server Web", + "Windows with SQL Server", + "Windows" + ] + }, "EC2InstanceInitiatedShutdownBehavior": { "AllowedValues": [ "stop", @@ -1116,6 +1140,23 @@ "persistent" ] }, + "EFSFileSystemLifecyclePolicy": { + "AllowedValues": [ + "AFTER_30_DAYS" + ] + }, + "EFSFileSystemPerformanceMode": { + "AllowedValues": [ + "generalPurpose", + "maxIO" + ] + }, + "EFSFileSystemThroughputMode": { + "AllowedValues": [ + "bursting", + "provisioned" + ] + }, "EbsIops": { "NumberMax": 20000, "NumberMin": 100 @@ -1129,30 +1170,6 @@ "standard" ] }, - "EC2CapacityReservationEndDateType": { - "AllowedValues": [ - "limited", - "unlimited" - ] - }, - "EC2CapacityReservationInstanceMatchCriteria": { - "AllowedValues": [ - "open", - "targeted" - ] - }, - "EC2CapacityReservationInstancePlatform": { - "AllowedValues": [ - "Linux/UNIX", - "Red Hat Enterprise Linux", - "SUSE Linux", - "Windows with SQL Server Enterprise", - "Windows with SQL Server Standard", - "Windows with SQL Server Web", - "Windows with SQL Server", - "Windows" - ] - }, "Ec2CpuCredits": { "AllowedValues": [ "standard", @@ -1165,17 +1182,16 @@ "vpc" ] }, - "Ec2FleetExcessCapacityTerminationPolicy": { + "Ec2FleetDefaultTargetCapacityType": { "AllowedValues": [ - "no-termination", - "termination" + "on-demand", + "spot" ] }, - "Ec2FleetType": { + "Ec2FleetExcessCapacityTerminationPolicy": { "AllowedValues": [ - "instant", - "maintain", - "request" + "no-termination", + "termination" ] }, "Ec2FleetOnDemandAllocationStrategy": { @@ -1197,10 +1213,11 @@ "terminate" ] }, - "Ec2FleetDefaultTargetCapacityType": { + "Ec2FleetType": { "AllowedValues": [ - "on-demand", - "spot" + "instant", + "maintain", + "request" ] }, "Ec2FlowLogDestinationType": { @@ -1249,12 +1266,6 @@ "FARGATE" ] }, - "EcsSchedulingStrategy": { - "AllowedValues": [ - "DAEMON", - "REPLICA" - ] - }, "EcsNetworkMode": { "AllowedValues": [ "awsvpc", @@ -1263,26 +1274,15 @@ "none" ] }, - "EcsTaskDefinitionProxyType": { - "AllowedValues": [ - "APPMESH" - ] - }, - "EFSFileSystemLifecyclePolicy": { - "AllowedValues": [ - "AFTER_30_DAYS" - ] - }, - "EFSFileSystemPerformanceMode": { + "EcsSchedulingStrategy": { "AllowedValues": [ - "generalPurpose", - "maxIO" + "DAEMON", + "REPLICA" ] }, - "EFSFileSystemThroughputMode": { + "EcsTaskDefinitionProxyType": { "AllowedValues": [ - "bursting", - "provisioned" + "APPMESH" ] }, "ElasticInferenceAccelerator": { @@ -1492,6 +1492,16 @@ ] } }, + "IamPolicyName": { + "AllowedPatternRegex": "^[a-zA-Z0-9+=,.@\\-_]+$", + "Ref": { + "Parameters": [ + "String" + ] + }, + "StringMax": 128, + "StringMin": 1 + }, "IamRole": { "GetAtt": { }, @@ -1637,16 +1647,6 @@ "volume" ] }, - "LoadBalancerPort": { - "NumberMax": 65535, - "NumberMin": 1, - "Ref": { - "Parameters": [ - "String", - "Number" - ] - } - }, "LoadBalancerName": { "GetAtt": { }, @@ -1668,6 +1668,16 @@ ] } }, + "LoadBalancerPort": { + "NumberMax": 65535, + "NumberMin": 1, + "Ref": { + "Parameters": [ + "String", + "Number" + ] + } + }, "LoadBalancerV2Arn": { "GetAtt": { }, diff --git a/src/cfnlint/data/ExtendedSpecs/all/04_property_values.json b/src/cfnlint/data/ExtendedSpecs/all/04_property_values.json index 3c48968d9a..9127110d7a 100644 --- a/src/cfnlint/data/ExtendedSpecs/all/04_property_values.json +++ b/src/cfnlint/data/ExtendedSpecs/all/04_property_values.json @@ -2574,5 +2574,33 @@ "value": { "ValueType": "KmsKey.Arn" } + }, + { + "op": "add", + "path": "/PropertyTypes/AWS::IAM::Group.Policy/Properties/PolicyName/Value", + "value": { + "ValueType": "IamPolicyName" + } + }, + { + "op": "add", + "path": "/PropertyTypes/AWS::IAM::Role.Policy/Properties/PolicyName/Value", + "value": { + "ValueType": "IamPolicyName" + } + }, + { + "op": "add", + "path": "/PropertyTypes/AWS::IAM::User.Policy/Properties/PolicyName/Value", + "value": { + "ValueType": "IamPolicyName" + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::IAM::Policy/Properties/PolicyName/Value", + "value": { + "ValueType": "IamPolicyName" + } } ]