we are not a component

Author: randhid

src/viam/api/CMakeLists.txt

@@ -306,8 +306,6 @@ target_sources(viamapi
     ${PROTO_GEN_DIR}/component/encoder/v1/encoder.pb.cc
     ${PROTO_GEN_DIR}/component/gantry/v1/gantry.grpc.pb.cc
     ${PROTO_GEN_DIR}/component/gantry/v1/gantry.pb.cc
-    ${PROTO_GEN_DIR}/component/discovery/v1/discovery.grpc.pb.cc
-    ${PROTO_GEN_DIR}/component/discovery/v1/discovery.pb.cc
     ${PROTO_GEN_DIR}/component/generic/v1/generic.grpc.pb.cc
     ${PROTO_GEN_DIR}/component/generic/v1/generic.pb.cc
     ${PROTO_GEN_DIR}/component/gripper/v1/gripper.grpc.pb.cc
@@ -332,6 +330,8 @@ target_sources(viamapi
     ${PROTO_GEN_DIR}/module/v1/module.pb.cc
     ${PROTO_GEN_DIR}/robot/v1/robot.grpc.pb.cc
     ${PROTO_GEN_DIR}/robot/v1/robot.pb.cc
+    ${PROTO_GEN_DIR}/service/discovery/v1/discovery.grpc.pb.cc
+    ${PROTO_GEN_DIR}/service/discovery/v1/discovery.pb.cc
     ${PROTO_GEN_DIR}/service/generic/v1/generic.grpc.pb.cc
     ${PROTO_GEN_DIR}/service/generic/v1/generic.pb.cc
     ${PROTO_GEN_DIR}/service/mlmodel/v1/mlmodel.grpc.pb.cc
@@ -366,8 +366,6 @@ target_sources(viamapi
       ${PROTO_GEN_DIR}/../../viam/api/component/encoder/v1/encoder.pb.h
       ${PROTO_GEN_DIR}/../../viam/api/component/gantry/v1/gantry.grpc.pb.h
       ${PROTO_GEN_DIR}/../../viam/api/component/gantry/v1/gantry.pb.h
-      ${PROTO_GEN_DIR}/../../viam/api/component/discovery/v1/discovery.grpc.pb.h
-      ${PROTO_GEN_DIR}/../../viam/api/component/discovery/v1/discovery.pb.h
       ${PROTO_GEN_DIR}/../../viam/api/component/generic/v1/generic.grpc.pb.h
       ${PROTO_GEN_DIR}/../../viam/api/component/generic/v1/generic.pb.h
       ${PROTO_GEN_DIR}/../../viam/api/component/gripper/v1/gripper.grpc.pb.h
@@ -393,6 +391,8 @@ target_sources(viamapi
       ${PROTO_GEN_DIR}/../../viam/api/robot/v1/robot.grpc.pb.h
       ${PROTO_GEN_DIR}/../../viam/api/robot/v1/robot.pb.h
       ${PROTO_GEN_DIR}/../../viam/api/tagger/v1/tagger.grpc.pb.h
+      ${PROTO_GEN_DIR}/../../viam/api/service/discovery/v1/discovery.grpc.pb.h
+      ${PROTO_GEN_DIR}/../../viam/api/service/discovery/v1/discovery.pb.h
       ${PROTO_GEN_DIR}/../../viam/api/service/generic/v1/generic.grpc.pb.h
       ${PROTO_GEN_DIR}/../../viam/api/service/generic/v1/generic.pb.h
       ${PROTO_GEN_DIR}/../../viam/api/service/mlmodel/v1/mlmodel.grpc.pb.h

src/viam/sdk/services/discovery.hpp

@@ -14,15 +14,15 @@ namespace sdk {
 /// @defgroup Discovery Classes related to the Discovery service.
 
 /// @class Discovery discovery.hpp "services/discovery.hpp"
-/// @brief A `Discovery` service is used to discover resources that are physically connected to your machine.
+/// @brief A `Discovery` service is used to discover resources that are physically connected to 
+/// your machine.
 /// @ingroup Discovery 
 ///
 /// This acts as an abstract parent class to be inherited from by any drivers representing
 /// specific discovery implementations. This class cannot be used on its own.
 
 class Discovery : public Service {
    public:
-
     /// @brief Discover valid viam configuration of resources that are physically
     /// connected to your machine.
     inline std::vector<ResourceConfig> discover_resources() {
@@ -31,8 +31,7 @@ class Discovery : public Service {
 
     /// @brief Discover valid viam configuration of resources that are physically 
     /// connected to your machine. 
-    virtual std::vector<ResourceConfig> discover_resources(
-        const ProtoStruct& extra) = 0;
+    virtual std::vector<ResourceConfig> discover_resources(const ProtoStruct& extra) = 0;
 
     /// @brief Do an arbitrary command.
     /// @param command Freeform fields that are service-specific.
@@ -45,7 +44,6 @@ class Discovery : public Service {
     explicit Discovery(std::string name);
 };
 
-
 template <>
 struct API::traits<Navigation> {
     static API api();