Revert "Reapply "Specify the Xcode version on Queue Entry""

This reverts commit bf9830d.
bazel-ios · Aug 12, 2024 · 4bd30b2 · 4bd30b2
1 parent 9e79a9d
commit 4bd30b2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 57 deletions.
diff --git a/src/main/java/build/buildfarm/instance/server/NodeInstance.java b/src/main/java/build/buildfarm/instance/server/NodeInstance.java
@@ -1152,7 +1152,7 @@ protected void validatePlatform(
   }
 
   @VisibleForTesting
-  protected void validateCommand(
+  void validateCommand(
       Command command,
       Digest inputRootDigest,
       Set<String> inputFiles,

diff --git a/src/main/java/build/buildfarm/instance/shard/ServerInstance.java b/src/main/java/build/buildfarm/instance/shard/ServerInstance.java
@@ -49,7 +49,6 @@
 import build.bazel.remote.execution.v2.BatchReadBlobsResponse.Response;
 import build.bazel.remote.execution.v2.CacheCapabilities;
 import build.bazel.remote.execution.v2.Command;
-import build.bazel.remote.execution.v2.Command.EnvironmentVariable;
 import build.bazel.remote.execution.v2.Compressor;
 import build.bazel.remote.execution.v2.Digest;
 import build.bazel.remote.execution.v2.DigestFunction;
@@ -1738,26 +1737,6 @@ private ListenableFuture<QueuedOperation> buildQueuedOperation(
         service);
   }
 
-  @Override
-  protected void validateCommand(
-      Command command,
-      Digest inputRootDigest,
-      Set<String> inputFiles,
-      Set<String> inputDirectories,
-      Map<Digest, Directory> directoriesIndex,
-      PreconditionFailure.Builder preconditionFailure) {
-    // Validating the match platform
-    Platform matchPlatform = getMatchPlatform(command);
-    Command queuedCommand = command.toBuilder().setPlatform(matchPlatform).build();
-    super.validateCommand(
-        queuedCommand,
-        inputRootDigest,
-        inputFiles,
-        inputDirectories,
-        directoriesIndex,
-        preconditionFailure);
-  }
-
   @Override
   protected void validatePlatform(
       Platform platform, PreconditionFailure.Builder preconditionFailure) {
@@ -2380,37 +2359,6 @@ public ListenableFuture<Void> queue(ExecuteEntry executeEntry, Poller poller, Du
         operationTransformService);
   }
 
-  /**
-   * Allow specifying an xcode to ensure we have the right version for a given action when provided
-   *
-   * <p>Bazel doesn't have a great way to set this client side today; See bazel issue 16866 and
-   * https://groups.google.com/g/bazel-discuss/c/kG11xW7Hvyk
-   */
-  private Platform getMatchPlatform(Command command) {
-    String xcodeEnvKey = "XCODE_VERSION_OVERRIDE";
-    String xcodeEnvValue = null;
-    for (EnvironmentVariable envVar : command.getEnvironmentVariablesList()) {
-      if (envVar.getName().equals(xcodeEnvKey)) {
-        xcodeEnvValue = envVar.getValue();
-      }
-    }
-
-    Platform basePlatform = command.getPlatform();
-    if (xcodeEnvValue == null) {
-      return basePlatform;
-    }
-
-    Platform.Builder matchPlatformBuilder = Platform.newBuilder();
-    for (Platform.Property p : basePlatform.getPropertiesList()) {
-      matchPlatformBuilder.addProperties(p);
-    }
-
-    matchPlatformBuilder.addProperties(
-        Property.newBuilder().setName("xcode").setValue(xcodeEnvValue).build());
-    Platform matchPlatform = matchPlatformBuilder.build();
-    return matchPlatform;
-  }
-
   private ListenableFuture<Void> transformAndQueue(
       ExecuteEntry executeEntry,
       Poller poller,
@@ -2560,14 +2508,12 @@ public void onSuccess(ProfiledQueuedOperationMetadata profiledQueuedMetadata) {
                 profiledQueuedMetadata.getQueuedOperationMetadata();
             Operation queueOperation =
                 operation.toBuilder().setMetadata(Any.pack(queuedOperationMetadata)).build();
-
-            Platform matchPlatform =
-                getMatchPlatform(profiledQueuedMetadata.getQueuedOperation().getCommand());
             QueueEntry queueEntry =
                 QueueEntry.newBuilder()
                     .setExecuteEntry(executeEntry)
                     .setQueuedOperationDigest(queuedOperationMetadata.getQueuedOperationDigest())
-                    .setPlatform(matchPlatform)
+                    .setPlatform(
+                        profiledQueuedMetadata.getQueuedOperation().getCommand().getPlatform())
                     .build();
             try {
               ensureCanQueue(stopwatch);