Add pre-condition to toPatchUri and toSafePatchUri

Summary: If uri is already patch or safepatch, validate it.

Reviewed By: Mizuchi

Differential Revision: D71083651

fbshipit-source-id: 90f723c18ffda735b9a70a1cd9c08b31a6e3f994

Author: thedavekwon

thrift/lib/cpp2/patch/test/DynamicPatchTest.cpp

@@ -1029,6 +1029,12 @@ TEST(DynamicPatchTest, InvalidToPatchType) {
   type::Type type = type::Type::get<type::union_t<MyUnion>>();
   type.toThrift().name()->unionType_ref()->scopedName_ref() = "scoped.name";
   EXPECT_THROW(detail::toPatchType(type), std::runtime_error);
+  EXPECT_THROW(
+      detail::toPatchType(type::Type::get<type::infer_tag<MyStructPatch>>()),
+      std::runtime_error);
+  EXPECT_THROW(
+      detail::toPatchType(type::Type::get<type::struct_t<MyStructSafePatch>>()),
+      std::runtime_error);
 }
 
 TEST(DynamicPatchTest, ToSafePatchType) {
@@ -1044,6 +1050,12 @@ TEST(DynamicPatchTest, ToSafePatchType) {
   unionScopedName.toThrift().name()->unionType_ref()->scopedName_ref() =
       "scoped.name";
   EXPECT_THROW(toSafePatchType(unionScopedName), std::runtime_error);
+  EXPECT_THROW(
+      toSafePatchType(type::Type::get<type::infer_tag<MyStructPatch>>()),
+      std::runtime_error);
+  EXPECT_THROW(
+      toSafePatchType(type::Type::get<type::struct_t<MyStructSafePatch>>()),
+      std::runtime_error);
 }
 
 TEST(DynamicPatchTest, AnyPatch) {

thrift/lib/thrift/detail/DynamicPatch.cpp

@@ -280,13 +280,21 @@ void checkHomogeneousContainer(const ValueMap& m) {
 }
 
 std::string toSafePatchUri(std::string s) {
+  if (folly::StringPiece(s).endsWith(kPatchUriSuffix)) {
+    folly::throw_exception<std::runtime_error>(
+        fmt::format("Uri {} is already Patch.", s));
+  }
   s += kSafePatchUriSuffix;
   return s;
 }
 
 } // namespace detail
 
 std::string toPatchUri(std::string s) {
+  if (folly::StringPiece(s).endsWith(detail::kPatchUriSuffix)) {
+    folly::throw_exception<std::runtime_error>(
+        fmt::format("Uri {} is already Patch.", s));
+  }
   s += detail::kPatchUriSuffix;
   return s;
 }