Internal change

PiperOrigin-RevId: 894511804

Author: DeviceInfra

src/java/com/google/devtools/mobileharness/fe/v6/service/host/provider/BUILD

@@ -25,6 +25,7 @@ java_library(
     srcs = glob(["*.java"]),
     deps = [
         "//src/devtools/mobileharness/fe/v6/service/proto/host:host_resources_java_proto",
+        "//src/java/com/google/devtools/mobileharness/fe/v6/service/util",
         "//src/java/com/google/devtools/mobileharness/shared/util/auto:auto_value",
         "@maven//:com_google_guava_guava",
         "@maven//:javax_inject_jsr330_api",

src/java/com/google/devtools/mobileharness/fe/v6/service/host/provider/HostAuxiliaryInfoProvider.java

@@ -18,19 +18,78 @@
 
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.devtools.mobileharness.fe.v6.service.proto.host.DiagnosticLink;
+import com.google.devtools.mobileharness.fe.v6.service.util.UniverseScope;
 import java.util.List;
 import java.util.Optional;
 
 /** Provides auxiliary information about hosts, such as release info and pass-through flags. */
 public interface HostAuxiliaryInfoProvider {
 
   /** Fetches release information and host attributes from internal services. */
-  ListenableFuture<Optional<HostReleaseInfo>> getHostReleaseInfo(String hostName);
+  ListenableFuture<Optional<HostReleaseInfo>> getHostReleaseInfo(
+      String hostName, UniverseScope universe);
+
+  /**
+   * @deprecated Use {@link #getHostReleaseInfo(String, UniverseScope)} instead. TODO: Remove after
+   *     all callers are migrated to UniverseScope.
+   */
+  @Deprecated
+  default ListenableFuture<Optional<HostReleaseInfo>> getHostReleaseInfo(
+      String hostName, String universe) {
+    return getHostReleaseInfo(hostName, UniverseScope.fromString(universe));
+  }
+
+  /**
+   * @deprecated Use {@link #getHostReleaseInfo(String, UniverseScope)} instead. TODO: Remove after
+   *     all callers are migrated to UniverseScope.
+   */
+  @Deprecated
+  default ListenableFuture<Optional<HostReleaseInfo>> getHostReleaseInfo(String hostName) {
+    return getHostReleaseInfo(hostName, new UniverseScope.SelfUniverse());
+  }
 
   /** Fetches the legacy pass-through flags for the lab server. */
-  ListenableFuture<Optional<String>> getPassThroughFlags(String hostName);
+  ListenableFuture<Optional<String>> getPassThroughFlags(String hostName, UniverseScope universe);
+
+  /**
+   * @deprecated Use {@link #getPassThroughFlags(String, UniverseScope)} instead. TODO: Remove after
+   *     all callers are migrated to UniverseScope.
+   */
+  @Deprecated
+  default ListenableFuture<Optional<String>> getPassThroughFlags(String hostName, String universe) {
+    return getPassThroughFlags(hostName, UniverseScope.fromString(universe));
+  }
+
+  /**
+   * @deprecated Use {@link #getPassThroughFlags(String, UniverseScope)} instead. TODO: Remove after
+   *     all callers are migrated to UniverseScope.
+   */
+  @Deprecated
+  default ListenableFuture<Optional<String>> getPassThroughFlags(String hostName) {
+    return getPassThroughFlags(hostName, new UniverseScope.SelfUniverse());
+  }
 
   /** Fetches the diagnostic links for the host. */
   ListenableFuture<List<DiagnosticLink>> getDiagnosticLinks(
-      String hostName, Optional<String> labType);
+      String hostName, Optional<String> labType, UniverseScope universe);
+
+  /**
+   * @deprecated Use {@link #getDiagnosticLinks(String, Optional, UniverseScope)} instead. TODO:
+   *     Remove after all callers are migrated to UniverseScope.
+   */
+  @Deprecated
+  default ListenableFuture<List<DiagnosticLink>> getDiagnosticLinks(
+      String hostName, Optional<String> labType, String universe) {
+    return getDiagnosticLinks(hostName, labType, UniverseScope.fromString(universe));
+  }
+
+  /**
+   * @deprecated Use {@link #getDiagnosticLinks(String, Optional, UniverseScope)} instead. TODO:
+   *     Remove after all callers are migrated to UniverseScope.
+   */
+  @Deprecated
+  default ListenableFuture<List<DiagnosticLink>> getDiagnosticLinks(
+      String hostName, Optional<String> labType) {
+    return getDiagnosticLinks(hostName, labType, new UniverseScope.SelfUniverse());
+  }
 }

src/java/com/google/devtools/mobileharness/fe/v6/service/host/provider/OssHostAuxiliaryInfoProviderImpl.java

@@ -21,6 +21,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.devtools.mobileharness.fe.v6.service.proto.host.DiagnosticLink;
+import com.google.devtools.mobileharness.fe.v6.service.util.UniverseScope;
 import java.util.List;
 import java.util.Optional;
 import javax.inject.Inject;
@@ -32,18 +33,20 @@ public class OssHostAuxiliaryInfoProviderImpl implements HostAuxiliaryInfoProvid
   OssHostAuxiliaryInfoProviderImpl() {}
 
   @Override
-  public ListenableFuture<Optional<HostReleaseInfo>> getHostReleaseInfo(String hostName) {
+  public ListenableFuture<Optional<HostReleaseInfo>> getHostReleaseInfo(
+      String hostName, UniverseScope universe) {
     return immediateFuture(Optional.empty());
   }
 
   @Override
-  public ListenableFuture<Optional<String>> getPassThroughFlags(String hostName) {
+  public ListenableFuture<Optional<String>> getPassThroughFlags(
+      String hostName, UniverseScope universe) {
     return immediateFuture(Optional.empty());
   }
 
   @Override
   public ListenableFuture<List<DiagnosticLink>> getDiagnosticLinks(
-      String hostName, Optional<String> labType) {
+      String hostName, Optional<String> labType, UniverseScope universe) {
     return immediateFuture(ImmutableList.of());
   }
 }

src/java/com/google/devtools/mobileharness/fe/v6/service/util/BUILD

@@ -19,6 +19,7 @@ package(
     default_applicable_licenses = ["//:license"],
     default_visibility = [
         "//java/com/google/devtools/mobileharness/fe/v6/service:__subpackages__",
+        "//javatests/com/google/devtools/mobileharness/fe/v6/service:__subpackages__",
         "//src/java/com/google/devtools/mobileharness/fe/v6/service:__subpackages__",
         "//src/javatests/com/google/devtools/mobileharness/fe/v6/service:__subpackages__",
     ],

src/java/com/google/devtools/mobileharness/fe/v6/service/util/UniverseFactory.java

@@ -0,0 +1,58 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.devtools.mobileharness.fe.v6.service.util;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+/**
+ * Factory for creating {@link UniverseScope} instances based on environment and request parameters.
+ */
+@Singleton
+public class UniverseFactory {
+
+  private final Environment environment;
+
+  @Inject
+  UniverseFactory(Environment environment) {
+    this.environment = environment;
+  }
+
+  /**
+   * Creates a {@link UniverseScope} instance from a universe string.
+   *
+   * @param universeStr the universe string from the request
+   * @return the {@link UniverseScope} instance
+   * @throws IllegalArgumentException if the universe string is invalid for the current environment
+   */
+  public UniverseScope create(String universeStr) {
+    if (environment.isGoogleInternal()) {
+      if (universeStr.isEmpty() || universeStr.equals("google_1p")) {
+        return UniverseScope.SELF;
+      } else {
+        return new UniverseScope.RoutedUniverse(universeStr);
+      }
+    } else {
+      if (universeStr.isEmpty()) {
+        return UniverseScope.SELF;
+      } else {
+        throw new IllegalArgumentException(
+            "Non-empty universe is not supported in OSS/ATS environment.");
+      }
+    }
+  }
+}

src/java/com/google/devtools/mobileharness/fe/v6/service/util/UniverseScope.java

@@ -0,0 +1,56 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.devtools.mobileharness.fe.v6.service.util;
+
+/**
+ * Represents the universe scope for routing and feature enablement.
+ *
+ * <p>This sealed interface replaces the {@code Universe} proto for internal service logic,
+ * providing compile-time type safety with exactly two states:
+ *
+ * <ul>
+ *   <li>{@link SelfUniverse} — the local (google_1p) universe
+ *   <li>{@link RoutedUniverse} — a remote ATS controller universe
+ * </ul>
+ */
+public sealed interface UniverseScope {
+
+  /** A singleton {@link SelfUniverse} instance for convenience. */
+  UniverseScope SELF = new SelfUniverse();
+
+  /** Represents the local (google_1p) universe. */
+  record SelfUniverse() implements UniverseScope {}
+
+  /** Represents a remote ATS controller universe, identified by its controller ID. */
+  record RoutedUniverse(String atsControllerId) implements UniverseScope {}
+
+  /**
+   * Creates a {@link UniverseScope} from a legacy universe string.
+   *
+   * <p>This is intended for use in {@code @Deprecated} bridge methods to convert legacy
+   * String-based callers to the new type-safe API during the migration period.
+   *
+   * @deprecated Use {@link UniverseFactory#create(String)} instead, which includes environment
+   *     validation. TODO: Remove after all callers are migrated to UniverseScope.
+   */
+  @Deprecated
+  static UniverseScope fromString(String universe) {
+    return (universe.isEmpty() || universe.equals("google_1p"))
+        ? SELF
+        : new RoutedUniverse(universe);
+  }
+}

src/javatests/com/google/devtools/mobileharness/fe/v6/service/host/provider/BUILD

@@ -26,6 +26,7 @@ java_library(
     srcs = glob(["*.java"]),
     deps = [
         "//src/java/com/google/devtools/mobileharness/fe/v6/service/host/provider",
+        "//src/java/com/google/devtools/mobileharness/fe/v6/service/util",
         "//src/javatests/com/google/devtools/mobileharness/builddefs:truth",
         "@maven//:junit_junit",
     ],

src/javatests/com/google/devtools/mobileharness/fe/v6/service/host/provider/OssHostAuxiliaryInfoProviderImplTest.java

@@ -18,6 +18,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import com.google.devtools.mobileharness.fe.v6.service.util.UniverseScope;
 import java.util.Optional;
 import org.junit.Before;
 import org.junit.Test;
@@ -36,17 +37,28 @@ public void setUp() {
 
   @Test
   public void getHostReleaseInfo_returnsEmpty() throws Exception {
-    assertThat(ossHostAuxiliaryInfoProviderImpl.getHostReleaseInfo("host").get()).isEmpty();
+    assertThat(
+            ossHostAuxiliaryInfoProviderImpl
+                .getHostReleaseInfo("host", new UniverseScope.SelfUniverse())
+                .get())
+        .isEmpty();
   }
 
   @Test
   public void getPassThroughFlags_returnsEmpty() throws Exception {
-    assertThat(ossHostAuxiliaryInfoProviderImpl.getPassThroughFlags("host").get()).isEmpty();
+    assertThat(
+            ossHostAuxiliaryInfoProviderImpl
+                .getPassThroughFlags("host", new UniverseScope.SelfUniverse())
+                .get())
+        .isEmpty();
   }
 
   @Test
   public void getDiagnosticLinks_returnsEmpty() throws Exception {
-    assertThat(ossHostAuxiliaryInfoProviderImpl.getDiagnosticLinks("host", Optional.empty()).get())
+    assertThat(
+            ossHostAuxiliaryInfoProviderImpl
+                .getDiagnosticLinks("host", Optional.empty(), new UniverseScope.SelfUniverse())
+                .get())
         .isEmpty();
   }
 }

src/javatests/com/google/devtools/mobileharness/fe/v6/service/util/UniverseFactoryTest.java

@@ -0,0 +1,90 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.devtools.mobileharness.fe.v6.service.util;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertThrows;
+import static org.mockito.Mockito.when;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
+
+@RunWith(JUnit4.class)
+public final class UniverseFactoryTest {
+
+  @Rule public final MockitoRule mocks = MockitoJUnit.rule();
+
+  @Mock private Environment mockEnvironment;
+
+  private UniverseFactory universeFactory;
+
+  @Before
+  public void setUp() {
+    universeFactory = new UniverseFactory(mockEnvironment);
+  }
+
+  @Test
+  public void create_internal_emptyUniverse_returnsSelfUniverse() {
+    when(mockEnvironment.isGoogleInternal()).thenReturn(true);
+
+    UniverseScope universe = universeFactory.create("");
+
+    assertThat(universe).isInstanceOf(UniverseScope.SelfUniverse.class);
+  }
+
+  @Test
+  public void create_internal_google1pUniverse_returnsSelfUniverse() {
+    when(mockEnvironment.isGoogleInternal()).thenReturn(true);
+
+    UniverseScope universe = universeFactory.create("google_1p");
+
+    assertThat(universe).isInstanceOf(UniverseScope.SelfUniverse.class);
+  }
+
+  @Test
+  public void create_internal_otherUniverse_returnsRoutedUniverse() {
+    when(mockEnvironment.isGoogleInternal()).thenReturn(true);
+
+    UniverseScope universe = universeFactory.create("my_universe");
+
+    assertThat(universe).isInstanceOf(UniverseScope.RoutedUniverse.class);
+    assertThat(((UniverseScope.RoutedUniverse) universe).atsControllerId())
+        .isEqualTo("my_universe");
+  }
+
+  @Test
+  public void create_oss_emptyUniverse_returnsSelfUniverse() {
+    when(mockEnvironment.isGoogleInternal()).thenReturn(false);
+
+    UniverseScope universe = universeFactory.create("");
+
+    assertThat(universe).isInstanceOf(UniverseScope.SelfUniverse.class);
+  }
+
+  @Test
+  public void create_oss_nonEmptyUniverse_throwsException() {
+    when(mockEnvironment.isGoogleInternal()).thenReturn(false);
+
+    assertThrows(IllegalArgumentException.class, () -> universeFactory.create("my_universe"));
+  }
+}