From e46c17e06311207e7bd23458e66a458780bc2da9 Mon Sep 17 00:00:00 2001 From: Abe Winter Date: Thu, 19 Sep 2024 15:23:46 -0400 Subject: [PATCH 1/6] use boost options in dial_api_key example --- src/viam/examples/dial_api_key/CMakeLists.txt | 1 + .../dial_api_key/example_dial_api_key.cpp | 39 +++++++++++++------ 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/src/viam/examples/dial_api_key/CMakeLists.txt b/src/viam/examples/dial_api_key/CMakeLists.txt index c8f782c89..057901676 100644 --- a/src/viam/examples/dial_api_key/CMakeLists.txt +++ b/src/viam/examples/dial_api_key/CMakeLists.txt @@ -17,6 +17,7 @@ add_executable(example_dial_api_key ) target_link_libraries(example_dial_api_key + Boost::program_options viam-cpp-sdk::viamsdk ) diff --git a/src/viam/examples/dial_api_key/example_dial_api_key.cpp b/src/viam/examples/dial_api_key/example_dial_api_key.cpp index c894b26c5..1a3f9c967 100644 --- a/src/viam/examples/dial_api_key/example_dial_api_key.cpp +++ b/src/viam/examples/dial_api_key/example_dial_api_key.cpp @@ -8,6 +8,7 @@ #include #include +#include #include #include #include @@ -24,21 +25,35 @@ using viam::robot::v1::Status; using namespace viam::sdk; -int main() { - const char* uri = ""; - DialOptions dial_options; - std::string type = "api-key"; - std::string entity = ""; - std::string payload = ""; - dial_options.set_entity(entity); - Credentials credentials(type, payload); - dial_options.set_credentials(credentials); - boost::optional opts(dial_options); - std::string address(uri); +namespace po = boost::program_options; + +int main(int argc, char* argv[]) { + po::options_description desc("Allowed options"); + desc.add_options() + ("help", "List options and exit") + ("uri", po::value(), "URI of robot") + ("entity", po::value(), "api key ID") + ("api-key", po::value(), "api key secret") + ; + po::variables_map vm; + po::store(po::parse_command_line(argc, argv, desc), vm); + if (vm.count("help")) { + std::cout << desc << std::endl; + return 0; + } + boost::optional opts; + if (vm.count("entity") && vm.count("api-key")) { + DialOptions dial_options; + dial_options.set_entity(vm["entity"].as()); + Credentials credentials("api-key", vm["api-key"].as()); + dial_options.set_credentials(credentials); + opts = dial_options; + } Options options(1, opts); + std::cout << vm["uri"].as() << ", " << vm.count("uri") << std::endl; // connect to robot, ensure we can refresh it - std::shared_ptr robot = RobotClient::at_address(address, options); + std::shared_ptr robot = RobotClient::at_address(vm["uri"].as(), options); // ensure we can query resources std::vector resource_names = robot->resource_names(); From 983d709d9eb971a0972afdc5cc0fd94db66af412 Mon Sep 17 00:00:00 2001 From: Abe Winter Date: Thu, 19 Sep 2024 15:28:09 -0400 Subject: [PATCH 2/6] lint --- src/viam/examples/dial_api_key/example_dial_api_key.cpp | 6 +++--- src/viam/examples/modules/complex/proto/buf.lock | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/viam/examples/dial_api_key/example_dial_api_key.cpp b/src/viam/examples/dial_api_key/example_dial_api_key.cpp index 1a3f9c967..bb4906264 100644 --- a/src/viam/examples/dial_api_key/example_dial_api_key.cpp +++ b/src/viam/examples/dial_api_key/example_dial_api_key.cpp @@ -33,8 +33,7 @@ int main(int argc, char* argv[]) { ("help", "List options and exit") ("uri", po::value(), "URI of robot") ("entity", po::value(), "api key ID") - ("api-key", po::value(), "api key secret") - ; + ("api-key", po::value(), "api key secret"); po::variables_map vm; po::store(po::parse_command_line(argc, argv, desc), vm); if (vm.count("help")) { @@ -53,7 +52,8 @@ int main(int argc, char* argv[]) { std::cout << vm["uri"].as() << ", " << vm.count("uri") << std::endl; // connect to robot, ensure we can refresh it - std::shared_ptr robot = RobotClient::at_address(vm["uri"].as(), options); + std::shared_ptr robot = + RobotClient::at_address(vm["uri"].as(), options); // ensure we can query resources std::vector resource_names = robot->resource_names(); diff --git a/src/viam/examples/modules/complex/proto/buf.lock b/src/viam/examples/modules/complex/proto/buf.lock index 2b3f954ff..603482e23 100644 --- a/src/viam/examples/modules/complex/proto/buf.lock +++ b/src/viam/examples/modules/complex/proto/buf.lock @@ -4,5 +4,5 @@ deps: - remote: buf.build owner: googleapis repository: googleapis - commit: 8bc2c51e08c447cd8886cdea48a73e14 - digest: shake256:a969155953a5cedc5b2df5b42c368f2bc66ff8ce1804bc96e0f14ff2ee8a893687963058909df844d1643cdbc98ff099d2daa6bc9f9f5b8886c49afdc60e19af + commit: e7f8d366f5264595bcc4cd4139af9973 + digest: shake256:e5e5f1c12f82e028ea696faa43b4f9dc6258a6d1226282962a8c8b282e10946281d815884f574bd279ebd9cd7588629beb3db17b892af6c33b56f92f8f67f509 From ec803d907384fb5d5636e83fd668b8ef7a6c45ff Mon Sep 17 00:00:00 2001 From: Abe Winter Date: Thu, 19 Sep 2024 15:31:06 -0400 Subject: [PATCH 3/6] lint? --- .../examples/dial_api_key/example_dial_api_key.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/viam/examples/dial_api_key/example_dial_api_key.cpp b/src/viam/examples/dial_api_key/example_dial_api_key.cpp index bb4906264..e93a18ee5 100644 --- a/src/viam/examples/dial_api_key/example_dial_api_key.cpp +++ b/src/viam/examples/dial_api_key/example_dial_api_key.cpp @@ -29,11 +29,11 @@ namespace po = boost::program_options; int main(int argc, char* argv[]) { po::options_description desc("Allowed options"); - desc.add_options() - ("help", "List options and exit") - ("uri", po::value(), "URI of robot") - ("entity", po::value(), "api key ID") - ("api-key", po::value(), "api key secret"); + desc.add_options()( + "help", "List options and exit")( + "uri", po::value(), "URI of robot")( + "entity", po::value(), "api key ID")( + "api-key", po::value(), "api key secret"); po::variables_map vm; po::store(po::parse_command_line(argc, argv, desc), vm); if (vm.count("help")) { From 8ea96e85af4d0e2858d24527016e85ea9fd0255c Mon Sep 17 00:00:00 2001 From: Abe Winter Date: Thu, 19 Sep 2024 15:36:11 -0400 Subject: [PATCH 4/6] rm stray print --- src/viam/examples/dial_api_key/example_dial_api_key.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/viam/examples/dial_api_key/example_dial_api_key.cpp b/src/viam/examples/dial_api_key/example_dial_api_key.cpp index e93a18ee5..adf1b3de6 100644 --- a/src/viam/examples/dial_api_key/example_dial_api_key.cpp +++ b/src/viam/examples/dial_api_key/example_dial_api_key.cpp @@ -50,7 +50,6 @@ int main(int argc, char* argv[]) { } Options options(1, opts); - std::cout << vm["uri"].as() << ", " << vm.count("uri") << std::endl; // connect to robot, ensure we can refresh it std::shared_ptr robot = RobotClient::at_address(vm["uri"].as(), options); From 41d01f128f797e8acf9db3efaa77d2747731e032 Mon Sep 17 00:00:00 2001 From: Abe Winter Date: Thu, 19 Sep 2024 15:36:38 -0400 Subject: [PATCH 5/6] rm accidental lockfile change --- src/viam/examples/modules/complex/proto/buf.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/viam/examples/modules/complex/proto/buf.lock b/src/viam/examples/modules/complex/proto/buf.lock index 603482e23..2b3f954ff 100644 --- a/src/viam/examples/modules/complex/proto/buf.lock +++ b/src/viam/examples/modules/complex/proto/buf.lock @@ -4,5 +4,5 @@ deps: - remote: buf.build owner: googleapis repository: googleapis - commit: e7f8d366f5264595bcc4cd4139af9973 - digest: shake256:e5e5f1c12f82e028ea696faa43b4f9dc6258a6d1226282962a8c8b282e10946281d815884f574bd279ebd9cd7588629beb3db17b892af6c33b56f92f8f67f509 + commit: 8bc2c51e08c447cd8886cdea48a73e14 + digest: shake256:a969155953a5cedc5b2df5b42c368f2bc66ff8ce1804bc96e0f14ff2ee8a893687963058909df844d1643cdbc98ff099d2daa6bc9f9f5b8886c49afdc60e19af From 586dd17fc5409f8acab7d32993d4bbd489968404 Mon Sep 17 00:00:00 2001 From: Abe Winter Date: Thu, 19 Sep 2024 15:37:12 -0400 Subject: [PATCH 6/6] lint --- src/viam/examples/dial_api_key/example_dial_api_key.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/viam/examples/dial_api_key/example_dial_api_key.cpp b/src/viam/examples/dial_api_key/example_dial_api_key.cpp index adf1b3de6..5c0a4f687 100644 --- a/src/viam/examples/dial_api_key/example_dial_api_key.cpp +++ b/src/viam/examples/dial_api_key/example_dial_api_key.cpp @@ -29,8 +29,7 @@ namespace po = boost::program_options; int main(int argc, char* argv[]) { po::options_description desc("Allowed options"); - desc.add_options()( - "help", "List options and exit")( + desc.add_options()("help", "List options and exit")( "uri", po::value(), "URI of robot")( "entity", po::value(), "api key ID")( "api-key", po::value(), "api key secret");