From 8cf250022dd71ae8b27be862a6621f67ed73a5e6 Mon Sep 17 00:00:00 2001 From: Andrew Emil Date: Mon, 26 Mar 2018 11:11:40 -0400 Subject: [PATCH 1/4] Rename MetadataAgentConfiguration to Configuration --- src/agent.cc | 2 +- src/agent.h | 8 ++++---- src/api_server.cc | 4 ++-- src/api_server.h | 8 ++++---- src/configuration.cc | 12 ++++++------ src/configuration.h | 10 +++++----- src/docker.cc | 2 +- src/docker.h | 8 ++++---- src/environment.cc | 2 +- src/environment.h | 6 +++--- src/health_checker.cc | 2 +- src/health_checker.h | 4 ++-- src/instance.cc | 2 +- src/instance.h | 8 ++++---- src/kubernetes.cc | 4 ++-- src/kubernetes.h | 9 ++++----- src/metadatad.cc | 2 +- src/reporter.cc | 2 +- src/reporter.h | 6 +++--- src/store.cc | 2 +- src/store.h | 6 +++--- src/updater.cc | 4 ++-- src/updater.h | 10 +++++----- test/configuration_unittest.cc | 22 +++++++++++----------- test/health_checker_unittest.cc | 8 ++++---- 25 files changed, 76 insertions(+), 77 deletions(-) diff --git a/src/agent.cc b/src/agent.cc index c2e094a9..57507b1a 100644 --- a/src/agent.cc +++ b/src/agent.cc @@ -23,7 +23,7 @@ namespace google { -MetadataAgent::MetadataAgent(const MetadataAgentConfiguration& config) +MetadataAgent::MetadataAgent(const Configuration& config) : config_(config), store_(config_), health_checker_(config) {} MetadataAgent::~MetadataAgent() {} diff --git a/src/agent.h b/src/agent.h index 9566c8b6..05364671 100644 --- a/src/agent.h +++ b/src/agent.h @@ -24,7 +24,7 @@ namespace google { // Configuration object. -class MetadataAgentConfiguration; +class Configuration; // A server that implements the metadata agent API. class MetadataApiServer; @@ -35,13 +35,13 @@ class MetadataReporter; // Runs the metadata tasks. class MetadataAgent { public: - MetadataAgent(const MetadataAgentConfiguration& config); + MetadataAgent(const Configuration& config); ~MetadataAgent(); // Starts serving. void start(); - const MetadataAgentConfiguration& config() const { + const Configuration& config() const { return config_; } @@ -58,7 +58,7 @@ class MetadataAgent { } private: - const MetadataAgentConfiguration& config_; + const Configuration& config_; HealthChecker health_checker_; // The store for the metadata. diff --git a/src/api_server.cc b/src/api_server.cc index c673854e..8bd5b7f0 100644 --- a/src/api_server.cc +++ b/src/api_server.cc @@ -25,7 +25,7 @@ namespace google { -MetadataApiServer::Handler::Handler(const MetadataAgentConfiguration& config, +MetadataApiServer::Handler::Handler(const Configuration& config, const MetadataStore& store) : config_(config), store_(store) {} @@ -66,7 +66,7 @@ void MetadataApiServer::Handler::log(const HttpServer::string_type& info) { } -MetadataApiServer::MetadataApiServer(const MetadataAgentConfiguration& config, +MetadataApiServer::MetadataApiServer(const Configuration& config, const MetadataStore& store, int server_threads, const std::string& host, int port) diff --git a/src/api_server.h b/src/api_server.h index 72efcf8c..90764ed5 100644 --- a/src/api_server.h +++ b/src/api_server.h @@ -27,7 +27,7 @@ namespace http = boost::network::http; namespace google { // Configuration object. -class MetadataAgentConfiguration; +class Configuration; // Storage for the metadata mapping. class MetadataStore; @@ -35,7 +35,7 @@ class MetadataStore; // A server that implements the metadata agent API. class MetadataApiServer { public: - MetadataApiServer(const MetadataAgentConfiguration& config, + MetadataApiServer(const Configuration& config, const MetadataStore& store, int server_threads, const std::string& host, int port); ~MetadataApiServer(); @@ -45,13 +45,13 @@ class MetadataApiServer { using HttpServer = http::server; class Handler { public: - Handler(const MetadataAgentConfiguration& config, + Handler(const Configuration& config, const MetadataStore& store); void operator()(const HttpServer::request& request, std::shared_ptr conn); void log(const HttpServer::string_type& info); private: - const MetadataAgentConfiguration& config_; + const Configuration& config_; const MetadataStore& store_; }; diff --git a/src/configuration.cc b/src/configuration.cc index e41c8876..360a43b7 100644 --- a/src/configuration.cc +++ b/src/configuration.cc @@ -75,7 +75,7 @@ constexpr const char kDefaultHealthCheckFile[] = } -MetadataAgentConfiguration::MetadataAgentConfiguration() +Configuration::Configuration() : project_id_(kDefaultProjectId), credentials_file_(kDefaultCredentialsFile), verbose_logging_(false), @@ -116,12 +116,12 @@ MetadataAgentConfiguration::MetadataAgentConfiguration() instance_zone_(kDefaultInstanceZone), health_check_file_(kDefaultHealthCheckFile) {} -MetadataAgentConfiguration::MetadataAgentConfiguration(std::istream& input) - : MetadataAgentConfiguration() { +Configuration::Configuration(std::istream& input) + : Configuration() { ParseConfiguration(input); } -int MetadataAgentConfiguration::ParseArguments(int ac, char** av) { +int Configuration::ParseArguments(int ac, char** av) { std::string config_file; boost::program_options::options_description flags_desc; flags_desc.add_options() @@ -167,14 +167,14 @@ int MetadataAgentConfiguration::ParseArguments(int ac, char** av) { } } -void MetadataAgentConfiguration::ParseConfigFile(const std::string& filename) { +void Configuration::ParseConfigFile(const std::string& filename) { if (filename.empty()) return; std::ifstream input(filename); ParseConfiguration(input); } -void MetadataAgentConfiguration::ParseConfiguration(std::istream& input) { +void Configuration::ParseConfiguration(std::istream& input) { YAML::Node config = YAML::Load(input); std::lock_guard lock(mutex_); project_id_ = diff --git a/src/configuration.h b/src/configuration.h index 214d4152..dd426a2a 100644 --- a/src/configuration.h +++ b/src/configuration.h @@ -23,13 +23,13 @@ int main(int, char**); namespace google { -class MetadataAgentConfiguration { +class Configuration { public: - MetadataAgentConfiguration(); - MetadataAgentConfiguration(std::istream& input); + Configuration(); + Configuration(std::istream& input); // Used to accept inline construction of streams. - MetadataAgentConfiguration(std::istream&& input) - : MetadataAgentConfiguration(input) {} + Configuration(std::istream&& input) + : Configuration(input) {} // Shared configuration. const std::string& ProjectId() const { diff --git a/src/docker.cc b/src/docker.cc index 73770ac7..cd77ecc4 100644 --- a/src/docker.cc +++ b/src/docker.cc @@ -45,7 +45,7 @@ constexpr const char kDockerContainerResourcePrefix[] = "container"; } -DockerReader::DockerReader(const MetadataAgentConfiguration& config) +DockerReader::DockerReader(const Configuration& config) : config_(config), environment_(config) {} bool DockerReader::ValidateConfiguration() const { diff --git a/src/docker.h b/src/docker.h index 763352c1..44d39276 100644 --- a/src/docker.h +++ b/src/docker.h @@ -24,14 +24,14 @@ namespace google { // Configuration object. -class MetadataAgentConfiguration; +class Configuration; // Storage for the metadata mapping. class MetadataStore; class DockerReader { public: - DockerReader(const MetadataAgentConfiguration& config); + DockerReader(const Configuration& config); // A Docker metadata query function. std::vector MetadataQuery() const; @@ -59,13 +59,13 @@ class DockerReader { const json::Object* container, Timestamp collected_at) const throw(json::Exception); - const MetadataAgentConfiguration& config_; + const Configuration& config_; Environment environment_; }; class DockerUpdater : public PollingMetadataUpdater { public: - DockerUpdater(const MetadataAgentConfiguration& config, + DockerUpdater(const Configuration& config, MetadataStore* store) : reader_(config), PollingMetadataUpdater( config, store, "DockerUpdater", diff --git a/src/environment.cc b/src/environment.cc index 349b3057..2f459bf3 100644 --- a/src/environment.cc +++ b/src/environment.cc @@ -77,7 +77,7 @@ constexpr const char kGceInstanceResourceType[] = "gce_instance"; } -Environment::Environment(const MetadataAgentConfiguration& config) +Environment::Environment(const Configuration& config) : config_(config), application_default_credentials_read_(false) {} std::string Environment::GetMetadataString(const std::string& path) const { diff --git a/src/environment.h b/src/environment.h index 5f79491c..7f5d7206 100644 --- a/src/environment.h +++ b/src/environment.h @@ -26,7 +26,7 @@ namespace google { class Environment { public: - Environment(const MetadataAgentConfiguration& config); + Environment(const Configuration& config); const std::string& NumericProjectId() const; const std::string& InstanceResourceType() const; @@ -39,14 +39,14 @@ class Environment { std::string GetMetadataString(const std::string& path) const; - const MetadataAgentConfiguration& config() const { + const Configuration& config() const { return config_; } private: void ReadApplicationDefaultCredentials() const; - const MetadataAgentConfiguration& config_; + const Configuration& config_; // Cached data. mutable std::mutex mutex_; diff --git a/src/health_checker.cc b/src/health_checker.cc index 88a06dc0..2b783964 100644 --- a/src/health_checker.cc +++ b/src/health_checker.cc @@ -23,7 +23,7 @@ namespace google { -HealthChecker::HealthChecker(const MetadataAgentConfiguration& config) +HealthChecker::HealthChecker(const Configuration& config) : config_(config) { boost::filesystem::create_directories( boost::filesystem::path(config_.HealthCheckFile()).parent_path()); diff --git a/src/health_checker.h b/src/health_checker.h index 828a7d96..0afb107b 100644 --- a/src/health_checker.h +++ b/src/health_checker.h @@ -27,7 +27,7 @@ namespace google { // Collects and reports health information about the metadata agent. class HealthChecker { public: - HealthChecker(const MetadataAgentConfiguration& config); + HealthChecker(const Configuration& config); void SetUnhealthy(const std::string& component); private: @@ -36,7 +36,7 @@ class HealthChecker { bool IsHealthy() const; void CleanupForTest(); - const MetadataAgentConfiguration& config_; + const Configuration& config_; std::set unhealthy_components_; mutable std::mutex mutex_; }; diff --git a/src/instance.cc b/src/instance.cc index 218797d3..1ed377ca 100644 --- a/src/instance.cc +++ b/src/instance.cc @@ -29,7 +29,7 @@ namespace http = boost::network::http; namespace google { -InstanceReader::InstanceReader(const MetadataAgentConfiguration& config) +InstanceReader::InstanceReader(const Configuration& config) : config_(config), environment_(config) {} /*static*/ diff --git a/src/instance.h b/src/instance.h index 184309a7..eeb15d0c 100644 --- a/src/instance.h +++ b/src/instance.h @@ -25,14 +25,14 @@ namespace google { // Configuration object. -class MetadataAgentConfiguration; +class Configuration; // Storage for the metadata mapping. class MetadataStore; class InstanceReader { public: - InstanceReader(const MetadataAgentConfiguration& config); + InstanceReader(const Configuration& config); // A Instance metadata query function. std::vector MetadataQuery() const; @@ -40,13 +40,13 @@ class InstanceReader { static MonitoredResource InstanceResource(const Environment& environment); private: - const MetadataAgentConfiguration& config_; + const Configuration& config_; Environment environment_; }; class InstanceUpdater : public PollingMetadataUpdater { public: - InstanceUpdater(const MetadataAgentConfiguration& config, + InstanceUpdater(const Configuration& config, MetadataStore* store) : reader_(config), PollingMetadataUpdater( config, store, "InstanceUpdater", diff --git a/src/kubernetes.cc b/src/kubernetes.cc index ad2293b3..972c59b8 100644 --- a/src/kubernetes.cc +++ b/src/kubernetes.cc @@ -89,7 +89,7 @@ bool ReadServiceAccountSecret( } -KubernetesReader::KubernetesReader(const MetadataAgentConfiguration& config, +KubernetesReader::KubernetesReader(const Configuration& config, HealthChecker* health_checker) : config_(config), environment_(config), health_checker_(health_checker) {} @@ -1164,7 +1164,7 @@ void KubernetesReader::WatchNodes( LOG(INFO) << "Watch thread (node) exiting"; } -KubernetesUpdater::KubernetesUpdater(const MetadataAgentConfiguration& config, +KubernetesUpdater::KubernetesUpdater(const Configuration& config, HealthChecker* health_checker, MetadataStore* store) : reader_(config, health_checker), PollingMetadataUpdater( diff --git a/src/kubernetes.h b/src/kubernetes.h index d8b5414a..38e95e30 100644 --- a/src/kubernetes.h +++ b/src/kubernetes.h @@ -31,14 +31,14 @@ namespace google { // Configuration object. -class MetadataAgentConfiguration; +class Configuration; // Storage for the metadata mapping. class MetadataStore; class KubernetesReader { public: - KubernetesReader(const MetadataAgentConfiguration& config, + KubernetesReader(const Configuration& config, HealthChecker* health_checker); // A Kubernetes metadata query function. std::vector MetadataQuery() const; @@ -152,15 +152,14 @@ class KubernetesReader { // A memoized map from an encoded owner reference to the owner object. mutable std::map owners_; - const MetadataAgentConfiguration& config_; + const Configuration& config_; HealthChecker* health_checker_; Environment environment_; }; class KubernetesUpdater : public PollingMetadataUpdater { public: - KubernetesUpdater(const MetadataAgentConfiguration& config, - HealthChecker* health_checker, + KubernetesUpdater(const Configuration& config, HealthChecker* health_checker, MetadataStore* store); ~KubernetesUpdater() { if (node_watch_thread_.joinable()) { diff --git a/src/metadatad.cc b/src/metadatad.cc index 4c5bb66e..bd2f0bb8 100644 --- a/src/metadatad.cc +++ b/src/metadatad.cc @@ -21,7 +21,7 @@ #include "kubernetes.h" int main(int ac, char** av) { - google::MetadataAgentConfiguration config; + google::Configuration config; int parse_result = config.ParseArguments(ac, av); if (parse_result) { return parse_result < 0 ? 0 : parse_result; diff --git a/src/reporter.cc b/src/reporter.cc index 4bc74c2b..767a39b6 100644 --- a/src/reporter.cc +++ b/src/reporter.cc @@ -29,7 +29,7 @@ namespace http = boost::network::http; namespace google { -MetadataReporter::MetadataReporter(const MetadataAgentConfiguration& config, +MetadataReporter::MetadataReporter(const Configuration& config, MetadataStore* store, double period_s) : store_(store), config_(config), diff --git a/src/reporter.h b/src/reporter.h index 334d8700..18d56e2e 100644 --- a/src/reporter.h +++ b/src/reporter.h @@ -31,12 +31,12 @@ namespace google { // Configuration object. -class MetadataAgentConfiguration; +class Configuration; // A periodic reporter of metadata to Stackdriver. class MetadataReporter { public: - MetadataReporter(const MetadataAgentConfiguration& config, + MetadataReporter(const Configuration& config, MetadataStore* store, double period_s); ~MetadataReporter(); @@ -49,7 +49,7 @@ class MetadataReporter { std::map&& metadata) throw (boost::system::system_error); - const MetadataAgentConfiguration& config_; + const Configuration& config_; MetadataStore* store_; Environment environment_; OAuth2 auth_; diff --git a/src/store.cc b/src/store.cc index ca412e62..98d1f8f5 100644 --- a/src/store.cc +++ b/src/store.cc @@ -26,7 +26,7 @@ MetadataStore::Metadata MetadataStore::Metadata::IGNORED() { return MetadataStore::Metadata(); } -MetadataStore::MetadataStore(const MetadataAgentConfiguration& config) +MetadataStore::MetadataStore(const Configuration& config) : config_(config) {} const MonitoredResource& MetadataStore::LookupResource( diff --git a/src/store.h b/src/store.h index 04efad74..bd1b18e5 100644 --- a/src/store.h +++ b/src/store.h @@ -28,7 +28,7 @@ namespace google { // Configuration object. -class MetadataAgentConfiguration; +class Configuration; // A timestamp type. using Timestamp = time_point; @@ -72,7 +72,7 @@ class MetadataStore { metadata(json::object({})), ignore(true) {} }; - MetadataStore(const MetadataAgentConfiguration& config); + MetadataStore(const Configuration& config); // Looks up the local resource map entry for a given resource id. // Throws an exception if the resource is not found. @@ -96,7 +96,7 @@ class MetadataStore { std::map GetMetadataMap() const; void PurgeDeletedEntries(); - const MetadataAgentConfiguration& config_; + const Configuration& config_; // A lock that guards access to the local resource map. mutable std::mutex resource_mu_; diff --git a/src/updater.cc b/src/updater.cc index 24c535bf..980555df 100644 --- a/src/updater.cc +++ b/src/updater.cc @@ -23,7 +23,7 @@ namespace google { -MetadataUpdater::MetadataUpdater(const MetadataAgentConfiguration& config, +MetadataUpdater::MetadataUpdater(const Configuration& config, MetadataStore* store, const std::string& name) : config_(config), store_(store), name_(name) {} @@ -43,7 +43,7 @@ void MetadataUpdater::stop() { } PollingMetadataUpdater::PollingMetadataUpdater( - const MetadataAgentConfiguration& config, MetadataStore* store, + const Configuration& config, MetadataStore* store, const std::string& name, double period_s, std::function()> query_metadata) : MetadataUpdater(config, store, name), diff --git a/src/updater.h b/src/updater.h index 1738274e..54f46246 100644 --- a/src/updater.h +++ b/src/updater.h @@ -29,7 +29,7 @@ namespace google { // Configuration object. -class MetadataAgentConfiguration; +class Configuration; // An abstract class for asynchronous updates of the metadata mapping. class MetadataUpdater { @@ -47,7 +47,7 @@ class MetadataUpdater { MetadataStore::Metadata metadata; }; - MetadataUpdater(const MetadataAgentConfiguration& config, + MetadataUpdater(const Configuration& config, MetadataStore* store, const std::string& name); virtual ~MetadataUpdater(); @@ -83,7 +83,7 @@ class MetadataUpdater { store_->UpdateMetadata(result.resource, std::move(result.metadata)); } - const MetadataAgentConfiguration& config() { + const Configuration& config() { return config_; } @@ -91,7 +91,7 @@ class MetadataUpdater { // The name of the updater provided by subclasses. std::string name_; - const MetadataAgentConfiguration& config_; + const Configuration& config_; // The store for the metadata. MetadataStore* store_; @@ -101,7 +101,7 @@ class MetadataUpdater { class PollingMetadataUpdater : public MetadataUpdater { public: PollingMetadataUpdater( - const MetadataAgentConfiguration& config, MetadataStore* store, + const Configuration& config, MetadataStore* store, const std::string& name, double period_s, std::function()> query_metadata); ~PollingMetadataUpdater(); diff --git a/test/configuration_unittest.cc b/test/configuration_unittest.cc index 751a09a7..ed20c645 100644 --- a/test/configuration_unittest.cc +++ b/test/configuration_unittest.cc @@ -4,7 +4,7 @@ namespace google { -void VerifyDefaultConfig(const MetadataAgentConfiguration& config) { +void VerifyDefaultConfig(const Configuration& config) { EXPECT_EQ("", config.ProjectId()); EXPECT_EQ("", config.CredentialsFile()); EXPECT_EQ(3, config.MetadataApiNumThreads()); @@ -37,18 +37,18 @@ void VerifyDefaultConfig(const MetadataAgentConfiguration& config) { EXPECT_EQ("/var/run/metadata-agent/health/unhealthy", config.HealthCheckFile()); } -TEST(MetadataAgentConfigurationTest, NoConfig) { - MetadataAgentConfiguration config; +TEST(ConfigurationTest, NoConfig) { + Configuration config; VerifyDefaultConfig(config); } -TEST(MetadataAgentConfigurationTest, EmptyConfig) { - MetadataAgentConfiguration config(std::istringstream("")); +TEST(ConfigurationTest, EmptyConfig) { + Configuration config(std::istringstream("")); VerifyDefaultConfig(config); } -TEST(MetadataAgentConfigurationTest, PopulatedConfig) { - MetadataAgentConfiguration config(std::istringstream( +TEST(ConfigurationTest, PopulatedConfig) { + Configuration config(std::istringstream( "ProjectId: TestProjectId\n" "MetadataApiNumThreads: 13\n" "MetadataReporterPurgeDeleted: true\n" @@ -62,8 +62,8 @@ TEST(MetadataAgentConfigurationTest, PopulatedConfig) { EXPECT_EQ("/a/b/c", config.HealthCheckFile()); } -TEST(MetadataAgentConfigurationTest, CommentSkipped) { - MetadataAgentConfiguration config(std::istringstream( +TEST(ConfigurationTest, CommentSkipped) { + Configuration config(std::istringstream( "ProjectId: TestProjectId\n" "#MetadataApiNumThreads: 13\n" "MetadataReporterPurgeDeleted: true\n" @@ -71,8 +71,8 @@ TEST(MetadataAgentConfigurationTest, CommentSkipped) { EXPECT_EQ(3, config.MetadataApiNumThreads()); } -TEST(MetadataAgentConfigurationTest, BlankLine) { - MetadataAgentConfiguration config(std::istringstream( +TEST(ConfigurationTest, BlankLine) { + Configuration config(std::istringstream( "ProjectId: TestProjectId\n" "\n" "\n" diff --git a/test/health_checker_unittest.cc b/test/health_checker_unittest.cc index 34827e89..a6df3b1e 100644 --- a/test/health_checker_unittest.cc +++ b/test/health_checker_unittest.cc @@ -31,14 +31,14 @@ std::istringstream IsolationPathConfig(const std::string& test_name) { } // namespace TEST_F(HealthCheckerUnittest, DefaultHealthy) { - MetadataAgentConfiguration config(IsolationPathConfig(test_info_->name())); + Configuration config(IsolationPathConfig(test_info_->name())); HealthChecker health_checker(config); EXPECT_TRUE(IsHealthy(health_checker)); Cleanup(&health_checker); } TEST_F(HealthCheckerUnittest, SimpleFailure) { - MetadataAgentConfiguration config(IsolationPathConfig(test_info_->name())); + Configuration config(IsolationPathConfig(test_info_->name())); HealthChecker health_checker(config); SetUnhealthy(&health_checker, "kubernetes_pod_thread"); EXPECT_FALSE(IsHealthy(health_checker)); @@ -46,7 +46,7 @@ TEST_F(HealthCheckerUnittest, SimpleFailure) { } TEST_F(HealthCheckerUnittest, MultiFailure) { - MetadataAgentConfiguration config(IsolationPathConfig(test_info_->name())); + Configuration config(IsolationPathConfig(test_info_->name())); HealthChecker health_checker(config); EXPECT_TRUE(IsHealthy(health_checker)); SetUnhealthy(&health_checker, "kubernetes_pod_thread"); @@ -57,7 +57,7 @@ TEST_F(HealthCheckerUnittest, MultiFailure) { } TEST_F(HealthCheckerUnittest, FailurePersists) { - MetadataAgentConfiguration config(IsolationPathConfig(test_info_->name())); + Configuration config(IsolationPathConfig(test_info_->name())); HealthChecker health_checker(config); EXPECT_TRUE(IsHealthy(health_checker)); SetUnhealthy(&health_checker, "kubernetes_pod_thread"); From 2290d617ebac8754db80397a55f7bc874ce3f461 Mon Sep 17 00:00:00 2001 From: Andrew Emil Date: Mon, 26 Mar 2018 15:30:21 -0400 Subject: [PATCH 2/4] Addressed style comments --- src/api_server.h | 3 +-- src/docker.h | 3 +-- src/instance.h | 3 +-- src/store.cc | 3 +-- src/updater.h | 4 ++-- 5 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/api_server.h b/src/api_server.h index 90764ed5..5dbb8c97 100644 --- a/src/api_server.h +++ b/src/api_server.h @@ -45,8 +45,7 @@ class MetadataApiServer { using HttpServer = http::server; class Handler { public: - Handler(const Configuration& config, - const MetadataStore& store); + Handler(const Configuration& config, const MetadataStore& store); void operator()(const HttpServer::request& request, std::shared_ptr conn); void log(const HttpServer::string_type& info); diff --git a/src/docker.h b/src/docker.h index 44d39276..ea62a765 100644 --- a/src/docker.h +++ b/src/docker.h @@ -65,8 +65,7 @@ class DockerReader { class DockerUpdater : public PollingMetadataUpdater { public: - DockerUpdater(const Configuration& config, - MetadataStore* store) + DockerUpdater(const Configuration& config, MetadataStore* store) : reader_(config), PollingMetadataUpdater( config, store, "DockerUpdater", config.DockerUpdaterIntervalSeconds(), diff --git a/src/instance.h b/src/instance.h index eeb15d0c..139b7959 100644 --- a/src/instance.h +++ b/src/instance.h @@ -46,8 +46,7 @@ class InstanceReader { class InstanceUpdater : public PollingMetadataUpdater { public: - InstanceUpdater(const Configuration& config, - MetadataStore* store) + InstanceUpdater(const Configuration& config, MetadataStore* store) : reader_(config), PollingMetadataUpdater( config, store, "InstanceUpdater", config.InstanceUpdaterIntervalSeconds(), diff --git a/src/store.cc b/src/store.cc index 98d1f8f5..adfe8899 100644 --- a/src/store.cc +++ b/src/store.cc @@ -26,8 +26,7 @@ MetadataStore::Metadata MetadataStore::Metadata::IGNORED() { return MetadataStore::Metadata(); } -MetadataStore::MetadataStore(const Configuration& config) - : config_(config) {} +MetadataStore::MetadataStore(const Configuration& config) : config_(config) {} const MonitoredResource& MetadataStore::LookupResource( const std::string& resource_id) const throw(std::out_of_range) { diff --git a/src/updater.h b/src/updater.h index 54f46246..0a9cf782 100644 --- a/src/updater.h +++ b/src/updater.h @@ -47,8 +47,8 @@ class MetadataUpdater { MetadataStore::Metadata metadata; }; - MetadataUpdater(const Configuration& config, - MetadataStore* store, const std::string& name); + MetadataUpdater(const Configuration& config, MetadataStore* store, + const std::string& name); virtual ~MetadataUpdater(); // Starts updating. From 9155b2fc50e35021fc1f28cee114ac93b11e8467 Mon Sep 17 00:00:00 2001 From: Andrew Emil Date: Wed, 28 Mar 2018 11:51:47 -0400 Subject: [PATCH 3/4] Addressed code review comments --- src/configuration.cc | 3 +-- src/configuration.h | 3 +-- src/reporter.h | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/configuration.cc b/src/configuration.cc index 360a43b7..138ddb1d 100644 --- a/src/configuration.cc +++ b/src/configuration.cc @@ -116,8 +116,7 @@ Configuration::Configuration() instance_zone_(kDefaultInstanceZone), health_check_file_(kDefaultHealthCheckFile) {} -Configuration::Configuration(std::istream& input) - : Configuration() { +Configuration::Configuration(std::istream& input) : Configuration() { ParseConfiguration(input); } diff --git a/src/configuration.h b/src/configuration.h index dd426a2a..c275b080 100644 --- a/src/configuration.h +++ b/src/configuration.h @@ -28,8 +28,7 @@ class Configuration { Configuration(); Configuration(std::istream& input); // Used to accept inline construction of streams. - Configuration(std::istream&& input) - : Configuration(input) {} + Configuration(std::istream&& input) : Configuration(input) {} // Shared configuration. const std::string& ProjectId() const { diff --git a/src/reporter.h b/src/reporter.h index 18d56e2e..6a5b8e42 100644 --- a/src/reporter.h +++ b/src/reporter.h @@ -36,8 +36,8 @@ class Configuration; // A periodic reporter of metadata to Stackdriver. class MetadataReporter { public: - MetadataReporter(const Configuration& config, - MetadataStore* store, double period_s); + MetadataReporter(const Configuration& config, MetadataStore* store, + double period_s); ~MetadataReporter(); private: From be321fff1d0909c3d439e419f3e3be4f686acd8a Mon Sep 17 00:00:00 2001 From: Andrew Emil Date: Wed, 28 Mar 2018 13:00:26 -0400 Subject: [PATCH 4/4] Style change --- src/api_server.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/api_server.h b/src/api_server.h index 5dbb8c97..8252bf83 100644 --- a/src/api_server.h +++ b/src/api_server.h @@ -35,9 +35,8 @@ class MetadataStore; // A server that implements the metadata agent API. class MetadataApiServer { public: - MetadataApiServer(const Configuration& config, - const MetadataStore& store, int server_threads, - const std::string& host, int port); + MetadataApiServer(const Configuration& config, const MetadataStore& store, + int server_threads, const std::string& host, int port); ~MetadataApiServer(); private: