Fix spec issues

aws-cloudformation · Dec 22, 2023 · 9a96c17 · 9a96c17
1 parent 6284787
commit 9a96c17
Show file tree

Hide file tree

Showing 35 changed files with 498 additions and 2,758 deletions.
diff --git a/...nloadsMetadata/227d6e59c86482f7153466759080e65963a1bf4413531ad420ff60a5a0d7965d.meta.json b/...nloadsMetadata/227d6e59c86482f7153466759080e65963a1bf4413531ad420ff60a5a0d7965d.meta.json
@@ -1 +1 @@
-{"etag": "\"e66593754e392c10b5ca50bbf9c25aa2\"", "url": "https://schema.cloudformation.me-south-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"b5c89f186c5e4f99cfd241bf0411e4a7\"", "url": "https://schema.cloudformation.me-south-1.amazonaws.com/CloudformationSchema.zip"}
diff --git a/...nloadsMetadata/b8db30bc086b29ccb23b831e7ab56df87f0051cca9ba1d43a87259b5f150a65e.meta.json b/...nloadsMetadata/b8db30bc086b29ccb23b831e7ab56df87f0051cca9ba1d43a87259b5f150a65e.meta.json
@@ -1 +1 @@
-{"etag": "\"d3f2c3231c0813003203d8bed742245c\"", "url": "https://cfn-resource-specifications-ca-west-1-prod.s3.ca-west-1.amazonaws.com/latest/CloudFormationResourceSpecification.json"}
+{"etag": "\"d3f2c3231c0813003203d8bed742245c\"", "url": "https://cfn-resource-specifications-ca-west-1-prod.s3.ca-west-1.amazonaws.com/latest/CloudFormationResourceSpecification.json"}
diff --git a/...nloadsMetadata/f1896c9151984eec294af1eddf64260f6cd7e4ced378cacdb93f76ed227b5c5d.meta.json b/...nloadsMetadata/f1896c9151984eec294af1eddf64260f6cd7e4ced378cacdb93f76ed227b5c5d.meta.json
@@ -1 +1 @@
-{"etag": "\"c5675327d2991cb4dd80a7e20c1065ff\"", "url": "https://schema.cloudformation.us-west-2.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"77cc727b4ce058de3f06ccf616457e59\"", "url": "https://schema.cloudformation.us-west-2.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_rds_dbcluster/readonlyproperties2.json b/src/cfnlint/data/schemas/patches/providers/all/aws_rds_dbcluster/readonlyproperties2.json
@@ -0,0 +1,22 @@
+[
+ {
+  "op": "test",
+  "path": "/readOnlyProperties",
+  "value": [
+   "/properties/Id",
+   "/properties/ReadEndpoint.Address",
+   "/properties/Endpoint.Port",
+   "/properties/Endpoint.Address"
+  ]
+ },
+ {
+  "op": "replace",
+  "path": "/readOnlyProperties",
+  "value": [
+   "/properties/Id",
+   "/properties/ReadEndpointAddress",
+   "/properties/EndpointPort",
+   "/properties/EndpointAddress"
+  ]
+ }
+]
diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_rds_dbinstance/__init__.py b/src/cfnlint/data/schemas/patches/providers/all/aws_rds_dbinstance/__init__.py
diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_rds_dbinstance/readonlyproperties.json b/src/cfnlint/data/schemas/patches/providers/all/aws_rds_dbinstance/readonlyproperties.json
@@ -0,0 +1,20 @@
+[
+ {
+  "op": "test",
+  "path": "/readOnlyProperties",
+  "value": [
+   "/properties/Id",
+   "/properties/Endpoint.Port",
+   "/properties/Endpoint.Address"
+  ]
+ },
+ {
+  "op": "replace",
+  "path": "/readOnlyProperties",
+  "value": [
+   "/properties/Id",
+   "/properties/EndpointPort",
+   "/properties/EndpointAddress"
+  ]
+ }
+]
diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_redshift_cluster/endpoint.json b/src/cfnlint/data/schemas/patches/providers/all/aws_redshift_cluster/endpoint.json
diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_redshift_cluster/readonlyproperties.json b/src/cfnlint/data/schemas/patches/providers/all/aws_redshift_cluster/readonlyproperties.json
@@ -0,0 +1,20 @@
+[
+ {
+  "op": "test",
+  "path": "/readOnlyProperties",
+  "value": [
+   "/properties/Id",
+   "/properties/Endpoint.Port",
+   "/properties/Endpoint.Address"
+  ]
+ },
+ {
+  "op": "replace",
+  "path": "/readOnlyProperties",
+  "value": [
+   "/properties/Id",
+   "/properties/EndpointPort",
+   "/properties/EndpointAddress"
+  ]
+ }
+]
diff --git a/src/cfnlint/data/schemas/providers/ap_south_2/aws-redshift-cluster.json b/src/cfnlint/data/schemas/providers/ap_south_2/aws-redshift-cluster.json
@@ -92,17 +92,6 @@
   "Encrypted": {
    "type": "boolean"
   },
-  "Endpoint": {
-   "properties": {
-    "Address": {
-     "type": "string"
-    },
-    "Port": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
   "EndpointAddress": {
    "type": "string"
   },
@@ -181,8 +170,8 @@
  },
  "readOnlyProperties": [
   "/properties/Id",
-  "/properties/Endpoint/Port",
-  "/properties/Endpoint/Address"
+  "/properties/EndpointPort",
+  "/properties/EndpointAddress"
  ],
  "required": [
   "MasterUserPassword",

diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-redshift-cluster.json b/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-redshift-cluster.json
@@ -92,17 +92,6 @@
   "Encrypted": {
    "type": "boolean"
   },
-  "Endpoint": {
-   "properties": {
-    "Address": {
-     "type": "string"
-    },
-    "Port": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
   "EndpointAddress": {
    "type": "string"
   },
@@ -181,8 +170,8 @@
  },
  "readOnlyProperties": [
   "/properties/Id",
-  "/properties/Endpoint/Port",
-  "/properties/Endpoint/Address"
+  "/properties/EndpointPort",
+  "/properties/EndpointAddress"
  ],
  "required": [
   "MasterUserPassword",

diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-redshift-cluster.json b/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-redshift-cluster.json
@@ -92,17 +92,6 @@
   "Encrypted": {
    "type": "boolean"
   },
-  "Endpoint": {
-   "properties": {
-    "Address": {
-     "type": "string"
-    },
-    "Port": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
   "EndpointAddress": {
    "type": "string"
   },
@@ -181,8 +170,8 @@
  },
  "readOnlyProperties": [
   "/properties/Id",
-  "/properties/Endpoint/Port",
-  "/properties/Endpoint/Address"
+  "/properties/EndpointPort",
+  "/properties/EndpointAddress"
  ],
  "required": [
   "MasterUserPassword",

diff --git a/src/cfnlint/data/schemas/providers/ca_west_1/aws-rds-dbcluster.json b/src/cfnlint/data/schemas/providers/ca_west_1/aws-rds-dbcluster.json
@@ -227,9 +227,9 @@
  },
  "readOnlyProperties": [
   "/properties/Id",
-  "/properties/ReadEndpoint.Address",
-  "/properties/Endpoint.Port",
-  "/properties/Endpoint.Address"
+  "/properties/ReadEndpointAddress",
+  "/properties/EndpointPort",
+  "/properties/EndpointAddress"
  ],
  "required": [
   "Engine"

diff --git a/src/cfnlint/data/schemas/providers/ca_west_1/aws-rds-dbinstance.json b/src/cfnlint/data/schemas/providers/ca_west_1/aws-rds-dbinstance.json
@@ -306,8 +306,8 @@
  },
  "readOnlyProperties": [
   "/properties/Id",
-  "/properties/Endpoint.Port",
-  "/properties/Endpoint.Address"
+  "/properties/EndpointPort",
+  "/properties/EndpointAddress"
  ],
  "required": [
   "DBInstanceClass"

diff --git a/src/cfnlint/data/schemas/providers/ca_west_1/aws-redshift-cluster.json b/src/cfnlint/data/schemas/providers/ca_west_1/aws-redshift-cluster.json
@@ -92,17 +92,6 @@
   "Encrypted": {
    "type": "boolean"
   },
-  "Endpoint": {
-   "properties": {
-    "Address": {
-     "type": "string"
-    },
-    "Port": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
   "EndpointAddress": {
    "type": "string"
   },
@@ -181,8 +170,8 @@
  },
  "readOnlyProperties": [
   "/properties/Id",
-  "/properties/Endpoint/Port",
-  "/properties/Endpoint/Address"
+  "/properties/EndpointPort",
+  "/properties/EndpointAddress"
  ],
  "required": [
   "MasterUserPassword",

diff --git a/src/cfnlint/data/schemas/providers/cn_north_1/aws-redshift-cluster.json b/src/cfnlint/data/schemas/providers/cn_north_1/aws-redshift-cluster.json
@@ -92,17 +92,6 @@
   "Encrypted": {
    "type": "boolean"
   },
-  "Endpoint": {
-   "properties": {
-    "Address": {
-     "type": "string"
-    },
-    "Port": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
   "EndpointAddress": {
    "type": "string"
   },
@@ -181,8 +170,8 @@
  },
  "readOnlyProperties": [
   "/properties/Id",
-  "/properties/Endpoint/Port",
-  "/properties/Endpoint/Address"
+  "/properties/EndpointPort",
+  "/properties/EndpointAddress"
  ],
  "required": [
   "MasterUserPassword",

diff --git a/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-redshift-cluster.json b/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-redshift-cluster.json
@@ -92,17 +92,6 @@
   "Encrypted": {
    "type": "boolean"
   },
-  "Endpoint": {
-   "properties": {
-    "Address": {
-     "type": "string"
-    },
-    "Port": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
   "EndpointAddress": {
    "type": "string"
   },
@@ -181,8 +170,8 @@
  },
  "readOnlyProperties": [
   "/properties/Id",
-  "/properties/Endpoint/Port",
-  "/properties/Endpoint/Address"
+  "/properties/EndpointPort",
+  "/properties/EndpointAddress"
  ],
  "required": [
   "MasterUserPassword",

diff --git a/src/cfnlint/data/schemas/providers/eu_central_1/aws-redshift-cluster.json b/src/cfnlint/data/schemas/providers/eu_central_1/aws-redshift-cluster.json
@@ -258,15 +258,7 @@
    "type": "boolean"
   },
   "Endpoint": {
-   "properties": {
-    "Address": {
-     "type": "string"
-    },
-    "Port": {
-     "type": "string"
-    }
-   },
-   "type": "object"
+   "$ref": "#/definitions/Endpoint"
   },
   "EnhancedVpcRouting": {
    "description": "An option that specifies whether to create the cluster with enhanced VPC routing enabled. To create a cluster that uses enhanced VPC routing, the cluster must be in a VPC. For more information, see Enhanced VPC Routing in the Amazon Redshift Cluster Management Guide.\n\nIf this option is true , enhanced VPC routing is enabled.\n\nDefault: false",
@@ -413,9 +405,11 @@
   }
  },
  "readOnlyProperties": [
-  "/properties/Id",
+  "/properties/DeferMaintenanceIdentifier",
   "/properties/Endpoint/Port",
-  "/properties/Endpoint/Address"
+  "/properties/Endpoint/Address",
+  "/properties/ClusterNamespaceArn",
+  "/properties/MasterPasswordSecretArn"
  ],
  "required": [
   "NodeType",

diff --git a/src/cfnlint/data/schemas/providers/eu_central_2/aws-redshift-cluster.json b/src/cfnlint/data/schemas/providers/eu_central_2/aws-redshift-cluster.json
@@ -92,17 +92,6 @@
   "Encrypted": {
    "type": "boolean"
   },
-  "Endpoint": {
-   "properties": {
-    "Address": {
-     "type": "string"
-    },
-    "Port": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
   "EndpointAddress": {
    "type": "string"
   },
@@ -181,8 +170,8 @@
  },
  "readOnlyProperties": [
   "/properties/Id",
-  "/properties/Endpoint/Port",
-  "/properties/Endpoint/Address"
+  "/properties/EndpointPort",
+  "/properties/EndpointAddress"
  ],
  "required": [
   "MasterUserPassword",

diff --git a/src/cfnlint/data/schemas/providers/eu_south_2/aws-redshift-cluster.json b/src/cfnlint/data/schemas/providers/eu_south_2/aws-redshift-cluster.json
@@ -92,17 +92,6 @@
   "Encrypted": {
    "type": "boolean"
   },
-  "Endpoint": {
-   "properties": {
-    "Address": {
-     "type": "string"
-    },
-    "Port": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
   "EndpointAddress": {
    "type": "string"
   },
@@ -181,8 +170,8 @@
  },
  "readOnlyProperties": [
   "/properties/Id",
-  "/properties/Endpoint/Port",
-  "/properties/Endpoint/Address"
+  "/properties/EndpointPort",
+  "/properties/EndpointAddress"
  ],
  "required": [
   "MasterUserPassword",