Skip to content

Display error messages from tenant for "/api/rdpfile" #6816

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

Merged
kairu-ms merged 7 commits into from
Oct 13, 2023
Merged

Display error messages from tenant for "/api/rdpfile" #6816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
581d259
Display error messages from tenant for "/api/rdpfile"
Tejaswikandula Sep 28, 2023
fb4d5bf
try with different region
Tejaswikandula Sep 29, 2023
4a5a9f7
westeurope
Tejaswikandula Sep 29, 2023
cd1b51a
add new line
Tejaswikandula Sep 29, 2023
da64ddf
Revert test location change
Tejaswikandula Oct 11, 2023
e94cef7
westus2
Tejaswikandula Oct 11, 2023
fe5f511
Bump api versions
Tejaswikandula Oct 13, 2023
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
4 changes: 4 additions & 0 deletions src/bastion/azext_bastion/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import tempfile
import threading
import time
import json

import requests
from azure.cli.core.azclierror import ValidationError, InvalidArgumentValueError, RequiredArgumentMissingError, \
Expand Down Expand Up @@ -279,6 +280,9 @@ def rdp_bastion_host(cmd, target_resource_id, target_ip_address, resource_group_
}
response = requests.get(web_address, headers=headers)
if not response.ok:
errorMessage = json.loads(response.content).get('message', None)
if errorMessage:
raise ClientRequestError("Request failed with error: " + errorMessage)
raise ClientRequestError("Request to EncodingReservedUnitTypes v2 API endpoint failed.")

_write_to_file(response)
Expand Down
8 changes: 4 additions & 4 deletions src/bastion/azext_bastion/tests/latest/recordings/test_bastion_host_crud.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ interactions:
- AZURECLI/2.46.0 (AAZ) azsdk-python-core/1.24.0 Python/3.10.10 (Linux-5.15.0-1034-azure-x86_64-with-glibc2.31)
VSTS_7b238909-6802-4b65-b90d-184bca47f458_build_261_0
method: PUT
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_bastion_host_000001/providers/Microsoft.Network/virtualNetworks/vnet-000002/subnets/subnet-000003?api-version=2022-01-01
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_bastion_host_000001/providers/Microsoft.Network/virtualNetworks/vnet-000002/subnets/subnet-000003?api-version=2023-05-01
response:
body:
string: "{\r\n \"name\": \"subnet-000003\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_bastion_host_000001/providers/Microsoft.Network/virtualNetworks/vnet-000002/subnets/subnet-000003\",\r\n
Expand Down Expand Up @@ -354,7 +354,7 @@ interactions:
- AZURECLI/2.46.0 (AAZ) azsdk-python-core/1.24.0 Python/3.10.10 (Linux-5.15.0-1034-azure-x86_64-with-glibc2.31)
VSTS_7b238909-6802-4b65-b90d-184bca47f458_build_261_0
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_bastion_host_000001/providers/Microsoft.Network/virtualNetworks/vnet-000002/subnets/subnet-000003?api-version=2022-01-01
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_bastion_host_000001/providers/Microsoft.Network/virtualNetworks/vnet-000002/subnets/subnet-000003?api-version=2023-05-01
response:
body:
string: "{\r\n \"name\": \"subnet-000003\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_bastion_host_000001/providers/Microsoft.Network/virtualNetworks/vnet-000002/subnets/subnet-000003\",\r\n
Expand Down Expand Up @@ -459,7 +459,7 @@ interactions:
- AZURECLI/2.46.0 (AAZ) azsdk-python-core/1.24.0 Python/3.10.10 (Linux-5.15.0-1034-azure-x86_64-with-glibc2.31)
VSTS_7b238909-6802-4b65-b90d-184bca47f458_build_261_0
method: PUT
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_bastion_host_000001/providers/Microsoft.Network/publicIPAddresses/ip-000004?api-version=2022-05-01
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_bastion_host_000001/providers/Microsoft.Network/publicIPAddresses/ip-000004?api-version=2022-11-01
response:
body:
string: "{\r\n \"name\": \"ip-000004\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_bastion_host_000001/providers/Microsoft.Network/publicIPAddresses/ip-000004\",\r\n
Expand Down Expand Up @@ -569,7 +569,7 @@ interactions:
- AZURECLI/2.46.0 (AAZ) azsdk-python-core/1.24.0 Python/3.10.10 (Linux-5.15.0-1034-azure-x86_64-with-glibc2.31)
VSTS_7b238909-6802-4b65-b90d-184bca47f458_build_261_0
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_bastion_host_000001/providers/Microsoft.Network/publicIPAddresses/ip-000004?api-version=2022-05-01
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_bastion_host_000001/providers/Microsoft.Network/publicIPAddresses/ip-000004?api-version=2022-11-01
response:
body:
string: "{\r\n \"name\": \"ip-000004\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_bastion_host_000001/providers/Microsoft.Network/publicIPAddresses/ip-000004\",\r\n
Expand Down