ExternalVendorCode/onefuzz
1
0
Fork 0
mirror of https://github.com/microsoft/onefuzz.git synced 2025-06-16 20:08:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

handle issue from azure-mgmt-resource 17.0.0 upgrade (#893)

Browse Source
This commit is contained in:
bmc-msft
2021-05-14 16:19:52 -04:00
committed by GitHub
parent b0993fb4b7
commit 811264e249
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/api-service/__app__/onefuzzlib/azure/creds.py
View File

@ -3,6 +3,7 @@
# Copyright (c) Microsoft Corporation. # Copyright (c) Microsoft Corporation.
# Licensed under the MIT License. # Licensed under the MIT License.
import json
import os import os
from typing import Any, List from typing import Any, List
from uuid import UUID from uuid import UUID
@ -130,7 +131,19 @@ def get_scaleset_principal_id() -> UUID:
credential=get_identity(), subscription_id=get_subscription() credential=get_identity(), subscription_id=get_subscription()
) )
uid = client.resources.get_by_id(get_scaleset_identity_resource_path(), api_version) uid = client.resources.get_by_id(get_scaleset_identity_resource_path(), api_version)
return UUID(uid.properties["principalId"])
# workaround issue from azure-mgmt-resource, where properties is now a str
# instead of an obj.
# https://github.com/Azure/azure-sdk-for-python/pull/18686/files
if isinstance(uid.properties, str):
as_str = uid.properties
if as_str.startswith("{'"):
as_str = as_str.replace("'", '"')
prop = json.loads(as_str)
else:
prop = uid.properties
return UUID(prop["principalId"])
@cached @cached