From 0edf4ffde6ccee3d8c5e8dfc67dd2aff0956dd91 Mon Sep 17 00:00:00 2001 From: Luke Couzens Date: Tue, 14 Nov 2023 14:12:03 +0000 Subject: [PATCH 1/2] fix set vs list ordering bug --- nise/__init__.py | 2 +- nise/report.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/nise/__init__.py b/nise/__init__.py index dc6124e0..d7701f93 100644 --- a/nise/__init__.py +++ b/nise/__init__.py @@ -1,3 +1,3 @@ -__version__ = "4.4.7" +__version__ = "4.4.8" VERSION = __version__.split(".") diff --git a/nise/report.py b/nise/report.py index cb69005a..d14e7462 100644 --- a/nise/report.py +++ b/nise/report.py @@ -1020,6 +1020,7 @@ def write_gcp_file(start_date, end_date, data, options): if options.get("gcp_resource_level", False): columns += GCP_RESOURCE_COLUMNS _write_csv(local_file_path, data, columns) + LOG.info(local_file_path) return local_file_path, output_file_name @@ -1146,7 +1147,7 @@ def gcp_create_report(options): # noqa: C901 ) else: months = _create_month_list(start_date, end_date) - monthly_files = set() + monthly_files = [] output_files = [] for month in months: data = [] @@ -1180,7 +1181,7 @@ def gcp_create_report(options): # noqa: C901 local_file_path, output_file_name = write_gcp_file(gen_start_date, gen_end_date, data, options) output_files.append(output_file_name) - monthly_files.update([local_file_path]) + monthly_files.append(local_file_path) for index, month_file in enumerate(monthly_files): if gcp_bucket_name: From 974f9f95cddac88a2a88623f25f91459ab21c63d Mon Sep 17 00:00:00 2001 From: Luke Couzens Date: Tue, 14 Nov 2023 14:13:05 +0000 Subject: [PATCH 2/2] Update report.py --- nise/report.py | 1 - 1 file changed, 1 deletion(-) diff --git a/nise/report.py b/nise/report.py index d14e7462..12ad527f 100644 --- a/nise/report.py +++ b/nise/report.py @@ -1020,7 +1020,6 @@ def write_gcp_file(start_date, end_date, data, options): if options.get("gcp_resource_level", False): columns += GCP_RESOURCE_COLUMNS _write_csv(local_file_path, data, columns) - LOG.info(local_file_path) return local_file_path, output_file_name