Skip to content

Commit 4db3029

Browse files
JuliehzlJuliehzl
authored
fix (#19945)
1 parent 94798e3 commit 4db3029

File tree

4 files changed

+202
-230
lines changed

4 files changed

+202
-230
lines changed

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

Lines changed: 75 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -762,94 +762,83 @@
762762
"CustomHostnameAnalysisResult": {
763763
"description": "Custom domain analysis.",
764764
"type": "object",
765-
"allOf": [
766-
{
767-
"$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ProxyResource"
768-
}
769-
],
770765
"properties": {
771-
"properties": {
772-
"description": "CustomHostnameAnalysisResult resource specific properties",
773-
"type": "object",
774-
"properties": {
775-
"hostName": {
776-
"description": "Host name that was analyzed",
777-
"type": "string",
778-
"readOnly": true
779-
},
780-
"isHostnameAlreadyVerified": {
781-
"description": "<code>true</code> if hostname is already verified; otherwise, <code>false</code>.",
782-
"type": "boolean",
783-
"readOnly": true
784-
},
785-
"customDomainVerificationTest": {
786-
"description": "DNS verification test result.",
787-
"enum": [
788-
"Passed",
789-
"Failed",
790-
"Skipped"
791-
],
792-
"type": "string",
793-
"readOnly": true,
794-
"x-ms-enum": {
795-
"name": "DnsVerificationTestResult",
796-
"modelAsString": false
797-
}
798-
},
799-
"customDomainVerificationFailureInfo": {
800-
"$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse",
801-
"description": "Raw failure information if DNS verification fails.",
802-
"readOnly": true
803-
},
804-
"hasConflictOnManagedEnvironment": {
805-
"description": "<code>true</code> if there is a conflict on the Container App's managed environment; otherwise, <code>false</code>.",
806-
"type": "boolean",
807-
"readOnly": true
808-
},
809-
"conflictingContainerAppResourceId": {
810-
"description": "Name of the conflicting Container App on the Managed Environment if it's within the same subscription.",
811-
"type": "string",
812-
"readOnly": true
813-
},
814-
"cNameRecords": {
815-
"description": "CName records visible for this hostname.",
816-
"type": "array",
817-
"items": {
818-
"type": "string"
819-
}
820-
},
821-
"txtRecords": {
822-
"description": "TXT records visible for this hostname.",
823-
"type": "array",
824-
"items": {
825-
"type": "string"
826-
}
827-
},
828-
"aRecords": {
829-
"description": "A records visible for this hostname.",
830-
"type": "array",
831-
"items": {
832-
"type": "string"
833-
}
834-
},
835-
"alternateCNameRecords": {
836-
"description": "Alternate CName records visible for this hostname.",
837-
"type": "array",
838-
"items": {
839-
"type": "string"
840-
}
841-
},
842-
"alternateTxtRecords": {
843-
"description": "Alternate TXT records visible for this hostname.",
844-
"type": "array",
845-
"items": {
846-
"type": "string"
847-
}
848-
}
849-
},
850-
"x-ms-client-flatten": true
766+
"hostName": {
767+
"description": "Host name that was analyzed",
768+
"type": "string",
769+
"readOnly": true
770+
},
771+
"isHostnameAlreadyVerified": {
772+
"description": "<code>true</code> if hostname is already verified; otherwise, <code>false</code>.",
773+
"type": "boolean",
774+
"readOnly": true
775+
},
776+
"customDomainVerificationTest": {
777+
"description": "DNS verification test result.",
778+
"enum": [
779+
"Passed",
780+
"Failed",
781+
"Skipped"
782+
],
783+
"type": "string",
784+
"readOnly": true,
785+
"x-ms-enum": {
786+
"name": "DnsVerificationTestResult",
787+
"modelAsString": false
788+
}
789+
},
790+
"customDomainVerificationFailureInfo": {
791+
"$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse",
792+
"description": "Raw failure information if DNS verification fails.",
793+
"readOnly": true
794+
},
795+
"hasConflictOnManagedEnvironment": {
796+
"description": "<code>true</code> if there is a conflict on the Container App's managed environment; otherwise, <code>false</code>.",
797+
"type": "boolean",
798+
"readOnly": true
799+
},
800+
"conflictingContainerAppResourceId": {
801+
"description": "Name of the conflicting Container App on the Managed Environment if it's within the same subscription.",
802+
"type": "string",
803+
"readOnly": true
804+
},
805+
"cNameRecords": {
806+
"description": "CName records visible for this hostname.",
807+
"type": "array",
808+
"items": {
809+
"type": "string"
810+
}
811+
},
812+
"txtRecords": {
813+
"description": "TXT records visible for this hostname.",
814+
"type": "array",
815+
"items": {
816+
"type": "string"
817+
}
818+
},
819+
"aRecords": {
820+
"description": "A records visible for this hostname.",
821+
"type": "array",
822+
"items": {
823+
"type": "string"
824+
}
825+
},
826+
"alternateCNameRecords": {
827+
"description": "Alternate CName records visible for this hostname.",
828+
"type": "array",
829+
"items": {
830+
"type": "string"
831+
}
832+
},
833+
"alternateTxtRecords": {
834+
"description": "Alternate TXT records visible for this hostname.",
835+
"type": "array",
836+
"items": {
837+
"type": "string"
838+
}
851839
}
852-
}
840+
},
841+
"x-ms-client-flatten": true
853842
}
854843
},
855844
"securityDefinitions": {

‎specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/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)