Skip to content
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

Jump to bottom

Expose Patch operations. Expose missing provider level operations #1816

Merged
merged 41 commits into from
Oct 23, 2017
Merged

Expose Patch operations. Expose missing provider level operations #1816

Show file tree
Hide file tree
Changes from 33 commits
Commits
Show all changes
41 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
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
136 changes: 132 additions & 4 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 @@ -252,6 +252,66 @@
"description": "Certificate order does not exist."
}
}
},
"patch": {
"tags": [
"AppServiceCertificateOrders"
],
"summary": "Create or update a certificate purchase order.",
"description": "Create or update a certificate purchase order.",
"operationId": "AppServiceCertificateOrders_Update",
"consumes": [
"application/json",
"text/json",
"application/x-www-form-urlencoded"
],
"produces": [
"application/json",
"text/json",
"application/xml",
"text/xml"
],
"parameters": [
{
"$ref": "#/parameters/resourceGroupNameParameter"
},
{
"name": "certificateOrderName",
"in": "path",
"description": "Name of the certificate order.",
"required": true,
"type": "string"
},
{
"name": "certificateDistinguishedName",
"in": "body",
"description": "Distinguished name to to use for the certificate order.",
"required": true,
"schema": {
"$ref": "#/definitions/AppServiceCertificateOrder"
}
},
{
"$ref": "#/parameters/subscriptionIdParameter"
},
{
"$ref": "#/parameters/apiVersionParameter"
}
],
"responses": {
"200": {
"description": "App Service Certificate Order is created.",
"schema": {
"$ref": "#/definitions/AppServiceCertificateOrder"
}
},
"201": {
"description": "App Service Certificate Order creation operation is in progress",
"schema": {
"$ref": "#/definitions/AppServiceCertificateOrder"
}
}
}
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CertificateRegistration/certificateOrders/{certificateOrderName}/certificates": {
Expand Down Expand Up @@ -453,6 +513,73 @@
"description": "Certificate does not exist."
}
}
},
"patch": {
"tags": [
"AppServiceCertificateOrders"
],
"summary": "Creates or updates a certificate and associates with key vault secret.",
"description": "Creates or updates a certificate and associates with key vault secret.",
"operationId": "AppServiceCertificateOrders_UpdateCertificate",
"consumes": [
"application/json",
"text/json",
"application/x-www-form-urlencoded"
],
"produces": [
"application/json",
"text/json",
"application/xml",
"text/xml"
],
"parameters": [
{
"$ref": "#/parameters/resourceGroupNameParameter"
},
{
"name": "certificateOrderName",
"in": "path",
"description": "Name of the certificate order.",
"required": true,
"type": "string"
},
{
"name": "name",
"in": "path",
"description": "Name of the certificate.",
"required": true,
"type": "string"
},
{
"name": "keyVaultCertificate",
"in": "body",
"description": "Key vault certificate resource Id.",
"required": true,
"schema": {
"$ref": "#/definitions/AppServiceCertificateResource"
}
},
{
"$ref": "#/parameters/subscriptionIdParameter"
},
{
"$ref": "#/parameters/apiVersionParameter"
}
],
"responses": {
"200": {
"description": "App Service Certificate is created.",
"schema": {
"$ref": "#/definitions/AppServiceCertificateResource"
}
},
"201": {
"description": "App Service Certificate creation operation is in progress",
"schema": {
"$ref": "#/definitions/AppServiceCertificateResource"
}
}
}
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CertificateRegistration/certificateOrders/{certificateOrderName}/reissue": {
Expand Down Expand Up @@ -1321,9 +1448,6 @@
},
"Resource": {
"description": "Azure resource. This resource is tracked in Azure Resource Manager",
"required": [
"location"
],
"properties": {
"id": {
"description": "Resource Id.",
Expand All @@ -1341,7 +1465,11 @@
},
"location": {
"description": "Resource Location.",
"type": "string"
"type": "string",
"x-ms-mutability": [
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know, we recommend to use x-ms-mutability. AutoRest SDK code generation doesn't use the extension for now but it may use it in the future. It's not an SDK breaking change. In the same time, removing required field may change an order of constructor parameters.

"create",
"read"
]
},
"type": {
"description": "Resource type.",
Expand Down
72 changes: 67 additions & 5 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 @@ -349,6 +349,67 @@
"description": "Domain does not exist in Azure database probably because it has already been deleted"
}
}
},
"patch": {
"tags": [
"Domains"
],
"summary": "Creates or updates a domain.",
"description": "Creates or updates a domain.",
"operationId": "Domains_Update",
"consumes": [
"application/json",
"text/json",
"application/x-www-form-urlencoded"
],
"produces": [
"application/json",
"text/json",
"application/xml",
"text/xml"
],
"parameters": [
{
"$ref": "#/parameters/resourceGroupNameParameter"
},
{
"name": "domainName",
"in": "path",
"description": "Name of the domain.",
"required": true,
"type": "string",
"pattern": "[a-zA-Z0-9][a-zA-Z0-9\\.-]+"
},
{
"name": "domain",
"in": "body",
"description": "Domain registration information.",
"required": true,
"schema": {
"$ref": "#/definitions/Domain"
}
},
{
"$ref": "#/parameters/subscriptionIdParameter"
},
{
"$ref": "#/parameters/apiVersionParameter"
}
],
"responses": {
"202": {
"description": "Domain purchase is in progress.",
"schema": {
"$ref": "#/definitions/Domain"
}
},
"200": {
"description": "Domain purchase was successful.",
"schema": {
"$ref": "#/definitions/Domain"
}
}
}
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DomainRegistration/domains/{domainName}/domainOwnershipIdentifiers": {
Expand Down Expand Up @@ -646,7 +707,7 @@
}
},
"Contact": {
"description": "Contact information for domain registration. If 'Domain Privacy' option is not selected then the contact information is made publicly available through the Whois \n directories as per ICANN requirements.",
"description": "Contact information for domain registration. If 'Domain Privacy' option is not selected then the contact information is made publicly available through the Whois \ndirectories as per ICANN requirements.",
"required": [
"email",
"nameFirst",
Expand Down Expand Up @@ -1130,9 +1191,6 @@
},
"Resource": {
"description": "Azure resource. This resource is tracked in Azure Resource Manager",
"required": [
"location"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here, it's a potential SDK breaking change.

],
"properties": {
"id": {
"description": "Resource Id.",
Expand All @@ -1150,7 +1208,11 @@
},
"location": {
"description": "Resource Location.",
"type": "string"
"type": "string",
"x-ms-mutability": [
"create",
"read"
]
},
"type": {
"description": "Resource type.",
Expand Down
10 changes: 6 additions & 4 deletions specification/web/resource-manager/Microsoft.Web/2016-03-01/Certificates.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,7 @@
"readOnly": true
},
"cerBlob": {
"format": "byte",
"description": "Raw bytes of .cer file",
"type": "string",
"readOnly": true
Expand Down Expand Up @@ -451,9 +452,6 @@
},
"Resource": {
"description": "Azure resource. This resource is tracked in Azure Resource Manager",
"required": [
"location"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A potential SDK breaking change.

],
"properties": {
"id": {
"description": "Resource Id.",
Expand All @@ -471,7 +469,11 @@
},
"location": {
"description": "Resource Location.",
"type": "string"
"type": "string",
"x-ms-mutability": [
"create",
"read"
]
},
"type": {
"description": "Resource type.",
Expand Down
8 changes: 2 additions & 6 deletions specification/web/resource-manager/Microsoft.Web/2016-03-01/Provider.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/Object"
"type": "object"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

an SDK breaking change.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change from #/definitions/Object is SDK but recommended by Azure SDK/ARM

}
}
}
Expand Down Expand Up @@ -92,7 +92,7 @@
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/Object"
"type": "object"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

an SDK breaking change.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change from #/definitions/Object is SDK but recommended by Azure SDK/ARM

}
}
}
Expand Down Expand Up @@ -246,10 +246,6 @@
}
}
},
"Object": {
"type": "object",
"properties": {}
},
"ServiceSpecification": {
"type": "object",
"properties": {
Expand Down
17 changes: 13 additions & 4 deletions specification/web/resource-manager/Microsoft.Web/2016-03-01/Recommendations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,12 @@
"description": "Specify <code>true</code> to update the last-seen timestamp of the recommendation object.",
"type": "boolean"
},
{
"name": "recommendationId",
"in": "query",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A new parameter in the middle of parameter list, which is an SDK breaking change and probably Rest API breaking change. @ravbhatnagar. To reduce impact on SDK code generation, the new parameter should be the last one so function signature will not have a breaking change.

"description": "The GUID of the recommedation object if you query an expired one. You don't need to specify it to query an active entry.",
"type": "string"
},
{
"$ref": "#/parameters/subscriptionIdParameter"
},
Expand Down Expand Up @@ -323,8 +329,10 @@
"type": "string"
},
"recommendationId": {
"format": "uuid",
"description": "A GUID value that each recommendation object is associated with.",
"type": "string"
"type": "string",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SDK breaking change.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Client validation for (uuid, byte ) will cause SDK breaks, but is acceptable and actually a good change.

"example": "00000000-0000-0000-0000-000000000000"
},
"resourceId": {
"description": "Full ARM resource ID string that this recommendation object is associated with.",
Expand Down Expand Up @@ -461,8 +469,9 @@
},
"recommendationId": {
"format": "uuid",
"description": "Recommendation ID of an associated recommendation object tied to the rule, if exists.\n If such an object doesn't exist, it is set to null.",
"type": "string"
"description": "Recommendation ID of an associated recommendation object tied to the rule, if exists.\nIf such an object doesn't exist, it is set to null.",
"type": "string",
"example": "00000000-0000-0000-0000-000000000000"
},
"description": {
"description": "Localized detailed description of the rule.",
Expand Down Expand Up @@ -572,4 +581,4 @@
]
}
]
}
}
Loading