fix: Detect iOS devices as physical (#2182)

* fix: Detect iOS devices as physical

* Try to fix ios exception

* Update BillableMinutesTest.kt

* Update BillableMinutesTest.kt

* Fix IosArgsTest

* Add GitHub rate limit work around

Author: bootstraponline

build.gradle.kts

@@ -1,4 +1,3 @@
-
 import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
 import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
 import org.jmailen.gradle.kotlinter.tasks.LintTask
@@ -86,10 +85,16 @@ val resolveArtifacts by tasks.registering {
             "flankScripts.bat" else "flankScripts"
         val flankScriptsPath = Paths.get("flank-scripts", "bash", flankScriptsRunnerName).toString()
         val rootFlankScriptsPath = rootDir.resolve(flankScriptsPath).absolutePath
-        println(rootFlankScriptsPath)
-        exec {
-            commandLine(rootFlankScriptsPath, "testArtifacts", "-p", rootDir.absolutePath, "resolve")
-            workingDir = rootDir
+        try {
+            exec {
+                val cmd = listOf(rootFlankScriptsPath, "testArtifacts", "-p", rootDir.absolutePath, "resolve")
+                println(cmd.joinToString(" "))
+                commandLine(cmd)
+                workingDir = rootDir
+            }
+        } catch (e: Exception) {
+            // avoid breaking all gradle builds if github has rate limited us by not throwing the exception
+            e.printStackTrace()
         }
     }
 }

test_runner/src/main/kotlin/ftl/args/ValidateIosArgs.kt

@@ -84,7 +84,7 @@ private fun IosArgs.assertXcodeSupported() = when {
 
 private fun IosArgs.assertDevicesSupported() = devices.forEach { device ->
     if (!isDeviceSupported(device.model, device.version, this.project))
-        throw IncompatibleTestDimensionError("iOS ${device.version} on ${device.model} is not a supported\nSupported version ids for '${device.model}': ${device.getSupportedVersionId(project).joinToString()}")
+        throw IncompatibleTestDimensionError("iOS ${device.version} on ${device.model} is not supported\nSupported version ids for '${device.model}': ${device.getSupportedVersionId(project).joinToString()}")
 }
 
 @VisibleForTesting

test_runner/src/main/kotlin/ftl/client/google/AndroidCatalog.kt

@@ -17,7 +17,7 @@ object AndroidCatalog {
     private val modelMap: MutableMap<String, List<String>> = mutableMapOf()
     private val versionMap: MutableMap<String, List<String>> = mutableMapOf()
 
-    private fun deviceCatalog(projectId: String) = catalogMap.getOrPut(projectId) {
+    private fun androidDeviceCatalog(projectId: String) = catalogMap.getOrPut(projectId) {
         GcTesting.get.testEnvironmentCatalog()
             .get("android")
             .setProjectId(projectId)
@@ -29,26 +29,29 @@ object AndroidCatalog {
     private fun AndroidDeviceCatalog.filterDevicesWithoutSupportedVersions() =
         setModels(models.filterNotNull().filter { it.supportedVersionIds?.isNotEmpty() ?: false })
 
-    fun getModels(projectId: String): List<AndroidModel> = deviceCatalog(projectId).models.orEmpty()
+    fun getModels(projectId: String): List<AndroidModel> = androidDeviceCatalog(projectId).models.orEmpty()
 
     fun supportedOrientations(projectId: String): List<Orientation> =
-        deviceCatalog(projectId).runtimeConfiguration.orientations
+        androidDeviceCatalog(projectId).runtimeConfiguration.orientations
 
-    internal fun getLocales(projectId: String) = deviceCatalog(projectId).runtimeConfiguration.locales
+    internal fun getLocales(projectId: String) = androidDeviceCatalog(projectId).runtimeConfiguration.locales
 
     fun androidModelIds(projectId: String) =
-        modelMap.getOrPut(projectId) { deviceCatalog(projectId).models.map { it.id } }
+        modelMap.getOrPut(projectId) { androidDeviceCatalog(projectId).models.map { it.id } }
 
     fun androidVersionIds(projectId: String) =
-        versionMap.getOrPut(projectId) { deviceCatalog(projectId).versions.map { it.id } }
+        versionMap.getOrPut(projectId) { androidDeviceCatalog(projectId).versions.map { it.id } }
 
     fun isVirtualDevice(device: AndroidDevice?, projectId: String): Boolean = device
         ?.androidModelId
         ?.let { isVirtualDevice(it, projectId) }
         ?: false
 
     fun isVirtualDevice(modelId: String, projectId: String): Boolean {
-        val form = deviceCatalog(projectId).models
+        val isIos = IosCatalog.getModels(projectId).any { it.id.equals(modelId, ignoreCase = true) }
+        if (isIos) return false
+
+        val form = androidDeviceCatalog(projectId).models
             .find { it.id.equals(modelId, ignoreCase = true) }?.form
             ?: DeviceType.PHYSICAL.name.also {
                 ReportManagerState.Log(

test_runner/src/main/kotlin/ftl/client/google/IosCatalog.kt

@@ -55,19 +55,7 @@ object IosCatalog {
                 .filterDevicesWithoutSupportedVersions()
         }
     } catch (e: java.lang.Exception) {
-        throw java.lang.RuntimeException(
-            """
-Unable to access the test environment catalogMap. Firebase Test Lab for iOS is currently in beta.
-Request access for your project via the following form:
-  https://goo.gl/forms/wAxbiNEP2pxeIRG82
-
-If this project has already been granted access, please make sure you are using a project
-on the Blaze or Flame billing plans, and that you have run
-gcloud config set billing/quota_project project
-
-If you are still having issues, please email ftl-ios-feedback@google.com for support.""",
-            e
-        )
+        throw java.lang.RuntimeException(e)
     }
 
     private fun IosDeviceCatalog.filterDevicesWithoutSupportedVersions() =

test_runner/src/test/kotlin/ftl/args/IosArgsTest.kt

@@ -137,7 +137,7 @@ flank:
 
     @Test
     fun `args invalidDeviceExits`() {
-        assertThrowsWithMessage(Throwable::class, "iOS 11.2 on iphonexsmax is not a supported\nSupported version ids for 'iphonexsmax': 12.1, 12.3") {
+        assertThrowsWithMessage(Throwable::class, "iOS 11.2 on iphonexsmax is not supported\nSupported version ids for 'iphonexsmax': 12.1") {
             val invalidDevice = mutableListOf(Device("iphonexsmax", "11.2"))
             createIosArgs(
                 config = defaultIosConfig().apply {

test_runner/src/test/kotlin/ftl/reports/outcome/BillableMinutesTest.kt

@@ -2,6 +2,7 @@ package ftl.reports.outcome
 
 import com.google.api.services.toolresults.model.Step
 import com.google.testing.model.AndroidModel
+import com.google.testing.model.IosModel
 import ftl.client.google.BillableMinutes
 import ftl.client.google.DeviceType
 import ftl.client.google.GcTesting
@@ -31,6 +32,11 @@ class BillableMinutesTest {
         make { id = "nullVersions"; form = DeviceType.PHYSICAL.name; supportedVersionIds = null }
     )
 
+    private val iosModels = listOf<IosModel>(
+        make { id = "iphone11"; supportedVersionIds = listOf("13.3", "13.6") },
+        make { id = "ipad5"; supportedVersionIds = listOf("14.1") }
+    )
+
     @Before
     fun setUp() {
         output.clearLog()
@@ -44,6 +50,7 @@ class BillableMinutesTest {
                 .executeWithRetry()
         } returns make {
             androidDeviceCatalog = make { models = androidModels }
+            iosDeviceCatalog = make { models = iosModels }
         }
     }