fix (#19945)

Azure · Jul 27, 2022 · 4db3029 · 4db3029
1 parent 94798e3
commit 4db3029
Show file tree

Hide file tree

Showing 4 changed files with 202 additions and 230 deletions.
diff --git a/...fication/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/ContainerApps.json b/...fication/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": "<code>true</code> if hostname is already verified; otherwise, <code>false</code>.",
-              "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": "<code>true</code> if there is a conflict on the Container App's managed environment; otherwise, <code>false</code>.",
-              "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": "<code>true</code> if hostname is already verified; otherwise, <code>false</code>.",
+          "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": "<code>true</code> if there is a conflict on the Container App's managed environment; otherwise, <code>false</code>.",
+          "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/...oft.App/preview/2022-01-01-preview/examples/ContainerApps_ListCustomHostNameAnalysis.json b/...oft.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"
+        ]
       }
     }
   }