Cleanup patching of format keyword

aws-cloudformation · Jan 23, 2025 · 8e4f1ed · 8e4f1ed
1 parent 5b8b7b7
commit 8e4f1ed
Show file tree

Hide file tree

Showing 246 changed files with 299 additions and 295 deletions.
diff --git a/docs/format_keyword.md b/docs/format_keyword.md
@@ -12,11 +12,15 @@ In `cfn-lint`, we have extended the `format` keyword to support custom formats t
 
 This format ensures that the value is a valid VPC ID, which is a string of the pattern `vpc-[0-9a-f]{8}` or `vpc-[0-9a-f]{17}`.
 
-### AWS::EC2::SecurityGroup.GroupId
+### AWS::EC2::SecurityGroup.Id
 
 This format validates that the value is a valid Security Group ID, which is a string of the pattern `sg-[0-9a-f]{8}` or `sg-[0-9a-f]{17}`.
 
-### AWS::EC2::SecurityGroup.GroupName
+### AWS::EC2::SecurityGroup.Ids
+
+This format validates that the value is a valid list of Security Group IDs, which is a string of the pattern `sg-[0-9a-f]{8}` or `sg-[0-9a-f]{17}`.
+
+### AWS::EC2::SecurityGroup.Name
 
 This format validates that the value is a valid Security Group Name, which must be a string of 1 to 255 characters, starting with a letter, and containing only letters, numbers, and certain special characters.
 

diff --git a/scripts/update_schemas_format.py b/scripts/update_schemas_format.py
@@ -89,7 +89,7 @@ def _create_security_group_ids_patch(type_name: str, ref: str, resolver: RefReso
             path=ref[1:],
         ),
         _create_patch(
-            {"format": "AWS::EC2::SecurityGroup.GroupId"},
+            {"format": "AWS::EC2::SecurityGroup.Id"},
             items_path,
             resolver=resolver,
         ),
@@ -110,7 +110,7 @@ def _create_security_group_id(type_name: str, ref: str, resolver: RefResolver):
 
     return [
         _create_patch(
-            {"format": "AWS::EC2::SecurityGroup.GroupId"},
+            {"format": "AWS::EC2::SecurityGroup.Id"},
             ref,
             resolver=resolver,
         )
@@ -129,7 +129,7 @@ def _create_security_group_name(type_name: str, ref: str, resolver: RefResolver)
 
     return [
         _create_patch(
-            {"format": "AWS::EC2::SecurityGroup.GroupName"},
+            {"format": "AWS::EC2::SecurityGroup.Name"},
             ref,
             resolver=resolver,
         )
@@ -150,27 +150,27 @@ def _create_patch(value: dict[str, str], ref: Sequence[str], resolver: RefResolv
 _manual_patches = {
     "AWS::EC2::SecurityGroup": [
         Patch(
-            values={"format": "AWS::EC2::SecurityGroup.GroupId"},
+            values={"format": "AWS::EC2::SecurityGroup.Id"},
             path="/properties/GroupId",
         ),
         Patch(
-            values={"format": "AWS::EC2::SecurityGroup.GroupName"},
+            values={"format": "AWS::EC2::SecurityGroup.Name"},
             path="/properties/GroupName",
         ),
         Patch(
-            values={"format": "AWS::EC2::SecurityGroup.GroupId"},
+            values={"format": "AWS::EC2::SecurityGroup.Id"},
             path="/properties/Id",
         ),
     ],
     "AWS::EC2::SecurityGroupIngress": [
         Patch(
-            values={"format": "AWS::EC2::SecurityGroup.GroupId"},
+            values={"format": "AWS::EC2::SecurityGroup.Id"},
             path="/properties/GroupId",
         ),
     ],
     "AWS::EC2::SecurityGroupEgress": [
         Patch(
-            values={"format": "AWS::EC2::SecurityGroup.GroupId"},
+            values={"format": "AWS::EC2::SecurityGroup.Id"},
             path="/properties/GroupId",
         ),
     ],

diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_amazonmq_broker/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_amazonmq_broker/format.json
@@ -7,6 +7,6 @@
  {
   "op": "add",
   "path": "/properties/SecurityGroups/items/format",
-  "value": "AWS::EC2::SecurityGroup.GroupId"
+  "value": "AWS::EC2::SecurityGroup.Id"
  }
 ]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_apigatewayv2_vpclink/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_apigatewayv2_vpclink/format.json
@@ -7,6 +7,6 @@
  {
   "op": "add",
   "path": "/properties/SecurityGroupIds/items/format",
-  "value": "AWS::EC2::SecurityGroup.GroupId"
+  "value": "AWS::EC2::SecurityGroup.Id"
  }
 ]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_apprunner_vpcconnector/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_apprunner_vpcconnector/format.json
@@ -17,6 +17,6 @@
  {
   "op": "add",
   "path": "/properties/SecurityGroups/items/format",
-  "value": "AWS::EC2::SecurityGroup.GroupId"
+  "value": "AWS::EC2::SecurityGroup.Id"
  }
 ]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_appstream_appblockbuilder/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_appstream_appblockbuilder/format.json
@@ -7,6 +7,6 @@
  {
   "op": "add",
   "path": "/definitions/VpcConfig/properties/SecurityGroupIds/items/format",
-  "value": "AWS::EC2::SecurityGroup.GroupId"
+  "value": "AWS::EC2::SecurityGroup.Id"
  }
 ]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_appstream_fleet/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_appstream_fleet/format.json
@@ -7,6 +7,6 @@
  {
   "op": "add",
   "path": "/definitions/VpcConfig/properties/SecurityGroupIds/items/format",
-  "value": "AWS::EC2::SecurityGroup.GroupId"
+  "value": "AWS::EC2::SecurityGroup.Id"
  }
 ]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_appstream_imagebuilder/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_appstream_imagebuilder/format.json
@@ -7,6 +7,6 @@
  {
   "op": "add",
   "path": "/definitions/VpcConfig/properties/SecurityGroupIds/items/format",
-  "value": "AWS::EC2::SecurityGroup.GroupId"
+  "value": "AWS::EC2::SecurityGroup.Id"
  }
 ]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_aps_scraper/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_aps_scraper/format.json
@@ -7,6 +7,6 @@
  {
   "op": "add",
   "path": "/definitions/SecurityGroupId/format",
-  "value": "AWS::EC2::SecurityGroup.GroupId"
+  "value": "AWS::EC2::SecurityGroup.Id"
  }
 ]
diff --git a/...nlint/data/schemas/patches/extensions/all/aws_autoscaling_launchconfiguration/format.json b/...nlint/data/schemas/patches/extensions/all/aws_autoscaling_launchconfiguration/format.json
@@ -12,6 +12,6 @@
  {
   "op": "add",
   "path": "/properties/SecurityGroups/items/format",
-  "value": "AWS::EC2::SecurityGroup.GroupId"
+  "value": "AWS::EC2::SecurityGroup.Id"
  }
 ]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_batch_computeenvironment/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_batch_computeenvironment/format.json
@@ -22,6 +22,6 @@
  {
   "op": "add",
   "path": "/definitions/ComputeResources/properties/SecurityGroupIds/items/format",
-  "value": "AWS::EC2::SecurityGroup.GroupId"
+  "value": "AWS::EC2::SecurityGroup.Id"
  }
 ]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_codebuild_fleet/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_codebuild_fleet/format.json
@@ -27,6 +27,6 @@
  {
   "op": "add",
   "path": "/definitions/VpcConfig/properties/SecurityGroupIds/items/format",
-  "value": "AWS::EC2::SecurityGroup.GroupId"
+  "value": "AWS::EC2::SecurityGroup.Id"
  }
 ]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_codebuild_project/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_codebuild_project/format.json
@@ -22,6 +22,6 @@
  {
   "op": "add",
   "path": "/definitions/VpcConfig/properties/SecurityGroupIds/items/format",
-  "value": "AWS::EC2::SecurityGroup.GroupId"
+  "value": "AWS::EC2::SecurityGroup.Id"
  }
 ]
diff --git a/...cfnlint/data/schemas/patches/extensions/all/aws_comprehend_documentclassifier/format.json b/...cfnlint/data/schemas/patches/extensions/all/aws_comprehend_documentclassifier/format.json
@@ -17,6 +17,6 @@
  {
   "op": "add",
   "path": "/definitions/VpcConfig/properties/SecurityGroupIds/items/format",
-  "value": "AWS::EC2::SecurityGroup.GroupId"
+  "value": "AWS::EC2::SecurityGroup.Id"
  }
 ]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_comprehend_flywheel/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_comprehend_flywheel/format.json
@@ -17,6 +17,6 @@
  {
   "op": "add",
   "path": "/definitions/VpcConfig/properties/SecurityGroupIds/items/format",
-  "value": "AWS::EC2::SecurityGroup.GroupId"
+  "value": "AWS::EC2::SecurityGroup.Id"
  }
 ]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_dax_cluster/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_dax_cluster/format.json
@@ -7,6 +7,6 @@
  {
   "op": "add",
   "path": "/properties/SecurityGroupIds/items/format",
-  "value": "AWS::EC2::SecurityGroup.GroupId"
+  "value": "AWS::EC2::SecurityGroup.Id"
  }
 ]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_deadline_licenseendpoint/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_deadline_licenseendpoint/format.json
@@ -12,6 +12,6 @@
  {
   "op": "add",
   "path": "/properties/SecurityGroupIds/items/format",
-  "value": "AWS::EC2::SecurityGroup.GroupId"
+  "value": "AWS::EC2::SecurityGroup.Id"
  }
 ]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_clientvpnendpoint/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_clientvpnendpoint/format.json
@@ -12,6 +12,6 @@
  {
   "op": "add",
   "path": "/properties/SecurityGroupIds/items/format",
-  "value": "AWS::EC2::SecurityGroup.GroupId"
+  "value": "AWS::EC2::SecurityGroup.Id"
  }
 ]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_instance/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_instance/format.json
@@ -27,7 +27,7 @@
  {
   "op": "add",
   "path": "/properties/SecurityGroupIds/items/format",
-  "value": "AWS::EC2::SecurityGroup.GroupId"
+  "value": "AWS::EC2::SecurityGroup.Id"
  },
  {
   "op": "add",
@@ -37,6 +37,6 @@
  {
   "op": "add",
   "path": "/properties/SecurityGroups/items/format",
-  "value": "AWS::EC2::SecurityGroup.GroupId"
+  "value": "AWS::EC2::SecurityGroup.Id"
  }
 ]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_instanceconnectendpoint/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_instanceconnectendpoint/format.json
@@ -12,6 +12,6 @@
  {
   "op": "add",
   "path": "/definitions/SecurityGroupId/format",
-  "value": "AWS::EC2::SecurityGroup.GroupId"
+  "value": "AWS::EC2::SecurityGroup.Id"
  }
 ]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_launchtemplate/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_launchtemplate/format.json
@@ -17,7 +17,7 @@
  {
   "op": "add",
   "path": "/definitions/LaunchTemplateData/properties/SecurityGroupIds/items/format",
-  "value": "AWS::EC2::SecurityGroup.GroupId"
+  "value": "AWS::EC2::SecurityGroup.Id"
  },
  {
   "op": "add",
@@ -27,6 +27,6 @@
  {
   "op": "add",
   "path": "/definitions/LaunchTemplateData/properties/SecurityGroups/items/format",
-  "value": "AWS::EC2::SecurityGroup.GroupId"
+  "value": "AWS::EC2::SecurityGroup.Id"
  }
 ]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_securitygroup/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_securitygroup/format.json
@@ -2,17 +2,17 @@
  {
   "op": "add",
   "path": "/properties/GroupId/format",
-  "value": "AWS::EC2::SecurityGroup.GroupId"
+  "value": "AWS::EC2::SecurityGroup.Id"
  },
  {
   "op": "add",
   "path": "/properties/GroupName/format",
-  "value": "AWS::EC2::SecurityGroup.GroupName"
+  "value": "AWS::EC2::SecurityGroup.Name"
  },
  {
   "op": "add",
   "path": "/properties/Id/format",
-  "value": "AWS::EC2::SecurityGroup.GroupId"
+  "value": "AWS::EC2::SecurityGroup.Id"
  },
  {
   "op": "add",
@@ -22,16 +22,16 @@
  {
   "op": "add",
   "path": "/definitions/Egress/properties/DestinationSecurityGroupId/format",
-  "value": "AWS::EC2::SecurityGroup.GroupId"
+  "value": "AWS::EC2::SecurityGroup.Id"
  },
  {
   "op": "add",
   "path": "/definitions/Ingress/properties/SourceSecurityGroupId/format",
-  "value": "AWS::EC2::SecurityGroup.GroupId"
+  "value": "AWS::EC2::SecurityGroup.Id"
  },
  {
   "op": "add",
   "path": "/definitions/Ingress/properties/SourceSecurityGroupName/format",
-  "value": "AWS::EC2::SecurityGroup.GroupName"
+  "value": "AWS::EC2::SecurityGroup.Name"
  }
 ]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_securitygroupegress/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_securitygroupegress/format.json
@@ -2,11 +2,11 @@
  {
   "op": "add",
   "path": "/properties/GroupId/format",
-  "value": "AWS::EC2::SecurityGroup.GroupId"
+  "value": "AWS::EC2::SecurityGroup.Id"
  },
  {
   "op": "add",
   "path": "/properties/DestinationSecurityGroupId/format",
-  "value": "AWS::EC2::SecurityGroup.GroupId"
+  "value": "AWS::EC2::SecurityGroup.Id"
  }
 ]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_securitygroupingress/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_securitygroupingress/format.json
@@ -2,16 +2,16 @@
  {
   "op": "add",
   "path": "/properties/GroupId/format",
-  "value": "AWS::EC2::SecurityGroup.GroupId"
+  "value": "AWS::EC2::SecurityGroup.Id"
  },
  {
   "op": "add",
   "path": "/properties/SourceSecurityGroupId/format",
-  "value": "AWS::EC2::SecurityGroup.GroupId"
+  "value": "AWS::EC2::SecurityGroup.Id"
  },
  {
   "op": "add",
   "path": "/properties/SourceSecurityGroupName/format",
-  "value": "AWS::EC2::SecurityGroup.GroupName"
+  "value": "AWS::EC2::SecurityGroup.Name"
  }
 ]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_spotfleet/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_spotfleet/format.json
@@ -27,6 +27,6 @@
  {
   "op": "add",
   "path": "/definitions/GroupIdentifier/format",
-  "value": "AWS::EC2::SecurityGroup.GroupId"
+  "value": "AWS::EC2::SecurityGroup.Id"
  }
 ]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_verifiedaccessendpoint/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_verifiedaccessendpoint/format.json
@@ -7,6 +7,6 @@
  {
   "op": "add",
   "path": "/definitions/SecurityGroupId/format",
-  "value": "AWS::EC2::SecurityGroup.GroupId"
+  "value": "AWS::EC2::SecurityGroup.Id"
  }
 ]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_vpc/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_vpc/format.json
@@ -7,6 +7,6 @@
  {
   "op": "add",
   "path": "/properties/DefaultSecurityGroup/format",
-  "value": "AWS::EC2::SecurityGroup.GroupId"
+  "value": "AWS::EC2::SecurityGroup.Id"
  }
 ]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_vpcendpoint/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_vpcendpoint/format.json
@@ -12,6 +12,6 @@
  {
   "op": "add",
   "path": "/properties/SecurityGroupIds/items/format",
-  "value": "AWS::EC2::SecurityGroup.GroupId"
+  "value": "AWS::EC2::SecurityGroup.Id"
  }
 ]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_ecs_service/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_ecs_service/format.json
@@ -17,6 +17,6 @@
  {
   "op": "add",
   "path": "/definitions/AwsVpcConfiguration/properties/SecurityGroups/items/format",
-  "value": "AWS::EC2::SecurityGroup.GroupId"
+  "value": "AWS::EC2::SecurityGroup.Id"
  }
 ]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_ecs_taskset/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_ecs_taskset/format.json
@@ -17,6 +17,6 @@
  {
   "op": "add",
   "path": "/definitions/AwsVpcConfiguration/properties/SecurityGroups/items/format",
-  "value": "AWS::EC2::SecurityGroup.GroupId"
+  "value": "AWS::EC2::SecurityGroup.Id"
  }
 ]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_efs_mounttarget/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_efs_mounttarget/format.json
@@ -12,6 +12,6 @@
  {
   "op": "add",
   "path": "/properties/SecurityGroups/items/format",
-  "value": "AWS::EC2::SecurityGroup.GroupId"
+  "value": "AWS::EC2::SecurityGroup.Id"
  }
 ]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_eks_cluster/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_eks_cluster/format.json
@@ -7,6 +7,6 @@
  {
   "op": "add",
   "path": "/definitions/ResourcesVpcConfig/properties/SecurityGroupIds/items/format",
-  "value": "AWS::EC2::SecurityGroup.GroupId"
+  "value": "AWS::EC2::SecurityGroup.Id"
  }
 ]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_elasticache_replicationgroup/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_elasticache_replicationgroup/format.json
@@ -7,6 +7,6 @@
  {
   "op": "add",
   "path": "/properties/SecurityGroupIds/items/format",
-  "value": "AWS::EC2::SecurityGroup.GroupId"
+  "value": "AWS::EC2::SecurityGroup.Id"
  }
 ]