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

Symlink and Performance fix #358

Merged
merged 1 commit into from
Mar 31, 2023
Merged

Symlink and Performance fix #358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 3 additions & 28 deletions ebcli/core/fileoperations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@
import shutil
import stat
import sys
import zipfile
import yaml
import warnings
from pathspec import PathSpec
import yaml
import zipfile

from cement.utils.misc import minimal_logger
from ebcli.objects.buildconfiguration import BuildConfiguration
from pathspec import PathSpec
from six import StringIO
from yaml import safe_load, safe_dump
from yaml.parser import ParserError
Expand Down Expand Up @@ -110,12 +110,6 @@ def _get_option(config, section, key, default):
def is_git_directory_present():
return os.path.isdir('.git')

def is_parent_directory_in_ignore_list(filepath, ignore_list):
for directory in ignore_list:
if os.path.abspath(filepath).startswith(os.path.abspath(directory)):
return True
return False

def clean_up():
cwd = os.getcwd()
try:
Expand Down Expand Up @@ -437,32 +431,13 @@ def _zipdir(path, zipf, ignore_list=None):
if '.elasticbeanstalk' in root:
io.log_info(' -skipping: {}'.format(root))
continue
for d in dirs:
cur_dir = os.path.join(root, d)
if os.path.islink(cur_dir):
# It is probably safe to remove this code since os.walk seems to categorize
# symlinks-to-directories as files. This doesn't matter as far as creation
# of the zip is concerned, but just having the code around is confusing.
zipInfo = zipfile.ZipInfo()
zipInfo.filename = os.path.join(root, d)

# 2716663808L is the "magic code" for symlinks
if sys.version_info > (3,):
zipInfo.external_attr = 2716663808
else:
zipInfo.external_attr = long(2716663808)
if not is_parent_directory_in_ignore_list(cur_dir, ignore_list):
zipf.writestr(zipInfo, os.readlink(cur_dir))
else:
io.log_info(' -skipping: {}'.format(cur_dir))
for f in files:
cur_file = os.path.join(root, f)

if (
cur_file.endswith('~')
or cur_file in ignore_list
or not _validate_file_for_archive(cur_file)
or is_parent_directory_in_ignore_list(cur_file, ignore_list)
):
# Ignore editor backup files (like file.txt~)
# Ignore anything in the .ebignore file
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/core/test_fileoperations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -756,7 +756,7 @@ def test_zip_up_project(self, _validate_file_for_archive_mock):

fileoperations.zip_up_project(
'app.zip',
ignore_list=[os.path.join('src', 'lib', 'ignore-this-file.py'), os.path.join('ignore-me/')]
ignore_list=[os.path.join('src', 'lib', 'ignore-this-file.py'), os.path.join('ignore-me/'), os.path.join('src', 'lib', 'api-copy')]
)

os.mkdir('tmp')
Expand All @@ -765,7 +765,7 @@ def test_zip_up_project(self, _validate_file_for_archive_mock):
self.assertTrue(os.path.exists(os.path.join('tmp', 'src', 'lib', 'app.py')))
self.assertTrue(os.path.exists(os.path.join('tmp', 'src', 'lib', 'api')))
self.assertTrue(os.path.exists(os.path.join('tmp', 'src', 'lib', 'app.py-copy')))
self.assertTrue(os.path.exists(os.path.join('tmp', 'src', 'lib', 'api-copy')))
self.assertFalse(os.path.exists(os.path.join('tmp', 'src', 'lib', 'api-copy')))
self.assertFalse(os.path.exists(os.path.join('tmp', 'src', 'lib', 'app.py~')))
self.assertFalse(os.path.exists(os.path.join('tmp', 'src', 'lib', 'ignore-this-file.py')))
self.assertFalse(os.path.exists(os.path.join('tmp', 'src', 'lib', 'test.sock')))
Expand Down