Merge pull request aws-cloudformation#977 from fatbasstard/launch-tem…

…plates Improve AWS::EC2::LaunchTemplate linting
fatbasstard · Jun 24, 2019 · 58568ca · 58568ca
2 parents 66805bc + aa6f460
commit 58568ca
Showing 24 changed files with 462 additions and 72 deletions.
diff --git a/src/cfnlint/data/AdditionalSpecs/OnlyOne.json b/src/cfnlint/data/AdditionalSpecs/OnlyOne.json
@@ -7,6 +7,12 @@
         "NoDevice"
       ]
     ],
+    "AWS::AutoScaling::AutoScalingGroup.LaunchTemplateSpecification": [
+      [
+        "LaunchTemplateId",
+        "LaunchTemplateName"
+      ]
+    ],
     "AWS::CloudFront::Distribution.Origin": [
       [
         "CustomOriginConfig",

diff --git a/src/cfnlint/data/CloudSpecs/ap-east-1.json b/src/cfnlint/data/CloudSpecs/ap-east-1.json
@@ -3435,13 +3435,16 @@
         "ResourceType": {
           "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-tagspecification.html#cfn-ec2-launchtemplate-tagspecification-resourcetype",
           "PrimitiveType": "String",
-          "Required": false,
-          "UpdateType": "Mutable"
+          "Required": true,
+          "UpdateType": "Mutable",
+          "Value": {
+            "ValueType": "LaunchTemplateTagSpecificationResourceType"
+          }
         },
         "Tags": {
           "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-tagspecification.html#cfn-ec2-launchtemplate-tagspecification-tags",
           "ItemType": "Tag",
-          "Required": false,
+          "Required": true,
           "Type": "List",
           "UpdateType": "Mutable"
         }
@@ -13778,7 +13781,10 @@
           "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-launchtemplate.html#cfn-ec2-launchtemplate-launchtemplatename",
           "PrimitiveType": "String",
           "Required": false,
-          "UpdateType": "Immutable"
+          "UpdateType": "Immutable",
+          "Value": {
+            "ValueType": "LaunchTemplateName"
+          }
         }
       }
     },
@@ -21749,6 +21755,18 @@
         ]
       }
     },
+    "LaunchTemplateName": {
+      "AllowedPattern": "[a-zA-Z0-9().-/_]+",
+      "AllowedPatternRegex": "^[a-zA-Z0-9().-/_]+$",
+      "StringMax": 128,
+      "StringMin": 3
+    },
+    "LaunchTemplateTagSpecificationResourceType": {
+      "AllowedValues": [
+        "instance",
+        "volume"
+      ]
+    },
     "LoadBalancerName": {
       "GetAtt": {},
       "Ref": {

diff --git a/src/cfnlint/data/CloudSpecs/ap-northeast-1.json b/src/cfnlint/data/CloudSpecs/ap-northeast-1.json
@@ -8391,13 +8391,16 @@
         "ResourceType": {
           "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-tagspecification.html#cfn-ec2-launchtemplate-tagspecification-resourcetype",
           "PrimitiveType": "String",
-          "Required": false,
-          "UpdateType": "Mutable"
+          "Required": true,
+          "UpdateType": "Mutable",
+          "Value": {
+            "ValueType": "LaunchTemplateTagSpecificationResourceType"
+          }
         },
         "Tags": {
           "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-tagspecification.html#cfn-ec2-launchtemplate-tagspecification-tags",
           "ItemType": "Tag",
-          "Required": false,
+          "Required": true,
           "Type": "List",
           "UpdateType": "Mutable"
         }
@@ -29606,7 +29609,10 @@
           "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-launchtemplate.html#cfn-ec2-launchtemplate-launchtemplatename",
           "PrimitiveType": "String",
           "Required": false,
-          "UpdateType": "Immutable"
+          "UpdateType": "Immutable",
+          "Value": {
+            "ValueType": "LaunchTemplateName"
+          }
         }
       }
     },
@@ -43010,6 +43016,18 @@
         ]
       }
     },
+    "LaunchTemplateName": {
+      "AllowedPattern": "[a-zA-Z0-9().-/_]+",
+      "AllowedPatternRegex": "^[a-zA-Z0-9().-/_]+$",
+      "StringMax": 128,
+      "StringMin": 3
+    },
+    "LaunchTemplateTagSpecificationResourceType": {
+      "AllowedValues": [
+        "instance",
+        "volume"
+      ]
+    },
     "LoadBalancerName": {
       "GetAtt": {},
       "Ref": {

diff --git a/src/cfnlint/data/CloudSpecs/ap-northeast-2.json b/src/cfnlint/data/CloudSpecs/ap-northeast-2.json
@@ -7975,13 +7975,16 @@
         "ResourceType": {
           "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-tagspecification.html#cfn-ec2-launchtemplate-tagspecification-resourcetype",
           "PrimitiveType": "String",
-          "Required": false,
-          "UpdateType": "Mutable"
+          "Required": true,
+          "UpdateType": "Mutable",
+          "Value": {
+            "ValueType": "LaunchTemplateTagSpecificationResourceType"
+          }
         },
         "Tags": {
           "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-tagspecification.html#cfn-ec2-launchtemplate-tagspecification-tags",
           "ItemType": "Tag",
-          "Required": false,
+          "Required": true,
           "Type": "List",
           "UpdateType": "Mutable"
         }
@@ -26074,7 +26077,10 @@
           "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-launchtemplate.html#cfn-ec2-launchtemplate-launchtemplatename",
           "PrimitiveType": "String",
           "Required": false,
-          "UpdateType": "Immutable"
+          "UpdateType": "Immutable",
+          "Value": {
+            "ValueType": "LaunchTemplateName"
+          }
         }
       }
     },
@@ -38077,6 +38083,18 @@
         ]
       }
     },
+    "LaunchTemplateName": {
+      "AllowedPattern": "[a-zA-Z0-9().-/_]+",
+      "AllowedPatternRegex": "^[a-zA-Z0-9().-/_]+$",
+      "StringMax": 128,
+      "StringMin": 3
+    },
+    "LaunchTemplateTagSpecificationResourceType": {
+      "AllowedValues": [
+        "instance",
+        "volume"
+      ]
+    },
     "LoadBalancerName": {
       "GetAtt": {},
       "Ref": {

diff --git a/src/cfnlint/data/CloudSpecs/ap-northeast-3.json b/src/cfnlint/data/CloudSpecs/ap-northeast-3.json
@@ -23697,6 +23697,18 @@
         ]
       }
     },
+    "LaunchTemplateName": {
+      "AllowedPattern": "[a-zA-Z0-9().-/_]+",
+      "AllowedPatternRegex": "^[a-zA-Z0-9().-/_]+$",
+      "StringMax": 128,
+      "StringMin": 3
+    },
+    "LaunchTemplateTagSpecificationResourceType": {
+      "AllowedValues": [
+        "instance",
+        "volume"
+      ]
+    },
     "LoadBalancerName": {
       "GetAtt": {},
       "Ref": {

diff --git a/src/cfnlint/data/CloudSpecs/ap-south-1.json b/src/cfnlint/data/CloudSpecs/ap-south-1.json
@@ -7463,13 +7463,16 @@
         "ResourceType": {
           "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-tagspecification.html#cfn-ec2-launchtemplate-tagspecification-resourcetype",
           "PrimitiveType": "String",
-          "Required": false,
-          "UpdateType": "Mutable"
+          "Required": true,
+          "UpdateType": "Mutable",
+          "Value": {
+            "ValueType": "LaunchTemplateTagSpecificationResourceType"
+          }
         },
         "Tags": {
           "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-tagspecification.html#cfn-ec2-launchtemplate-tagspecification-tags",
           "ItemType": "Tag",
-          "Required": false,
+          "Required": true,
           "Type": "List",
           "UpdateType": "Mutable"
         }
@@ -24951,7 +24954,10 @@
           "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-launchtemplate.html#cfn-ec2-launchtemplate-launchtemplatename",
           "PrimitiveType": "String",
           "Required": false,
-          "UpdateType": "Immutable"
+          "UpdateType": "Immutable",
+          "Value": {
+            "ValueType": "LaunchTemplateName"
+          }
         }
       }
     },
@@ -37358,6 +37364,18 @@
         ]
       }
     },
+    "LaunchTemplateName": {
+      "AllowedPattern": "[a-zA-Z0-9().-/_]+",
+      "AllowedPatternRegex": "^[a-zA-Z0-9().-/_]+$",
+      "StringMax": 128,
+      "StringMin": 3
+    },
+    "LaunchTemplateTagSpecificationResourceType": {
+      "AllowedValues": [
+        "instance",
+        "volume"
+      ]
+    },
     "LoadBalancerName": {
       "GetAtt": {},
       "Ref": {

diff --git a/src/cfnlint/data/CloudSpecs/ap-southeast-1.json b/src/cfnlint/data/CloudSpecs/ap-southeast-1.json
@@ -7687,13 +7687,16 @@
         "ResourceType": {
           "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-tagspecification.html#cfn-ec2-launchtemplate-tagspecification-resourcetype",
           "PrimitiveType": "String",
-          "Required": false,
-          "UpdateType": "Mutable"
+          "Required": true,
+          "UpdateType": "Mutable",
+          "Value": {
+            "ValueType": "LaunchTemplateTagSpecificationResourceType"
+          }
         },
         "Tags": {
           "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-tagspecification.html#cfn-ec2-launchtemplate-tagspecification-tags",
           "ItemType": "Tag",
-          "Required": false,
+          "Required": true,
           "Type": "List",
           "UpdateType": "Mutable"
         }
@@ -26097,7 +26100,10 @@
           "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-launchtemplate.html#cfn-ec2-launchtemplate-launchtemplatename",
           "PrimitiveType": "String",
           "Required": false,
-          "UpdateType": "Immutable"
+          "UpdateType": "Immutable",
+          "Value": {
+            "ValueType": "LaunchTemplateName"
+          }
         }
       }
     },
@@ -38227,6 +38233,18 @@
         ]
       }
     },
+    "LaunchTemplateName": {
+      "AllowedPattern": "[a-zA-Z0-9().-/_]+",
+      "AllowedPatternRegex": "^[a-zA-Z0-9().-/_]+$",
+      "StringMax": 128,
+      "StringMin": 3
+    },
+    "LaunchTemplateTagSpecificationResourceType": {
+      "AllowedValues": [
+        "instance",
+        "volume"
+      ]
+    },
     "LoadBalancerName": {
       "GetAtt": {},
       "Ref": {

diff --git a/src/cfnlint/data/CloudSpecs/ap-southeast-2.json b/src/cfnlint/data/CloudSpecs/ap-southeast-2.json
@@ -8669,13 +8669,16 @@
         "ResourceType": {
           "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-tagspecification.html#cfn-ec2-launchtemplate-tagspecification-resourcetype",
           "PrimitiveType": "String",
-          "Required": false,
-          "UpdateType": "Mutable"
+          "Required": true,
+          "UpdateType": "Mutable",
+          "Value": {
+            "ValueType": "LaunchTemplateTagSpecificationResourceType"
+          }
         },
         "Tags": {
           "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-tagspecification.html#cfn-ec2-launchtemplate-tagspecification-tags",
           "ItemType": "Tag",
-          "Required": false,
+          "Required": true,
           "Type": "List",
           "UpdateType": "Mutable"
         }
@@ -29777,7 +29780,10 @@
           "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-launchtemplate.html#cfn-ec2-launchtemplate-launchtemplatename",
           "PrimitiveType": "String",
           "Required": false,
-          "UpdateType": "Immutable"
+          "UpdateType": "Immutable",
+          "Value": {
+            "ValueType": "LaunchTemplateName"
+          }
         }
       }
     },
@@ -43286,6 +43292,18 @@
         ]
       }
     },
+    "LaunchTemplateName": {
+      "AllowedPattern": "[a-zA-Z0-9().-/_]+",
+      "AllowedPatternRegex": "^[a-zA-Z0-9().-/_]+$",
+      "StringMax": 128,
+      "StringMin": 3
+    },
+    "LaunchTemplateTagSpecificationResourceType": {
+      "AllowedValues": [
+        "instance",
+        "volume"
+      ]
+    },
     "LoadBalancerName": {
       "GetAtt": {},
       "Ref": {

diff --git a/src/cfnlint/data/CloudSpecs/ca-central-1.json b/src/cfnlint/data/CloudSpecs/ca-central-1.json
@@ -7085,13 +7085,16 @@
         "ResourceType": {
           "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-tagspecification.html#cfn-ec2-launchtemplate-tagspecification-resourcetype",
           "PrimitiveType": "String",
-          "Required": false,
-          "UpdateType": "Mutable"
+          "Required": true,
+          "UpdateType": "Mutable",
+          "Value": {
+            "ValueType": "LaunchTemplateTagSpecificationResourceType"
+          }
         },
         "Tags": {
           "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-tagspecification.html#cfn-ec2-launchtemplate-tagspecification-tags",
           "ItemType": "Tag",
-          "Required": false,
+          "Required": true,
           "Type": "List",
           "UpdateType": "Mutable"
         }
@@ -21868,7 +21871,10 @@
           "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-launchtemplate.html#cfn-ec2-launchtemplate-launchtemplatename",
           "PrimitiveType": "String",
           "Required": false,
-          "UpdateType": "Immutable"
+          "UpdateType": "Immutable",
+          "Value": {
+            "ValueType": "LaunchTemplateName"
+          }
         }
       }
     },
@@ -32955,6 +32961,18 @@
         ]
       }
     },
+    "LaunchTemplateName": {
+      "AllowedPattern": "[a-zA-Z0-9().-/_]+",
+      "AllowedPatternRegex": "^[a-zA-Z0-9().-/_]+$",
+      "StringMax": 128,
+      "StringMin": 3
+    },
+    "LaunchTemplateTagSpecificationResourceType": {
+      "AllowedValues": [
+        "instance",
+        "volume"
+      ]
+    },
     "LoadBalancerName": {
       "GetAtt": {},
       "Ref": {