From d0afe3600822d9b5476a2e7938bb63e05c87f870 Mon Sep 17 00:00:00 2001 From: Minnie Liu Date: Tue, 7 Feb 2023 16:00:00 -0800 Subject: [PATCH 1/5] Update rooms json examples according to new changes --- .../examples/Rooms_AddParticipants.json | 2 +- .../examples/Rooms_GetParticipants.json | 21 +++---------------- .../examples/Rooms_RemoveAllParticipants.json | 2 +- .../examples/Rooms_RemoveParticipants.json | 2 +- .../examples/Rooms_UpdateParticipants.json | 2 +- 5 files changed, 7 insertions(+), 22 deletions(-) diff --git a/specification/communication/data-plane/Rooms/preview/2023-01-01-preview/examples/Rooms_AddParticipants.json b/specification/communication/data-plane/Rooms/preview/2023-01-01-preview/examples/Rooms_AddParticipants.json index 310f0e455888..c81380412e9a 100644 --- a/specification/communication/data-plane/Rooms/preview/2023-01-01-preview/examples/Rooms_AddParticipants.json +++ b/specification/communication/data-plane/Rooms/preview/2023-01-01-preview/examples/Rooms_AddParticipants.json @@ -3,7 +3,7 @@ "endpoint": "https://contoso.communication.azure.com/", "api-version": "2023-01-01", "roomId": "99199690362660524", - "PatchParticipantsRequest": { + "patchParticipantsRequest": { "8:acs:db75ed0c-e801-41a3-99a4-66a0a119a06c_00000010-ce28-064a-83fe-084822000666": { "role": "Presenter" }, diff --git a/specification/communication/data-plane/Rooms/preview/2023-01-01-preview/examples/Rooms_GetParticipants.json b/specification/communication/data-plane/Rooms/preview/2023-01-01-preview/examples/Rooms_GetParticipants.json index 15ed4ade3b16..016a0ec9aa24 100644 --- a/specification/communication/data-plane/Rooms/preview/2023-01-01-preview/examples/Rooms_GetParticipants.json +++ b/specification/communication/data-plane/Rooms/preview/2023-01-01-preview/examples/Rooms_GetParticipants.json @@ -9,30 +9,15 @@ "body": { "participants": [ { - "communicationIdentifier": { - "rawId": "8:acs:db75ed0c-e801-41a3-99a4-66a0a119a06c_00000010-ce28-064a-83fe-084822000333", - "communicationUser": { - "id": "8:acs:db75ed0c-e801-41a3-99a4-66a0a119a06c_00000010-ce28-064a-83fe-084822000333" - } - }, + "rawId": "8:acs:db75ed0c-e801-41a3-99a4-66a0a119a06c_00000010-ce28-064a-83fe-084822000333", "role": "Presenter" }, { - "communicationIdentifier": { - "rawId": "8:acs:db75ed0c-e801-41a3-99a4-66a0a119a06c_00000010-ce28-064a-83fe-084822000444", - "communicationUser": { - "id": "8:acs:db75ed0c-e801-41a3-99a4-66a0a119a06c_00000010-ce28-064a-83fe-084822000444" - } - }, + "rawId": "8:acs:db75ed0c-e801-41a3-99a4-66a0a119a06c_00000010-ce28-064a-83fe-084822000444", "role": "Attendee" }, { - "communicationIdentifier": { - "rawId": "8:acs:db75ed0c-e801-41a3-99a4-66a0a119a06c_00000010-ce28-064a-83fe-084822000555", - "communicationUser": { - "id": "8:acs:db75ed0c-e801-41a3-99a4-66a0a119a06c_00000010-ce28-064a-83fe-084822000555" - } - }, + "rawId": "8:acs:db75ed0c-e801-41a3-99a4-66a0a119a06c_00000010-ce28-064a-83fe-084822000555", "role": "Attendee" } ], diff --git a/specification/communication/data-plane/Rooms/preview/2023-01-01-preview/examples/Rooms_RemoveAllParticipants.json b/specification/communication/data-plane/Rooms/preview/2023-01-01-preview/examples/Rooms_RemoveAllParticipants.json index 8b8a81355042..a3331e7e5d85 100644 --- a/specification/communication/data-plane/Rooms/preview/2023-01-01-preview/examples/Rooms_RemoveAllParticipants.json +++ b/specification/communication/data-plane/Rooms/preview/2023-01-01-preview/examples/Rooms_RemoveAllParticipants.json @@ -3,7 +3,7 @@ "endpoint": "https://contoso.communication.azure.com/", "api-version": "2023-01-01", "roomId": "99199690362660524", - "PatchParticipantsRequest": null + "patchParticipantsRequest": null }, "responses": { "200": { diff --git a/specification/communication/data-plane/Rooms/preview/2023-01-01-preview/examples/Rooms_RemoveParticipants.json b/specification/communication/data-plane/Rooms/preview/2023-01-01-preview/examples/Rooms_RemoveParticipants.json index 7b3913dddccc..078f805eff67 100644 --- a/specification/communication/data-plane/Rooms/preview/2023-01-01-preview/examples/Rooms_RemoveParticipants.json +++ b/specification/communication/data-plane/Rooms/preview/2023-01-01-preview/examples/Rooms_RemoveParticipants.json @@ -3,7 +3,7 @@ "endpoint": "https://contoso.communication.azure.com/", "api-version": "2023-01-01", "roomId": "99199690362660524", - "PatchParticipantsRequest": { + "patchParticipantsRequest": { "8:acs:db75ed0c-e801-41a3-99a4-66a0a119a06c_00000010-ce28-064a-83fe-084822000666": null } }, diff --git a/specification/communication/data-plane/Rooms/preview/2023-01-01-preview/examples/Rooms_UpdateParticipants.json b/specification/communication/data-plane/Rooms/preview/2023-01-01-preview/examples/Rooms_UpdateParticipants.json index edd6fc8e5080..c8396485312d 100644 --- a/specification/communication/data-plane/Rooms/preview/2023-01-01-preview/examples/Rooms_UpdateParticipants.json +++ b/specification/communication/data-plane/Rooms/preview/2023-01-01-preview/examples/Rooms_UpdateParticipants.json @@ -3,7 +3,7 @@ "endpoint": "https://contoso.communication.azure.com/", "api-version": "2023-01-01", "roomId": "99199690362660524", - "PatchParticipantsRequest": { + "patchParticipantsRequest": { "8:acs:db75ed0c-e801-41a3-99a4-66a0a119a06c_00000010-ce28-064a-83fe-084822000666": { "role": "Attendee" }, From a8720eaf4c8b1b7faa2e720da5f7286f40f2741a Mon Sep 17 00:00:00 2001 From: Minnie Liu Date: Tue, 7 Feb 2023 16:08:49 -0800 Subject: [PATCH 2/5] Address pipeline validation errors --- .../examples/Rooms_AddParticipants.json | 2 +- .../communication/data-plane/Rooms/readme.md | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/specification/communication/data-plane/Rooms/preview/2023-01-01-preview/examples/Rooms_AddParticipants.json b/specification/communication/data-plane/Rooms/preview/2023-01-01-preview/examples/Rooms_AddParticipants.json index c81380412e9a..c8be9fe41b77 100644 --- a/specification/communication/data-plane/Rooms/preview/2023-01-01-preview/examples/Rooms_AddParticipants.json +++ b/specification/communication/data-plane/Rooms/preview/2023-01-01-preview/examples/Rooms_AddParticipants.json @@ -10,7 +10,7 @@ "8:acs:db75ed0c-e801-41a3-99a4-66a0a119a06c_00000010-ce28-064a-83fe-084822000667": { "role": "Attendee" } - } + } }, "responses": { "200": { diff --git a/specification/communication/data-plane/Rooms/readme.md b/specification/communication/data-plane/Rooms/readme.md index 572f60a6956d..01f5bcac61b2 100644 --- a/specification/communication/data-plane/Rooms/readme.md +++ b/specification/communication/data-plane/Rooms/readme.md @@ -40,4 +40,15 @@ input-file: - preview/2022-02-01-preview/communicationservicesrooms.json title: Azure Communication Services +``` + +### Tag: package-rooms-2023-01-01-preview + +These settings apply only when `--tag=package-rooms-2023-01-01-preview` is specified on the command line. + +```yaml $(tag) == 'package-rooms-2023-01-01-preview' +input-file: + - preview/2023-01-01-preview/communicationservicesrooms.json +title: + Azure Communication Services ``` \ No newline at end of file From 0b5b725d95bdb24395f16c2c301cb0167836a159 Mon Sep 17 00:00:00 2001 From: Minnie Liu Date: Tue, 7 Feb 2023 16:31:15 -0800 Subject: [PATCH 3/5] Address pipeline validation errors --- specification/communication/data-plane/Rooms/readme.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/specification/communication/data-plane/Rooms/readme.md b/specification/communication/data-plane/Rooms/readme.md index 01f5bcac61b2..1a4344da3ef3 100644 --- a/specification/communication/data-plane/Rooms/readme.md +++ b/specification/communication/data-plane/Rooms/readme.md @@ -26,9 +26,7 @@ These are the global settings for the communicationservices. ```yaml openapi-type: data-plane -tag: package-rooms-2022-02-01-preview -input-file: - - preview/2022-02-01-preview/communicationservicesrooms.json +tag: package-rooms-2023-01-01-preview ``` ### Tag: package-rooms-2022-02-01-preview From d4a1108dd67448d2eb3e0838d40b66a09c365eaf Mon Sep 17 00:00:00 2001 From: Minnie Liu Date: Tue, 7 Feb 2023 16:54:00 -0800 Subject: [PATCH 4/5] Address pipeline validation errors --- .../data-plane/Rooms/readme.csharp.md | 15 +++++++++++++ .../communication/data-plane/Rooms/readme.md | 21 ++++++++++++++++++- .../data-plane/Rooms/readme.python.md | 21 +++++++++++++++++++ .../data-plane/Rooms/readme.typescript.md | 13 ++++++++++++ 4 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 specification/communication/data-plane/Rooms/readme.csharp.md create mode 100644 specification/communication/data-plane/Rooms/readme.python.md create mode 100644 specification/communication/data-plane/Rooms/readme.typescript.md diff --git a/specification/communication/data-plane/Rooms/readme.csharp.md b/specification/communication/data-plane/Rooms/readme.csharp.md new file mode 100644 index 000000000000..2efd3715cdc3 --- /dev/null +++ b/specification/communication/data-plane/Rooms/readme.csharp.md @@ -0,0 +1,15 @@ +## C + +These settings apply only when `--csharp` is specified on the command line. +Please also specify `--csharp-sdks-folder=`. + +```yaml $(csharp) +csharp: + azure-arm: true + license-header: MICROSOFT_MIT_NO_VERSION + payload-flattening-threshold: 1 + clear-output-folder: true + client-side-validation: false + namespace: Microsoft.CommunicationServices + output-folder: $(csharp-sdks-folder)/communicationservices/management/Microsoft.CommunicationServices/GeneratedProtocol +``` diff --git a/specification/communication/data-plane/Rooms/readme.md b/specification/communication/data-plane/Rooms/readme.md index 1a4344da3ef3..13e0213fdd26 100644 --- a/specification/communication/data-plane/Rooms/readme.md +++ b/specification/communication/data-plane/Rooms/readme.md @@ -49,4 +49,23 @@ input-file: - preview/2023-01-01-preview/communicationservicesrooms.json title: Azure Communication Services -``` \ No newline at end of file +``` + +# Code Generation + +## Swagger to SDK + +This section describes what SDK should be generated by the automatic system. +This is not used by Autorest itself. + +## Python + +See configuration in [readme.python.md](./readme.python.md) + +## TypeScript + +See configuration in [readme.typescript.md](./readme.typescript.md) + +## CSharp + +See configuration in [readme.csharp.md](./readme.csharp.md) \ No newline at end of file diff --git a/specification/communication/data-plane/Rooms/readme.python.md b/specification/communication/data-plane/Rooms/readme.python.md new file mode 100644 index 000000000000..553af2866639 --- /dev/null +++ b/specification/communication/data-plane/Rooms/readme.python.md @@ -0,0 +1,21 @@ +## Python + +These settings apply only when `--python` is specified on the command line. +Please also specify `--python-sdks-folder=`. + +```yaml $(python) +python: + azure-arm: true + license-header: MICROSOFT_MIT_NO_VERSION + payload-flattening-threshold: 2 + namespace: Microsoft.CommunicationServices + package-name: communicationservices + package-version: 2023-01-01-preview + clear-output-folder: true +``` + +```yaml $(python) +python: + no-namespace-folders: true + output-folder: $(python-sdks-folder)/azure-mgmt/communicationservices +``` diff --git a/specification/communication/data-plane/Rooms/readme.typescript.md b/specification/communication/data-plane/Rooms/readme.typescript.md new file mode 100644 index 000000000000..be9f877fd1c2 --- /dev/null +++ b/specification/communication/data-plane/Rooms/readme.typescript.md @@ -0,0 +1,13 @@ +## TypeScript + +These settings apply only when `--typescript` is specified on the command line. +Please also specify `--typescript-sdks-folder=`. + +```yaml $(typescript) +typescript: + azure-arm: true + package-name: "communicationservices" + output-folder: "$(typescript-sdks-folder)/packages/communicationservices" + payload-flattening-threshold: 1 + generate-metadata: true +``` From 432eae961f473dd0efcbc4c86dfe89240a85d5bb Mon Sep 17 00:00:00 2001 From: Minnie Liu Date: Tue, 7 Feb 2023 17:10:04 -0800 Subject: [PATCH 5/5] revert readme --- .../data-plane/Rooms/readme.csharp.md | 15 -------- .../communication/data-plane/Rooms/readme.md | 36 +++---------------- .../data-plane/Rooms/readme.python.md | 21 ----------- .../data-plane/Rooms/readme.typescript.md | 13 ------- 4 files changed, 4 insertions(+), 81 deletions(-) delete mode 100644 specification/communication/data-plane/Rooms/readme.csharp.md delete mode 100644 specification/communication/data-plane/Rooms/readme.python.md delete mode 100644 specification/communication/data-plane/Rooms/readme.typescript.md diff --git a/specification/communication/data-plane/Rooms/readme.csharp.md b/specification/communication/data-plane/Rooms/readme.csharp.md deleted file mode 100644 index 2efd3715cdc3..000000000000 --- a/specification/communication/data-plane/Rooms/readme.csharp.md +++ /dev/null @@ -1,15 +0,0 @@ -## C - -These settings apply only when `--csharp` is specified on the command line. -Please also specify `--csharp-sdks-folder=`. - -```yaml $(csharp) -csharp: - azure-arm: true - license-header: MICROSOFT_MIT_NO_VERSION - payload-flattening-threshold: 1 - clear-output-folder: true - client-side-validation: false - namespace: Microsoft.CommunicationServices - output-folder: $(csharp-sdks-folder)/communicationservices/management/Microsoft.CommunicationServices/GeneratedProtocol -``` diff --git a/specification/communication/data-plane/Rooms/readme.md b/specification/communication/data-plane/Rooms/readme.md index 13e0213fdd26..572f60a6956d 100644 --- a/specification/communication/data-plane/Rooms/readme.md +++ b/specification/communication/data-plane/Rooms/readme.md @@ -26,7 +26,9 @@ These are the global settings for the communicationservices. ```yaml openapi-type: data-plane -tag: package-rooms-2023-01-01-preview +tag: package-rooms-2022-02-01-preview +input-file: + - preview/2022-02-01-preview/communicationservicesrooms.json ``` ### Tag: package-rooms-2022-02-01-preview @@ -38,34 +40,4 @@ input-file: - preview/2022-02-01-preview/communicationservicesrooms.json title: Azure Communication Services -``` - -### Tag: package-rooms-2023-01-01-preview - -These settings apply only when `--tag=package-rooms-2023-01-01-preview` is specified on the command line. - -```yaml $(tag) == 'package-rooms-2023-01-01-preview' -input-file: - - preview/2023-01-01-preview/communicationservicesrooms.json -title: - Azure Communication Services -``` - -# Code Generation - -## Swagger to SDK - -This section describes what SDK should be generated by the automatic system. -This is not used by Autorest itself. - -## Python - -See configuration in [readme.python.md](./readme.python.md) - -## TypeScript - -See configuration in [readme.typescript.md](./readme.typescript.md) - -## CSharp - -See configuration in [readme.csharp.md](./readme.csharp.md) \ No newline at end of file +``` \ No newline at end of file diff --git a/specification/communication/data-plane/Rooms/readme.python.md b/specification/communication/data-plane/Rooms/readme.python.md deleted file mode 100644 index 553af2866639..000000000000 --- a/specification/communication/data-plane/Rooms/readme.python.md +++ /dev/null @@ -1,21 +0,0 @@ -## Python - -These settings apply only when `--python` is specified on the command line. -Please also specify `--python-sdks-folder=`. - -```yaml $(python) -python: - azure-arm: true - license-header: MICROSOFT_MIT_NO_VERSION - payload-flattening-threshold: 2 - namespace: Microsoft.CommunicationServices - package-name: communicationservices - package-version: 2023-01-01-preview - clear-output-folder: true -``` - -```yaml $(python) -python: - no-namespace-folders: true - output-folder: $(python-sdks-folder)/azure-mgmt/communicationservices -``` diff --git a/specification/communication/data-plane/Rooms/readme.typescript.md b/specification/communication/data-plane/Rooms/readme.typescript.md deleted file mode 100644 index be9f877fd1c2..000000000000 --- a/specification/communication/data-plane/Rooms/readme.typescript.md +++ /dev/null @@ -1,13 +0,0 @@ -## TypeScript - -These settings apply only when `--typescript` is specified on the command line. -Please also specify `--typescript-sdks-folder=`. - -```yaml $(typescript) -typescript: - azure-arm: true - package-name: "communicationservices" - output-folder: "$(typescript-sdks-folder)/packages/communicationservices" - payload-flattening-threshold: 1 - generate-metadata: true -```