Skip to content

Commit 3522d29

Browse files
naveedazfearthecowboy
naveedaz
authored and
fearthecowboy
committed
Use relative references to models in common definitions json. Remove duplicate models from each swagger collection doc (Azure#1909)
* Fix regression where Get source control API was accidentally removed from swagger * Add PublicCertificates API, MSDeploy API and remove obsolete microService and gateway API * Add public certificates, Functions Admin Token and MSDeploy APIs * Revert resource definition changes and description change for site properties * Make type and name readonly properties. Add ARM envelope to MSDeployStatus object * Fix missing quotation issue. * Add long running operation to MS deploy * Make MsDeploy and MsDeployLog Azure resources * Fix some AutoRest validation issues. Use dictionary for msdeploy.setparameters * Ensure models are same across all schemas in Microsoft.Web * Fix azure resource type across all models * Remove conflicting ListOperations. It is not used for public Azure. * Expose Patch operations. Expose missing provider level operations * Fix static validation issues. * Remove required for location on Azure resource * Fix enum to maintain order * Fix Stampcapacity enum in ResourceProvider.json * Move common definitions to single location. * Fix spurious references to commonDefinitions * Address CR issues. * Revert references to common definitions * Revert Model Resource to have required location. * Fixing a few straglers * Use relative references to models in common definitions json. Remove duplicate models from each swagger collection doc * Fix missing reference to RampUpRule. * Add security and security definitions to common definitions. * Read IgnoreQuotas property and fix functionappid property name
1 parent 7e3b8b2 commit 3522d29

File tree

10 files changed

+2891
-9770
lines changed

10 files changed

+2891
-9770
lines changed

‎specification/web/resource-manager/Microsoft.CertificateRegistration/2015-08-01/AppServiceCertificateOrders.json‎

Lines changed: 9 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -655,7 +655,7 @@
655655
"description": "Email address",
656656
"required": true,
657657
"schema": {
658-
"$ref": "#/definitions/NameIdentifier"
658+
"$ref": "../../Microsoft.Web/2016-03-01/CommonDefinitions.json#/definitions/NameIdentifier"
659659
}
660660
},
661661
{
@@ -891,7 +891,7 @@
891891
"type": "object",
892892
"allOf": [
893893
{
894-
"$ref": "#/definitions/Resource"
894+
"$ref": "../../Microsoft.Web/2016-03-01/CommonDefinitions.json#/definitions/Resource"
895895
}
896896
],
897897
"properties": {
@@ -1095,7 +1095,7 @@
10951095
"type": "object",
10961096
"allOf": [
10971097
{
1098-
"$ref": "#/definitions/ProxyOnlyResource"
1098+
"$ref": "../../Microsoft.Web/2016-03-01/CommonDefinitions.json#/definitions/ProxyOnlyResource"
10991099
}
11001100
],
11011101
"properties": {
@@ -1279,7 +1279,7 @@
12791279
"type": "object",
12801280
"allOf": [
12811281
{
1282-
"$ref": "#/definitions/ProxyOnlyResource"
1282+
"$ref": "../../Microsoft.Web/2016-03-01/CommonDefinitions.json#/definitions/ProxyOnlyResource"
12831283
}
12841284
],
12851285
"properties": {
@@ -1295,7 +1295,7 @@
12951295
"type": "object",
12961296
"allOf": [
12971297
{
1298-
"$ref": "#/definitions/Resource"
1298+
"$ref": "../../Microsoft.Web/2016-03-01/CommonDefinitions.json#/definitions/Resource"
12991299
}
13001300
],
13011301
"properties": {
@@ -1365,7 +1365,7 @@
13651365
"type": "object",
13661366
"allOf": [
13671367
{
1368-
"$ref": "#/definitions/ProxyOnlyResource"
1368+
"$ref": "../../Microsoft.Web/2016-03-01/CommonDefinitions.json#/definitions/ProxyOnlyResource"
13691369
}
13701370
],
13711371
"properties": {
@@ -1391,7 +1391,7 @@
13911391
"type": "object",
13921392
"allOf": [
13931393
{
1394-
"$ref": "#/definitions/Resource"
1394+
"$ref": "../../Microsoft.Web/2016-03-01/CommonDefinitions.json#/definitions/Resource"
13951395
}
13961396
],
13971397
"properties": {
@@ -1432,47 +1432,12 @@
14321432
}
14331433
}
14341434
},
1435-
"NameIdentifier": {
1436-
"description": "Identifies an object.",
1437-
"type": "object",
1438-
"properties": {
1439-
"name": {
1440-
"description": "Name of the object.",
1441-
"type": "string"
1442-
}
1443-
}
1444-
},
1445-
"ProxyOnlyResource": {
1446-
"description": "Azure proxy only resource. This resource is not tracked by Azure Resource Manager.",
1447-
"properties": {
1448-
"id": {
1449-
"description": "Resource Id.",
1450-
"type": "string",
1451-
"readOnly": true
1452-
},
1453-
"name": {
1454-
"description": "Resource Name.",
1455-
"type": "string",
1456-
"readOnly": true
1457-
},
1458-
"kind": {
1459-
"description": "Kind of resource.",
1460-
"type": "string"
1461-
},
1462-
"type": {
1463-
"description": "Resource type.",
1464-
"type": "string",
1465-
"readOnly": true
1466-
}
1467-
},
1468-
"x-ms-azure-resource": true
1469-
},
14701435
"ReissueCertificateOrderRequest": {
14711436
"description": "Class representing certificate reissue request.",
14721437
"type": "object",
14731438
"allOf": [
14741439
{
1475-
"$ref": "#/definitions/Resource"
1440+
"$ref": "../../Microsoft.Web/2016-03-01/CommonDefinitions.json#/definitions/Resource"
14761441
}
14771442
],
14781443
"properties": {
@@ -1507,7 +1472,7 @@
15071472
"type": "object",
15081473
"allOf": [
15091474
{
1510-
"$ref": "#/definitions/Resource"
1475+
"$ref": "../../Microsoft.Web/2016-03-01/CommonDefinitions.json#/definitions/Resource"
15111476
}
15121477
],
15131478
"properties": {
@@ -1532,45 +1497,6 @@
15321497
}
15331498
}
15341499
},
1535-
"Resource": {
1536-
"description": "Azure resource. This resource is tracked in Azure Resource Manager",
1537-
"required": [
1538-
"location"
1539-
],
1540-
"properties": {
1541-
"id": {
1542-
"description": "Resource Id.",
1543-
"type": "string",
1544-
"readOnly": true
1545-
},
1546-
"name": {
1547-
"description": "Resource Name.",
1548-
"type": "string",
1549-
"readOnly": true
1550-
},
1551-
"kind": {
1552-
"description": "Kind of resource.",
1553-
"type": "string"
1554-
},
1555-
"location": {
1556-
"description": "Resource Location.",
1557-
"type": "string"
1558-
},
1559-
"type": {
1560-
"description": "Resource type.",
1561-
"type": "string",
1562-
"readOnly": true
1563-
},
1564-
"tags": {
1565-
"description": "Resource tags.",
1566-
"type": "object",
1567-
"additionalProperties": {
1568-
"type": "string"
1569-
}
1570-
}
1571-
},
1572-
"x-ms-azure-resource": true
1573-
},
15741500
"SiteSeal": {
15751501
"description": "Site seal",
15761502
"required": [

‎specification/web/resource-manager/Microsoft.DomainRegistration/2015-04-01/Domains.json‎

Lines changed: 5 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"description": "Name of the domain.",
3131
"required": true,
3232
"schema": {
33-
"$ref": "#/definitions/NameIdentifier"
33+
"$ref": "../../Microsoft.Web/2016-03-01/CommonDefinitions.json#/definitions/NameIdentifier"
3434
}
3535
},
3636
{
@@ -667,7 +667,7 @@
667667
"type": "object",
668668
"allOf": [
669669
{
670-
"$ref": "#/definitions/Resource"
670+
"$ref": "../../Microsoft.Web/2016-03-01/CommonDefinitions.json#/definitions/Resource"
671671
}
672672
],
673673
"properties": {
@@ -937,7 +937,7 @@
937937
"type": "object",
938938
"allOf": [
939939
{
940-
"$ref": "#/definitions/ProxyOnlyResource"
940+
"$ref": "../../Microsoft.Web/2016-03-01/CommonDefinitions.json#/definitions/ProxyOnlyResource"
941941
}
942942
],
943943
"properties": {
@@ -978,7 +978,7 @@
978978
"type": "object",
979979
"allOf": [
980980
{
981-
"$ref": "#/definitions/ProxyOnlyResource"
981+
"$ref": "../../Microsoft.Web/2016-03-01/CommonDefinitions.json#/definitions/ProxyOnlyResource"
982982
}
983983
],
984984
"properties": {
@@ -1270,16 +1270,6 @@
12701270
}
12711271
}
12721272
},
1273-
"NameIdentifier": {
1274-
"description": "Identifies an object.",
1275-
"type": "object",
1276-
"properties": {
1277-
"name": {
1278-
"description": "Name of the object.",
1279-
"type": "string"
1280-
}
1281-
}
1282-
},
12831273
"NameIdentifierCollection": {
12841274
"description": "Collection of domain name identifiers.",
12851275
"required": [
@@ -1291,78 +1281,14 @@
12911281
"description": "Collection of resources.",
12921282
"type": "array",
12931283
"items": {
1294-
"$ref": "#/definitions/NameIdentifier"
1284+
"$ref": "../../Microsoft.Web/2016-03-01/CommonDefinitions.json#/definitions/NameIdentifier"
12951285
}
12961286
},
12971287
"nextLink": {
12981288
"description": "Link to next page of resources.",
12991289
"type": "string"
13001290
}
13011291
}
1302-
},
1303-
"ProxyOnlyResource": {
1304-
"description": "Azure proxy only resource. This resource is not tracked by Azure Resource Manager.",
1305-
"properties": {
1306-
"id": {
1307-
"description": "Resource Id.",
1308-
"type": "string",
1309-
"readOnly": true
1310-
},
1311-
"name": {
1312-
"description": "Resource Name.",
1313-
"type": "string",
1314-
"readOnly": true
1315-
},
1316-
"kind": {
1317-
"description": "Kind of resource.",
1318-
"type": "string"
1319-
},
1320-
"type": {
1321-
"description": "Resource type.",
1322-
"type": "string",
1323-
"readOnly": true
1324-
}
1325-
},
1326-
"x-ms-azure-resource": true
1327-
},
1328-
"Resource": {
1329-
"description": "Azure resource. This resource is tracked in Azure Resource Manager",
1330-
"required": [
1331-
"location"
1332-
],
1333-
"properties": {
1334-
"id": {
1335-
"description": "Resource Id.",
1336-
"type": "string",
1337-
"readOnly": true
1338-
},
1339-
"name": {
1340-
"description": "Resource Name.",
1341-
"type": "string",
1342-
"readOnly": true
1343-
},
1344-
"kind": {
1345-
"description": "Kind of resource.",
1346-
"type": "string"
1347-
},
1348-
"location": {
1349-
"description": "Resource Location.",
1350-
"type": "string"
1351-
},
1352-
"type": {
1353-
"description": "Resource type.",
1354-
"type": "string",
1355-
"readOnly": true
1356-
},
1357-
"tags": {
1358-
"description": "Resource tags.",
1359-
"type": "object",
1360-
"additionalProperties": {
1361-
"type": "string"
1362-
}
1363-
}
1364-
},
1365-
"x-ms-azure-resource": true
13661292
}
13671293
},
13681294
"parameters": {

‎specification/web/resource-manager/Microsoft.DomainRegistration/2015-04-01/TopLevelDomains.json‎

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -124,31 +124,6 @@
124124
}
125125
},
126126
"definitions": {
127-
"ProxyOnlyResource": {
128-
"description": "Azure proxy only resource. This resource is not tracked by Azure Resource Manager.",
129-
"properties": {
130-
"id": {
131-
"description": "Resource Id.",
132-
"type": "string",
133-
"readOnly": true
134-
},
135-
"name": {
136-
"description": "Resource Name.",
137-
"type": "string",
138-
"readOnly": true
139-
},
140-
"kind": {
141-
"description": "Kind of resource.",
142-
"type": "string"
143-
},
144-
"type": {
145-
"description": "Resource type.",
146-
"type": "string",
147-
"readOnly": true
148-
}
149-
},
150-
"x-ms-azure-resource": true
151-
},
152127
"TldLegalAgreement": {
153128
"description": "Legal agreement for a top level domain.",
154129
"required": [
@@ -201,7 +176,7 @@
201176
"type": "object",
202177
"allOf": [
203178
{
204-
"$ref": "#/definitions/ProxyOnlyResource"
179+
"$ref": "../../Microsoft.Web/2016-03-01/CommonDefinitions.json#/definitions/ProxyOnlyResource"
205180
}
206181
],
207182
"properties": {

0 commit comments

Comments
 (0)