[Synapse] Azure Synapse Correctness (#17116)

* [Synapse] Azure Synapse Correctness * roundtripCorrectnessFixes * Prettier and Semantic fix * Model, Semantic and Prettier fix * More Correctness changes * More Correctness changes * Lint changes * Lint Diff Fix * Suggestions Incoporation * Review Comment Incoporation * Review Comments Incoporation 1 * Semantic fix * Review Comment Incoporation Co-authored-by: Nikhil Kumar <nikhilkumar@microsoft.com>
Azure · Dec 27, 2021 · a63f789 · a63f789
1 parent c77c6c6
commit a63f789
Show file tree

Hide file tree

Showing 16 changed files with 227 additions and 50 deletions.
diff --git a/...on/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/bigDataPool.json b/...on/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/bigDataPool.json
@@ -406,7 +406,8 @@
         "creationDate": {
           "type": "string",
           "format": "date-time",
-          "description": "The time when the Big Data pool was created."
+          "description": "The time when the Big Data pool was created.",
+          "readOnly": true
         },
         "autoPause": {
           "$ref": "#/definitions/AutoPauseProperties",
@@ -544,6 +545,16 @@
         "enabled": {
           "type": "boolean",
           "description": "Indicates whether Dynamic Executor Allocation is enabled or not."
+        },
+        "minExecutors": {
+          "type": "integer",
+          "format": "int32",
+          "description": "The minimum number of executors alloted"
+        },
+        "maxExecutors": {
+          "type": "integer",
+          "format": "int32",
+          "description": "The maximum number of executors alloted"
         }
       }
     },

diff --git a/...resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/CreateSqlPool.json b/...resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/CreateSqlPool.json
@@ -37,12 +37,10 @@
         "properties": {
           "maxSizeBytes": 0,
           "collation": "",
-          "sourceDatabaseId": "",
           "recoverableDatabaseId": "",
           "provisioningState": "Provisioning",
           "status": "Paused",
           "restorePointInTime": "1970-01-01T00:00:00.000Z",
-          "createMode": "",
           "creationDate": "1970-01-01T00:00:00.000Z",
           "storageAccountType": "LRS"
         }

diff --git a/...resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/UpdateSqlPool.json b/...resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/UpdateSqlPool.json
@@ -16,11 +16,7 @@
       "properties": {
         "maxSizeBytes": 0,
         "collation": "",
-        "sourceDatabaseId": "",
-        "recoverableDatabaseId": "",
-        "restorePointInTime": "1970-01-01T00:00:00.000Z",
-        "createMode": "",
-        "creationDate": "1970-01-01T00:00:00.000Z"
+        "restorePointInTime": "1970-01-01T00:00:00.000Z"
       }
     }
   },
@@ -39,12 +35,10 @@
         "properties": {
           "maxSizeBytes": 0,
           "collation": "",
-          "sourceDatabaseId": "",
           "recoverableDatabaseId": "",
           "provisioningState": "Provisioning",
           "status": "Paused",
           "restorePointInTime": "1970-01-01T00:00:00.000Z",
-          "createMode": "",
           "creationDate": "1970-01-01T00:00:00.000Z",
           "storageAccountType": "GRS"
         }

diff --git a/...pse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/integrationRuntime.json b/...pse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/integrationRuntime.json
@@ -1386,6 +1386,11 @@
           "description": "Managed integration runtime properties.",
           "x-ms-client-flatten": true,
           "$ref": "#/definitions/ManagedIntegrationRuntimeTypeProperties"
+        },
+        "managedVirtualNetwork": {
+          "description": "Managed integration runtime managed virtual network.",
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/ManagedIntegrationRuntimeManagedVirtualNetworkReference"
         }
       },
       "required": [
@@ -1406,6 +1411,24 @@
         }
       }
     },
+    "ManagedIntegrationRuntimeManagedVirtualNetworkReference": {
+      "description": "Managed integration runtime managed virtual network reference.",
+      "type": "object",
+      "properties": {
+        "referenceName": {
+          "description": "The reference name of the managed virtual network.",
+          "type": "string"
+        },
+        "type": {
+          "description": "The type of the managed virtual network.",
+          "type": "string"
+        },
+        "id": {
+          "description": "The id of the managed virtual network.",
+          "type": "string"
+        }
+      }
+    },
     "IntegrationRuntimeComputeProperties": {
       "description": "The compute resource properties for managed integration runtime.",
       "type": "object",
@@ -2236,6 +2259,18 @@
           "type": "string",
           "format": "date-time",
           "readOnly": true
+        },
+        "serviceRegion": {
+          "description": "The service region of the integration runtime",
+          "type": "string"
+        },
+        "newerVersions": {
+          "description": "The newer versions on download center.",
+          "type": "array",
+          "items": {
+            "description": "The newer versions",
+            "type": "string"
+          }
         }
       }
     },

diff --git a/...cation/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/sqlPool.json b/...cation/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/sqlPool.json
@@ -5330,7 +5330,11 @@
         },
         "sourceDatabaseId": {
           "type": "string",
-          "description": "Source database to create from"
+          "description": "Source database to create from",
+          "x-ms-mutability": [
+            "create",
+            "update"
+          ]
         },
         "recoverableDatabaseId": {
           "type": "string",
@@ -5342,7 +5346,8 @@
         },
         "status": {
           "type": "string",
-          "description": "Resource status"
+          "description": "Resource status",
+          "readOnly": true
         },
         "restorePointInTime": {
           "type": "string",
@@ -5361,19 +5366,23 @@
           "x-ms-enum": {
             "name": "createMode",
             "modelAsString": true
-          }
+          },
+          "x-ms-mutability": [
+            "create",
+            "update"
+          ]
         },
         "creationDate": {
           "type": "string",
           "description": "Date the SQL pool was created",
-          "format": "date-time"
+          "format": "date-time",
+          "readOnly": true
         },
         "storageAccountType": {
           "description": "The storage account type used to store backups for this sql pool.",
           "enum": [
             "GRS",
-            "LRS",
-            "ZRS"
+            "LRS"
           ],
           "type": "string",
           "x-ms-enum": {
@@ -5409,7 +5418,8 @@
             "syncIntervalInMinutes": {
               "type": "integer",
               "format": "int32",
-              "description": "The Sync Interval in minutes."
+              "description": "The Sync Interval in minutes.",
+              "readOnly": true
             }
           },
           "x-ms-client-flatten": true

diff --git a/...tion/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/sqlServer.json b/...tion/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/sqlServer.json
@@ -1487,14 +1487,18 @@
     },
     "ServerVulnerabilityAssessmentProperties": {
       "description": "Properties of a server Vulnerability Assessment.",
+      "type": "object",
       "required": [
         "storageContainerPath"
       ],
-      "type": "object",
       "properties": {
         "storageContainerPath": {
           "description": "A blob storage container path to hold the scan results (e.g. https://myStorage.blob.core.windows.net/VaScans/).",
-          "type": "string"
+          "type": "string",
+          "x-ms-mutability": [
+            "create",
+            "read"
+          ]
         },
         "storageContainerSasKey": {
           "description": "A shared access signature (SAS Key) that has read and write access to the blob container specified in 'storageContainerPath' parameter. If 'storageAccountAccessKey' isn't specified, StorageContainerSasKey is required.",

diff --git a/...tion/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/workspace.json b/...tion/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/workspace.json
@@ -926,7 +926,11 @@
       "properties": {
         "accountUrl": {
           "description": "Account URL",
-          "type": "string"
+          "type": "string",
+          "x-ms-mutability": [
+            "create",
+            "read"
+          ]
         },
         "filesystem": {
           "description": "Filesystem name",
@@ -1170,7 +1174,11 @@
       "properties": {
         "initialWorkspaceAdminObjectId": {
           "description": "AAD object ID of initial workspace admin",
-          "type": "string"
+          "type": "string",
+          "x-ms-mutability": [
+            "create",
+            "read"
+          ]
         }
       }
     },
@@ -1282,6 +1290,7 @@
             "Disabled"
           ],
           "description": "Enable or Disable public network access to workspace",
+          "default": "Enabled",
           "type": "string",
           "x-ms-enum": {
             "name": "WorkspacePublicNetworkAccess",
@@ -1303,6 +1312,11 @@
         "azureADOnlyAuthentication": {
           "description": "Enable or Disable AzureADOnlyAuthentication on All Workspace subresource",
           "type": "boolean"
+        },
+        "trustedServiceBypassEnabled": {
+          "description": "Is trustedServiceBypassEnabled for the workspace",
+          "type": "boolean",
+          "default": false
         }
       }
     },

diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/bigDataPool.json b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/bigDataPool.json
@@ -406,7 +406,8 @@
         "creationDate": {
           "type": "string",
           "format": "date-time",
-          "description": "The time when the Big Data pool was created."
+          "description": "The time when the Big Data pool was created.",
+          "readOnly": true
         },
         "autoPause": {
           "$ref": "#/definitions/AutoPauseProperties",
@@ -450,7 +451,7 @@
           }
         },
         "sparkConfigProperties": {
-          "$ref": "#/definitions/LibraryRequirements",
+          "$ref": "#/definitions/SparkConfigProperties",
           "description": "Spark configuration file to specify additional properties"
         },
         "sparkVersion": {
@@ -544,6 +545,16 @@
         "enabled": {
           "type": "boolean",
           "description": "Indicates whether Dynamic Executor Allocation is enabled or not."
+        },
+        "minExecutors": {
+          "type": "integer",
+          "format": "int32",
+          "description": "The minimum number of executors alloted"
+        },
+        "maxExecutors": {
+          "type": "integer",
+          "format": "int32",
+          "description": "The maximum number of executors alloted"
         }
       }
     },
@@ -606,6 +617,39 @@
           "description": "The filename of the library requirements file."
         }
       }
+    },
+    "SparkConfigProperties": {
+      "type": "object",
+      "description": "SparkConfig Properties for a Big Data pool powered by Apache Spark",
+      "title": "Spark pool Config Properties",
+      "properties": {
+        "time": {
+          "type": "string",
+          "format": "date-time",
+          "readOnly": true,
+          "description": "The last update time of the spark config properties file."
+        },
+        "content": {
+          "type": "string",
+          "description": "The spark config properties."
+        },
+        "filename": {
+          "type": "string",
+          "description": "The filename of the spark config properties file."
+        },
+        "configurationType": {
+          "enum": [
+            "File",
+            "Artifact"
+          ],
+          "type": "string",
+          "description": "The type of the spark config properties file.",
+          "x-ms-enum": {
+            "name": "ConfigurationType",
+            "modelAsString": true
+          }
+        }
+      }
     }
   }
 }
diff --git a/...e/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/CreateIpFirewallRule.json b/...e/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/CreateIpFirewallRule.json
@@ -37,6 +37,7 @@
         }
       }
     },
+    "202": {},
     "default": {
       "body": {
         "error": {

diff --git a/.../synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/CreateSqlPool.json b/.../synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/CreateSqlPool.json
@@ -37,12 +37,10 @@
         "properties": {
           "maxSizeBytes": 0,
           "collation": "",
-          "sourceDatabaseId": "",
           "recoverableDatabaseId": "",
           "provisioningState": "Provisioning",
           "status": "Paused",
           "restorePointInTime": "1970-01-01T00:00:00.000Z",
-          "createMode": "",
           "creationDate": "1970-01-01T00:00:00.000Z",
           "storageAccountType": "LRS"
         }

diff --git a/.../synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/UpdateSqlPool.json b/.../synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/UpdateSqlPool.json
@@ -16,11 +16,7 @@
       "properties": {
         "maxSizeBytes": 0,
         "collation": "",
-        "sourceDatabaseId": "",
-        "recoverableDatabaseId": "",
-        "restorePointInTime": "1970-01-01T00:00:00.000Z",
-        "createMode": "",
-        "creationDate": "1970-01-01T00:00:00.000Z"
+        "restorePointInTime": "1970-01-01T00:00:00.000Z"
       }
     }
   },
@@ -39,12 +35,10 @@
         "properties": {
           "maxSizeBytes": 0,
           "collation": "",
-          "sourceDatabaseId": "",
           "recoverableDatabaseId": "",
           "provisioningState": "Provisioning",
           "status": "Paused",
           "restorePointInTime": "1970-01-01T00:00:00.000Z",
-          "createMode": "",
           "creationDate": "1970-01-01T00:00:00.000Z",
           "storageAccountType": "GRS"
         }

diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/firewallRule.json b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/firewallRule.json
@@ -119,6 +119,9 @@
             },
             "description": ""
           },
+          "202": {
+            "description": ""
+          },
           "default": {
             "schema": {
               "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"