New Optional property addition for spark configuration artifact (#16101)

* Add blockchain to latest profile

* Add additional types

* Added new Property ConfigMergeRule for Spark Configuration Artifact

Added new Property ConfigMergeRule for Spark Configuration Artifact

Co-authored-by: Mark Cowlishaw <[email protected]>

Author: Bharath550-ms

specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/SparkConfiguration.json

@@ -41,6 +41,13 @@
           "type": "string",
           "format": "date-time",
           "description": "The timestamp of resource creation."
+        },
+        "configMergeRule": {
+          "type": "object",
+          "description": "SparkConfiguration configMergeRule.",
+          "additionalProperties": {
+            "type": "string"
+          }
         }
       },
       "required": [

specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/examples/SparkConfigurations_Create.json

@@ -14,7 +14,11 @@
           "testAnnotation1",
           "testAnnotation2"
         ],
-        "notes": "testNotes"
+        "notes": "testNotes",
+        "configMergeRule": {
+          "currentOperation.spark.key1": "append",
+          "currentOperation.append.separator.spark.key1": "space"
+        }
       }
     },
     "api-version": "2021-06-01-preview"
@@ -53,7 +57,11 @@
           ],
           "notes": "testNotes",
           "createdBy": "[email protected]",
-          "created": "1970-01-01T00:00:00Z"
+          "created": "1970-01-01T00:00:00Z",
+          "configMergeRule": {
+            "currentOperation.spark.key1": "append",
+            "currentOperation.append.separator.spark.key1": "space"
+          }
         },
         "etag": "0a0069d4-0000-0000-0000-5b245bd50000"
       }

specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/examples/SparkConfigurations_Get.json

@@ -30,7 +30,11 @@
           ],
           "notes": "testNotes",
           "createdBy": "[email protected]",
-          "created": "1970-01-01T00:00:00Z"
+          "created": "1970-01-01T00:00:00Z",
+          "configMergeRule": {
+            "currentOperation.spark.key1": "append",
+            "currentOperation.append.separator.spark.key1": "space"
+          }
         },
         "etag": "1500504f-0000-0200-0000-5cbe090f0000"
       }

specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/examples/SparkConfigurations_ListByWorkspace.json

@@ -30,7 +30,11 @@
               ],
               "notes": "testNotes",
               "createdBy": "[email protected]",
-              "created": "1970-01-01T00:00:00Z"
+              "created": "1970-01-01T00:00:00Z",
+              "configMergeRule": {
+                "currentOperation.spark.key1": "append",
+                "currentOperation.append.separator.spark.key1": "space"
+              }
             },
             "etag": "1500504f-0000-0200-0000-5cbe090f0000"
           }

specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/examples/SparkConfigurations_Update.json

@@ -14,7 +14,11 @@
           "testAnnotation1",
           "testAnnotation2"
         ],
-        "notes": "testNotes"
+        "notes": "testNotes",
+        "configMergeRule": {
+          "currentOperation.spark.key1": "append",
+          "currentOperation.append.separator.spark.key1": "space"
+        }
       }
     },
     "api-version": "2021-06-01-preview"
@@ -53,7 +57,11 @@
           ],
           "notes": "testNotes",
           "createdBy": "[email protected]",
-          "created": "1970-01-01T00:00:00Z"
+          "created": "1970-01-01T00:00:00Z",
+          "configMergeRule": {
+            "currentOperation.spark.key1": "append",
+            "currentOperation.append.separator.spark.key1": "space"
+          }
         },
         "etag": "0a006cd4-0000-0000-0000-5b245bd60000"
       }