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

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

@@ -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 → cloud_governance-1.1.359}/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-1.1.357 → cloud_governance-1.1.359}/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-1.1.357 → cloud_governance-1.1.359}/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 → cloud_governance-1.1.359/cloud_governance.egg-info}/PKG-INFO

@@ -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 → cloud_governance-1.1.359}/cloud_governance.egg-info/requires.txt

@@ -8,8 +8,8 @@ azure-mgmt-resource==23.0.1
 azure-mgmt-compute==30.1.0
 azure-mgmt-network==25.0.0
 azure-mgmt-monitor==6.0.2
-boto3==1.26.4
-botocore==1.29.4
+boto3==1.33.1
+botocore==1.33.8
 elasticsearch-dsl==7.4.0
 elasticsearch==7.13.4
 google-api-python-client==2.57.0

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

@@ -2,7 +2,7 @@ from codecs import open
 from os import path
 from setuptools import setup, find_packages
 
-__version__ = '1.1.357'
+__version__ = '1.1.359'
 
 here = path.abspath(path.dirname(__file__))
 
@@ -48,8 +48,8 @@ setup(
         'azure-mgmt-compute==30.1.0',
         'azure-mgmt-network==25.0.0',
         'azure-mgmt-monitor==6.0.2',
-        'boto3==1.26.4',  # required by c7n 0.9.14
-        'botocore==1.29.4',  # required by c7n 0.9.14
+        'boto3==1.33.1',
+        'botocore==1.33.8',
         'elasticsearch-dsl==7.4.0',
         'elasticsearch==7.13.4',  # opensearch 1.2.4 for elasticsearch
         'google-api-python-client==2.57.0',  # google drive