cloud-governance 1.1.356__py3-none-any.whl → 1.1.358__py3-none-any.whl

cloud_governance/common/clouds/aws/ec2/ec2_operations.py

@@ -346,7 +346,8 @@ class EC2Operations:
         This method returns all images in the region
         @return:
         """
-        return self.ec2_client.describe_images(Owners=['self'], **kwargs)['Images']
+        return self.ec2_client.describe_images(Owners=['self'], IncludeDeprecated=True, IncludeDisabled=True, **kwargs)[
+            'Images']
 
     def get_snapshots(self):
         """
@@ -624,9 +625,12 @@ class EC2Operations:
         active_instances = {}
         active_regions = self.get_active_regions()
         for region_name in active_regions[::-1]:
-            filters = [{'Name': f'tag:{tag_name}', 'Values': [tag_value, tag_value.upper(), tag_value.lower(), tag_value.title()]}]
+            filters = [{'Name': f'tag:{tag_name}',
+                        'Values': [tag_value, tag_value.upper(), tag_value.lower(), tag_value.title()]}]
             self.get_ec2_instance_list()
-            active_instances_in_region = self.get_ec2_instance_list(Filters=filters, ec2_client=boto3.client('ec2', region_name=region_name), ignore_tag=ignore_tag)
+            active_instances_in_region = self.get_ec2_instance_list(Filters=filters, ec2_client=boto3.client('ec2',
+                                                                                                             region_name=region_name),
+                                                                    ignore_tag=ignore_tag)
             if active_instances_in_region:
                 if skip_full_scan:
                     return True
@@ -642,7 +646,8 @@ class EC2Operations:
         :return:
         """
         ignore_tag = 'TicketId'
-        return self.get_active_instances(tag_name=tag_name, tag_value=tag_value, skip_full_scan=True, ignore_tag=ignore_tag)
+        return self.get_active_instances(tag_name=tag_name, tag_value=tag_value, skip_full_scan=True,
+                                         ignore_tag=ignore_tag)
 
     def describe_tags(self, **kwargs):
         """

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloud-governance
-Version: 1.1.356
+Version: 1.1.358
 Summary: Cloud Governance Tool
 Home-page: https://github.com/redhat-performance/cloud-governance
 Author: Red Hat
@@ -25,8 +25,8 @@ Requires-Dist: azure-mgmt-resource==23.0.1
 Requires-Dist: azure-mgmt-compute==30.1.0
 Requires-Dist: azure-mgmt-network==25.0.0
 Requires-Dist: azure-mgmt-monitor==6.0.2
-Requires-Dist: boto3==1.26.4
-Requires-Dist: botocore==1.29.4
+Requires-Dist: boto3==1.33.1
+Requires-Dist: botocore==1.33.8
 Requires-Dist: elasticsearch-dsl==7.4.0
 Requires-Dist: elasticsearch==7.13.4
 Requires-Dist: google-api-python-client==2.57.0

{cloud_governance-1.1.356.dist-info → cloud_governance-1.1.358.dist-info}/RECORD

@@ -49,7 +49,7 @@ cloud_governance/common/clouds/aws/cost_explorer/cost_explorer_operations.py,sha
 cloud_governance/common/clouds/aws/dynamodb/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloud_governance/common/clouds/aws/dynamodb/dynamodb_operations.py,sha256=eeV3YgT2bAMwb3UmQjCGdh3ie3-Q8UvKNv4iOypYwNg,4916
 cloud_governance/common/clouds/aws/ec2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cloud_governance/common/clouds/aws/ec2/ec2_operations.py,sha256=2km09WsFrFWZ1IEyiqER9rF05W4jnfRABb9OwQgEYFI,23990
+cloud_governance/common/clouds/aws/ec2/ec2_operations.py,sha256=wt5gLCe5EFtooaukWRS6QBliCy_1_LDurTs5i1IZH4Y,24291
 cloud_governance/common/clouds/aws/iam/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloud_governance/common/clouds/aws/iam/iam_operations.py,sha256=ngVh19oIse1UjzvUkImYzs3xBFt74LhdUGbOhI58ZMA,4843
 cloud_governance/common/clouds/aws/price/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -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.356.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-cloud_governance-1.1.356.dist-info/METADATA,sha256=mNvoFNdQ_M3Q5wLHAUhE4wmpfqZ_voKMcz_0AeMkiJw,11364
-cloud_governance-1.1.356.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-cloud_governance-1.1.356.dist-info/top_level.txt,sha256=jfB1fgj7jvx3YZkZA4G6hFeS1RHO7J7XtnbjuMNMRww,17
-cloud_governance-1.1.356.dist-info/RECORD,,
+cloud_governance-1.1.358.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+cloud_governance-1.1.358.dist-info/METADATA,sha256=4IwoOBQ0x3OceyOB6oBbAIMSiPewR2EFgRcyasRPQUE,11364
+cloud_governance-1.1.358.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+cloud_governance-1.1.358.dist-info/top_level.txt,sha256=jfB1fgj7jvx3YZkZA4G6hFeS1RHO7J7XtnbjuMNMRww,17
+cloud_governance-1.1.358.dist-info/RECORD,,