cloud-governance 1.1.374__py3-none-any.whl → 1.1.376__py3-none-any.whl

cloud_governance/main/environment_variables.py

@@ -408,6 +408,7 @@ class EnvironmentVariables:
 
 
 environment_variables = EnvironmentVariables()
+
 # env vars examples
 # os.environ['AWS_DEFAULT_REGION'] = 'us-east-2'
 # os.environ['AWS_DEFAULT_REGION'] = 'all'

cloud_governance/policy/aws/zombie_cluster_resource.py

@@ -983,5 +983,5 @@ class ZombieClusterResources(ZombieClusterCommonMethods):
 
         return zombies, cluster_left_out_days
 
-# zombie_cluster_resources = ZombieClusterResources(cluster_prefix='kubernetes.io/cluster/', delete=False, region='us-east-2')
+# zombie_cluster_resources = ZombieClusterResources(cluster_prefix=["kubernetes.io/cluster", "sigs.k8s.io/cluster-api-provider-aws/cluster"], delete=False, region='us-east-2')
 # print(zombie_cluster_resources.zombie_cluster_subnet())

cloud_governance/policy/policy_operations/aws/tag_cluster/run_tag_cluster_resouces.py

@@ -15,7 +15,7 @@ def tag_cluster_resource(cluster_name: str = '', mandatory_tags: dict = None, re
     else:
         action = 'read'
         dry_run = 'yes'
-    tag_cluster_resources = TagClusterResources(cluster_prefix='kubernetes.io/cluster/', cluster_name=cluster_name,
+    tag_cluster_resources = TagClusterResources(cluster_prefix=["kubernetes.io/cluster", "sigs.k8s.io/cluster-api-provider-aws/cluster"], cluster_name=cluster_name,
                                                 input_tags=mandatory_tags, region=region, dry_run=dry_run, cluster_only=cluster_only)
 
     func_resource_list = [tag_cluster_resources.cluster_instance,

cloud_governance/policy/policy_operations/aws/tag_cluster/tag_cluster_resouces.py

@@ -16,7 +16,7 @@ class TagClusterResources(TagClusterOperations):
     SHORT_ID = 5
     NA_VALUE = 'NA'
 
-    def __init__(self, cluster_name: str = None, cluster_prefix: str = None, input_tags: dict = None,
+    def __init__(self, cluster_name: str = None, cluster_prefix: list = None, input_tags: dict = None,
                  region: str = 'us-east-2', dry_run: str = 'yes', cluster_only: bool = False):
         super().__init__(cluster_name=cluster_name, cluster_prefix=cluster_prefix, input_tags=input_tags, region=region,
                          dry_run=dry_run, cluster_only=cluster_only)
@@ -63,7 +63,7 @@ class TagClusterResources(TagClusterOperations):
                 if tag.get('Key') == 'api.openshift.com/name':
                     cluster_name = tag['Value']
                 else:
-                    if not cluster_name and self.cluster_prefix in tag.get('Key'):
+                    if not cluster_name and any(prefix in tag.get('Key', '') for prefix in self.cluster_prefix):
                         cluster_name = tag['Key']
             if cluster_name:
                 # cluster_name = cluster_id
@@ -85,7 +85,7 @@ class TagClusterResources(TagClusterOperations):
                 found = True
                 break
         for tag in tags:
-            if self.cluster_prefix in tag.get('Key'):
+            if any(prefix in tag.get('Key', '') for prefix in self.cluster_prefix):
                 cluster_name = tag['Key']
                 break
         if not found:
@@ -106,8 +106,8 @@ class TagClusterResources(TagClusterOperations):
                 for item in instance:
                     if item.get('Tags'):
                         for tag in item.get('Tags'):
-                            if self.cluster_prefix in tag.get('Key'):
-                                if tag.get('Key') == cluster_name:
+                            if any(prefix in tag.get('Key', '') for prefix in self.cluster_prefix):
+                                if cluster_name in tag.get('Key'):
                                     i_tags = [instance_tag for instance_tag in item.get('Tags') if
                                               instance_tag.get('Key') != 'Name']
                                     return [i_tag for i_tag in i_tags if i_tag.get('Key') != cluster_name]
@@ -149,7 +149,7 @@ class TagClusterResources(TagClusterOperations):
                 # search that not exist permanent tags in the resource
                 if not self.__validate_existing_tag(resource.get(tags)):
                     for tag in resource[tags]:
-                        if self.cluster_prefix in tag.get('Key'):
+                        if any(prefix in tag.get('Key', '') for prefix in self.cluster_prefix):
                             if tag.get('Key') not in cluster_tags:
                                 cluster_tags[tag.get('Key')] = []
                                 cluster_ids[tag.get('Key')] = []
@@ -195,7 +195,7 @@ class TagClusterResources(TagClusterOperations):
                         all_tags.extend(vpc_data.get(vpc_id))
                         all_tags = self.__check_name_in_tags(tags=all_tags, resource_id=resource_id)
                         all_tags = self.__filter_resource_tags_by_add_tags(resource.get('Tags'), all_tags)
-                        cluster_tag = [tag for tag in vpc_data.get(vpc_id) if self.cluster_prefix in tag.get('Key')]
+                        cluster_tag = [tag for tag in vpc_data.get(vpc_id, []) if any(prefix in tag.get('Key', '') for prefix in self.cluster_prefix)]
                         if all_tags:
                             if self.cluster_name:
                                 if self.cluster_name in cluster_tag[0].get('Key'):
@@ -224,7 +224,7 @@ class TagClusterResources(TagClusterOperations):
             for resource in resources_list:
                 if resource.get(tags):
                     for tag in resource[tags]:
-                        if tag['Key'].startswith(f'{self.cluster_prefix}{self.cluster_name}'):
+                        if any(tag['Key'].startswith(f"{prefix}/{self.cluster_name}") for prefix in self.cluster_prefix):
                             return tag['Key']
         return ''
 
@@ -284,7 +284,7 @@ class TagClusterResources(TagClusterOperations):
                     # search that not exist permanent tags in the resource
                     if not self.__validate_existing_tag(tags):
                         for tag in tags:
-                            if self.cluster_prefix in tag.get('Key'):
+                            if any(prefix in tag.get('Key', '') for prefix in self.cluster_prefix):
                                 add_tags = self.__append_input_tags()
                                 add_tags.append(tag)
                                 cluster_name = tag.get('Key').split('/')[-1]
@@ -472,7 +472,7 @@ class TagClusterResources(TagClusterOperations):
                 if item.get('Tags'):
                     if not self.__validate_existing_tag(item.get('Tags')):
                         for tag in item['Tags']:
-                            if self.cluster_prefix in tag.get('Key'):
+                            if any(prefix in tag.get('Key', '') for prefix in self.cluster_prefix):
                                 all_tags = []
                                 instance_tags = self.__get_cluster_tags_by_instance_cluster(cluster_name=tag.get('Key'))
                                 if not instance_tags:
@@ -520,7 +520,7 @@ class TagClusterResources(TagClusterOperations):
                 if item.get('Tags'):
                     if not self.__validate_existing_tag(item.get('Tags')):
                         for tag in item['Tags']:
-                            if self.cluster_prefix in tag.get('Key'):
+                            if any(prefix in tag.get('Key', '') for prefix in self.cluster_prefix):
                                 all_tags = []
                                 instance_tags = self.__get_cluster_tags_by_instance_cluster(cluster_name=tag.get('Key'))
                                 if not instance_tags:
@@ -576,7 +576,7 @@ class TagClusterResources(TagClusterOperations):
         for vpc in vpcs_data:
             if vpc.get('Tags'):
                 for tag in vpc.get('Tags'):
-                    if self.cluster_prefix in tag.get('Key'):
+                    if any(prefix in tag.get('Key', '') for prefix in self.cluster_prefix):
                         vpc_ids[vpc.get('VpcId')] = [tag for tag in vpc.get('Tags') if tag.get('Key') != 'Name']
                         break
         return vpc_ids
@@ -688,7 +688,7 @@ class TagClusterResources(TagClusterOperations):
                                 role_data = role['Role']
                                 all_tags = []
                                 instance_tags = self.__get_cluster_tags_by_instance_cluster(
-                                    cluster_name=f'{self.cluster_prefix}{cluster_key}')
+                                    cluster_name=cluster_key)
                                 if not instance_tags:
                                     all_tags = self.__append_input_tags(role_data.get('Tags'))
                                 else:
@@ -738,7 +738,7 @@ class TagClusterResources(TagClusterOperations):
                                     if cluster_name in tag['Key']:
                                         all_tags = []
                                         instance_tags = self.__get_cluster_tags_by_instance_cluster(
-                                            cluster_name=f'{self.cluster_prefix}{cluster_name}')
+                                            cluster_name=cluster_name)
                                         if not instance_tags:
                                             all_tags = self.__append_input_tags(data.get('Tags'))
                                         all_tags.extend(instance_tags)
@@ -822,7 +822,7 @@ class TagClusterResources(TagClusterOperations):
                                 if not self.__validate_existing_tag(bucket_tags):
                                     add_tags = []
                                     instance_tags = self.__get_cluster_tags_by_instance_cluster(
-                                        cluster_name=f'{self.cluster_prefix}{cluster_name}')
+                                        cluster_name=cluster_name)
                                     if not instance_tags:
                                         add_tags = self.__append_input_tags(bucket_tags)
                                     add_tags.extend(instance_tags)

{cloud_governance-1.1.374.dist-info → cloud_governance-1.1.376.dist-info}/METADATA

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

{cloud_governance-1.1.374.dist-info → cloud_governance-1.1.376.dist-info}/RECORD

@@ -143,7 +143,7 @@ cloud_governance/common/utils/configs.py,sha256=shFxWt0Kc-GwzcZKYCkHm058ujwdTxn4
 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=erhi9cVXRE4-jQ9pPKjj_q_ee38MHDoh9pCq8_nbTzY,29332
+cloud_governance/main/environment_variables.py,sha256=ultgSpJ-WaFP4Q5Sh_pb0B_dfxxpity6mthioDUC7k8,29333
 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=4TBiCBO_1z8KpGXb8brPKBmv3jHBl8fl_-Sb80ctYno,18880
@@ -167,7 +167,7 @@ cloud_governance/policy/aws/s3_inactive.py,sha256=NXUUGtJhpqohaWYczSebw-q0Q7RKg3
 cloud_governance/policy/aws/skipped_resources.py,sha256=D0kbt9dg6Bkl5PgGaqimWvLct6D-JOnerzJ0FkWzGFc,5679
 cloud_governance/policy/aws/spot_savings_analysis.py,sha256=lGG5qtz8pr7xjLo5BrtVSHGTz928MLwYPbSCaDfpTes,5513
 cloud_governance/policy/aws/unused_access_key.py,sha256=62_JaQMZLgnmYck0Brp8CTS1CvyRhwcNTXYmFjgWMoY,3542
-cloud_governance/policy/aws/zombie_cluster_resource.py,sha256=pwE8MypeqQfSQs--U1hbk5nk1M6x0R_NLs0x-wmOIjI,59626
+cloud_governance/policy/aws/zombie_cluster_resource.py,sha256=Qkd5_Sh74cixaL7yiQgU1OvoEIfGmeKSECb5tNAnQ7I,59675
 cloud_governance/policy/aws/zombie_snapshots.py,sha256=V48cq4GCG2z-MRwUSE4b5wQcGeI_T1Ah99SiHlTwkvY,3834
 cloud_governance/policy/aws/cleanup/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloud_governance/policy/aws/cleanup/database_idle.py,sha256=-kITbr5yB1QAi65D6zRO0kdWH1CFPEyd86nJua-dNKM,3632
@@ -214,9 +214,9 @@ cloud_governance/policy/policy_operations/aws/dynamodb_upload_data/cloudtrail_to
 cloud_governance/policy/policy_operations/aws/dynamodb_upload_data/upload_data_to_dynamodb.py,sha256=6htSixTFRzKc2E8glsQom7uRpenNjmvaIKjb_sYH8ZE,2534
 cloud_governance/policy/policy_operations/aws/tag_cluster/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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/run_tag_cluster_resouces.py,sha256=08f661b6YlAsOOWq8YZvuA6wjkKw5jPOgi4BGQziOLc,5163
 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=NrQcdeDqcSiRWnQMuZXu1XdoySLuoDuBSnn8XHOSxJg,44380
+cloud_governance/policy/policy_operations/aws/tag_cluster/tag_cluster_resouces.py,sha256=aBDBrkUPILFDsu1z8v4aYmXdDJ-VXVdTaBvGS8hbvyE,44604
 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
@@ -264,8 +264,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.374.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-cloud_governance-1.1.374.dist-info/METADATA,sha256=BmOLgXaSiA-5UFXOfSxmZi5RaKXwKo6HKKDap4eFP2U,11384
-cloud_governance-1.1.374.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-cloud_governance-1.1.374.dist-info/top_level.txt,sha256=jfB1fgj7jvx3YZkZA4G6hFeS1RHO7J7XtnbjuMNMRww,17
-cloud_governance-1.1.374.dist-info/RECORD,,
+cloud_governance-1.1.376.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+cloud_governance-1.1.376.dist-info/METADATA,sha256=rw0CU6D1gEKl6fcZTXs1WS_WcegDFhlBIoxA7fduLC0,11384
+cloud_governance-1.1.376.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cloud_governance-1.1.376.dist-info/top_level.txt,sha256=jfB1fgj7jvx3YZkZA4G6hFeS1RHO7J7XtnbjuMNMRww,17
+cloud_governance-1.1.376.dist-info/RECORD,,