feat: modify some of REST and gRPC config name

Signed-off-by: ImMin5 <[email protected]>
(cherry picked from commit 93e5adc)

Author: ImMin5

src/spaceone/core/config/__init__.py

@@ -37,10 +37,6 @@ def get_service():
     return _GLOBAL['SERVICE']
 
 
-def get_extension_apis():
-    return _GLOBAL.get('EXTENSION_APIS', {})
-
-
 def get_handler(name):
     return _GLOBAL.get('HANDLERS', {}).get(name, {})
 

src/spaceone/core/config/default_conf.py

@@ -1,9 +1,3 @@
-# Service Description
-TITLE = ''
-DESCRIPTION = ''
-CONTACT = {
-}
-
 # Service Configuration
 PACKAGE = None
 SERVICE = None
@@ -18,27 +12,40 @@
 # Unit Test Configuration
 MOCK_MODE = False
 
+# gRPC Configuration
 # gRPC Extension APIs
-EXTENSION_APIS = {
+GRPC_EXTENSION_APIS = {
     'spaceone.core.extension.grpc_health': ['GRPCHealth'],
     'spaceone.core.extension.server_info': ['ServerInfo']
 }
 
-# Uvicorn Options for Rest Server
-UVICORN_OPTIONS = {
-    'factory': True
+# REST Configuration
+# REST Application Options
+REST_TITLE = ''
+REST_DESCRIPTION = ''
+REST_CONTACT = {
 }
 
-# Rest Middlewares
+# REST Middlewares
 REST_MIDDLEWARES = []
 
+# REST Extension Routers
 REST_EXTENSION_ROUTERS = [
     {
         'router_path': 'spaceone.core.fastapi.extension.health:router',
         'router_options': {}
     }
 ]
 
+# REST Uvicorn Options
+UVICORN_OPTIONS = {
+    'factory': True
+}
+
+# # REST External Swagger
+# EXTERNAL_SWAGGER = False
+# EXTERNAL_SWAGGER_PATH = []
+
 # Handler Configuration
 HANDLERS = {
     'authentication': [],

src/spaceone/core/fastapi/server.py

@@ -8,7 +8,6 @@
 from spaceone.core.logger import set_logger
 from spaceone.core.opentelemetry import set_tracer, set_metric
 from spaceone.core.extension.server_info import ServerInfoManager
-from spaceone.core.fastapi.openapi import add_external_swagger
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -124,18 +123,17 @@ def _init_fast_api():
     server_info = ServerInfoManager()
 
     return FastAPI(
-        title=global_conf.get('TITLE', 'Document'),
+        title=global_conf.get('REST_TITLE', 'Document'),
         version=server_info.get_version(),
-        contact=global_conf.get('CONTACT', {}),
-        description=global_conf.get('DESCRIPTION', ''),
+        contact=global_conf.get('REST_CONTACT', {}),
+        description=global_conf.get('REST_DESCRIPTION', ''),
     )
 
 
 def fast_api_app():
     app = _init_fast_api()
     app = _add_middlewares(app)
     app = _include_routers(app)
-    app = add_external_swagger(app)
     return app
 
 

src/spaceone/core/pygrpc/server.py

@@ -51,7 +51,7 @@ def _init_services(server):
     server, service_names = _add_services(server, service_names, proto_conf)
 
     # Set Extension Services
-    proto_conf = config.get_extension_apis()
+    proto_conf = config.get_global('GRPC_EXTENSION_APIS', {})
     server, service_names = _add_services(server, service_names, proto_conf)
 
     return server, service_names