Merge branch 'master' into sornaks/archive

Azure · Oct 30, 2020 · f6af652 · f6af652
2 parents 9ef2d96 + 54480da
commit f6af652
Show file tree

Hide file tree

Showing 20 changed files with 193 additions and 96 deletions.
diff --git a/custom-words.txt b/custom-words.txt
@@ -1993,3 +1993,4 @@ unarchive
 unarchiving
 ssoadfs
 Idempotence
+privatelinkhub
diff --git a/.../preview/2019-06-01-preview/examples/CreateOrUpdateManagedIdentitySqlControlSettings.json b/.../preview/2019-06-01-preview/examples/CreateOrUpdateManagedIdentitySqlControlSettings.json
@@ -24,6 +24,18 @@
           }
         }
       }
+    },
+    "201": {
+      "body": {
+        "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup1/providers/Microsoft.Synapse/workspaces/workspace1/managedIdentitySqlControlSettings/default",
+        "name": "default",
+        "properties": {
+          "grantSqlControlToManagedIdentity": {
+            "desiredState": "Enabled",
+            "actualState": "Enabling"
+          }
+        }
+      }
     }
   }
 }
diff --git a/...anager/Microsoft.Synapse/preview/2019-06-01-preview/examples/CreateOrUpdateWorkspace.json b/...anager/Microsoft.Synapse/preview/2019-06-01-preview/examples/CreateOrUpdateWorkspace.json
@@ -60,7 +60,6 @@
             ]
           },
           "sqlAdministratorLogin": "login",
-          "sqlAdministratorLoginPassword": "password",
           "managedResourceGroupName": "workspaceManagedResourceGroupUnique",
           "managedVirtualNetwork": "default",
           "provisioningState": "Succeeded",
@@ -81,7 +80,8 @@
                 }
               }
             }
-          ]
+          ],
+          "workspaceUID": "999b999q-b888-4b44-bacd-2c222cc2222d"
         },
         "tags": {
           "key": "value"
@@ -111,10 +111,10 @@
             "sql": "workspace1.sql.projectarcadia.net"
           },
           "sqlAdministratorLogin": "login",
-          "sqlAdministratorLoginPassword": "password",
           "managedResourceGroupName": "workspaceManagedResourceGroupUnique",
           "managedVirtualNetwork": "default",
-          "provisioningState": "Provisioning"
+          "provisioningState": "Provisioning",
+          "workspaceUID": "86984b43-b873-4b91-bacd-2ca083a104c7"
         },
         "tags": {
           "key": "value"

diff --git a/...resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/CreateSqlPool.json b/...resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/CreateSqlPool.json
@@ -17,9 +17,7 @@
         "collation": "",
         "sourceDatabaseId": "",
         "recoverableDatabaseId": "",
-        "restorePointInTime": "1970-01-01T00:00:00.000Z",
-        "createMode": "",
-        "creationDate": "1970-01-01T00:00:00.000Z"
+        "createMode": ""
       }
     }
   },

diff --git a/...e-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/DeletePrivateLinkHub.json b/...e-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/DeletePrivateLinkHub.json
@@ -7,6 +7,7 @@
   },
   "responses": {
     "204": {},
+    "202": {},
     "200": {},
     "default": {
       "body": {

diff --git a/...source-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/DeleteWorkspace.json b/...source-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/DeleteWorkspace.json
@@ -22,7 +22,6 @@
             "sql": "workspace1.sql.projectarcadia.net"
           },
           "sqlAdministratorLogin": "login",
-          "sqlAdministratorLoginPassword": "password",
           "managedResourceGroupName": "resourceGroup2",
           "provisioningState": "Deleting"
         },
@@ -48,7 +47,6 @@
             "sql": "workspace1.sql.projectarcadia.net"
           },
           "sqlAdministratorLogin": "login",
-          "sqlAdministratorLoginPassword": "password",
           "managedResourceGroupName": "resourceGroup2",
           "provisioningState": "Deleting"
         },

diff --git a/...r/Microsoft.Synapse/preview/2019-06-01-preview/examples/GetAzureAsyncOperationHeader.json b/...r/Microsoft.Synapse/preview/2019-06-01-preview/examples/GetAzureAsyncOperationHeader.json
@@ -11,15 +11,6 @@
       "body": {
         "status": "InProgress"
       }
-    },
-    "404": {},
-    "500": {
-      "body": {
-        "error": {
-          "code": "Error code",
-          "message": "Error message"
-        }
-      }
     }
   }
 }
diff --git a/...urce-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/GetLocationHeader.json b/...urce-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/GetLocationHeader.json
@@ -8,6 +8,8 @@
   },
   "responses": {
     "200": {},
+    "201": {},
+    "202": {},
     "204": {},
     "default": {
       "body": {

diff --git a/...osoft.Synapse/preview/2019-06-01-preview/examples/GetLocationHeaderResultWithSqlPool.json b/...osoft.Synapse/preview/2019-06-01-preview/examples/GetLocationHeaderResultWithSqlPool.json
@@ -10,6 +10,9 @@
   "responses": {
     "200": {
       "body": {}
+    },
+    "202": {
+      "body": {}
     }
   }
 }
diff --git a/.../resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/GetWorkspace.json b/.../resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/GetWorkspace.json
@@ -29,7 +29,6 @@
             ]
           },
           "sqlAdministratorLogin": "login",
-          "sqlAdministratorLoginPassword": "password",
           "managedResourceGroupName": "resourceGroup2",
           "provisioningState": "Succeeded",
           "privateEndpointConnections": [
@@ -50,8 +49,10 @@
               }
             }
           ],
+          "workspaceUID": "999b999q-b888-4b44-bacd-2c222cc2222d",
           "extraProperties": {
-            "IsScopeEnabled": "false"
+            "IsScopeEnabled": "false",
+            "WorkspaceType": "Normal"
           }
         },
         "tags": {

diff --git a/...r/Microsoft.Synapse/preview/2019-06-01-preview/examples/ListWorkspacesInSubscription.json b/...r/Microsoft.Synapse/preview/2019-06-01-preview/examples/ListWorkspacesInSubscription.json
@@ -22,9 +22,9 @@
                 "sql": "workspace1.sql.projectarcadia.net"
               },
               "sqlAdministratorLogin": "login",
-              "sqlAdministratorLoginPassword": "password",
               "managedResourceGroupName": "resourceGroup2",
-              "provisioningState": "Succeeded"
+              "provisioningState": "Succeeded",
+              "workspaceUID": "999b999q-b888-4b44-bacd-2c222cc2222d"
             },
             "tags": {
               "key": "value"
@@ -45,9 +45,9 @@
                 "sql": "workspace2.sql.projectarcadia.net"
               },
               "sqlAdministratorLogin": "login",
-              "sqlAdministratorLoginPassword": "password",
               "managedResourceGroupName": "resourceGroup2",
-              "provisioningState": "Succeeded"
+              "provisioningState": "Succeeded",
+              "workspaceUID": "999b999q-b888-4b44-bacd-2c222cc2222d"
             },
             "tags": {
               "key": "value"

diff --git a/...source-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/UpdateWorkspace.json b/...source-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/UpdateWorkspace.json
@@ -47,9 +47,9 @@
             "sql": "workspace1.sql.projectarcadia.net"
           },
           "sqlAdministratorLogin": "login",
-          "sqlAdministratorLoginPassword": "password",
           "managedResourceGroupName": "resourceGroup2",
-          "provisioningState": "Succeeded"
+          "provisioningState": "Succeeded",
+          "workspaceUID": "999b999q-b888-4b44-bacd-2c222cc2222d"
         },
         "tags": {
           "key": "value"
@@ -79,9 +79,9 @@
             "sql": "workspace1.sql.projectarcadia.net"
           },
           "sqlAdministratorLogin": "login",
-          "sqlAdministratorLoginPassword": "password",
           "managedResourceGroupName": "resourceGroup2",
-          "provisioningState": "Provisioning"
+          "provisioningState": "Provisioning",
+          "workspaceUID": "999b999q-b888-4b44-bacd-2c222cc2222d"
         },
         "tags": {
           "key": "value"

diff --git a/...pse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/integrationRuntime.json b/...pse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/integrationRuntime.json
@@ -1966,6 +1966,11 @@
           "type": "string",
           "readOnly": true
         },
+        "nodeCommunicationChannelEncryptionMode": {
+          "description": "The node communication Channel encryption mode",
+          "type": "string",
+          "readOnly": true
+        },
         "internalChannelEncryption": {
           "description": "It is used to set the encryption mode for node-node communication channel (when more than 2 self-hosted integration runtime nodes exist).",
           "type": "string",

diff --git a/...ion/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/operations.json b/...ion/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/operations.json
@@ -90,6 +90,12 @@
           "200": {
             "description": ""
           },
+          "201": {
+            "description": ""
+          },
+          "202": {
+            "description": ""
+          },
           "204": {
             "description": ""
           },
@@ -148,10 +154,7 @@
             },
             "description": ""
           },
-          "404": {
-            "description": ""
-          },
-          "500": {
+          "default": {
             "schema": {
               "$ref": "./workspace.json#/definitions/ErrorContract"
             },

diff --git a/...urce-manager/Microsoft.Synapse/preview/2019-06-01-preview/privateEndpointConnections.json b/...urce-manager/Microsoft.Synapse/preview/2019-06-01-preview/privateEndpointConnections.json
@@ -243,26 +243,22 @@
   },
   "definitions": {
     "PrivateEndpointConnectionList": {
-      "description": "A list of private endpoint connections",
       "type": "object",
       "properties": {
         "value": {
-          "description": "Array of results.",
           "type": "array",
           "items": {
             "$ref": "#/definitions/PrivateEndpointConnection"
           },
           "readOnly": true
         },
         "nextLink": {
-          "description": "Link to retrieve next page of results.",
           "type": "string",
           "readOnly": true
         }
       }
     },
     "PrivateEndpointConnection": {
-      "description": "A private endpoint connection",
       "type": "object",
       "allOf": [
         {
@@ -271,67 +267,10 @@
       ],
       "properties": {
         "properties": {
-          "$ref": "#/definitions/PrivateEndpointConnectionProperties",
-          "description": "Private endpoint connection properties.",
+          "$ref": "./privatelinkhub.json#/definitions/PrivateEndpointConnectionProperties",
           "x-ms-client-flatten": true
         }
       }
-    },
-    "PrivateEndpointConnectionProperties": {
-      "description": "Properties of a private endpoint connection.",
-      "type": "object",
-      "properties": {
-        "privateEndpoint": {
-          "$ref": "#/definitions/PrivateEndpoint",
-          "description": "The private endpoint which the connection belongs to."
-        },
-        "privateLinkServiceConnectionState": {
-          "$ref": "#/definitions/PrivateLinkServiceConnectionState",
-          "description": "Connection state of the private endpoint connection."
-        },
-        "provisioningState": {
-          "description": "Provisioning state of the private endpoint connection.",
-          "type": "string",
-          "readOnly": true
-        }
-      }
-    },
-    "PrivateEndpoint": {
-      "description": "Private endpoint details",
-      "type": "object",
-      "properties": {
-        "id": {
-          "description": "Resource id of the private endpoint.",
-          "type": "string",
-          "readOnly": true
-        }
-      },
-      "x-ms-azure-resource": true
-    },
-    "PrivateLinkServiceConnectionState": {
-      "description": "Connection state details of the private endpoint",
-      "type": "object",
-      "properties": {
-        "status": {
-          "description": "The private link service connection status.",
-          "type": "string",
-          "enum": [
-            "Approved",
-            "Pending",
-            "Rejected",
-            "Disconnected"
-          ]
-        },
-        "description": {
-          "description": "The private link service connection description.",
-          "type": "string"
-        },
-        "actionsRequired": {
-          "description": "The actions required for private link service connection.",
-          "type": "string",
-          "readOnly": true
-        }
-      }
     }
   }
 }
diff --git a/...e/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/privateLinkResources.json b/...e/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/privateLinkResources.json
@@ -56,6 +56,12 @@
               "$ref": "#/definitions/PrivateLinkResourceListResult"
             },
             "description": "List of private link resources"
+          },
+          "default": {
+            "schema": {
+              "$ref": "./workspace.json#/definitions/ErrorContract"
+            },
+            "description": ""
           }
         },
         "x-ms-examples": {