fix(biz/validators): 修复缺少stage查询条件问题 (#1103)

TencentBlueKing · Nov 5, 2024 · 24516ea · 24516ea
1 parent d0f54d4
commit 24516ea
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 5 deletions.
diff --git a/src/dashboard/apigateway/apigateway/biz/validators.py b/src/dashboard/apigateway/apigateway/biz/validators.py
@@ -198,7 +198,7 @@ def _validate_stage_backends(self):
                     if resource["proxy"].get("backend_id", None)
                 }
             )
-            backend_configs = BackendConfig.objects.filter(backend_id__in=backend_ids)
+            backend_configs = BackendConfig.objects.filter(stage=self.stage, backend_id__in=backend_ids)
         else:
             backend_configs = BackendConfig.objects.filter(stage=self.stage)
 
@@ -207,9 +207,10 @@ def _validate_stage_backends(self):
                 if not core_constants.HOST_WITHOUT_SCHEME_PATTERN.match(host["host"]):
                     raise ReleaseValidationError(
                         _(
-                            "网关环境【{stage_name}】中的配置【后端服务地址】不合法。请在网关 `后端服务` 中进行配置。"
+                            "网关环境【{stage_name}】中的配置【后端服务 {backend_name} 地址】不合法。请在网关 `后端服务` 中进行配置。"
                         ).format(
                             stage_name=self.stage.name,
+                            backend_name=backend_config.backend.name,
                         )
                     )
 

diff --git a/src/dashboard/apigateway/apigateway/tests/biz/test_validators.py b/src/dashboard/apigateway/apigateway/tests/biz/test_validators.py
@@ -344,18 +344,37 @@ def test_validate_stage_backends(self, fake_stage, fake_gateway):
             description="test",
         )
 
-        backend_config = G(
+        stage2 = G(
+            Stage,
+            gateway=fake_gateway,
+            name="test_stage2",
+            description="test",
+        )
+
+        G(
             BackendConfig,
             gateway=fake_gateway,
-            backend_id=backend.id,
-            stage_id=227,
+            backend=backend,
+            stage=fake_stage,
             config={
                 "timeout": 30,
                 "loadbalance": "roundrobin",
                 "hosts": [{"scheme": "http", "host": "ee.com", "weight": 100}],
             },
         )
 
+        G(
+            BackendConfig,
+            gateway=fake_gateway,
+            backend=backend,
+            stage=stage2,
+            config={
+                "timeout": 30,
+                "loadbalance": "roundrobin",
+                "hosts": [{"scheme": "", "host": "", "weight": 100}],
+            },
+        )
+
         resource_version = G(
             ResourceVersion,
             gateway=fake_gateway,