qontract-reconcile 0.10.1rc1184__py3-none-any.whl → 0.10.1rc1185__py3-none-any.whl

{qontract_reconcile-0.10.1rc1184.dist-info → qontract_reconcile-0.10.1rc1185.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc1184
+Version: 0.10.1rc1185
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Home-page: https://github.com/app-sre/qontract-reconcile
 Author: Red Hat App-SRE Team

{qontract_reconcile-0.10.1rc1184.dist-info → qontract_reconcile-0.10.1rc1185.dist-info}/RECORD

@@ -655,7 +655,7 @@ reconcile/unleash_feature_toggles/integration.py,sha256=nx7BhtzCsTfPbOp60vI5MkNw
 reconcile/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/utils/aggregated_list.py,sha256=km0xadW0jO4G_CqZPsXmoBURQ8c90FaTu5x4X1K1cZs,3357
 reconcile/utils/amtool.py,sha256=ngtBuVPETH6oAy5RnKzvreVbjwQCaATS_PYYwBprzjQ,2288
-reconcile/utils/aws_api.py,sha256=Mp5-euZUfKfnVzgMZd3LoWbegm1OrNjzpP1A-n2EiF0,67640
+reconcile/utils/aws_api.py,sha256=8LeEweWeydLJB9t-neYkYSN6EneDJontGwcglg0xmS0,67652
 reconcile/utils/aws_helper.py,sha256=MDbv5jrNdqqJ5pfBxniGdJXBBO_EYc2_Uf2w9ZzeMNs,2854
 reconcile/utils/batches.py,sha256=TtEm64a8lWhFuNbUVpFEmXVdU2Q0sTBrP_I0Cjbgh7g,320
 reconcile/utils/binary.py,sha256=7MaAFBpzuBUTJ_aA6G6-eult_BPMVyiXbBLD0Y6F-DM,2301
@@ -882,8 +882,8 @@ tools/test/test_qontract_cli.py,sha256=iuzKbQ6ahinvjoQmQLBrG4shey0z-1rB6qCgS8T6d
 tools/test/test_saas_promotion_state.py,sha256=dy4kkSSAQ7bC0Xp2CociETGN-2aABEfL6FU5D9Jl00Y,6056
 tools/test/test_sd_app_sre_alert_report.py,sha256=v363r9zM7__0kR5K6mvJoGFcM9BvE33fWAayrqkpojA,2116
 tools/test/test_sre_checkpoints.py,sha256=SKqPPTl9ua0RFdSSofnoQX-JZE6dFLO3LRhfQzqtfh8,2607
-qontract_reconcile-0.10.1rc1184.dist-info/METADATA,sha256=8DHsuGLxV4LuSR7LPUvgLMjGqffzD8xy5iCyTv2Ltuc,2213
-qontract_reconcile-0.10.1rc1184.dist-info/WHEEL,sha256=bFJAMchF8aTQGUgMZzHJyDDMPTO3ToJ7x23SLJa1SVo,92
-qontract_reconcile-0.10.1rc1184.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc1184.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc1184.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc1185.dist-info/METADATA,sha256=QatFHWfiRw29TrdKQtJhxXlwWCTa6pwrNTKTnxBMJtY,2213
+qontract_reconcile-0.10.1rc1185.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+qontract_reconcile-0.10.1rc1185.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc1185.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc1185.dist-info/RECORD,,

{qontract_reconcile-0.10.1rc1184.dist-info → qontract_reconcile-0.10.1rc1185.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.45.0)
+Generator: bdist_wheel (0.45.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

reconcile/utils/aws_api.py

@@ -956,36 +956,43 @@ class AWSApi:  # pylint: disable=too-many-public-methods
                     for s in vpc_subnets
                 ]
             if hcp_vpc_endpoint_sg:
-                endpoints = AWSApi._get_vpc_endpoints(
-                    [
-                        {"Name": "vpc-id", "Values": [vpc_id]},
-                        {
-                            "Name": "tag:AWSEndpointService",
-                            "Values": ["private-router"],
-                        },
-                    ],
-                    assumed_ec2,
+                api_security_group_id = self._get_api_security_group_id(
+                    assumed_ec2, vpc_id
                 )
-                if len(endpoints) > 1:
-                    raise ValueError(
-                        f"exactly one VPC endpoint for private API router in VPC {vpc_id} expected but {len(endpoints)} found"
-                    )
-                vpc_endpoint_id = endpoints[0]["VpcEndpointId"]
-                # https://github.com/openshift/hypershift/blob/c855f68e84e78924ccc9c2132b75dc7e30c4e1d8/control-plane-operator/controllers/hostedcontrolplane/hostedcontrolplane_controller.go#L4243
-                security_groups = [
-                    sg
-                    for sg in endpoints[0]["Groups"]
-                    if sg["GroupName"].endswith("-default-sg")
-                ]
-                if len(security_groups) != 1:
-                    raise ValueError(
-                        f"exactly one VPC endpoint default security group for private API router {vpc_endpoint_id} "
-                        f"in VPC {vpc_id} expected but {len(security_groups)} found"
-                    )
-                api_security_group_id = security_groups[0]["GroupId"]
 
         return vpc_id, route_table_ids, subnets_id_az, api_security_group_id
 
+    def _get_api_security_group_id(self, assumed_ec2, vpc_id):
+        endpoints = AWSApi._get_vpc_endpoints(
+            [
+                {"Name": "vpc-id", "Values": [vpc_id]},
+                {
+                    "Name": "tag:AWSEndpointService",
+                    "Values": ["private-router"],
+                },
+            ],
+            assumed_ec2,
+        )
+        if not endpoints:
+            return None
+        if len(endpoints) > 1:
+            raise ValueError(
+                f"exactly one VPC endpoint for private API router in VPC {vpc_id} expected but {len(endpoints)} found"
+            )
+        vpc_endpoint_id = endpoints[0]["VpcEndpointId"]
+        # https://github.com/openshift/hypershift/blob/c855f68e84e78924ccc9c2132b75dc7e30c4e1d8/control-plane-operator/controllers/hostedcontrolplane/hostedcontrolplane_controller.go#L4243
+        security_groups = [
+            sg
+            for sg in endpoints[0]["Groups"]
+            if sg["GroupName"].endswith("-default-sg")
+        ]
+        if len(security_groups) != 1:
+            raise ValueError(
+                f"exactly one VPC endpoint default security group for private API router {vpc_endpoint_id} "
+                f"in VPC {vpc_id} expected but {len(security_groups)} found"
+            )
+        return security_groups[0]["GroupId"]
+
     def get_cluster_nat_gateways_egress_ips(self, account: dict[str, Any], vpc_id: str):
         assumed_role_data = self._get_account_assume_data(account)
         assumed_ec2 = self._get_assumed_role_client(*assumed_role_data)