Skip to content

Fix: Make prodinfo check failure not an error #143

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
ligangty merged 1 commit into from
Mar 8, 2022
Merged

Fix: Make prodinfo check failure not an error #143

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
21 changes: 13 additions & 8 deletions charon/pkgs/npm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,12 +113,12 @@ def handle_npm_uploading(
succeeded = True
for target in targets:
manifest_folder = target[0]
logger.info("Start uploading manifest to s3 bucket %s", manifest_bucket_name)
if not manifest_bucket_name:
logger.warning(
'Warning: No manifest bucket is provided, will ignore the process of manifest '
'uploading\n')
else:
logger.info("Start uploading manifest to s3 bucket %s", manifest_bucket_name)
manifest_name, manifest_full_path = write_manifest(valid_paths, target_dir, product)
client.upload_manifest(
manifest_name, manifest_full_path,
Expand Down Expand Up @@ -216,13 +216,18 @@ def handle_npm_del(
)
logger.info("Files deletion done\n")

manifest_folder = target[0]
logger.info(
"Start deleting manifest from s3 bucket %s",
manifest_bucket_name
)
client.delete_manifest(product, manifest_folder, manifest_bucket_name)
logger.info("Manifest deletion is done\n")
if manifest_bucket_name:
manifest_folder = target[0]
logger.info(
"Start deleting manifest from s3 bucket %s in folder %s",
manifest_bucket_name, manifest_folder
)
client.delete_manifest(product, manifest_folder, manifest_bucket_name)
logger.info("Manifest deletion is done\n")
else:
logger.warning(
'Warning: No manifest bucket is provided, will ignore the process of manifest '
'deletion\n')

logger.info(
"Start generating package.json for package: %s in bucket %s",
Expand Down
22 changes: 9 additions & 13 deletions charon/storage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,12 +203,10 @@ async def path_upload_handler(
failed.append(full_file_path)
return
else:
succeeded = await handle_existed(
await handle_existed(
full_file_path, sha1, main_path_key,
main_bucket_name, main_file_object, failed
main_bucket_name, main_file_object
)
if not succeeded:
return

# do copy:
for target_ in extra_prefixed_buckets:
Expand Down Expand Up @@ -241,12 +239,12 @@ async def path_upload_handler(
else:
await handle_existed(
full_file_path, sha1, extra_path_key,
extra_bucket_name, file_object, failed
extra_bucket_name, file_object
)

async def handle_existed(
file_path, file_sha1, path_key,
bucket_name, file_object, failed_paths
bucket_name, file_object
) -> bool:
logger.debug(
"File %s already exists in bucket %s, check if need to update product.",
Expand All @@ -257,10 +255,9 @@ async def handle_existed(
f_meta[CHECKSUM_META_KEY] if CHECKSUM_META_KEY in f_meta else ""
)
if checksum != "" and checksum.strip() != file_sha1:
logger.warning('Error: checksum check failed. The file %s is '
logger.warning('Warning: checksum check failed. The file %s is '
'different from the one in S3 bucket %s. Product: %s',
path_key, bucket_name, product)
failed_paths.append(file_path)
return False
(prods, no_error) = await self.__run_async(
self.__get_prod_info,
Expand All @@ -277,7 +274,6 @@ async def handle_existed(
path_key, bucket_name, prods
)
if not result:
failed_paths.append(file_path)
return False
return True

Expand Down Expand Up @@ -703,8 +699,8 @@ async def __update_prod_info(
logger.debug("Updated product infomation for file %s", file)
return True
except (ClientError, HTTPClientError) as e:
logger.error("ERROR: Can not update product info for file %s "
"due to error: %s", file, e)
logger.warning("WARNING: Can not update product info for file %s "
"due to error: %s", file, e)
return False
else:
logger.debug("Removing product infomation file for file %s "
Expand All @@ -724,8 +720,8 @@ async def __update_prod_info(
logger.debug("Removed product infomation file for file %s", file)
return True
except (ClientError, HTTPClientError) as e:
logger.error("ERROR: Can not delete product info file for file %s "
"due to error: %s", file, e)
logger.warning("WARNING: Can not delete product info file for file %s "
"due to error: %s", file, e)
return False

def __path_handler_count_wrapper(
Expand Down
10 changes: 7 additions & 3 deletions tests/test_s3client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
limitations under the License.
"""
from typing import List

from boto3_type_annotations import s3
from charon.storage import S3Client, CHECKSUM_META_KEY
from charon.utils.archive import extract_zip_all
Expand Down Expand Up @@ -375,16 +374,21 @@ def test_exists_override_failing(self):
product="apache-commons", root=temp_root
)
self.assertEqual(0, len(failed_paths))
sha1 = read_sha1(all_files[0])
path = all_files[0][len(temp_root) + 1:]

# Change content to make hash changes
with open(all_files[0], "w+", encoding="utf-8") as f:
f.write("changed content")
sha1_changed = read_sha1(all_files[0])
self.assertNotEqual(sha1, sha1_changed)
failed_paths = self.s3_client.upload_files(
all_files, targets=[(MY_BUCKET, None)],
product="apache-commons-2", root=temp_root
)
self.assertEqual(1, len(failed_paths))
self.assertIn(failed_paths[0], all_files[0])
bucket = self.mock_s3.Bucket(MY_BUCKET)
file_obj = bucket.Object(path)
self.assertEqual(sha1, file_obj.metadata[CHECKSUM_META_KEY])

def __prepare_files(self):
test_zip = zipfile.ZipFile(
Expand Down