From fbcea524cbcbe4afdb013cdfea3acd699e77da98 Mon Sep 17 00:00:00 2001 From: Dhrupad Bhardwaj Date: Thu, 29 Mar 2018 19:59:21 -0400 Subject: [PATCH 01/10] Unittests for InstanceMonitoredResource and InstanceResourceMetadata --- src/updater.h | 1 + test/Makefile | 11 ++++-- test/instance_unittest.cc | 77 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 85 insertions(+), 4 deletions(-) create mode 100644 test/instance_unittest.cc diff --git a/src/updater.h b/src/updater.h index 0a9cf782..3b4d4a93 100644 --- a/src/updater.h +++ b/src/updater.h @@ -112,6 +112,7 @@ class PollingMetadataUpdater : public MetadataUpdater { void StopUpdater(); private: + friend class InstanceTest; // Metadata poller. void PollForMetadata(); diff --git a/test/Makefile b/test/Makefile index 08ace465..30f3b9df 100644 --- a/test/Makefile +++ b/test/Makefile @@ -44,6 +44,7 @@ TESTS=\ configuration_unittest \ format_unittest \ health_checker_unittest \ + instance_unittest \ json_unittest \ kubernetes_unittest \ resource_unittest \ @@ -104,6 +105,12 @@ base64_unittest: base64_unittest.o $(SRC_DIR)/base64.o $(CXX) $(LDFLAGS) $^ $(LDLIBS) -o $@ configuration_unittest: configuration_unittest.o $(SRC_DIR)/configuration.o $(CXX) $(LDFLAGS) $^ $(LDLIBS) -o $@ +health_checker_unittest: health_checker_unittest.o $(SRC_DIR)/health_checker.o $(SRC_DIR)/configuration.o + $(CXX) $(LDFLAGS) $^ $(LDLIBS) -lboost_filesystem -lboost_system -o $@ +instance_unittest: instance_unittest.o $(SRC_DIR)/instance.o $(SRC_DIR)/configuration.o $(SRC_DIR)/environment.o $(SRC_DIR)/format.o $(SRC_DIR)/json.o $(SRC_DIR)/logging.o $(SRC_DIR)/resource.o $(SRC_DIR)/store.o $(SRC_DIR)/time.o + $(CXX) $(LDFLAGS) $^ $(LDLIBS) -o $@ +json_unittest: json_unittest.o $(SRC_DIR)/json.o + $(CXX) $(LDFLAGS) $^ $(LDLIBS) -o $@ kubernetes_unittest: kubernetes_unittest.o $(SRC_DIR)/kubernetes.o $(SRC_DIR)/json.o $(SRC_DIR)/logging.o $(SRC_DIR)/environment.o $(SRC_DIR)/time.o $(SRC_DIR)/store.o $(SRC_DIR)/resource.o $(SRC_DIR)/updater.o $(SRC_DIR)/instance.o $(SRC_DIR)/format.o $(SRC_DIR)/configuration.o $(SRC_DIR)/health_checker.o $(CXX) $(LDFLAGS) $^ $(LDLIBS) -o $@ resource_unittest: resource_unittest.o $(SRC_DIR)/resource.o $(SRC_DIR)/json.o @@ -112,9 +119,5 @@ store_unittest: store_unittest.o $(SRC_DIR)/store.o $(SRC_DIR)/resource.o $(SRC_ $(CXX) $(LDFLAGS) $^ $(LDLIBS) -o $@ time_unittest: time_unittest.o $(SRC_DIR)/time.o $(CXX) $(LDFLAGS) $^ $(LDLIBS) -o $@ -health_checker_unittest: health_checker_unittest.o $(SRC_DIR)/health_checker.o $(SRC_DIR)/configuration.o - $(CXX) $(LDFLAGS) $^ $(LDLIBS) -lboost_filesystem -lboost_system -o $@ -json_unittest: json_unittest.o $(SRC_DIR)/json.o - $(CXX) $(LDFLAGS) $^ $(LDLIBS) -o $@ .PHONY: all test clean purge diff --git a/test/instance_unittest.cc b/test/instance_unittest.cc new file mode 100644 index 00000000..66ad1e1b --- /dev/null +++ b/test/instance_unittest.cc @@ -0,0 +1,77 @@ +#include "../src/configuration.h" +#include "../src/environment.h" +#include "../src/instance.h" +#include "../src/resource.h" +#include "../src/updater.h" +#include "gtest/gtest.h" + +namespace google { + +namespace { + +class InstanceTest : public ::testing::Test { + protected: + const MetadataStore::Metadata&& GetResourceMetadata( + const MetadataUpdater::ResourceMetadata* rm) { + return std::move(rm->metadata); + } + + MonitoredResource GetMonitoredResource( + const MetadataUpdater::ResourceMetadata* rm) { + return rm->resource; + } + + std::vector GetResourceIds( + const MetadataUpdater::ResourceMetadata* rm) { + return rm->ids; + } +}; + +TEST_F(InstanceTest, GetInstanceMonitoredResource) { + Configuration config(std::istringstream( + "InstanceResourceType: gce_instance\n" + "InstanceId: 1234567891011\n" + "InstanceZone: us-east1-b\n" + )); + Environment env(config); + MonitoredResource mr_actual = + InstanceReader::InstanceResource(env); + MonitoredResource mr_expected( + "gce_instance", + {{"instance_id", "1234567891011"}, {"zone", "us-east1-b"}}); + EXPECT_EQ(mr_expected, mr_actual); +} + +TEST_F(InstanceTest, GetInstanceMonitoredResourceWithEmptyConfig) { + Environment env(*(new Configuration())); + MonitoredResource mr_actual = + InstanceReader::InstanceResource(env); + MonitoredResource mr_expected( + "gce_instance", {{"instance_id", ""}, {"zone", ""}}); + EXPECT_EQ(mr_expected, mr_actual); +} + +TEST_F(InstanceTest, GetInstanceMetatadataQuery) { + Configuration config(std::istringstream( + "InstanceResourceType: gce_instance\n" + "InstanceId: 1234567891011\n" + "InstanceZone: us-east1-b\n" + )); + InstanceReader reader(config); + const auto& result = reader.MetadataQuery(); + MonitoredResource mr_expected( + "gce_instance", + {{"instance_id", "1234567891011"}, {"zone", "us-east1-b"}}); + std::string vinit[] = {"", "1234567891011"}; + std::vector ids_exp = {vinit, std::end(vinit)}; + EXPECT_EQ(1, result.size()); + const MetadataUpdater::ResourceMetadata& rm = result.at(0); + EXPECT_EQ(mr_expected, GetMonitoredResource(&rm)); + EXPECT_EQ(ids_exp, GetResourceIds(&rm)); + EXPECT_EQ(MetadataStore::Metadata::IGNORED().ignore, + GetResourceMetadata(&rm).ignore); +} + +} // namespace + +} // google From 900af04d3e4cd90b816606ed8531937fbcbd8e9e Mon Sep 17 00:00:00 2001 From: Dhrupad Bhardwaj Date: Fri, 30 Mar 2018 11:23:24 -0400 Subject: [PATCH 02/10] Address feedback --- src/updater.h | 1 + test/instance_unittest.cc | 61 +++++++++++++++++++-------------------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/updater.h b/src/updater.h index 3b4d4a93..27ed3ab3 100644 --- a/src/updater.h +++ b/src/updater.h @@ -113,6 +113,7 @@ class PollingMetadataUpdater : public MetadataUpdater { private: friend class InstanceTest; + // Metadata poller. void PollForMetadata(); diff --git a/test/instance_unittest.cc b/test/instance_unittest.cc index 66ad1e1b..a5e0203d 100644 --- a/test/instance_unittest.cc +++ b/test/instance_unittest.cc @@ -11,19 +11,19 @@ namespace { class InstanceTest : public ::testing::Test { protected: - const MetadataStore::Metadata&& GetResourceMetadata( - const MetadataUpdater::ResourceMetadata* rm) { - return std::move(rm->metadata); + static const MetadataStore::Metadata& GetResourceMetadata( + const MetadataUpdater::ResourceMetadata& rm) { + return rm.metadata; } - MonitoredResource GetMonitoredResource( - const MetadataUpdater::ResourceMetadata* rm) { - return rm->resource; + static MonitoredResource GetMonitoredResource( + const MetadataUpdater::ResourceMetadata& rm) { + return rm.resource; } - std::vector GetResourceIds( - const MetadataUpdater::ResourceMetadata* rm) { - return rm->ids; + static std::vector GetResourceIds( + const MetadataUpdater::ResourceMetadata& rm) { + return rm.ids; } }; @@ -34,21 +34,21 @@ TEST_F(InstanceTest, GetInstanceMonitoredResource) { "InstanceZone: us-east1-b\n" )); Environment env(config); - MonitoredResource mr_actual = - InstanceReader::InstanceResource(env); - MonitoredResource mr_expected( - "gce_instance", - {{"instance_id", "1234567891011"}, {"zone", "us-east1-b"}}); - EXPECT_EQ(mr_expected, mr_actual); + MonitoredResource mr = InstanceReader::InstanceResource(env); + EXPECT_EQ(MonitoredResource("gce_instance", { + {"instance_id", "1234567891011"}, + {"zone", "us-east1-b"} + }), mr); } TEST_F(InstanceTest, GetInstanceMonitoredResourceWithEmptyConfig) { - Environment env(*(new Configuration())); - MonitoredResource mr_actual = - InstanceReader::InstanceResource(env); - MonitoredResource mr_expected( - "gce_instance", {{"instance_id", ""}, {"zone", ""}}); - EXPECT_EQ(mr_expected, mr_actual); + Configuration config; + Environment env(config); + MonitoredResource mr = InstanceReader::InstanceResource(env); + EXPECT_EQ(MonitoredResource("gce_instance", { + {"instance_id", ""}, + {"zone", ""} + }), mr); } TEST_F(InstanceTest, GetInstanceMetatadataQuery) { @@ -58,18 +58,17 @@ TEST_F(InstanceTest, GetInstanceMetatadataQuery) { "InstanceZone: us-east1-b\n" )); InstanceReader reader(config); - const auto& result = reader.MetadataQuery(); - MonitoredResource mr_expected( - "gce_instance", - {{"instance_id", "1234567891011"}, {"zone", "us-east1-b"}}); - std::string vinit[] = {"", "1234567891011"}; - std::vector ids_exp = {vinit, std::end(vinit)}; + const auto result = reader.MetadataQuery(); + const std::vector ids_exp({"", "1234567891011"}); EXPECT_EQ(1, result.size()); - const MetadataUpdater::ResourceMetadata& rm = result.at(0); - EXPECT_EQ(mr_expected, GetMonitoredResource(&rm)); - EXPECT_EQ(ids_exp, GetResourceIds(&rm)); + const MetadataUpdater::ResourceMetadata& rm = result[0]; + EXPECT_EQ(MonitoredResource("gce_instance", { + {"instance_id", "1234567891011"}, + {"zone", "us-east1-b"} + }), GetMonitoredResource(rm)); + EXPECT_EQ(ids_exp, GetResourceIds(rm)); EXPECT_EQ(MetadataStore::Metadata::IGNORED().ignore, - GetResourceMetadata(&rm).ignore); + GetResourceMetadata(rm).ignore); } } // namespace From 90c6f2eb19d1b0b3f4372d0e89d4eaf4536de36a Mon Sep 17 00:00:00 2001 From: Dhrupad Bhardwaj Date: Fri, 30 Mar 2018 11:36:16 -0400 Subject: [PATCH 03/10] Remove empty config unittest --- test/instance_unittest.cc | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/test/instance_unittest.cc b/test/instance_unittest.cc index a5e0203d..92a8ace5 100644 --- a/test/instance_unittest.cc +++ b/test/instance_unittest.cc @@ -41,16 +41,6 @@ TEST_F(InstanceTest, GetInstanceMonitoredResource) { }), mr); } -TEST_F(InstanceTest, GetInstanceMonitoredResourceWithEmptyConfig) { - Configuration config; - Environment env(config); - MonitoredResource mr = InstanceReader::InstanceResource(env); - EXPECT_EQ(MonitoredResource("gce_instance", { - {"instance_id", ""}, - {"zone", ""} - }), mr); -} - TEST_F(InstanceTest, GetInstanceMetatadataQuery) { Configuration config(std::istringstream( "InstanceResourceType: gce_instance\n" From 4416a599a5ae4b5ecb1cd89e292a1da1ad1bc6ad Mon Sep 17 00:00:00 2001 From: Dhrupad Bhardwaj Date: Fri, 30 Mar 2018 12:18:11 -0400 Subject: [PATCH 04/10] Address feedback --- test/instance_unittest.cc | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/test/instance_unittest.cc b/test/instance_unittest.cc index 92a8ace5..f6af4222 100644 --- a/test/instance_unittest.cc +++ b/test/instance_unittest.cc @@ -16,12 +16,12 @@ class InstanceTest : public ::testing::Test { return rm.metadata; } - static MonitoredResource GetMonitoredResource( + static const MonitoredResource& GetMonitoredResource( const MetadataUpdater::ResourceMetadata& rm) { return rm.resource; } - static std::vector GetResourceIds( + static const std::vector& GetResourceIds( const MetadataUpdater::ResourceMetadata& rm) { return rm.ids; } @@ -34,11 +34,10 @@ TEST_F(InstanceTest, GetInstanceMonitoredResource) { "InstanceZone: us-east1-b\n" )); Environment env(config); - MonitoredResource mr = InstanceReader::InstanceResource(env); EXPECT_EQ(MonitoredResource("gce_instance", { {"instance_id", "1234567891011"}, {"zone", "us-east1-b"} - }), mr); + }), InstanceReader::InstanceResource(env)); } TEST_F(InstanceTest, GetInstanceMetatadataQuery) { @@ -49,16 +48,15 @@ TEST_F(InstanceTest, GetInstanceMetatadataQuery) { )); InstanceReader reader(config); const auto result = reader.MetadataQuery(); - const std::vector ids_exp({"", "1234567891011"}); + const std::vector ids_expected({"", "1234567891011"}); EXPECT_EQ(1, result.size()); const MetadataUpdater::ResourceMetadata& rm = result[0]; EXPECT_EQ(MonitoredResource("gce_instance", { - {"instance_id", "1234567891011"}, - {"zone", "us-east1-b"} + {"instance_id", "1234567891011"}, + {"zone", "us-east1-b"} }), GetMonitoredResource(rm)); - EXPECT_EQ(ids_exp, GetResourceIds(rm)); - EXPECT_EQ(MetadataStore::Metadata::IGNORED().ignore, - GetResourceMetadata(rm).ignore); + EXPECT_EQ(ids_expected, GetResourceIds(rm)); + EXPECT_TRUE(GetResourceMetadata(rm).ignore); } } // namespace From 334b88f3f630eb8e70bb04d9878dcd2a3f41fa45 Mon Sep 17 00:00:00 2001 From: Dhrupad Bhardwaj Date: Fri, 30 Mar 2018 15:06:51 -0400 Subject: [PATCH 05/10] Address feedback. ResourceMetadata accessors private --- src/updater.h | 39 ++++++++++++++++++++++++++++----------- test/instance_unittest.cc | 28 +++++----------------------- 2 files changed, 33 insertions(+), 34 deletions(-) diff --git a/src/updater.h b/src/updater.h index 27ed3ab3..65a0d640 100644 --- a/src/updater.h +++ b/src/updater.h @@ -35,16 +35,32 @@ class Configuration; class MetadataUpdater { public: struct ResourceMetadata { - ResourceMetadata(const std::vector& ids_, - const MonitoredResource& resource_, - MetadataStore::Metadata&& metadata_) - : ids(ids_), resource(resource_), metadata(std::move(metadata_)) {} + ResourceMetadata(const std::vector& ids, + const MonitoredResource& resource, + MetadataStore::Metadata&& metadata) + : ids_(ids), resource_(resource), metadata_(std::move(metadata)) {} ResourceMetadata(ResourceMetadata&& other) - : ResourceMetadata(other.ids, other.resource, - std::move(other.metadata)) {} - std::vector ids; - MonitoredResource resource; - MetadataStore::Metadata metadata; + : ResourceMetadata(other.ids_, other.resource_, + std::move(other.metadata_)) {} + + const MetadataStore::Metadata& metadata() const { + return metadata_; + } + + const MonitoredResource& resource() const { + return resource_; + } + + const std::vector& ids() const { + return ids_; + } + + private: + friend class MetadataUpdater; + + std::vector ids_; + MonitoredResource resource_; + MetadataStore::Metadata metadata_; }; MetadataUpdater(const Configuration& config, MetadataStore* store, @@ -75,12 +91,13 @@ class MetadataUpdater { // Updates the resource map in the store. void UpdateResourceCallback(const ResourceMetadata& result) { - store_->UpdateResource(result.ids, result.resource); + store_->UpdateResource(result.ids_, result.resource_); } // Updates the metadata in the store. Consumes result. void UpdateMetadataCallback(ResourceMetadata&& result) { - store_->UpdateMetadata(result.resource, std::move(result.metadata)); + store_->UpdateMetadata(result.resource_, + std::move(result.metadata_)); } const Configuration& config() { diff --git a/test/instance_unittest.cc b/test/instance_unittest.cc index f6af4222..7939edf0 100644 --- a/test/instance_unittest.cc +++ b/test/instance_unittest.cc @@ -9,25 +9,7 @@ namespace google { namespace { -class InstanceTest : public ::testing::Test { - protected: - static const MetadataStore::Metadata& GetResourceMetadata( - const MetadataUpdater::ResourceMetadata& rm) { - return rm.metadata; - } - - static const MonitoredResource& GetMonitoredResource( - const MetadataUpdater::ResourceMetadata& rm) { - return rm.resource; - } - - static const std::vector& GetResourceIds( - const MetadataUpdater::ResourceMetadata& rm) { - return rm.ids; - } -}; - -TEST_F(InstanceTest, GetInstanceMonitoredResource) { +TEST(InstanceTest, GetInstanceMonitoredResource) { Configuration config(std::istringstream( "InstanceResourceType: gce_instance\n" "InstanceId: 1234567891011\n" @@ -40,7 +22,7 @@ TEST_F(InstanceTest, GetInstanceMonitoredResource) { }), InstanceReader::InstanceResource(env)); } -TEST_F(InstanceTest, GetInstanceMetatadataQuery) { +TEST(InstanceTest, GetInstanceMetatadataQuery) { Configuration config(std::istringstream( "InstanceResourceType: gce_instance\n" "InstanceId: 1234567891011\n" @@ -54,9 +36,9 @@ TEST_F(InstanceTest, GetInstanceMetatadataQuery) { EXPECT_EQ(MonitoredResource("gce_instance", { {"instance_id", "1234567891011"}, {"zone", "us-east1-b"} - }), GetMonitoredResource(rm)); - EXPECT_EQ(ids_expected, GetResourceIds(rm)); - EXPECT_TRUE(GetResourceMetadata(rm).ignore); + }), rm.resource()); + EXPECT_EQ(ids_expected, rm.ids()); + EXPECT_TRUE(rm.metadata().ignore); } } // namespace From a4cf3be97fe7c94e69b58c6b31d6a87cff6a644f Mon Sep 17 00:00:00 2001 From: Dhrupad Bhardwaj Date: Fri, 30 Mar 2018 15:35:29 -0400 Subject: [PATCH 06/10] Address feedback --- src/updater.h | 15 ++++----------- test/instance_unittest.cc | 3 +-- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/src/updater.h b/src/updater.h index 65a0d640..bcc1adcf 100644 --- a/src/updater.h +++ b/src/updater.h @@ -43,19 +43,12 @@ class MetadataUpdater { : ResourceMetadata(other.ids_, other.resource_, std::move(other.metadata_)) {} - const MetadataStore::Metadata& metadata() const { - return metadata_; - } - - const MonitoredResource& resource() const { - return resource_; - } - - const std::vector& ids() const { - return ids_; - } + const MetadataStore::Metadata& metadata() const { return metadata_; } + const MonitoredResource& resource() const { return resource_; } + const std::vector& ids() const { return ids_; } private: + // Needs write access to metadata_. friend class MetadataUpdater; std::vector ids_; diff --git a/test/instance_unittest.cc b/test/instance_unittest.cc index 7939edf0..b6534f79 100644 --- a/test/instance_unittest.cc +++ b/test/instance_unittest.cc @@ -30,14 +30,13 @@ TEST(InstanceTest, GetInstanceMetatadataQuery) { )); InstanceReader reader(config); const auto result = reader.MetadataQuery(); - const std::vector ids_expected({"", "1234567891011"}); EXPECT_EQ(1, result.size()); const MetadataUpdater::ResourceMetadata& rm = result[0]; EXPECT_EQ(MonitoredResource("gce_instance", { {"instance_id", "1234567891011"}, {"zone", "us-east1-b"} }), rm.resource()); - EXPECT_EQ(ids_expected, rm.ids()); + EXPECT_EQ(std::vector({"", "1234567891011"}), rm.ids()); EXPECT_TRUE(rm.metadata().ignore); } From f9f8b4ba60061a27b4a6eb63f042535d7bd10fd9 Mon Sep 17 00:00:00 2001 From: Dhrupad Bhardwaj Date: Fri, 30 Mar 2018 15:39:16 -0400 Subject: [PATCH 07/10] Inline comment --- src/updater.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/updater.h b/src/updater.h index bcc1adcf..bebab10d 100644 --- a/src/updater.h +++ b/src/updater.h @@ -48,8 +48,7 @@ class MetadataUpdater { const std::vector& ids() const { return ids_; } private: - // Needs write access to metadata_. - friend class MetadataUpdater; + friend class MetadataUpdater; // Needs write access to metadata_. std::vector ids_; MonitoredResource resource_; From ee86ee5a5d9c5dbcee2a77c7ad847519e724c144 Mon Sep 17 00:00:00 2001 From: Dhrupad Bhardwaj Date: Fri, 30 Mar 2018 15:40:47 -0400 Subject: [PATCH 08/10] Formatting --- src/updater.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/updater.h b/src/updater.h index bebab10d..3b8ba90e 100644 --- a/src/updater.h +++ b/src/updater.h @@ -88,8 +88,7 @@ class MetadataUpdater { // Updates the metadata in the store. Consumes result. void UpdateMetadataCallback(ResourceMetadata&& result) { - store_->UpdateMetadata(result.resource_, - std::move(result.metadata_)); + store_->UpdateMetadata(result.resource_, std::move(result.metadata_)); } const Configuration& config() { From c854403faaa2d434512a21c5bf032bd5233ad20d Mon Sep 17 00:00:00 2001 From: Dhrupad Bhardwaj Date: Fri, 30 Mar 2018 15:43:31 -0400 Subject: [PATCH 09/10] Tiny nit --- src/updater.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/updater.h b/src/updater.h index 3b8ba90e..01de5d5d 100644 --- a/src/updater.h +++ b/src/updater.h @@ -48,7 +48,7 @@ class MetadataUpdater { const std::vector& ids() const { return ids_; } private: - friend class MetadataUpdater; // Needs write access to metadata_. + friend class MetadataUpdater; // Needs write access to metadata_. std::vector ids_; MonitoredResource resource_; From 03b27330043c1f3c42b6f3a91fc452ddc81b1177 Mon Sep 17 00:00:00 2001 From: Dhrupad Bhardwaj Date: Fri, 30 Mar 2018 15:50:32 -0400 Subject: [PATCH 10/10] Update kubernetes_unittest to use new ResourceMetadata API --- test/kubernetes_unittest.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/test/kubernetes_unittest.cc b/test/kubernetes_unittest.cc index 79e4ac94..455c2b10 100644 --- a/test/kubernetes_unittest.cc +++ b/test/kubernetes_unittest.cc @@ -34,18 +34,18 @@ TEST_F(KubernetesTest, GetNodeMetadata) { }); const auto m = GetNodeMetadata(reader, node->As(), Timestamp(), false); - EXPECT_EQ(1, m.ids.size()); - EXPECT_EQ("k8s_node.testname", m.ids[0]); + EXPECT_EQ(1, m.ids().size()); + EXPECT_EQ("k8s_node.testname", m.ids()[0]); EXPECT_EQ(MonitoredResource("k8s_node", { {"cluster_name", "TestClusterName"}, {"node_name", "testname"}, {"location", "TestClusterLocation"}, - }), m.resource); - EXPECT_EQ("TestVersion", m.metadata.version); - EXPECT_EQ(false, m.metadata.is_deleted); + }), m.resource()); + EXPECT_EQ("TestVersion", m.metadata().version); + EXPECT_EQ(false, m.metadata().is_deleted); EXPECT_EQ(time::rfc3339::FromString("2018-03-03T01:23:45.678901234Z"), - m.metadata.created_at); - EXPECT_EQ(Timestamp(), m.metadata.collected_at); + m.metadata().created_at); + EXPECT_EQ(Timestamp(), m.metadata().collected_at); json::value big = json::object({ {"blobs", json::object({ {"association", json::object({ @@ -66,6 +66,6 @@ TEST_F(KubernetesTest, GetNodeMetadata) { })}, })}, }); - EXPECT_EQ(big->ToString(), m.metadata.metadata->ToString()); + EXPECT_EQ(big->ToString(), m.metadata().metadata->ToString()); } } // namespace google