From 4db302910d4cb6f05ba52fda5afbb59aac2f18ad Mon Sep 17 00:00:00 2001 From: Zunli Hu Date: Wed, 27 Jul 2022 11:39:00 +0800 Subject: [PATCH] fix (#19945) --- .../2022-01-01-preview/ContainerApps.json | 161 ++++++++---------- ...tainerApps_ListCustomHostNameAnalysis.json | 55 +++--- .../stable/2022-03-01/ContainerApps.json | 161 ++++++++---------- ...tainerApps_ListCustomHostNameAnalysis.json | 55 +++--- 4 files changed, 202 insertions(+), 230 deletions(-) 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 d85e22c386dd..941dc207f39a 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 @@ -762,94 +762,83 @@ "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", - "type": "object", - "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": { - "$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.", - "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 + "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": { + "$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.", + "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/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/stable/2022-03-01/ContainerApps.json b/specification/app/resource-manager/Microsoft.App/stable/2022-03-01/ContainerApps.json index 12a13ac54eef..5f8972bd72af 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 @@ -755,94 +755,83 @@ "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", - "type": "object", - "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": { - "$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.", - "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 + "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": { + "$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.", + "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/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" + ] } } }