Skip to content

Commit

Permalink
Swagger PR for Adding 2021-04-01-preview API version (Azure#13736)
Browse files Browse the repository at this point in the history 
* Adding baseline version from previous stable version

* Fixing Avocado errors

* Fixing API Version Mismatch Avacado error

* Updating SystemData

* Fixing examples to have latest API version

* Removing vNet Peering APIs as we aren't versioning them

* Fixing Lint Errors

* Updating CMK Properties

* Fixing lint errors

* Fixed review comment

* Fixing ARM Reviewer Comment

* Bringing S360 fixes to new version

* Fixing the casing of the keyVaultUri

* adds private link properties, params and examples (Azure#13986)

* Revert "adds private link properties, params and examples (Azure#13986)"

This reverts commit 0498eaa.

* Fixing Cross Version Breaking Change Errors

* Updating the vNet Peering into Preview Tag as well

Co-authored-by: nishantpunetha <nishant.punetha@gmail.com>
  • Loading branch information
@mvvsubbu @nishantpunetha @mkarmark
2 people authored and mkarmark committed Jul 20, 2021
1 parent 7b960fd commit 0e16ada
Show file tree
Hide file tree
Showing 16 changed files with 2,537 additions and 349 deletions.
1,052 changes: 1,052 additions & 0 deletions ...tabricks/resource-manager/Microsoft.Databricks/preview/2021-04-01-preview/databricks.json
View file

Large diffs are not rendered by default.

130 changes: 130 additions & 0 deletions ...e-manager/Microsoft.Databricks/preview/2021-04-01-preview/examples/DisableEncryption.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
{
"parameters": {
"subscriptionId": "subid",
"resourceGroupName": "rg",
"workspaceName": "myWorkspace",
"api-version": "2021-04-01-preview",
"parameters": {
"properties": {
"managedResourceGroupId": "/subscriptions/subid/resourceGroups/myManagedRG",
"parameters": {
"encryption": {
"value": {
"keySource": "Default"
}
}
}
},
"location": "westus"
}
},
"responses": {
"200": {
"headers": {},
"body": {
"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",
"parameters": {
"customPrivateSubnetName": {
"type": "String",
"value": "PrivateBob"
},
"customPublicSubnetName": {
"type": "String",
"value": "PublicSarah"
},
"customVirtualNetworkId": {
"type": "String",
"value": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Network/virtualNetworks/myNetwork"
},
"prepareEncryption": {
"type": "Bool",
"value": true
},
"encryption": {
"type": "Object",
"value": {
"keySource": "Default"
}
}
},
"provisioningState": "Succeeded",
"uiDefinitionUri": "https://path/to/workspaceCreateUiDefinition.json",
"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"
},
"storageAccountIdentity": {
"principalId": "55555555-5555-5555-5555-555555555555",
"tenantId": "66666666-6666-6666-6666-666666666666",
"type": "SystemAssigned"
},
"updatedBy": {
"oid": "22222222-2222-2222-2222-222222222222",
"puid": "33333333",
"applicationId": "44444444-4444-4444-4444-444444444444"
},
"createdDateTime": "2020-02-20T00:10:29.2858439Z",
"workspaceId": "5555555555555555",
"workspaceUrl": "adb-5555555555555555.19.azuredatabricks.net"
}
}
},
"201": {
"headers": {},
"body": {
"name": "myWorkspace",
"id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Databricks/workspaces/myWorkspace",
"type": "Microsoft.Databricks/workspaces",
"location": "East US 2",
"tags": {
"environment": "dev"
},
"sku": {
"name": "premium"
},
"properties": {
"managedResourceGroupId": "/subscriptions/subid/resourceGroups/myManagedRG",
"provisioningState": "Accepted",
"uiDefinitionUri": "https://path/to/workspaceCreateUiDefinition.json",
"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": "2020-02-20T00:10:29.2858439Z",
"storageAccountIdentity": {
"principalId": "55555555-5555-5555-5555-555555555555",
"tenantId": "66666666-6666-6666-6666-666666666666",
"type": "SystemAssigned"
}
}
}
}
}
}
139 changes: 139 additions & 0 deletions ...ce-manager/Microsoft.Databricks/preview/2021-04-01-preview/examples/EnableEncryption.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,139 @@
{
"parameters": {
"subscriptionId": "subid",
"resourceGroupName": "rg",
"workspaceName": "myWorkspace",
"api-version": "2021-04-01-preview",
"parameters": {
"properties": {
"managedResourceGroupId": "/subscriptions/subid/resourceGroups/myManagedRG",
"parameters": {
"prepareEncryption": {
"value": true
},
"encryption": {
"value": {
"keySource": "Microsoft.Keyvault",
"keyvaulturi": "https://myKeyVault.vault.azure.net/",
"KeyName": "myKeyName",
"keyversion": "00000000000000000000000000000000"
}
}
}
},
"location": "westus"
}
},
"responses": {
"200": {
"headers": {},
"body": {
"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",
"parameters": {
"customPrivateSubnetName": {
"type": "String",
"value": "PrivateBob"
},
"customPublicSubnetName": {
"type": "String",
"value": "PublicSarah"
},
"customVirtualNetworkId": {
"type": "String",
"value": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Network/virtualNetworks/myNetwork"
},
"prepareEncryption": {
"type": "Bool",
"value": true
},
"encryption": {
"type": "Object",
"value": {
"keySource": "Microsoft.Keyvault",
"keyvaulturi": "https://myKeyVault.vault.azure.net/",
"KeyName": "myKeyName",
"keyversion": "00000000000000000000000000000000"
}
}
},
"provisioningState": "Succeeded",
"uiDefinitionUri": "https://path/to/workspaceCreateUiDefinition.json",
"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"
},
"storageAccountIdentity": {
"principalId": "55555555-5555-5555-5555-555555555555",
"tenantId": "66666666-6666-6666-6666-666666666666",
"type": "SystemAssigned"
},
"updatedBy": {
"oid": "22222222-2222-2222-2222-222222222222",
"puid": "33333333",
"applicationId": "44444444-4444-4444-4444-444444444444"
},
"createdDateTime": "2020-02-20T00:10:29.2858439Z",
"workspaceId": "5555555555555555",
"workspaceUrl": "adb-5555555555555555.19.azuredatabricks.net"
}
}
},
"201": {
"headers": {},
"body": {
"name": "myWorkspace",
"id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Databricks/workspaces/myWorkspace",
"type": "Microsoft.Databricks/workspaces",
"location": "East US 2",
"tags": {
"environment": "dev"
},
"sku": {
"name": "premium"
},
"properties": {
"managedResourceGroupId": "/subscriptions/subid/resourceGroups/myManagedRG",
"provisioningState": "Accepted",
"uiDefinitionUri": "https://path/to/workspaceCreateUiDefinition.json",
"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": "2020-02-20T00:10:29.2858439Z",
"storageAccountIdentity": {
"principalId": "55555555-5555-5555-5555-555555555555",
"tenantId": "66666666-6666-6666-6666-666666666666",
"type": "SystemAssigned"
}
}
}
}
}
}
65 changes: 65 additions & 0 deletions ...urce-manager/Microsoft.Databricks/preview/2021-04-01-preview/examples/OperationsList.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
{
"parameters": {
"api-version": "2021-04-01-preview"
},
"responses": {
"200": {
"body": [
{
"name": "Microsoft.Databricks/workspaces/read",
"display": {
"provider": "Microsoft Databricks",
"resource": "Workspace",
"operation": "List Workspaces",
"description": "Retrieves a list of workspaces."
}
},
{
"name": "Microsoft.Databricks/workspaces/write",
"display": {
"provider": "Microsoft Databricks",
"resource": "Workspace",
"operation": "Create Workspace",
"description": "Creates an workspace."
}
},
{
"name": "Microsoft.Databricks/workspaces/delete",
"display": {
"provider": "Microsoft Databricks",
"resource": "Workspace",
"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"
}
}
]
}
}
}
Loading

0 comments on commit 0e16ada

Please sign in to comment.