From 43362e2be6848b9c2b06f4a60d35f7e520196a55 Mon Sep 17 00:00:00 2001 From: Thirumalesh Aaraveti <97395760+athiruma@users.noreply.github.com> Date: Wed, 29 Nov 2023 14:04:59 +0530 Subject: [PATCH 1/2] Removed the spot_savings_analysis policy daily policy runner (#696) --- .../aws/zombie_non_cluster/run_zombie_non_cluster_policies.py | 2 ++ jenkins/clouds/aws/daily/policies/run_policies.py | 1 + 2 files changed, 3 insertions(+) diff --git a/cloud_governance/policy/policy_operations/aws/zombie_non_cluster/run_zombie_non_cluster_policies.py b/cloud_governance/policy/policy_operations/aws/zombie_non_cluster/run_zombie_non_cluster_policies.py index 7cc51e5c6..c1458aeca 100644 --- a/cloud_governance/policy/policy_operations/aws/zombie_non_cluster/run_zombie_non_cluster_policies.py +++ b/cloud_governance/policy/policy_operations/aws/zombie_non_cluster/run_zombie_non_cluster_policies.py @@ -336,6 +336,8 @@ def _organise_instance_data(self, resources: list): for attachment in volume.get('Attachments'): attachment['AttachTime'] = attachment['AttachTime'].strftime("%Y-%m-%dT%H:%M:%S+00:00") volume['CreateTime'] = volume['CreateTime'].strftime("%Y-%m-%dT%H:%M:%S+00:00") + if 'Tags' in volume: + del volume['Tags'] organize_data.append(volume) return organize_data diff --git a/jenkins/clouds/aws/daily/policies/run_policies.py b/jenkins/clouds/aws/daily/policies/run_policies.py index 0bf230453..04d74ed5e 100644 --- a/jenkins/clouds/aws/daily/policies/run_policies.py +++ b/jenkins/clouds/aws/daily/policies/run_policies.py @@ -56,6 +56,7 @@ def get_policies(type: str = None): policies.remove('monthly_report') policies.remove('cost_billing_reports') policies.remove('cost_explorer_payer_billings') +policies.remove('spot_savings_analysis') for region in regions: for policy in policies: From f0e59968978b920797bfb2c6ccf20f7227eead73 Mon Sep 17 00:00:00 2001 From: ebattat Date: Wed, 29 Nov 2023 09:08:54 +0000 Subject: [PATCH 2/2] bump version to exist version v1.1.177 --- .bumpversion.cfg | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index fdb252e33..09b91e764 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,7 +1,7 @@ [bumpversion] commit = False tag = True -current_version = 1.1.177 +current_version = 1.1.178 tag_name = v{current_version} message = GitHub Actions Build {current_version} diff --git a/setup.py b/setup.py index 4cfb116f2..ef9d5241a 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from os import path from setuptools import setup, find_packages -__version__ = '1.1.177' +__version__ = '1.1.178' here = path.abspath(path.dirname(__file__))