1 files changed, 15 insertions, 67 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/remote/RemoteOptions.java b/src/main/java/com/google/devtools/build/lib/remote/RemoteOptions.java
index 0c76aa3106..fcdb44a14a 100644
--- a/src/main/java/com/google/devtools/build/lib/remote/RemoteOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/remote/RemoteOptions.java
@@ -20,14 +20,14 @@ import com.google.devtools.common.options.OptionsBase;
 /** Options for remote execution and distributed caching. */
 public final class RemoteOptions extends OptionsBase {
   @Option(
-    name = "rest_cache_url",
+    name = "remote_rest_cache",
     defaultValue = "null",
     category = "remote",
     help =
         "A base URL for a RESTful cache server for storing build artifacts."
             + "It has to support PUT, GET, and HEAD requests."
   )
-  public String restCacheUrl;
+  public String remoteRestCache;
 
   @Option(
     name = "hazelcast_node",
@@ -56,18 +56,18 @@ public final class RemoteOptions extends OptionsBase {
   public int hazelcastStandaloneListenPort;
 
   @Option(
-    name = "remote_worker",
+    name = "remote_executor",
     defaultValue = "null",
     category = "remote",
-    help = "Hostname and port number of remote worker in the form of host:port. "
+    help = "HOST or HOST:PORT of a remote execution endpoint."
   )
-  public String remoteWorker;
+  public String remoteExecutor;
 
   @Option(
     name = "remote_cache",
     defaultValue = "null",
     category = "remote",
-    help = "Hostname and port number of remote gRPC cache in the form of host:port. "
+    help = "HOST or HOST:PORT of a remote caching endpoint."
   )
   public String remoteCache;
 
@@ -96,12 +96,12 @@ public final class RemoteOptions extends OptionsBase {
   public int grpcMaxBatchSizeBytes;
 
   @Option(
-    name = "grpc_timeout_seconds",
+    name = "remote_timeout",
     defaultValue = "60",
     category = "remote",
-    help = "The maximal number of seconds to wait for remote calls."
+    help = "The maximum number of seconds to wait for remote execution and cache calls."
   )
-  public int grpcTimeoutSeconds;
+  public int remoteTimeout;
 
   @Option(
     name = "remote_accept_cached",
@@ -112,20 +112,20 @@ public final class RemoteOptions extends OptionsBase {
   public boolean remoteAcceptCached;
 
   @Option(
-    name = "remote_allow_local_fallback",
+    name = "remote_local_fallback",
     defaultValue = "true",
     category = "remote",
-    help = "Whether to fall back to standalone strategy if remote fails."
+    help = "Whether to fall back to standalone local execution strategy if remote execution fails."
   )
-  public boolean remoteAllowLocalFallback;
+  public boolean remoteLocalFallback;
 
   @Option(
-    name = "remote_local_exec_upload_results",
+    name = "remote_upload_local_results",
     defaultValue = "true",
     category = "remote",
-    help = "Whether to upload action results to the remote cache after executing locally."
+    help = "Whether to upload locally executed action results to the remote cache."
   )
-  public boolean remoteLocalExecUploadResults;
+  public boolean remoteUploadLocalResults;
 
   @Option(
     name = "experimental_remote_platform_override",
@@ -134,56 +134,4 @@ public final class RemoteOptions extends OptionsBase {
     help = "Temporary, for testing only. Manually set a Platform to pass to remote execution."
   )
   public String experimentalRemotePlatformOverride;
-
-  @Option(
-    name = "auth_enabled",
-    defaultValue = "false",
-    category = "remote",
-    help = "Whether to enable API key authentication."
-  )
-  public boolean authEnabled;
-
-  @Option(
-    name = "auth_scope",
-    defaultValue = "null",
-    category = "remote",
-    help = "If server authentication requires a scope, provide it here."
-  )
-  public String authScope;
-
-  @Option(
-    name = "auth_credentials_json",
-    defaultValue = "null",
-    category = "remote",
-    help = "Location of credentials JSON file."
-  )
-  public String authCredentialsJson;
-
-  @Option(
-    name = "tls_enabled",
-    defaultValue = "false",
-    category = "remote",
-    help =
-        "If set to true, Bazel uses TLS encryption for all connections to remote cache and "
-            + "execution servers."
-  )
-  public boolean tlsEnabled;
-
-  @Option(
-    name = "tls_cert",
-    defaultValue = "null",
-    category = "remote",
-    help = "TLS certificate file to use."
-  )
-  public String tlsCert;
-
-  @Option(
-    name = "tls_authority_override",
-    defaultValue = "null",
-    category = "remote",
-    help =
-        "If present, consider the value of the flag a valid TLS authority. This is useful for "
-            + "using self-signed test TLS certificates. For testing only."
-  )
-  public String tlsAuthorityOverride;
 }