Add option to thrift_library to require URIs

Summary:
Opt-in enforcement for package names / URIs.
When `require_uris_transitively` is enabled, the extra validation ignores the AllowLegacyMissingUris annotation and requires that the root file and all transitive deps have URIs for all definitions that require them.
This enables platforms using Dynamic Thrift features that error at runtime when URIs are missing to catch the errors at diff-time instead.

Reviewed By: praihan

Differential Revision: D95271039

fbshipit-source-id: a43954da1342e1b6ea1bc016bc67c46beb154f6f

Author: iahs

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

@@ -200,6 +200,10 @@ void printUsageTo(FILE* stream) {
                   the first namespace wins.
                   Default: none
 
+                ignore_missing_uri_opt_out
+                  Ignore @thrift.AllowLegacyMissingUris when checking for
+                  missing URIs. Requires missing_uris=error.
+
                 warn_on_redundant_custom_default_values
                   DEPRECATED, prefer: redundant_custom_default_values=warn
 
@@ -1020,6 +1024,11 @@ std::string parse_args(
             continue;
           }
 
+          if (validator == "ignore_missing_uri_opt_out") {
+            sparams.ignore_missing_uri_opt_out = true;
+            continue;
+          }
+
         } catch (const std::exception& e) {
           fmt::print(
               stderr,
@@ -1208,6 +1217,9 @@ void record_invocation_params(
       fmt::format(
           "duplicate_namespace={}",
           fmt::underlying(sparams.duplicate_namespace)));
+  sema_params_metric.add(
+      fmt::format(
+          "ignore_missing_uri_opt_out={}", sparams.ignore_missing_uri_opt_out));
   sema_params_metric.add(
       "warn_on_redundant_custom_default_values=" +
       std::to_string(

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

@@ -189,6 +189,10 @@ struct sema_params {
   // Action to take when a namespace is declared more than once for the same
   // language within a single file. If not `error`, the first namespace wins.
   validation_level duplicate_namespace = validation_level::none;
+
+  // If true, ignore @thrift.AllowLegacyMissingUris opt-out when checking for
+  // missing URIs. Requires missing_uris to be set to error.
+  bool ignore_missing_uri_opt_out = false;
 };
 
 // An AST visitor context for semantic analysis. It combines diagnostics

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

@@ -1040,8 +1040,9 @@ void validate_missing_uris(sema_context& ctx, const t_program& program) {
       }
     }
 
+    const bool ignoreOptOut = ctx.sema_parameters().ignore_missing_uri_opt_out;
     const bool shouldReportMissingUri =
-        !packageHasAnnotation && !nodeHasAnnotation;
+        ignoreOptOut || (!packageHasAnnotation && !nodeHasAnnotation);
     if (shouldReportMissingUri) {
       ctx.report(
           node,

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

@@ -4107,3 +4107,61 @@ TEST(CompilerTest, duplicate_namespaces) {
   )",
       {"--extra-validation", "duplicate_namespace=error"});
 }
+
+/**
+ * Tests ignore_missing_uri_opt_out on a single file with types missing URIs.
+ * AllowLegacyMissingUris does not suppress errors.
+ */
+TEST(CompilerTest, ignore_missing_uri_opt_out_basic) {
+  check_compile(
+      R"(
+    include "thrift/annotation/thrift.thrift"
+
+    package;
+    # expected-warning@-1: Thrift file should have a (non-empty) package. Packages will soon be required, at which point missing packages will trigger a Thrift compiler error. For more details, see https://fburl.com/thrift-uri-add-package
+
+    // Valid: struct with URI
+    @thrift.Uri{value = "facebook.com/thrift/test/ValidStruct"}
+    struct ValidStruct { }
+
+    // Error: struct without URI
+    struct MissingUriStruct { }
+    # expected-error@-1: Definition `MissingUriStruct` requires a URI: add a non-empty package to the file, or annotate the type with @thrift.Uri. For more details, see https://fburl.com/thrift-uri-add-package
+
+    // Error: AllowLegacyMissingUris does NOT suppress when opt-out is ignored
+    @thrift.AllowLegacyMissingUris
+    struct LegacyAnnotatedStruct { }
+    # expected-error@-2: Definition `LegacyAnnotatedStruct` requires a URI: add a non-empty package to the file, or annotate the type with @thrift.Uri. For more details, see https://fburl.com/thrift-uri-add-package
+
+    // Error: enum without URI
+    enum MissingUriEnum { }
+    # expected-error@-1: Definition `MissingUriEnum` requires a URI: add a non-empty package to the file, or annotate the type with @thrift.Uri. For more details, see https://fburl.com/thrift-uri-add-package
+  )",
+      {"--extra-validation", "ignore_missing_uri_opt_out,missing_uris=error"});
+}
+
+/**
+ * Tests that @thrift.AllowLegacyMissingUris at both package and node level
+ * is ignored when ignore_missing_uri_opt_out is set.
+ */
+TEST(CompilerTest, ignore_missing_uri_opt_out_with_allow_legacy) {
+  check_compile(
+      R"(
+    include "thrift/annotation/thrift.thrift"
+
+    @thrift.AllowLegacyMissingUris
+    package;
+    # expected-warning@-2: Thrift file should have a (non-empty) package. Packages will soon be required, at which point missing packages will trigger a Thrift compiler error. For more details, see https://fburl.com/thrift-uri-add-package
+
+    // Error: package-level AllowLegacyMissingUris does not suppress
+    struct PkgAnnotatedStruct { }
+    # expected-error@-1: Definition `PkgAnnotatedStruct` requires a URI: add a non-empty package to the file, or annotate the type with @thrift.Uri. For more details, see https://fburl.com/thrift-uri-add-package
+
+    // Error: both package and node level AllowLegacyMissingUris do not suppress
+    @thrift.AllowLegacyMissingUris
+    struct BothAnnotatedStruct { }
+    # expected-error@-2: Unnecessary use of @thrift.AllowLegacyMissingUris on `BothAnnotatedStruct`: the annotation is already applied at the package (i.e., file) level.
+    # expected-error@-3: Definition `BothAnnotatedStruct` requires a URI: add a non-empty package to the file, or annotate the type with @thrift.Uri. For more details, see https://fburl.com/thrift-uri-add-package
+  )",
+      {"--extra-validation", "ignore_missing_uri_opt_out,missing_uris=error"});
+}