Ban unstructured annotations

Summary: Deprecated in favor of structured annotations.

Reviewed By: vitaut

Differential Revision: D95829948

fbshipit-source-id: 8654644098b1c1dc3eaf9cb2363c27cec4736601

Author: iahs

third-party/thrift/src/thrift/compiler/compiler.cc

@@ -942,6 +942,10 @@ std::string parse_args(
           sparams.forbid_unstructured_annotations = true;
           continue;
         }
+        if (validator == "allow_unstructured_annotations") {
+          sparams.forbid_unstructured_annotations = false;
+          continue;
+        }
         if (validator == "warn_on_redundant_custom_default_values") {
           sparams.redundant_custom_default_values =
               sema_params::validation_level::warn;

third-party/thrift/src/thrift/compiler/sema/sema_context.h

@@ -134,7 +134,7 @@ struct sema_params {
   // for a field, but that value is equal to the intrinsic default value.
   validation_level redundant_custom_default_values = validation_level::none;
 
-  bool forbid_unstructured_annotations = false;
+  bool forbid_unstructured_annotations = true;
 
   // Action to take when @cpp.EnableCustomTypeOrdering is present on a
   // (structured) type that does not need it.

third-party/thrift/src/thrift/compiler/test/compiler_test.cc

@@ -216,6 +216,8 @@ def _parse_fixture_cmd(
             fixture_dir_abspath,
             "-I",
             repo_root_dir_abspath,
+            "--extra-validation",
+            "allow_unstructured_annotations",
         ]
         if _should_build_included_files_recursively(generator_spec):
             base_args.append("-r")

third-party/thrift/src/thrift/compiler/test/fixture_utils.py

@@ -43,7 +43,13 @@ def check_run_thrift(annotate, *args):
     gen_str = "json"
     if annotate:
         gen_str = "json:annotate"
-    argsx = [thrift, "--gen", gen_str] + list(args)
+    argsx = [
+        thrift,
+        "--gen",
+        gen_str,
+        "--extra-validation",
+        "allow_unstructured_annotations",
+    ] + list(args)
     pipe = subprocess.PIPE
     return subprocess.check_call(argsx, stdout=pipe, stderr=pipe)
 

third-party/thrift/src/thrift/compiler/test/json_compiler_test.py

@@ -27,17 +27,17 @@ TEST(StandardValidatorTest, BadPriority) {
       void foo() (priority = "bad2");
     } (priority = "bad1")
     # expected-error@-3: Bad priority 'bad1'. Choose one of ["HIGH_IMPORTANT", "HIGH", "IMPORTANT", "NORMAL", "BEST_EFFORT"].
-    # expected-warning@-4: The annotation priority is deprecated. Please use @thrift.Priority instead.
+    # expected-error@-4: The annotation priority has been removed. Please use @thrift.Priority instead.
     # expected-error@-4: Bad priority 'bad2'. Choose one of ["HIGH_IMPORTANT", "HIGH", "IMPORTANT", "NORMAL", "BEST_EFFORT"].
-    # expected-warning@-5: The annotation priority is deprecated. Please use @thrift.Priority instead.
+    # expected-error@-5: The annotation priority has been removed. Please use @thrift.Priority instead.
 
     interaction Interaction {
       void foo() (priority = "bad4");
     } (priority = "bad3")
     # expected-error@-3: Bad priority 'bad3'. Choose one of ["HIGH_IMPORTANT", "HIGH", "IMPORTANT", "NORMAL", "BEST_EFFORT"].
-    # expected-warning@-4: The annotation priority is deprecated. Please use @thrift.Priority instead.
+    # expected-error@-4: The annotation priority has been removed. Please use @thrift.Priority instead.
     # expected-error@-4: Bad priority 'bad4'. Choose one of ["HIGH_IMPORTANT", "HIGH", "IMPORTANT", "NORMAL", "BEST_EFFORT"].
-    # expected-warning@-5: The annotation priority is deprecated. Please use @thrift.Priority instead.
+    # expected-error@-5: The annotation priority has been removed. Please use @thrift.Priority instead.
   )");
 }
 
@@ -66,7 +66,7 @@ TEST(StandardValidatorTest, UnionErrors) {
         # expected-warning@-1: The 'required' qualifier is deprecated and ignored by most language implementations. Leave the field unqualified instead: `req` (in `Union`).
       2: optional i64 opt; # expected-error: Unions cannot contain qualified fields. Remove `optional` qualifier from field `opt`.
       3: Struct mixin (cpp.mixin); # expected-error: Union `Union` cannot contain mixin field `mixin`.
-        # expected-warning@-1: The annotation cpp.mixin is deprecated. Please use @thrift.Mixin instead.
+        # expected-error@-1: The annotation cpp.mixin has been removed. Please use @thrift.Mixin instead.
       4: i64 non;
     }
   )");
@@ -95,7 +95,7 @@ TEST(StandardValidatorTest, ValidateExceptionMessage) {
     }
 
     exception MyExceptionWithDuplicatedDeprecatedExceptionMessage { # expected-error: Duplicate message annotation.
-      # expected-warning@-1: The annotation message is deprecated. Please use @thrift.ExceptionMessage instead.
+      # expected-error@-1: The annotation message has been removed. Please use @thrift.ExceptionMessage instead.
       @thrift.ExceptionMessage
       1: string valid_message;
       2: string invalid_message;

third-party/thrift/src/thrift/compiler/test/standard_validator_test.cc

@@ -108,7 +108,7 @@ TEST_F(SchemaTest, linked) {
 TEST_F(SchemaTest, static_schema) {
   auto static_schema = schema::detail::mergeSchemas(
       facebook::thrift::test::schema::schema_constants::
-          _fbthrift_schema_b303fc86e3a41852_includes());
+          _fbthrift_schema_8b1d51c766420544_includes());
   const type::Program* static_program = nullptr;
   for (const auto& program : *static_schema.programs()) {
     if (program.path() == "thrift/test/schema.thrift") {
@@ -131,7 +131,7 @@ TEST_F(SchemaTest, static_schema) {
 
 TEST_F(SchemaTest, merged_schema_add_after_access) {
   auto data = facebook::thrift::test::schema::schema_constants::
-      _fbthrift_schema_b303fc86e3a41852();
+      _fbthrift_schema_8b1d51c766420544();
 
   BaseSchemaRegistry base;
   SchemaRegistry registry(base);

third-party/thrift/src/thrift/test/SchemaTest.cpp

@@ -99,4 +99,5 @@ struct Annot {
 }
 
 @Annot{val = 42}
-struct Annotated {} (annot_with_val = 2023, annot_without_val)
+@thrift.DeprecatedUnvalidatedAnnotations{items = {"annot_with_val": "2023", "annot_without_val": "1"}}
+struct Annotated {}