cloud-governance 1.1.355__py3-none-any.whl → 1.1.357__py3-none-any.whl

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/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/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.dist-info → cloud_governance-1.1.357.dist-info}/METADATA

@@ -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.dist-info → cloud_governance-1.1.357.dist-info}/RECORD

@@ -200,7 +200,7 @@ cloud_governance/policy/ibm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMp
 cloud_governance/policy/ibm/cost_billing_reports.py,sha256=3qQlgugtBQGw_W3PhrsQCehi4r4o1QPr6G50ZWGATnE,4118
 cloud_governance/policy/ibm/cost_usage_reports.py,sha256=UoiGugo9wCtoEKBWd-a4hbkbFhfWOf5BgM8Z6VkWnNU,2298
 cloud_governance/policy/ibm/ibm_cost_over_usage.py,sha256=C9ZkpMjRao9FQ2iZSXFdXqGxctBZVoLe-JXEupqIJ10,3595
-cloud_governance/policy/ibm/ibm_cost_report.py,sha256=3DbC_Os_vy-V4dD7i63JvWvd25dXgZa7oJHQIHETrec,5385
+cloud_governance/policy/ibm/ibm_cost_report.py,sha256=xv-TX4eDgnTt5EM_iCLrUwj5hXRmHrsCfE6bs-bSlIo,5716
 cloud_governance/policy/ibm/tag_baremetal.py,sha256=7vVh3t4mqs_RDEzSwUS1E2xQzHnwJYPs3lGn5V7d3RU,5329
 cloud_governance/policy/ibm/tag_resources.py,sha256=g0ypZuKsQrJxscWDmcCdXHm9AS2fpMWsqpMCorF_Tdc,6324
 cloud_governance/policy/ibm/tag_vm.py,sha256=G3QLYwuB2cWSHAsoR40BHVBV5nmGVcVzLtJLmM3MenA,4836
@@ -215,7 +215,7 @@ cloud_governance/policy/policy_operations/aws/tag_cluster/__init__.py,sha256=47D
 cloud_governance/policy/policy_operations/aws/tag_cluster/remove_cluster_tags.py,sha256=uNaDEvF4r8d9gcFpR29WbbWC5ezQSbtrNwe-_rSuemc,25603
 cloud_governance/policy/policy_operations/aws/tag_cluster/run_tag_cluster_resouces.py,sha256=3FF70eXrGkqRC1uZ-XaAfoydq5kViw6d_Aplv3G2GPw,5114
 cloud_governance/policy/policy_operations/aws/tag_cluster/tag_cluster_operations.py,sha256=uivH-ZBNS9eXId9EhSk8BVVx5tx5lTX6JZCoPuM6Jx0,3862
-cloud_governance/policy/policy_operations/aws/tag_cluster/tag_cluster_resouces.py,sha256=rUd_ukxMhM_CLdugoYNS6_831KQBPw5FS5HckqfK-ps,44188
+cloud_governance/policy/policy_operations/aws/tag_cluster/tag_cluster_resouces.py,sha256=NrQcdeDqcSiRWnQMuZXu1XdoySLuoDuBSnn8XHOSxJg,44380
 cloud_governance/policy/policy_operations/aws/tag_non_cluster/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloud_governance/policy/policy_operations/aws/tag_non_cluster/non_cluster_operations.py,sha256=PUWS0SE7T56BejBa3FRUK-txq70gVHztNAj1JmB-Ra0,9497
 cloud_governance/policy/policy_operations/aws/tag_non_cluster/remove_non_cluster_tags.py,sha256=d-RKpWSaZi2ALQaA9_MwqxHwzbSpsdyjQTBacJVoOLw,8362
@@ -253,7 +253,7 @@ cloud_governance/policy/policy_runners/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JC
 cloud_governance/policy/policy_runners/common_policy_runner.py,sha256=p3CYga0q3PqdiEu4SEnM6UnDd1bwtBPEsLFnw8U4BPY,1174
 cloud_governance/policy/policy_runners/aws/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloud_governance/policy/policy_runners/aws/policy_runner.py,sha256=biDRpgtBgXakdBeFloZngmtOzc1dZmtqyDtYw5spvvI,1858
-cloud_governance/policy/policy_runners/aws/upload_s3.py,sha256=01y1BiBhDcpqC7PpYMC5JtEDY166RnyIIjF_Pz2vTbc,1054
+cloud_governance/policy/policy_runners/aws/upload_s3.py,sha256=myw36EEnufq0df4biunQh5kI-b77P5aTqI1WcNA-TKM,1195
 cloud_governance/policy/policy_runners/azure/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloud_governance/policy/policy_runners/azure/policy_runner.py,sha256=5jGuVuFZFzn2V9zuviZ3TJS3xNwVuy2B0Cb2hnWhzxI,975
 cloud_governance/policy/policy_runners/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -263,8 +263,8 @@ cloud_governance/policy/policy_runners/elasticsearch/__init__.py,sha256=47DEQpj8
 cloud_governance/policy/policy_runners/elasticsearch/upload_elastic_search.py,sha256=pOwUJWXjJbyTy8iv3Ap8xJGnqQe-5lZgoR8-vGfAVos,1881
 cloud_governance/policy/policy_runners/ibm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloud_governance/policy/policy_runners/ibm/policy_runner.py,sha256=V0E_f7F3hXit0aSq4BlfX1Jd4vjR2NEvOWsJ5upvZ4o,1302
-cloud_governance-1.1.355.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-cloud_governance-1.1.355.dist-info/METADATA,sha256=-gNmzHnA6GTcCPgADOqlBJX8SFkBeX_5C9tpkFUEBYE,11364
-cloud_governance-1.1.355.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-cloud_governance-1.1.355.dist-info/top_level.txt,sha256=jfB1fgj7jvx3YZkZA4G6hFeS1RHO7J7XtnbjuMNMRww,17
-cloud_governance-1.1.355.dist-info/RECORD,,
+cloud_governance-1.1.357.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+cloud_governance-1.1.357.dist-info/METADATA,sha256=usz6LlExIPvmpIG16VhTuw4WsCUNgRkUhK6BzJ4ieXs,11364
+cloud_governance-1.1.357.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+cloud_governance-1.1.357.dist-info/top_level.txt,sha256=jfB1fgj7jvx3YZkZA4G6hFeS1RHO7J7XtnbjuMNMRww,17
+cloud_governance-1.1.357.dist-info/RECORD,,

{cloud_governance-1.1.355.dist-info → cloud_governance-1.1.357.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (77.0.3)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any