feat: new helper function for 'archive' storage class

googleapis · Oct 13, 2019 · 963098c · 963098c
1 parent 8ab5e51
commit 963098c
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 0 deletions.
diff --git a/google/cloud/storage/lifecycle_rule.cc b/google/cloud/storage/lifecycle_rule.cc
@@ -54,6 +54,10 @@ LifecycleRuleAction LifecycleRule::SetStorageClassDurableReducedAvailability() {
   return SetStorageClass(storage_class::DurableReducedAvailability());
 }
 
+LifecycleRuleAction LifecycleRule::SetStorageClassArchive() {
+  return SetStorageClass(storage_class::Archive());
+}
+
 LifecycleRuleAction LifecycleRule::SetStorageClass(std::string storage_class) {
   return LifecycleRuleAction{"SetStorageClass", std::move(storage_class)};
 }

diff --git a/google/cloud/storage/lifecycle_rule.h b/google/cloud/storage/lifecycle_rule.h
@@ -149,6 +149,7 @@ class LifecycleRule {
   static LifecycleRuleAction SetStorageClassNearline();
   static LifecycleRuleAction SetStorageClassColdline();
   static LifecycleRuleAction SetStorageClassDurableReducedAvailability();
+  static LifecycleRuleAction SetStorageClassArchive();
   static LifecycleRuleAction SetStorageClass(std::string storage_class);
   //@}
 
@@ -232,6 +233,10 @@ class LifecycleRule {
     return MatchesStorageClass(storage_class::DurableReducedAvailability());
   }
 
+  static LifecycleRuleCondition MatchesStorageClassArchive() {
+    return MatchesStorageClass(storage_class::Archive());
+  }
+
   static LifecycleRuleCondition NumNewerVersions(std::int32_t days) {
     LifecycleRuleCondition result;
     result.num_newer_versions.emplace(std::move(days));

diff --git a/google/cloud/storage/lifecycle_rule_test.cc b/google/cloud/storage/lifecycle_rule_test.cc
@@ -72,6 +72,8 @@ TEST(LifecycleRuleTest, SetStorageClass) {
   EXPECT_EQ(LifecycleRule::SetStorageClass(
                 storage_class::DurableReducedAvailability()),
             LifecycleRule::SetStorageClassDurableReducedAvailability());
+  EXPECT_EQ(LifecycleRule::SetStorageClass(storage_class::Archive()),
+            LifecycleRule::SetStorageClassArchive());
 }
 
 /// @test Verify that LifecycleRuleCondition comparisons work as expected.
@@ -230,6 +232,14 @@ TEST(LifecycleRuleTest, MatchesStorageClassDurableReducedAvailability) {
             condition.matches_storage_class->front());
 }
 
+/// @test LifecycleRule::MatchesStorageClassArchive.
+TEST(LifecycleRuleTest, MatchesStorageClassArchive) {
+  auto condition = LifecycleRule::MatchesStorageClassArchive();
+  ASSERT_TRUE(condition.matches_storage_class.has_value());
+  ASSERT_FALSE(condition.matches_storage_class->empty());
+  EXPECT_EQ(storage_class::Archive(), condition.matches_storage_class->front());
+}
+
 /// @test Verify that LifecycleRule::NumNewerVersions() works as expected.
 TEST(LifecycleRuleTest, NumNewerVersions) {
   auto condition = LifecycleRule::NumNewerVersions(7);

diff --git a/google/cloud/storage/storage_class.h b/google/cloud/storage/storage_class.h
@@ -53,6 +53,11 @@ inline char const* DurableReducedAvailability() {
   return kStorageClass;
 }
 
+inline char const* Archive() {
+  static constexpr char kStorageClass[] = "ARCHIVE";
+  return kStorageClass;
+}
+
 }  // namespace storage_class
 }  // namespace STORAGE_CLIENT_NS
 }  // namespace storage

diff --git a/google/cloud/storage/storage_class_test.cc b/google/cloud/storage/storage_class_test.cc
@@ -31,6 +31,7 @@ TEST(StorageClassTest, Values) {
   EXPECT_EQ(std::string("COLDLINE"), Coldline());
   EXPECT_EQ(std::string("DURABLE_REDUCED_AVAILABILITY"),
             DurableReducedAvailability());
+  EXPECT_EQ(std::string("ARCHIVE"), Archive());
 }
 
 }  // namespace