[Synapse] - fix scheme for Artifacts and update readme to include KQL scripts for October release

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

@@ -61,7 +61,7 @@
         },
         "resultLimit": {
           "description": "Limit of results, '-1' for no limit.",
-          "type": "number"
+          "type": "integer"
         },
         "metadata": {
           "description": "The metadata of the SQL script.",

specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/Dataset.json

@@ -2318,6 +2318,37 @@
         }
       }
     },
+    "AmazonRdsForSqlServerTableDataset": {
+      "x-ms-discriminator-value": "AmazonRdsForSqlServerTable",
+      "description": "The Amazon RDS for SQL Server dataset.",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Dataset"
+        }
+      ],
+      "properties": {
+        "typeProperties": {
+          "description": "The Amazon RDS for SQL Server dataset properties.",
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/AmazonRdsForSqlServerTableDatasetTypeProperties"
+        }
+      }
+    },
+    "AmazonRdsForSqlServerTableDatasetTypeProperties": {
+      "description": "The Amazon RDS for SQL Server dataset properties.",
+      "type": "object",
+      "properties": {
+        "schema": {
+          "type": "object",
+          "description": "The schema name of the SQL Server dataset. Type: string (or Expression with resultType string)."
+        },
+        "table": {
+          "type": "object",
+          "description": "The table name of the SQL Server dataset. Type: string (or Expression with resultType string)."
+        }
+      }
+    },
     "RestResourceDataset": {
       "x-ms-discriminator-value": "RestResource",
       "description": "A Rest service dataset.",

specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/LinkedService.json

@@ -280,6 +280,51 @@
         "connectionString"
       ]
     },
+    "AmazonRdsForSqlServerLinkedService": {
+      "x-ms-discriminator-value": "AmazonRdsForSqlServer",
+      "description": "Amazon RDS for SQL Server linked service.",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/LinkedService"
+        }
+      ],
+      "properties": {
+        "typeProperties": {
+          "description": "Amazon RDS for SQL Server linked service properties.",
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/AmazonRdsForSqlServerLinkedServiceTypeProperties"
+        }
+      },
+      "required": [
+        "typeProperties"
+      ]
+    },
+    "AmazonRdsForSqlServerLinkedServiceTypeProperties": {
+      "description": "SQL Server linked service properties.",
+      "type": "object",
+      "properties": {
+        "connectionString": {
+          "description": "The connection string. Type: string, SecureString or AzureKeyVaultSecretReference.",
+          "type": "object"
+        },
+        "userName": {
+          "type": "object",
+          "description": "The on-premises Windows authentication user name. Type: string (or Expression with resultType string)."
+        },
+        "password": {
+          "description": "The on-premises Windows authentication password.",
+          "$ref": "../artifacts.json#/definitions/SecretBase"
+        },
+        "encryptedCredential": {
+          "type": "object",
+          "description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string)."
+        }
+      },
+      "required": [
+        "connectionString"
+      ]
+    },
     "AzureSqlDatabaseLinkedService": {
       "x-ms-discriminator-value": "AzureSqlDatabase",
       "description": "Microsoft Azure SQL Database linked service.",

specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/Notebook.json

@@ -42,6 +42,16 @@
           "items": {
             "$ref": "#/definitions/NotebookCell"
           }
+        },
+        "folder": {
+          "description": "The folder that this notebook is in. If not specified, this notebook will appear at the root level.",
+          "type": "object",
+          "properties": {
+            "name": {
+              "description": "The name of the folder that this notebook is in.",
+              "type": "string"
+            }
+          }
         }
       },
       "additionalProperties": {

specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/Pipeline.json

@@ -2274,6 +2274,44 @@
         }
       }
     },
+    "AmazonRdsForSqlServerSource": {
+      "description": "A copy activity Amazon RDS for SQL Server source.",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/TabularSource"
+        }
+      ],
+      "properties": {
+        "sqlReaderQuery": {
+          "type": "object",
+          "description": "SQL reader query. Type: string (or Expression with resultType string)."
+        },
+        "sqlReaderStoredProcedureName": {
+          "type": "object",
+          "description": "Name of the stored procedure for a SQL Database source. This cannot be used at the same time as SqlReaderQuery. Type: string (or Expression with resultType string)."
+        },
+        "storedProcedureParameters": {
+          "description": "Value and type setting for stored procedure parameters. Example: \"{Parameter1: {value: \"1\", type: \"int\"}}\".",
+          "type": "object",
+          "additionalProperties": {
+            "$ref": "#/definitions/StoredProcedureParameter"
+          }
+        },
+        "produceAdditionalTypes": {
+          "description": "Which additional types to produce.",
+          "type": "object"
+        },
+        "partitionOption": {
+          "description": "The partition mechanism that will be used for Sql read in parallel. Possible values include: \"None\", \"PhysicalPartitionsOfTable\", \"DynamicRange\".",
+          "type": "object"
+        },
+        "partitionSettings": {
+          "description": "The settings that will be leveraged for Sql source partitioning.",
+          "$ref": "#/definitions/SqlPartitionSettings"
+        }
+      }
+    },
     "AzureSqlSource": {
       "description": "A copy activity Azure SQL source.",
       "type": "object",
@@ -7168,6 +7206,14 @@
         "sparkJob": {
           "description": "Synapse spark job reference.",
           "$ref": "../artifacts.json#/definitions/SynapseSparkJobReference"
+        },
+        "args": {
+          "x-ms-client-name": "arguments",
+          "description": "User specified arguments to SynapseSparkJobDefinitionActivity.",
+          "type": "array",
+          "items": {
+            "description": "Type: string (or Expression with resultType string)."
+          }
         }
       },
       "required": [

specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/SparkJobDefinition.json

@@ -29,6 +29,16 @@
         "jobProperties": {
           "description": "The properties of the Spark job.",
           "$ref": "#/definitions/SparkJobProperties"
+        },
+        "folder": {
+          "description": "The folder that this Spark job definition is in. If not specified, this Spark job definition will appear at the root level.",
+          "type": "object",
+          "properties": {
+            "name": {
+              "description": "The name of the folder that this Spark job definition is in.",
+              "type": "string"
+            }
+          }
         }
       },
       "additionalProperties": {

specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/SqlScript.json

@@ -28,6 +28,16 @@
         "content": {
           "description": "The content of the SQL script.",
           "$ref": "#/definitions/SqlScriptContent"
+        },
+        "folder": {
+          "description": "The folder that this SQL script is in. If not specified, this SQL script will appear at the root level.",
+          "type": "object",
+          "properties": {
+            "name": {
+              "description": "The name of the folder that this SQL script is in.",
+              "type": "string"
+            }
+          }
         }
       },
       "additionalProperties": {
@@ -49,6 +59,10 @@
           "description": "The connection used to execute the SQL script.",
           "$ref": "#/definitions/SqlConnection"
         },
+        "resultLimit": {
+          "description": "Limit of results, '-1' for no limit.",
+          "type": "integer"
+        },
         "metadata": {
           "description": "The metadata of the SQL script.",
           "$ref": "#/definitions/SqlScriptMetadata"
@@ -58,8 +72,7 @@
         "type": "object"
       },
       "required": [
-        "query",
-        "currentConnection"
+        "query"
       ]
     },
     "SqlScriptMetadata": {
@@ -94,15 +107,19 @@
         "name": {
           "description": "The identifier of the connection.",
           "type": "string"
+        },
+        "poolName": {
+          "description": "The associated SQL pool name (supported by SQL pool v3)",
+          "type": "string"
+        },
+        "databaseName": {
+          "description": "The associated database name (supported by SQL pool v3)",
+          "type": "string"
         }
       },
       "additionalProperties": {
         "type": "object"
-      },
-      "required": [
-        "type",
-        "name"
-      ]
+      }
     }
   }
 }

specification/synapse/data-plane/readme.md

@@ -55,6 +55,7 @@ These settings apply only when `--tag=package-artifacts-composite-v1` is specifi
 
 ``` yaml $(tag) == 'package-artifacts-composite-v1'
 input-file:
+  - Microsoft.Synapse/preview/2021-06-01-preview/kqlScripts.json
   - Microsoft.Synapse/preview/2021-06-01-preview/sparkConfigurations.json
   - Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/SparkConfiguration.json
   - Microsoft.Synapse/stable/2020-12-01/artifacts.json