Fix final result check (#36441)

Co-authored-by: Pan Shao <[email protected]>

Author: pshao25

eng/tools/typespec-migration-validation/src/compare.ts

@@ -1,4 +1,4 @@
-import { HttpMethod, OpenAPI2Document, OpenAPI2Operation, OpenAPI2Response, Ref, Refable } from "@azure-tools/typespec-autorest";
+import { HttpMethod, OpenAPI2Document, OpenAPI2Operation, OpenAPI2Response, Refable } from "@azure-tools/typespec-autorest";
 
 interface Diff {
   before: any;
@@ -177,23 +177,26 @@ function compareLongRunning(oldOperation: OpenAPI2Operation, newOperation: OpenA
     });
   }
 
-  const newFinalResult = newOperation["x-ms-long-running-operation-options"]?.["final-state-schema"];
-  if (newFinalResult !== getResponseSchema(oldOperation.responses?.["200"])) {
-    pathDiffs.push({
-      before: getResponseSchema(oldOperation.responses?.["200"]),
-      after: newFinalResult,
-      operationId: operationId,
-      type: "finalresult",
-      level: "error"
-    });
-  }
+  if (oldLongRunning) {
+    const newFinalResult = newOperation["x-ms-long-running-operation-options"]?.["final-state-schema"];
+    const newFinalResultSchema = newFinalResult?.split("/").pop();
+    if (newFinalResultSchema !== getResponseSchema(oldOperation.responses?.["200"])) {
+      pathDiffs.push({
+        before: getResponseSchema(oldOperation.responses?.["200"]),
+        after: newFinalResultSchema,
+        operationId: operationId,
+        type: "finalresult",
+        level: "error"
+      });
+    }
+  }  
 
   return pathDiffs;
 }
 
 function getResponseSchema(response: Refable<OpenAPI2Response> | undefined): string | undefined {
-  if (response && (response as Ref<OpenAPI2Response>).$ref) {
-    const refPath = (response as Ref<OpenAPI2Response>).$ref;
+  if (response && (response as OpenAPI2Response).schema && ((response as OpenAPI2Response).schema as any).$ref) {
+    const refPath = ((response as OpenAPI2Response).schema as any).$ref;
     return refPath.split("/").pop();
   }
 

eng/tools/typespec-migration-validation/src/index.ts

@@ -167,8 +167,8 @@ export async function main() {
   const sortedOldFile = sortOpenAPIDocument(processedOldFile);
 
   logHeader(`Processing new swagger from: ${newPath}...`);
-  const newFile = readFileContent(newPath!);
-  const processedNewFile = processDocument(JSON.parse(newFile.toString()));
+  const newFile = JSON.parse(readFileContent(newPath!).toString());
+  const processedNewFile = processDocument(newFile);
   const sortedNewFile = sortOpenAPIDocument(processedNewFile);
 
   logHeader("Comparing old and new Swagger files...");
@@ -197,8 +197,8 @@ export async function main() {
 
   let outputMarkdown = "";
   const compareResult = compareDocuments(
-    sortedOldFile,
-    sortedNewFile,
+    mergedOldfile,
+    newFile,
   );
   if (compareResult.length === 0) {
     logHeader("No differences found.");