Migrate Actions provider to skylarkbuildapi
RELNOTES: None.
PiperOrigin-RevId: 201367075
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ActionsProvider.java b/src/main/java/com/google/devtools/build/lib/analysis/ActionsProvider.java
index 105dbd8..4e887e4 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/ActionsProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/ActionsProvider.java
@@ -17,9 +17,10 @@
import com.google.devtools.build.lib.actions.ActionAnalysisMetadata;
import com.google.devtools.build.lib.actions.Artifact;
import com.google.devtools.build.lib.events.Location;
+import com.google.devtools.build.lib.packages.BuiltinProvider;
import com.google.devtools.build.lib.packages.Info;
-import com.google.devtools.build.lib.packages.NativeProvider;
import com.google.devtools.build.lib.packages.SkylarkInfo;
+import com.google.devtools.build.lib.skylarkbuildapi.ActionsInfoProviderApi;
import java.util.HashMap;
import java.util.Map;
@@ -27,11 +28,14 @@
* This provides a view over the actions that were created during the analysis of a rule
* (not including actions for its transitive dependencies).
*/
-public final class ActionsProvider {
+public final class ActionsProvider extends BuiltinProvider<Info> implements ActionsInfoProviderApi {
- /** The Actions provider type itself. */
- public static final NativeProvider<Info> SKYLARK_CONSTRUCTOR =
- new NativeProvider<Info>(Info.class, "Actions") {};
+ /** The ActionsProvider singleton instance. */
+ public static final ActionsProvider INSTANCE = new ActionsProvider();
+
+ public ActionsProvider() {
+ super("Actions", Info.class);
+ }
/** Factory method for creating instances of the Actions provider. */
public static Info create(Iterable<ActionAnalysisMetadata> actions) {
@@ -46,6 +50,6 @@
}
}
ImmutableMap<String, Object> fields = ImmutableMap.<String, Object>of("by_file", map);
- return SkylarkInfo.createSchemaless(SKYLARK_CONSTRUCTOR, fields, Location.BUILTIN);
+ return SkylarkInfo.createSchemaless(INSTANCE, fields, Location.BUILTIN);
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkModules.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkModules.java
index 3770c51..9f50d75 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkModules.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkModules.java
@@ -15,6 +15,7 @@
package com.google.devtools.build.lib.analysis.skylark;
import com.google.common.collect.ImmutableMap;
+import com.google.devtools.build.lib.analysis.ActionsProvider;
import com.google.devtools.build.lib.analysis.OutputGroupInfo;
import com.google.devtools.build.lib.packages.SkylarkNativeModule;
import com.google.devtools.build.lib.packages.StructProvider;
@@ -38,7 +39,8 @@
SkylarkNativeModule.class,
SkylarkRuleClassFunctions.class,
StructProvider.STRUCT,
- OutputGroupInfo.SKYLARK_CONSTRUCTOR);
+ OutputGroupInfo.SKYLARK_CONSTRUCTOR,
+ ActionsProvider.INSTANCE);
/**
* Adds bindings for skylark built-ins and non-rules-specific globals of the build API to
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleClassFunctions.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleClassFunctions.java
index ff3ff32..4108824 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleClassFunctions.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleClassFunctions.java
@@ -33,7 +33,6 @@
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.google.devtools.build.lib.actions.Artifact;
-import com.google.devtools.build.lib.analysis.ActionsProvider;
import com.google.devtools.build.lib.analysis.BaseRuleClasses;
import com.google.devtools.build.lib.analysis.DefaultInfo;
import com.google.devtools.build.lib.analysis.TemplateVariableInfo;
@@ -257,28 +256,6 @@
)
private static final NativeProvider<?> defaultInfo = DefaultInfo.PROVIDER;
- // TODO(bazel-team): Move to a "testing" namespace module. Normally we'd pass an objectType
- // to @SkylarkSignature to do this, but that doesn't work here because we're exposing an already-
- // configured BaseFunction, rather than defining a new BuiltinFunction. This should wait for
- // better support from the Skylark/Java interface, or perhaps support for first-class modules.
- @SkylarkSignature(
- name = "Actions",
- returnType = SkylarkProvider.class,
- doc =
- "<i>(Note: This is a provider type. Don't instantiate it yourself; use it to retrieve a "
- + "provider object from a <a href=\"Target.html\">Target</a>.)</i>"
- + "<br/><br/>"
- + "Provides access to the <a href=\"Action.html\">actions</a> generated by a rule. "
- + "There is one field, <code>by_file</code>, which is a dictionary from an output "
- + "of the rule to its corresponding generating action. "
- + "<br/><br/>"
- + "This is designed for testing rules, and should not be accessed outside "
- + "of test logic. This provider is only available for targets generated by rules"
- + " that have <a href=\"globals.html#rule._skylark_testable\">_skylark_testable</a> "
- + "set to <code>True</code>."
- )
- private static final NativeProvider<?> actions = ActionsProvider.SKYLARK_CONSTRUCTOR;
-
@Override
public Provider provider(String doc, Object fields, Location location) throws EvalException {
Iterable<String> fieldNames = null;
