From 151a690f947a1b25c098b983ffc3fc8f44292845 Mon Sep 17 00:00:00 2001
From: mmaeng <mmaeng@users.noreply.github.com>
Date: Tue, 25 Jun 2024 00:10:30 +0000
Subject: [PATCH] CloudFormation Resource Provider Definition MetaSchema update

---
 .../schema/base.definition.schema.v1.json     |  40 --
 src/rpdk/core/data/schema/meta-schema.json    | 399 +++++++-----------
 .../schema/provider.definition.schema.v1.json |   6 +-
 3 files changed, 165 insertions(+), 280 deletions(-)

diff --git a/src/rpdk/core/data/schema/base.definition.schema.v1.json b/src/rpdk/core/data/schema/base.definition.schema.v1.json
index df2fcbd9..88d64528 100644
--- a/src/rpdk/core/data/schema/base.definition.schema.v1.json
+++ b/src/rpdk/core/data/schema/base.definition.schema.v1.json
@@ -70,38 +70,6 @@
                                 "AttributeList"
                             ]
                         },
-                        "relationshipRef": {
-                            "$comment": "The relationshipRef relate a property in the resource to that in another resource",
-                            "type": "object",
-                            "properties": {
-                                "typeName": {
-                                    "$comment": "Name of the related resource",
-                                    "type": "string",
-                                    "pattern": "^[a-zA-Z0-9]{2,64}::[a-zA-Z0-9]{2,64}::[a-zA-Z0-9]{2,64}$"
-                                },
-                                "propertyPath": {
-                                    "$comment": "Path of the property in the related resource schema",
-                                    "type": "string",
-                                    "pattern": "^(\/properties\/)[A-Za-z0-9]*$"
-                                },
-                                "publisherId": {
-                                    "$comment": "Id of the related third party resource publisher",
-                                    "type": "string",
-                                    "pattern": "[0-9a-zA-Z]{12,40}"
-                                },
-                                "majorVersion": {
-                                    "$comment": "Major version of the related resource",
-                                    "type": "integer",
-                                    "minimum": 1,
-                                    "maximum": 10000
-                                }
-                            },
-                            "required": [
-                                "typeName",
-                                "propertyPath"
-                            ],
-                            "additionalProperties": false
-                        },
                         "$ref": {
                             "$ref": "http://json-schema.org/draft-07/schema#/properties/$ref"
                         },
@@ -301,14 +269,6 @@
             },
             "additionalProperties": false
         },
-        "propertyTransform": {
-            "type": "object",
-            "patternProperties": {
-                "^[A-Za-z0-9]{1,64}$": {
-                    "type": "string"
-                }
-            }
-        },
         "remote": {
             "description": "Reserved for CloudFormation use. A namespace to inline remote schemas.",
             "type": "object",
diff --git a/src/rpdk/core/data/schema/meta-schema.json b/src/rpdk/core/data/schema/meta-schema.json
index c173cb86..f2e67ab2 100644
--- a/src/rpdk/core/data/schema/meta-schema.json
+++ b/src/rpdk/core/data/schema/meta-schema.json
@@ -1,245 +1,168 @@
 {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "$id": "http://json-schema.org/draft-07/schema#",
-    "title": "Core schema meta-schema",
-    "definitions": {
-        "schemaArray": {
-            "type": "array",
-            "minItems": 1,
-            "items": {
-                "$ref": "#"
-            }
-        },
-        "nonNegativeInteger": {
-            "type": "integer",
-            "minimum": 0
-        },
-        "nonNegativeIntegerDefault0": {
-            "allOf": [
-                {
-                    "$ref": "#/definitions/nonNegativeInteger"
-                },
-                {
-                    "default": 0
-                }
-            ]
-        },
-        "simpleTypes": {
-            "enum": [
-                "array",
-                "boolean",
-                "integer",
-                "null",
-                "number",
-                "object",
-                "string"
-            ]
-        },
-        "stringArray": {
-            "type": "array",
-            "items": {
-                "type": "string"
-            },
-            "uniqueItems": true,
-            "default": []
-        }
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$id": "http://json-schema.org/draft-07/schema",
+  "title": "Core schema meta-schema",
+  "definitions": {
+    "schemaArray": {
+      "type": "array",
+      "minItems": 1,
+      "items": { "$ref": "#" }
+    },
+    "nonNegativeInteger": {
+      "type": "integer",
+      "minimum": 0
+    },
+    "nonNegativeIntegerDefault0": {
+      "allOf": [
+        { "$ref": "#/definitions/nonNegativeInteger" },
+        { "default": 0 }
+      ]
     },
-    "type": [
+    "simpleTypes": {
+      "enum": [
+        "array",
+        "boolean",
+        "integer",
+        "null",
+        "number",
         "object",
-        "boolean"
-    ],
+        "string"
+      ]
+    },
+    "stringArray": {
+      "type": "array",
+      "items": { "type": "string" },
+      "uniqueItems": true,
+      "default": []
+    }
+  },
+  "type": ["object", "boolean"],
+  "properties": {
+    "$id": {
+      "type": "string",
+      "format": "uri-reference"
+    },
+    "$schema": {
+      "type": "string",
+      "format": "uri"
+    },
+    "$ref": {
+      "type": "string",
+      "format": "uri-reference"
+    },
+    "$comment": {
+      "type": "string"
+    },
+    "title": {
+      "type": "string"
+    },
+    "description": {
+      "type": "string"
+    },
+    "default": true,
+    "readOnly": {
+      "type": "boolean",
+      "default": false
+    },
+    "examples": {
+      "type": "array",
+      "items": true
+    },
+    "multipleOf": {
+      "type": "number",
+      "exclusiveMinimum": 0
+    },
+    "maximum": {
+      "type": "number"
+    },
+    "exclusiveMaximum": {
+      "type": "number"
+    },
+    "minimum": {
+      "type": "number"
+    },
+    "exclusiveMinimum": {
+      "type": "number"
+    },
+    "maxLength": { "$ref": "#/definitions/nonNegativeInteger" },
+    "minLength": { "$ref": "#/definitions/nonNegativeIntegerDefault0" },
+    "pattern": {
+      "type": "string",
+      "format": "regex"
+    },
+    "additionalItems": { "$ref": "#" },
+    "items": {
+      "anyOf": [
+        { "$ref": "#" },
+        { "$ref": "#/definitions/schemaArray" }
+      ],
+      "default": true
+    },
+    "maxItems": { "$ref": "#/definitions/nonNegativeInteger" },
+    "minItems": { "$ref": "#/definitions/nonNegativeIntegerDefault0" },
+    "uniqueItems": {
+      "type": "boolean",
+      "default": false
+    },
+    "contains": { "$ref": "#" },
+    "maxProperties": { "$ref": "#/definitions/nonNegativeInteger" },
+    "minProperties": { "$ref": "#/definitions/nonNegativeIntegerDefault0" },
+    "required": { "$ref": "#/definitions/stringArray" },
+    "additionalProperties": { "$ref": "#" },
+    "definitions": {
+      "type": "object",
+      "additionalProperties": { "$ref": "#" },
+      "default": {}
+    },
     "properties": {
-        "$id": {
-            "type": "string",
-            "format": "uri-reference"
-        },
-        "$schema": {
-            "type": "string",
-            "format": "uri"
-        },
-        "$ref": {
-            "type": "string",
-            "format": "uri-reference"
-        },
-        "$comment": {
-            "type": "string"
-        },
-        "title": {
-            "type": "string"
-        },
-        "description": {
-            "type": "string"
-        },
-        "default": true,
-        "readOnly": {
-            "type": "boolean",
-            "default": false
-        },
-        "writeOnly": {
-            "type": "boolean",
-            "default": false
-        },
-        "examples": {
-            "type": "array",
-            "items": true
-        },
-        "multipleOf": {
-            "type": "number",
-            "exclusiveMinimum": 0
-        },
-        "maximum": {
-            "type": "number"
-        },
-        "exclusiveMaximum": {
-            "type": "number"
-        },
-        "minimum": {
-            "type": "number"
-        },
-        "exclusiveMinimum": {
-            "type": "number"
-        },
-        "maxLength": {
-            "$ref": "#/definitions/nonNegativeInteger"
-        },
-        "minLength": {
-            "$ref": "#/definitions/nonNegativeIntegerDefault0"
-        },
-        "pattern": {
-            "type": "string",
-            "format": "regex"
-        },
-        "additionalItems": {
-            "$ref": "#"
-        },
-        "items": {
-            "anyOf": [
-                {
-                    "$ref": "#"
-                },
-                {
-                    "$ref": "#/definitions/schemaArray"
-                }
-            ],
-            "default": true
-        },
-        "maxItems": {
-            "$ref": "#/definitions/nonNegativeInteger"
-        },
-        "minItems": {
-            "$ref": "#/definitions/nonNegativeIntegerDefault0"
-        },
-        "uniqueItems": {
-            "type": "boolean",
-            "default": false
-        },
-        "contains": {
-            "$ref": "#"
-        },
-        "maxProperties": {
-            "$ref": "#/definitions/nonNegativeInteger"
-        },
-        "minProperties": {
-            "$ref": "#/definitions/nonNegativeIntegerDefault0"
-        },
-        "required": {
-            "$ref": "#/definitions/stringArray"
-        },
-        "additionalProperties": {
-            "$ref": "#"
-        },
-        "definitions": {
-            "type": "object",
-            "additionalProperties": {
-                "$ref": "#"
-            },
-            "default": {}
-        },
-        "properties": {
-            "type": "object",
-            "additionalProperties": {
-                "$ref": "#"
-            },
-            "default": {}
-        },
-        "patternProperties": {
-            "type": "object",
-            "additionalProperties": {
-                "$ref": "#"
-            },
-            "propertyNames": {
-                "format": "regex"
-            },
-            "default": {}
-        },
-        "dependencies": {
-            "type": "object",
-            "additionalProperties": {
-                "anyOf": [
-                    {
-                        "$ref": "#"
-                    },
-                    {
-                        "$ref": "#/definitions/stringArray"
-                    }
-                ]
-            }
-        },
-        "propertyNames": {
-            "$ref": "#"
-        },
-        "const": true,
-        "enum": {
-            "type": "array",
-            "items": true,
-            "minItems": 1,
-            "uniqueItems": true
-        },
-        "type": {
-            "anyOf": [
-                {
-                    "$ref": "#/definitions/simpleTypes"
-                },
-                {
-                    "type": "array",
-                    "items": {
-                        "$ref": "#/definitions/simpleTypes"
-                    },
-                    "minItems": 1,
-                    "uniqueItems": true
-                }
-            ]
-        },
-        "format": {
-            "type": "string"
-        },
-        "contentMediaType": {
-            "type": "string"
-        },
-        "contentEncoding": {
-            "type": "string"
-        },
-        "if": {
-            "$ref": "#"
-        },
-        "then": {
-            "$ref": "#"
-        },
-        "else": {
-            "$ref": "#"
-        },
-        "allOf": {
-            "$ref": "#/definitions/schemaArray"
-        },
-        "anyOf": {
-            "$ref": "#/definitions/schemaArray"
-        },
-        "oneOf": {
-            "$ref": "#/definitions/schemaArray"
-        },
-        "not": {
-            "$ref": "#"
+      "type": "object",
+      "additionalProperties": { "$ref": "#" },
+      "default": {}
+    },
+    "patternProperties": {
+      "type": "object",
+      "additionalProperties": { "$ref": "#" },
+      "propertyNames": { "format": "regex" },
+      "default": {}
+    },
+    "dependencies": {
+      "type": "object",
+      "additionalProperties": {
+        "anyOf": [
+          { "$ref": "#" },
+          { "$ref": "#/definitions/stringArray" }
+        ]
+      }
+    },
+    "propertyNames": { "$ref": "#" },
+    "const": true,
+    "enum": {
+      "type": "array",
+      "items": true,
+      "minItems": 1,
+      "uniqueItems": true
+    },
+    "type": {
+      "anyOf": [
+        { "$ref": "#/definitions/simpleTypes" },
+        {
+          "type": "array",
+          "items": { "$ref": "#/definitions/simpleTypes" },
+          "minItems": 1,
+          "uniqueItems": true
         }
+      ]
     },
-    "default": true
+    "format": { "type": "string" },
+    "contentMediaType": { "type": "string" },
+    "contentEncoding": { "type": "string" },
+    "if": { "$ref": "#" },
+    "then": { "$ref": "#" },
+    "else": { "$ref": "#" },
+    "allOf": { "$ref": "#/definitions/schemaArray" },
+    "anyOf": { "$ref": "#/definitions/schemaArray" },
+    "oneOf": { "$ref": "#/definitions/schemaArray" },
+    "not": { "$ref": "#" }
+  },
+  "default": true
 }
diff --git a/src/rpdk/core/data/schema/provider.definition.schema.v1.json b/src/rpdk/core/data/schema/provider.definition.schema.v1.json
index 7b2061df..ce21803b 100644
--- a/src/rpdk/core/data/schema/provider.definition.schema.v1.json
+++ b/src/rpdk/core/data/schema/provider.definition.schema.v1.json
@@ -4,7 +4,7 @@
     "title": "CloudFormation Resource Provider Definition MetaSchema",
     "description": "This schema validates a CloudFormation resource provider definition.",
     "definitions": {
-	"handlerSchema": {
+        "handlerSchema": {
             "type": "object",
             "properties": {
                 "properties": {
@@ -23,7 +23,9 @@
                     "$ref": "base.definition.schema.v1.json#/definitions/schemaArray"
                 }
             },
-            "required": ["properties"],
+            "required": [
+                "properties"
+            ],
             "additionalProperties": false
         },
         "handlerDefinitionWithSchemaOverride": {