Skip to content

Use relative references to models in common definitions json. Remove duplicate models from each swagger collection doc #1909

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fearthecowboy merged 48 commits into from
Oct 24, 2017
Merged

Use relative references to models in common definitions json. Remove duplicate models from each swagger collection doc #1909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
7a491a8
Fix regression where Get source control API was accidentally removed …
May 9, 2017
c211666
Merge remote-tracking branch 'upstream/master'
Jul 5, 2017
5d1d2ec
Add PublicCertificates API, MSDeploy API and remove obsolete microSer…
Jul 5, 2017
dc0352d
Add public certificates, Functions Admin Token and MSDeploy APIs
Jul 26, 2017
549a9de
Revert resource definition changes and description change for site pr…
Jul 26, 2017
39ceb0d
Merge remote-tracking branch 'upstream/current' into current
Jul 26, 2017
ba5ad4f
Make type and name readonly properties. Add ARM envelope to MSDeployS…
Jul 28, 2017
f9084ca
Merge remote-tracking branch 'upstream/current' into current
Jul 28, 2017
a82a87c
Fix missing quotation issue.
Jul 28, 2017
7ed3428
Merge remote-tracking branch 'upstream/current' into current
Jul 28, 2017
e0fd751
Add long running operation to MS deploy
Jul 28, 2017
7fa0073
Merge remote-tracking branch 'upstream/current' into current
Jul 28, 2017
4dab1f8
Make MsDeploy and MsDeployLog Azure resources
Aug 7, 2017
2101e70
Merge remote-tracking branch 'upstream/current' into current
Aug 7, 2017
d4abb2f
Fix some AutoRest validation issues. Use dictionary for msdeploy.setp…
Aug 8, 2017
b47c0d5
Ensure models are same across all schemas in Microsoft.Web
Aug 8, 2017
26c40f9
Fix azure resource type across all models
Aug 8, 2017
d068b39
Merge remote-tracking branch 'upstream/current' into current
Aug 8, 2017
49b1967
Remove conflicting ListOperations. It is not used for public Azure.
Aug 8, 2017
39cbd9e
Merge remote-tracking branch 'upstream/current' into current
Aug 8, 2017
462f730
Merge remote-tracking branch 'upstream/current' into current
Oct 4, 2017
5f7e16e
Merge conflicts
Oct 5, 2017
e4e2990
Merge remote-tracking branch 'upstream/current' into current
Oct 5, 2017
0937c56
Expose Patch operations. Expose missing provider level operations
Oct 6, 2017
c01b88b
Merge remote-tracking branch 'upstream/current' into current
Oct 6, 2017
98f90e5
Fix static validation issues.
Oct 6, 2017
512ff6a
Remove required for location on Azure resource
Oct 9, 2017
6eb2e27
Merge remote-tracking branch 'upstream/current' into current
Oct 9, 2017
82258b4
Fix enum to maintain order
Oct 11, 2017
c4f4231
Merge remote-tracking branch 'upstream/current' into current
Oct 11, 2017
5c4e17a
Fix Stampcapacity enum in ResourceProvider.json
Oct 11, 2017
c8b9172
Merge upstream changes
Oct 16, 2017
20c083c
Merge remote-tracking branch 'upstream/current' into current
Oct 16, 2017
ea96df9
Move common definitions to single location.
Oct 20, 2017
3680787
Fix spurious references to commonDefinitions
Oct 20, 2017
3883327
Merge remote-tracking branch 'upstream/current' into current
Oct 20, 2017
f9bffdc
Address CR issues.
Oct 20, 2017
4866660
Revert references to common definitions
Oct 20, 2017
e7d6ee8
Merge remote-tracking branch 'upstream/current' into current
Oct 20, 2017
9478357
Revert Model Resource to have required location.
Oct 20, 2017
e1592df
Fixing a few straglers
Oct 20, 2017
76ea9c5
Merge remote-tracking branch 'upstream/current' into current
Oct 23, 2017
71b15d0
Use relative references to models in common definitions json. Remove …
Oct 23, 2017
14c4638
Fix missing reference to RampUpRule.
Oct 23, 2017
cc95339
Merge remote-tracking branch 'upstream/current' into current
Oct 23, 2017
8bc0468
Add security and security definitions to common definitions.
Oct 23, 2017
4fd6f00
Read IgnoreQuotas property and fix functionappid property name
Oct 24, 2017
f2bb5a6
Merge remote-tracking branch 'upstream/current' into current
Oct 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
92 changes: 9 additions & 83 deletions ...rce-manager/Microsoft.CertificateRegistration/2015-08-01/AppServiceCertificateOrders.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -655,7 +655,7 @@
"description": "Email address",
"required": true,
"schema": {
"$ref": "#/definitions/NameIdentifier"
"$ref": "../../Microsoft.Web/2016-03-01/CommonDefinitions.json#/definitions/NameIdentifier"
}
},
{
Expand Down Expand Up @@ -891,7 +891,7 @@
"type": "object",
"allOf": [
{
"$ref": "#/definitions/Resource"
"$ref": "../../Microsoft.Web/2016-03-01/CommonDefinitions.json#/definitions/Resource"
}
],
"properties": {
Expand Down Expand Up @@ -1095,7 +1095,7 @@
"type": "object",
"allOf": [
{
"$ref": "#/definitions/ProxyOnlyResource"
"$ref": "../../Microsoft.Web/2016-03-01/CommonDefinitions.json#/definitions/ProxyOnlyResource"
}
],
"properties": {
Expand Down Expand Up @@ -1279,7 +1279,7 @@
"type": "object",
"allOf": [
{
"$ref": "#/definitions/ProxyOnlyResource"
"$ref": "../../Microsoft.Web/2016-03-01/CommonDefinitions.json#/definitions/ProxyOnlyResource"
}
],
"properties": {
Expand All @@ -1295,7 +1295,7 @@
"type": "object",
"allOf": [
{
"$ref": "#/definitions/Resource"
"$ref": "../../Microsoft.Web/2016-03-01/CommonDefinitions.json#/definitions/Resource"
}
],
"properties": {
Expand Down Expand Up @@ -1365,7 +1365,7 @@
"type": "object",
"allOf": [
{
"$ref": "#/definitions/ProxyOnlyResource"
"$ref": "../../Microsoft.Web/2016-03-01/CommonDefinitions.json#/definitions/ProxyOnlyResource"
}
],
"properties": {
Expand All @@ -1391,7 +1391,7 @@
"type": "object",
"allOf": [
{
"$ref": "#/definitions/Resource"
"$ref": "../../Microsoft.Web/2016-03-01/CommonDefinitions.json#/definitions/Resource"
}
],
"properties": {
Expand Down Expand Up @@ -1432,47 +1432,12 @@
}
}
},
"NameIdentifier": {
"description": "Identifies an object.",
"type": "object",
"properties": {
"name": {
"description": "Name of the object.",
"type": "string"
}
}
},
"ProxyOnlyResource": {
"description": "Azure proxy only resource. This resource is not tracked by Azure Resource Manager.",
"properties": {
"id": {
"description": "Resource Id.",
"type": "string",
"readOnly": true
},
"name": {
"description": "Resource Name.",
"type": "string",
"readOnly": true
},
"kind": {
"description": "Kind of resource.",
"type": "string"
},
"type": {
"description": "Resource type.",
"type": "string",
"readOnly": true
}
},
"x-ms-azure-resource": true
},
"ReissueCertificateOrderRequest": {
"description": "Class representing certificate reissue request.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/Resource"
"$ref": "../../Microsoft.Web/2016-03-01/CommonDefinitions.json#/definitions/Resource"
}
],
"properties": {
Expand Down Expand Up @@ -1507,7 +1472,7 @@
"type": "object",
"allOf": [
{
"$ref": "#/definitions/Resource"
"$ref": "../../Microsoft.Web/2016-03-01/CommonDefinitions.json#/definitions/Resource"
}
],
"properties": {
Expand All @@ -1532,45 +1497,6 @@
}
}
},
"Resource": {
"description": "Azure resource. This resource is tracked in Azure Resource Manager",
"required": [
"location"
],
"properties": {
"id": {
"description": "Resource Id.",
"type": "string",
"readOnly": true
},
"name": {
"description": "Resource Name.",
"type": "string",
"readOnly": true
},
"kind": {
"description": "Kind of resource.",
"type": "string"
},
"location": {
"description": "Resource Location.",
"type": "string"
},
"type": {
"description": "Resource type.",
"type": "string",
"readOnly": true
},
"tags": {
"description": "Resource tags.",
"type": "object",
"additionalProperties": {
"type": "string"
}
}
},
"x-ms-azure-resource": true
},
"SiteSeal": {
"description": "Site seal",
"required": [
Expand Down
84 changes: 5 additions & 79 deletions specification/web/resource-manager/Microsoft.DomainRegistration/2015-04-01/Domains.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"description": "Name of the domain.",
"required": true,
"schema": {
"$ref": "#/definitions/NameIdentifier"
"$ref": "../../Microsoft.Web/2016-03-01/CommonDefinitions.json#/definitions/NameIdentifier"
}
},
{
Expand Down Expand Up @@ -667,7 +667,7 @@
"type": "object",
"allOf": [
{
"$ref": "#/definitions/Resource"
"$ref": "../../Microsoft.Web/2016-03-01/CommonDefinitions.json#/definitions/Resource"
}
],
"properties": {
Expand Down Expand Up @@ -937,7 +937,7 @@
"type": "object",
"allOf": [
{
"$ref": "#/definitions/ProxyOnlyResource"
"$ref": "../../Microsoft.Web/2016-03-01/CommonDefinitions.json#/definitions/ProxyOnlyResource"
}
],
"properties": {
Expand Down Expand Up @@ -978,7 +978,7 @@
"type": "object",
"allOf": [
{
"$ref": "#/definitions/ProxyOnlyResource"
"$ref": "../../Microsoft.Web/2016-03-01/CommonDefinitions.json#/definitions/ProxyOnlyResource"
}
],
"properties": {
Expand Down Expand Up @@ -1270,16 +1270,6 @@
}
}
},
"NameIdentifier": {
"description": "Identifies an object.",
"type": "object",
"properties": {
"name": {
"description": "Name of the object.",
"type": "string"
}
}
},
"NameIdentifierCollection": {
"description": "Collection of domain name identifiers.",
"required": [
Expand All @@ -1291,78 +1281,14 @@
"description": "Collection of resources.",
"type": "array",
"items": {
"$ref": "#/definitions/NameIdentifier"
"$ref": "../../Microsoft.Web/2016-03-01/CommonDefinitions.json#/definitions/NameIdentifier"
}
},
"nextLink": {
"description": "Link to next page of resources.",
"type": "string"
}
}
},
"ProxyOnlyResource": {
"description": "Azure proxy only resource. This resource is not tracked by Azure Resource Manager.",
"properties": {
"id": {
"description": "Resource Id.",
"type": "string",
"readOnly": true
},
"name": {
"description": "Resource Name.",
"type": "string",
"readOnly": true
},
"kind": {
"description": "Kind of resource.",
"type": "string"
},
"type": {
"description": "Resource type.",
"type": "string",
"readOnly": true
}
},
"x-ms-azure-resource": true
},
"Resource": {
"description": "Azure resource. This resource is tracked in Azure Resource Manager",
"required": [
"location"
],
"properties": {
"id": {
"description": "Resource Id.",
"type": "string",
"readOnly": true
},
"name": {
"description": "Resource Name.",
"type": "string",
"readOnly": true
},
"kind": {
"description": "Kind of resource.",
"type": "string"
},
"location": {
"description": "Resource Location.",
"type": "string"
},
"type": {
"description": "Resource type.",
"type": "string",
"readOnly": true
},
"tags": {
"description": "Resource tags.",
"type": "object",
"additionalProperties": {
"type": "string"
}
}
},
"x-ms-azure-resource": true
}
},
"parameters": {
Expand Down
27 changes: 1 addition & 26 deletions ...ication/web/resource-manager/Microsoft.DomainRegistration/2015-04-01/TopLevelDomains.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,31 +124,6 @@
}
},
"definitions": {
"ProxyOnlyResource": {
"description": "Azure proxy only resource. This resource is not tracked by Azure Resource Manager.",
"properties": {
"id": {
"description": "Resource Id.",
"type": "string",
"readOnly": true
},
"name": {
"description": "Resource Name.",
"type": "string",
"readOnly": true
},
"kind": {
"description": "Kind of resource.",
"type": "string"
},
"type": {
"description": "Resource type.",
"type": "string",
"readOnly": true
}
},
"x-ms-azure-resource": true
},
"TldLegalAgreement": {
"description": "Legal agreement for a top level domain.",
"required": [
Expand Down Expand Up @@ -201,7 +176,7 @@
"type": "object",
"allOf": [
{
"$ref": "#/definitions/ProxyOnlyResource"
"$ref": "../../Microsoft.Web/2016-03-01/CommonDefinitions.json#/definitions/ProxyOnlyResource"
}
],
"properties": {
Expand Down
Loading