Skip to content

Commit 0318e07

Browse files
QingqingYuan2QingqingYuan2
authored
add required fields for sku object (Azure#10623)
* add required fields for sku object * fix prettier * fix lint errors * fix prettier * fix lint errors * Fix lint errors * fix sdk eorror * add default response * Fix checknameavailability response * fix prettier * add default result for operations * Remove proxy resource definition * supress the provider name check * Remove duplicate Resource definition * removed duplicate tracked resource definition
1 parent ae862b1 commit 0318e07

File tree

19 files changed

+399
-748
lines changed

19 files changed

+399
-748
lines changed

‎specification/mariadb/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-preview/mariadb.json‎

Lines changed: 28 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
}
3535
},
3636
"paths": {
37-
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMariaDB/servers/{serverName}": {
37+
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMariaDB/servers/{serverName}": {
3838
"put": {
3939
"tags": [
4040
"Servers"
@@ -217,7 +217,7 @@
217217
}
218218
}
219219
},
220-
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMariaDB/servers": {
220+
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMariaDB/servers": {
221221
"get": {
222222
"tags": [
223223
"Servers"
@@ -253,7 +253,7 @@
253253
}
254254
}
255255
},
256-
"/subscriptions/{subscriptionId}/providers/Microsoft.DBforMariaDB/servers": {
256+
"/subscriptions/{subscriptionId}/providers/Microsoft.DBForMariaDB/servers": {
257257
"get": {
258258
"tags": [
259259
"Servers"
@@ -286,7 +286,7 @@
286286
}
287287
}
288288
},
289-
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMariaDB/servers/{serverName}/restart": {
289+
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMariaDB/servers/{serverName}/restart": {
290290
"post": {
291291
"tags": [
292292
"ServerRestart"
@@ -329,7 +329,7 @@
329329
"x-ms-long-running-operation": true
330330
}
331331
},
332-
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMariaDB/servers/{serverName}/replicas": {
332+
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMariaDB/servers/{serverName}/replicas": {
333333
"get": {
334334
"tags": [
335335
"Replicas"
@@ -368,7 +368,7 @@
368368
}
369369
}
370370
},
371-
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMariaDB/servers/{serverName}/firewallRules/{firewallRuleName}": {
371+
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMariaDB/servers/{serverName}/firewallRules/{firewallRuleName}": {
372372
"put": {
373373
"tags": [
374374
"FirewallRules"
@@ -504,7 +504,7 @@
504504
}
505505
}
506506
},
507-
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMariaDB/servers/{serverName}/firewallRules": {
507+
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMariaDB/servers/{serverName}/firewallRules": {
508508
"get": {
509509
"tags": [
510510
"FirewallRules"
@@ -543,7 +543,7 @@
543543
}
544544
}
545545
},
546-
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMariaDB/servers/{serverName}/virtualNetworkRules/{virtualNetworkRuleName}": {
546+
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMariaDB/servers/{serverName}/virtualNetworkRules/{virtualNetworkRuleName}": {
547547
"get": {
548548
"tags": [
549549
"VirtualNetworkRules"
@@ -688,7 +688,7 @@
688688
}
689689
}
690690
},
691-
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMariaDB/servers/{serverName}/virtualNetworkRules": {
691+
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMariaDB/servers/{serverName}/virtualNetworkRules": {
692692
"get": {
693693
"tags": [
694694
"VirtualNetworkRules"
@@ -730,7 +730,7 @@
730730
}
731731
}
732732
},
733-
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMariaDB/servers/{serverName}/databases/{databaseName}": {
733+
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMariaDB/servers/{serverName}/databases/{databaseName}": {
734734
"put": {
735735
"tags": [
736736
"Databases"
@@ -866,7 +866,7 @@
866866
}
867867
}
868868
},
869-
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMariaDB/servers/{serverName}/databases": {
869+
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMariaDB/servers/{serverName}/databases": {
870870
"get": {
871871
"tags": [
872872
"Databases"
@@ -905,7 +905,7 @@
905905
}
906906
}
907907
},
908-
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMariaDB/servers/{serverName}/configurations/{configurationName}": {
908+
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMariaDB/servers/{serverName}/configurations/{configurationName}": {
909909
"put": {
910910
"tags": [
911911
"Configurations"
@@ -994,7 +994,7 @@
994994
}
995995
}
996996
},
997-
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMariaDB/servers/{serverName}/configurations": {
997+
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMariaDB/servers/{serverName}/configurations": {
998998
"get": {
999999
"tags": [
10001000
"Configurations"
@@ -1033,7 +1033,7 @@
10331033
}
10341034
}
10351035
},
1036-
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMariaDB/servers/{serverName}/logFiles": {
1036+
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMariaDB/servers/{serverName}/logFiles": {
10371037
"get": {
10381038
"tags": [
10391039
"LogFiles"
@@ -1072,7 +1072,7 @@
10721072
}
10731073
}
10741074
},
1075-
"/subscriptions/{subscriptionId}/providers/Microsoft.DBforMariaDB/locations/{locationName}/performanceTiers": {
1075+
"/subscriptions/{subscriptionId}/providers/Microsoft.DBForMariaDB/locations/{locationName}/performanceTiers": {
10761076
"get": {
10771077
"tags": [
10781078
"LocationBasedPerformanceTier"
@@ -1108,7 +1108,7 @@
11081108
}
11091109
}
11101110
},
1111-
"/subscriptions/{subscriptionId}/providers/Microsoft.DBforMariaDB/checkNameAvailability": {
1111+
"/subscriptions/{subscriptionId}/providers/Microsoft.DBForMariaDB/checkNameAvailability": {
11121112
"post": {
11131113
"tags": [
11141114
"CheckNameAvailability"
@@ -1147,7 +1147,7 @@
11471147
}
11481148
}
11491149
},
1150-
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMariaDB/servers/{serverName}/securityAlertPolicies/{securityAlertPolicyName}": {
1150+
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMariaDB/servers/{serverName}/securityAlertPolicies/{securityAlertPolicyName}": {
11511151
"get": {
11521152
"tags": [
11531153
"ServerSecurityAlertPolicies"
@@ -1267,7 +1267,7 @@
12671267
}
12681268
}
12691269
},
1270-
"/providers/Microsoft.DBforMariaDB/operations": {
1270+
"/providers/Microsoft.DBForMariaDB/operations": {
12711271
"get": {
12721272
"tags": [
12731273
"Operations"
@@ -1320,55 +1320,6 @@
13201320
"modelAsString": false
13211321
}
13221322
},
1323-
"ProxyResource": {
1324-
"description": "Resource properties.",
1325-
"properties": {
1326-
"id": {
1327-
"readOnly": true,
1328-
"type": "string",
1329-
"description": "Resource ID"
1330-
},
1331-
"name": {
1332-
"readOnly": true,
1333-
"type": "string",
1334-
"description": "Resource name."
1335-
},
1336-
"type": {
1337-
"readOnly": true,
1338-
"type": "string",
1339-
"description": "Resource type."
1340-
}
1341-
},
1342-
"x-ms-azure-resource": true
1343-
},
1344-
"TrackedResource": {
1345-
"description": "Resource properties including location and tags for track resources.",
1346-
"properties": {
1347-
"location": {
1348-
"type": "string",
1349-
"x-ms-mutability": [
1350-
"read",
1351-
"create"
1352-
],
1353-
"description": "The location the resource resides in."
1354-
},
1355-
"tags": {
1356-
"type": "object",
1357-
"additionalProperties": {
1358-
"type": "string"
1359-
},
1360-
"description": "Application-specific metadata in the form of key-value pairs."
1361-
}
1362-
},
1363-
"allOf": [
1364-
{
1365-
"$ref": "#/definitions/ProxyResource"
1366-
}
1367-
],
1368-
"required": [
1369-
"location"
1370-
]
1371-
},
13721323
"ServerProperties": {
13731324
"properties": {
13741325
"administratorLogin": {
@@ -1617,6 +1568,9 @@
16171568
"description": "The family of hardware."
16181569
}
16191570
},
1571+
"required": [
1572+
"name"
1573+
],
16201574
"description": "Billing information related properties of a server."
16211575
},
16221576
"ResourceIdentity": {
@@ -1666,7 +1620,7 @@
16661620
},
16671621
"allOf": [
16681622
{
1669-
"$ref": "#/definitions/TrackedResource"
1623+
"$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/TrackedResource"
16701624
}
16711625
],
16721626
"description": "Represents a server."
@@ -1784,7 +1738,7 @@
17841738
},
17851739
"allOf": [
17861740
{
1787-
"$ref": "#/definitions/ProxyResource"
1741+
"$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource"
17881742
}
17891743
],
17901744
"required": [
@@ -1842,7 +1796,7 @@
18421796
"type": "object",
18431797
"allOf": [
18441798
{
1845-
"$ref": "#/definitions/ProxyResource"
1799+
"$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource"
18461800
}
18471801
],
18481802
"properties": {
@@ -1895,7 +1849,7 @@
18951849
},
18961850
"allOf": [
18971851
{
1898-
"$ref": "#/definitions/ProxyResource"
1852+
"$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource"
18991853
}
19001854
],
19011855
"description": "Represents a Database."
@@ -1955,7 +1909,7 @@
19551909
},
19561910
"allOf": [
19571911
{
1958-
"$ref": "#/definitions/ProxyResource"
1912+
"$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource"
19591913
}
19601914
],
19611915
"description": "Represents a Configuration."
@@ -2093,7 +2047,7 @@
20932047
},
20942048
"allOf": [
20952049
{
2096-
"$ref": "#/definitions/ProxyResource"
2050+
"$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource"
20972051
}
20982052
],
20992053
"description": "Represents a log file."
@@ -2267,7 +2221,7 @@
22672221
"type": "object",
22682222
"allOf": [
22692223
{
2270-
"$ref": "#/definitions/ProxyResource"
2224+
"$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource"
22712225
}
22722226
],
22732227
"properties": {

‎specification/mariadb/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-privatepreview/PrivateEndpointConnections.json‎

Lines changed: 1 addition & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -346,44 +346,12 @@
346346
}
347347
}
348348
},
349-
"Resource": {
350-
"description": "ARM resource.",
351-
"type": "object",
352-
"properties": {
353-
"id": {
354-
"description": "Resource ID.",
355-
"type": "string",
356-
"readOnly": true
357-
},
358-
"name": {
359-
"description": "Resource name.",
360-
"type": "string",
361-
"readOnly": true
362-
},
363-
"type": {
364-
"description": "Resource type.",
365-
"type": "string",
366-
"readOnly": true
367-
}
368-
},
369-
"x-ms-azure-resource": true
370-
},
371-
"ProxyResource": {
372-
"description": "ARM proxy resource.",
373-
"type": "object",
374-
"allOf": [
375-
{
376-
"$ref": "#/definitions/Resource"
377-
}
378-
],
379-
"properties": {}
380-
},
381349
"PrivateEndpointConnection": {
382350
"description": "A private endpoint connection",
383351
"type": "object",
384352
"allOf": [
385353
{
386-
"$ref": "#/definitions/ProxyResource"
354+
"$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource"
387355
}
388356
],
389357
"properties": {

‎specification/mariadb/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-privatepreview/PrivateLinkResources.json‎

Lines changed: 1 addition & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -168,44 +168,12 @@
168168
}
169169
}
170170
},
171-
"Resource": {
172-
"description": "ARM resource.",
173-
"type": "object",
174-
"properties": {
175-
"id": {
176-
"description": "Resource ID.",
177-
"type": "string",
178-
"readOnly": true
179-
},
180-
"name": {
181-
"description": "Resource name.",
182-
"type": "string",
183-
"readOnly": true
184-
},
185-
"type": {
186-
"description": "Resource type.",
187-
"type": "string",
188-
"readOnly": true
189-
}
190-
},
191-
"x-ms-azure-resource": true
192-
},
193-
"ProxyResource": {
194-
"description": "ARM proxy resource.",
195-
"type": "object",
196-
"allOf": [
197-
{
198-
"$ref": "#/definitions/Resource"
199-
}
200-
],
201-
"properties": {}
202-
},
203171
"PrivateLinkResource": {
204172
"description": "A private link resource",
205173
"type": "object",
206174
"allOf": [
207175
{
208-
"$ref": "#/definitions/ProxyResource"
176+
"$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource"
209177
}
210178
],
211179
"properties": {

0 commit comments

Comments
 (0)