Moving the RemoteWorker into tools/remote directory.

This is because I want to add another remote execution related tool, the remote_client, which will use the Remote Execution API to fetch blobs from a remote cache. I will use this tool as part of end-to-end tests for remote execution.

TESTED=remote integration tests, presubmit
RELNOTES: None
PiperOrigin-RevId: 177995895

12 files changed, 34 insertions, 34 deletions

diff --git a/src/tools/remote/BUILD b/src/tools/remote/BUILD
new file mode 100644
index 0000000000..31ce3ecb15
--- /dev/null
+++ b/src/tools/remote/BUILD
@@ -0,0 +1,16 @@
+filegroup(
+    name = "srcs",
+    srcs = glob(["**"]) + ["//src/tools/remote/src/main/java/com/google/devtools/build/remote/worker:srcs"],
+    visibility = ["//src:__pkg__"],
+)
+
+java_binary(
+    name = "worker",
+    jvm_flags = [
+        # Enables REST for Hazelcast server for testing.
+        "-Dhazelcast.rest.enabled=true",
+    ],
+    main_class = "com.google.devtools.build.remote.worker.RemoteWorker",
+    visibility = ["//visibility:public"],
+    runtime_deps = ["//src/tools/remote/src/main/java/com/google/devtools/build/remote/worker"],
+)
diff --git a/src/tools/remote_worker/README.md b/src/tools/remote/README.md
index 408ab67d47..d662790f4f 100644
--- a/src/tools/remote_worker/README.md
+++ b/src/tools/remote/README.md
@@ -4,14 +4,14 @@ This program implements a remote execution worker that uses gRPC to accept work
 requests. It can work as a remote execution worker, a cache worker, or both.
 The simplest setup is as follows:
 
-- First build remote_worker and run it.
+- First build the worker and run it.
 
-        bazel build src/tools/remote_worker:all
-        bazel-bin/src/tools/remote_worker/remote_worker \
+        bazel build src/tools/remote:all
+        bazel-bin/src/tools/remote/worker \
             --work_path=/tmp/test \
             --listen_port=8080
 
-- Then you run Bazel pointing to the remote_worker instance.
+- Then you run Bazel pointing to the worker instance.
 
         bazel build \
             --spawn_strategy=remote --remote_cache=localhost:8080 \
@@ -22,9 +22,9 @@ uses the local worker as the distributed caching and execution backend.
 
 ## Sandboxing
 
-If you run the remote_worker on Linux, you can also enable sandboxing for increased hermeticity:
+If you run the worker on Linux, you can also enable sandboxing for increased hermeticity:
 
-        bazel-bin/src/tools/remote_worker/remote_worker \
+        bazel-bin/src/tools/remote/worker \
             --work_path=/tmp/test \
             --listen_port=8080 \
             --sandboxing \
diff --git a/src/tools/remote_worker/src/main/java/com/google/devtools/build/remote/ActionCacheServer.java b/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/ActionCacheServer.java
index 8e9ba2fafb..f440cadeff 100644
--- a/src/tools/remote_worker/src/main/java/com/google/devtools/build/remote/ActionCacheServer.java
+++ b/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/ActionCacheServer.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.devtools.build.remote;
+package com.google.devtools.build.remote.worker;
 
 import static java.util.logging.Level.WARNING;
 
diff --git a/src/tools/remote_worker/src/main/java/com/google/devtools/build/remote/BUILD b/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/BUILD
index 8f36c4d0a8..9918895963 100644
--- a/src/tools/remote_worker/src/main/java/com/google/devtools/build/remote/BUILD
+++ b/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/BUILD
@@ -1,15 +1,15 @@
 filegroup(
     name = "srcs",
     srcs = glob(["**"]),
-    visibility = ["//src/tools/remote_worker:__pkg__"],
+    visibility = ["//src/tools/remote:__pkg__"],
 )
 
 java_library(
-    name = "remote",
+    name = "worker",
     srcs = glob(["*.java"]),
     data = ["//src:libunix"],
     resources = ["//src/main/tools:linux-sandbox"],
-    visibility = ["//src/tools/remote_worker:__subpackages__"],
+    visibility = ["//src/tools/remote:__subpackages__"],
     deps = [
         "//src/main/java/com/google/devtools/build/lib:build-base",
         "//src/main/java/com/google/devtools/build/lib:os_util",
diff --git a/src/tools/remote_worker/src/main/java/com/google/devtools/build/remote/ByteStreamServer.java b/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/ByteStreamServer.java
index 778d74335a..ad3af5a058 100644
--- a/src/tools/remote_worker/src/main/java/com/google/devtools/build/remote/ByteStreamServer.java
+++ b/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/ByteStreamServer.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.devtools.build.remote;
+package com.google.devtools.build.remote.worker;
 
 import static java.util.logging.Level.SEVERE;
 import static java.util.logging.Level.WARNING;
diff --git a/src/tools/remote_worker/src/main/java/com/google/devtools/build/remote/CasServer.java b/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/CasServer.java
index 13e42b239d..77325c5279 100644
--- a/src/tools/remote_worker/src/main/java/com/google/devtools/build/remote/CasServer.java
+++ b/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/CasServer.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.devtools.build.remote;
+package com.google.devtools.build.remote.worker;
 
 import com.google.devtools.build.lib.remote.SimpleBlobStoreActionCache;
 import com.google.devtools.remoteexecution.v1test.BatchUpdateBlobsRequest;
diff --git a/src/tools/remote_worker/src/main/java/com/google/devtools/build/remote/ExecutionServer.java b/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/ExecutionServer.java
index 0b3f2780bf..e80257b5b0 100644
--- a/src/tools/remote_worker/src/main/java/com/google/devtools/build/remote/ExecutionServer.java
+++ b/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/ExecutionServer.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.devtools.build.remote;
+package com.google.devtools.build.remote.worker;
 
 import static java.util.logging.Level.FINE;
 import static java.util.logging.Level.INFO;
diff --git a/src/tools/remote_worker/src/main/java/com/google/devtools/build/remote/RemoteWorker.java b/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/RemoteWorker.java
index c05076a627..b49df47f4e 100644
--- a/src/tools/remote_worker/src/main/java/com/google/devtools/build/remote/RemoteWorker.java
+++ b/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/RemoteWorker.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.devtools.build.remote;
+package com.google.devtools.build.remote.worker;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.logging.Level.FINE;
@@ -298,7 +298,7 @@ public final class RemoteWorker {
     if (sandbox == null) {
       logger.severe(
           "Sandboxing requested, but could not find bundled linux-sandbox binary. "
-              + "Please rebuild a remote_worker_deploy.jar on Linux to make this work.");
+              + "Please rebuild a worker_deploy.jar on Linux to make this work.");
       System.exit(1);
     }
 
diff --git a/src/tools/remote_worker/src/main/java/com/google/devtools/build/remote/RemoteWorkerOptions.java b/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/RemoteWorkerOptions.java
index 9dee83a349..ca6a431297 100644
--- a/src/tools/remote_worker/src/main/java/com/google/devtools/build/remote/RemoteWorkerOptions.java
+++ b/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/RemoteWorkerOptions.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.devtools.build.remote;
+package com.google.devtools.build.remote.worker;
 
 import com.google.devtools.build.lib.actions.LocalHostCapacity;
 import com.google.devtools.common.options.Converters.RangeConverter;
diff --git a/src/tools/remote_worker/src/main/java/com/google/devtools/build/remote/StatusUtils.java b/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/StatusUtils.java
index 494ee58453..46288e663c 100644
--- a/src/tools/remote_worker/src/main/java/com/google/devtools/build/remote/StatusUtils.java
+++ b/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/StatusUtils.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.devtools.build.remote;
+package com.google.devtools.build.remote.worker;
 
 import com.google.devtools.remoteexecution.v1test.Digest;
 import com.google.protobuf.Any;
diff --git a/src/tools/remote_worker/src/main/java/com/google/devtools/build/remote/WatcherServer.java b/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/WatcherServer.java
index 9a242f92f1..26797dc30c 100644
--- a/src/tools/remote_worker/src/main/java/com/google/devtools/build/remote/WatcherServer.java
+++ b/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/WatcherServer.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.devtools.build.remote;
+package com.google.devtools.build.remote.worker;
 
 import com.google.common.base.Throwables;
 import com.google.common.util.concurrent.ListenableFuture;
diff --git a/src/tools/remote_worker/BUILD b/src/tools/remote_worker/BUILD
deleted file mode 100644
index 3a45276870..0000000000
--- a/src/tools/remote_worker/BUILD
+++ /dev/null
@@ -1,16 +0,0 @@
-filegroup(
-    name = "srcs",
-    srcs = glob(["**"]) + ["//src/tools/remote_worker/src/main/java/com/google/devtools/build/remote:srcs"],
-    visibility = ["//src:__pkg__"],
-)
-
-java_binary(
-    name = "remote_worker",
-    jvm_flags = [
-        # Enables REST for Hazelcast server for testing.
-        "-Dhazelcast.rest.enabled=true",
-    ],
-    main_class = "com.google.devtools.build.remote.RemoteWorker",
-    visibility = ["//visibility:public"],
-    runtime_deps = ["//src/tools/remote_worker/src/main/java/com/google/devtools/build/remote"],
-)