cloud-governance 1.1.355__tar.gz → 1.1.357__tar.gz

{cloud_governance-1.1.355/cloud_governance.egg-info → cloud_governance-1.1.357}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloud-governance
-Version: 1.1.355
+Version: 1.1.357
 Summary: Cloud Governance Tool
 Home-page: https://github.com/redhat-performance/cloud-governance
 Author: Red Hat

{cloud_governance-1.1.355 → cloud_governance-1.1.357}/cloud_governance/policy/ibm/ibm_cost_report.py

@@ -51,6 +51,8 @@ class IBMCostReport:
             hardware_tags = self.collect_tags_from_machines(
                 tags=self.classic_operations.get_hardware_tags(hardware_id=str(hardware.get('id'))))
             hardware_tags['fqdn'] = hardware.get('fullyQualifiedDomainName').lower()
+            if 'budget' not in hardware_tags:
+                hardware_tags['budget'] = self.__environment_variables_dict.get('account')
             collect_machines_data[hardware_tags['fqdn']] = hardware_tags
         return collect_machines_data
 
@@ -86,7 +88,8 @@ class IBMCostReport:
             if fqdn not in collect_machines_data:
                 user = [user for user in users if user in fqdn]
                 if user:
-                    user_tags = self.ibm_account.get_user_tags_from_gsheet(username=f'{user[0]}@redhat.com', user_email='yes')
+                    user_tags = self.ibm_account.get_user_tags_from_gsheet(username=f'{user[0]}@redhat.com',
+                                                                           user_email='yes')
                     invoice_data[fqdn].update(self.collect_tags_from_machines(user_tags))
         return invoice_data
 
@@ -112,15 +115,17 @@ class IBMCostReport:
         collect_machines_data = self.get_hardware_data()
         collect_machines_data.update(self.get_virtual_machine_data())
         invoice_data = self.get_invoice_data(collect_machines_data=collect_machines_data)
-        cost_invoice_resource_data = self.concatenate_dictionaries(resource_data=collect_machines_data, invoice_data=invoice_data)
+        cost_invoice_resource_data = self.concatenate_dictionaries(resource_data=collect_machines_data,
+                                                                   invoice_data=invoice_data)
         for tag_name in self.owned_tags:
             cost_list_items = []
             for _, data in cost_invoice_resource_data.items():
-                if data[tag_name] != 0 or tag_name == 'budget':
+                if data.get(tag_name) != 0 or tag_name == 'budget':
                     cost_list_items.append({
                         tag_name.capitalize(): data[tag_name],
                         'Cost': data['cost'],
                         'Budget': self._elastic_upload.account
                     })
-            self._elastic_upload.es_upload_data(items=cost_list_items, es_index=f'{self._elastic_upload.es_index}-{tag_name.lower()}')
+            self._elastic_upload.es_upload_data(items=cost_list_items,
+                                                es_index=f'{self._elastic_upload.es_index}-{tag_name.lower()}')
         return True

{cloud_governance-1.1.355 → cloud_governance-1.1.357}/cloud_governance/policy/policy_operations/aws/tag_cluster/tag_cluster_resouces.py

@@ -811,9 +811,13 @@ class TagClusterResources(TagClusterOperations):
                     for bucket in response['Buckets']:
                         # starts with cluster name
                         if bucket['Name'].startswith(cluster_key):
-                            bucket_tags = self.s3_client.get_bucket_tagging(Bucket=bucket.get('Name'))
+                            try:
+                                bucket_tags = self.s3_client.get_bucket_tagging(Bucket=bucket.get('Name'))
+                            except Exception as err:
+                                logger.info(err)
+                                bucket_tags = {}
                             if bucket_tags:
-                                bucket_tags = bucket_tags['TagSet']
+                                bucket_tags = bucket_tags.get('TagSet')
                                 # search that not exist permanent tags in the resource
                                 if not self.__validate_existing_tag(bucket_tags):
                                     add_tags = []

{cloud_governance-1.1.355 → cloud_governance-1.1.357}/cloud_governance/policy/policy_runners/aws/upload_s3.py

@@ -23,6 +23,9 @@ class UploadS3(AbstractUpload):
         """
         if self._policy_output:
             data = json.dumps(data, cls=JsonDateTimeEncoder)
-            self._s3operations.save_results_to_s3(policy=self._policy.replace('_', '-'),
-                                                  policy_output=self._policy_output, policy_result=data)
-            logger.info(f"Uploaded the data s3 Bucket: {self._policy_output}")
+            try:
+                self._s3operations.save_results_to_s3(policy=self._policy.replace('_', '-'),
+                                                      policy_output=self._policy_output, policy_result=data)
+                logger.info(f"Uploaded the data s3 Bucket: {self._policy_output}")
+            except Exception as err:
+                logger.error(f"Exection raised on uploading to s3, {err}")

{cloud_governance-1.1.355 → cloud_governance-1.1.357/cloud_governance.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloud-governance
-Version: 1.1.355
+Version: 1.1.357
 Summary: Cloud Governance Tool
 Home-page: https://github.com/redhat-performance/cloud-governance
 Author: Red Hat

{cloud_governance-1.1.355 → cloud_governance-1.1.357}/setup.py

@@ -2,7 +2,7 @@ from codecs import open
 from os import path
 from setuptools import setup, find_packages
 
-__version__ = '1.1.355'
+__version__ = '1.1.357'
 
 here = path.abspath(path.dirname(__file__))