Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change body to bodyroot in converter #5032

Merged
merged 3 commits into from
Nov 1, 2024
Merged

Change body to bodyroot in converter #5032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
97770d4
Change body to bodyroot
Oct 24, 2024
962c1ac
update
Oct 24, 2024
6df56e0
Merge branch 'main' into bodyrootFix
pshao25 Oct 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions common/changes/@autorest/openapi-to-typespec/bodyrootFix_2024-10-24-11-57.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@autorest/openapi-to-typespec",
"comment": "Change @body to @bodyRoot",
"type": "patch"
}
],
"packageName": "@autorest/openapi-to-typespec"
}
2 changes: 1 addition & 1 deletion packages/extensions/openapi-to-typespec/src/generate/generate-operations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ export function generateProviderAction(operation: TspArmProviderActionOperation)
const responses = [...new Set(operation.responses)];
// Workaround for array response, refactor later.
const response =
responses.length === 1 && responses[0].endsWith("[]") ? `{@body _: ${responses[0]}}` : responses.join("|");
responses.length === 1 && responses[0].endsWith("[]") ? `{@bodyRoot _: ${responses[0]}}` : responses.join("|");
if (response !== "void") {
templateParameters.push(`Response = ${response}`);
}
Expand Down
2 changes: 1 addition & 1 deletion packages/extensions/openapi-to-typespec/src/transforms/transform-arm-resources.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ function convertResourceCreateOrReplaceOperation(
if (acceptedResponse) {
let responseParameter = `ArmResourceCreatedResponse<${resourceMetadata.SwaggerModelName}> | ArmResourceUpdatedResponse<${resourceMetadata.SwaggerModelName}>`;
if (isResponseSchema(acceptedResponse) && acceptedResponse.schema) {
responseParameter += `| (ArmAcceptedLroResponse & {@body _: ${resourceMetadata.SwaggerModelName};})`;
responseParameter += `| (ArmAcceptedLroResponse & {@bodyRoot _: ${resourceMetadata.SwaggerModelName};})`;
} else responseParameter += `| ArmAcceptedLroResponse`;
templateParameters.push(`Response = ${responseParameter}`);
suppressions = getSuppressionsForArmResourceCreateOrReplaceAsync();
Expand Down
2 changes: 1 addition & 1 deletion ...sions/openapi-to-typespec/test/arm-analysisservices/tsp-output/AnalysisServicesServer.tsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ interface AnalysisServicesServersOperationGroup {
create is ArmResourceCreateOrReplaceAsync<
AnalysisServicesServer,
Response = ArmResourceCreatedResponse<AnalysisServicesServer> | ArmResourceUpdatedResponse<AnalysisServicesServer> | (ArmAcceptedLroResponse & {
@body _: AnalysisServicesServer;
@bodyRoot _: AnalysisServicesServer;
})
>;

Expand Down
2 changes: 1 addition & 1 deletion packages/extensions/openapi-to-typespec/test/arm-compute/tsp-output/Disk.tsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ interface Disks {
createOrUpdate is ArmResourceCreateOrReplaceAsync<
Disk,
Response = ArmResourceCreatedResponse<Disk> | ArmResourceUpdatedResponse<Disk> | (ArmAcceptedLroResponse & {
@body _: Disk;
@bodyRoot _: Disk;
})
>;

Expand Down
2 changes: 1 addition & 1 deletion packages/extensions/openapi-to-typespec/test/arm-compute/tsp-output/DiskAccess.tsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ interface DiskAccesses {
createOrUpdate is ArmResourceCreateOrReplaceAsync<
DiskAccess,
Response = ArmResourceCreatedResponse<DiskAccess> | ArmResourceUpdatedResponse<DiskAccess> | (ArmAcceptedLroResponse & {
@body _: DiskAccess;
@bodyRoot _: DiskAccess;
})
>;

Expand Down
2 changes: 1 addition & 1 deletion packages/extensions/openapi-to-typespec/test/arm-compute/tsp-output/DiskEncryptionSet.tsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ interface DiskEncryptionSets {
createOrUpdate is ArmResourceCreateOrReplaceAsync<
DiskEncryptionSet,
Response = ArmResourceCreatedResponse<DiskEncryptionSet> | ArmResourceUpdatedResponse<DiskEncryptionSet> | (ArmAcceptedLroResponse & {
@body _: DiskEncryptionSet;
@bodyRoot _: DiskEncryptionSet;
})
>;

Expand Down
2 changes: 1 addition & 1 deletion packages/extensions/openapi-to-typespec/test/arm-compute/tsp-output/Gallery.tsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ interface Galleries {
createOrUpdate is ArmResourceCreateOrReplaceAsync<
Gallery,
Response = ArmResourceCreatedResponse<Gallery> | ArmResourceUpdatedResponse<Gallery> | (ArmAcceptedLroResponse & {
@body _: Gallery;
@bodyRoot _: Gallery;
})
>;

Expand Down
2 changes: 1 addition & 1 deletion packages/extensions/openapi-to-typespec/test/arm-compute/tsp-output/GalleryApplication.tsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ interface GalleryApplications {
createOrUpdate is ArmResourceCreateOrReplaceAsync<
GalleryApplication,
Response = ArmResourceCreatedResponse<GalleryApplication> | ArmResourceUpdatedResponse<GalleryApplication> | (ArmAcceptedLroResponse & {
@body _: GalleryApplication;
@bodyRoot _: GalleryApplication;
})
>;

Expand Down
2 changes: 1 addition & 1 deletion .../extensions/openapi-to-typespec/test/arm-compute/tsp-output/GalleryApplicationVersion.tsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ interface GalleryApplicationVersions {
createOrUpdate is ArmResourceCreateOrReplaceAsync<
GalleryApplicationVersion,
Response = ArmResourceCreatedResponse<GalleryApplicationVersion> | ArmResourceUpdatedResponse<GalleryApplicationVersion> | (ArmAcceptedLroResponse & {
@body _: GalleryApplicationVersion;
@bodyRoot _: GalleryApplicationVersion;
})
>;

Expand Down
2 changes: 1 addition & 1 deletion packages/extensions/openapi-to-typespec/test/arm-compute/tsp-output/GalleryImage.tsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ interface GalleryImages {
createOrUpdate is ArmResourceCreateOrReplaceAsync<
GalleryImage,
Response = ArmResourceCreatedResponse<GalleryImage> | ArmResourceUpdatedResponse<GalleryImage> | (ArmAcceptedLroResponse & {
@body _: GalleryImage;
@bodyRoot _: GalleryImage;
})
>;

Expand Down
2 changes: 1 addition & 1 deletion packages/extensions/openapi-to-typespec/test/arm-compute/tsp-output/GalleryImageVersion.tsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ interface GalleryImageVersions {
createOrUpdate is ArmResourceCreateOrReplaceAsync<
GalleryImageVersion,
Response = ArmResourceCreatedResponse<GalleryImageVersion> | ArmResourceUpdatedResponse<GalleryImageVersion> | (ArmAcceptedLroResponse & {
@body _: GalleryImageVersion;
@bodyRoot _: GalleryImageVersion;
})
>;

Expand Down
2 changes: 1 addition & 1 deletion .../extensions/openapi-to-typespec/test/arm-compute/tsp-output/PrivateEndpointConnection.tsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ interface PrivateEndpointConnections {
updateAPrivateEndpointConnection is ArmResourceCreateOrReplaceAsync<
PrivateEndpointConnection,
Response = ArmResourceCreatedResponse<PrivateEndpointConnection> | ArmResourceUpdatedResponse<PrivateEndpointConnection> | (ArmAcceptedLroResponse & {
@body _: PrivateEndpointConnection;
@bodyRoot _: PrivateEndpointConnection;
})
>;

Expand Down
2 changes: 1 addition & 1 deletion packages/extensions/openapi-to-typespec/test/arm-compute/tsp-output/Snapshot.tsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ interface Snapshots {
createOrUpdate is ArmResourceCreateOrReplaceAsync<
Snapshot,
Response = ArmResourceCreatedResponse<Snapshot> | ArmResourceUpdatedResponse<Snapshot> | (ArmAcceptedLroResponse & {
@body _: Snapshot;
@bodyRoot _: Snapshot;
})
>;

Expand Down
2 changes: 1 addition & 1 deletion ...s/extensions/openapi-to-typespec/test/arm-compute/tsp-output/VirtualMachineScaleSetVM.tsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ interface VirtualMachineScaleSetVMS {
update is ArmResourceCreateOrReplaceAsync<
VirtualMachineScaleSetVM,
Response = ArmResourceCreatedResponse<VirtualMachineScaleSetVM> | ArmResourceUpdatedResponse<VirtualMachineScaleSetVM> | (ArmAcceptedLroResponse & {
@body _: VirtualMachineScaleSetVM;
@bodyRoot _: VirtualMachineScaleSetVM;
})
>;

Expand Down
16 changes: 8 additions & 8 deletions packages/extensions/openapi-to-typespec/test/arm-compute/tsp-output/routes.tsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ interface VirtualMachineImagesOperations {
@action("versions")
list is ArmProviderActionAsync<
Response = {
@body _: VirtualMachineImageResource[];
@bodyRoot _: VirtualMachineImageResource[];
},
Scope = SubscriptionActionScope,
Parameters = {
Expand Down Expand Up @@ -177,7 +177,7 @@ interface VirtualMachineImagesOperations {
@action("artifacttypes/vmimage/offers")
listOffers is ArmProviderActionAsync<
Response = {
@body _: VirtualMachineImageResource[];
@bodyRoot _: VirtualMachineImageResource[];
},
Scope = SubscriptionActionScope,
Parameters = {
Expand All @@ -200,7 +200,7 @@ interface VirtualMachineImagesOperations {
@action("publishers")
listPublishers is ArmProviderActionAsync<
Response = {
@body _: VirtualMachineImageResource[];
@bodyRoot _: VirtualMachineImageResource[];
},
Scope = SubscriptionActionScope,
Parameters = LocationParameter
Expand All @@ -214,7 +214,7 @@ interface VirtualMachineImagesOperations {
@action("skus")
listSkus is ArmProviderActionAsync<
Response = {
@body _: VirtualMachineImageResource[];
@bodyRoot _: VirtualMachineImageResource[];
},
Scope = SubscriptionActionScope,
Parameters = {
Expand Down Expand Up @@ -313,7 +313,7 @@ interface VirtualMachineImagesEdgeZoneOperations {
@action("versions")
list is ArmProviderActionAsync<
Response = {
@body _: VirtualMachineImageResource[];
@bodyRoot _: VirtualMachineImageResource[];
},
Scope = SubscriptionActionScope,
Parameters = {
Expand Down Expand Up @@ -375,7 +375,7 @@ interface VirtualMachineImagesEdgeZoneOperations {
@action("artifacttypes/vmimage/offers")
listOffers is ArmProviderActionAsync<
Response = {
@body _: VirtualMachineImageResource[];
@bodyRoot _: VirtualMachineImageResource[];
},
Scope = SubscriptionActionScope,
Parameters = {
Expand Down Expand Up @@ -405,7 +405,7 @@ interface VirtualMachineImagesEdgeZoneOperations {
@action("publishers")
listPublishers is ArmProviderActionAsync<
Response = {
@body _: VirtualMachineImageResource[];
@bodyRoot _: VirtualMachineImageResource[];
},
Scope = SubscriptionActionScope,
Parameters = {
Expand All @@ -428,7 +428,7 @@ interface VirtualMachineImagesEdgeZoneOperations {
@action("skus")
listSkus is ArmProviderActionAsync<
Response = {
@body _: VirtualMachineImageResource[];
@bodyRoot _: VirtualMachineImageResource[];
},
Scope = SubscriptionActionScope,
Parameters = {
Expand Down
Loading