diff --git a/src/VERSION b/src/VERSION index 2d5dc35..80057b0 100644 --- a/src/VERSION +++ b/src/VERSION @@ -1 +1 @@ -v1.10.3.3 +v1.10.4.2 diff --git a/src/spaceone/core/fastapi/api.py b/src/spaceone/core/fastapi/api.py index 361229d..0ab5cd5 100644 --- a/src/spaceone/core/fastapi/api.py +++ b/src/spaceone/core/fastapi/api.py @@ -69,16 +69,16 @@ class BaseAPI(object): def name(self): return self.__class__.__name__ - async def parse_request(self, request: Request, token=None): + async def parse_request(self, request: Request, token=None, resource=None, verb=None): try: metadata = { 'url': request.url.path, - 'service': self.service + 'service': self.service, + 'resource': resource, + 'verb': verb, + 'token': token } - if token: - metadata['token'] = token - return await request.json(), metadata except Exception as e: _LOGGER.debug(f'JSON Parsing Error: {e}', exc_info=True) diff --git a/src/spaceone/core/locator.py b/src/spaceone/core/locator.py index 3b9c69f..c18a315 100644 --- a/src/spaceone/core/locator.py +++ b/src/spaceone/core/locator.py @@ -47,48 +47,59 @@ def get_manager(self, name: [str, object], **kwargs): except Exception as e: raise ERROR_LOCATOR(name=name, reason=e, _meta={'type': 'manager'}) - def get_connector(self, name: str, **kwargs): + def get_info(self, name: [str, object], *args, **kwargs): package = config.get_package() - connector_conf = config.get_connector(name) - backend = connector_conf.get('backend') - try: - if backend: - connector_module, name = backend.rsplit('.', 1) - connector_module = __import__(connector_module, fromlist=[name]) + if isinstance(name, str): + info_module = _get_module(package, 'info') + return getattr(info_module, name)(*args, **kwargs) else: - connector_module = _get_module(package, 'connector') - - return getattr(connector_module, name)(transaction=self.transaction, config=connector_conf, **kwargs) + return name(*args, **kwargs) except ERROR_BASE as e: raise e except Exception as e: - raise ERROR_LOCATOR(name=name, reason=e, _meta={'type': 'connector'}) + raise ERROR_LOCATOR(name=name, reason=e, _meta={'type': 'info'}) - def get_info(self, name: str, *args, **kwargs): + def get_model(self, name: [str, object]): package = config.get_package() try: - info_module = _get_module(package, 'info') - return getattr(info_module, name)(*args, **kwargs) + if isinstance(name, str): + model_module = _get_module(package, 'model') + model = getattr(model_module, name) + model.init() + return model + else: + name.init() + return name except ERROR_BASE as e: raise e except Exception as e: - raise ERROR_LOCATOR(name=name, reason=e, _meta={'type': 'info'}) + raise ERROR_LOCATOR(name=f'{name} Model', reason=e, _meta={'type': 'model'}) - def get_model(self, name: str): + def get_connector(self, name: [str, object], **kwargs): package = config.get_package() + try: - model_module = _get_module(package, 'model') - model = getattr(model_module, name) - model.init() - return model + if isinstance(name, str): + connector_conf = config.get_connector(name) + backend = connector_conf.get('backend') + + if backend: + connector_module, name = backend.rsplit('.', 1) + connector_module = __import__(connector_module, fromlist=[name]) + else: + connector_module = _get_module(package, 'connector') + + return getattr(connector_module, name)(transaction=self.transaction, config=connector_conf, **kwargs) + else: + return name(transitions=self.transaction, **kwargs) except ERROR_BASE as e: raise e except Exception as e: - raise ERROR_LOCATOR(name=f'{name} Model', reason=e, _meta={'type': 'model'}) + raise ERROR_LOCATOR(name=name, reason=e, _meta={'type': 'connector'}) diff --git a/src/spaceone/core/pygrpc/client.py b/src/spaceone/core/pygrpc/client.py index 0f8fc5f..46d5997 100644 --- a/src/spaceone/core/pygrpc/client.py +++ b/src/spaceone/core/pygrpc/client.py @@ -398,12 +398,13 @@ def _parse_endpoint(endpoint): def _create_secure_channel(endpoint, options): - host, port = _parse_endpoint(endpoint) - _check_server_port(host, port, endpoint) + # host, port = _parse_endpoint(endpoint) + # _check_server_port(host, port, endpoint) try: - cert = ssl.get_server_certificate((host, port)) - creds = grpc.ssl_channel_credentials(str.encode(cert)) + # cert = ssl.get_server_certificate((host, port)) + # creds = grpc.ssl_channel_credentials(str.encode(cert)) + creds = grpc.ssl_channel_credentials() except Exception as e: raise ERROR_GRPC_TLS_HANDSHAKE(reason=e) @@ -411,8 +412,8 @@ def _create_secure_channel(endpoint, options): def _create_insecure_channel(endpoint, options): - host, port = _parse_endpoint(endpoint) - _check_server_port(host, port, endpoint) + # host, port = _parse_endpoint(endpoint) + # _check_server_port(host, port, endpoint) return grpc.insecure_channel(endpoint, options=options) @@ -433,6 +434,11 @@ def client(endpoint=None, ssl_enabled=False, max_message_length=None, **client_o else: channel = _create_insecure_channel(endpoint, options) + try: + grpc.channel_ready_future(channel).result(timeout=3) + except Exception as e: + raise ERROR_GRPC_CONNECTION(channel=endpoint, message='Channel is not ready.') + try: _GRPC_CHANNEL[endpoint] = _GRPCClient(channel, client_opts, endpoint) except Exception as e: