Support for anyObject (#4958)

Fix #4957 Fix #4959 --------- Co-authored-by: Pan Shao <pashao@microsoft.com>
Azure · Apr 26, 2024 · 33f1071 · 33f1071
1 parent 03fc9ad
commit 33f1071
Show file tree

Hide file tree

Showing 213 changed files with 26,861 additions and 145 deletions.
diff --git a/common/changes/@autorest/openapi-to-typespec/any4957_2024-04-23-12-07.json b/common/changes/@autorest/openapi-to-typespec/any4957_2024-04-23-12-07.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@autorest/openapi-to-typespec",
+      "comment": "Support AnyObject",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@autorest/openapi-to-typespec"
+}
diff --git a/packages/extensions/openapi-to-typespec/src/generate/generate-arm-resource.ts b/packages/extensions/openapi-to-typespec/src/generate/generate-arm-resource.ts
@@ -50,7 +50,7 @@ function generateArmResourceModel(resource: TspArmResource): string {
   }
 
   if (resource.locationParent) {
-    definitions.push(`@parentResource("${resource.locationParent}")`);
+    definitions.push(`@parentResource(${resource.locationParent})`);
   }
 
   if (

diff --git a/packages/extensions/openapi-to-typespec/src/transforms/transform-arm-resources.ts b/packages/extensions/openapi-to-typespec/src/transforms/transform-arm-resources.ts
@@ -27,7 +27,7 @@ import {
   isResourceSchema,
 } from "../utils/resource-discovery";
 import { isResponseSchema } from "../utils/schemas";
-import { transformObjectProperty } from "./transform-object";
+import { getTypespecType, transformObjectProperty } from "./transform-object";
 import { transformParameter, transformRequest } from "./transform-operations";
 
 const generatedResourceObjects: Map<string, string> = new Map<string, string>();
@@ -536,7 +536,7 @@ function convertResourceActionOperations(
           }
         }
 
-        const request = bodyParam ? bodyParam.schema.language.default.name : "void";
+        const request = bodyParam ? getTypespecType(bodyParam.schema, getSession().model) : "void";
         const baseParameters = buildOperationBaseParameters(swaggerOperation, resourceMetadata);
         let kind;
         if (!okResponse) {

diff --git a/...tensions/openapi-to-typespec/test/arm-apimanagement/tsp-output/DeletedServiceContract.tsp b/...tensions/openapi-to-typespec/test/arm-apimanagement/tsp-output/DeletedServiceContract.tsp
@@ -17,7 +17,7 @@ namespace Azure.ResourceManager.ApiManagement;
 #suppress "@azure-tools/typespec-azure-core/composition-over-inheritance" "For backward compatibility"
 #suppress "@azure-tools/typespec-azure-resource-manager/arm-resource-invalid-envelope-property" "For backward compatibility"
 @subscriptionResource
-@parentResource("SubscriptionLocationResource")
+@parentResource(SubscriptionLocationResource)
 @includeInapplicableMetadataInPayload(false)
 @Azure.ResourceManager.Private.armResourceInternal(
   DeletedServiceContractProperties

diff --git a/packages/extensions/openapi-to-typespec/test/arm-compute/tsp-output/CommunityGallery.tsp b/packages/extensions/openapi-to-typespec/test/arm-compute/tsp-output/CommunityGallery.tsp
@@ -18,7 +18,7 @@ namespace Microsoft.Compute;
 #suppress "@azure-tools/typespec-azure-core/composition-over-inheritance" "For backward compatibility"
 #suppress "@azure-tools/typespec-azure-resource-manager/arm-resource-invalid-envelope-property" "For backward compatibility"
 @subscriptionResource
-@parentResource("SubscriptionLocationResource")
+@parentResource(SubscriptionLocationResource)
 @includeInapplicableMetadataInPayload(false)
 model CommunityGallery extends PirCommunityGalleryResource {
   /**

diff --git a/packages/extensions/openapi-to-typespec/test/arm-compute/tsp-output/OSFamily.tsp b/packages/extensions/openapi-to-typespec/test/arm-compute/tsp-output/OSFamily.tsp
@@ -17,7 +17,7 @@ namespace Microsoft.Compute;
 #suppress "@azure-tools/typespec-azure-core/composition-over-inheritance" "For backward compatibility"
 #suppress "@azure-tools/typespec-azure-resource-manager/arm-resource-invalid-envelope-property" "For backward compatibility"
 @subscriptionResource
-@parentResource("SubscriptionLocationResource")
+@parentResource(SubscriptionLocationResource)
 @includeInapplicableMetadataInPayload(false)
 model OSFamily {
   /**

diff --git a/packages/extensions/openapi-to-typespec/test/arm-compute/tsp-output/OSVersion.tsp b/packages/extensions/openapi-to-typespec/test/arm-compute/tsp-output/OSVersion.tsp
@@ -17,7 +17,7 @@ namespace Microsoft.Compute;
 #suppress "@azure-tools/typespec-azure-core/composition-over-inheritance" "For backward compatibility"
 #suppress "@azure-tools/typespec-azure-resource-manager/arm-resource-invalid-envelope-property" "For backward compatibility"
 @subscriptionResource
-@parentResource("SubscriptionLocationResource")
+@parentResource(SubscriptionLocationResource)
 @includeInapplicableMetadataInPayload(false)
 model OSVersion {
   /**

diff --git a/packages/extensions/openapi-to-typespec/test/arm-compute/tsp-output/SharedGallery.tsp b/packages/extensions/openapi-to-typespec/test/arm-compute/tsp-output/SharedGallery.tsp
@@ -18,7 +18,7 @@ namespace Microsoft.Compute;
 #suppress "@azure-tools/typespec-azure-core/composition-over-inheritance" "For backward compatibility"
 #suppress "@azure-tools/typespec-azure-resource-manager/arm-resource-invalid-envelope-property" "For backward compatibility"
 @subscriptionResource
-@parentResource("SubscriptionLocationResource")
+@parentResource(SubscriptionLocationResource)
 @includeInapplicableMetadataInPayload(false)
 model SharedGallery extends PirSharedGalleryResource {
   /**

diff --git a/...tensions/openapi-to-typespec/test/arm-compute/tsp-output/VirtualMachineExtensionImage.tsp b/...tensions/openapi-to-typespec/test/arm-compute/tsp-output/VirtualMachineExtensionImage.tsp
@@ -17,7 +17,7 @@ namespace Microsoft.Compute;
 #suppress "@azure-tools/typespec-azure-core/composition-over-inheritance" "For backward compatibility"
 #suppress "@azure-tools/typespec-azure-resource-manager/arm-resource-invalid-envelope-property" "For backward compatibility"
 @subscriptionResource
-@parentResource("SubscriptionLocationResource")
+@parentResource(SubscriptionLocationResource)
 @includeInapplicableMetadataInPayload(false)
 model VirtualMachineExtensionImage extends Resource {
   @path