qontract-reconcile 0.10.2.dev202__py3-none-any.whl → 0.10.2.dev203__py3-none-any.whl

{qontract_reconcile-0.10.2.dev202.dist-info → qontract_reconcile-0.10.2.dev203.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev202
+Version: 0.10.2.dev203
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Project-URL: homepage, https://github.com/app-sre/qontract-reconcile
 Project-URL: repository, https://github.com/app-sre/qontract-reconcile

{qontract_reconcile-0.10.2.dev202.dist-info → qontract_reconcile-0.10.2.dev203.dist-info}/RECORD

@@ -597,7 +597,7 @@ reconcile/unleash_feature_toggles/integration.py,sha256=nx7BhtzCsTfPbOp60vI5MkNw
 reconcile/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/utils/aggregated_list.py,sha256=_9UeaS1TWbJsGIESvXlzzK-omPI2lMMcCsoqc9LBclc,4022
 reconcile/utils/amtool.py,sha256=Ng5VVNCiPYEK67eDjIwfuuTLs5JsfltCwt6w5UfXbcY,2289
-reconcile/utils/aws_api.py,sha256=_Cr3zBPqpk1iTJxfWcbT7-8d3WiJihSA2zHdXX68EI4,80479
+reconcile/utils/aws_api.py,sha256=Xrt4uukct0u5kkQBvl0azquF8JEbrb_aFtlBNEL2G2E,81488
 reconcile/utils/aws_helper.py,sha256=8PvDR17ntAGX3bBzlTIxDuENl2rkK-RECsNYKm2_DZw,2955
 reconcile/utils/batches.py,sha256=TtEm64a8lWhFuNbUVpFEmXVdU2Q0sTBrP_I0Cjbgh7g,320
 reconcile/utils/binary.py,sha256=lSIevhilMeoGMePPHD7A-pxe45LVpBT0LksecYbM-EA,2477
@@ -670,7 +670,7 @@ reconcile/utils/state.py,sha256=az4tBmZ0EdbFcAGiBVUxs3cr2-BVWsuDQiNTvjjQq8s,1637
 reconcile/utils/structs.py,sha256=LcbLEg8WxfRqM6nW7NhcWN0YeqF7SQzxOgntmLs1SgY,352
 reconcile/utils/template.py,sha256=wTvRU4AnAV_o042tD4Mwls2dwWMuk7MKnde3MaCjaYg,331
 reconcile/utils/terraform_client.py,sha256=IDlrNvGEc2i6ElZIL_fzaJEad1nRC3DkP9_VXhJXmU0,37329
-reconcile/utils/terrascript_aws_client.py,sha256=gyBUJK89FDYEmb0QyPvD4pCgc5zjlQ6yp3PO6nxCJgI,292443
+reconcile/utils/terrascript_aws_client.py,sha256=RkiYjRietHFNXtfA1-WEZ1lZbJFBA_XCtTOsZUij5VM,292360
 reconcile/utils/three_way_diff_strategy.py,sha256=oQcHXd9LVhirJfoaOBoHUYuZVGfyL2voKr6KVI34zZE,4833
 reconcile/utils/throughput.py,sha256=iP4UWAe2LVhDo69mPPmgo9nQ7RxHD6_GS8MZe-aSiuM,344
 reconcile/utils/vault.py,sha256=aSA8l9cJlPUHpChFGl27nSY-Mpq9FMjBo7Dcgb1BVfM,15036
@@ -809,7 +809,7 @@ tools/saas_promotion_state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 tools/saas_promotion_state/saas_promotion_state.py,sha256=UfwwRLS5Ya4_Nh1w5n1dvoYtchQvYE9yj1VANt2IKqI,3925
 tools/sre_checkpoints/__init__.py,sha256=CDaDaywJnmRCLyl_NCcvxi-Zc0hTi_3OdwKiFOyS39I,145
 tools/sre_checkpoints/util.py,sha256=zEDbGr18ZeHNQwW8pUsr2JRjuXIPz--WAGJxZo9sv_Y,894
-qontract_reconcile-0.10.2.dev202.dist-info/METADATA,sha256=CYYvFFrH_On8hDff-SoAevyuCTPhipq1U_8ZnUL9E-c,24555
-qontract_reconcile-0.10.2.dev202.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev202.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev202.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev203.dist-info/METADATA,sha256=jLhZJ7x1qlr15Wil2EAOm2Aq2kAZBKMRm6RgIQhGAoM,24555
+qontract_reconcile-0.10.2.dev203.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev203.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev203.dist-info/RECORD,,

reconcile/utils/aws_api.py

@@ -42,6 +42,7 @@ if TYPE_CHECKING:
         FilterTypeDef,
         ImageTypeDef,
         LaunchPermissionModificationsTypeDef,
+        NetworkInterfaceTypeDef,
         RouteTableTypeDef,
         SubnetTypeDef,
         TagTypeDef,
@@ -52,6 +53,10 @@ if TYPE_CHECKING:
     )
     from mypy_boto3_ecr import ECRClient
     from mypy_boto3_elb import ElasticLoadBalancingClient
+    from mypy_boto3_elb.type_defs import (
+        LoadBalancerDescriptionTypeDef,
+        TagDescriptionTypeDef,
+    )
     from mypy_boto3_iam import IAMClient, IAMServiceResource
     from mypy_boto3_iam.type_defs import AccessKeyMetadataTypeDef
     from mypy_boto3_logs import CloudWatchLogsClient
@@ -92,7 +97,9 @@ else:
         TransitGatewayTypeDef
     ) = TransitGatewayVpcAttachmentTypeDef = UpgradeTargetTypeDef = (
         VpcEndpointTypeDef
-    ) = VpcTypeDef = object
+    ) = VpcTypeDef = NetworkInterfaceTypeDef = LoadBalancerDescriptionTypeDef = (
+        TagDescriptionTypeDef
+    ) = object
 
 
 class InvalidResourceTypeError(Exception):
@@ -194,9 +201,9 @@ class AWSApi:
         self.get_vpc_route_tables = lru_cache()(self.get_vpc_route_tables)  # type: ignore[method-assign]
         self.get_vpc_subnets = lru_cache()(self.get_vpc_subnets)  # type: ignore[method-assign]
         self._get_vpc_endpoints = lru_cache()(self._get_vpc_endpoints)  # type: ignore[method-assign]
-        self.get_alb_network_interface_ips = lru_cache()(  # type: ignore[method-assign]
-            self.get_alb_network_interface_ips
-        )
+        self.get_network_interfaces = lru_cache()(self.get_network_interfaces)  # type: ignore[method-assign]
+        self.get_load_balancers = lru_cache()(self.get_load_balancers)  # type: ignore[method-assign]
+        self.get_load_balancer_tags = lru_cache()(self.get_load_balancer_tags)  # type: ignore[method-assign]
 
         if init_users:
             self.init_users()
@@ -1568,8 +1575,9 @@ class AWSApi:
         ec2.create_tags(Resources=[resource_id], Tags=[tag_type_def])
 
     def get_alb_network_interface_ips(
-        self, assumed_role_data: tuple[str, str | None, str], service_name: str
+        self, account: awsh.Account, service_name: str
     ) -> set[str]:
+        assumed_role_data = self._get_account_assume_data(account)
         ec2_client = self._get_assumed_role_client(
             account_name=assumed_role_data[0],
             assume_role=assumed_role_data[1],
@@ -1583,14 +1591,14 @@ class AWSApi:
             client_type="elb",
         )
         service_tag = {"Key": "kubernetes.io/service-name", "Value": service_name}
-        nis = ec2_client.describe_network_interfaces()["NetworkInterfaces"]
-        lbs = elb_client.describe_load_balancers()["LoadBalancerDescriptions"]
+        nis = self.get_network_interfaces(ec2_client)
+        lbs = self.get_load_balancers(elb_client)
         result_ips = set()
         for lb in lbs:
             lb_name = lb["LoadBalancerName"]
-            tag_descriptions = elb_client.describe_tags(LoadBalancerNames=[lb_name])[
-                "TagDescriptions"
-            ]
+            tag_descriptions = self.get_load_balancer_tags(
+                elb=elb_client, lb_name=lb_name
+            )
             for td in tag_descriptions:
                 tags = td["Tags"]
                 if service_tag not in tags:
@@ -1608,6 +1616,22 @@ class AWSApi:
 
         return result_ips
 
+    @staticmethod
+    def get_network_interfaces(ec2: EC2Client) -> list[NetworkInterfaceTypeDef]:
+        return ec2.describe_network_interfaces()["NetworkInterfaces"]
+
+    @staticmethod
+    def get_load_balancers(
+        elb: ElasticLoadBalancingClient,
+    ) -> list[LoadBalancerDescriptionTypeDef]:
+        return elb.describe_load_balancers()["LoadBalancerDescriptions"]
+
+    @staticmethod
+    def get_load_balancer_tags(
+        elb: ElasticLoadBalancingClient, lb_name: str
+    ) -> list[TagDescriptionTypeDef]:
+        return elb.describe_tags(LoadBalancerNames=[lb_name])["TagDescriptions"]
+
     @staticmethod
     def get_vpc_default_sg_id(vpc_id: str, ec2: EC2Client) -> str | None:
         vpc_security_groups = ec2.describe_security_groups(

reconcile/utils/terrascript_aws_client.py

@@ -5189,8 +5189,7 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
         with AWSApi(
             1, [account], secret_reader=self.secret_reader, init_users=False
         ) as awsapi:
-            assumed_role_data = awsapi._get_account_assume_data(account)
-            ips = awsapi.get_alb_network_interface_ips(assumed_role_data, service_name)
+            ips = awsapi.get_alb_network_interface_ips(account, service_name)
         if not ips:
             raise ValueError(
                 f"[{account_name}/{identifier}] expected at least one "