Remove format patching for Cloud9 ImageId (#4255)

kddejong · web-flow · commit eb3b04c1c0fd · 2025-10-09T09:52:51.000-07:00
diff --git a/.github/workflows/ci-pr.yaml b/.github/workflows/ci-pr.yaml
@@ -77,3 +77,4 @@ jobs:
             GHSA-r9hx-vwmv-q579
             PYSEC-2022-43012
             PYSEC-2024-60
+            GHSA-4xh5-x5gv-qwph
diff --git a/scripts/update_schemas_format.py b/scripts/update_schemas_format.py
@@ -382,6 +382,10 @@ def main():
                     )
 
             for path in _descend(obj, ["ImageId", "AmiId"]):
+                if resource_type == "AWS::Cloud9::EnvironmentEC2" and path == deque(
+                    ["properties", "ImageId"]
+                ):
+                    continue
                 if path[-2] == "properties":
                     resource_patches.append(
                         _create_patch(
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_bedrockagentcore_runtime/__init__.py b/src/cfnlint/data/schemas/patches/extensions/all/aws_bedrockagentcore_runtime/__init__.py
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_bedrockagentcore_runtime/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_bedrockagentcore_runtime/format.json
@@ -0,0 +1,7 @@
+[
+ {
+  "op": "add",
+  "path": "/definitions/RoleArn/format",
+  "value": "AWS::IAM::Role.Arn"
+ }
+]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_cloud9_environmentec2/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_cloud9_environmentec2/format.json
@@ -1,9 +1,4 @@
 [
- {
-  "op": "add",
-  "path": "/properties/ImageId/format",
-  "value": "AWS::EC2::Image.Id"
- },
  {
   "op": "add",
   "path": "/properties/SubnetId/format",
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_odb_odbnetwork/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_odb_odbnetwork/format.json
@@ -0,0 +1,7 @@
+[
+ {
+  "op": "add",
+  "path": "/definitions/ManagedServices/properties/ZeroEtlAccess/properties/Cidr/format",
+  "value": "ipv4-network"
+ }
+]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_smsvoice_configurationset/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_smsvoice_configurationset/format.json
@@ -0,0 +1,12 @@
+[
+ {
+  "op": "add",
+  "path": "/definitions/CloudWatchLogsDestination/properties/IamRoleArn/format",
+  "value": "AWS::IAM::Role.Arn"
+ },
+ {
+  "op": "add",
+  "path": "/definitions/KinesisFirehoseDestination/properties/IamRoleArn/format",
+  "value": "AWS::IAM::Role.Arn"
+ }
+]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_workspacesinstances_workspaceinstance/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_workspacesinstances_workspaceinstance/format.json
@@ -8,5 +8,10 @@
   "op": "add",
   "path": "/properties/ManagedInstance/properties/ImageId/format",
   "value": "AWS::EC2::Image.Id"
+ },
+ {
+  "op": "add",
+  "path": "/properties/ManagedInstance/properties/SubnetId/format",
+  "value": "AWS::EC2::Subnet.Id"
  }
 ]
diff --git a/src/cfnlint/data/schemas/providers/cn_north_1/aws-cloud9-environmentec2.json b/src/cfnlint/data/schemas/providers/cn_north_1/aws-cloud9-environmentec2.json
@@ -63,7 +63,6 @@
    "type": "string"
   },
   "ImageId": {
-   "format": "AWS::EC2::Image.Id",
    "type": "string"
   },
   "InstanceType": {
diff --git a/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-cloud9-environmentec2.json b/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-cloud9-environmentec2.json
@@ -63,7 +63,6 @@
    "type": "string"
   },
   "ImageId": {
-   "format": "AWS::EC2::Image.Id",
    "type": "string"
   },
   "InstanceType": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-bedrockagentcore-runtime.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-bedrockagentcore-runtime.json
@@ -176,6 +176,7 @@
    "type": "string"
   },
   "RoleArn": {
+   "format": "AWS::IAM::Role.Arn",
    "pattern": "arn:aws(-[^:]+)?:iam::([0-9]{12})?:role/.+",
    "type": "string"
   },
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-cloud9-environmentec2.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-cloud9-environmentec2.json
@@ -63,7 +63,6 @@
    "type": "string"
   },
   "ImageId": {
-   "format": "AWS::EC2::Image.Id",
    "type": "string"
   },
   "InstanceType": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-odb-odbnetwork.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-odb-odbnetwork.json
@@ -94,6 +94,7 @@
      "additionalProperties": false,
      "properties": {
       "Cidr": {
+       "format": "ipv4-network",
        "type": "string"
       },
       "Status": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-smsvoice-configurationset.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-smsvoice-configurationset.json
@@ -8,6 +8,7 @@
    "additionalProperties": false,
    "properties": {
     "IamRoleArn": {
+     "format": "AWS::IAM::Role.Arn",
      "pattern": "^arn:\\S+$",
      "type": "string"
     },
@@ -84,6 +85,7 @@
      "type": "string"
     },
     "IamRoleArn": {
+     "format": "AWS::IAM::Role.Arn",
      "pattern": "^arn:\\S+$",
      "type": "string"
     }
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-workspacesinstances-workspaceinstance.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-workspacesinstances-workspaceinstance.json
@@ -590,6 +590,7 @@
      "$ref": "#/definitions/PrivateDnsNameOptionsRequest"
     },
     "SubnetId": {
+     "format": "AWS::EC2::Subnet.Id",
      "pattern": "^subnet-[0-9a-zA-Z]{1,63}$",
      "type": "string"
     },

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,4 @@`
`1`	`1`	`[`
`2`		`- {`
`3`		`- "op": "add",`
`4`		`- "path": "/properties/ImageId/format",`
`5`		`- "value": "AWS::EC2::Image.Id"`
`6`		`- },`
`7`	`2`	`{`
`8`	`3`	`"op": "add",`
`9`	`4`	`"path": "/properties/SubnetId/format",`
Original file line number	Diff line number	Diff line change
`@@ -8,5 +8,10 @@`
`8`	`8`	`"op": "add",`
`9`	`9`	`"path": "/properties/ManagedInstance/properties/ImageId/format",`
`10`	`10`	`"value": "AWS::EC2::Image.Id"`
	`11`	`+ },`
	`12`	`+ {`
	`13`	`+ "op": "add",`
	`14`	`+ "path": "/properties/ManagedInstance/properties/SubnetId/format",`
	`15`	`+ "value": "AWS::EC2::Subnet.Id"`
`11`	`16`	`}`
`12`	`17`	`]`