From 9df2a4bf39ef1651e075e30a69feebd2541a3fcf Mon Sep 17 00:00:00 2001 From: Leo Liu Date: Tue, 27 Oct 2020 17:59:33 -0700 Subject: [PATCH 1/2] Synapse -- Add BabylonConfiguration workspace property --- .../examples/CreateOrUpdateWorkspace.json | 9 +++++++++ .../examples/GetWorkspace.json | 3 +++ .../examples/UpdateWorkspace.json | 9 +++++++++ .../preview/2019-06-01-preview/workspace.json | 18 ++++++++++++++++++ 4 files changed, 39 insertions(+) diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/CreateOrUpdateWorkspace.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/CreateOrUpdateWorkspace.json index 45024b169fef..379145edc396 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/CreateOrUpdateWorkspace.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/CreateOrUpdateWorkspace.json @@ -20,6 +20,9 @@ "740239CE-A25B-485B-86A0-262F29F6EBDB" ] }, + "babylonConfiguration": { + "babylonResourceId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup1/providers/Microsoft.ProjectBabylon/accounts/accountname1" + }, "sqlAdministratorLogin": "login", "sqlAdministratorLoginPassword": "password", "managedVirtualNetwork": "default", @@ -59,6 +62,9 @@ "740239CE-A25B-485B-86A0-262F29F6EBDB" ] }, + "babylonConfiguration": { + "babylonResourceId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup1/providers/Microsoft.ProjectBabylon/accounts/accountname1" + }, "sqlAdministratorLogin": "login", "sqlAdministratorLoginPassword": "password", "managedResourceGroupName": "workspaceManagedResourceGroupUnique", @@ -106,6 +112,9 @@ "740239CE-A25B-485B-86A0-262F29F6EBDB" ] }, + "babylonConfiguration": { + "babylonResourceId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup1/providers/Microsoft.ProjectBabylon/accounts/accountname1" + }, "connectivityEndpoints": { "dev": "workspace1.dev.projectarcadia.net", "sql": "workspace1.sql.projectarcadia.net" diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/GetWorkspace.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/GetWorkspace.json index ea7289112cc0..6ae002003a34 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/GetWorkspace.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/GetWorkspace.json @@ -28,6 +28,9 @@ "740239CE-A25B-485B-86A0-262F29F6EBDB" ] }, + "babylonConfiguration": { + "babylonResourceId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup1/providers/Microsoft.ProjectBabylon/accounts/accountname1" + }, "sqlAdministratorLogin": "login", "sqlAdministratorLoginPassword": "password", "managedResourceGroupName": "resourceGroup2", diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/UpdateWorkspace.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/UpdateWorkspace.json index a42bbb2ccb14..e804a4b7c473 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/UpdateWorkspace.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/UpdateWorkspace.json @@ -19,6 +19,9 @@ "allowedAadTenantIdsForLinking": [ "740239CE-A25B-485B-86A0-262F29F6EBDB" ] + }, + "babylonConfiguration": { + "babylonResourceId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup1/providers/Microsoft.ProjectBabylon/accounts/accountname1" } } } @@ -42,6 +45,9 @@ "740239CE-A25B-485B-86A0-262F29F6EBDB" ] }, + "babylonConfiguration": { + "babylonResourceId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup1/providers/Microsoft.ProjectBabylon/accounts/accountname1" + }, "connectivityEndpoints": { "dev": "workspace1.dev.projectarcadia.net", "sql": "workspace1.sql.projectarcadia.net" @@ -74,6 +80,9 @@ "740239CE-A25B-485B-86A0-262F29F6EBDB" ] }, + "babylonConfiguration": { + "babylonResourceId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup1/providers/Microsoft.ProjectBabylon/accounts/accountname1" + }, "connectivityEndpoints": { "dev": "workspace1.dev.projectarcadia.net", "sql": "workspace1.sql.projectarcadia.net" diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json index 23e084e91246..76c1e7edee3c 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json @@ -728,6 +728,16 @@ } } }, + "BabylonConfiguration": { + "description": "Babylon Configuration", + "type": "object", + "properties": { + "babylonResourceId": { + "description": "Babylon Resource ID", + "type": "string" + } + } + }, "WorkspaceAadAdminInfo": { "description": "Workspace active directory administrator", "type": "object", @@ -823,6 +833,10 @@ "managedVirtualNetworkSettings": { "description": "Managed Virtual Network Settings", "$ref": "#/definitions/ManagedVirtualNetworkSettings" + }, + "babylonConfiguration": { + "description": "Babylon Configuration", + "$ref": "#/definitions/BabylonConfiguration" } } }, @@ -860,6 +874,10 @@ "description": "Managed Virtual Network Settings", "$ref": "#/definitions/ManagedVirtualNetworkSettings" }, + "babylonConfiguration": { + "description": "Babylon Configuration", + "$ref": "#/definitions/BabylonConfiguration" + } "provisioningState": { "description": "Resource provisioning state", "type": "string", From b6093f3dbfa15660a112b2d9a0fd349121ad299f Mon Sep 17 00:00:00 2001 From: Leo Liu Date: Wed, 28 Oct 2020 19:19:49 -0700 Subject: [PATCH 2/2] Update workspace.json --- .../Microsoft.Synapse/preview/2019-06-01-preview/workspace.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json index 76c1e7edee3c..4507ad165cd0 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json @@ -877,7 +877,7 @@ "babylonConfiguration": { "description": "Babylon Configuration", "$ref": "#/definitions/BabylonConfiguration" - } + }, "provisioningState": { "description": "Resource provisioning state", "type": "string",