Introduce ctx.actions.write in place of ctx.file_action.

RELNOTES: None.
PiperOrigin-RevId: 160630261

6 files changed, 25 insertions, 24 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java
index 3ed9a39ee1..b4334436a9 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java
@@ -2796,7 +2796,7 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase {
     scratch.file(
         "java/com/foo/reader.bzl",
         "def _impl(ctx):",
-        "  ctx.file_action(",
+        "  ctx.actions.write(",
         "      ctx.outputs.java,",
         "      '\\n'.join([",
         "          str(target.label) + ': ' + target[config_common.FeatureFlagInfo].value",
diff --git a/src/test/java/com/google/devtools/build/lib/rules/test/SkylarkTestingModuleTest.java b/src/test/java/com/google/devtools/build/lib/rules/test/SkylarkTestingModuleTest.java
index 4cde8ce3b5..7aecef07b4 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/test/SkylarkTestingModuleTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/test/SkylarkTestingModuleTest.java
@@ -86,7 +86,7 @@ public class SkylarkTestingModuleTest extends BuildViewTestCase {
         "examples/rule/apple_rules.bzl",
         "def my_rule_test_impl(ctx):",
         "  exec_info = testing.ExecutionInfo({'local': ''})",
-        "  ctx.file_action(ctx.outputs.executable, '', True)",
+        "  ctx.actions.write(ctx.outputs.executable, '', True)",
         "  return [exec_info]",
         "my_rule_test = rule(implementation = my_rule_test_impl,",
         "    test = True,",
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkAspectsTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkAspectsTest.java
index 4b3740b220..6b86b8800c 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkAspectsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkAspectsTest.java
@@ -918,7 +918,7 @@ public class SkylarkAspectsTest extends AnalysisTestCase {
         "MyAspect = aspect(implementation=_impl)",
         "def _rule_impl(ctx):",
         "  g = ctx.actions.declare_file('g.txt')",
-        "  ctx.file_action(g, 'g')",
+        "  ctx.actions.write(g, 'g')",
         "  return struct(output_groups = { 'duplicate' : depset([g]) })",
         "my_rule = rule(_rule_impl)",
         "def _noop(ctx):",
@@ -948,7 +948,7 @@ public class SkylarkAspectsTest extends AnalysisTestCase {
         "test/aspect.bzl",
         "def _a1_impl(target, ctx):",
         "  f = ctx.actions.declare_file(target.label.name + '_a1.txt')",
-        "  ctx.file_action(f, 'f')",
+        "  ctx.actions.write(f, 'f')",
         "  return struct(output_groups = { 'a1_group' : depset([f]) })",
         "",
         "a1 = aspect(implementation=_a1_impl, attr_aspects = ['dep'])",
@@ -980,7 +980,7 @@ public class SkylarkAspectsTest extends AnalysisTestCase {
         "test/aspect.bzl",
         "def _a1_impl(target, ctx):",
         "  f = ctx.actions.declare_file(target.label.name + '_a1.txt')",
-        "  ctx.file_action(f, 'f')",
+        "  ctx.actions.write(f, 'f')",
         "  return [OutputGroupInfo(a1_group = depset([f]))]",
         "",
         "a1 = aspect(implementation=_a1_impl, attr_aspects = ['dep'])",
@@ -1011,7 +1011,7 @@ public class SkylarkAspectsTest extends AnalysisTestCase {
         "test/aspect.bzl",
         "def _a1_impl(target, ctx):",
         "  f = ctx.actions.declare_file(target.label.name + '_a1.txt')",
-        "  ctx.file_action(f, 'f')",
+        "  ctx.actions.write(f, 'f')",
         "  return struct(output_groups = { 'a1_group' : depset([f]) })",
         "",
         "a1 = aspect(implementation=_a1_impl, attr_aspects = ['dep'])",
@@ -1023,7 +1023,7 @@ public class SkylarkAspectsTest extends AnalysisTestCase {
         "my_rule1 = rule(_rule_impl, attrs = { 'dep' : attr.label(aspects = [a1]) })",
         "def _a2_impl(target, ctx):",
         "  g = ctx.actions.declare_file(target.label.name + '_a2.txt')",
-        "  ctx.file_action(g, 'f')",
+        "  ctx.actions.write(g, 'f')",
         "  return struct(output_groups = { 'a2_group' : depset([g]) })",
         "",
         "a2 = aspect(implementation=_a2_impl, attr_aspects = ['dep'])",
@@ -1052,7 +1052,7 @@ public class SkylarkAspectsTest extends AnalysisTestCase {
         "test/aspect.bzl",
         "def _a1_impl(target, ctx):",
         "  f = ctx.actions.declare_file(target.label.name + '_a1.txt')",
-        "  ctx.file_action(f, 'f')",
+        "  ctx.actions.write(f, 'f')",
         "  return [OutputGroupInfo(a1_group = depset([f]))]",
         "",
         "a1 = aspect(implementation=_a1_impl, attr_aspects = ['dep'])",
@@ -1069,7 +1069,7 @@ public class SkylarkAspectsTest extends AnalysisTestCase {
         "my_rule1 = rule(_rule_impl, attrs = { 'dep' : attr.label(aspects = [a1]) })",
         "def _a2_impl(target, ctx):",
         "  g = ctx.actions.declare_file(target.label.name + '_a2.txt')",
-        "  ctx.file_action(g, 'f')",
+        "  ctx.actions.write(g, 'f')",
         "  return [OutputGroupInfo(a2_group = depset([g]))]",
         "",
         "a2 = aspect(implementation=_a2_impl, attr_aspects = ['dep'])",
@@ -1099,7 +1099,7 @@ public class SkylarkAspectsTest extends AnalysisTestCase {
         "test/aspect.bzl",
         "def _a1_impl(target, ctx):",
         "  f = ctx.actions.declare_file(target.label.name + '_a1.txt')",
-        "  ctx.file_action(f, 'f')",
+        "  ctx.actions.write(f, 'f')",
         "  return struct(output_groups = { 'a1_group' : depset([f]) })",
         "",
         "a1 = aspect(implementation=_a1_impl, attr_aspects = ['dep'])",
@@ -1111,7 +1111,7 @@ public class SkylarkAspectsTest extends AnalysisTestCase {
         "my_rule1 = rule(_rule_impl, attrs = { 'dep' : attr.label(aspects = [a1]) })",
         "def _a2_impl(target, ctx):",
         "  g = ctx.actions.declare_file(target.label.name + '_a2.txt')",
-        "  ctx.file_action(g, 'f')",
+        "  ctx.actions.write(g, 'f')",
         "  return struct(output_groups = { 'a1_group' : depset([g]) })",
         "",
         "a2 = aspect(implementation=_a2_impl, attr_aspects = ['dep'])",
@@ -1648,7 +1648,7 @@ public class SkylarkAspectsTest extends AnalysisTestCase {
         "foo/extension.bzl",
         "def _aspect_impl(target, ctx):",
         "   file = ctx.actions.declare_file('aspect-output-' + target.label.name)",
-        "   ctx.file_action(file, 'data')",
+        "   ctx.actions.write(file, 'data')",
         "   return struct(aspect_file = file)",
         "my_aspect = aspect(_aspect_impl)",
         "def _rule_impl(ctx):",
@@ -1919,7 +1919,7 @@ public class SkylarkAspectsTest extends AnalysisTestCase {
         "def _a3_impl(target,ctx):",
         "  value = []",
         "  f = ctx.actions.declare_file('a3.out')",
-        "  ctx.file_action(f, 'text')",
+        "  ctx.actions.write(f, 'text')",
         "  for dep in ctx.rule.attr.deps:",
         "     if hasattr(dep, 'a3p'):",
         "         value += dep.a3p",
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkIntegrationTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkIntegrationTest.java
index eeb39003f3..14842fc056 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkIntegrationTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkIntegrationTest.java
@@ -527,7 +527,7 @@ public class SkylarkIntegrationTest extends BuildViewTestCase {
     scratch.file(
         "test/skylark/extension.bzl",
         "def custom_rule_impl(ctx):",
-        "  ctx.file_action(output = ctx.outputs.executable, content = 'echo hello')",
+        "  ctx.actions.write(output = ctx.outputs.executable, content = 'echo hello')",
         "  rf = ctx.runfiles(ctx.files.data)",
         "  return struct(runfiles = rf)",
         "",
@@ -967,7 +967,7 @@ public class SkylarkIntegrationTest extends BuildViewTestCase {
         "    command = 'echo')",
         "  ftb = depset(files)",
         "  for i in ctx.outputs.out:",
-        "    ctx.file_action(output=i, content='hi there')",
+        "    ctx.actions.write(output=i, content='hi there')",
         "",
         "def output_func(attr1):",
         "  return {'o': attr1 + '.txt'}",
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java
index 202bc66833..f93a7e3181 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java
@@ -1561,7 +1561,7 @@ public class SkylarkRuleContextTest extends SkylarkTestCase {
         "def _undertest_impl(ctx):",
         "  out1 = ctx.outputs.out1",
         "  out2 = ctx.outputs.out2",
-        "  ctx.file_action(output=out1, content='foo123')",
+        "  ctx.actions.write(output=out1, content='foo123')",
         "  ctx.action(outputs=[out2], inputs=[out1], command='cp ' + out1.path + ' ' + out2.path)",
         "  return struct(out1=out1, out2=out2)",
         "undertest_rule = rule(",
@@ -1681,7 +1681,7 @@ public class SkylarkRuleContextTest extends SkylarkTestCase {
   public void testFileWriteActionInterface() throws Exception {
     scratch.file("test/rules.bzl",
         getSimpleUnderTestDefinition(
-            "ctx.file_action(output=out, content='foo123')"),
+            "ctx.actions.write(output=out, content='foo123')"),
         testingRuleDefinition);
     scratch.file("test/BUILD",
         simpleBuildDefinition);
@@ -1862,6 +1862,7 @@ public class SkylarkRuleContextTest extends SkylarkTestCase {
       "actions.declare_directory('foo.txt')",
       "actions.declare_directory('foo.txt', sibling = file)",
       "actions.do_nothing(mnemonic = 'foo', inputs = [file])",
+      "actions.write(file, 'foo')",
       "check_placeholders('foo', [])",
       "action(command = 'foo', outputs = [file])",
       "file_action(file, 'foo')",
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java
index 9677078bf6..d908085b8b 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java
@@ -409,10 +409,10 @@ public class SkylarkRuleImplementationFunctionsTest extends SkylarkTestCase {
     SkylarkRuleContext ruleContext = createRuleContext("//foo:foo");
     evalRuleContextCode(
         ruleContext,
-        "ruleContext.file_action(",
+        "ruleContext.actions.write(",
         "  output = ruleContext.files.srcs[0],",
         "  content = 'hello world',",
-        "  executable = False)");
+        "  is_executable = False)");
     FileWriteAction action =
         (FileWriteAction)
             Iterables.getOnlyElement(
@@ -621,12 +621,12 @@ public class SkylarkRuleImplementationFunctionsTest extends SkylarkTestCase {
     SkylarkRuleContext ruleContext = createRuleContext("//foo:foo");
     checkErrorContains(
         ruleContext,
-        "method ctx.file_action(output: File, content: string, executable: bool) is not applicable "
-            + "for arguments (File, int, bool): 'content' is 'int', but should be 'string'",
-        "ruleContext.file_action(",
+        "Cannot convert parameter 'content' to type string, in method "
+            + "write(File output, int content, bool is_executable) of 'actions'",
+        "ruleContext.actions.write(",
         "  output = ruleContext.files.srcs[0],",
         "  content = 1,",
-        "  executable = False)");
+        "  is_executable = False)");
   }
 
   @Test
@@ -1533,7 +1533,7 @@ public class SkylarkRuleImplementationFunctionsTest extends SkylarkTestCase {
         "  outs = ctx.outputs",
         "  for i in ctx.attr.srcs:",
         "    o = getattr(outs, 'foo_' + i.label.name)",
-        "    ctx.file_action(",
+        "    ctx.actions.write(",
         "      output = o,",
         "      content = 'hoho')",
         "",