Update schemas for DBInstance KmsKeyId (#2989)

aws-cloudformation · May 2, 2024 · 4c0fc9f · 4c0fc9f
1 parent 76c68df
commit 4c0fc9f
Show file tree

Hide file tree

Showing 21 changed files with 684 additions and 111 deletions.
diff --git a/scripts/update_schemas_manually.py b/scripts/update_schemas_manually.py
@@ -1321,13 +1321,22 @@ def make_only_one_required(props: Sequence[str]) -> Sequence[Dict[str, Any]]:
                     values={
                         "dependencies": {
                             "SourceDBInstanceIdentifier": {
+                                "notDescription": "['CharacterSetName', 'MasterUserPassword', 'MasterUsername', and 'StorageEncrypted'] should not be included with 'SourceDBInstanceIdentifier'",
+                                "not": {
+                                    "anyOf": [
+                                        {"required": ["CharacterSetName"]},
+                                        {"required": ["MasterUserPassword"]},
+                                        {"required": ["MasterUsername"]},
+                                        {"required": ["StorageEncrypted"]},
+                                    ]
+                                },
+                            },
+                            "KmsKeyId": {
                                 "properties": {
-                                    "StorageEncrypted": False,
-                                    "MasterUsername": False,
-                                    "MasterUserPassword": False,
-                                    "CharacterSetName": False,
-                                }
-                            }
+                                    "StorageEncrypted": {"enum": ["true", "True", True]}
+                                },
+                                "required": ["StorageEncrypted"],
+                            },
                         }
                     },
                     path="/",

diff --git a/...nloadsMetadata/227d6e59c86482f7153466759080e65963a1bf4413531ad420ff60a5a0d7965d.meta.json b/...nloadsMetadata/227d6e59c86482f7153466759080e65963a1bf4413531ad420ff60a5a0d7965d.meta.json
@@ -1 +1 @@
-{"etag": "\"b5c89f186c5e4f99cfd241bf0411e4a7\"", "url": "https://schema.cloudformation.me-south-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"e66593754e392c10b5ca50bbf9c25aa2\"", "url": "https://schema.cloudformation.me-south-1.amazonaws.com/CloudformationSchema.zip"}
diff --git a/...nloadsMetadata/f54eee6f8ad9619f41835b700369cdbb41c64a9c91b2fa5b4928c0d9b2f780b0.meta.json b/...nloadsMetadata/f54eee6f8ad9619f41835b700369cdbb41c64a9c91b2fa5b4928c0d9b2f780b0.meta.json
@@ -1 +1 @@
-{"etag": "\"bd541cc660f08b31649a41edca102406\"", "url": "https://schema.cloudformation.us-east-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"16bd7ecdde6801014ac6d5d0db40e721\"", "url": "https://schema.cloudformation.us-east-1.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_rds_dbinstance/manual.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_rds_dbinstance/manual.json
@@ -54,13 +54,46 @@
   "op": "add",
   "path": "/dependencies",
   "value": {
-   "SourceDBInstanceIdentifier": {
+   "KmsKeyId": {
     "properties": {
-     "CharacterSetName": false,
-     "MasterUserPassword": false,
-     "MasterUsername": false,
-     "StorageEncrypted": false
-    }
+     "StorageEncrypted": {
+      "enum": [
+       "true",
+       "True",
+       true
+      ]
+     }
+    },
+    "required": [
+     "StorageEncrypted"
+    ]
+   },
+   "SourceDBInstanceIdentifier": {
+    "not": {
+     "anyOf": [
+      {
+       "required": [
+        "CharacterSetName"
+       ]
+      },
+      {
+       "required": [
+        "MasterUserPassword"
+       ]
+      },
+      {
+       "required": [
+        "MasterUsername"
+       ]
+      },
+      {
+       "required": [
+        "StorageEncrypted"
+       ]
+      }
+     ]
+    },
+    "notDescription": "['CharacterSetName', 'MasterUserPassword', 'MasterUsername', and 'StorageEncrypted'] should not be included with 'SourceDBInstanceIdentifier'"
    }
   }
  }

diff --git a/src/cfnlint/data/schemas/providers/af_south_1/aws-rds-dbinstance.json b/src/cfnlint/data/schemas/providers/af_south_1/aws-rds-dbinstance.json
@@ -145,13 +145,46 @@
   }
  },
  "dependencies": {
-  "SourceDBInstanceIdentifier": {
+  "KmsKeyId": {
    "properties": {
-    "CharacterSetName": false,
-    "MasterUserPassword": false,
-    "MasterUsername": false,
-    "StorageEncrypted": false
-   }
+    "StorageEncrypted": {
+     "enum": [
+      "true",
+      "True",
+      true
+     ]
+    }
+   },
+   "required": [
+    "StorageEncrypted"
+   ]
+  },
+  "SourceDBInstanceIdentifier": {
+   "not": {
+    "anyOf": [
+     {
+      "required": [
+       "CharacterSetName"
+      ]
+     },
+     {
+      "required": [
+       "MasterUserPassword"
+      ]
+     },
+     {
+      "required": [
+       "MasterUsername"
+      ]
+     },
+     {
+      "required": [
+       "StorageEncrypted"
+      ]
+     }
+    ]
+   },
+   "notDescription": "['CharacterSetName', 'MasterUserPassword', 'MasterUsername', and 'StorageEncrypted'] should not be included with 'SourceDBInstanceIdentifier'"
   }
  },
  "deprecatedProperties": [

diff --git a/src/cfnlint/data/schemas/providers/ap_east_1/aws-rds-dbinstance.json b/src/cfnlint/data/schemas/providers/ap_east_1/aws-rds-dbinstance.json
@@ -145,13 +145,46 @@
   }
  },
  "dependencies": {
-  "SourceDBInstanceIdentifier": {
+  "KmsKeyId": {
    "properties": {
-    "CharacterSetName": false,
-    "MasterUserPassword": false,
-    "MasterUsername": false,
-    "StorageEncrypted": false
-   }
+    "StorageEncrypted": {
+     "enum": [
+      "true",
+      "True",
+      true
+     ]
+    }
+   },
+   "required": [
+    "StorageEncrypted"
+   ]
+  },
+  "SourceDBInstanceIdentifier": {
+   "not": {
+    "anyOf": [
+     {
+      "required": [
+       "CharacterSetName"
+      ]
+     },
+     {
+      "required": [
+       "MasterUserPassword"
+      ]
+     },
+     {
+      "required": [
+       "MasterUsername"
+      ]
+     },
+     {
+      "required": [
+       "StorageEncrypted"
+      ]
+     }
+    ]
+   },
+   "notDescription": "['CharacterSetName', 'MasterUserPassword', 'MasterUsername', and 'StorageEncrypted'] should not be included with 'SourceDBInstanceIdentifier'"
   }
  },
  "deprecatedProperties": [

diff --git a/src/cfnlint/data/schemas/providers/ap_south_2/aws-rds-dbinstance.json b/src/cfnlint/data/schemas/providers/ap_south_2/aws-rds-dbinstance.json
@@ -145,13 +145,46 @@
   }
  },
  "dependencies": {
-  "SourceDBInstanceIdentifier": {
+  "KmsKeyId": {
    "properties": {
-    "CharacterSetName": false,
-    "MasterUserPassword": false,
-    "MasterUsername": false,
-    "StorageEncrypted": false
-   }
+    "StorageEncrypted": {
+     "enum": [
+      "true",
+      "True",
+      true
+     ]
+    }
+   },
+   "required": [
+    "StorageEncrypted"
+   ]
+  },
+  "SourceDBInstanceIdentifier": {
+   "not": {
+    "anyOf": [
+     {
+      "required": [
+       "CharacterSetName"
+      ]
+     },
+     {
+      "required": [
+       "MasterUserPassword"
+      ]
+     },
+     {
+      "required": [
+       "MasterUsername"
+      ]
+     },
+     {
+      "required": [
+       "StorageEncrypted"
+      ]
+     }
+    ]
+   },
+   "notDescription": "['CharacterSetName', 'MasterUserPassword', 'MasterUsername', and 'StorageEncrypted'] should not be included with 'SourceDBInstanceIdentifier'"
   }
  },
  "deprecatedProperties": [

diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-rds-dbinstance.json b/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-rds-dbinstance.json
@@ -145,13 +145,46 @@
   }
  },
  "dependencies": {
-  "SourceDBInstanceIdentifier": {
+  "KmsKeyId": {
    "properties": {
-    "CharacterSetName": false,
-    "MasterUserPassword": false,
-    "MasterUsername": false,
-    "StorageEncrypted": false
-   }
+    "StorageEncrypted": {
+     "enum": [
+      "true",
+      "True",
+      true
+     ]
+    }
+   },
+   "required": [
+    "StorageEncrypted"
+   ]
+  },
+  "SourceDBInstanceIdentifier": {
+   "not": {
+    "anyOf": [
+     {
+      "required": [
+       "CharacterSetName"
+      ]
+     },
+     {
+      "required": [
+       "MasterUserPassword"
+      ]
+     },
+     {
+      "required": [
+       "MasterUsername"
+      ]
+     },
+     {
+      "required": [
+       "StorageEncrypted"
+      ]
+     }
+    ]
+   },
+   "notDescription": "['CharacterSetName', 'MasterUserPassword', 'MasterUsername', and 'StorageEncrypted'] should not be included with 'SourceDBInstanceIdentifier'"
   }
  },
  "deprecatedProperties": [

diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-rds-dbinstance.json b/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-rds-dbinstance.json
@@ -145,13 +145,46 @@
   }
  },
  "dependencies": {
-  "SourceDBInstanceIdentifier": {
+  "KmsKeyId": {
    "properties": {
-    "CharacterSetName": false,
-    "MasterUserPassword": false,
-    "MasterUsername": false,
-    "StorageEncrypted": false
-   }
+    "StorageEncrypted": {
+     "enum": [
+      "true",
+      "True",
+      true
+     ]
+    }
+   },
+   "required": [
+    "StorageEncrypted"
+   ]
+  },
+  "SourceDBInstanceIdentifier": {
+   "not": {
+    "anyOf": [
+     {
+      "required": [
+       "CharacterSetName"
+      ]
+     },
+     {
+      "required": [
+       "MasterUserPassword"
+      ]
+     },
+     {
+      "required": [
+       "MasterUsername"
+      ]
+     },
+     {
+      "required": [
+       "StorageEncrypted"
+      ]
+     }
+    ]
+   },
+   "notDescription": "['CharacterSetName', 'MasterUserPassword', 'MasterUsername', and 'StorageEncrypted'] should not be included with 'SourceDBInstanceIdentifier'"
   }
  },
  "deprecatedProperties": [