Skip to content

Expose Patch operations. Expose missing provider level operations #1816

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
sergey-shandar 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 all 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
462 changes: 324 additions & 138 deletions ...rce-manager/Microsoft.CertificateRegistration/2015-08-01/AppServiceCertificateOrders.json
View file
Open in desktop

Large diffs are not rendered by default.

422 changes: 296 additions & 126 deletions specification/web/resource-manager/Microsoft.DomainRegistration/2015-04-01/Domains.json
View file
Open in desktop

Large diffs are not rendered by default.

27 changes: 6 additions & 21 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 @@ -8,6 +8,12 @@
"schemes": [
"https"
],
"consumes": [
"application/json"
],
"produces": [
"application/json"
],
"paths": {
"/subscriptions/{subscriptionId}/providers/Microsoft.DomainRegistration/topLevelDomains": {
"get": {
Expand All @@ -17,10 +23,6 @@
"summary": "Get all top-level domains supported for registration.",
"description": "Get all top-level domains supported for registration.",
"operationId": "TopLevelDomains_List",
"produces": [
"application/json",
"text/json"
],
"parameters": [
{
"$ref": "#/parameters/subscriptionIdParameter"
Expand Down Expand Up @@ -50,12 +52,6 @@
"summary": "Get details of a top-level domain.",
"description": "Get details of a top-level domain.",
"operationId": "TopLevelDomains_Get",
"produces": [
"application/json",
"text/json",
"application/xml",
"text/xml"
],
"parameters": [
{
"name": "name",
Expand Down Expand Up @@ -89,17 +85,6 @@
"summary": "Gets all legal agreements that user needs to accept before purchasing a domain.",
"description": "Gets all legal agreements that user needs to accept before purchasing a domain.",
"operationId": "TopLevelDomains_ListAgreements",
"consumes": [
"application/json",
"text/json",
"application/xml",
"text/xml",
"application/x-www-form-urlencoded"
],
"produces": [
"application/json",
"text/json"
],
"parameters": [
{
"name": "name",
Expand Down
247 changes: 176 additions & 71 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 @@ -8,6 +8,12 @@
"schemes": [
"https"
],
"consumes": [
"application/json"
],
"produces": [
"application/json"
],
"paths": {
"/subscriptions/{subscriptionId}/providers/Microsoft.Web/certificates": {
"get": {
Expand All @@ -17,10 +23,6 @@
"summary": "Get all certificates for a subscription.",
"description": "Get all certificates for a subscription.",
"operationId": "Certificates_List",
"produces": [
"application/json",
"text/json"
],
"parameters": [
{
"$ref": "#/parameters/subscriptionIdParameter"
Expand Down Expand Up @@ -50,10 +52,6 @@
"summary": "Get all certificates in a resource group.",
"description": "Get all certificates in a resource group.",
"operationId": "Certificates_ListByResourceGroup",
"produces": [
"application/json",
"text/json"
],
"parameters": [
{
"$ref": "#/parameters/resourceGroupNameParameter"
Expand Down Expand Up @@ -86,12 +84,6 @@
"summary": "Get a certificate.",
"description": "Get a certificate.",
"operationId": "Certificates_Get",
"produces": [
"application/json",
"text/json",
"application/xml",
"text/xml"
],
"parameters": [
{
"$ref": "#/parameters/resourceGroupNameParameter"
Expand Down Expand Up @@ -126,17 +118,6 @@
"summary": "Create or update a certificate.",
"description": "Create or update a certificate.",
"operationId": "Certificates_CreateOrUpdate",
"consumes": [
"application/json",
"text/json",
"application/x-www-form-urlencoded"
],
"produces": [
"application/json",
"text/json",
"application/xml",
"text/xml"
],
"parameters": [
{
"$ref": "#/parameters/resourceGroupNameParameter"
Expand Down Expand Up @@ -214,17 +195,6 @@
"summary": "Create or update a certificate.",
"description": "Create or update a certificate.",
"operationId": "Certificates_Update",
"consumes": [
"application/json",
"text/json",
"application/x-www-form-urlencoded"
],
"produces": [
"application/json",
"text/json",
"application/xml",
"text/xml"
],
"parameters": [
{
"$ref": "#/parameters/resourceGroupNameParameter"
Expand All @@ -242,7 +212,7 @@
"description": "Details of certificate, if it exists already.",
"required": true,
"schema": {
"$ref": "#/definitions/Certificate"
"$ref": "#/definitions/CertificatePatchResource"
}
},
{
Expand Down Expand Up @@ -346,6 +316,7 @@
"readOnly": true
},
"cerBlob": {
"format": "byte",
"description": "Raw bytes of .cer file",
"type": "string",
"readOnly": true
Expand Down Expand Up @@ -395,11 +366,6 @@
"type": "string",
"readOnly": true
},
"name": {
"description": "Resource name of the certificate.",
"type": "string",
"readOnly": true
},
"serverFarmId": {
"description": "Resource ID of the associated App Service plan, formatted as: \"/subscriptions/{subscriptionID}/resourceGroups/{groupName}/providers/Microsoft.Web/serverfarms/{appServicePlanName}\".",
"type": "string"
Expand Down Expand Up @@ -429,6 +395,147 @@
}
}
},
"CertificatePatchResource": {
"description": "ARM resource for a certificate.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/ProxyOnlyResource"
}
],
"properties": {
"properties": {
"description": "CertificatePatchResource resource specific properties",
"required": [
"password"
],
"properties": {
"friendlyName": {
"description": "Friendly name of the certificate.",
"type": "string",
"readOnly": true
},
"subjectName": {
"description": "Subject name of the certificate.",
"type": "string",
"readOnly": true
},
"hostNames": {
"description": "Host names the certificate applies to.",
"type": "array",
"items": {
"type": "string"
}
},
"pfxBlob": {
"format": "byte",
"description": "Pfx blob.",
"type": "string"
},
"siteName": {
"description": "App name.",
"type": "string",
"readOnly": true
},
"selfLink": {
"description": "Self link.",
"type": "string",
"readOnly": true
},
"issuer": {
"description": "Certificate issuer.",
"type": "string",
"readOnly": true
},
"issueDate": {
"format": "date-time",
"description": "Certificate issue Date.",
"type": "string",
"readOnly": true
},
"expirationDate": {
"format": "date-time",
"description": "Certificate expriration date.",
"type": "string",
"readOnly": true
},
"password": {
"description": "Certificate password.",
"type": "string",
"x-ms-mutability": [
"create"
]
},
"thumbprint": {
"description": "Certificate thumbprint.",
"type": "string",
"readOnly": true
},
"valid": {
"description": "Is the certificate valid?.",
"type": "boolean",
"readOnly": true
},
"cerBlob": {
"format": "byte",
"description": "Raw bytes of .cer file",
"type": "string",
"readOnly": true
},
"publicKeyHash": {
"description": "Public key hash.",
"type": "string",
"readOnly": true
},
"hostingEnvironmentProfile": {
"$ref": "#/definitions/HostingEnvironmentProfile",
"description": "Specification for the App Service Environment to use for the certificate.",
"readOnly": true
},
"keyVaultId": {
"description": "Key Vault Csm resource Id.",
"type": "string"
},
"keyVaultSecretName": {
"description": "Key Vault secret name.",
"type": "string"
},
"keyVaultSecretStatus": {
"description": "Status of the Key Vault secret.",
"enum": [
"Initialized",
"WaitingOnCertificateOrder",
"Succeeded",
"CertificateOrderFailed",
"OperationNotPermittedOnKeyVault",
"AzureServiceUnauthorizedToAccessKeyVault",
"KeyVaultDoesNotExist",
"KeyVaultSecretDoesNotExist",
"UnknownError",
"ExternalPrivateKey",
"Unknown"
],
"type": "string",
"readOnly": true,
"x-ms-enum": {
"name": "KeyVaultSecretStatus",
"modelAsString": false
}
},
"geoRegion": {
"description": "Region of the certificate.",
"type": "string",
"readOnly": true
},
"serverFarmId": {
"description": "Resource ID of the associated App Service plan, formatted as: \"/subscriptions/{subscriptionID}/resourceGroups/{groupName}/providers/Microsoft.Web/serverfarms/{appServicePlanName}\".",
"type": "string"
}
},
"x-ms-client-flatten": true
}
}
},
"HostingEnvironmentProfile": {
"description": "Specification for an App Service Environment to use for this resource.",
"type": "object",
Expand All @@ -449,6 +556,31 @@
}
}
},
"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": [
Expand Down Expand Up @@ -484,33 +616,6 @@
"additionalProperties": {
"type": "string"
}
},
"identity": {
"description": "Identity for the resource.",
"type": "object",
"properties": {
"principalId": {
"description": "The principal ID of resource identity.",
"type": "string",
"readOnly": true
},
"tenantId": {
"description": "The tenant ID of resource.",
"type": "string",
"readOnly": true
},
"type": {
"description": "The identity type.",
"type": "string",
"enum": [
"SystemAssigned"
],
"x-ms-enum": {
"name": "ManagedServiceIdentityType",
"modelAsString": false
}
}
}
}
},
"x-ms-azure-resource": true
Expand All @@ -529,11 +634,11 @@
"in": "path",
"description": "Name of the resource group to which the resource belongs.",
"required": true,
"x-ms-parameter-location": "method",
"type": "string",
"maxLength": 90,
"minLength": 1,
"pattern": "^[-\\w\\._\\(\\)]+[^\\.]$"
"pattern": "^[-\\w\\._\\(\\)]+[^\\.]$",
"x-ms-parameter-location": "method"
},
"apiVersionParameter": {
"name": "api-version",
Expand Down
Loading