Fix Cidr type in AWS::EC2::IPAMPool (#4101)

Author: kddejong

scripts/update_schemas_format.py

@@ -39,6 +39,7 @@ def _descend(instance: Any, keywords: Sequence[str]) -> Iterator[deque[str]]:
 def _create_cidr_patch(type_name: str, ref: str, resolver: RefResolver, format: str):
     if type_name in [
         "AWS::SecurityHub::Insight",
+        "AWS::EC2::IPAMPool",
     ]:
         return []
 

src/cfnlint/data/schemas/patches/extensions/all/aws_datazone_connection/format.json

@@ -0,0 +1,17 @@
+[
+ {
+  "op": "add",
+  "path": "/definitions/PhysicalConnectionRequirements/properties/SecurityGroupIdList/format",
+  "value": "AWS::EC2::SecurityGroup.Ids"
+ },
+ {
+  "op": "add",
+  "path": "/definitions/PhysicalConnectionRequirements/properties/SecurityGroupIdList/items/format",
+  "value": "AWS::EC2::SecurityGroup.Id"
+ },
+ {
+  "op": "add",
+  "path": "/definitions/PhysicalConnectionRequirements/properties/SubnetId/format",
+  "value": "AWS::EC2::Subnet.Id"
+ }
+]

src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_ipampool/format.json

@@ -0,0 +1,7 @@
+[
+ {
+  "op": "add",
+  "path": "/properties/VpcId/format",
+  "value": "AWS::EC2::VPC.Id"
+ }
+]

src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_routeserverassociation/__init__.py

@@ -0,0 +1,12 @@
+[
+ {
+  "op": "add",
+  "path": "/properties/SubnetId/format",
+  "value": "AWS::EC2::Subnet.Id"
+ },
+ {
+  "op": "add",
+  "path": "/properties/VpcId/format",
+  "value": "AWS::EC2::VPC.Id"
+ }
+]

src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_routeserverassociation/format.json

@@ -0,0 +1,12 @@
+[
+ {
+  "op": "add",
+  "path": "/properties/SubnetId/format",
+  "value": "AWS::EC2::Subnet.Id"
+ },
+ {
+  "op": "add",
+  "path": "/properties/VpcId/format",
+  "value": "AWS::EC2::VPC.Id"
+ }
+]

src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_routeserverendpoint/format.json

@@ -0,0 +1,7 @@
+[
+ {
+  "op": "add",
+  "path": "/definitions/KendraSourceDetail/properties/RoleArn/format",
+  "value": "AWS::IAM::Role.Arn"
+ }
+]

src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_routeserverpeer/format.json

@@ -431,8 +431,10 @@
      "type": "string"
     },
     "SecurityGroupIdList": {
+     "format": "AWS::EC2::SecurityGroup.Ids",
      "insertionOrder": false,
      "items": {
+      "format": "AWS::EC2::SecurityGroup.Id",
       "maxLength": 255,
       "minLength": 1,
       "type": "string"
@@ -442,6 +444,7 @@
      "type": "array"
     },
     "SubnetId": {
+     "format": "AWS::EC2::Subnet.Id",
      "maxLength": 32,
      "pattern": "^subnet-[a-z0-9]+$",
      "type": "string"

src/cfnlint/data/schemas/patches/extensions/all/aws_iotsitewise_dataset/format.json

@@ -12,7 +12,6 @@
  ],
  "definitions": {
   "Cidr": {
-   "format": "ipv4-network",
    "type": "string"
   },
   "ProvisionedCidr": {

src/cfnlint/data/schemas/providers/us_east_1/aws-datazone-connection.json

@@ -14,6 +14,7 @@
    "type": "string"
   },
   "VpcId": {
+   "format": "AWS::EC2::VPC.Id",
    "type": "string"
   }
  },

src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-ipampool.json

@@ -46,6 +46,7 @@
    "type": "string"
   },
   "SubnetId": {
+   "format": "AWS::EC2::Subnet.Id",
    "type": "string"
   },
   "Tags": {
@@ -57,6 +58,7 @@
    "uniqueItems": false
   },
   "VpcId": {
+   "format": "AWS::EC2::VPC.Id",
    "type": "string"
   }
  },

src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-routeserverassociation.json

@@ -75,6 +75,7 @@
    "type": "string"
   },
   "SubnetId": {
+   "format": "AWS::EC2::Subnet.Id",
    "type": "string"
   },
   "Tags": {
@@ -86,6 +87,7 @@
    "uniqueItems": false
   },
   "VpcId": {
+   "format": "AWS::EC2::VPC.Id",
    "type": "string"
   }
  },

src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-routeserverendpoint.json

@@ -36,6 +36,7 @@
      "type": "string"
     },
     "RoleArn": {
+     "format": "AWS::IAM::Role.Arn",
      "maxLength": 1600,
      "minLength": 1,
      "pattern": "^arn:aws(-cn|-us-gov)?:[a-zA-Z0-9-:\\/_\\.]+$",