Skip to content

{Packaging} Add missing dependencies for azure-cli-core #20740

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
jiasli merged 2 commits into from
Dec 17, 2021
Merged

{Packaging} Add missing dependencies for azure-cli-core #20740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
000cacd
Add msrestazure dependency
jiasli Dec 15, 2021
f7a4d9d
packaging
jiasli Dec 17, 2021
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
2 changes: 1 addition & 1 deletion src/azure-cli-core/azure/cli/core/_profile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ def login(self,

def login_with_managed_identity(self, identity_id=None, allow_no_subscriptions=None):
import jwt
from msrestazure.tools import is_valid_resource_id
from azure.mgmt.core.tools import is_valid_resource_id
from azure.cli.core.auth.adal_authentication import MSIAuthenticationWrapper
resource = self.cli_ctx.cloud.endpoints.active_directory_resource_id

Expand Down
4 changes: 2 additions & 2 deletions src/azure-cli-core/azure/cli/core/commands/arm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ def deployment_validate_table_format(result):
class ResourceId(str):

def __new__(cls, val):
from msrestazure.tools import is_valid_resource_id
from azure.mgmt.core.tools import is_valid_resource_id
if not is_valid_resource_id(val):
raise ValueError()
return str.__new__(cls, val)
Expand Down Expand Up @@ -782,7 +782,7 @@ def _gen_guid():


def get_arm_resource_by_id(cli_ctx, arm_id, api_version=None):
from msrestazure.tools import parse_resource_id, is_valid_resource_id
from azure.mgmt.core.tools import parse_resource_id, is_valid_resource_id

if not is_valid_resource_id(arm_id):
raise CLIError("'{}' is not a valid ID.".format(arm_id))
Expand Down
4 changes: 2 additions & 2 deletions src/azure-cli-core/azure/cli/core/commands/template_create.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def get_folded_parameter_help_string(
def _validate_name_or_id(
cli_ctx, resource_group_name, property_value, property_type, parent_value, parent_type):
from azure.cli.core.commands.client_factory import get_subscription_id
from msrestazure.tools import parse_resource_id, is_valid_resource_id
from azure.mgmt.core.tools import parse_resource_id, is_valid_resource_id
has_parent = parent_type is not None
if is_valid_resource_id(property_value):
resource_id_parts = parse_resource_id(property_value)
Expand Down Expand Up @@ -95,7 +95,7 @@ def get_folded_parameter_validator(

# construct the validator
def validator(cmd, namespace):
from msrestazure.tools import resource_id
from azure.mgmt.core.tools import resource_id
type_field_name = '{}_type'.format(property_name)
property_val = getattr(namespace, property_name, None)
parent_val = getattr(namespace, parent_name, None) if parent_name else None
Expand Down
2 changes: 2 additions & 0 deletions src/azure-cli-core/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@
'knack~=0.9.0',
'msal-extensions>=0.3.1,<0.4',
'msal>=1.16.0,<2.0.0',
'msrestazure~=0.6.4',
'packaging>=20.9,<22.0',
Copy link
Member Author

@jiasli jiasli Feb 7, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The version bound is copied from #20661. We set the upper bound simply because we don't want unexpected breaking change, which is a value point today.

'paramiko>=2.0.8,<3.0.0',
'pkginfo>=1.5.0.1',
'PyJWT>=2.1.0',
Expand Down
2 changes: 1 addition & 1 deletion src/azure-cli/requirements.py3.Darwin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ MarkupSafe==1.1.1
msal-extensions==0.3.1
msal==1.16.0
msrest==0.6.21
msrestazure==0.6.3
msrestazure==0.6.4
oauthlib==3.0.1
packaging==21.3
paramiko==2.6.0
Expand Down
2 changes: 1 addition & 1 deletion src/azure-cli/requirements.py3.Linux.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ MarkupSafe==1.1.1
msal-extensions==0.3.1
msal==1.16.0
msrest==0.6.21
msrestazure==0.6.3
msrestazure==0.6.4
oauthlib==3.0.1
packaging==21.3
paramiko==2.6.0
Expand Down
2 changes: 1 addition & 1 deletion src/azure-cli/requirements.py3.windows.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ MarkupSafe==1.1.1
msal-extensions==0.3.1
msal==1.16.0
msrest==0.6.21
msrestazure==0.6.3
msrestazure==0.6.4
oauthlib==3.0.1
packaging==21.3
paramiko==2.6.0
Expand Down