Rename ExternalIPsConfig() -> GetExternalIPsConfig()

Author: ovalenti

collector/lib/CollectorConfig.cpp

@@ -438,7 +438,7 @@ std::ostream& operator<<(std::ostream& os, const CollectorConfig& c) {
          << ", set_import_users:" << c.ImportUsers()
          << ", collect_connection_status:" << c.CollectConnectionStatus()
          << ", enable_detailed_metrics:" << c.EnableDetailedMetrics()
-         << ", external_ips:" << c.ExternalIPsConf()
+         << ", external_ips:" << c.GetExternalIPsConf()
          << ", track_send_recv:" << c.TrackingSendRecv();
 }
 

collector/lib/CollectorConfig.h

@@ -95,10 +95,10 @@ class CollectorConfig {
   bool ImportUsers() const { return import_users_; }
   bool CollectConnectionStatus() const { return collect_connection_status_; }
 
-  // EnableExternalIPs will check for the existence
+  // GetEnableExternalIPs will check for the existence
   // of a runtime configuration, and defer to that value
   // otherwise, we rely on the feature flag (env var)
-  ExternalIPsConfig ExternalIPsConf() const {
+  ExternalIPsConfig GetExternalIPsConf() const {
     auto lock = ReadLock();
 
     return ExternalIPsConfig(runtime_config_, enable_external_ips_);

collector/lib/NetworkStatusNotifier.cpp

@@ -225,7 +225,7 @@ void NetworkStatusNotifier::RunSingle(IDuplexClientWriter<sensor::NetworkConnect
   auto next_scrape = std::chrono::system_clock::now();
   int64_t time_at_last_scrape = NowMicros();
 
-  ExternalIPsConfig prevEnableExternalIPs = config_.ExternalIPsConf();
+  ExternalIPsConfig prevEnableExternalIPs = config_.GetExternalIPsConf();
 
   while (writer->Sleep(next_scrape)) {
     CLOG(DEBUG) << "Starting network status notification";
@@ -242,7 +242,7 @@ void NetworkStatusNotifier::RunSingle(IDuplexClientWriter<sensor::NetworkConnect
     const sensor::NetworkConnectionInfoMessage* msg;
     ConnMap new_conn_state, delta_conn;
     AdvertisedEndpointMap new_cep_state;
-    ExternalIPsConfig externalIPsConfig = config_.ExternalIPsConf();
+    ExternalIPsConfig externalIPsConfig = config_.GetExternalIPsConf();
 
     WITH_TIMER(CollectorStats::net_fetch_state) {
       conn_tracker_->SetExternalIPsConfig(externalIPsConfig);

collector/test/CollectorConfigTest.cpp

@@ -116,11 +116,11 @@ TEST(CollectorConfigTest, TestEnableExternalIpsFeatureFlag) {
 
   config.MockSetEnableExternalIPs(false);
 
-  EXPECT_EQ(Direction::NONE, config.ExternalIPsConf().GetDirection());
+  EXPECT_EQ(Direction::NONE, config.GetExternalIPsConf().GetDirection());
 
   config.MockSetEnableExternalIPs(true);
 
-  EXPECT_EQ(Direction::BOTH, config.ExternalIPsConf().GetDirection());
+  EXPECT_EQ(Direction::BOTH, config.GetExternalIPsConf().GetDirection());
 }
 
 TEST(CollectorConfigTest, TestEnableExternalIpsRuntimeConfig) {
@@ -139,20 +139,20 @@ TEST(CollectorConfigTest, TestEnableExternalIpsRuntimeConfig) {
 
   config.SetRuntimeConfig(runtime_config);
 
-  EXPECT_EQ(Direction::NONE, config.ExternalIPsConf().GetDirection());
-  EXPECT_FALSE(config.ExternalIPsConf().IsEnabled(Direction::INGRESS));
-  EXPECT_FALSE(config.ExternalIPsConf().IsEnabled(Direction::EGRESS));
-  EXPECT_FALSE(config.ExternalIPsConf().IsEnabled(Direction::BOTH));
+  EXPECT_EQ(Direction::NONE, config.GetExternalIPsConf().GetDirection());
+  EXPECT_FALSE(config.GetExternalIPsConf().IsEnabled(Direction::INGRESS));
+  EXPECT_FALSE(config.GetExternalIPsConf().IsEnabled(Direction::EGRESS));
+  EXPECT_FALSE(config.GetExternalIPsConf().IsEnabled(Direction::BOTH));
 
   config.MockSetEnableExternalIPs(false);
 
   external_ips_config->set_enabled(sensor::ExternalIpsEnabled::ENABLED);
   config.SetRuntimeConfig(runtime_config);
 
-  EXPECT_EQ(Direction::BOTH, config.ExternalIPsConf().GetDirection());
-  EXPECT_TRUE(config.ExternalIPsConf().IsEnabled(Direction::INGRESS));
-  EXPECT_TRUE(config.ExternalIPsConf().IsEnabled(Direction::EGRESS));
-  EXPECT_TRUE(config.ExternalIPsConf().IsEnabled(Direction::BOTH));
+  EXPECT_EQ(Direction::BOTH, config.GetExternalIPsConf().GetDirection());
+  EXPECT_TRUE(config.GetExternalIPsConf().IsEnabled(Direction::INGRESS));
+  EXPECT_TRUE(config.GetExternalIPsConf().IsEnabled(Direction::EGRESS));
+  EXPECT_TRUE(config.GetExternalIPsConf().IsEnabled(Direction::BOTH));
 }
 
 }  // namespace collector

collector/test/ConfigLoaderTest.cpp

@@ -363,7 +363,7 @@ TEST(CollectorConfigTest, TestYamlConfigToConfigMultiple) {
 
     EXPECT_TRUE(runtime_config.has_value());
 
-    EXPECT_EQ(config.ExternalIPsConf().GetDirection(), expected);
+    EXPECT_EQ(config.GetExternalIPsConf().GetDirection(), expected);
   }
 }