Skip to content

Commit 7077134

Browse files
JuliehzlJuliehzl
authored
Fix definition for customhostnameesult (#19014)
* fix * update * more fix
1 parent fabf9a5 commit 7077134

File tree

2 files changed

+132
-100
lines changed

2 files changed

+132
-100
lines changed

‎specification/app/resource-manager/Microsoft.App/stable/2022-05-01/ContainerApps.json

Lines changed: 106 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -755,94 +755,129 @@
755755
"CustomHostnameAnalysisResult": {
756756
"description": "Custom domain analysis.",
757757
"type": "object",
758-
"allOf": [
759-
{
760-
"$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ProxyResource"
761-
}
762-
],
763758
"properties": {
764-
"properties": {
765-
"description": "CustomHostnameAnalysisResult resource specific properties",
759+
"hostName": {
760+
"description": "Host name that was analyzed",
761+
"type": "string",
762+
"readOnly": true
763+
},
764+
"isHostnameAlreadyVerified": {
765+
"description": "<code>true</code> if hostname is already verified; otherwise, <code>false</code>.",
766+
"type": "boolean",
767+
"readOnly": true
768+
},
769+
"customDomainVerificationTest": {
770+
"description": "DNS verification test result.",
771+
"enum": [
772+
"Passed",
773+
"Failed",
774+
"Skipped"
775+
],
776+
"type": "string",
777+
"readOnly": true,
778+
"x-ms-enum": {
779+
"name": "DnsVerificationTestResult",
780+
"modelAsString": false
781+
}
782+
},
783+
"customDomainVerificationFailureInfo": {
784+
"description": "Raw failure information if DNS verification fails.",
766785
"type": "object",
767786
"properties": {
768-
"hostName": {
769-
"description": "Host name that was analyzed",
787+
"code": {
788+
"description": "Standardized string to programmatically identify the error.",
770789
"type": "string",
771790
"readOnly": true
772791
},
773-
"isHostnameAlreadyVerified": {
774-
"description": "<code>true</code> if hostname is already verified; otherwise, <code>false</code>.",
775-
"type": "boolean",
776-
"readOnly": true
777-
},
778-
"customDomainVerificationTest": {
779-
"description": "DNS verification test result.",
780-
"enum": [
781-
"Passed",
782-
"Failed",
783-
"Skipped"
784-
],
792+
"message": {
793+
"description": "Detailed error description and debugging information.",
785794
"type": "string",
786-
"readOnly": true,
787-
"x-ms-enum": {
788-
"name": "DnsVerificationTestResult",
789-
"modelAsString": false
790-
}
791-
},
792-
"customDomainVerificationFailureInfo": {
793-
"$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse",
794-
"description": "Raw failure information if DNS verification fails.",
795795
"readOnly": true
796796
},
797-
"hasConflictOnManagedEnvironment": {
798-
"description": "<code>true</code> if there is a conflict on the Container App's managed environment; otherwise, <code>false</code>.",
799-
"type": "boolean",
800-
"readOnly": true
801-
},
802-
"conflictingContainerAppResourceId": {
803-
"description": "Name of the conflicting Container App on the Managed Environment if it's within the same subscription.",
797+
"target": {
798+
"description": "Detailed error description and debugging information.",
804799
"type": "string",
805800
"readOnly": true
806801
},
807-
"cNameRecords": {
808-
"description": "CName records visible for this hostname.",
802+
"details": {
809803
"type": "array",
804+
"description": "Details or the error",
810805
"items": {
811-
"type": "string"
812-
}
813-
},
814-
"txtRecords": {
815-
"description": "TXT records visible for this hostname.",
816-
"type": "array",
817-
"items": {
818-
"type": "string"
819-
}
820-
},
821-
"aRecords": {
822-
"description": "A records visible for this hostname.",
823-
"type": "array",
824-
"items": {
825-
"type": "string"
826-
}
827-
},
828-
"alternateCNameRecords": {
829-
"description": "Alternate CName records visible for this hostname.",
830-
"type": "array",
831-
"items": {
832-
"type": "string"
833-
}
834-
},
835-
"alternateTxtRecords": {
836-
"description": "Alternate TXT records visible for this hostname.",
837-
"type": "array",
838-
"items": {
839-
"type": "string"
840-
}
806+
"description": "Detailed errors.",
807+
"type": "object",
808+
"properties": {
809+
"code": {
810+
"description": "Standardized string to programmatically identify the error.",
811+
"type": "string",
812+
"readOnly": true
813+
},
814+
"message": {
815+
"description": "Detailed error description and debugging information.",
816+
"type": "string",
817+
"readOnly": true
818+
},
819+
"target": {
820+
"description": "Detailed error description and debugging information.",
821+
"type": "string",
822+
"readOnly": true
823+
}
824+
},
825+
"readOnly": true
826+
},
827+
"x-ms-identifiers": [
828+
"code"
829+
]
841830
}
842831
},
843-
"x-ms-client-flatten": true
832+
"readOnly": true
833+
},
834+
"hasConflictOnManagedEnvironment": {
835+
"description": "<code>true</code> if there is a conflict on the Container App's managed environment; otherwise, <code>false</code>.",
836+
"type": "boolean",
837+
"readOnly": true
838+
},
839+
"conflictingContainerAppResourceId": {
840+
"description": "Name of the conflicting Container App on the Managed Environment if it's within the same subscription.",
841+
"type": "string",
842+
"readOnly": true
843+
},
844+
"cNameRecords": {
845+
"description": "CName records visible for this hostname.",
846+
"type": "array",
847+
"items": {
848+
"type": "string"
849+
}
850+
},
851+
"txtRecords": {
852+
"description": "TXT records visible for this hostname.",
853+
"type": "array",
854+
"items": {
855+
"type": "string"
856+
}
857+
},
858+
"aRecords": {
859+
"description": "A records visible for this hostname.",
860+
"type": "array",
861+
"items": {
862+
"type": "string"
863+
}
864+
},
865+
"alternateCNameRecords": {
866+
"description": "Alternate CName records visible for this hostname.",
867+
"type": "array",
868+
"items": {
869+
"type": "string"
870+
}
871+
},
872+
"alternateTxtRecords": {
873+
"description": "Alternate TXT records visible for this hostname.",
874+
"type": "array",
875+
"items": {
876+
"type": "string"
877+
}
844878
}
845-
}
879+
},
880+
"x-ms-client-flatten": true
846881
}
847882
},
848883
"securityDefinitions": {

‎specification/app/resource-manager/Microsoft.App/stable/2022-05-01/examples/ContainerApps_ListCustomHostNameAnalysis.json

Lines changed: 26 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -10,35 +10,32 @@
1010
"200": {
1111
"headers": {},
1212
"body": {
13-
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/containerApps/testcontainerApp0",
14-
"properties": {
15-
"hostName": "my.name.corp",
16-
"isHostnameAlreadyVerified": true,
17-
"customDomainVerificationTest": "Passed",
18-
"customDomainVerificationFailureInfo": {},
19-
"hasConflictOnManagedEnvironment": false,
20-
"conflictingContainerAppResourceId": "",
21-
"cNameRecords": [
22-
"cNameRecord1",
23-
"cNameRecord2"
24-
],
25-
"txtRecords": [
26-
"txtRecord1",
27-
"txtRecord2"
28-
],
29-
"aRecords": [
30-
"aRecord1",
31-
"aRecord2"
32-
],
33-
"alternateCNameRecords": [
34-
"cNameRecord1",
35-
"cNameRecord2"
36-
],
37-
"alternateTxtRecords": [
38-
"txtRecord1",
39-
"txtRecord2"
40-
]
41-
}
13+
"hostName": "my.name.corp",
14+
"isHostnameAlreadyVerified": true,
15+
"customDomainVerificationTest": "Passed",
16+
"customDomainVerificationFailureInfo": {},
17+
"hasConflictOnManagedEnvironment": false,
18+
"conflictingContainerAppResourceId": "",
19+
"cNameRecords": [
20+
"cNameRecord1",
21+
"cNameRecord2"
22+
],
23+
"txtRecords": [
24+
"txtRecord1",
25+
"txtRecord2"
26+
],
27+
"aRecords": [
28+
"aRecord1",
29+
"aRecord2"
30+
],
31+
"alternateCNameRecords": [
32+
"cNameRecord1",
33+
"cNameRecord2"
34+
],
35+
"alternateTxtRecords": [
36+
"txtRecord1",
37+
"txtRecord2"
38+
]
4239
}
4340
}
4441
}

0 commit comments

Comments
 (0)