cloud-governance 1.1.390__py3-none-any.whl → 1.1.391__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -269,7 +269,19 @@ class DeleteEC2Resources:
269
269
  if ip_permission.get('UserIdGroupPairs'):
270
270
  for user_id_group_pair in ip_permission.get('UserIdGroupPairs'):
271
271
  if user_id_group_pair.get('GroupId') == resource_id:
272
- ingress_rule = {'FromPort': ip_permission.get('FromPort'), 'IpProtocol': ip_permission.get('IpProtocol'), 'IpRanges': ip_permission.get('IpRanges'), 'Ipv6Ranges': ip_permission.get('Ipv6Ranges'), 'PrefixListIds': ip_permission.get('PrefixListIds'), 'ToPort': ip_permission.get('ToPort'), 'UserIdGroupPairs': [user_id_group_pair]}
272
+ ingress_rule = {
273
+ 'IpProtocol': ip_permission.get('IpProtocol'),
274
+ 'IpRanges': ip_permission.get('IpRanges'),
275
+ 'Ipv6Ranges': ip_permission.get('Ipv6Ranges'),
276
+ 'PrefixListIds': ip_permission.get('PrefixListIds'),
277
+ 'UserIdGroupPairs': [user_id_group_pair]
278
+ }
279
+ from_port = ip_permission.get('FromPort')
280
+ to_port = ip_permission.get('ToPort')
281
+ if from_port is not None:
282
+ ingress_rule['FromPort'] = from_port
283
+ if to_port is not None:
284
+ ingress_rule['ToPort'] = to_port
273
285
  self.client.revoke_security_group_ingress(GroupId=vpc_security_group.get('GroupId'), IpPermissions=[ingress_rule])
274
286
  logger.info(f'Removed the Ingress rules of Security Group {vpc_security_group.get("GroupId")} :: {ingress_rule}')
275
287
  else:
@@ -281,7 +293,13 @@ class DeleteEC2Resources:
281
293
  if ip_permission.get('UserIdGroupPairs'):
282
294
  for user_id_group_pair in ip_permission.get('UserIdGroupPairs'):
283
295
  if user_id_group_pair.get('GroupId') == resource_id:
284
- self.client.revoke_security_group_ingress(GroupId=vpc_security_group.get('GroupId'), IpPermissions=[ip_permission])
296
+ cleaned_ip_permission = {k: v for k, v in ip_permission.items() if
297
+ v is not None}
298
+ cleaned_ip_permission['UserIdGroupPairs'] = [user_id_group_pair]
299
+
300
+ self.client.revoke_security_group_ingress(
301
+ GroupId=vpc_security_group.get('GroupId'),
302
+ IpPermissions=[cleaned_ip_permission])
285
303
  logger.info(f'Removed the Ingress rules of Security Group {resource_id} from {vpc_security_group.get("GroupId")}')
286
304
  network_interfaces = self.ec2_operations.get_network_interface()
287
305
  network_interface_ids = self.__get_cluster_references(resource_id=vpc_id, resource_list=network_interfaces,
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: cloud-governance
3
- Version: 1.1.390
3
+ Version: 1.1.391
4
4
  Summary: Cloud Governance Tool
5
5
  Home-page: https://github.com/redhat-performance/cloud-governance
6
6
  Author: Red Hat
@@ -230,7 +230,7 @@ cloud_governance/policy/policy_operations/aws/tag_user/remove_user_tags.py,sha25
230
230
  cloud_governance/policy/policy_operations/aws/tag_user/run_tag_iam_user.py,sha256=MhSE010U-5jpLI59BxfzyLP1eYT7bYQcBQChj9UvfLY,2912
231
231
  cloud_governance/policy/policy_operations/aws/tag_user/tag_iam_user.py,sha256=Sym0R4P0A8AFhkLKRa_Fv9D53obLXYFRzzpcjipnZ4o,12217
232
232
  cloud_governance/policy/policy_operations/aws/zombie_cluster/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
233
- cloud_governance/policy/policy_operations/aws/zombie_cluster/delete_ec2_resources.py,sha256=LhT91KCA-POvFbPSp7K_LnVJX6SFJPwysWtfW4O1SWg,27146
233
+ cloud_governance/policy/policy_operations/aws/zombie_cluster/delete_ec2_resources.py,sha256=jZe89uBiIDXN0dXJLBaLZnQ9fe5mcrE88TMSpbTAGoA,28272
234
234
  cloud_governance/policy/policy_operations/aws/zombie_cluster/delete_iam_resources.py,sha256=HzHIx_FLRCrlhYi15-Y4vrOmmbBUhm-kAA7FWgRqYN0,3730
235
235
  cloud_governance/policy/policy_operations/aws/zombie_cluster/delete_s3_resources.py,sha256=Y0PaOGUEurgizoXjZb8a5qC2MVObcqGwJ4oYGZ-Oyic,1373
236
236
  cloud_governance/policy/policy_operations/aws/zombie_cluster/run_zombie_cluster_resources.py,sha256=6ZC-KQpRPpRdqY-QuVI5BYoaaxgTv4QLNDUJ8v7oTiU,12315
@@ -265,8 +265,8 @@ cloud_governance/policy/policy_runners/elasticsearch/__init__.py,sha256=47DEQpj8
265
265
  cloud_governance/policy/policy_runners/elasticsearch/upload_elastic_search.py,sha256=pOwUJWXjJbyTy8iv3Ap8xJGnqQe-5lZgoR8-vGfAVos,1881
266
266
  cloud_governance/policy/policy_runners/ibm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
267
267
  cloud_governance/policy/policy_runners/ibm/policy_runner.py,sha256=V0E_f7F3hXit0aSq4BlfX1Jd4vjR2NEvOWsJ5upvZ4o,1302
268
- cloud_governance-1.1.390.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
269
- cloud_governance-1.1.390.dist-info/METADATA,sha256=GLZTMm4vq-oCFA2AzpHw8V2EK8uIthdudCidFvCRmpY,11384
270
- cloud_governance-1.1.390.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
271
- cloud_governance-1.1.390.dist-info/top_level.txt,sha256=jfB1fgj7jvx3YZkZA4G6hFeS1RHO7J7XtnbjuMNMRww,17
272
- cloud_governance-1.1.390.dist-info/RECORD,,
268
+ cloud_governance-1.1.391.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
269
+ cloud_governance-1.1.391.dist-info/METADATA,sha256=7oqmkEU71exnqPETEO3biTCY1F6QWzXFNfCnNn3NiuM,11384
270
+ cloud_governance-1.1.391.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
271
+ cloud_governance-1.1.391.dist-info/top_level.txt,sha256=jfB1fgj7jvx3YZkZA4G6hFeS1RHO7J7XtnbjuMNMRww,17
272
+ cloud_governance-1.1.391.dist-info/RECORD,,