From ceb6e22927eac78e10f2bf4821cecb338a56964d Mon Sep 17 00:00:00 2001 From: Amogh Natu Date: Tue, 18 Feb 2020 09:05:58 -0800 Subject: [PATCH 01/24] Updated Swagger as per latest changes. --- .../stable/2018-04-01/databricks.json | 30 ++++++++++++-- .../2018-04-01/examples/WorkspaceCreate.json | 23 +++++++++-- .../WorkspaceCreateWithParameters.json | 33 ++++++++++++--- .../2018-04-01/examples/WorkspaceGet.json | 29 ++++++++++++-- .../examples/WorkspaceGetParameters.json | 19 ++++++++- .../2018-04-01/examples/WorkspaceUpdate.json | 19 ++++++++- .../WorkspacesListByResourceGroup.json | 38 ++++++++++++++++-- .../WorkspacesListBySubscription.json | 40 +++++++++++++++++-- 8 files changed, 203 insertions(+), 28 deletions(-) diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json index abc6368cb41c..123ac016eaa0 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json @@ -391,16 +391,20 @@ "$ref": "#/definitions/ProvisioningState", "description": "The workspace provisioning state." }, - "uiDefinitionUri": { - "type": "string", - "description": "The blob URI where the UI definition file is located." - }, "authorizations": { "description": "The workspace provider authorizations.", "type": "array", "items": { "$ref": "#/definitions/WorkspaceProviderAuthorization" } + }, + "createdBy": { + "description": "Indicates the Object ID, PUID and Application ID of entity that created the workspace.", + "$ref": "#/definitions/CreatedBy" + }, + "updatedBy": { + "description": "Indicates the Object ID, PUID and Application ID of entity that last updated the workspace.", + "$ref": "#/definitions/CreatedBy" } }, "required": [ @@ -615,6 +619,24 @@ }, "description": "Custom Parameters used for Cluster Creation." }, + "CreatedBy": { + "properties": { + "oid": { + "type": "string", + "format": "uuid", + "description": "The Object ID that created the workspace." + }, + "puid": { + "type": "string", + "description": "The Personal Object ID corresponding to the object ID above" + }, + "applicationId": { + "type": "string", + "format": "uuid", + "description": "The application ID of the application that initiated the creation of the workspace. For example, Azure Portal." + } + } + }, "WorkspaceProviderAuthorization": { "properties": { "principalId": { diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceCreate.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceCreate.json index 977b42112e3b..087d6b9dc466 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceCreate.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceCreate.json @@ -35,15 +35,32 @@ "id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Databricks/workspaces/myWorkspace", "type": "Microsoft.Databricks/workspaces", "location": "East US 2", - "tags": null, + "tags": { + "environment": "dev" + }, "sku": { "name": "skuName" }, "properties": { "managedResourceGroupId": "/subscriptions/subid/resourceGroups/myManagedRG", "parameters": null, - "provisioningState": "Created", - "uiDefinitionUri": "https://path/to/workspaceCreateUiDefinition.json" + "provisioningState": "Accepted", + "authorizations": [ + { + "principalId": "00000000-0000-0000-0000-000000000000", + "roleDefinitionId": "11111111-1111-1111-1111-111111111111" + } + ], + "createdBy": { + "oid": "22222222-2222-2222-2222-222222222222", + "puid": "33333333", + "applicationId": "44444444-4444-4444-4444-444444444444" + }, + "updatedBy": { + "oid": "22222222-2222-2222-2222-222222222222", + "puid": "33333333", + "applicationId": "44444444-4444-4444-4444-444444444444" + } } } } diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceCreateWithParameters.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceCreateWithParameters.json index 4e9773afc9be..c6635f2bbb0e 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceCreateWithParameters.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceCreateWithParameters.json @@ -6,7 +6,12 @@ "api-version": "2018-04-01", "parameters": { "properties": { - "managedResourceGroupId": "/subscriptions/subid/resourceGroups/myManagedRG" + "managedResourceGroupId": "/subscriptions/subid/resourceGroups/myManagedRG", + "parameters": { + "storageAccountName": { + "value": "myStorageAccount" + } + } }, "location": "westus" } @@ -76,8 +81,23 @@ "value": "10.139" } }, - "provisioningState": "Created", - "uiDefinitionUri": "https://path/to/workspaceCreateUiDefinition.json" + "provisioningState": "Succeeded", + "authorizations": [ + { + "principalId": "00000000-0000-0000-0000-000000000000", + "roleDefinitionId": "11111111-1111-1111-1111-111111111111" + } + ], + "createdBy": { + "oid": "22222222-2222-2222-2222-222222222222", + "puid": "33333333", + "applicationId": "44444444-4444-4444-4444-444444444444" + }, + "updatedBy": { + "oid": "22222222-2222-2222-2222-222222222222", + "puid": "33333333", + "applicationId": "44444444-4444-4444-4444-444444444444" + } } } }, @@ -88,7 +108,9 @@ "id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Databricks/workspaces/myWorkspace", "type": "Microsoft.Databricks/workspaces", "location": "East US 2", - "tags": null, + "tags": { + "environment": "dev" + }, "sku": { "name": "skuName" }, @@ -146,8 +168,7 @@ "value": "10.139" } }, - "provisioningState": "Created", - "uiDefinitionUri": "https://path/to/workspaceCreateUiDefinition.json" + "provisioningState": "Accepted" } } } diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGet.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGet.json index 699d03663b88..c6bce5afe0ce 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGet.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGet.json @@ -16,11 +16,34 @@ "properties": { "managedResourceGroupId": "/subscriptions/subid/resourceGroups/myManagedRG", "parameters": null, - "provisioningState": "Created", - "uiDefinitionUri": "https://path/to/workspaceCreateUiDefinition.json" + "provisioningState": "Succeeded", + "authorizations": [ + { + "principalId": "00000000-0000-0000-0000-000000000000", + "roleDefinitionId": "11111111-1111-1111-1111-111111111111" + } + ], + "createdBy": { + "oid": "22222222-2222-2222-2222-222222222222", + "puid": "33333333", + "applicationId": "44444444-4444-4444-4444-444444444444" + }, + "updatedBy": { + "oid": "22222222-2222-2222-2222-222222222222", + "puid": "33333333", + "applicationId": "44444444-4444-4444-4444-444444444444" + } } } }, - "404": {} + "404": { + "headers":{}, + "body": { + "error": { + "code": "ResourceNotFound", + "message": "The Resource 'Microsoft.Databricks/workspaces/myWorkspace' under resource group 'rg' was not found." + } + } + } } } diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGetParameters.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGetParameters.json index d2afb9f36a5f..d2d5c8883228 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGetParameters.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGetParameters.json @@ -69,8 +69,23 @@ "value": "" } }, - "provisioningState": "Created", - "uiDefinitionUri": "https://path/to/workspaceCreateUiDefinition.json" + "provisioningState": "Succeeded", + "authorizations":[ + { + "principalId": "00000000-0000-0000-0000-000000000000", + "roleDefinitionId": "11111111-1111-1111-1111-111111111111" + } + ], + "createdBy": { + "oid": "22222222-2222-2222-2222-222222222222", + "puid": "33333333", + "applicationId": "44444444-4444-4444-4444-444444444444" + }, + "updatedBy": { + "oid": "22222222-2222-2222-2222-222222222222", + "puid": "33333333", + "applicationId": "44444444-4444-4444-4444-444444444444" + } } } }, diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceUpdate.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceUpdate.json index e386347fa0a2..942b7177b194 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceUpdate.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceUpdate.json @@ -23,8 +23,23 @@ "properties": { "managedResourceGroupId": "/subscriptions/subid/resourceGroups/myManagedRG", "parameters": null, - "provisioningState": "Created", - "uiDefinitionUri": "https://path/to/workspaceCreateUiDefinition.json" + "provisioningState": "Succeeded", + "authorizations":[ + { + "principalId": "00000000-0000-0000-0000-000000000000", + "roleDefinitionId": "11111111-1111-1111-1111-111111111111" + } + ], + "createdBy": { + "oid": "22222222-2222-2222-2222-222222222222", + "puid": "33333333", + "applicationId": "44444444-4444-4444-4444-444444444444" + }, + "updatedBy": { + "oid": "22222222-2222-2222-2222-222222222222", + "puid": "33333333", + "applicationId": "44444444-4444-4444-4444-444444444444" + } } } }, diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspacesListByResourceGroup.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspacesListByResourceGroup.json index e53b60c320e1..162158b29851 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspacesListByResourceGroup.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspacesListByResourceGroup.json @@ -21,8 +21,23 @@ "properties": { "managedResourceGroupId": "/subscriptions/subid/resourceGroups/myManagedRG", "parameters": null, - "provisioningState": "Created", - "uiDefinitionUri": "https://path/to/workspaceCreateUiDefinition.json" + "provisioningState": "Succeeded", + "authorizations":[ + { + "principalId": "00000000-0000-0000-0000-000000000000", + "roleDefinitionId": "11111111-1111-1111-1111-111111111111" + } + ], + "createdBy": { + "oid": "22222222-2222-2222-2222-222222222222", + "puid": "33333333", + "applicationId": "44444444-4444-4444-4444-444444444444" + }, + "updatedBy": { + "oid": "22222222-2222-2222-2222-222222222222", + "puid": "33333333", + "applicationId": "44444444-4444-4444-4444-444444444444" + } } }, { @@ -37,8 +52,23 @@ "properties": { "managedResourceGroupId": "/subscriptions/subid/resourceGroups/myManagedRG", "parameters": null, - "provisioningState": "Created", - "uiDefinitionUri": "https://path/to/workspaceCreateUiDefinition.json" + "provisioningState": "Succeeded", + "authorizations":[ + { + "principalId": "00000000-0000-0000-0000-000000000000", + "roleDefinitionId": "11111111-1111-1111-1111-111111111111" + } + ], + "createdBy": { + "oid": "22222222-2222-2222-2222-222222222222", + "puid": "33333333", + "applicationId": "44444444-4444-4444-4444-444444444444" + }, + "updatedBy": { + "oid": "22222222-2222-2222-2222-222222222222", + "puid": "33333333", + "applicationId": "44444444-4444-4444-4444-444444444444" + } } } ] diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspacesListBySubscription.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspacesListBySubscription.json index 4fbbf3fc1d89..75188ee69f6d 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspacesListBySubscription.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspacesListBySubscription.json @@ -20,8 +20,24 @@ "properties": { "managedResourceGroupId": "/subscriptions/subid/resourceGroups/myManagedRG", "parameters": null, - "provisioningState": "Created", - "uiDefinitionUri": "https://path/to/workspaceCreateUiDefinition.json" + "provisioningState": "Succeeded", + "authorizations":[ + { + "principalId": "00000000-0000-0000-0000-000000000000", + "roleDefinitionId": "11111111-1111-1111-1111-111111111111" + } + ], + "createdBy": { + "oid": "22222222-2222-2222-2222-222222222222", + "puid": "33333333", + "applicationId": "44444444-4444-4444-4444-444444444444" + }, + "updatedBy": { + "oid": "22222222-2222-2222-2222-222222222222", + "puid": "33333333", + "applicationId": "44444444-4444-4444-4444-444444444444" + }, + "createdDateTime": "YYYY-MM-ddTHH:mm:ss.fffZ" } }, { @@ -36,8 +52,24 @@ "properties": { "managedResourceGroupId": "/subscriptions/subid/resourceGroups/myManagedRG", "parameters": null, - "provisioningState": "Created", - "uiDefinitionUri": "https://path/to/workspaceCreateUiDefinition.json" + "provisioningState": "Succeeded", + "authorizations":[ + { + "principalId": "00000000-0000-0000-0000-000000000000", + "roleDefinitionId": "11111111-1111-1111-1111-111111111111" + } + ], + "createdBy": { + "oid": "22222222-2222-2222-2222-222222222222", + "puid": "33333333", + "applicationId": "44444444-4444-4444-4444-444444444444" + }, + "updatedBy": { + "oid": "22222222-2222-2222-2222-222222222222", + "puid": "33333333", + "applicationId": "44444444-4444-4444-4444-444444444444" + }, + "createdDateTime": "YYYY-MM-ddTHH:mm:ss.fffZ" } } ] From 2503391a626cff583103dd94e048a68088e45226 Mon Sep 17 00:00:00 2001 From: Amogh Natu Date: Tue, 18 Feb 2020 10:21:49 -0800 Subject: [PATCH 02/24] Added description field Added the missing 'description' field in CreatedBy element --- .../Microsoft.Databricks/stable/2018-04-01/databricks.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json index 123ac016eaa0..67202d5a9084 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json @@ -635,7 +635,8 @@ "format": "uuid", "description": "The application ID of the application that initiated the creation of the workspace. For example, Azure Portal." } - } + }, + "description":"Provides details of the entity that created/updated the workspace." }, "WorkspaceProviderAuthorization": { "properties": { From 8e6467e218ecacebf15f5a45062cd62c8b4d02d8 Mon Sep 17 00:00:00 2001 From: Amogh Natu Date: Wed, 19 Feb 2020 10:05:08 -0800 Subject: [PATCH 03/24] added readonly attribute added readonly attribute to properties --- .../Microsoft.Databricks/stable/2018-04-01/databricks.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json index 67202d5a9084..18788a409d39 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json @@ -399,10 +399,12 @@ } }, "createdBy": { + "readOnly": true, "description": "Indicates the Object ID, PUID and Application ID of entity that created the workspace.", "$ref": "#/definitions/CreatedBy" }, "updatedBy": { + "readOnly": true, "description": "Indicates the Object ID, PUID and Application ID of entity that last updated the workspace.", "$ref": "#/definitions/CreatedBy" } From 8f9ddf8fd7a40e5eabe5cf35d4142bd48fb75e29 Mon Sep 17 00:00:00 2001 From: Amogh Natu Date: Wed, 19 Feb 2020 14:22:51 -0800 Subject: [PATCH 04/24] Fixed review comments Fixed all the below review comments. 1. New property 'properties.parameters.enableFedRampCertified' 2. Returning 'properties.CreatedDateTime' 3. VNet peering in the operation list 4. AML workspace id in the example should be a resource uri 5. Sku name value should be allowed value (in the example) 6. Revert changes to remove properties 7. Update examples as well. --- .../stable/2018-04-01/databricks.json | 8 ++ .../2018-04-01/examples/OperationsList.json | 27 +++++++ .../2018-04-01/examples/WorkspaceCreate.json | 27 +++++-- .../WorkspaceCreateWithParameters.json | 80 ++++++------------- .../2018-04-01/examples/WorkspaceGet.json | 6 +- .../examples/WorkspaceGetParameters.json | 20 ++++- .../2018-04-01/examples/WorkspaceUpdate.json | 6 +- .../WorkspacesListByResourceGroup.json | 10 ++- .../WorkspacesListBySubscription.json | 4 +- 9 files changed, 118 insertions(+), 70 deletions(-) diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json index 18788a409d39..455193083e7a 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json @@ -391,6 +391,10 @@ "$ref": "#/definitions/ProvisioningState", "description": "The workspace provisioning state." }, + "uiDefinitionUri": { + "type": "string", + "description": "The blob URI where the UI definition file is located." + }, "authorizations": { "description": "The workspace provider authorizations.", "type": "array", @@ -617,6 +621,10 @@ "vnetAddressPrefix": { "$ref": "#/definitions/WorkspaceCustomStringParameter", "description": "The first 2 octets of the virtual network /16 address range (e.g., '10.139' for the address range 10.139.0.0/16)." + }, + "enableFedRampCertified": { + "$ref": "#/definitions/WorkspaceCustomBooleanParameter", + "description": "Boolean indicating whether FedRAMP Certification should be enabled on the workspace." } }, "description": "Custom Parameters used for Cluster Creation." diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/OperationsList.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/OperationsList.json index ae621c5399a9..4da476627d55 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/OperationsList.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/OperationsList.json @@ -31,6 +31,33 @@ "operation": "Remove Workspace", "description": "Removes an workspace." } + }, + { + "name": "Microsoft.Databricks/workspaces/virtualNetworkPeerings/read", + "display": { + "provider": "Microsoft Databricks", + "resource": "Virtual Network Peering", + "operation": "Get Virtual Network Peering", + "description": "Gets the virtual network peering." + } + }, + { + "name": "Microsoft.Databricks/workspaces/virtualNetworkPeerings/write", + "display": { + "provider": "Microsoft Databricks", + "resource": "Virtual Network Peering", + "operation": "Add Virtual Network Peering", + "description": "Add or modify virtual network peering" + } + }, + { + "name": "Microsoft.Databricks/workspaces/virtualNetworkPeerings/delete", + "display": { + "provider": "Microsoft Databricks", + "resource": "Virtual Network Peering", + "operation": "Delete Virtual Network Peering", + "description": "Deletes a virtual network peering" + } } ] } diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceCreate.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceCreate.json index 087d6b9dc466..7aea191693b8 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceCreate.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceCreate.json @@ -19,13 +19,29 @@ "location": "East US 2", "tags": null, "sku": { - "name": "skuName" + "name": "premium" }, "properties": { "managedResourceGroupId": "/subscriptions/subid/resourceGroups/myManagedRG", "parameters": null, - "provisioningState": "Created", - "uiDefinitionUri": "https://path/to/workspaceCreateUiDefinition.json" + "provisioningState": "Accepted", + "authorizations": [ + { + "principalId": "00000000-0000-0000-0000-000000000000", + "roleDefinitionId": "11111111-1111-1111-1111-111111111111" + } + ], + "createdBy": { + "oid": "22222222-2222-2222-2222-222222222222", + "puid": "33333333", + "applicationId": "44444444-4444-4444-4444-444444444444" + }, + "updatedBy": { + "oid": "22222222-2222-2222-2222-222222222222", + "puid": "33333333", + "applicationId": "44444444-4444-4444-4444-444444444444" + }, + "createdDateTime": "YYYY-MM-ddTHH:mm:ss.fffZ" } } }, @@ -39,7 +55,7 @@ "environment": "dev" }, "sku": { - "name": "skuName" + "name": "premium" }, "properties": { "managedResourceGroupId": "/subscriptions/subid/resourceGroups/myManagedRG", @@ -60,7 +76,8 @@ "oid": "22222222-2222-2222-2222-222222222222", "puid": "33333333", "applicationId": "44444444-4444-4444-4444-444444444444" - } + }, + "createdDateTime": "YYYY-MM-ddTHH:mm:ss.fffZ" } } } diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceCreateWithParameters.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceCreateWithParameters.json index c6635f2bbb0e..1bc102338c09 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceCreateWithParameters.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceCreateWithParameters.json @@ -25,14 +25,14 @@ "location": "East US 2", "tags": null, "sku": { - "name": "skuName" + "name": "premium" }, "properties": { "managedResourceGroupId": "/subscriptions/subid/resourceGroups/myManagedRG", "parameters": { "amlWorkspaceId": { "type": "String", - "value": "11112222-3333-4444-5555-666677778888" + "value": "/subscriptions/subid/resourcegroups/rg/providers/Microsoft.MachineLearningServices/workspaces/myAmlWorkspace" }, "customPrivateSubnetName": { "type": "String", @@ -79,6 +79,10 @@ "vnetAddressPrefix": { "type": "String", "value": "10.139" + }, + "enableFedRampCertified": { + "type": "Bool", + "value": true } }, "provisioningState": "Succeeded", @@ -97,7 +101,8 @@ "oid": "22222222-2222-2222-2222-222222222222", "puid": "33333333", "applicationId": "44444444-4444-4444-4444-444444444444" - } + }, + "createdDateTime": "YYYY-MM-ddTHH:mm:ss.fffZ" } } }, @@ -112,63 +117,28 @@ "environment": "dev" }, "sku": { - "name": "skuName" + "name": "premium" }, "properties": { "managedResourceGroupId": "/subscriptions/subid/resourceGroups/myManagedRG", - "parameters": { - "amlWorkspaceId": { - "type": "String", - "value": "11112222-3333-4444-5555-666677778888" - }, - "customPrivateSubnetName": { - "type": "String", - "value": "PrivateBob" - }, - "customPublicSubnetName": { - "type": "String", - "value": "PublicSarah" - }, - "customVirtualNetworkId": { - "type": "String", - "value": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Network/virtualNetworks/myNetwork" - }, - "enableNoPublicIp": { - "type": "Bool", - "value": true - }, - "loadBalancerBackendPoolName": { - "type": "String", - "value": "CustomBackendAddressPool" - }, - "loadBalancerId": { - "type": "String", - "value": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Network/loadBalancers/lb1" - }, - "relayNamespaceName": { - "type": "String", - "value": "test" - }, - "resourceTags": { - "type": "Object", - "value": { - "hello": "world" - } - }, - "storageAccountName": { - "type": "String", - "value": "mysa999" - }, - "storageAccountSkuName": { - "type": "String", - "value": "Standard_GRS" - }, - "vnetAddressPrefix": { - "type": "String", - "value": "10.139" + "provisioningState": "Accepted", + "authorizations": [ + { + "principalId": "00000000-0000-0000-0000-000000000000", + "roleDefinitionId": "11111111-1111-1111-1111-111111111111" } + ], + "createdBy": { + "oid": "22222222-2222-2222-2222-222222222222", + "puid": "33333333", + "applicationId": "44444444-4444-4444-4444-444444444444" + }, + "updatedBy": { + "oid": "22222222-2222-2222-2222-222222222222", + "puid": "33333333", + "applicationId": "44444444-4444-4444-4444-444444444444" }, - "provisioningState": "Accepted" + "createdDateTime": "YYYY-MM-ddTHH:mm:ss.fffZ" } } } diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGet.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGet.json index c6bce5afe0ce..4339e07fe173 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGet.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGet.json @@ -12,6 +12,9 @@ "name": "myWorkspace", "id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Databricks/workspaces/myWorkspace", "type": "Microsoft.Databricks/workspaces", + "sku": { + "name": "premium" + }, "location": "East US 2", "properties": { "managedResourceGroupId": "/subscriptions/subid/resourceGroups/myManagedRG", @@ -32,7 +35,8 @@ "oid": "22222222-2222-2222-2222-222222222222", "puid": "33333333", "applicationId": "44444444-4444-4444-4444-444444444444" - } + }, + "createdDateTime": "YYYY-MM-ddTHH:mm:ss.fffZ" } } }, diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGetParameters.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGetParameters.json index d2d5c8883228..c12873014d6c 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGetParameters.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGetParameters.json @@ -13,6 +13,9 @@ "id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Databricks/workspaces/myWorkspace", "type": "Microsoft.Databricks/workspaces", "location": "East US 2", + "sku": { + "name": "premium" + }, "properties": { "managedResourceGroupId": "/subscriptions/subid/resourceGroups/myManagedRG", "parameters": { @@ -67,6 +70,10 @@ "amlWorkspaceId": { "type": "String", "value": "" + }, + "enableFedRampCertified": { + "type": "Bool", + "value": true } }, "provisioningState": "Succeeded", @@ -85,10 +92,19 @@ "oid": "22222222-2222-2222-2222-222222222222", "puid": "33333333", "applicationId": "44444444-4444-4444-4444-444444444444" - } + }, + "createdDateTime": "YYYY-MM-ddTHH:mm:ss.fffZ" } } }, - "404": {} + "404": { + "headers":{}, + "body": { + "error": { + "code": "ResourceNotFound", + "message": "The Resource 'Microsoft.Databricks/workspaces/myWorkspace' under resource group 'rg' was not found." + } + } + } } } diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceUpdate.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceUpdate.json index 942b7177b194..a9a0d517f65d 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceUpdate.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceUpdate.json @@ -20,6 +20,9 @@ "tags": { "mytag1": "myvalue1" }, + "sku": { + "name": "premium" + }, "properties": { "managedResourceGroupId": "/subscriptions/subid/resourceGroups/myManagedRG", "parameters": null, @@ -39,7 +42,8 @@ "oid": "22222222-2222-2222-2222-222222222222", "puid": "33333333", "applicationId": "44444444-4444-4444-4444-444444444444" - } + }, + "createdDateTime": "YYYY-MM-ddTHH:mm:ss.fffZ" } } }, diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspacesListByResourceGroup.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspacesListByResourceGroup.json index 162158b29851..25608247d58f 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspacesListByResourceGroup.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspacesListByResourceGroup.json @@ -16,7 +16,7 @@ "location": "East US 2", "tags": null, "sku": { - "name": "skuName" + "name": "premium" }, "properties": { "managedResourceGroupId": "/subscriptions/subid/resourceGroups/myManagedRG", @@ -37,7 +37,8 @@ "oid": "22222222-2222-2222-2222-222222222222", "puid": "33333333", "applicationId": "44444444-4444-4444-4444-444444444444" - } + }, + "createdDateTime": "YYYY-MM-ddTHH:mm:ss.fffZ" } }, { @@ -47,7 +48,7 @@ "location": "East US 2", "tags": null, "sku": { - "name": "skuName" + "name": "standard" }, "properties": { "managedResourceGroupId": "/subscriptions/subid/resourceGroups/myManagedRG", @@ -68,7 +69,8 @@ "oid": "22222222-2222-2222-2222-222222222222", "puid": "33333333", "applicationId": "44444444-4444-4444-4444-444444444444" - } + }, + "createdDateTime": "YYYY-MM-ddTHH:mm:ss.fffZ" } } ] diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspacesListBySubscription.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspacesListBySubscription.json index 75188ee69f6d..d2d5cd7eea6f 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspacesListBySubscription.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspacesListBySubscription.json @@ -15,7 +15,7 @@ "location": "East US 2", "tags": null, "sku": { - "name": "skuName" + "name": "premium" }, "properties": { "managedResourceGroupId": "/subscriptions/subid/resourceGroups/myManagedRG", @@ -47,7 +47,7 @@ "location": "East US 2", "tags": null, "sku": { - "name": "skuName" + "name": "standard" }, "properties": { "managedResourceGroupId": "/subscriptions/subid/resourceGroups/myManagedRG", From 8277de26ce580a478f86d5ccd354329667d3c032 Mon Sep 17 00:00:00 2001 From: Amogh Natu Date: Wed, 19 Feb 2020 16:18:20 -0800 Subject: [PATCH 05/24] Fixed model validation errors Fixed model validation errors. --- .../stable/2018-04-01/databricks.json | 19 +++++++++++++++---- .../2018-04-01/examples/WorkspaceCreate.json | 2 ++ .../WorkspaceCreateWithParameters.json | 2 ++ .../2018-04-01/examples/WorkspaceGet.json | 1 + .../examples/WorkspaceGetParameters.json | 1 + .../2018-04-01/examples/WorkspaceUpdate.json | 1 + .../WorkspacesListByResourceGroup.json | 2 ++ .../WorkspacesListBySubscription.json | 2 ++ 8 files changed, 26 insertions(+), 4 deletions(-) diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json index 455193083e7a..e2dc8c28ae0b 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json @@ -71,7 +71,10 @@ } }, "404": { - "description": "Not Found" + "description": "Not Found", + "schema": { + "$ref": "#/definitions/ErrorDetail" + } }, "default": { "description": "Error response describing why the operation failed.", @@ -403,14 +406,16 @@ } }, "createdBy": { - "readOnly": true, "description": "Indicates the Object ID, PUID and Application ID of entity that created the workspace.", "$ref": "#/definitions/CreatedBy" }, "updatedBy": { - "readOnly": true, "description": "Indicates the Object ID, PUID and Application ID of entity that last updated the workspace.", "$ref": "#/definitions/CreatedBy" + }, + "createdDateTime": { + "description": "Specifies the date and time when the workspace is created.", + "$ref": "#definitions/CreatedDateTime" } }, "required": [ @@ -629,6 +634,11 @@ }, "description": "Custom Parameters used for Cluster Creation." }, + "CreatedDateTime": { + "type": "string", + "format": "date-time", + "readOnly": true + }, "CreatedBy": { "properties": { "oid": { @@ -646,7 +656,8 @@ "description": "The application ID of the application that initiated the creation of the workspace. For example, Azure Portal." } }, - "description":"Provides details of the entity that created/updated the workspace." + "description":"Provides details of the entity that created/updated the workspace.", + "readOnly": true }, "WorkspaceProviderAuthorization": { "properties": { diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceCreate.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceCreate.json index 7aea191693b8..a552ddf907d2 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceCreate.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceCreate.json @@ -25,6 +25,7 @@ "managedResourceGroupId": "/subscriptions/subid/resourceGroups/myManagedRG", "parameters": null, "provisioningState": "Accepted", + "uiDefinitionUri": "https://path/to/workspaceCreateUiDefinition.json", "authorizations": [ { "principalId": "00000000-0000-0000-0000-000000000000", @@ -61,6 +62,7 @@ "managedResourceGroupId": "/subscriptions/subid/resourceGroups/myManagedRG", "parameters": null, "provisioningState": "Accepted", + "uiDefinitionUri": "https://path/to/workspaceCreateUiDefinition.json", "authorizations": [ { "principalId": "00000000-0000-0000-0000-000000000000", diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceCreateWithParameters.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceCreateWithParameters.json index 1bc102338c09..afbd7af6eec8 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceCreateWithParameters.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceCreateWithParameters.json @@ -86,6 +86,7 @@ } }, "provisioningState": "Succeeded", + "uiDefinitionUri": "https://path/to/workspaceCreateUiDefinition.json", "authorizations": [ { "principalId": "00000000-0000-0000-0000-000000000000", @@ -122,6 +123,7 @@ "properties": { "managedResourceGroupId": "/subscriptions/subid/resourceGroups/myManagedRG", "provisioningState": "Accepted", + "uiDefinitionUri": "https://path/to/workspaceCreateUiDefinition.json", "authorizations": [ { "principalId": "00000000-0000-0000-0000-000000000000", diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGet.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGet.json index 4339e07fe173..9c21b01ed838 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGet.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGet.json @@ -20,6 +20,7 @@ "managedResourceGroupId": "/subscriptions/subid/resourceGroups/myManagedRG", "parameters": null, "provisioningState": "Succeeded", + "uiDefinitionUri": "https://path/to/workspaceCreateUiDefinition.json", "authorizations": [ { "principalId": "00000000-0000-0000-0000-000000000000", diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGetParameters.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGetParameters.json index c12873014d6c..43e9cc1f7ca2 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGetParameters.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGetParameters.json @@ -77,6 +77,7 @@ } }, "provisioningState": "Succeeded", + "uiDefinitionUri": "https://path/to/workspaceCreateUiDefinition.json", "authorizations":[ { "principalId": "00000000-0000-0000-0000-000000000000", diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceUpdate.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceUpdate.json index a9a0d517f65d..7ca5d8ca8491 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceUpdate.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceUpdate.json @@ -27,6 +27,7 @@ "managedResourceGroupId": "/subscriptions/subid/resourceGroups/myManagedRG", "parameters": null, "provisioningState": "Succeeded", + "uiDefinitionUri": "https://path/to/workspaceCreateUiDefinition.json", "authorizations":[ { "principalId": "00000000-0000-0000-0000-000000000000", diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspacesListByResourceGroup.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspacesListByResourceGroup.json index 25608247d58f..3efb1ddbca81 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspacesListByResourceGroup.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspacesListByResourceGroup.json @@ -22,6 +22,7 @@ "managedResourceGroupId": "/subscriptions/subid/resourceGroups/myManagedRG", "parameters": null, "provisioningState": "Succeeded", + "uiDefinitionUri": "https://path/to/workspaceCreateUiDefinition.json", "authorizations":[ { "principalId": "00000000-0000-0000-0000-000000000000", @@ -54,6 +55,7 @@ "managedResourceGroupId": "/subscriptions/subid/resourceGroups/myManagedRG", "parameters": null, "provisioningState": "Succeeded", + "uiDefinitionUri": "https://path/to/workspaceCreateUiDefinition.json", "authorizations":[ { "principalId": "00000000-0000-0000-0000-000000000000", diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspacesListBySubscription.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspacesListBySubscription.json index d2d5cd7eea6f..5afc97b68a0d 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspacesListBySubscription.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspacesListBySubscription.json @@ -21,6 +21,7 @@ "managedResourceGroupId": "/subscriptions/subid/resourceGroups/myManagedRG", "parameters": null, "provisioningState": "Succeeded", + "uiDefinitionUri": "https://path/to/workspaceCreateUiDefinition.json", "authorizations":[ { "principalId": "00000000-0000-0000-0000-000000000000", @@ -53,6 +54,7 @@ "managedResourceGroupId": "/subscriptions/subid/resourceGroups/myManagedRG", "parameters": null, "provisioningState": "Succeeded", + "uiDefinitionUri": "https://path/to/workspaceCreateUiDefinition.json", "authorizations":[ { "principalId": "00000000-0000-0000-0000-000000000000", From f3ec322239af15b3325fcacdb1a0739c19035447 Mon Sep 17 00:00:00 2001 From: Amogh Natu Date: Wed, 19 Feb 2020 16:24:41 -0800 Subject: [PATCH 06/24] fixed typo --- .../Microsoft.Databricks/stable/2018-04-01/databricks.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json index e2dc8c28ae0b..c26ba201716d 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json @@ -415,7 +415,7 @@ }, "createdDateTime": { "description": "Specifies the date and time when the workspace is created.", - "$ref": "#definitions/CreatedDateTime" + "$ref": "#/definitions/CreatedDateTime" } }, "required": [ From 2cff5d64a9d053fa13ec0fffe787507f9db92d8b Mon Sep 17 00:00:00 2001 From: Amogh Natu Date: Wed, 19 Feb 2020 16:45:30 -0800 Subject: [PATCH 07/24] updated datetime format --- .../stable/2018-04-01/examples/WorkspaceCreate.json | 4 ++-- .../2018-04-01/examples/WorkspaceCreateWithParameters.json | 4 ++-- .../stable/2018-04-01/examples/WorkspaceGet.json | 2 +- .../stable/2018-04-01/examples/WorkspaceGetParameters.json | 2 +- .../stable/2018-04-01/examples/WorkspaceUpdate.json | 2 +- .../2018-04-01/examples/WorkspacesListByResourceGroup.json | 4 ++-- .../2018-04-01/examples/WorkspacesListBySubscription.json | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceCreate.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceCreate.json index a552ddf907d2..3f925bcda1e6 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceCreate.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceCreate.json @@ -42,7 +42,7 @@ "puid": "33333333", "applicationId": "44444444-4444-4444-4444-444444444444" }, - "createdDateTime": "YYYY-MM-ddTHH:mm:ss.fffZ" + "createdDateTime": "2020-02-20T00:10:29.2858439Z" } } }, @@ -79,7 +79,7 @@ "puid": "33333333", "applicationId": "44444444-4444-4444-4444-444444444444" }, - "createdDateTime": "YYYY-MM-ddTHH:mm:ss.fffZ" + "createdDateTime": "2020-02-20T00:10:29.2858439Z" } } } diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceCreateWithParameters.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceCreateWithParameters.json index afbd7af6eec8..22f50c9b00fe 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceCreateWithParameters.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceCreateWithParameters.json @@ -103,7 +103,7 @@ "puid": "33333333", "applicationId": "44444444-4444-4444-4444-444444444444" }, - "createdDateTime": "YYYY-MM-ddTHH:mm:ss.fffZ" + "createdDateTime": "2020-02-20T00:10:29.2858439Z" } } }, @@ -140,7 +140,7 @@ "puid": "33333333", "applicationId": "44444444-4444-4444-4444-444444444444" }, - "createdDateTime": "YYYY-MM-ddTHH:mm:ss.fffZ" + "createdDateTime": "2020-02-20T00:10:29.2858439Z" } } } diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGet.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGet.json index 9c21b01ed838..2420b7610f1b 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGet.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGet.json @@ -37,7 +37,7 @@ "puid": "33333333", "applicationId": "44444444-4444-4444-4444-444444444444" }, - "createdDateTime": "YYYY-MM-ddTHH:mm:ss.fffZ" + "createdDateTime": "2020-02-20T00:10:29.2858439Z" } } }, diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGetParameters.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGetParameters.json index 43e9cc1f7ca2..bb1f7a11504d 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGetParameters.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGetParameters.json @@ -94,7 +94,7 @@ "puid": "33333333", "applicationId": "44444444-4444-4444-4444-444444444444" }, - "createdDateTime": "YYYY-MM-ddTHH:mm:ss.fffZ" + "createdDateTime": "2020-02-20T00:10:29.2858439Z" } } }, diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceUpdate.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceUpdate.json index 7ca5d8ca8491..59187f737c7c 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceUpdate.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceUpdate.json @@ -44,7 +44,7 @@ "puid": "33333333", "applicationId": "44444444-4444-4444-4444-444444444444" }, - "createdDateTime": "YYYY-MM-ddTHH:mm:ss.fffZ" + "createdDateTime": "2020-02-20T00:10:29.2858439Z" } } }, diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspacesListByResourceGroup.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspacesListByResourceGroup.json index 3efb1ddbca81..af73fa1e339d 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspacesListByResourceGroup.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspacesListByResourceGroup.json @@ -39,7 +39,7 @@ "puid": "33333333", "applicationId": "44444444-4444-4444-4444-444444444444" }, - "createdDateTime": "YYYY-MM-ddTHH:mm:ss.fffZ" + "createdDateTime": "2020-02-20T00:10:29.2858439Z" } }, { @@ -72,7 +72,7 @@ "puid": "33333333", "applicationId": "44444444-4444-4444-4444-444444444444" }, - "createdDateTime": "YYYY-MM-ddTHH:mm:ss.fffZ" + "createdDateTime": "2020-02-20T00:10:29.2858439Z" } } ] diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspacesListBySubscription.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspacesListBySubscription.json index 5afc97b68a0d..dde37c8609ce 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspacesListBySubscription.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspacesListBySubscription.json @@ -38,7 +38,7 @@ "puid": "33333333", "applicationId": "44444444-4444-4444-4444-444444444444" }, - "createdDateTime": "YYYY-MM-ddTHH:mm:ss.fffZ" + "createdDateTime": "2020-02-20T00:10:29.2858439Z" } }, { @@ -71,7 +71,7 @@ "puid": "33333333", "applicationId": "44444444-4444-4444-4444-444444444444" }, - "createdDateTime": "YYYY-MM-ddTHH:mm:ss.fffZ" + "createdDateTime": "2020-02-20T00:10:29.2858439Z" } } ] From c87389c41d689148710c91b2b1ca11b24aa635f8 Mon Sep 17 00:00:00 2001 From: Amogh Natu Date: Wed, 19 Feb 2020 16:52:37 -0800 Subject: [PATCH 08/24] fixed error response definition path --- .../Microsoft.Databricks/stable/2018-04-01/databricks.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json index c26ba201716d..13c6ecabe4d5 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json @@ -73,7 +73,7 @@ "404": { "description": "Not Found", "schema": { - "$ref": "#/definitions/ErrorDetail" + "$ref": "#/definitions/ErrorResponse" } }, "default": { From 2ffb27c1ea74457d0f7420a0cbc7298d21efcd26 Mon Sep 17 00:00:00 2001 From: Amogh Natu Date: Wed, 19 Feb 2020 21:37:20 -0800 Subject: [PATCH 09/24] fixed prettier issues --- .../Microsoft.Databricks/stable/2018-04-01/databricks.json | 4 ++-- .../stable/2018-04-01/examples/WorkspaceGet.json | 2 +- .../stable/2018-04-01/examples/WorkspaceGetParameters.json | 4 ++-- .../stable/2018-04-01/examples/WorkspaceUpdate.json | 2 +- .../2018-04-01/examples/WorkspacesListByResourceGroup.json | 4 ++-- .../2018-04-01/examples/WorkspacesListBySubscription.json | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json index 13c6ecabe4d5..7384f240ff5a 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json @@ -396,7 +396,7 @@ }, "uiDefinitionUri": { "type": "string", - "description": "The blob URI where the UI definition file is located." + "description": "The blob URI where the UI definition file is located." }, "authorizations": { "description": "The workspace provider authorizations.", @@ -656,7 +656,7 @@ "description": "The application ID of the application that initiated the creation of the workspace. For example, Azure Portal." } }, - "description":"Provides details of the entity that created/updated the workspace.", + "description": "Provides details of the entity that created/updated the workspace.", "readOnly": true }, "WorkspaceProviderAuthorization": { diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGet.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGet.json index 2420b7610f1b..7d1ee0b5feb7 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGet.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGet.json @@ -42,7 +42,7 @@ } }, "404": { - "headers":{}, + "headers": {}, "body": { "error": { "code": "ResourceNotFound", diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGetParameters.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGetParameters.json index bb1f7a11504d..bd809e3b1472 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGetParameters.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGetParameters.json @@ -78,7 +78,7 @@ }, "provisioningState": "Succeeded", "uiDefinitionUri": "https://path/to/workspaceCreateUiDefinition.json", - "authorizations":[ + "authorizations": [ { "principalId": "00000000-0000-0000-0000-000000000000", "roleDefinitionId": "11111111-1111-1111-1111-111111111111" @@ -99,7 +99,7 @@ } }, "404": { - "headers":{}, + "headers": {}, "body": { "error": { "code": "ResourceNotFound", diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceUpdate.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceUpdate.json index 59187f737c7c..743d572ae9f8 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceUpdate.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceUpdate.json @@ -28,7 +28,7 @@ "parameters": null, "provisioningState": "Succeeded", "uiDefinitionUri": "https://path/to/workspaceCreateUiDefinition.json", - "authorizations":[ + "authorizations": [ { "principalId": "00000000-0000-0000-0000-000000000000", "roleDefinitionId": "11111111-1111-1111-1111-111111111111" diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspacesListByResourceGroup.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspacesListByResourceGroup.json index af73fa1e339d..cbf7ccfba86b 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspacesListByResourceGroup.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspacesListByResourceGroup.json @@ -23,7 +23,7 @@ "parameters": null, "provisioningState": "Succeeded", "uiDefinitionUri": "https://path/to/workspaceCreateUiDefinition.json", - "authorizations":[ + "authorizations": [ { "principalId": "00000000-0000-0000-0000-000000000000", "roleDefinitionId": "11111111-1111-1111-1111-111111111111" @@ -56,7 +56,7 @@ "parameters": null, "provisioningState": "Succeeded", "uiDefinitionUri": "https://path/to/workspaceCreateUiDefinition.json", - "authorizations":[ + "authorizations": [ { "principalId": "00000000-0000-0000-0000-000000000000", "roleDefinitionId": "11111111-1111-1111-1111-111111111111" diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspacesListBySubscription.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspacesListBySubscription.json index dde37c8609ce..22996cc86036 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspacesListBySubscription.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspacesListBySubscription.json @@ -22,7 +22,7 @@ "parameters": null, "provisioningState": "Succeeded", "uiDefinitionUri": "https://path/to/workspaceCreateUiDefinition.json", - "authorizations":[ + "authorizations": [ { "principalId": "00000000-0000-0000-0000-000000000000", "roleDefinitionId": "11111111-1111-1111-1111-111111111111" @@ -55,7 +55,7 @@ "parameters": null, "provisioningState": "Succeeded", "uiDefinitionUri": "https://path/to/workspaceCreateUiDefinition.json", - "authorizations":[ + "authorizations": [ { "principalId": "00000000-0000-0000-0000-000000000000", "roleDefinitionId": "11111111-1111-1111-1111-111111111111" From ed1bd6edba9b1e973c77b900b8ecf48b998326d1 Mon Sep 17 00:00:00 2001 From: Amogh Natu Date: Thu, 20 Feb 2020 06:25:04 -0800 Subject: [PATCH 10/24] updated readonly on the properties --- .../stable/2018-04-01/databricks.json | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json index 7384f240ff5a..a54d9e5e5bd4 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json @@ -644,20 +644,22 @@ "oid": { "type": "string", "format": "uuid", - "description": "The Object ID that created the workspace." + "description": "The Object ID that created the workspace.", + "readOnly": true }, "puid": { "type": "string", - "description": "The Personal Object ID corresponding to the object ID above" + "description": "The Personal Object ID corresponding to the object ID above", + "readOnly": true }, "applicationId": { "type": "string", "format": "uuid", - "description": "The application ID of the application that initiated the creation of the workspace. For example, Azure Portal." + "description": "The application ID of the application that initiated the creation of the workspace. For example, Azure Portal.", + "readOnly": true } }, - "description": "Provides details of the entity that created/updated the workspace.", - "readOnly": true + "description": "Provides details of the entity that created/updated the workspace." }, "WorkspaceProviderAuthorization": { "properties": { From f29e64548998ae7f788e95f1619be8a769902bd3 Mon Sep 17 00:00:00 2001 From: Amogh Natu Date: Thu, 20 Feb 2020 13:44:17 -0800 Subject: [PATCH 11/24] Changed enableFedRamp value --- .../2018-04-01/examples/WorkspaceCreateWithParameters.json | 2 +- .../stable/2018-04-01/examples/WorkspaceGetParameters.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceCreateWithParameters.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceCreateWithParameters.json index 22f50c9b00fe..bb25ec73a348 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceCreateWithParameters.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceCreateWithParameters.json @@ -82,7 +82,7 @@ }, "enableFedRampCertified": { "type": "Bool", - "value": true + "value": false } }, "provisioningState": "Succeeded", diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGetParameters.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGetParameters.json index bd809e3b1472..be26a23d5e34 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGetParameters.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGetParameters.json @@ -73,7 +73,7 @@ }, "enableFedRampCertified": { "type": "Bool", - "value": true + "value": false } }, "provisioningState": "Succeeded", From c86abe9a3f33be1cbca2c7fb95d5b1e83af10bca Mon Sep 17 00:00:00 2001 From: Amogh Natu Date: Thu, 20 Feb 2020 13:51:59 -0800 Subject: [PATCH 12/24] Renamed property --- .../Microsoft.Databricks/stable/2018-04-01/databricks.json | 2 +- .../2018-04-01/examples/WorkspaceCreateWithParameters.json | 2 +- .../stable/2018-04-01/examples/WorkspaceGetParameters.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json index a54d9e5e5bd4..b2e14df1170f 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json @@ -627,7 +627,7 @@ "$ref": "#/definitions/WorkspaceCustomStringParameter", "description": "The first 2 octets of the virtual network /16 address range (e.g., '10.139' for the address range 10.139.0.0/16)." }, - "enableFedRampCertified": { + "enableFedRampCertification": { "$ref": "#/definitions/WorkspaceCustomBooleanParameter", "description": "Boolean indicating whether FedRAMP Certification should be enabled on the workspace." } diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceCreateWithParameters.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceCreateWithParameters.json index bb25ec73a348..83e4035d6c34 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceCreateWithParameters.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceCreateWithParameters.json @@ -80,7 +80,7 @@ "type": "String", "value": "10.139" }, - "enableFedRampCertified": { + "enableFedRampCertification": { "type": "Bool", "value": false } diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGetParameters.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGetParameters.json index be26a23d5e34..0c1a9be9b6fa 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGetParameters.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGetParameters.json @@ -71,7 +71,7 @@ "type": "String", "value": "" }, - "enableFedRampCertified": { + "enableFedRampCertification": { "type": "Bool", "value": false } From 8bb00d5816c09728b142bfb48b631d3bdaffd9b6 Mon Sep 17 00:00:00 2001 From: Amogh Natu Date: Fri, 21 Feb 2020 14:57:30 -0800 Subject: [PATCH 13/24] removed unnecesary 404 code --- .../Microsoft.Databricks/stable/2018-04-01/databricks.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json index b2e14df1170f..c46708d37995 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json @@ -70,12 +70,6 @@ "$ref": "#/definitions/Workspace" } }, - "404": { - "description": "Not Found", - "schema": { - "$ref": "#/definitions/ErrorResponse" - } - }, "default": { "description": "Error response describing why the operation failed.", "schema": { From 5e294b3ba870adf20ac38594baff85c70df3f568 Mon Sep 17 00:00:00 2001 From: Amogh Natu Date: Fri, 21 Feb 2020 19:43:42 -0800 Subject: [PATCH 14/24] removed 404 response in example --- .../stable/2018-04-01/examples/WorkspaceGet.json | 9 --------- 1 file changed, 9 deletions(-) diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGet.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGet.json index 7d1ee0b5feb7..0d300eba6ea5 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGet.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGet.json @@ -40,15 +40,6 @@ "createdDateTime": "2020-02-20T00:10:29.2858439Z" } } - }, - "404": { - "headers": {}, - "body": { - "error": { - "code": "ResourceNotFound", - "message": "The Resource 'Microsoft.Databricks/workspaces/myWorkspace' under resource group 'rg' was not found." - } - } } } } From e06680ca0c143b9f51395b909750cc58010d396b Mon Sep 17 00:00:00 2001 From: Amogh Natu Date: Wed, 26 Feb 2020 11:21:14 -0800 Subject: [PATCH 15/24] removed 404 --- .../2018-04-01/examples/WorkspaceGetParameters.json | 9 --------- 1 file changed, 9 deletions(-) diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGetParameters.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGetParameters.json index 0c1a9be9b6fa..5ddf2e1efa5c 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGetParameters.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGetParameters.json @@ -97,15 +97,6 @@ "createdDateTime": "2020-02-20T00:10:29.2858439Z" } } - }, - "404": { - "headers": {}, - "body": { - "error": { - "code": "ResourceNotFound", - "message": "The Resource 'Microsoft.Databricks/workspaces/myWorkspace' under resource group 'rg' was not found." - } - } } } } From c4f724c97d230d55293ecd70190e4cb41a9013c0 Mon Sep 17 00:00:00 2001 From: Amogh Natu Date: Wed, 26 Feb 2020 11:37:26 -0800 Subject: [PATCH 16/24] updated autorest --- package-lock.json | 13 +++++++++---- package.json | 3 +++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9bb5d920da32..ef3ad42f7f31 100644 --- a/package-lock.json +++ b/package-lock.json @@ -55,6 +55,12 @@ "@ts-common/string-map": "^0.3.0", "tslib": "^1.9.3" } + }, + "autorest": { + "version": "2.0.4413", + "resolved": "https://registry.npmjs.org/autorest/-/autorest-2.0.4413.tgz", + "integrity": "sha512-Ttx/O6Yag5q8fpJDvllgf/joLuVPBySkbAqDF7+9jAmscCPQplYjA9H/N12bwkhh+6YR3ugWZHQq3NTN33hkAg==", + "dev": true } } }, @@ -630,10 +636,9 @@ "dev": true }, "autorest": { - "version": "2.0.4407", - "resolved": "https://registry.npmjs.org/autorest/-/autorest-2.0.4407.tgz", - "integrity": "sha512-keyeMDb/bVNN8hnDd8o08UC2C1OE8HRhubxksljSvKM5osHIJnoKBA1k3kD7MPAJ/+m6UjDQXci3ronxZeYy+Q==", - "dev": true + "version": "3.0.6187", + "resolved": "https://registry.npmjs.org/autorest/-/autorest-3.0.6187.tgz", + "integrity": "sha512-Xk27qVfsAbmp95Kx+Wwr7LiKlwsoFtcixu46sEaXCRr9zS+lZJDO50uZLXa2ZIE8/z9accpNt3HTdv/9DHk7yg==" }, "aws-sign2": { "version": "0.7.0", diff --git a/package.json b/package.json index 682934dbd6ed..243af3c505f5 100644 --- a/package.json +++ b/package.json @@ -44,5 +44,8 @@ "prettier": "prettier", "tsc": "tsc", "multiapi": "ts-node ./scripts/multiapi.ts" + }, + "dependencies": { + "autorest": "^3.0.6187" } } From 6c6f1c46caace23c6f2e4315bc09f9e7de7d8b78 Mon Sep 17 00:00:00 2001 From: Amogh Natu Date: Wed, 4 Mar 2020 11:13:06 -0800 Subject: [PATCH 17/24] updated package version --- package-lock.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3da3f4741aa3..0bd99abb0cfd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -696,10 +696,9 @@ "dev": true }, "autorest": { - "version": "2.0.4413", - "resolved": "https://registry.npmjs.org/autorest/-/autorest-2.0.4413.tgz", - "integrity": "sha512-Ttx/O6Yag5q8fpJDvllgf/joLuVPBySkbAqDF7+9jAmscCPQplYjA9H/N12bwkhh+6YR3ugWZHQq3NTN33hkAg==", - "dev": true + "version": "3.0.6187", + "resolved": "https://registry.npmjs.org/autorest/-/autorest-3.0.6187.tgz", + "integrity": "sha512-Xk27qVfsAbmp95Kx+Wwr7LiKlwsoFtcixu46sEaXCRr9zS+lZJDO50uZLXa2ZIE8/z9accpNt3HTdv/9DHk7yg==" }, "aws-sign2": { "version": "0.7.0", From bcff84681648dbfd40c5c602cbcf5647a2789089 Mon Sep 17 00:00:00 2001 From: Amogh Natu Date: Wed, 4 Mar 2020 22:46:23 -0800 Subject: [PATCH 18/24] Reverted package.json and package lock json changes --- package-lock.json | 13 ++++--------- package.json | 3 --- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0bd99abb0cfd..3d3444b00953 100644 --- a/package-lock.json +++ b/package-lock.json @@ -55,12 +55,6 @@ "@ts-common/string-map": "^0.3.0", "tslib": "^1.9.3" } - }, - "autorest": { - "version": "2.0.4413", - "resolved": "https://registry.npmjs.org/autorest/-/autorest-2.0.4413.tgz", - "integrity": "sha512-Ttx/O6Yag5q8fpJDvllgf/joLuVPBySkbAqDF7+9jAmscCPQplYjA9H/N12bwkhh+6YR3ugWZHQq3NTN33hkAg==", - "dev": true } } }, @@ -696,9 +690,10 @@ "dev": true }, "autorest": { - "version": "3.0.6187", - "resolved": "https://registry.npmjs.org/autorest/-/autorest-3.0.6187.tgz", - "integrity": "sha512-Xk27qVfsAbmp95Kx+Wwr7LiKlwsoFtcixu46sEaXCRr9zS+lZJDO50uZLXa2ZIE8/z9accpNt3HTdv/9DHk7yg==" + "version": "2.0.4407", + "resolved": "https://registry.npmjs.org/autorest/-/autorest-2.0.4407.tgz", + "integrity": "sha512-keyeMDb/bVNN8hnDd8o08UC2C1OE8HRhubxksljSvKM5osHIJnoKBA1k3kD7MPAJ/+m6UjDQXci3ronxZeYy+Q==", + "dev": true }, "aws-sign2": { "version": "0.7.0", diff --git a/package.json b/package.json index 8ced3facb4fe..4b56361de1f4 100644 --- a/package.json +++ b/package.json @@ -44,8 +44,5 @@ "prettier": "prettier", "tsc": "tsc", "multiapi": "ts-node ./scripts/multiapi.ts" - }, - "dependencies": { - "autorest": "^3.0.6187" } } From f962ca3e5a7ed6e38366e15524d2dd33bc8f3666 Mon Sep 17 00:00:00 2001 From: Amogh Natu Date: Thu, 5 Mar 2020 23:16:43 -0800 Subject: [PATCH 19/24] added workspaceId and workspaceUrl properties to existing API version. --- .../stable/2018-04-01/databricks.json | 9 +++++++++ .../stable/2018-04-01/examples/WorkspaceCreate.json | 4 +++- .../examples/WorkspaceCreateWithParameters.json | 4 +++- .../stable/2018-04-01/examples/WorkspaceGet.json | 4 +++- .../2018-04-01/examples/WorkspaceGetParameters.json | 4 +++- .../stable/2018-04-01/examples/WorkspaceUpdate.json | 4 +++- .../examples/WorkspacesListByResourceGroup.json | 8 ++++++-- .../examples/WorkspacesListBySubscription.json | 8 ++++++-- 8 files changed, 36 insertions(+), 9 deletions(-) diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json index c46708d37995..ec4435a4f512 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json @@ -410,6 +410,14 @@ "createdDateTime": { "description": "Specifies the date and time when the workspace is created.", "$ref": "#/definitions/CreatedDateTime" + }, + "workspaceId": { + "description": "The unique identifier of the databricks workspace in databricks control plane.", + "type": "string" + }, + "workspaceUrl": { + "description": "The workspace URL which is of the format 'adb-{workspaceId}.{random}.azuredatabricks.net'", + "type": "string" } }, "required": [ @@ -631,6 +639,7 @@ "CreatedDateTime": { "type": "string", "format": "date-time", + "description": "The date and time stamp when the workspace was created.", "readOnly": true }, "CreatedBy": { diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceCreate.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceCreate.json index 3f925bcda1e6..2c2962677166 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceCreate.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceCreate.json @@ -42,7 +42,9 @@ "puid": "33333333", "applicationId": "44444444-4444-4444-4444-444444444444" }, - "createdDateTime": "2020-02-20T00:10:29.2858439Z" + "createdDateTime": "2020-02-20T00:10:29.2858439Z", + "workspaceId": "5555555555555555", + "workspaceUrl": "adb-5555555555555555.19.azuredatabricks.net" } } }, diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceCreateWithParameters.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceCreateWithParameters.json index 83e4035d6c34..41bf9e28b1a5 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceCreateWithParameters.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceCreateWithParameters.json @@ -103,7 +103,9 @@ "puid": "33333333", "applicationId": "44444444-4444-4444-4444-444444444444" }, - "createdDateTime": "2020-02-20T00:10:29.2858439Z" + "createdDateTime": "2020-02-20T00:10:29.2858439Z", + "workspaceId": "5555555555555555", + "workspaceUrl": "adb-5555555555555555.19.azuredatabricks.net" } } }, diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGet.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGet.json index 0d300eba6ea5..48fe6d0b4990 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGet.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGet.json @@ -37,7 +37,9 @@ "puid": "33333333", "applicationId": "44444444-4444-4444-4444-444444444444" }, - "createdDateTime": "2020-02-20T00:10:29.2858439Z" + "createdDateTime": "2020-02-20T00:10:29.2858439Z", + "workspaceId": "5555555555555555", + "workspaceUrl": "adb-5555555555555555.19.azuredatabricks.net" } } } diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGetParameters.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGetParameters.json index 5ddf2e1efa5c..24f72ab5ad67 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGetParameters.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGetParameters.json @@ -94,7 +94,9 @@ "puid": "33333333", "applicationId": "44444444-4444-4444-4444-444444444444" }, - "createdDateTime": "2020-02-20T00:10:29.2858439Z" + "createdDateTime": "2020-02-20T00:10:29.2858439Z", + "workspaceId": "5555555555555555", + "workspaceUrl": "adb-5555555555555555.19.azuredatabricks.net" } } } diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceUpdate.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceUpdate.json index 743d572ae9f8..766bbcd78728 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceUpdate.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceUpdate.json @@ -44,7 +44,9 @@ "puid": "33333333", "applicationId": "44444444-4444-4444-4444-444444444444" }, - "createdDateTime": "2020-02-20T00:10:29.2858439Z" + "createdDateTime": "2020-02-20T00:10:29.2858439Z", + "workspaceId": "6666666666666666", + "workspaceUrl": "adb-6666666666666666.19.azuredatabricks.net" } } }, diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspacesListByResourceGroup.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspacesListByResourceGroup.json index cbf7ccfba86b..f8fad446745f 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspacesListByResourceGroup.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspacesListByResourceGroup.json @@ -39,7 +39,9 @@ "puid": "33333333", "applicationId": "44444444-4444-4444-4444-444444444444" }, - "createdDateTime": "2020-02-20T00:10:29.2858439Z" + "createdDateTime": "2020-02-20T00:10:29.2858439Z", + "workspaceId": "5555555555555555", + "workspaceUrl": "adb-5555555555555555.19.azuredatabricks.net" } }, { @@ -72,7 +74,9 @@ "puid": "33333333", "applicationId": "44444444-4444-4444-4444-444444444444" }, - "createdDateTime": "2020-02-20T00:10:29.2858439Z" + "createdDateTime": "2020-02-20T00:10:29.2858439Z", + "workspaceId": "6666666666666666", + "workspaceUrl": "adb-6666666666666666.19.azuredatabricks.net" } } ] diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspacesListBySubscription.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspacesListBySubscription.json index 22996cc86036..de92bdaeaf18 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspacesListBySubscription.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspacesListBySubscription.json @@ -38,7 +38,9 @@ "puid": "33333333", "applicationId": "44444444-4444-4444-4444-444444444444" }, - "createdDateTime": "2020-02-20T00:10:29.2858439Z" + "createdDateTime": "2020-02-20T00:10:29.2858439Z", + "workspaceId": "5555555555555555", + "workspaceUrl": "adb-5555555555555555.19.azuredatabricks.net" } }, { @@ -71,7 +73,9 @@ "puid": "33333333", "applicationId": "44444444-4444-4444-4444-444444444444" }, - "createdDateTime": "2020-02-20T00:10:29.2858439Z" + "createdDateTime": "2020-02-20T00:10:29.2858439Z", + "workspaceId": "6666666666666666", + "workspaceUrl": "adb-6666666666666666.19.azuredatabricks.net" } } ] From a7ea409e27b7e46d88ed3be2d19b0ac8fa67d702 Mon Sep 17 00:00:00 2001 From: Amogh Natu Date: Fri, 6 Mar 2020 11:48:55 -0800 Subject: [PATCH 20/24] Added readonly to new properties. --- .../Microsoft.Databricks/stable/2018-04-01/databricks.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json index ec4435a4f512..8ef0dd323385 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json @@ -412,10 +412,12 @@ "$ref": "#/definitions/CreatedDateTime" }, "workspaceId": { + "readOnly": true, "description": "The unique identifier of the databricks workspace in databricks control plane.", "type": "string" }, "workspaceUrl": { + "readOnly": true, "description": "The workspace URL which is of the format 'adb-{workspaceId}.{random}.azuredatabricks.net'", "type": "string" } From 55459a65a2d8affcfea839caf94659a56c8c3f50 Mon Sep 17 00:00:00 2001 From: Amogh Natu Date: Tue, 10 Mar 2020 11:03:07 -0700 Subject: [PATCH 21/24] Reverted change in package.lock.json --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3d3444b00953..8e980689a258 100644 --- a/package-lock.json +++ b/package-lock.json @@ -690,9 +690,9 @@ "dev": true }, "autorest": { - "version": "2.0.4407", - "resolved": "https://registry.npmjs.org/autorest/-/autorest-2.0.4407.tgz", - "integrity": "sha512-keyeMDb/bVNN8hnDd8o08UC2C1OE8HRhubxksljSvKM5osHIJnoKBA1k3kD7MPAJ/+m6UjDQXci3ronxZeYy+Q==", + "version": "2.0.4413", + "resolved": "https://registry.npmjs.org/autorest/-/autorest-2.0.4413.tgz", + "integrity": "sha512-Ttx/O6Yag5q8fpJDvllgf/joLuVPBySkbAqDF7+9jAmscCPQplYjA9H/N12bwkhh+6YR3ugWZHQq3NTN33hkAg==", "dev": true }, "aws-sign2": { From 41d5aec56c8fbcbc729a71f644e137efa74e9c59 Mon Sep 17 00:00:00 2001 From: Amogh Natu Date: Thu, 12 Mar 2020 01:01:26 -0700 Subject: [PATCH 22/24] Added missing 200 response on delete. --- .../Microsoft.Databricks/stable/2018-04-01/databricks.json | 3 +++ .../stable/2018-04-01/examples/WorkspaceDelete.json | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json index 8ef0dd323385..2a27ae79708d 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json @@ -110,6 +110,9 @@ "202": { "description": "Accepted - Returns this status until the asynchronous operation has completed." }, + "200": { + "description": "OK. The request has succeeded." + }, "default": { "description": "Error response describing why the operation failed.", "schema": { diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceDelete.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceDelete.json index f3362fe69807..887fbec903a7 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceDelete.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceDelete.json @@ -6,6 +6,12 @@ "subscriptionId": "subid" }, "responses": { + "200": { + "headers": {}, + "body": { + "status": "Succeeded" + } + }, "202": {}, "204": {} } From d7f487966601211e229ab13deceb614fdeb0726b Mon Sep 17 00:00:00 2001 From: Amogh Natu Date: Thu, 12 Mar 2020 01:09:45 -0700 Subject: [PATCH 23/24] fixed model validation error. --- .../stable/2018-04-01/examples/WorkspaceDelete.json | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceDelete.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceDelete.json index 887fbec903a7..affad060724a 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceDelete.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceDelete.json @@ -6,12 +6,7 @@ "subscriptionId": "subid" }, "responses": { - "200": { - "headers": {}, - "body": { - "status": "Succeeded" - } - }, + "200": {}, "202": {}, "204": {} } From f953e9572e0e255dfe5e470b73f294b390b1a6d5 Mon Sep 17 00:00:00 2001 From: Amogh Natu Date: Mon, 16 Mar 2020 15:37:19 -0700 Subject: [PATCH 24/24] Removed FedRAMP parameter from api-version --- .../Microsoft.Databricks/stable/2018-04-01/databricks.json | 4 ---- .../2018-04-01/examples/WorkspaceCreateWithParameters.json | 4 ---- .../stable/2018-04-01/examples/WorkspaceGetParameters.json | 4 ---- 3 files changed, 12 deletions(-) diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json index 2a27ae79708d..abda17bead08 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json @@ -633,10 +633,6 @@ "vnetAddressPrefix": { "$ref": "#/definitions/WorkspaceCustomStringParameter", "description": "The first 2 octets of the virtual network /16 address range (e.g., '10.139' for the address range 10.139.0.0/16)." - }, - "enableFedRampCertification": { - "$ref": "#/definitions/WorkspaceCustomBooleanParameter", - "description": "Boolean indicating whether FedRAMP Certification should be enabled on the workspace." } }, "description": "Custom Parameters used for Cluster Creation." diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceCreateWithParameters.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceCreateWithParameters.json index 41bf9e28b1a5..2b9bba003636 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceCreateWithParameters.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceCreateWithParameters.json @@ -79,10 +79,6 @@ "vnetAddressPrefix": { "type": "String", "value": "10.139" - }, - "enableFedRampCertification": { - "type": "Bool", - "value": false } }, "provisioningState": "Succeeded", diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGetParameters.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGetParameters.json index 24f72ab5ad67..ac00dcb900e2 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGetParameters.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/examples/WorkspaceGetParameters.json @@ -70,10 +70,6 @@ "amlWorkspaceId": { "type": "String", "value": "" - }, - "enableFedRampCertification": { - "type": "Bool", - "value": false } }, "provisioningState": "Succeeded",