Fix linting issues found by clang-tidy 6.0 (#56)

* clang-tidy fixes

* clang-tidy linting issues fixed manually

Author: mm318

cloudwatch_logger/include/cloudwatch_logger/log_node.h

@@ -34,8 +34,16 @@ class LogNode : public Service
 {
 public:
   struct Options {
-    int8_t min_log_severity;
-    bool publish_topic_names;
+    Options() = default;
+
+    template<class UnorderedSet>
+    Options(int8_t severity, bool publish, UnorderedSet && nodes)
+      : min_log_severity(severity),
+        publish_topic_names(publish),
+        ignore_nodes(std::forward<UnorderedSet>(nodes)) {}
+
+    int8_t min_log_severity = rosgraph_msgs::Log::DEBUG;
+    bool publish_topic_names = true;
     std::unordered_set<std::string> ignore_nodes;
   };
 
@@ -62,7 +70,7 @@ class LogNode : public Service
   /**
    *  @brief Tears down a AWSCloudWatchLogNode object
    */
-  ~LogNode();
+  ~LogNode() override;
 
   /**
    * @brief Reads creds, region, and SDK option to configure log manager
@@ -76,7 +84,7 @@ class LogNode : public Service
   void Initialize(const std::string & log_group, const std::string & log_stream,
                   const Aws::Client::ClientConfiguration & config, Aws::SDKOptions & sdk_options,
                   const Aws::CloudWatchLogs::CloudWatchOptions & cloudwatch_options,
-                  std::shared_ptr<LogServiceFactory> log_service_factory = std::make_shared<LogServiceFactory>());
+                  const std::shared_ptr<LogServiceFactory>& log_service_factory = std::make_shared<LogServiceFactory>());
 
   bool start() override;
   bool shutdown() override;
@@ -94,7 +102,7 @@ class LogNode : public Service
    *
    * @param timer A ros timer
    */
-  void TriggerLogPublisher(const ros::TimerEvent &);
+  void TriggerLogPublisher(const ros::TimerEvent & /*unused*/);
 
   /**
    * Return a Trigger response detailing the LogService online status.

cloudwatch_logger/include/cloudwatch_logger/log_node_param_helper.h

@@ -69,7 +69,7 @@ constexpr bool kNodePublishTopicNamesDefaultValue = true;
  * as returned by \p parameter_reader
  */
 Aws::AwsError ReadPublishFrequency(
-  std::shared_ptr<Aws::Client::ParameterReaderInterface> parameter_reader,
+  const std::shared_ptr<Aws::Client::ParameterReaderInterface>& parameter_reader,
   double & publish_frequency);
 
 /**
@@ -80,7 +80,7 @@ Aws::AwsError ReadPublishFrequency(
  * @return an error code that indicates whether the parameter was read successfully or not, 
  * as returned by \p parameter_reader
  */
-Aws::AwsError ReadLogGroup(std::shared_ptr<Aws::Client::ParameterReaderInterface> parameter_reader,
+Aws::AwsError ReadLogGroup(const std::shared_ptr<Aws::Client::ParameterReaderInterface>& parameter_reader,
                            std::string & log_group);
 
 /**
@@ -91,7 +91,7 @@ Aws::AwsError ReadLogGroup(std::shared_ptr<Aws::Client::ParameterReaderInterface
  * @return an error code that indicates whether the parameter was read successfully or not, 
  * as returned by \p parameter_reader
  */
-Aws::AwsError ReadLogStream(std::shared_ptr<Aws::Client::ParameterReaderInterface> parameter_reader,
+Aws::AwsError ReadLogStream(const std::shared_ptr<Aws::Client::ParameterReaderInterface>& parameter_reader,
                             std::string & log_stream);
 
 /**
@@ -103,7 +103,7 @@ Aws::AwsError ReadLogStream(std::shared_ptr<Aws::Client::ParameterReaderInterfac
  * as returned by \p parameter_reader
  */
 Aws::AwsError ReadSubscribeToRosout(
-  std::shared_ptr<Aws::Client::ParameterReaderInterface> parameter_reader,
+  const std::shared_ptr<Aws::Client::ParameterReaderInterface>& parameter_reader,
   bool & subscribe_to_rosout);
 
 /**
@@ -116,7 +116,7 @@ Aws::AwsError ReadSubscribeToRosout(
  * as returned by \p parameter_reader
  */
 Aws::AwsError ReadMinLogVerbosity(
-  std::shared_ptr<Aws::Client::ParameterReaderInterface> parameter_reader,
+  const std::shared_ptr<Aws::Client::ParameterReaderInterface>& parameter_reader,
   int8_t & min_log_verbosity);
 
 /**
@@ -146,8 +146,8 @@ Aws::AwsError ReadPublishTopicNames(
  */
 Aws::AwsError ReadSubscriberList(
   bool subscribe_to_rosout,
-  std::shared_ptr<Aws::Client::ParameterReaderInterface> parameter_reader,
-  boost::function<void(const rosgraph_msgs::Log::ConstPtr &)> callback,
+  const std::shared_ptr<Aws::Client::ParameterReaderInterface>& parameter_reader,
+  const boost::function<void(const rosgraph_msgs::Log::ConstPtr &)>& callback,
   ros::NodeHandle & nh,
   std::vector<ros::Subscriber> & subscriptions);
 
@@ -160,7 +160,7 @@ Aws::AwsError ReadSubscriberList(
  * as returned by \p parameter_reader
  */
 Aws::AwsError ReadIgnoreNodesSet(
-  std::shared_ptr<Aws::Client::ParameterReaderInterface> parameter_reader,
+  const std::shared_ptr<Aws::Client::ParameterReaderInterface>& parameter_reader,
   std::unordered_set<std::string> & ignore_nodes);
 
 /**
@@ -172,7 +172,7 @@ Aws::AwsError ReadIgnoreNodesSet(
  * as returned by \p parameter_reader
  */
 void ReadCloudWatchOptions(
-  std::shared_ptr<Aws::Client::ParameterReaderInterface> parameter_reader,
+  const std::shared_ptr<Aws::Client::ParameterReaderInterface>& parameter_reader,
   Aws::CloudWatchLogs::CloudWatchOptions & cloudwatch_options);
 
 /**
@@ -184,7 +184,7 @@ void ReadCloudWatchOptions(
  * as returned by \p parameter_reader
  */
 void ReadUploaderOptions(
-  std::shared_ptr<Aws::Client::ParameterReaderInterface> parameter_reader,
+  const std::shared_ptr<Aws::Client::ParameterReaderInterface>& parameter_reader,
   Aws::DataFlow::UploaderOptions & uploader_options);
 
 /**
@@ -196,7 +196,7 @@ void ReadUploaderOptions(
  * as returned by \p parameter_reader
  */
 void ReadFileManagerStrategyOptions(
-  std::shared_ptr<Aws::Client::ParameterReaderInterface> parameter_reader,
+  const std::shared_ptr<Aws::Client::ParameterReaderInterface>& parameter_reader,
   Aws::FileManagement::FileManagerStrategyOptions & file_manager_strategy_options);
 
 /**
@@ -210,7 +210,7 @@ void ReadFileManagerStrategyOptions(
  * as returned by \p parameter_reader
  */
 void ReadOption(
-  std::shared_ptr<Aws::Client::ParameterReaderInterface> parameter_reader,
+  const std::shared_ptr<Aws::Client::ParameterReaderInterface>& parameter_reader,
   const std::string & option_key,
   const std::string & default_value,
   std::string & option_value);
@@ -226,7 +226,7 @@ void ReadOption(
  * as returned by \p parameter_reader
  */
 void ReadOption(
-  std::shared_ptr<Aws::Client::ParameterReaderInterface> parameter_reader,
+  const std::shared_ptr<Aws::Client::ParameterReaderInterface>& parameter_reader,
   const std::string & option_key,
   const size_t & default_value,
   size_t & option_value);

cloudwatch_logger/src/log_node.cpp

@@ -28,22 +28,25 @@
 #include <std_srvs/Trigger.h>
 #include <std_srvs/Empty.h>
 
-using namespace Aws::CloudWatchLogs::Utils;
+
+namespace Aws {
+namespace CloudWatchLogs {
+namespace Utils {
 
 LogNode::LogNode(const Options & options)
   : min_log_severity_(options.min_log_severity),
     ignore_nodes_(options.ignore_nodes),
     publish_topic_names_(options.publish_topic_names) {}
 
 LogNode::LogNode(int8_t min_log_severity, std::unordered_set<std::string> ignore_nodes)
-  : LogNode(Options{min_log_severity, true, std::move(ignore_nodes)}) {}
+  : LogNode(Options(min_log_severity, true, std::move(ignore_nodes))) {}
 
 LogNode::~LogNode() { this->log_service_ = nullptr; }
 
 void LogNode::Initialize(const std::string & log_group, const std::string & log_stream,
                          const Aws::Client::ClientConfiguration & config, Aws::SDKOptions & sdk_options,
                          const Aws::CloudWatchLogs::CloudWatchOptions & cloudwatch_options,
-                         std::shared_ptr<LogServiceFactory> factory)
+                         const std::shared_ptr<LogServiceFactory>& factory)
 {
   this->log_service_ = factory->CreateLogService(log_group, log_stream, config, sdk_options, cloudwatch_options);
 }
@@ -96,7 +99,7 @@ void LogNode::RecordLogs(const rosgraph_msgs::Log::ConstPtr & log_msg)
   }
 }
 
-void LogNode::TriggerLogPublisher(const ros::TimerEvent &) {
+void LogNode::TriggerLogPublisher(const ros::TimerEvent & /*unused*/) {
   this->log_service_->publishBatchedData();
 }
 
@@ -149,3 +152,7 @@ const std::string LogNode::FormatLogs(const rosgraph_msgs::Log::ConstPtr & log_m
 
   return ss.str();
 }
+
+}  // namespace Utils
+}  // namespace CloudWatchLogs
+}  // namespace Aws

cloudwatch_logger/src/log_node_param_helper.cpp

@@ -18,15 +18,14 @@
 #include <aws/core/utils/logging/LogMacros.h>
 #include <cloudwatch_logs_common/cloudwatch_options.h>
 
-
-using namespace Aws::Client;
+using Aws::Client::ParameterPath;
 
 namespace Aws {
 namespace CloudWatchLogs {
 namespace Utils {
 
 Aws::AwsError ReadPublishFrequency(
-  std::shared_ptr<Aws::Client::ParameterReaderInterface> parameter_reader,
+  const std::shared_ptr<Aws::Client::ParameterReaderInterface>& parameter_reader,
   double & publish_frequency)
 {
   Aws::AwsError ret =
@@ -51,7 +50,7 @@ Aws::AwsError ReadPublishFrequency(
   return ret;
 }
 
-Aws::AwsError ReadLogGroup(std::shared_ptr<Aws::Client::ParameterReaderInterface> parameter_reader,
+Aws::AwsError ReadLogGroup(const std::shared_ptr<Aws::Client::ParameterReaderInterface>& parameter_reader,
                            std::string & log_group)
 {
   Aws::AwsError ret = parameter_reader->ReadParam(ParameterPath(kNodeParamLogGroupNameKey), log_group);
@@ -74,7 +73,7 @@ Aws::AwsError ReadLogGroup(std::shared_ptr<Aws::Client::ParameterReaderInterface
   return ret;
 }
 
-Aws::AwsError ReadLogStream(std::shared_ptr<Aws::Client::ParameterReaderInterface> parameter_reader,
+Aws::AwsError ReadLogStream(const std::shared_ptr<Aws::Client::ParameterReaderInterface>& parameter_reader,
                             std::string & log_stream)
 {
   Aws::AwsError ret = parameter_reader->ReadParam(ParameterPath(kNodeParamLogStreamNameKey), log_stream);
@@ -98,7 +97,7 @@ Aws::AwsError ReadLogStream(std::shared_ptr<Aws::Client::ParameterReaderInterfac
 }
 
 Aws::AwsError ReadSubscribeToRosout(
-  std::shared_ptr<Aws::Client::ParameterReaderInterface> parameter_reader,
+  const std::shared_ptr<Aws::Client::ParameterReaderInterface>& parameter_reader,
   bool & subscribe_to_rosout)
 {
   Aws::AwsError ret =
@@ -127,7 +126,7 @@ Aws::AwsError ReadSubscribeToRosout(
 }
 
 Aws::AwsError ReadMinLogVerbosity(
-  std::shared_ptr<Aws::Client::ParameterReaderInterface> parameter_reader,
+  const std::shared_ptr<Aws::Client::ParameterReaderInterface>& parameter_reader,
   int8_t & min_log_verbosity)
 {
   min_log_verbosity = kNodeMinLogVerbosityDefaultValue;
@@ -204,8 +203,8 @@ Aws::AwsError ReadPublishTopicNames(
 
 Aws::AwsError ReadSubscriberList(
   const bool subscribe_to_rosout,
-  std::shared_ptr<Aws::Client::ParameterReaderInterface> parameter_reader,
-  boost::function<void(const rosgraph_msgs::Log::ConstPtr &)> callback,
+  const std::shared_ptr<Aws::Client::ParameterReaderInterface>& parameter_reader,
+  const boost::function<void(const rosgraph_msgs::Log::ConstPtr &)>& callback,
   ros::NodeHandle & nh,
   std::vector<ros::Subscriber> & subscriptions)
 {
@@ -226,7 +225,7 @@ Aws::AwsError ReadSubscriberList(
 }
 
 Aws::AwsError ReadIgnoreNodesSet(
-  std::shared_ptr<Aws::Client::ParameterReaderInterface> parameter_reader,
+  const std::shared_ptr<Aws::Client::ParameterReaderInterface>& parameter_reader,
   std::unordered_set<std::string> & ignore_nodes)
 {
   std::vector<std::string> ignore_list;
@@ -248,10 +247,10 @@ Aws::AwsError ReadIgnoreNodesSet(
 }
 
 void ReadCloudWatchOptions(
-  std::shared_ptr<Aws::Client::ParameterReaderInterface> parameter_reader,
+  const std::shared_ptr<Aws::Client::ParameterReaderInterface>& parameter_reader,
   Aws::CloudWatchLogs::CloudWatchOptions & cloudwatch_options) {
 
-  Aws::DataFlow::UploaderOptions uploader_options;
+  Aws::DataFlow::UploaderOptions uploader_options{};
   Aws::FileManagement::FileManagerStrategyOptions file_manager_strategy_options;
 
   ReadUploaderOptions(parameter_reader, uploader_options);
@@ -264,7 +263,7 @@ void ReadCloudWatchOptions(
 }
 
 void ReadUploaderOptions(
-  std::shared_ptr<Aws::Client::ParameterReaderInterface> parameter_reader,
+  const std::shared_ptr<Aws::Client::ParameterReaderInterface>& parameter_reader,
   Aws::DataFlow::UploaderOptions & uploader_options) {
 
   ReadOption(
@@ -304,7 +303,7 @@ void ReadUploaderOptions(
 }
 
 void ReadFileManagerStrategyOptions(
-  std::shared_ptr<Aws::Client::ParameterReaderInterface> parameter_reader,
+  const std::shared_ptr<Aws::Client::ParameterReaderInterface>& parameter_reader,
   Aws::FileManagement::FileManagerStrategyOptions & file_manager_strategy_options) {
 
   ReadOption(
@@ -339,7 +338,7 @@ void ReadFileManagerStrategyOptions(
 }
 
 void ReadOption(
-  std::shared_ptr<Aws::Client::ParameterReaderInterface> parameter_reader,
+  const std::shared_ptr<Aws::Client::ParameterReaderInterface>& parameter_reader,
   const std::string & option_key,
   const std::string & default_value,
   std::string & option_value) {
@@ -361,7 +360,7 @@ void ReadOption(
 }
 
 void ReadOption(
-  std::shared_ptr<Aws::Client::ParameterReaderInterface> parameter_reader,
+  const std::shared_ptr<Aws::Client::ParameterReaderInterface>& parameter_reader,
   const std::string & option_key,
   const size_t & default_value,
   size_t & option_value) {
@@ -374,7 +373,7 @@ void ReadOption(
                          option_key << " parameter not found, setting to default value: " << default_value);
       break;
     case Aws::AwsError::AWS_ERR_OK:
-      option_value = (size_t)return_value;
+      option_value = static_cast<size_t>(return_value);
       AWS_LOGSTREAM_INFO(__func__, option_key << " is set to: " << option_value);
       break;
     default:

cloudwatch_logger/test/log_node_param_helper_test.cpp

@@ -21,7 +21,6 @@
 
 using namespace Aws::Client;
 using namespace Aws::CloudWatchLogs::Utils;
-using ::testing::_;
 using ::testing::Eq;
 using ::testing::A;
 using ::testing::InSequence;

cloudwatch_logger/test/log_node_test.cpp

@@ -23,8 +23,11 @@
 #include <cloudwatch_logs_common/log_service_factory.h>
 #include <rosgraph_msgs/Log.h>
 
+#include <utility>
+
 using namespace Aws::CloudWatchLogs;
 using namespace Aws::CloudWatchLogs::Utils;
+using namespace Aws::FileManagement;
 using ::testing::_;
 using ::testing::AllOf;
 using ::testing::HasSubstr;
@@ -69,7 +72,7 @@ class LogServiceMock : public LogService
     LogServiceMock(std::shared_ptr<Publisher<LogCollection>> log_publisher,
                std::shared_ptr<DataBatcher<LogType>> log_batcher,
                std::shared_ptr<FileUploadStreamer<LogCollection>> log_file_upload_streamer = nullptr)
-               : LogService(log_publisher, log_batcher, log_file_upload_streamer) {}
+               : LogService(std::move(log_publisher), std::move(log_batcher), std::move(log_file_upload_streamer)) {}
 
     MOCK_METHOD1(batchData, bool(const std::string & data_to_batch));
     MOCK_METHOD0(start, bool());