From 3b008a07228d9a507d96b1af9c3f1b69fffa4a7d Mon Sep 17 00:00:00 2001 From: Tanmay Satam Date: Thu, 24 Aug 2023 10:01:06 -0400 Subject: [PATCH] Replace vendored ARO SDK with real SDK --- python/az/aro/azext_aro/_client_factory.py | 2 +- python/az/aro/azext_aro/custom.py | 2 +- python/az/aro/azext_aro/vendored_sdks | 1 - python/az/aro/setup.py | 3 ++- 4 files changed, 4 insertions(+), 4 deletions(-) delete mode 120000 python/az/aro/azext_aro/vendored_sdks diff --git a/python/az/aro/azext_aro/_client_factory.py b/python/az/aro/azext_aro/_client_factory.py index 3487acdb5ec..2882653abf0 100644 --- a/python/az/aro/azext_aro/_client_factory.py +++ b/python/az/aro/azext_aro/_client_factory.py @@ -3,7 +3,7 @@ import urllib3 -from azext_aro.vendored_sdks.azure.mgmt.redhatopenshift.v2023_04_01 import AzureRedHatOpenShiftClient +from azure.mgmt.redhatopenshift import AzureRedHatOpenShiftClient from azure.cli.core.commands.client_factory import get_mgmt_service_client diff --git a/python/az/aro/azext_aro/custom.py b/python/az/aro/azext_aro/custom.py index 968b252f587..f1c1da04982 100644 --- a/python/az/aro/azext_aro/custom.py +++ b/python/az/aro/azext_aro/custom.py @@ -7,7 +7,7 @@ from base64 import b64decode import textwrap -import azext_aro.vendored_sdks.azure.mgmt.redhatopenshift.v2023_04_01.models as openshiftcluster +import azure.mgmt.redhatopenshift.models as openshiftcluster from azure.cli.command_modules.role import GraphError from azure.cli.core.commands.client_factory import get_mgmt_service_client diff --git a/python/az/aro/azext_aro/vendored_sdks b/python/az/aro/azext_aro/vendored_sdks deleted file mode 120000 index 2c1f52acc3a..00000000000 --- a/python/az/aro/azext_aro/vendored_sdks +++ /dev/null @@ -1 +0,0 @@ -../../../client \ No newline at end of file diff --git a/python/az/aro/setup.py b/python/az/aro/setup.py index 6dc9a4735e0..076ec5b8331 100644 --- a/python/az/aro/setup.py +++ b/python/az/aro/setup.py @@ -28,7 +28,8 @@ ] DEPENDENCIES = [ - 'azure-cli-core' + 'azure-cli-core', + 'azure-mgmt-redhatopenshift~=1.3.0', ] with open('README.rst', 'r', encoding='utf-8') as f: