Clean up InvocationPolicy's use of OptionDescription.

OptionDescription is basically a hack to get the expansion data for options from outside the options parser, but it was being used at various points of invocation policy enforcement. In order to correctly track option origin, we only want to get this information once. Do it during the invocation policy expansion stage, not at enforcement, so that we track the information of the option's origin in the original invocation policy passed to the enforcer, not the expanded one.

PiperOrigin-RevId: 171661669

1 files changed, 3 insertions, 1 deletions

diff --git a/src/test/java/com/google/devtools/common/options/InvocationPolicyEnforcerTestBase.java b/src/test/java/com/google/devtools/common/options/InvocationPolicyEnforcerTestBase.java
index a217c5083a..86f0112d59 100644
--- a/src/test/java/com/google/devtools/common/options/InvocationPolicyEnforcerTestBase.java
+++ b/src/test/java/com/google/devtools/common/options/InvocationPolicyEnforcerTestBase.java
@@ -21,6 +21,7 @@ import com.google.devtools.build.lib.runtime.proto.InvocationPolicyOuterClass.In
 import java.io.ByteArrayOutputStream;
 import java.util.Arrays;
 import java.util.List;
+import java.util.logging.Level;
 import org.junit.Before;
 import org.junit.BeforeClass;
 
@@ -62,7 +63,8 @@ public class InvocationPolicyEnforcerTestBase {
 
     return new InvocationPolicyEnforcer(
         InvocationPolicyParser.parsePolicy(
-            startupOptionsParser.getOptions(BlazeServerStartupOptions.class).invocationPolicy));
+            startupOptionsParser.getOptions(BlazeServerStartupOptions.class).invocationPolicy),
+        Level.INFO);
   }
 
   OptionsParser parser;