Skip to content

Commit 54ffab4

Browse files
naveedazsergey-shandar
naveedaz
authored and
sergey-shandar
committed
Expose Patch operations. Expose missing provider level operations (Azure#1816)
* 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
1 parent 02a8a6b commit 54ffab4

File tree

12 files changed

+5631
-3115
lines changed

12 files changed

+5631
-3115
lines changed

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

Lines changed: 324 additions & 138 deletions
Large diffs are not rendered by default.

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

Lines changed: 296 additions & 126 deletions
Large diffs are not rendered by default.

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

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@
88
"schemes": [
99
"https"
1010
],
11+
"consumes": [
12+
"application/json"
13+
],
14+
"produces": [
15+
"application/json"
16+
],
1117
"paths": {
1218
"/subscriptions/{subscriptionId}/providers/Microsoft.DomainRegistration/topLevelDomains": {
1319
"get": {
@@ -17,10 +23,6 @@
1723
"summary": "Get all top-level domains supported for registration.",
1824
"description": "Get all top-level domains supported for registration.",
1925
"operationId": "TopLevelDomains_List",
20-
"produces": [
21-
"application/json",
22-
"text/json"
23-
],
2426
"parameters": [
2527
{
2628
"$ref": "#/parameters/subscriptionIdParameter"
@@ -50,12 +52,6 @@
5052
"summary": "Get details of a top-level domain.",
5153
"description": "Get details of a top-level domain.",
5254
"operationId": "TopLevelDomains_Get",
53-
"produces": [
54-
"application/json",
55-
"text/json",
56-
"application/xml",
57-
"text/xml"
58-
],
5955
"parameters": [
6056
{
6157
"name": "name",
@@ -89,17 +85,6 @@
8985
"summary": "Gets all legal agreements that user needs to accept before purchasing a domain.",
9086
"description": "Gets all legal agreements that user needs to accept before purchasing a domain.",
9187
"operationId": "TopLevelDomains_ListAgreements",
92-
"consumes": [
93-
"application/json",
94-
"text/json",
95-
"application/xml",
96-
"text/xml",
97-
"application/x-www-form-urlencoded"
98-
],
99-
"produces": [
100-
"application/json",
101-
"text/json"
102-
],
10388
"parameters": [
10489
{
10590
"name": "name",

‎specification/web/resource-manager/Microsoft.Web/2016-03-01/Certificates.json‎

Lines changed: 176 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@
88
"schemes": [
99
"https"
1010
],
11+
"consumes": [
12+
"application/json"
13+
],
14+
"produces": [
15+
"application/json"
16+
],
1117
"paths": {
1218
"/subscriptions/{subscriptionId}/providers/Microsoft.Web/certificates": {
1319
"get": {
@@ -17,10 +23,6 @@
1723
"summary": "Get all certificates for a subscription.",
1824
"description": "Get all certificates for a subscription.",
1925
"operationId": "Certificates_List",
20-
"produces": [
21-
"application/json",
22-
"text/json"
23-
],
2426
"parameters": [
2527
{
2628
"$ref": "#/parameters/subscriptionIdParameter"
@@ -50,10 +52,6 @@
5052
"summary": "Get all certificates in a resource group.",
5153
"description": "Get all certificates in a resource group.",
5254
"operationId": "Certificates_ListByResourceGroup",
53-
"produces": [
54-
"application/json",
55-
"text/json"
56-
],
5755
"parameters": [
5856
{
5957
"$ref": "#/parameters/resourceGroupNameParameter"
@@ -86,12 +84,6 @@
8684
"summary": "Get a certificate.",
8785
"description": "Get a certificate.",
8886
"operationId": "Certificates_Get",
89-
"produces": [
90-
"application/json",
91-
"text/json",
92-
"application/xml",
93-
"text/xml"
94-
],
9587
"parameters": [
9688
{
9789
"$ref": "#/parameters/resourceGroupNameParameter"
@@ -126,17 +118,6 @@
126118
"summary": "Create or update a certificate.",
127119
"description": "Create or update a certificate.",
128120
"operationId": "Certificates_CreateOrUpdate",
129-
"consumes": [
130-
"application/json",
131-
"text/json",
132-
"application/x-www-form-urlencoded"
133-
],
134-
"produces": [
135-
"application/json",
136-
"text/json",
137-
"application/xml",
138-
"text/xml"
139-
],
140121
"parameters": [
141122
{
142123
"$ref": "#/parameters/resourceGroupNameParameter"
@@ -214,17 +195,6 @@
214195
"summary": "Create or update a certificate.",
215196
"description": "Create or update a certificate.",
216197
"operationId": "Certificates_Update",
217-
"consumes": [
218-
"application/json",
219-
"text/json",
220-
"application/x-www-form-urlencoded"
221-
],
222-
"produces": [
223-
"application/json",
224-
"text/json",
225-
"application/xml",
226-
"text/xml"
227-
],
228198
"parameters": [
229199
{
230200
"$ref": "#/parameters/resourceGroupNameParameter"
@@ -242,7 +212,7 @@
242212
"description": "Details of certificate, if it exists already.",
243213
"required": true,
244214
"schema": {
245-
"$ref": "#/definitions/Certificate"
215+
"$ref": "#/definitions/CertificatePatchResource"
246216
}
247217
},
248218
{
@@ -346,6 +316,7 @@
346316
"readOnly": true
347317
},
348318
"cerBlob": {
319+
"format": "byte",
349320
"description": "Raw bytes of .cer file",
350321
"type": "string",
351322
"readOnly": true
@@ -395,11 +366,6 @@
395366
"type": "string",
396367
"readOnly": true
397368
},
398-
"name": {
399-
"description": "Resource name of the certificate.",
400-
"type": "string",
401-
"readOnly": true
402-
},
403369
"serverFarmId": {
404370
"description": "Resource ID of the associated App Service plan, formatted as: \"/subscriptions/{subscriptionID}/resourceGroups/{groupName}/providers/Microsoft.Web/serverfarms/{appServicePlanName}\".",
405371
"type": "string"
@@ -429,6 +395,147 @@
429395
}
430396
}
431397
},
398+
"CertificatePatchResource": {
399+
"description": "ARM resource for a certificate.",
400+
"type": "object",
401+
"allOf": [
402+
{
403+
"$ref": "#/definitions/ProxyOnlyResource"
404+
}
405+
],
406+
"properties": {
407+
"properties": {
408+
"description": "CertificatePatchResource resource specific properties",
409+
"required": [
410+
"password"
411+
],
412+
"properties": {
413+
"friendlyName": {
414+
"description": "Friendly name of the certificate.",
415+
"type": "string",
416+
"readOnly": true
417+
},
418+
"subjectName": {
419+
"description": "Subject name of the certificate.",
420+
"type": "string",
421+
"readOnly": true
422+
},
423+
"hostNames": {
424+
"description": "Host names the certificate applies to.",
425+
"type": "array",
426+
"items": {
427+
"type": "string"
428+
}
429+
},
430+
"pfxBlob": {
431+
"format": "byte",
432+
"description": "Pfx blob.",
433+
"type": "string"
434+
},
435+
"siteName": {
436+
"description": "App name.",
437+
"type": "string",
438+
"readOnly": true
439+
},
440+
"selfLink": {
441+
"description": "Self link.",
442+
"type": "string",
443+
"readOnly": true
444+
},
445+
"issuer": {
446+
"description": "Certificate issuer.",
447+
"type": "string",
448+
"readOnly": true
449+
},
450+
"issueDate": {
451+
"format": "date-time",
452+
"description": "Certificate issue Date.",
453+
"type": "string",
454+
"readOnly": true
455+
},
456+
"expirationDate": {
457+
"format": "date-time",
458+
"description": "Certificate expriration date.",
459+
"type": "string",
460+
"readOnly": true
461+
},
462+
"password": {
463+
"description": "Certificate password.",
464+
"type": "string",
465+
"x-ms-mutability": [
466+
"create"
467+
]
468+
},
469+
"thumbprint": {
470+
"description": "Certificate thumbprint.",
471+
"type": "string",
472+
"readOnly": true
473+
},
474+
"valid": {
475+
"description": "Is the certificate valid?.",
476+
"type": "boolean",
477+
"readOnly": true
478+
},
479+
"cerBlob": {
480+
"format": "byte",
481+
"description": "Raw bytes of .cer file",
482+
"type": "string",
483+
"readOnly": true
484+
},
485+
"publicKeyHash": {
486+
"description": "Public key hash.",
487+
"type": "string",
488+
"readOnly": true
489+
},
490+
"hostingEnvironmentProfile": {
491+
"$ref": "#/definitions/HostingEnvironmentProfile",
492+
"description": "Specification for the App Service Environment to use for the certificate.",
493+
"readOnly": true
494+
},
495+
"keyVaultId": {
496+
"description": "Key Vault Csm resource Id.",
497+
"type": "string"
498+
},
499+
"keyVaultSecretName": {
500+
"description": "Key Vault secret name.",
501+
"type": "string"
502+
},
503+
"keyVaultSecretStatus": {
504+
"description": "Status of the Key Vault secret.",
505+
"enum": [
506+
"Initialized",
507+
"WaitingOnCertificateOrder",
508+
"Succeeded",
509+
"CertificateOrderFailed",
510+
"OperationNotPermittedOnKeyVault",
511+
"AzureServiceUnauthorizedToAccessKeyVault",
512+
"KeyVaultDoesNotExist",
513+
"KeyVaultSecretDoesNotExist",
514+
"UnknownError",
515+
"ExternalPrivateKey",
516+
"Unknown"
517+
],
518+
"type": "string",
519+
"readOnly": true,
520+
"x-ms-enum": {
521+
"name": "KeyVaultSecretStatus",
522+
"modelAsString": false
523+
}
524+
},
525+
"geoRegion": {
526+
"description": "Region of the certificate.",
527+
"type": "string",
528+
"readOnly": true
529+
},
530+
"serverFarmId": {
531+
"description": "Resource ID of the associated App Service plan, formatted as: \"/subscriptions/{subscriptionID}/resourceGroups/{groupName}/providers/Microsoft.Web/serverfarms/{appServicePlanName}\".",
532+
"type": "string"
533+
}
534+
},
535+
"x-ms-client-flatten": true
536+
}
537+
}
538+
},
432539
"HostingEnvironmentProfile": {
433540
"description": "Specification for an App Service Environment to use for this resource.",
434541
"type": "object",
@@ -449,6 +556,31 @@
449556
}
450557
}
451558
},
559+
"ProxyOnlyResource": {
560+
"description": "Azure proxy only resource. This resource is not tracked by Azure Resource Manager.",
561+
"properties": {
562+
"id": {
563+
"description": "Resource Id.",
564+
"type": "string",
565+
"readOnly": true
566+
},
567+
"name": {
568+
"description": "Resource Name.",
569+
"type": "string",
570+
"readOnly": true
571+
},
572+
"kind": {
573+
"description": "Kind of resource.",
574+
"type": "string"
575+
},
576+
"type": {
577+
"description": "Resource type.",
578+
"type": "string",
579+
"readOnly": true
580+
}
581+
},
582+
"x-ms-azure-resource": true
583+
},
452584
"Resource": {
453585
"description": "Azure resource. This resource is tracked in Azure Resource Manager",
454586
"required": [
@@ -484,33 +616,6 @@
484616
"additionalProperties": {
485617
"type": "string"
486618
}
487-
},
488-
"identity": {
489-
"description": "Identity for the resource.",
490-
"type": "object",
491-
"properties": {
492-
"principalId": {
493-
"description": "The principal ID of resource identity.",
494-
"type": "string",
495-
"readOnly": true
496-
},
497-
"tenantId": {
498-
"description": "The tenant ID of resource.",
499-
"type": "string",
500-
"readOnly": true
501-
},
502-
"type": {
503-
"description": "The identity type.",
504-
"type": "string",
505-
"enum": [
506-
"SystemAssigned"
507-
],
508-
"x-ms-enum": {
509-
"name": "ManagedServiceIdentityType",
510-
"modelAsString": false
511-
}
512-
}
513-
}
514619
}
515620
},
516621
"x-ms-azure-resource": true
@@ -529,11 +634,11 @@
529634
"in": "path",
530635
"description": "Name of the resource group to which the resource belongs.",
531636
"required": true,
532-
"x-ms-parameter-location": "method",
533637
"type": "string",
534638
"maxLength": 90,
535639
"minLength": 1,
536-
"pattern": "^[-\\w\\._\\(\\)]+[^\\.]$"
640+
"pattern": "^[-\\w\\._\\(\\)]+[^\\.]$",
641+
"x-ms-parameter-location": "method"
537642
},
538643
"apiVersionParameter": {
539644
"name": "api-version",

0 commit comments

Comments
 (0)