Skip to content
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

Jump to bottom

[Storage] Fix #27590: az storage fs directory download: Check user sytem PATH for azcopy and use CLI config directory for new install #27593

Merged
merged 8 commits into from
Oct 19, 2023
Merged

[Storage] Fix #27590: az storage fs directory download: Check user sytem PATH for azcopy and use CLI config directory for new install #27593

Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
84bcf7f
check system path for azcopy as well
calvinhzy Oct 13, 2023
a3c3a7e
use exception
calvinhzy Oct 16, 2023
91f305d
a better solution suggested by @jakevc is to have a more unique insta…
calvinhzy Oct 17, 2023
219a85e
lint
calvinhzy Oct 17, 2023
e0bedef
lint
calvinhzy Oct 17, 2023
d5399c7
check system PATH for existing azcopy and check if the version is new…
calvinhzy Oct 18, 2023
35bb69e
use broad except to cover other cases, add back check for cli-install…
calvinhzy Oct 18, 2023
b874928
fix
calvinhzy Oct 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
31 changes: 23 additions & 8 deletions src/azure-cli/azure/cli/command_modules/storage/azcopy/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
from urllib.parse import urlparse
from urllib.request import urlopen
from azure.cli.core._profile import Profile
from azure.cli.core.api import get_config_dir
from knack.log import get_logger
from knack.util import CLIError

Expand All @@ -30,10 +31,26 @@ class AzCopy:
def __init__(self, creds=None):
self.system = platform.system()
install_location = _get_default_install_location()
self.executable = install_location
self.executable = None
if os.path.isfile(install_location):
self.executable = install_location
else:
try:
import re
from packaging.version import parse as parse_version
args = ["azcopy", "--version"]
out_bytes = subprocess.check_output(args)
out_text = out_bytes.decode('utf-8')
version = re.findall(r"azcopy version (.+?)\n", out_text)[0]
if parse_version(version) >= parse_version(AZCOPY_VERSION):
self.executable = "azcopy"
except FileNotFoundError:
calvinhzy marked this conversation as resolved.
Show resolved Hide resolved
pass
self.creds = creds
if not os.path.isfile(install_location) or self.check_version() != AZCOPY_VERSION:
calvinhzy marked this conversation as resolved.
Show resolved Hide resolved
if not self.executable:
logger.warning("Azcopy not found, installing at %s", install_location)
self.install_azcopy(install_location)
self.executable = install_location

def install_azcopy(self, install_location):
install_dir = os.path.dirname(install_location)
Expand Down Expand Up @@ -182,14 +199,12 @@ def _generate_sas_token(cmd, account_name, account_key, service, resource_types=

def _get_default_install_location():
system = platform.system()
_config_dir = get_config_dir()
_azcopy_installation_dir = os.path.join(_config_dir, "bin")
if system == 'Windows':
home_dir = os.environ.get('USERPROFILE')
if not home_dir:
raise CLIError('In the Windows platform, please specify the environment variable "USERPROFILE" '
'as the installation location.')
install_location = os.path.join(home_dir, r'.azcopy\azcopy.exe')
install_location = os.path.join(_azcopy_installation_dir, 'azcopy.exe')
elif system in ('Linux', 'Darwin'):
install_location = os.path.expanduser(os.path.join('~', 'bin/azcopy'))
install_location = os.path.join(_azcopy_installation_dir, 'azcopy')
else:
raise CLIError('The {} platform is not currently supported. If you want to know which platforms are supported, '
'please refer to the document for supported platforms: '
Expand Down