From 1ccab73b651f6022b2fe6121c9ad1099da72e1ac Mon Sep 17 00:00:00 2001 From: Drew Short Date: Mon, 20 Apr 2020 17:55:24 -0500 Subject: [PATCH 1/3] Don't override embedded secrets in config --- .gitignore | 4 +++- acm.py | 4 ---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index bb8b487..1157c04 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,6 @@ +.idea/ + venv/ l_venv/ -acm-config.json \ No newline at end of file +acm-config.json diff --git a/acm.py b/acm.py index ccc3e6f..c9e0105 100755 --- a/acm.py +++ b/acm.py @@ -221,10 +221,6 @@ def load_config(path: str) -> any: with open(path, 'r') as config_file: config = json.load(config_file) - # Setup S3 Settings - config['s3']['access'] = os.getenv('ACM_S3_ACCESS') - config['s3']['secret'] = os.getenv('ACM_S3_SECRET') - # Setup concurrency if 'concurrency' in config: config['concurrency'] = abs(int(config['concurrency'])) From 89c536d1bfea212c7e076d42fb49899586270e35 Mon Sep 17 00:00:00 2001 From: Drew Short Date: Mon, 20 Apr 2020 18:04:05 -0500 Subject: [PATCH 2/3] Added print identity to list --- acm.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/acm.py b/acm.py index c9e0105..f82ff93 100755 --- a/acm.py +++ b/acm.py @@ -277,8 +277,9 @@ def print_config(ctx): @click.option('--sha256sum/--no-sha256sum', default=False) @click.option('--suffix', default=None) @click.option('-x', '--context', required=True) +@click.option('--print-identity/--no-print-identity', default=False) @click.pass_context -def list_files(ctx, context, sha256sum, suffix): +def list_files(ctx, context, sha256sum, suffix, print_identity): ctx.obj['CONTEXT'] = context s3_config = ctx.obj['CONFIG']['s3'] s3_bucket = ctx.obj['CONTEXT'] @@ -311,8 +312,12 @@ def list_files(ctx, context, sha256sum, suffix): stat = s3.stat_object(s3_bucket, obj) sha256sum_value = stat.metadata[get_metadata_name("SHA256SUM")] file = f'{sha256sum_value} {file}' - - found_files.append(file) + else if print_identity: + file_object = s3.get_object(s3_bucket, obj) + stored_data = json.load(file_object) + found_files.append(stored_data['storedAssetIdentity']) + else: + found_files.append(file) print(os.linesep.join(found_files)) From 65694684b15450a7fdf68f12e58b1d02411b9cee Mon Sep 17 00:00:00 2001 From: Drew Short Date: Mon, 20 Apr 2020 18:16:51 -0500 Subject: [PATCH 3/3] Address python else if issue --- acm.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/acm.py b/acm.py index f82ff93..c1363ec 100755 --- a/acm.py +++ b/acm.py @@ -309,10 +309,11 @@ def list_files(ctx, context, sha256sum, suffix, print_identity): file = file.strip() if sha256sum: - stat = s3.stat_object(s3_bucket, obj) - sha256sum_value = stat.metadata[get_metadata_name("SHA256SUM")] + file_object = s3.get_object(s3_bucket, obj) + stored_data = json.load(file_object) + sha256sum_value = stored_data['sha256sum'] file = f'{sha256sum_value} {file}' - else if print_identity: + elif print_identity: file_object = s3.get_object(s3_bucket, obj) stored_data = json.load(file_object) found_files.append(stored_data['storedAssetIdentity'])