Skip to content

Commit 6f64a86

Browse files
mvvsubbunishantpunetha
mvvsubbu
and
nishantpunetha
authored
Swagger PR for Adding 2021-04-01-preview API version (Azure#13736)
* 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 0498eaab0cdf6441acce6a85988ef06759751553. * Fixing Cross Version Breaking Change Errors * Updating the vNet Peering into Preview Tag as well Co-authored-by: nishantpunetha <[email protected]>
1 parent 50eae85 commit 6f64a86

File tree

16 files changed

+2537
-349
lines changed

16 files changed

+2537
-349
lines changed

‎specification/databricks/resource-manager/Microsoft.Databricks/preview/2021-04-01-preview/databricks.json‎

Lines changed: 1052 additions & 0 deletions
Large diffs are not rendered by default.

‎specification/databricks/resource-manager/Microsoft.Databricks/preview/2021-04-01-preview/examples/DisableEncryption.json‎

Lines changed: 130 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,130 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "subid",
4+
"resourceGroupName": "rg",
5+
"workspaceName": "myWorkspace",
6+
"api-version": "2021-04-01-preview",
7+
"parameters": {
8+
"properties": {
9+
"managedResourceGroupId": "/subscriptions/subid/resourceGroups/myManagedRG",
10+
"parameters": {
11+
"encryption": {
12+
"value": {
13+
"keySource": "Default"
14+
}
15+
}
16+
}
17+
},
18+
"location": "westus"
19+
}
20+
},
21+
"responses": {
22+
"200": {
23+
"headers": {},
24+
"body": {
25+
"name": "myWorkspace",
26+
"id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Databricks/workspaces/myWorkspace",
27+
"type": "Microsoft.Databricks/workspaces",
28+
"sku": {
29+
"name": "premium"
30+
},
31+
"location": "East US 2",
32+
"properties": {
33+
"managedResourceGroupId": "/subscriptions/subid/resourceGroups/myManagedRG",
34+
"parameters": {
35+
"customPrivateSubnetName": {
36+
"type": "String",
37+
"value": "PrivateBob"
38+
},
39+
"customPublicSubnetName": {
40+
"type": "String",
41+
"value": "PublicSarah"
42+
},
43+
"customVirtualNetworkId": {
44+
"type": "String",
45+
"value": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Network/virtualNetworks/myNetwork"
46+
},
47+
"prepareEncryption": {
48+
"type": "Bool",
49+
"value": true
50+
},
51+
"encryption": {
52+
"type": "Object",
53+
"value": {
54+
"keySource": "Default"
55+
}
56+
}
57+
},
58+
"provisioningState": "Succeeded",
59+
"uiDefinitionUri": "https://path/to/workspaceCreateUiDefinition.json",
60+
"authorizations": [
61+
{
62+
"principalId": "00000000-0000-0000-0000-000000000000",
63+
"roleDefinitionId": "11111111-1111-1111-1111-111111111111"
64+
}
65+
],
66+
"createdBy": {
67+
"oid": "22222222-2222-2222-2222-222222222222",
68+
"puid": "33333333",
69+
"applicationId": "44444444-4444-4444-4444-444444444444"
70+
},
71+
"storageAccountIdentity": {
72+
"principalId": "55555555-5555-5555-5555-555555555555",
73+
"tenantId": "66666666-6666-6666-6666-666666666666",
74+
"type": "SystemAssigned"
75+
},
76+
"updatedBy": {
77+
"oid": "22222222-2222-2222-2222-222222222222",
78+
"puid": "33333333",
79+
"applicationId": "44444444-4444-4444-4444-444444444444"
80+
},
81+
"createdDateTime": "2020-02-20T00:10:29.2858439Z",
82+
"workspaceId": "5555555555555555",
83+
"workspaceUrl": "adb-5555555555555555.19.azuredatabricks.net"
84+
}
85+
}
86+
},
87+
"201": {
88+
"headers": {},
89+
"body": {
90+
"name": "myWorkspace",
91+
"id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Databricks/workspaces/myWorkspace",
92+
"type": "Microsoft.Databricks/workspaces",
93+
"location": "East US 2",
94+
"tags": {
95+
"environment": "dev"
96+
},
97+
"sku": {
98+
"name": "premium"
99+
},
100+
"properties": {
101+
"managedResourceGroupId": "/subscriptions/subid/resourceGroups/myManagedRG",
102+
"provisioningState": "Accepted",
103+
"uiDefinitionUri": "https://path/to/workspaceCreateUiDefinition.json",
104+
"authorizations": [
105+
{
106+
"principalId": "00000000-0000-0000-0000-000000000000",
107+
"roleDefinitionId": "11111111-1111-1111-1111-111111111111"
108+
}
109+
],
110+
"createdBy": {
111+
"oid": "22222222-2222-2222-2222-222222222222",
112+
"puid": "33333333",
113+
"applicationId": "44444444-4444-4444-4444-444444444444"
114+
},
115+
"updatedBy": {
116+
"oid": "22222222-2222-2222-2222-222222222222",
117+
"puid": "33333333",
118+
"applicationId": "44444444-4444-4444-4444-444444444444"
119+
},
120+
"createdDateTime": "2020-02-20T00:10:29.2858439Z",
121+
"storageAccountIdentity": {
122+
"principalId": "55555555-5555-5555-5555-555555555555",
123+
"tenantId": "66666666-6666-6666-6666-666666666666",
124+
"type": "SystemAssigned"
125+
}
126+
}
127+
}
128+
}
129+
}
130+
}

‎specification/databricks/resource-manager/Microsoft.Databricks/preview/2021-04-01-preview/examples/EnableEncryption.json‎

Lines changed: 139 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,139 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "subid",
4+
"resourceGroupName": "rg",
5+
"workspaceName": "myWorkspace",
6+
"api-version": "2021-04-01-preview",
7+
"parameters": {
8+
"properties": {
9+
"managedResourceGroupId": "/subscriptions/subid/resourceGroups/myManagedRG",
10+
"parameters": {
11+
"prepareEncryption": {
12+
"value": true
13+
},
14+
"encryption": {
15+
"value": {
16+
"keySource": "Microsoft.Keyvault",
17+
"keyvaulturi": "https://myKeyVault.vault.azure.net/",
18+
"KeyName": "myKeyName",
19+
"keyversion": "00000000000000000000000000000000"
20+
}
21+
}
22+
}
23+
},
24+
"location": "westus"
25+
}
26+
},
27+
"responses": {
28+
"200": {
29+
"headers": {},
30+
"body": {
31+
"name": "myWorkspace",
32+
"id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Databricks/workspaces/myWorkspace",
33+
"type": "Microsoft.Databricks/workspaces",
34+
"sku": {
35+
"name": "premium"
36+
},
37+
"location": "East US 2",
38+
"properties": {
39+
"managedResourceGroupId": "/subscriptions/subid/resourceGroups/myManagedRG",
40+
"parameters": {
41+
"customPrivateSubnetName": {
42+
"type": "String",
43+
"value": "PrivateBob"
44+
},
45+
"customPublicSubnetName": {
46+
"type": "String",
47+
"value": "PublicSarah"
48+
},
49+
"customVirtualNetworkId": {
50+
"type": "String",
51+
"value": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Network/virtualNetworks/myNetwork"
52+
},
53+
"prepareEncryption": {
54+
"type": "Bool",
55+
"value": true
56+
},
57+
"encryption": {
58+
"type": "Object",
59+
"value": {
60+
"keySource": "Microsoft.Keyvault",
61+
"keyvaulturi": "https://myKeyVault.vault.azure.net/",
62+
"KeyName": "myKeyName",
63+
"keyversion": "00000000000000000000000000000000"
64+
}
65+
}
66+
},
67+
"provisioningState": "Succeeded",
68+
"uiDefinitionUri": "https://path/to/workspaceCreateUiDefinition.json",
69+
"authorizations": [
70+
{
71+
"principalId": "00000000-0000-0000-0000-000000000000",
72+
"roleDefinitionId": "11111111-1111-1111-1111-111111111111"
73+
}
74+
],
75+
"createdBy": {
76+
"oid": "22222222-2222-2222-2222-222222222222",
77+
"puid": "33333333",
78+
"applicationId": "44444444-4444-4444-4444-444444444444"
79+
},
80+
"storageAccountIdentity": {
81+
"principalId": "55555555-5555-5555-5555-555555555555",
82+
"tenantId": "66666666-6666-6666-6666-666666666666",
83+
"type": "SystemAssigned"
84+
},
85+
"updatedBy": {
86+
"oid": "22222222-2222-2222-2222-222222222222",
87+
"puid": "33333333",
88+
"applicationId": "44444444-4444-4444-4444-444444444444"
89+
},
90+
"createdDateTime": "2020-02-20T00:10:29.2858439Z",
91+
"workspaceId": "5555555555555555",
92+
"workspaceUrl": "adb-5555555555555555.19.azuredatabricks.net"
93+
}
94+
}
95+
},
96+
"201": {
97+
"headers": {},
98+
"body": {
99+
"name": "myWorkspace",
100+
"id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Databricks/workspaces/myWorkspace",
101+
"type": "Microsoft.Databricks/workspaces",
102+
"location": "East US 2",
103+
"tags": {
104+
"environment": "dev"
105+
},
106+
"sku": {
107+
"name": "premium"
108+
},
109+
"properties": {
110+
"managedResourceGroupId": "/subscriptions/subid/resourceGroups/myManagedRG",
111+
"provisioningState": "Accepted",
112+
"uiDefinitionUri": "https://path/to/workspaceCreateUiDefinition.json",
113+
"authorizations": [
114+
{
115+
"principalId": "00000000-0000-0000-0000-000000000000",
116+
"roleDefinitionId": "11111111-1111-1111-1111-111111111111"
117+
}
118+
],
119+
"createdBy": {
120+
"oid": "22222222-2222-2222-2222-222222222222",
121+
"puid": "33333333",
122+
"applicationId": "44444444-4444-4444-4444-444444444444"
123+
},
124+
"updatedBy": {
125+
"oid": "22222222-2222-2222-2222-222222222222",
126+
"puid": "33333333",
127+
"applicationId": "44444444-4444-4444-4444-444444444444"
128+
},
129+
"createdDateTime": "2020-02-20T00:10:29.2858439Z",
130+
"storageAccountIdentity": {
131+
"principalId": "55555555-5555-5555-5555-555555555555",
132+
"tenantId": "66666666-6666-6666-6666-666666666666",
133+
"type": "SystemAssigned"
134+
}
135+
}
136+
}
137+
}
138+
}
139+
}

‎specification/databricks/resource-manager/Microsoft.Databricks/preview/2021-04-01-preview/examples/OperationsList.json‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
{
2+
"parameters": {
3+
"api-version": "2021-04-01-preview"
4+
},
5+
"responses": {
6+
"200": {
7+
"body": [
8+
{
9+
"name": "Microsoft.Databricks/workspaces/read",
10+
"display": {
11+
"provider": "Microsoft Databricks",
12+
"resource": "Workspace",
13+
"operation": "List Workspaces",
14+
"description": "Retrieves a list of workspaces."
15+
}
16+
},
17+
{
18+
"name": "Microsoft.Databricks/workspaces/write",
19+
"display": {
20+
"provider": "Microsoft Databricks",
21+
"resource": "Workspace",
22+
"operation": "Create Workspace",
23+
"description": "Creates an workspace."
24+
}
25+
},
26+
{
27+
"name": "Microsoft.Databricks/workspaces/delete",
28+
"display": {
29+
"provider": "Microsoft Databricks",
30+
"resource": "Workspace",
31+
"operation": "Remove Workspace",
32+
"description": "Removes an workspace."
33+
}
34+
},
35+
{
36+
"name": "Microsoft.Databricks/workspaces/virtualNetworkPeerings/read",
37+
"display": {
38+
"provider": "Microsoft Databricks",
39+
"resource": "Virtual Network Peering",
40+
"operation": "Get Virtual Network Peering",
41+
"description": "Gets the virtual network peering."
42+
}
43+
},
44+
{
45+
"name": "Microsoft.Databricks/workspaces/virtualNetworkPeerings/write",
46+
"display": {
47+
"provider": "Microsoft Databricks",
48+
"resource": "Virtual Network Peering",
49+
"operation": "Add Virtual Network Peering",
50+
"description": "Add or modify virtual network peering"
51+
}
52+
},
53+
{
54+
"name": "Microsoft.Databricks/workspaces/virtualNetworkPeerings/delete",
55+
"display": {
56+
"provider": "Microsoft Databricks",
57+
"resource": "Virtual Network Peering",
58+
"operation": "Delete Virtual Network Peering",
59+
"description": "Deletes a virtual network peering"
60+
}
61+
}
62+
]
63+
}
64+
}
65+
}

0 commit comments

Comments
 (0)