Skip to content

Commit 6ae8a73

Browse files
mlohvynenkomlohvynenko
committed
[utils] Use core common lib converter
Signed-off-by: Mykhailo Lohvynenko <Mykhailo_Lohvynenko@epam.com>
1 parent 016ccc6 commit 6ae8a73

12 files changed

+53
-335
lines changed

‎src/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ add_subdirectory(database)
2727
add_subdirectory(iamclient)
2828
add_subdirectory(iamserver)
2929
add_subdirectory(nodeinfoprovider)
30-
add_subdirectory(utils)
3130
add_subdirectory(visidentifier)
3231

3332
# ######################################################################################################################

‎src/iamclient/CMakeLists.txt

+1-10
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,4 @@ target_compile_options(${TARGET} PRIVATE -Wstack-usage=${AOS_STACK_USAGE})
3434
# Libraries
3535
# ######################################################################################################################
3636

37-
target_link_libraries(
38-
${TARGET}
39-
PUBLIC aoscommon
40-
aosiam
41-
aosutils
42-
aospbconvert
43-
aoscoreapi-gen-iam
44-
Poco::Util
45-
utils
46-
)
37+
target_link_libraries(${TARGET} PUBLIC aoscommon aosiam aosutils aospbconvert aoscoreapi-gen-iam Poco::Util)

‎src/iamclient/iamclient.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
#include <Poco/StreamCopier.h>
1212

1313
#include <pbconvert/common.hpp>
14+
#include <pbconvert/iam.hpp>
1415
#include <utils/exception.hpp>
1516
#include <utils/grpchelper.hpp>
1617

1718
#include "iamclient.hpp"
1819
#include "logger/logmodule.hpp"
19-
#include "utils/convert.hpp"
2020

2121
/***********************************************************************************************************************
2222
* Public
@@ -255,7 +255,7 @@ bool IAMClient::SendNodeInfo()
255255
return false;
256256
}
257257

258-
utils::ConvertToProto(*nodeInfo, *outgoingMsg.mutable_node_info());
258+
*outgoingMsg.mutable_node_info() = aos::common::pbconvert::ConvertToProto(nodeInfo);
259259

260260
LOG_DBG() << "Send node info: status=" << nodeInfo->mStatus;
261261

@@ -519,7 +519,7 @@ bool IAMClient::SendApplyCertResponse(const aos::String& nodeID, const aos::Stri
519519
std::string protoSerial;
520520
aos::Error resultError = error;
521521
if (error.IsNone()) {
522-
Tie(protoSerial, resultError) = utils::ConvertSerialToProto(serial);
522+
Tie(protoSerial, resultError) = aos::common::pbconvert::ConvertSerialToProto(serial);
523523
if (!resultError.IsNone()) {
524524
resultError = AOS_ERROR_WRAP(resultError);
525525

‎src/iamserver/CMakeLists.txt

+1-10
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,4 @@ target_compile_options(${TARGET} PRIVATE -Wstack-usage=${AOS_STACK_USAGE})
3434
# Libraries
3535
# ######################################################################################################################
3636

37-
target_link_libraries(
38-
${TARGET}
39-
PUBLIC aoscommon
40-
aosiam
41-
aosutils
42-
aospbconvert
43-
aoscoreapi-gen-iam
44-
Poco::Util
45-
utils
46-
)
37+
target_link_libraries(${TARGET} PUBLIC aoscommon aosiam aosutils aospbconvert aoscoreapi-gen-iam Poco::Util)

‎src/iamserver/nodecontroller.cpp

+9-10
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212

1313
#include "logger/logmodule.hpp"
1414
#include "nodecontroller.hpp"
15-
#include "utils/convert.hpp"
1615

1716
/***********************************************************************************************************************
1817
* NodeStreamHandler
@@ -102,7 +101,7 @@ grpc::Status NodeStreamHandler::GetCertTypes(const iamproto::GetCertTypesRequest
102101
incoming.mutable_get_cert_types_request()->CopyFrom(*request);
103102

104103
if (auto err = SendMessage(incoming, outgoing, responseTimeout); !err.IsNone()) {
105-
return utils::ConvertAosErrorToGrpcStatus(err);
104+
return aos::common::pbconvert::ConvertAosErrorToGrpcStatus(err);
106105
}
107106

108107
if (!outgoing.has_cert_types_response()) {
@@ -124,7 +123,7 @@ grpc::Status NodeStreamHandler::StartProvisioning(const iamproto::StartProvision
124123
incoming.mutable_start_provisioning_request()->CopyFrom(*request);
125124

126125
if (auto err = SendMessage(incoming, outgoing, responseTimeout); !err.IsNone()) {
127-
return utils::ConvertAosErrorToGrpcStatus(err);
126+
return aos::common::pbconvert::ConvertAosErrorToGrpcStatus(err);
128127
}
129128

130129
if (!outgoing.has_start_provisioning_response()) {
@@ -146,7 +145,7 @@ grpc::Status NodeStreamHandler::FinishProvisioning(const iamproto::FinishProvisi
146145
incoming.mutable_finish_provisioning_request()->CopyFrom(*request);
147146

148147
if (auto err = SendMessage(incoming, outgoing, responseTimeout); !err.IsNone()) {
149-
return utils::ConvertAosErrorToGrpcStatus(err);
148+
return aos::common::pbconvert::ConvertAosErrorToGrpcStatus(err);
150149
}
151150

152151
if (!outgoing.has_finish_provisioning_response()) {
@@ -168,7 +167,7 @@ grpc::Status NodeStreamHandler::Deprovision(const iamproto::DeprovisionRequest*
168167
incoming.mutable_deprovision_request()->CopyFrom(*request);
169168

170169
if (auto err = SendMessage(incoming, outgoing, responseTimeout); !err.IsNone()) {
171-
return utils::ConvertAosErrorToGrpcStatus(err);
170+
return aos::common::pbconvert::ConvertAosErrorToGrpcStatus(err);
172171
}
173172

174173
if (!outgoing.has_deprovision_response()) {
@@ -190,7 +189,7 @@ grpc::Status NodeStreamHandler::PauseNode(const iamproto::PauseNodeRequest* requ
190189
incoming.mutable_pause_node_request()->CopyFrom(*request);
191190

192191
if (auto err = SendMessage(incoming, outgoing, responseTimeout); !err.IsNone()) {
193-
return utils::ConvertAosErrorToGrpcStatus(err);
192+
return aos::common::pbconvert::ConvertAosErrorToGrpcStatus(err);
194193
}
195194

196195
if (!outgoing.has_pause_node_response()) {
@@ -212,7 +211,7 @@ grpc::Status NodeStreamHandler::ResumeNode(const iamproto::ResumeNodeRequest* re
212211
incoming.mutable_resume_node_request()->CopyFrom(*request);
213212

214213
if (auto err = SendMessage(incoming, outgoing, responseTimeout); !err.IsNone()) {
215-
return utils::ConvertAosErrorToGrpcStatus(err);
214+
return aos::common::pbconvert::ConvertAosErrorToGrpcStatus(err);
216215
}
217216

218217
if (!outgoing.has_resume_node_response()) {
@@ -234,7 +233,7 @@ grpc::Status NodeStreamHandler::CreateKey(const iamproto::CreateKeyRequest* requ
234233
incoming.mutable_create_key_request()->CopyFrom(*request);
235234

236235
if (auto err = SendMessage(incoming, outgoing, responseTimeout); !err.IsNone()) {
237-
return utils::ConvertAosErrorToGrpcStatus(err);
236+
return aos::common::pbconvert::ConvertAosErrorToGrpcStatus(err);
238237
}
239238

240239
if (!outgoing.has_create_key_response()) {
@@ -256,7 +255,7 @@ grpc::Status NodeStreamHandler::ApplyCert(const iamproto::ApplyCertRequest* requ
256255
incoming.mutable_apply_cert_request()->CopyFrom(*request);
257256

258257
if (auto err = SendMessage(incoming, outgoing, responseTimeout); !err.IsNone()) {
259-
return utils::ConvertAosErrorToGrpcStatus(err);
258+
return aos::common::pbconvert::ConvertAosErrorToGrpcStatus(err);
260259
}
261260

262261
if (!outgoing.has_apply_cert_response()) {
@@ -405,7 +404,7 @@ grpc::Status NodeController::HandleRegisterNodeStream(const std::vector<aos::Nod
405404

406405
Remove(handler);
407406

408-
return utils::ConvertAosErrorToGrpcStatus(ret);
407+
return aos::common::pbconvert::ConvertAosErrorToGrpcStatus(ret);
409408
}
410409

411410
NodeStreamHandler::Ptr NodeController::GetNodeStreamHandler(const std::string& nodeID)

‎src/iamserver/protectedmessagehandler.cpp

+18-16
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
#include <aos/iam/certhandler.hpp>
1515

1616
#include <pbconvert/common.hpp>
17+
#include <pbconvert/iam.hpp>
1718

1819
#include "logger/logmodule.hpp"
1920
#include "protectedmessagehandler.hpp"
20-
#include "utils/convert.hpp"
2121

2222
/***********************************************************************************************************************
2323
* Constants
@@ -101,7 +101,7 @@ grpc::Status ProtectedMessageHandler::PauseNode([[maybe_unused]] grpc::ServerCon
101101
if (auto status = RequestWithRetry([&]() {
102102
auto handler = GetNodeController()->GetNodeStreamHandler(nodeID);
103103
if (!handler) {
104-
return utils::ConvertAosErrorToGrpcStatus(cStreamNotFoundError);
104+
return aos::common::pbconvert::ConvertAosErrorToGrpcStatus(cStreamNotFoundError);
105105
}
106106

107107
return handler->PauseNode(request, response, cDefaultTimeout);
@@ -131,7 +131,7 @@ grpc::Status ProtectedMessageHandler::ResumeNode([[maybe_unused]] grpc::ServerCo
131131
if (auto status = RequestWithRetry([&]() {
132132
auto handler = GetNodeController()->GetNodeStreamHandler(nodeID);
133133
if (!handler) {
134-
return utils::ConvertAosErrorToGrpcStatus(cStreamNotFoundError);
134+
return aos::common::pbconvert::ConvertAosErrorToGrpcStatus(cStreamNotFoundError);
135135
}
136136

137137
return handler->ResumeNode(request, response, cDefaultTimeout);
@@ -165,7 +165,7 @@ grpc::Status ProtectedMessageHandler::GetCertTypes([[maybe_unused]] grpc::Server
165165
return RequestWithRetry([&]() {
166166
auto handler = GetNodeController()->GetNodeStreamHandler(nodeID);
167167
if (!handler) {
168-
return utils::ConvertAosErrorToGrpcStatus(cStreamNotFoundError);
168+
return aos::common::pbconvert::ConvertAosErrorToGrpcStatus(cStreamNotFoundError);
169169
}
170170

171171
return handler->GetCertTypes(request, response, cDefaultTimeout);
@@ -179,10 +179,12 @@ grpc::Status ProtectedMessageHandler::GetCertTypes([[maybe_unused]] grpc::Server
179179
if (!err.IsNone()) {
180180
LOG_ERR() << "Get certificate types error: " << AOS_ERROR_WRAP(err);
181181

182-
return utils::ConvertAosErrorToGrpcStatus(cStreamNotFoundError);
182+
return aos::common::pbconvert::ConvertAosErrorToGrpcStatus(cStreamNotFoundError);
183183
}
184184

185-
utils::ConvertToProto(certTypes, *response->mutable_types());
185+
for (const auto& type : certTypes) {
186+
response->add_types(type.CStr());
187+
}
186188

187189
return grpc::Status::OK;
188190
}
@@ -198,7 +200,7 @@ grpc::Status ProtectedMessageHandler::StartProvisioning([[maybe_unused]] grpc::S
198200
return RequestWithRetry([&]() {
199201
auto handler = GetNodeController()->GetNodeStreamHandler(nodeID);
200202
if (!handler) {
201-
return utils::ConvertAosErrorToGrpcStatus(cStreamNotFoundError);
203+
return aos::common::pbconvert::ConvertAosErrorToGrpcStatus(cStreamNotFoundError);
202204
}
203205

204206
return handler->StartProvisioning(request, response, cProvisioningTimeout);
@@ -225,7 +227,7 @@ grpc::Status ProtectedMessageHandler::FinishProvisioning([[maybe_unused]] grpc::
225227
if (auto status = RequestWithRetry([&]() {
226228
auto handler = GetNodeController()->GetNodeStreamHandler(nodeID);
227229
if (!handler) {
228-
return utils::ConvertAosErrorToGrpcStatus(cStreamNotFoundError);
230+
return aos::common::pbconvert::ConvertAosErrorToGrpcStatus(cStreamNotFoundError);
229231
}
230232

231233
return handler->FinishProvisioning(request, response, cProvisioningTimeout);
@@ -263,7 +265,7 @@ grpc::Status ProtectedMessageHandler::Deprovision([[maybe_unused]] grpc::ServerC
263265
if (auto status = RequestWithRetry([&]() {
264266
auto handler = GetNodeController()->GetNodeStreamHandler(nodeID);
265267
if (!handler) {
266-
return utils::ConvertAosErrorToGrpcStatus(cStreamNotFoundError);
268+
return aos::common::pbconvert::ConvertAosErrorToGrpcStatus(cStreamNotFoundError);
267269
}
268270

269271
return handler->Deprovision(request, response, cProvisioningTimeout);
@@ -331,7 +333,7 @@ grpc::Status ProtectedMessageHandler::CreateKey([[maybe_unused]] grpc::ServerCon
331333
return RequestWithRetry([&]() {
332334
auto handler = GetNodeController()->GetNodeStreamHandler(nodeID);
333335
if (!handler) {
334-
return utils::ConvertAosErrorToGrpcStatus(cStreamNotFoundError);
336+
return aos::common::pbconvert::ConvertAosErrorToGrpcStatus(cStreamNotFoundError);
335337
}
336338

337339
iamproto::CreateKeyRequest keyRequest = *request;
@@ -375,7 +377,7 @@ grpc::Status ProtectedMessageHandler::ApplyCert([[maybe_unused]] grpc::ServerCon
375377
return RequestWithRetry([&]() {
376378
auto handler = GetNodeController()->GetNodeStreamHandler(nodeID);
377379
if (!handler) {
378-
return utils::ConvertAosErrorToGrpcStatus(cStreamNotFoundError);
380+
return aos::common::pbconvert::ConvertAosErrorToGrpcStatus(cStreamNotFoundError);
379381
}
380382

381383
return handler->ApplyCert(request, response, cDefaultTimeout);
@@ -397,7 +399,7 @@ grpc::Status ProtectedMessageHandler::ApplyCert([[maybe_unused]] grpc::ServerCon
397399
aos::Error err;
398400
std::string serial;
399401

400-
Tie(serial, err) = utils::ConvertSerialToProto(certInfo.mSerial);
402+
Tie(serial, err) = aos::common::pbconvert::ConvertSerialToProto(certInfo.mSerial);
401403
if (!err.IsNone()) {
402404
LOG_ERR() << "Convert serial failed: error=" << err;
403405

@@ -432,7 +434,7 @@ grpc::Status ProtectedMessageHandler::RegisterInstance([[maybe_unused]] grpc::Se
432434
if (err = aosPermissions->EmplaceBack(); !err.IsNone()) {
433435
LOG_ERR() << "Failed to push back permissions: error=" << err;
434436

435-
return utils::ConvertAosErrorToGrpcStatus(err);
437+
return aos::common::pbconvert::ConvertAosErrorToGrpcStatus(err);
436438
}
437439

438440
aos::FunctionServicePermissions& servicePerm = aosPermissions->Back();
@@ -442,7 +444,7 @@ grpc::Status ProtectedMessageHandler::RegisterInstance([[maybe_unused]] grpc::Se
442444
if (err = servicePerm.mPermissions.PushBack({key.c_str(), val.c_str()}); !err.IsNone()) {
443445
LOG_ERR() << "Failed to push back permissions: error=" << err;
444446

445-
return utils::ConvertAosErrorToGrpcStatus(err);
447+
return aos::common::pbconvert::ConvertAosErrorToGrpcStatus(err);
446448
}
447449
}
448450
}
@@ -453,7 +455,7 @@ grpc::Status ProtectedMessageHandler::RegisterInstance([[maybe_unused]] grpc::Se
453455
if (!err.IsNone()) {
454456
LOG_ERR() << "Register instance failed: error=" << err;
455457

456-
return utils::ConvertAosErrorToGrpcStatus(err);
458+
return aos::common::pbconvert::ConvertAosErrorToGrpcStatus(err);
457459
}
458460

459461
response->set_secret(secret.CStr());
@@ -472,7 +474,7 @@ grpc::Status ProtectedMessageHandler::UnregisterInstance([[maybe_unused]] grpc::
472474
if (auto err = GetPermHandler()->UnregisterInstance(instance); !err.IsNone()) {
473475
LOG_ERR() << "Unregister instance failed: error=" << err;
474476

475-
return utils::ConvertAosErrorToGrpcStatus(err);
477+
return aos::common::pbconvert::ConvertAosErrorToGrpcStatus(err);
476478
}
477479

478480
return grpc::Status::OK;

0 commit comments

Comments
 (0)