NO_MODULE_PARENT fix (#516)

Author: lia-viam

src/viam/sdk/common/private/service_helper.hpp

@@ -99,14 +99,14 @@ class ServiceHelper : public ServiceHelperBase {
     }
 
     ResourceServer* rs_;
-    const ::grpc::ServerContext* context_;
+    const GrpcServerContext* context_;
     RequestType* request_;
 };
 
 template <typename ServiceType, typename RequestType>
 auto make_service_helper(const char* method,
                          ResourceServer* rs,
-                         ::grpc::ServerContext* context,
+                         GrpcServerContext* context,
                          RequestType* request) {
     return ServiceHelper<ServiceType, RequestType>{method, rs, context, request};
 }

src/viam/sdk/module/service.cpp

@@ -16,6 +16,7 @@
 #include <string>
 
 #include <boost/none.hpp>
+#include <boost/utility/string_ref.hpp>
 #include <google/protobuf/descriptor.h>
 #include <grpcpp/channel.h>
 #include <grpcpp/create_channel.h>
@@ -209,9 +210,15 @@ struct ModuleService::ServiceImpl : viam::module::v1::ModuleService::Service {
         const viam::module::v1::HandlerMap hm = to_proto(parent.module_->handles());
         *response->mutable_handlermap() = hm;
 
-        const char* no_module_parent =
-            std::getenv("VIAM_NO_MODULE_PARENT");  // NOLINT(concurrency-mt-unsafe)
-        if (strcmp(no_module_parent, "true") != 0) {
+        // Using string_ref is more verbose but I think more readable than strcmp
+        boost::string_ref no_module_parent;
+
+        if (const char* envp =
+                std::getenv("VIAM_NO_MODULE_PARENT")) {  // NOLINT(concurrency-mt-unsafe)
+            no_module_parent = envp;
+        }
+
+        if (no_module_parent != "true") {
             auto new_parent_addr = parent.grpc_conn_protocol_ + request->parent_address();
             if (parent.parent_addr_ != new_parent_addr) {
                 parent.parent_addr_ = std::move(new_parent_addr);