Skip to content

Make MsDeploy and MsDeployLog Azure resources #1519

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
jianghaolu merged 17 commits into from
Aug 9, 2017
Merged

Make MsDeploy and MsDeployLog Azure resources #1519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
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
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
35 changes: 31 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 @@ -1152,7 +1152,7 @@
"type": "object",
"allOf": [
{
"$ref": "#/definitions/Resource"
"$ref": "#/definitions/ProxyOnlyResource"
}
],
"properties": {
Expand Down Expand Up @@ -1229,6 +1229,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
},
"ReissueCertificateOrderRequest": {
"description": "Class representing certificate reissue request.",
"type": "object",
Expand Down Expand Up @@ -1295,7 +1320,7 @@
}
},
"Resource": {
"description": "Azure resource.",
"description": "Azure resource. This resource is tracked in Azure Resource Manager",
"required": [
"location"
],
Expand All @@ -1307,7 +1332,8 @@
},
"name": {
"description": "Resource Name.",
"type": "string"
"type": "string",
"readOnly": true
},
"kind": {
"description": "Kind of resource.",
Expand All @@ -1319,7 +1345,8 @@
},
"type": {
"description": "Resource type.",
"type": "string"
"type": "string",
"readOnly": true
},
"tags": {
"description": "Resource tags.",
Expand Down
8 changes: 5 additions & 3 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 @@ -1129,7 +1129,7 @@
}
},
"Resource": {
"description": "Azure resource.",
"description": "Azure resource. This resource is tracked in Azure Resource Manager",
"required": [
"location"
],
Expand All @@ -1141,7 +1141,8 @@
},
"name": {
"description": "Resource Name.",
"type": "string"
"type": "string",
"readOnly": true
},
"kind": {
"description": "Kind of resource.",
Expand All @@ -1153,7 +1154,8 @@
},
"type": {
"description": "Resource type.",
"type": "string"
"type": "string",
"readOnly": true
},
"tags": {
"description": "Resource tags.",
Expand Down
26 changes: 7 additions & 19 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 @@ -139,11 +139,8 @@
}
},
"definitions": {
"Resource": {
"description": "Azure resource.",
"required": [
"location"
],
"ProxyOnlyResource": {
"description": "Azure proxy only resource. This resource is not tracked by Azure Resource Manager.",
"properties": {
"id": {
"description": "Resource Id.",
Expand All @@ -152,26 +149,17 @@
},
"name": {
"description": "Resource Name.",
"type": "string"
"type": "string",
"readOnly": true
},
"kind": {
"description": "Kind of resource.",
"type": "string"
},
"location": {
"description": "Resource Location.",
"type": "string"
},
"type": {
"description": "Resource type.",
"type": "string"
},
"tags": {
"description": "Resource tags.",
"type": "object",
"additionalProperties": {
"type": "string"
}
"type": "string",
"readOnly": true
}
},
"x-ms-azure-resource": true
Expand Down Expand Up @@ -228,7 +216,7 @@
"type": "object",
"allOf": [
{
"$ref": "#/definitions/Resource"
"$ref": "#/definitions/ProxyOnlyResource"
}
],
"properties": {
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -450,7 +450,7 @@
}
},
"Resource": {
"description": "Azure resource.",
"description": "Azure resource. This resource is tracked in Azure Resource Manager",
"required": [
"location"
],
Expand Down
2 changes: 1 addition & 1 deletion specification/web/resource-manager/Microsoft.Web/2016-03-01/DeletedWebApps.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -732,7 +732,7 @@
}
},
"Resource": {
"description": "Azure resource.",
"description": "Azure resource. This resource is tracked in Azure Resource Manager",
"required": [
"location"
],
Expand Down
185 changes: 185 additions & 0 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 @@ -38,6 +38,34 @@
}
}
},
"/providers/Microsoft.Web/operations": {
"get": {
"tags": [
"Provider"
],
"operationId": "Provider_ListOperations",
"produces": [
"application/json",
"text/json"
],
"parameters": [
{
"$ref": "#/parameters/apiVersionParameter"
}
],
"responses": {
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/CsmOperationCollection"
}
}
},
"x-ms-pageable": {
"nextLinkName": "nextLink"
}
}
},
"/subscriptions/{subscriptionId}/providers/Microsoft.Web/availableStacks": {
"get": {
"tags": [
Expand Down Expand Up @@ -72,9 +100,166 @@
}
},
"definitions": {
"CsmOperationCollection": {
"description": "Collection of Azure resource manager operation metadata.",
"required": [
"value"
],
"type": "object",
"properties": {
"value": {
"description": "Collection of resources.",
"type": "array",
"items": {
"$ref": "#/definitions/CsmOperationDescription"
}
},
"nextLink": {
"description": "Link to next page of resources.",
"type": "string"
}
}
},
"CsmOperationDescription": {
"type": "object",
"properties": {
"name": {
"type": "string"
},
"display": {
"$ref": "#/definitions/CsmOperationDisplay"
},
"origin": {
"type": "string"
},
"properties": {
"$ref": "#/definitions/CsmOperationDescriptionProperties"
}
}
},
"CsmOperationDescriptionProperties": {
"type": "object",
"properties": {
"serviceSpecification": {
"$ref": "#/definitions/ServiceSpecification"
}
}
},
"CsmOperationDisplay": {
"type": "object",
"properties": {
"provider": {
"type": "string"
},
"resource": {
"type": "string"
},
"operation": {
"type": "string"
},
"description": {
"type": "string"
}
}
},
"Dimension": {
"type": "object",
"properties": {
"name": {
"type": "string"
},
"displayName": {
"type": "string"
},
"internalName": {
"type": "string"
},
"toBeExportedForShoebox": {
"type": "boolean"
}
}
},
"MetricAvailability": {
"type": "object",
"properties": {
"timeGrain": {
"type": "string"
},
"blobDuration": {
"type": "string"
}
}
},
"MetricSpecification": {
"type": "object",
"properties": {
"name": {
"type": "string"
},
"displayName": {
"type": "string"
},
"displayDescription": {
"type": "string"
},
"unit": {
"type": "string"
},
"aggregationType": {
"type": "string"
},
"supportsInstanceLevelAggregation": {
"type": "boolean"
},
"enableRegionalMdmAccount": {
"type": "boolean"
},
"sourceMdmAccount": {
"type": "string"
},
"sourceMdmNamespace": {
"type": "string"
},
"metricFilterPattern": {
"type": "string"
},
"fillGapWithZero": {
"type": "boolean"
},
"isInternal": {
"type": "boolean"
},
"dimensions": {
"type": "array",
"items": {
"$ref": "#/definitions/Dimension"
}
},
"category": {
"type": "string"
},
"availabilities": {
"type": "array",
"items": {
"$ref": "#/definitions/MetricAvailability"
}
}
}
},
"Object": {
"type": "object",
"properties": {}
},
"ServiceSpecification": {
"type": "object",
"properties": {
"metricSpecifications": {
"type": "array",
"items": {
"$ref": "#/definitions/MetricSpecification"
}
}
}
}
},
"parameters": {
Expand Down
Loading