Skip to content

Commit

Permalink
fix: 修复S-mart应用不能调用获取已经生效的增强服务环境变量 KEY API (#1376)
Browse files Browse the repository at this point in the history
  • Loading branch information
jiayuan929 authored Jun 12, 2024
1 parent 4d0650b commit b76e899
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion apiserver/paasng/paasng/accessories/servicehub/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
),
re_path(
make_app_pattern("/services/config_var_keys/$", include_envs=False),
views.ModuleServiceAttachmentsViewSet.as_view({"get": "list_provisioned_env_keys"}),
views.ModuleServicesViewSet.as_view({"get": "list_provisioned_env_keys"}),
name="api.services.list_provisioned_env_keys",
),
re_path(
Expand Down
28 changes: 14 additions & 14 deletions apiserver/paasng/paasng/accessories/servicehub/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,20 +99,6 @@ def retrieve_info(self, request, code, module_name):
services_info[env.environment] = ServicesInfo.get_detail(env.engine_app)["services_info"]
return Response(data=slzs.ModuleServiceInfoSLZ(services_info).data)

def list_provisioned_env_keys(self, request, code, module_name):
"""获取已经生效的增强服务环境变量 KEY"""
module = self.get_module_via_path()

# env_key_dict 内容示例: {"svc_name": ["key1", "key2"]}
env_key_dict: Dict[str, List[str]] = {}
for env in module.get_envs():
env_key_dict = {
**env_key_dict,
**ServiceSharingManager(env.module).get_enabled_env_keys(env),
**mixed_service_mgr.get_enabled_env_keys(env.engine_app),
}
return Response(data=env_key_dict)


class ModuleServicesViewSet(viewsets.ViewSet, ApplicationCodeInPathMixin):
"""与蓝鲸应用模块相关的增强服务接口"""
Expand Down Expand Up @@ -245,6 +231,20 @@ def unbind(self, request, code, module_name, service_id):
module_attachment.delete()
return Response(status=status.HTTP_200_OK)

def list_provisioned_env_keys(self, request, code, module_name):
"""获取已经生效的增强服务环境变量 KEY"""
module = self.get_module_via_path()

# env_key_dict 内容示例: {"svc_name": ["key1", "key2"]}
env_key_dict: Dict[str, List[str]] = {}
for env in module.get_envs():
env_key_dict = {
**env_key_dict,
**ServiceSharingManager(env.module).get_enabled_env_keys(env),
**mixed_service_mgr.get_enabled_env_keys(env.engine_app),
}
return Response(data=env_key_dict)


class ServiceViewSet(viewsets.ViewSet, ApplicationCodeInPathMixin):
"""增强服务相关视图(与应用无关的)"""
Expand Down

0 comments on commit b76e899

Please sign in to comment.