Add support for Security Group Name and ID (aws-cloudformation#889)

* Add type for Security Groups Name and IDs
fatbasstard · May 15, 2019 · d3b1b02 · d3b1b02
1 parent feff918
commit d3b1b02
Showing 22 changed files with 624 additions and 204 deletions.
diff --git a/src/cfnlint/data/CloudSpecs/ap-east-1.json b/src/cfnlint/data/CloudSpecs/ap-east-1.json
@@ -13924,8 +13924,8 @@
           "Type": "List",
           "UpdateType": "Conditional",
           "Value": {
-            "ListValueType": "SecurityGroupIds",
-            "ValueType": "SecurityGroupId"
+            "ListValueType": "SecurityGroupNameOrIds",
+            "ValueType": "SecurityGroupNameOrId"
           }
         },
         "SecurityGroups": {
@@ -16772,8 +16772,8 @@
           "Type": "List",
           "UpdateType": "Mutable",
           "Value": {
-            "ListValueType": "SecurityGroupIds",
-            "ValueType": "SecurityGroupId"
+            "ListValueType": "SecurityGroupNameOrIds",
+            "ValueType": "SecurityGroupNameOrId"
           }
         },
         "SubnetMappings": {
@@ -22788,6 +22788,29 @@
       "StringMin": ""
     },
     "SecurityGroupId": {
+      "GetAtt": {
+        "AWS::EC2::SecurityGroup": "GroupId",
+        "AWS::EC2::VPC": "DefaultSecurityGroup"
+      },
+      "Ref": {
+        "Parameters": [
+          "String",
+          "SecurityGroupId"
+        ]
+      }
+    },
+    "SecurityGroupIds": {
+      "GetAtt": {
+        "AWS::ElasticLoadBalancingV2::LoadBalancer": "SecurityGroups"
+      },
+      "Ref": {
+        "Parameters": [
+          "Strings",
+          "SecurityGroupIds"
+        ]
+      }
+    },
+    "SecurityGroupNameOrId": {
       "GetAtt": {
         "AWS::EC2::SecurityGroup": "GroupId",
         "AWS::EC2::VPC": "DefaultSecurityGroup"
@@ -22802,7 +22825,7 @@
         ]
       }
     },
-    "SecurityGroupIds": {
+    "SecurityGroupNameOrIds": {
       "GetAtt": {
         "AWS::ElasticLoadBalancingV2::LoadBalancer": "SecurityGroups"
       },
@@ -22819,9 +22842,6 @@
         "Parameters": [
           "Strings",
           "SecurityGroupIds"
-        ],
-        "Resources": [
-          "AWS::EC2::SecurityGroup"
         ]
       }
     },

diff --git a/src/cfnlint/data/CloudSpecs/ap-northeast-1.json b/src/cfnlint/data/CloudSpecs/ap-northeast-1.json
@@ -25798,8 +25798,8 @@
           "Type": "List",
           "UpdateType": "Conditional",
           "Value": {
-            "ListValueType": "SecurityGroupIds",
-            "ValueType": "SecurityGroupId"
+            "ListValueType": "SecurityGroupNameOrIds",
+            "ValueType": "SecurityGroupNameOrId"
           }
         },
         "SecurityGroups": {
@@ -28862,8 +28862,8 @@
           "Type": "List",
           "UpdateType": "Mutable",
           "Value": {
-            "ListValueType": "SecurityGroupIds",
-            "ValueType": "SecurityGroupId"
+            "ListValueType": "SecurityGroupNameOrIds",
+            "ValueType": "SecurityGroupNameOrId"
           }
         },
         "SubnetMappings": {
@@ -38609,6 +38609,29 @@
       "StringMin": ""
     },
     "SecurityGroupId": {
+      "GetAtt": {
+        "AWS::EC2::SecurityGroup": "GroupId",
+        "AWS::EC2::VPC": "DefaultSecurityGroup"
+      },
+      "Ref": {
+        "Parameters": [
+          "String",
+          "SecurityGroupId"
+        ]
+      }
+    },
+    "SecurityGroupIds": {
+      "GetAtt": {
+        "AWS::ElasticLoadBalancingV2::LoadBalancer": "SecurityGroups"
+      },
+      "Ref": {
+        "Parameters": [
+          "Strings",
+          "SecurityGroupIds"
+        ]
+      }
+    },
+    "SecurityGroupNameOrId": {
       "GetAtt": {
         "AWS::EC2::SecurityGroup": "GroupId",
         "AWS::EC2::VPC": "DefaultSecurityGroup"
@@ -38623,7 +38646,7 @@
         ]
       }
     },
-    "SecurityGroupIds": {
+    "SecurityGroupNameOrIds": {
       "GetAtt": {
         "AWS::ElasticLoadBalancingV2::LoadBalancer": "SecurityGroups"
       },
@@ -38640,9 +38663,6 @@
         "Parameters": [
           "Strings",
           "SecurityGroupIds"
-        ],
-        "Resources": [
-          "AWS::EC2::SecurityGroup"
         ]
       }
     },

diff --git a/src/cfnlint/data/CloudSpecs/ap-northeast-2.json b/src/cfnlint/data/CloudSpecs/ap-northeast-2.json
@@ -23015,8 +23015,8 @@
           "Type": "List",
           "UpdateType": "Conditional",
           "Value": {
-            "ListValueType": "SecurityGroupIds",
-            "ValueType": "SecurityGroupId"
+            "ListValueType": "SecurityGroupNameOrIds",
+            "ValueType": "SecurityGroupNameOrId"
           }
         },
         "SecurityGroups": {
@@ -26079,8 +26079,8 @@
           "Type": "List",
           "UpdateType": "Mutable",
           "Value": {
-            "ListValueType": "SecurityGroupIds",
-            "ValueType": "SecurityGroupId"
+            "ListValueType": "SecurityGroupNameOrIds",
+            "ValueType": "SecurityGroupNameOrId"
           }
         },
         "SubnetMappings": {
@@ -34316,6 +34316,29 @@
       "StringMin": ""
     },
     "SecurityGroupId": {
+      "GetAtt": {
+        "AWS::EC2::SecurityGroup": "GroupId",
+        "AWS::EC2::VPC": "DefaultSecurityGroup"
+      },
+      "Ref": {
+        "Parameters": [
+          "String",
+          "SecurityGroupId"
+        ]
+      }
+    },
+    "SecurityGroupIds": {
+      "GetAtt": {
+        "AWS::ElasticLoadBalancingV2::LoadBalancer": "SecurityGroups"
+      },
+      "Ref": {
+        "Parameters": [
+          "Strings",
+          "SecurityGroupIds"
+        ]
+      }
+    },
+    "SecurityGroupNameOrId": {
       "GetAtt": {
         "AWS::EC2::SecurityGroup": "GroupId",
         "AWS::EC2::VPC": "DefaultSecurityGroup"
@@ -34330,7 +34353,7 @@
         ]
       }
     },
-    "SecurityGroupIds": {
+    "SecurityGroupNameOrIds": {
       "GetAtt": {
         "AWS::ElasticLoadBalancingV2::LoadBalancer": "SecurityGroups"
       },
@@ -34347,9 +34370,6 @@
         "Parameters": [
           "Strings",
           "SecurityGroupIds"
-        ],
-        "Resources": [
-          "AWS::EC2::SecurityGroup"
         ]
       }
     },

diff --git a/src/cfnlint/data/CloudSpecs/ap-northeast-3.json b/src/cfnlint/data/CloudSpecs/ap-northeast-3.json
@@ -14198,8 +14198,8 @@
           "Type": "List",
           "UpdateType": "Conditional",
           "Value": {
-            "ListValueType": "SecurityGroupIds",
-            "ValueType": "SecurityGroupId"
+            "ListValueType": "SecurityGroupNameOrIds",
+            "ValueType": "SecurityGroupNameOrId"
           }
         },
         "SecurityGroups": {
@@ -17013,8 +17013,8 @@
           "Type": "List",
           "UpdateType": "Mutable",
           "Value": {
-            "ListValueType": "SecurityGroupIds",
-            "ValueType": "SecurityGroupId"
+            "ListValueType": "SecurityGroupNameOrIds",
+            "ValueType": "SecurityGroupNameOrId"
           }
         },
         "SubnetMappings": {
@@ -23159,6 +23159,29 @@
       "StringMin": ""
     },
     "SecurityGroupId": {
+      "GetAtt": {
+        "AWS::EC2::SecurityGroup": "GroupId",
+        "AWS::EC2::VPC": "DefaultSecurityGroup"
+      },
+      "Ref": {
+        "Parameters": [
+          "String",
+          "SecurityGroupId"
+        ]
+      }
+    },
+    "SecurityGroupIds": {
+      "GetAtt": {
+        "AWS::ElasticLoadBalancingV2::LoadBalancer": "SecurityGroups"
+      },
+      "Ref": {
+        "Parameters": [
+          "Strings",
+          "SecurityGroupIds"
+        ]
+      }
+    },
+    "SecurityGroupNameOrId": {
       "GetAtt": {
         "AWS::EC2::SecurityGroup": "GroupId",
         "AWS::EC2::VPC": "DefaultSecurityGroup"
@@ -23173,7 +23196,7 @@
         ]
       }
     },
-    "SecurityGroupIds": {
+    "SecurityGroupNameOrIds": {
       "GetAtt": {
         "AWS::ElasticLoadBalancingV2::LoadBalancer": "SecurityGroups"
       },
@@ -23190,9 +23213,6 @@
         "Parameters": [
           "Strings",
           "SecurityGroupIds"
-        ],
-        "Resources": [
-          "AWS::EC2::SecurityGroup"
         ]
       }
     },

diff --git a/src/cfnlint/data/CloudSpecs/ap-south-1.json b/src/cfnlint/data/CloudSpecs/ap-south-1.json
@@ -21317,8 +21317,8 @@
           "Type": "List",
           "UpdateType": "Conditional",
           "Value": {
-            "ListValueType": "SecurityGroupIds",
-            "ValueType": "SecurityGroupId"
+            "ListValueType": "SecurityGroupNameOrIds",
+            "ValueType": "SecurityGroupNameOrId"
           }
         },
         "SecurityGroups": {
@@ -24381,8 +24381,8 @@
           "Type": "List",
           "UpdateType": "Mutable",
           "Value": {
-            "ListValueType": "SecurityGroupIds",
-            "ValueType": "SecurityGroupId"
+            "ListValueType": "SecurityGroupNameOrIds",
+            "ValueType": "SecurityGroupNameOrId"
           }
         },
         "SubnetMappings": {
@@ -32610,6 +32610,29 @@
       "StringMin": ""
     },
     "SecurityGroupId": {
+      "GetAtt": {
+        "AWS::EC2::SecurityGroup": "GroupId",
+        "AWS::EC2::VPC": "DefaultSecurityGroup"
+      },
+      "Ref": {
+        "Parameters": [
+          "String",
+          "SecurityGroupId"
+        ]
+      }
+    },
+    "SecurityGroupIds": {
+      "GetAtt": {
+        "AWS::ElasticLoadBalancingV2::LoadBalancer": "SecurityGroups"
+      },
+      "Ref": {
+        "Parameters": [
+          "Strings",
+          "SecurityGroupIds"
+        ]
+      }
+    },
+    "SecurityGroupNameOrId": {
       "GetAtt": {
         "AWS::EC2::SecurityGroup": "GroupId",
         "AWS::EC2::VPC": "DefaultSecurityGroup"
@@ -32624,7 +32647,7 @@
         ]
       }
     },
-    "SecurityGroupIds": {
+    "SecurityGroupNameOrIds": {
       "GetAtt": {
         "AWS::ElasticLoadBalancingV2::LoadBalancer": "SecurityGroups"
       },
@@ -32641,9 +32664,6 @@
         "Parameters": [
           "Strings",
           "SecurityGroupIds"
-        ],
-        "Resources": [
-          "AWS::EC2::SecurityGroup"
         ]
       }
     },