cloud-governance 1.1.357__py3-none-any.whl → 1.1.359__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/common/elasticsearch/elasticsearch_operations.py

@@ -27,19 +27,32 @@ class ElasticSearchOperations:
     MIN_SEARCH_RESULTS = 100
     DEFAULT_ES_BULK_LIMIT = 5000
 
-    def __init__(self, es_host: str = None, es_port: str = None, region: str = '', bucket: str = '',
+    def __init__(self,
+                 es_host: str = None,
+                 es_port: str = None,
+                 region: str = '',
+                 es_user: str = None,
+                 es_password: str = None,
+                 bucket: str = '',
                  logs_bucket_key: str = '',
                  timeout: int = 2000):
         self.__environment_variables_dict = environment_variables.environment_variables_dict
         self.__es_host = es_host if es_host else self.__environment_variables_dict.get('es_host')
         self.__es_port = es_port if es_port else self.__environment_variables_dict.get('es_port')
+        self.__es_user = es_user if es_user else self.__environment_variables_dict.get('es_user')
+        self.__es_password = es_password if es_password else self.__environment_variables_dict.get('es_password')
         self.__region = region
         self.__timeout = int(
             self.__environment_variables_dict.get('ES_TIMEOUT')) if self.__environment_variables_dict.get(
             'ES_TIMEOUT') else timeout
         self.__account = self.__environment_variables_dict.get('account')
         try:
-            self.__es = Elasticsearch([{'host': self.__es_host, 'port': self.__es_port}], timeout=self.__timeout,
+            add_host = {'host': self.__es_host, 'port': self.__es_port,
+                        'http_auth': f'{self.__es_user}:{self.__es_password}'}
+            if int(self.__es_port) == 443:
+                add_host['use_ssl'] = True
+            self.__es = Elasticsearch([add_host],
+                                      timeout=self.__timeout,
                                       max_retries=2)
         except Exception as err:
             self.__es = None

cloud_governance/main/environment_variables.py

@@ -184,6 +184,8 @@ class EnvironmentVariables:
         self._environment_variables_dict['upload_data_es'] = EnvironmentVariables.get_env('upload_data_es', '')
         self._environment_variables_dict['es_host'] = EnvironmentVariables.get_env('es_host', '')
         self._environment_variables_dict['es_port'] = EnvironmentVariables.get_env('es_port', '')
+        self._environment_variables_dict['es_user'] = EnvironmentVariables.get_env('es_user', '')
+        self._environment_variables_dict['es_password'] = EnvironmentVariables.get_env('es_password', '')
         self._environment_variables_dict['es_index'] = EnvironmentVariables.get_env('es_index', es_index)
         self._environment_variables_dict['es_doc_type'] = EnvironmentVariables.get_env('es_doc_type', '')
         self._environment_variables_dict['ES_TIMEOUT'] = EnvironmentVariables.get_env('ES_TIMEOUT', 2000)

{cloud_governance-1.1.357.dist-info → cloud_governance-1.1.359.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloud-governance
-Version: 1.1.357
+Version: 1.1.359
 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.357.dist-info → cloud_governance-1.1.359.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
@@ -108,7 +108,7 @@ cloud_governance/common/clouds/ibm/vpc/vpc_infra_operations.py,sha256=W-NgQRwA15
 cloud_governance/common/elasticsearch/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloud_governance/common/elasticsearch/elastic_upload.py,sha256=OGdc6ZQ9L8Fjj8mhVARg1flUQ_SKB7J0HVcFVWt67Q0,2576
 cloud_governance/common/elasticsearch/elasticsearch_exceptions.py,sha256=6rwxbRYv93w7qvVaiSDJnwVgxG1A-kwU8IBzAU8iBmg,485
-cloud_governance/common/elasticsearch/elasticsearch_operations.py,sha256=IQOk0ycdPvXNr4qvl9hT97qo03jUk-CwH7AV6m2R4CI,15934
+cloud_governance/common/elasticsearch/elasticsearch_operations.py,sha256=WsAAjjCh-vX6K25SzQRP-rvPJ59RJ4dAtcXHCtmRUOQ,16529
 cloud_governance/common/elasticsearch/modals/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloud_governance/common/elasticsearch/modals/cost_usage_reports_data.py,sha256=xDxGIxJwhOtSh2VOnYx7XShRF90WPPlaQrfVm3fLQr8,1396
 cloud_governance/common/elasticsearch/modals/policy_es_data.py,sha256=6ydpSP_3e1OgyxM9IucohU8wSl0D2quisbmVlkM6WOA,1436
@@ -143,7 +143,7 @@ cloud_governance/common/utils/configs.py,sha256=8ry4UQT9s_GUivhrCdwS0vOWYN6OJIHD
 cloud_governance/common/utils/json_datetime_encoder.py,sha256=_-jzRTe0UqAKTn2E9qaU8SYIxHUoRA5ElWuVA0Y54Xw,338
 cloud_governance/common/utils/utils.py,sha256=ZUsi4ax2XhDIV-EQ5kJt5Ppd72kmm2psqcg1cNDZrvc,4349
 cloud_governance/main/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cloud_governance/main/environment_variables.py,sha256=5LgGK2QiRJd7Z0Pr7sRODPNmOFUrb_XhNFfWIgaqd0M,28024
+cloud_governance/main/environment_variables.py,sha256=78sP8Mp69Ucv1RVBV6em8VXCk1WswF6MoLmsvlMDEWI,28228
 cloud_governance/main/environment_variables_exceptions.py,sha256=UR0Ith0P0oshsDZdJRlRq8ZUTt0h8jFvUtrnP4m4AIY,437
 cloud_governance/main/es_uploader.py,sha256=6Ify5CS2NtUF1xXZ-rMwpYxVzDKfEZhv2vogWFltt98,10656
 cloud_governance/main/main.py,sha256=ydKIGwRjYAxjpGbqcPGBS14E5fZ1k66y3mpmTUIf1HI,18884
@@ -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.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.359.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+cloud_governance-1.1.359.dist-info/METADATA,sha256=Reuh_6B0aEckOZ7F9hqzbKdYpFYYlExT8jkaAH0Z7gU,11364
+cloud_governance-1.1.359.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
+cloud_governance-1.1.359.dist-info/top_level.txt,sha256=jfB1fgj7jvx3YZkZA4G6hFeS1RHO7J7XtnbjuMNMRww,17
+cloud_governance-1.1.359.dist-info/RECORD,,

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

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