diff --git a/custom-words.txt b/custom-words.txt index 9ef8e4bc72c4..562082bd3d01 100644 --- a/custom-words.txt +++ b/custom-words.txt @@ -3,11 +3,13 @@ A192CBCPAD A256CBCPAD AADDS aadiam +AADKERB AADP aapl AATP abcxyz ABFS +Abstractive ABGRABGR Accel ACCELCONTAINER @@ -21,6 +23,7 @@ ACLs aclspec acquisitionid acrapi +ACSS ACSSMS actionplans activedirectory @@ -45,6 +48,7 @@ adultscore afd afdx affinitized +AFRI AFRINIC agentpool aggregatedcost @@ -68,6 +72,8 @@ ambari amlcompute amortizedcost analysisservices +analyzeconversations +analyzetext AND'ed Annotatable anomalydetector @@ -131,7 +137,10 @@ appteststorage appxmanifest Appxmanifest ARGBARGB +argmax ARIN +Arima +Arimax Arjun armtemplates arpa @@ -141,6 +150,7 @@ artifactsources artifacttypes artifacturi asciifolding +ASCS Asns aspnet assessmentprojects @@ -149,6 +159,7 @@ Asturian asyncinfo asyncoperation atascada +attachednetworks attestationcollateral attestationmechanism attributerule @@ -159,6 +170,7 @@ australiaeast australiasoutheast authenticatable Authenticode +authkey authorityURL authorizationrules authpriv @@ -166,6 +178,7 @@ authprovider authproviders Auths authsettings +authtoken authsid autobackup Autocompletes @@ -181,7 +194,9 @@ Automanage automations autopatching autopool +Autoregressive autorest +autosave autoscale autoscaler autoscalesettings @@ -321,6 +336,7 @@ canadaeast canceldelete cancelpipelinerun canonicalized +capi Carbonite carretera catalogapi @@ -389,6 +405,8 @@ Cmdkey cmdlet cmdlets CMEK +CMKDW +CMKHS CMMI CNAME cntk @@ -396,9 +414,11 @@ CODEGEN codegeneration codemirror codepackage +Coffeelake cognitiveservices colls colocation +Cololocation COLUMNSTORE commandshistory commitmentplans @@ -428,6 +448,7 @@ continuouswebjobs contoso contosodataset contosomedia +Convolutional cooldown copyid copyto @@ -462,6 +483,7 @@ CSRP csrs currentbillingfeatures currentuser +customdnssuffix customerinsights customhostname customhostnames @@ -482,8 +504,10 @@ customvisiontraining CUTOVER CVEs CVSS +cyclicity Cyrl dacl +DaemonSet dailyforecast dailyhistorical dapr @@ -523,6 +547,8 @@ dataversion datawarehouse datetimeoffset datetimes +davinci +Dbinstance DBFS DCOS ddagpu @@ -577,9 +603,16 @@ destaging destinationshares detectorproperties deterministically +devcenter +devcenters +devbox +devboxes +devboxdefinitions +deviceclass deviceclasses devicecredentials devicegroups +deviceid deviceids deviceprovisioningservices devicestates @@ -613,6 +646,7 @@ diskoperations Distcp Distro dllpath +DMARC DMSDB DMTS Dnat @@ -655,6 +689,8 @@ EIRP eirpd Einsteinweg Ekaterinburg +ElasticSan +ElasticSans ekus Eloqua enableautoscale @@ -662,6 +698,7 @@ enablelog enablement enablescheduling ename +endoftext endpointkeys endpointname endswith @@ -678,6 +715,7 @@ entrypoint enumdef environmentsettings EPSG +erasureordestructionlog errordetail errored ESDNI @@ -696,6 +734,7 @@ Eventhub eventhubconnections eventhubs eventroutes +eventstream eventtime eventtypes EWDG @@ -755,6 +794,8 @@ fileuploadout fileurl findsimilars findsquare +finetune +finetunes firmwares Flexera Flowlet @@ -835,6 +876,8 @@ GIFs Gilbertese githubusercontent gitrepo +githuboauth +githuboauthcallback globalconfiguration Gloo gltf @@ -911,6 +954,8 @@ hybriddata hybriddatamanager Hyperdrive Hypernet +hyperparameters +hyperparams Hyperscale hyperv hypervcollectors @@ -920,6 +965,7 @@ IANA iata ICANN icao +Icelake ICMP Idempotence idempotency @@ -936,6 +982,7 @@ imagelists imagesearch IMDS immutabilitypolicy +Importances importcollectors importdevices Inbuild @@ -983,6 +1030,7 @@ ipconfig ipconfiguration ipconfigurations ipfilterrules +IPFIX ipgroups ipos Ipsec @@ -1034,12 +1082,15 @@ Kashubian kbId Kbps KECA +KEDA +Keda +keda kernelspec keyname Keyschannel keyspace keyspaces -keytab +Keytab Keyvault keyvaultproperties keyvaulturi @@ -1056,6 +1107,7 @@ koreacentral koreasouth Kpis Kraaij +Kratos Krustlet Ksettings kstem @@ -1068,6 +1120,7 @@ Kubelet kubelogin kubenet kubernetes +KubeVirt Kustomization kustomizations Kustomizations @@ -1084,6 +1137,7 @@ largefacelists largepersongroups lastfile lastmodified +LATAM Latn l'avion LDAP @@ -1104,6 +1158,7 @@ Liftr Linestring linkedservices linkexpiryinminutes +linkworkspaces LISTAFTERID listbackups listbyrg @@ -1141,8 +1196,11 @@ managedidentity loganalytics loggerid logio +logit +logits Logix lognormal +logprobs logprofiles loguniform Logz @@ -1151,6 +1209,7 @@ lookback lovins lowpriority lpar +LPIM LQUP LRO's Lucene @@ -1181,8 +1240,11 @@ managementpartner managementpolicy manualupgrade mapbox +mapconfiguration +mapconfigurations mapred mapreduce +Maputnik mariadb Marketo marketplaceagreementsapi @@ -1245,7 +1307,9 @@ mixedreality Mkdirs mktorest mlapi +mlflow mlFlowTrackingUri +mltable ML's mnist modelmanagement @@ -1282,12 +1346,15 @@ multiapi Multiclass MULTIJSON Multilabel +Multinomial multipart multipoint multipoints Multiset multislot +multispeaker multistep +Multisubnet multivalued muxed muxer @@ -1296,6 +1363,7 @@ muxing mware myanalytics myapp +myaudio myblobstore mydevenvironment myexperiment @@ -1348,11 +1416,13 @@ newrelapp newssearch Newtonsoft nextlink +NFSauto Ngfw NICs nillable nist NLSTEXT +NMAE noaccess noaction noartifactsource @@ -1383,6 +1453,7 @@ notstarted notstrict nouploadcache nowcasts +NRMSE n'recognition nsdname NSGs @@ -1395,6 +1466,7 @@ numa numofmessages numrecords nvarchar +NVME Nynorsk nysiis OAEP @@ -1418,6 +1490,7 @@ ondemandgc onedeploy onmachine omex +Omnichannel onmicrosoft ONNX Onprem @@ -1426,6 +1499,7 @@ onpremises ONVIF oobe Oozie +openai openapi openbsd opencode @@ -1447,6 +1521,7 @@ Optimisers optionalbody optmem Optmem +organisation originpath Orignal osdisk @@ -1501,6 +1576,7 @@ persongroups PFSMM Phonetik phplogging +phpworkloads phraselist phraselists Pids @@ -1709,6 +1785,7 @@ reprovisions reranker Reranker Reregister +resnest Rescan reseller reservationorders @@ -1754,6 +1831,7 @@ RIRs rmem Rmem rmpl +RMSE Rolledback Rollforward rollouts @@ -1767,6 +1845,7 @@ routable routingendpointhealth rpki RPKI +rpmsg rpns RSAES RSASSA @@ -1837,6 +1916,7 @@ securitydomainuploadoperation securityinsight seealso Seleted +seresnext serialconsole servercollectors servererror @@ -1898,6 +1978,7 @@ skillsets skiptoken sklearn skus +SKU SKU's SLES Sllb @@ -1914,6 +1995,7 @@ snapshotsdr snaptshot SNAT SNMP +Sobol softwareplan SOHSV solaris @@ -1939,6 +2021,7 @@ SPDX specversion speechservicesmanagement speechtotext +splitAllCSVs SQLAG sqldatabase SQLDB @@ -1950,6 +2033,7 @@ Sqlpools SQLRDS sqlvirtualmachine sqlvm +Sqlvms Sqoop SSDZRS SSIS @@ -1985,9 +2069,11 @@ storageaccount storageaccounts storagedatalake storageimportexport +storagesku storagesources storagesync storagetarget +storagetargetinfo storageuri storsimple streamanalytics @@ -2010,6 +2096,7 @@ sublists submount subnames subnet +subnetid subnetname subnets subnet's @@ -2049,6 +2136,7 @@ swedensouth switchprotection switzerlandnorth switzerlandwest +synapselink Sybase Syncer syncfunctiontriggers @@ -2109,6 +2197,7 @@ Tful Tfvc tilejson tileset +tilesetconfiguration tilesets timeasc timedesc @@ -2232,9 +2321,11 @@ updatepolicy updateprivateendpointconnection updateproperties updation +upgradegraph upgradeos uploadbatchservicelogs uploadcertificate +uploadsessions upns upsell Upsert @@ -2267,6 +2358,7 @@ Vcore Vcores VCPU vcsa +Vectorizer versionid Vertica Vfyc @@ -2280,6 +2372,8 @@ virtualmachine virtualmachineimagebuilder virtualmachines virtualnetworkgateways +virtualnetworkgatewaypolicygroups +vngclientconnectionconfigurations virtualnetworkrules virtualnetworks Virtustream @@ -2294,6 +2388,7 @@ Vldb vmextension VMILR vmimage +vmimages vmname VMOS vmotion @@ -2311,6 +2406,13 @@ vnetid Vnets voip Volapük +volume +volumes +volumename +volumesize +volumegroup +volumegroupname +volumegroups Vpnclient vpnconfiguration vpndeviceconfigurationscript @@ -2381,6 +2483,7 @@ workbooktemplates Workernode workitemsource workloadmonitor +workspace workspaces workspace's wrapkey @@ -2417,6 +2520,10 @@ relationshipdef structdef typedefs testfailover +tmpfs +Tmpfs +npipe +nocopy Orignal Onprem targetv @@ -2517,12 +2624,122 @@ Vuln IAASVM Quickbase Smartsheet +valn +adamw +hflip +nesterov +yolo +CUDA +xlarge +Sobol +Seasonality +autosave +Wargs +featurizers +Spearman's Qualys +primingjob +primingjobid +operatorconnect servermetrics +getent +useraccount +businessmetadata +usermetadata +Relaytype +Deboards +Deregisters Dataworld Asana AppFigures Twilio getazresiliencystatus -authtoken -eventstream \ No newline at end of file +providerport +spaceallocationparameter +cadl +unassignment +unassign +Unassigns +enrollmentgroups +scheduledjobs +getdevices +Umodeled +unmodeled +getx +setx +verifyx +removex +generateverificationcodex +favorited +datawarehousequeries +Dataware +SIMIDs +ICCID +unversioned +RANs +azuresqldbkeyrotation +DBCMK +DTCs +Angika +Awadhi +Bagheli +Balkar +Bhojpuri +Bodo +Brajbha +Bundeli +Chamling +Chhattisgarhi +Dari +Devanagiri +Dhimal +Dogri +Erzya +Faroese +Frulian +Gagauz +Gurung +Halbi +Haryanvi +Inari +Jaunsari +K'iche +Kangri +Karachay +Khaling +Korku +Koryak +Kosraean +Kumyk +Kurukh +Lule +Mahasu +Malto +Niuean +Nogay +Sadri +Sami +Santali +Sirmauri +Skolt +Thangmi +Tuvan +Uyghur +occured +Occured +Paramter +Spza +metallb +kubevirt +vmip +xlargerc +largerc +mediumrc +smallrc +Autotune +Showmount +autogrid +KubeProxyConfig +IPVS +TCPFIN +taginheritance diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/AuthConfigs.json b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/AuthConfigs.json index 3bbe8e1d6082..a8359454e10b 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/AuthConfigs.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/AuthConfigs.json @@ -121,7 +121,7 @@ "ContainerAppsAuthConfigs" ], "summary": "Create or update the AuthConfig for a Container App.", - "description": "Description for Create or update the AuthConfig for a Container App.", + "description": "Create or update the AuthConfig for a Container App.", "operationId": "ContainerAppsAuthConfigs_CreateOrUpdate", "parameters": [ { @@ -182,7 +182,7 @@ "ContainerAppsAuthConfigs" ], "summary": "Delete a Container App AuthConfig.", - "description": "Description for Delete a Container App AuthConfig.", + "description": "Delete a Container App AuthConfig.", "operationId": "ContainerAppsAuthConfigs_Delete", "parameters": [ { diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/ContainerApps.json b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/ContainerApps.json index 4f5698f87d16..382c410d016e 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/ContainerApps.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/ContainerApps.json @@ -150,7 +150,7 @@ "ContainerApps" ], "summary": "Create or update a Container App.", - "description": "Description for Create or update a Container App.", + "description": "Create or update a Container App.", "operationId": "ContainerApps_CreateOrUpdate", "parameters": [ { @@ -211,7 +211,7 @@ "ContainerApps" ], "summary": "Delete a Container App.", - "description": "Description for Delete a Container App.", + "description": "Delete a Container App.", "operationId": "ContainerApps_Delete", "parameters": [ { @@ -358,6 +358,9 @@ "x-ms-examples": { "Analyze Custom Hostname": { "$ref": "./examples/ContainerApps_ListCustomHostNameAnalysis.json" + }, + "Analyse Custom Hostname Error Response": { + "$ref": "./examples/ContainerApps_ListCustomHostNameAnalysisErrorResponse.json" } } } @@ -763,94 +766,129 @@ "CustomHostnameAnalysisResult": { "description": "Custom domain analysis.", "type": "object", - "allOf": [ - { - "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ProxyResource" - } - ], "properties": { - "properties": { - "description": "CustomHostnameAnalysisResult resource specific properties", + "hostName": { + "description": "Host name that was analyzed", + "type": "string", + "readOnly": true + }, + "isHostnameAlreadyVerified": { + "description": "true if hostname is already verified; otherwise, false.", + "type": "boolean", + "readOnly": true + }, + "customDomainVerificationTest": { + "description": "DNS verification test result.", + "enum": [ + "Passed", + "Failed", + "Skipped" + ], + "type": "string", + "readOnly": true, + "x-ms-enum": { + "name": "DnsVerificationTestResult", + "modelAsString": false + } + }, + "customDomainVerificationFailureInfo": { + "description": "Raw failure information if DNS verification fails.", "type": "object", "properties": { - "hostName": { - "description": "Host name that was analyzed", + "code": { + "description": "Standardized string to programmatically identify the error.", "type": "string", "readOnly": true }, - "isHostnameAlreadyVerified": { - "description": "true if hostname is already verified; otherwise, false.", - "type": "boolean", - "readOnly": true - }, - "customDomainVerificationTest": { - "description": "DNS verification test result.", - "enum": [ - "Passed", - "Failed", - "Skipped" - ], + "message": { + "description": "Detailed error description and debugging information.", "type": "string", - "readOnly": true, - "x-ms-enum": { - "name": "DnsVerificationTestResult", - "modelAsString": false - } - }, - "customDomainVerificationFailureInfo": { - "$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse", - "description": "Raw failure information if DNS verification fails.", - "readOnly": true - }, - "hasConflictOnManagedEnvironment": { - "description": "true if there is a conflict on the Container App's managed environment; otherwise, false.", - "type": "boolean", "readOnly": true }, - "conflictingContainerAppResourceId": { - "description": "Name of the conflicting Container App on the Managed Environment if it's within the same subscription.", + "target": { + "description": "Detailed error description and debugging information.", "type": "string", "readOnly": true }, - "cNameRecords": { - "description": "CName records visible for this hostname.", - "type": "array", - "items": { - "type": "string" - } - }, - "txtRecords": { - "description": "TXT records visible for this hostname.", - "type": "array", - "items": { - "type": "string" - } - }, - "aRecords": { - "description": "A records visible for this hostname.", - "type": "array", - "items": { - "type": "string" - } - }, - "alternateCNameRecords": { - "description": "Alternate CName records visible for this hostname.", + "details": { "type": "array", + "description": "Details or the error", "items": { - "type": "string" - } - }, - "alternateTxtRecords": { - "description": "Alternate TXT records visible for this hostname.", - "type": "array", - "items": { - "type": "string" - } + "description": "Detailed errors.", + "type": "object", + "properties": { + "code": { + "description": "Standardized string to programmatically identify the error.", + "type": "string", + "readOnly": true + }, + "message": { + "description": "Detailed error description and debugging information.", + "type": "string", + "readOnly": true + }, + "target": { + "description": "Detailed error description and debugging information.", + "type": "string", + "readOnly": true + } + }, + "readOnly": true + }, + "x-ms-identifiers": [ + "code" + ] } }, - "x-ms-client-flatten": true + "readOnly": true + }, + "hasConflictOnManagedEnvironment": { + "description": "true if there is a conflict on the Container App's managed environment; otherwise, false.", + "type": "boolean", + "readOnly": true + }, + "conflictingContainerAppResourceId": { + "description": "Name of the conflicting Container App on the Managed Environment if it's within the same subscription.", + "type": "string", + "readOnly": true + }, + "cNameRecords": { + "description": "CName records visible for this hostname.", + "type": "array", + "items": { + "type": "string" + } + }, + "txtRecords": { + "description": "TXT records visible for this hostname.", + "type": "array", + "items": { + "type": "string" + } + }, + "aRecords": { + "description": "A records visible for this hostname.", + "type": "array", + "items": { + "type": "string" + } + }, + "alternateCNameRecords": { + "description": "Alternate CName records visible for this hostname.", + "type": "array", + "items": { + "type": "string" + } + }, + "alternateTxtRecords": { + "description": "Alternate TXT records visible for this hostname.", + "type": "array", + "items": { + "type": "string" + } } - } + }, + "x-ms-client-flatten": true } }, "securityDefinitions": { diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/SourceControls.json b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/SourceControls.json index d9445cf3cde8..72f8b693e794 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/SourceControls.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/SourceControls.json @@ -139,7 +139,7 @@ "ContainerAppsSourceControls" ], "summary": "Create or update the SourceControl for a Container App.", - "description": "Description for Create or update the SourceControl for a Container App.", + "description": "Create or update the SourceControl for a Container App.", "operationId": "ContainerAppsSourceControls_CreateOrUpdate", "parameters": [ { @@ -207,7 +207,7 @@ "ContainerAppsSourceControls" ], "summary": "Delete a Container App SourceControl.", - "description": "Description for Delete a Container App SourceControl.", + "description": "Delete a Container App SourceControl.", "operationId": "ContainerAppsSourceControls_Delete", "parameters": [ { diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/Certificate_CreateOrUpdate.json b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/Certificate_CreateOrUpdate.json index 07bc10b63a27..578a8279a5e3 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/Certificate_CreateOrUpdate.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/Certificate_CreateOrUpdate.json @@ -17,12 +17,12 @@ "200": { "headers": {}, "body": { - "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/managedEnvironments/testcontainerenv/certificate-firendly-name", + "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/managedEnvironments/testcontainerenv/certificates/certificate-firendly-name", "type": "Microsoft.App/ManagedEnvironments/Certificates", "location": "East US", "properties": { "provisioningState": "Succeeded", - "subjectName": "my-subject-name.company.country.net", + "subjectName": "my-subject-name.contoso.com", "issuer": "Issuer Name", "issueDate": "2021-11-06T04:00:00Z", "expirationDate": "2022-11-06T04:00:00Z", diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/Certificate_Get.json b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/Certificate_Get.json index eb8e38e7f2c5..b06769ed4054 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/Certificate_Get.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/Certificate_Get.json @@ -10,13 +10,13 @@ "200": { "headers": {}, "body": { - "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/managedEnvironments/testcontainerenv/certificate-firendly-name", + "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/managedEnvironments/testcontainerenv/certificates/certificate-firendly-name", "name": "certificate-firendly-name", "type": "Microsoft.App/ManagedEnvironments/Certificates", "location": "East US", "properties": { "provisioningState": "Succeeded", - "subjectName": "my-subject-name.company.country.net", + "subjectName": "my-subject-name.contoso.com", "issuer": "Issuer Name", "issueDate": "2021-11-06T04:00:00Z", "expirationDate": "2022-11-06T04:00:00Z", diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/Certificates_ListByManagedEnvironment.json b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/Certificates_ListByManagedEnvironment.json index 7c6b2f990233..65a04e35d361 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/Certificates_ListByManagedEnvironment.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/Certificates_ListByManagedEnvironment.json @@ -11,13 +11,13 @@ "body": { "value": [ { - "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/managedEnvironments/testcontainerenv/certificate-firendly-name", + "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/managedEnvironments/testcontainerenv/certificates/certificate-firendly-name", "name": "certificate-firendly-name", "type": "Microsoft.App/ManagedEnvironments/Certificates", "location": "East US", "properties": { "provisioningState": "Succeeded", - "subjectName": "my-subject-name.company.country.net", + "subjectName": "my-subject-name.contoso.com", "issuer": "Issuer Name", "issueDate": "2021-11-06T04:00:00Z", "expirationDate": "2022-11-06T04:00:00Z", @@ -26,13 +26,13 @@ } }, { - "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/managedEnvironments/testcontainerenv/certificate-firendly-name", + "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/managedEnvironments/testcontainerenv/certificates/certificate-firendly-name", "name": "certificate-firendly-name", "type": "Microsoft.App/ManagedEnvironments/Certificates", "location": "East US", "properties": { "provisioningState": "Succeeded", - "subjectName": "my-subject-name.company.country.net", + "subjectName": "my-subject-name.contoso.com", "issuer": "Issuer Name", "issueDate": "2021-11-06T04:00:00Z", "expirationDate": "2022-11-06T04:00:00Z", diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/Certificates_Patch.json b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/Certificates_Patch.json index 43ab98b79927..350f012bb73c 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/Certificates_Patch.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/Certificates_Patch.json @@ -16,7 +16,7 @@ "200": { "headers": {}, "body": { - "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/managedEnvironments/testcontainerenv/certificate-firendly-name", + "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/managedEnvironments/testcontainerenv/certificates/certificate-firendly-name", "type": "Microsoft.App/ManagedEnvironments/Certificates", "location": "East US", "tags": { @@ -25,7 +25,7 @@ }, "properties": { "provisioningState": "Succeeded", - "subjectName": "my-subject-name.company.country.net", + "subjectName": "my-subject-name.contoso.com", "issuer": "Issuer Name", "issueDate": "2021-11-06T04:00:00Z", "expirationDate": "2022-11-06T04:00:00Z", diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_ListCustomHostNameAnalysis.json b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_ListCustomHostNameAnalysis.json index 21f55a593221..9b5cafea5e1f 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_ListCustomHostNameAnalysis.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_ListCustomHostNameAnalysis.json @@ -10,35 +10,32 @@ "200": { "headers": {}, "body": { - "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/containerApps/testcontainerApp0", - "properties": { - "hostName": "my.name.corp", - "isHostnameAlreadyVerified": true, - "customDomainVerificationTest": "Passed", - "customDomainVerificationFailureInfo": {}, - "hasConflictOnManagedEnvironment": false, - "conflictingContainerAppResourceId": "", - "cNameRecords": [ - "cNameRecord1", - "cNameRecord2" - ], - "txtRecords": [ - "txtRecord1", - "txtRecord2" - ], - "aRecords": [ - "aRecord1", - "aRecord2" - ], - "alternateCNameRecords": [ - "cNameRecord1", - "cNameRecord2" - ], - "alternateTxtRecords": [ - "txtRecord1", - "txtRecord2" - ] - } + "hostName": "my.name.corp", + "isHostnameAlreadyVerified": true, + "customDomainVerificationTest": "Passed", + "customDomainVerificationFailureInfo": {}, + "hasConflictOnManagedEnvironment": false, + "conflictingContainerAppResourceId": "", + "cNameRecords": [ + "cNameRecord1", + "cNameRecord2" + ], + "txtRecords": [ + "txtRecord1", + "txtRecord2" + ], + "aRecords": [ + "aRecord1", + "aRecord2" + ], + "alternateCNameRecords": [ + "cNameRecord1", + "cNameRecord2" + ], + "alternateTxtRecords": [ + "txtRecord1", + "txtRecord2" + ] } } } diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_ListCustomHostNameAnalysisErrorResponse.json b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_ListCustomHostNameAnalysisErrorResponse.json new file mode 100644 index 000000000000..77180aa3287c --- /dev/null +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_ListCustomHostNameAnalysisErrorResponse.json @@ -0,0 +1,33 @@ +{ + "parameters": { + "subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", + "resourceGroupName": "rg", + "containerAppName": "testcontainerApp0", + "customHostname": "my.name.corp", + "api-version": "2022-01-01-preview" + }, + "responses": { + "200": { + "headers": {}, + "body": { + "isHostnameAlreadyVerified": false, + "customDomainVerificationTest": "Failed", + "customDomainVerificationFailureInfo": { + "code": "InvalidCustomHostNameValidation", + "message": "A TXT record pointing from my.name.corp to AF365AD7C598B96CFCB1EA1A803A44A8F861436767173A251F6E9B7027FF078E was not found." + }, + "hasConflictOnManagedEnvironment": false, + "cNameRecords": [], + "txtRecords": [ + "652modgx8o8y2t0ahxci" + ], + "aRecords": [ + "40.112.243.18" + ], + "alternateTxtRecords": [ + "7301B614D78FC456A5F1F9002CF1A31B6116D7AC5DEDC128C5DE6CCC90F3BE1C" + ] + } + } + } +} diff --git a/specification/app/resource-manager/Microsoft.App/stable/2022-03-01/AuthConfigs.json b/specification/app/resource-manager/Microsoft.App/stable/2022-03-01/AuthConfigs.json index 649e44aede95..fe2778d99051 100644 --- a/specification/app/resource-manager/Microsoft.App/stable/2022-03-01/AuthConfigs.json +++ b/specification/app/resource-manager/Microsoft.App/stable/2022-03-01/AuthConfigs.json @@ -121,7 +121,7 @@ "ContainerAppsAuthConfigs" ], "summary": "Create or update the AuthConfig for a Container App.", - "description": "Description for Create or update the AuthConfig for a Container App.", + "description": "Create or update the AuthConfig for a Container App.", "operationId": "ContainerAppsAuthConfigs_CreateOrUpdate", "parameters": [ { @@ -182,7 +182,7 @@ "ContainerAppsAuthConfigs" ], "summary": "Delete a Container App AuthConfig.", - "description": "Description for Delete a Container App AuthConfig.", + "description": "Delete a Container App AuthConfig.", "operationId": "ContainerAppsAuthConfigs_Delete", "parameters": [ { diff --git a/specification/app/resource-manager/Microsoft.App/stable/2022-03-01/ContainerApps.json b/specification/app/resource-manager/Microsoft.App/stable/2022-03-01/ContainerApps.json index eae776b03f71..fd77bfd70094 100644 --- a/specification/app/resource-manager/Microsoft.App/stable/2022-03-01/ContainerApps.json +++ b/specification/app/resource-manager/Microsoft.App/stable/2022-03-01/ContainerApps.json @@ -150,7 +150,7 @@ "ContainerApps" ], "summary": "Create or update a Container App.", - "description": "Description for Create or update a Container App.", + "description": "Create or update a Container App.", "operationId": "ContainerApps_CreateOrUpdate", "parameters": [ { @@ -211,7 +211,7 @@ "ContainerApps" ], "summary": "Delete a Container App.", - "description": "Description for Delete a Container App.", + "description": "Delete a Container App.", "operationId": "ContainerApps_Delete", "parameters": [ { @@ -356,6 +356,9 @@ "x-ms-examples": { "Analyze Custom Hostname": { "$ref": "./examples/ContainerApps_ListCustomHostNameAnalysis.json" + }, + "Analyse Custom Hostname Error Response": { + "$ref": "./examples/ContainerApps_ListCustomHostNameAnalysisErrorResponse.json" } } } @@ -756,94 +759,129 @@ "CustomHostnameAnalysisResult": { "description": "Custom domain analysis.", "type": "object", - "allOf": [ - { - "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ProxyResource" - } - ], "properties": { - "properties": { - "description": "CustomHostnameAnalysisResult resource specific properties", + "hostName": { + "description": "Host name that was analyzed", + "type": "string", + "readOnly": true + }, + "isHostnameAlreadyVerified": { + "description": "true if hostname is already verified; otherwise, false.", + "type": "boolean", + "readOnly": true + }, + "customDomainVerificationTest": { + "description": "DNS verification test result.", + "enum": [ + "Passed", + "Failed", + "Skipped" + ], + "type": "string", + "readOnly": true, + "x-ms-enum": { + "name": "DnsVerificationTestResult", + "modelAsString": false + } + }, + "customDomainVerificationFailureInfo": { + "description": "Raw failure information if DNS verification fails.", "type": "object", "properties": { - "hostName": { - "description": "Host name that was analyzed", + "code": { + "description": "Standardized string to programmatically identify the error.", "type": "string", "readOnly": true }, - "isHostnameAlreadyVerified": { - "description": "true if hostname is already verified; otherwise, false.", - "type": "boolean", - "readOnly": true - }, - "customDomainVerificationTest": { - "description": "DNS verification test result.", - "enum": [ - "Passed", - "Failed", - "Skipped" - ], + "message": { + "description": "Detailed error description and debugging information.", "type": "string", - "readOnly": true, - "x-ms-enum": { - "name": "DnsVerificationTestResult", - "modelAsString": false - } - }, - "customDomainVerificationFailureInfo": { - "$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse", - "description": "Raw failure information if DNS verification fails.", - "readOnly": true - }, - "hasConflictOnManagedEnvironment": { - "description": "true if there is a conflict on the Container App's managed environment; otherwise, false.", - "type": "boolean", "readOnly": true }, - "conflictingContainerAppResourceId": { - "description": "Name of the conflicting Container App on the Managed Environment if it's within the same subscription.", + "target": { + "description": "Detailed error description and debugging information.", "type": "string", "readOnly": true }, - "cNameRecords": { - "description": "CName records visible for this hostname.", - "type": "array", - "items": { - "type": "string" - } - }, - "txtRecords": { - "description": "TXT records visible for this hostname.", - "type": "array", - "items": { - "type": "string" - } - }, - "aRecords": { - "description": "A records visible for this hostname.", - "type": "array", - "items": { - "type": "string" - } - }, - "alternateCNameRecords": { - "description": "Alternate CName records visible for this hostname.", + "details": { "type": "array", + "description": "Details or the error", "items": { - "type": "string" - } - }, - "alternateTxtRecords": { - "description": "Alternate TXT records visible for this hostname.", - "type": "array", - "items": { - "type": "string" - } + "description": "Detailed errors.", + "type": "object", + "properties": { + "code": { + "description": "Standardized string to programmatically identify the error.", + "type": "string", + "readOnly": true + }, + "message": { + "description": "Detailed error description and debugging information.", + "type": "string", + "readOnly": true + }, + "target": { + "description": "Detailed error description and debugging information.", + "type": "string", + "readOnly": true + } + }, + "readOnly": true + }, + "x-ms-identifiers": [ + "code" + ] } }, - "x-ms-client-flatten": true + "readOnly": true + }, + "hasConflictOnManagedEnvironment": { + "description": "true if there is a conflict on the Container App's managed environment; otherwise, false.", + "type": "boolean", + "readOnly": true + }, + "conflictingContainerAppResourceId": { + "description": "Name of the conflicting Container App on the Managed Environment if it's within the same subscription.", + "type": "string", + "readOnly": true + }, + "cNameRecords": { + "description": "CName records visible for this hostname.", + "type": "array", + "items": { + "type": "string" + } + }, + "txtRecords": { + "description": "TXT records visible for this hostname.", + "type": "array", + "items": { + "type": "string" + } + }, + "aRecords": { + "description": "A records visible for this hostname.", + "type": "array", + "items": { + "type": "string" + } + }, + "alternateCNameRecords": { + "description": "Alternate CName records visible for this hostname.", + "type": "array", + "items": { + "type": "string" + } + }, + "alternateTxtRecords": { + "description": "Alternate TXT records visible for this hostname.", + "type": "array", + "items": { + "type": "string" + } } - } + }, + "x-ms-client-flatten": true } }, "securityDefinitions": { diff --git a/specification/app/resource-manager/Microsoft.App/stable/2022-03-01/SourceControls.json b/specification/app/resource-manager/Microsoft.App/stable/2022-03-01/SourceControls.json index b710ae2f9898..bd41835676ba 100644 --- a/specification/app/resource-manager/Microsoft.App/stable/2022-03-01/SourceControls.json +++ b/specification/app/resource-manager/Microsoft.App/stable/2022-03-01/SourceControls.json @@ -139,7 +139,7 @@ "ContainerAppsSourceControls" ], "summary": "Create or update the SourceControl for a Container App.", - "description": "Description for Create or update the SourceControl for a Container App.", + "description": "Create or update the SourceControl for a Container App.", "operationId": "ContainerAppsSourceControls_CreateOrUpdate", "parameters": [ { @@ -183,7 +183,7 @@ } }, "201": { - "description": "Created.", + "description": "Created", "schema": { "$ref": "#/definitions/SourceControl" } @@ -207,7 +207,7 @@ "ContainerAppsSourceControls" ], "summary": "Delete a Container App SourceControl.", - "description": "Description for Delete a Container App SourceControl.", + "description": "Delete a Container App SourceControl.", "operationId": "ContainerAppsSourceControls_Delete", "parameters": [ { diff --git a/specification/app/resource-manager/Microsoft.App/stable/2022-03-01/examples/Certificate_CreateOrUpdate.json b/specification/app/resource-manager/Microsoft.App/stable/2022-03-01/examples/Certificate_CreateOrUpdate.json index d2dc08b9ea8b..54c13697695e 100644 --- a/specification/app/resource-manager/Microsoft.App/stable/2022-03-01/examples/Certificate_CreateOrUpdate.json +++ b/specification/app/resource-manager/Microsoft.App/stable/2022-03-01/examples/Certificate_CreateOrUpdate.json @@ -17,7 +17,7 @@ "200": { "headers": {}, "body": { - "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/managedEnvironments/testcontainerenv/certificate-firendly-name", + "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/managedEnvironments/testcontainerenv/certificates/certificate-firendly-name", "type": "Microsoft.App/ManagedEnvironments/Certificates", "location": "East US", "properties": { diff --git a/specification/app/resource-manager/Microsoft.App/stable/2022-03-01/examples/Certificate_Get.json b/specification/app/resource-manager/Microsoft.App/stable/2022-03-01/examples/Certificate_Get.json index 8d134c8e670e..0046da0f92f7 100644 --- a/specification/app/resource-manager/Microsoft.App/stable/2022-03-01/examples/Certificate_Get.json +++ b/specification/app/resource-manager/Microsoft.App/stable/2022-03-01/examples/Certificate_Get.json @@ -10,7 +10,7 @@ "200": { "headers": {}, "body": { - "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/managedEnvironments/testcontainerenv/certificate-firendly-name", + "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/managedEnvironments/testcontainerenv/certificates/certificate-firendly-name", "name": "certificate-firendly-name", "type": "Microsoft.App/ManagedEnvironments/Certificates", "location": "East US", diff --git a/specification/app/resource-manager/Microsoft.App/stable/2022-03-01/examples/Certificates_ListByManagedEnvironment.json b/specification/app/resource-manager/Microsoft.App/stable/2022-03-01/examples/Certificates_ListByManagedEnvironment.json index d1be7f76c5c1..a9cf667a8a15 100644 --- a/specification/app/resource-manager/Microsoft.App/stable/2022-03-01/examples/Certificates_ListByManagedEnvironment.json +++ b/specification/app/resource-manager/Microsoft.App/stable/2022-03-01/examples/Certificates_ListByManagedEnvironment.json @@ -11,7 +11,7 @@ "body": { "value": [ { - "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/managedEnvironments/testcontainerenv/certificate-firendly-name1", + "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/managedEnvironments/testcontainerenv/certificates/certificate-firendly-name1", "name": "certificate-firendly-name1", "type": "Microsoft.App/ManagedEnvironments/Certificates", "location": "East US", @@ -26,7 +26,7 @@ } }, { - "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/managedEnvironments/testcontainerenv/certificate-firendly-name2", + "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/managedEnvironments/testcontainerenv/certificates/certificate-firendly-name2", "name": "certificate-firendly-name2", "type": "Microsoft.App/ManagedEnvironments/Certificates", "location": "East US", diff --git a/specification/app/resource-manager/Microsoft.App/stable/2022-03-01/examples/Certificates_Patch.json b/specification/app/resource-manager/Microsoft.App/stable/2022-03-01/examples/Certificates_Patch.json index 94a889785114..e73a6378bb1d 100644 --- a/specification/app/resource-manager/Microsoft.App/stable/2022-03-01/examples/Certificates_Patch.json +++ b/specification/app/resource-manager/Microsoft.App/stable/2022-03-01/examples/Certificates_Patch.json @@ -16,7 +16,7 @@ "200": { "headers": {}, "body": { - "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/managedEnvironments/testcontainerenv/certificate-firendly-name", + "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/managedEnvironments/testcontainerenv/certificates/certificate-firendly-name", "type": "Microsoft.App/ManagedEnvironments/Certificates", "location": "East US", "tags": { diff --git a/specification/app/resource-manager/Microsoft.App/stable/2022-03-01/examples/ContainerApps_ListCustomHostNameAnalysis.json b/specification/app/resource-manager/Microsoft.App/stable/2022-03-01/examples/ContainerApps_ListCustomHostNameAnalysis.json index dd86259c50cf..7a31ac351009 100644 --- a/specification/app/resource-manager/Microsoft.App/stable/2022-03-01/examples/ContainerApps_ListCustomHostNameAnalysis.json +++ b/specification/app/resource-manager/Microsoft.App/stable/2022-03-01/examples/ContainerApps_ListCustomHostNameAnalysis.json @@ -10,35 +10,32 @@ "200": { "headers": {}, "body": { - "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/containerApps/testcontainerApp0", - "properties": { - "hostName": "my.name.corp", - "isHostnameAlreadyVerified": true, - "customDomainVerificationTest": "Passed", - "customDomainVerificationFailureInfo": {}, - "hasConflictOnManagedEnvironment": false, - "conflictingContainerAppResourceId": "", - "cNameRecords": [ - "cNameRecord1", - "cNameRecord2" - ], - "txtRecords": [ - "txtRecord1", - "txtRecord2" - ], - "aRecords": [ - "aRecord1", - "aRecord2" - ], - "alternateCNameRecords": [ - "cNameRecord1", - "cNameRecord2" - ], - "alternateTxtRecords": [ - "txtRecord1", - "txtRecord2" - ] - } + "hostName": "my.name.corp", + "isHostnameAlreadyVerified": true, + "customDomainVerificationTest": "Passed", + "customDomainVerificationFailureInfo": {}, + "hasConflictOnManagedEnvironment": false, + "conflictingContainerAppResourceId": "", + "cNameRecords": [ + "cNameRecord1", + "cNameRecord2" + ], + "txtRecords": [ + "txtRecord1", + "txtRecord2" + ], + "aRecords": [ + "aRecord1", + "aRecord2" + ], + "alternateCNameRecords": [ + "cNameRecord1", + "cNameRecord2" + ], + "alternateTxtRecords": [ + "txtRecord1", + "txtRecord2" + ] } } } diff --git a/specification/app/resource-manager/Microsoft.App/stable/2022-03-01/examples/ContainerApps_ListCustomHostNameAnalysisErrorResponse.json b/specification/app/resource-manager/Microsoft.App/stable/2022-03-01/examples/ContainerApps_ListCustomHostNameAnalysisErrorResponse.json new file mode 100644 index 000000000000..304bf1a1fa56 --- /dev/null +++ b/specification/app/resource-manager/Microsoft.App/stable/2022-03-01/examples/ContainerApps_ListCustomHostNameAnalysisErrorResponse.json @@ -0,0 +1,33 @@ +{ + "parameters": { + "subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", + "resourceGroupName": "rg", + "containerAppName": "testcontainerApp0", + "customHostname": "my.name.corp", + "api-version": "2022-03-03" + }, + "responses": { + "200": { + "headers": {}, + "body": { + "isHostnameAlreadyVerified": false, + "customDomainVerificationTest": "Failed", + "customDomainVerificationFailureInfo": { + "code": "InvalidCustomHostNameValidation", + "message": "A TXT record pointing from my.name.corp to AF365AD7C598B96CFCB1EA1A803A44A8F861436767173A251F6E9B7027FF078E was not found." + }, + "hasConflictOnManagedEnvironment": false, + "cNameRecords": [], + "txtRecords": [ + "652modgx8o8y2t0ahxci" + ], + "aRecords": [ + "40.112.243.18" + ], + "alternateTxtRecords": [ + "7301B614D78FC456A5F1F9002CF1A31B6116D7AC5DEDC128C5DE6CCC90F3BE1C" + ] + } + } + } +}