From dae242d593335f67e843e9d89aed7fb88dedd17f Mon Sep 17 00:00:00 2001 From: Devesh Doshi Date: Fri, 11 Sep 2020 13:02:58 +0530 Subject: [PATCH 01/10] Add short name field --- blambda/utils/lambda_manifest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blambda/utils/lambda_manifest.py b/blambda/utils/lambda_manifest.py index 31f5e72..6f34a8b 100644 --- a/blambda/utils/lambda_manifest.py +++ b/blambda/utils/lambda_manifest.py @@ -149,7 +149,7 @@ def source_files(self, dest_dir: Path = None): dst = dest_dir / dst_pattern if '*' in dst.name: - dst = dst.parent / src.name + dst = dst.parent / self.short_name / src.name yield src, dst else: From 7a52fb0ebb937e71ef40e585a6dc976c3445f81f Mon Sep 17 00:00:00 2001 From: Devesh Doshi Date: Fri, 11 Sep 2020 14:33:07 +0530 Subject: [PATCH 02/10] MInor changes --- blambda/utils/lambda_manifest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blambda/utils/lambda_manifest.py b/blambda/utils/lambda_manifest.py index 6f34a8b..36513b0 100644 --- a/blambda/utils/lambda_manifest.py +++ b/blambda/utils/lambda_manifest.py @@ -146,7 +146,7 @@ def source_files(self, dest_dir: Path = None): for src in src_paths: src = (self.basedir / src).resolve() - dst = dest_dir / dst_pattern + dst = dest_dir / self.short_name / dst_pattern if '*' in dst.name: dst = dst.parent / self.short_name / src.name From 055b5e76a556d587de06b06750142df12a23ca75 Mon Sep 17 00:00:00 2001 From: Devesh Doshi Date: Fri, 11 Sep 2020 14:45:36 +0530 Subject: [PATCH 03/10] Changes in deploy.py --- blambda/deploy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blambda/deploy.py b/blambda/deploy.py index 516de0f..c8aefdb 100644 --- a/blambda/deploy.py +++ b/blambda/deploy.py @@ -104,7 +104,7 @@ def copy_source_files(manifest, tmpdir: Path): dst.parent.mkdir(parents=True, exist_ok=True) if src.suffix == ".coffee": - coffee_compile(coffee_file=src, target_dir=dst.parent, npm_bin_dir=npm_bin_dir) + coffee_compile(coffee_file=src, target_dir=dst, npm_bin_dir=npm_bin_dir) else: shutil.copyfile(str(src), str(dst)) From 67fa6dc3d120ed5bde3358bb3c7ed1fed2d6739c Mon Sep 17 00:00:00 2001 From: Devesh Doshi Date: Fri, 11 Sep 2020 14:49:24 +0530 Subject: [PATCH 04/10] revert all changes --- blambda/deploy.py | 2 +- blambda/utils/lambda_manifest.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/blambda/deploy.py b/blambda/deploy.py index c8aefdb..516de0f 100644 --- a/blambda/deploy.py +++ b/blambda/deploy.py @@ -104,7 +104,7 @@ def copy_source_files(manifest, tmpdir: Path): dst.parent.mkdir(parents=True, exist_ok=True) if src.suffix == ".coffee": - coffee_compile(coffee_file=src, target_dir=dst, npm_bin_dir=npm_bin_dir) + coffee_compile(coffee_file=src, target_dir=dst.parent, npm_bin_dir=npm_bin_dir) else: shutil.copyfile(str(src), str(dst)) diff --git a/blambda/utils/lambda_manifest.py b/blambda/utils/lambda_manifest.py index 36513b0..31f5e72 100644 --- a/blambda/utils/lambda_manifest.py +++ b/blambda/utils/lambda_manifest.py @@ -146,10 +146,10 @@ def source_files(self, dest_dir: Path = None): for src in src_paths: src = (self.basedir / src).resolve() - dst = dest_dir / self.short_name / dst_pattern + dst = dest_dir / dst_pattern if '*' in dst.name: - dst = dst.parent / self.short_name / src.name + dst = dst.parent / src.name yield src, dst else: From 8e7a98195bcaf4032be8f15a46156bdbe2eaeb2f Mon Sep 17 00:00:00 2001 From: Devesh Doshi Date: Fri, 11 Sep 2020 15:03:22 +0530 Subject: [PATCH 05/10] minor changes --- blambda/utils/lambda_manifest.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/blambda/utils/lambda_manifest.py b/blambda/utils/lambda_manifest.py index 31f5e72..592e587 100644 --- a/blambda/utils/lambda_manifest.py +++ b/blambda/utils/lambda_manifest.py @@ -146,12 +146,12 @@ def source_files(self, dest_dir: Path = None): for src in src_paths: src = (self.basedir / src).resolve() - dst = dest_dir / dst_pattern + dst = dest_dir / self.short_name / dst_pattern if '*' in dst.name: - dst = dst.parent / src.name + dst = dst.parent / self.short_name / src.name - yield src, dst + yield src, dest_dir / self.short_name / dst_pattern else: if dest_dir != self.basedir: src = (self.basedir / source_spec).resolve() From 29fd124b5f5281726d90fa2c04fba444eaf216f9 Mon Sep 17 00:00:00 2001 From: Devesh Doshi Date: Fri, 11 Sep 2020 15:20:20 +0530 Subject: [PATCH 06/10] change in else portion --- blambda/utils/lambda_manifest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/blambda/utils/lambda_manifest.py b/blambda/utils/lambda_manifest.py index 592e587..91a0878 100644 --- a/blambda/utils/lambda_manifest.py +++ b/blambda/utils/lambda_manifest.py @@ -151,12 +151,12 @@ def source_files(self, dest_dir: Path = None): if '*' in dst.name: dst = dst.parent / self.short_name / src.name - yield src, dest_dir / self.short_name / dst_pattern + yield src, dst else: if dest_dir != self.basedir: src = (self.basedir / source_spec).resolve() if src.suffix == '.coffee' or src.suffix == '.js': - yield src, dest_dir / self.short_name / source_spec + yield src, dest_dir / source_spec else: yield src, dest_dir / source_spec From 2c394eb9cab5f69f7ab0a2b0441680b7071d8a17 Mon Sep 17 00:00:00 2001 From: Devesh Doshi Date: Fri, 11 Sep 2020 16:19:10 +0530 Subject: [PATCH 07/10] add short_name in if condition --- blambda/utils/lambda_manifest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/blambda/utils/lambda_manifest.py b/blambda/utils/lambda_manifest.py index 91a0878..6f34a8b 100644 --- a/blambda/utils/lambda_manifest.py +++ b/blambda/utils/lambda_manifest.py @@ -146,7 +146,7 @@ def source_files(self, dest_dir: Path = None): for src in src_paths: src = (self.basedir / src).resolve() - dst = dest_dir / self.short_name / dst_pattern + dst = dest_dir / dst_pattern if '*' in dst.name: dst = dst.parent / self.short_name / src.name @@ -156,7 +156,7 @@ def source_files(self, dest_dir: Path = None): if dest_dir != self.basedir: src = (self.basedir / source_spec).resolve() if src.suffix == '.coffee' or src.suffix == '.js': - yield src, dest_dir / source_spec + yield src, dest_dir / self.short_name / source_spec else: yield src, dest_dir / source_spec From 40031e2df12055a017037ab06657d6f9519fd1e8 Mon Sep 17 00:00:00 2001 From: Devesh Doshi Date: Fri, 11 Sep 2020 16:41:49 +0530 Subject: [PATCH 08/10] Add short_name outside if statement --- blambda/utils/lambda_manifest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/blambda/utils/lambda_manifest.py b/blambda/utils/lambda_manifest.py index 6f34a8b..cfdb6bd 100644 --- a/blambda/utils/lambda_manifest.py +++ b/blambda/utils/lambda_manifest.py @@ -146,10 +146,10 @@ def source_files(self, dest_dir: Path = None): for src in src_paths: src = (self.basedir / src).resolve() - dst = dest_dir / dst_pattern + dst = dest_dir / self.short_name / dst_pattern if '*' in dst.name: - dst = dst.parent / self.short_name / src.name + dst = dst.parent / src.name yield src, dst else: From 3a4734e745946fc1372aa639cc8ab596fa668a9c Mon Sep 17 00:00:00 2001 From: Mitali Patel Date: Tue, 22 Nov 2022 13:21:05 +0530 Subject: [PATCH 09/10] ENG-676 : node16 deployment fixes --- blambda/utils/lambda_manifest.py | 9 ++++++--- setup.py | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/blambda/utils/lambda_manifest.py b/blambda/utils/lambda_manifest.py index cfdb6bd..8e180ec 100644 --- a/blambda/utils/lambda_manifest.py +++ b/blambda/utils/lambda_manifest.py @@ -197,18 +197,21 @@ def process_manifest(self, clean=False, prod=False): tempdir = tempfile.mkdtemp() node_modules = Path(tempdir) / "node_modules" - node_modules.symlink_to(self.node_dir) + # node_modules.symlink_to(self.node_dir) + os.system(f"ln -s {node_modules} {self.node_dir}") if clean and self.node_dir.exists(): shutil.rmtree(self.node_dir) - self.node_dir.mkdir(exist_ok=True) + # self.node_dir.mkdir(exist_ok=True) # install node dependencies 1 at a time to avoid race condition issues for dependency, version in deps_to_install.items(): spawn(f"npm install {dependency}@{version}", show=True, working_directory=tempdir) - shutil.rmtree(tempdir) + # Commenting below line because symlink is created to temp directory and + # While deploying lambda it is trying to copy content from symlinked dir. + # shutil.rmtree(tempdir) else: raise RuntimeError("Unknown runtime: " + self.runtime) diff --git a/setup.py b/setup.py index d75d977..e133e48 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ author='Balihoo Developers', author_email='devall@balihoo.com', license='MIT', - url='git@github.com:balihoo/fulfillment-lambda-functions.git', + url='git+https://github.com/balihoo/fulfillment-lambda-functions.git', install_requires=['boto3', 'python-dateutil', 'requests', 'termcolor', 'lxml', 'beautifulsoup4'], packages=find_packages(exclude=['tests']), include_package_data=True, From 781a83d38fa3814edc76d0167175ff3572ddcf82 Mon Sep 17 00:00:00 2001 From: Mitali Patel Date: Thu, 8 Aug 2024 15:36:18 +0530 Subject: [PATCH 10/10] increased timeout --- blambda/deploy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blambda/deploy.py b/blambda/deploy.py index 516de0f..9d6f27b 100644 --- a/blambda/deploy.py +++ b/blambda/deploy.py @@ -287,7 +287,7 @@ def publish(name, role, zipfile, options, dryrun): ZipFile=file_bytes ) - time.sleep(5) + time.sleep(15) cprint("Updating lambda function configuration", 'yellow') response = client.update_function_configuration(