refactor: Logging refactor - android/ios test environment

test_runner/src/main/kotlin/ftl/adapter/GoogleTestEnvironment.kt

@@ -0,0 +1,42 @@
+package ftl.adapter
+
+import ftl.api.Locale
+import ftl.api.Platform
+import ftl.api.TestEnvironment
+import ftl.api.fetchAndroidOsVersion
+import ftl.api.fetchDeviceModelAndroid
+import ftl.api.fetchDeviceModelIos
+import ftl.api.fetchIosOsVersion
+import ftl.api.fetchIpBlocks
+import ftl.api.fetchLocales
+import ftl.api.fetchNetworkProfiles
+import ftl.api.fetchOrientation
+import ftl.api.fetchSoftwareCatalog
+
+object FetchGoogleTestEnvironmentAndroid :
+    TestEnvironment.Android.Fetch,
+    (String) -> TestEnvironment.Android by { projectId ->
+        TestEnvironment.Android(
+            osVersions = fetchAndroidOsVersion(projectId),
+            models = fetchDeviceModelAndroid(projectId),
+            locales = fetchLocales(Locale.Identity(projectId, Platform.ANDROID)),
+            softwareCatalog = fetchSoftwareCatalog(),
+            networkProfiles = fetchNetworkProfiles(),
+            orientations = fetchOrientation(projectId, Platform.ANDROID),
+            ipBlocks = fetchIpBlocks()
+        )
+    }
+
+object FetchGoogleTestEnvironmentIos :
+    TestEnvironment.Ios.Fetch,
+    (String) -> TestEnvironment.Ios by { projectId ->
+        TestEnvironment.Ios(
+            osVersions = fetchIosOsVersion(projectId),
+            models = fetchDeviceModelIos(projectId),
+            locales = fetchLocales(Locale.Identity(projectId, Platform.IOS)),
+            softwareCatalog = fetchSoftwareCatalog(),
+            networkProfiles = fetchNetworkProfiles(),
+            orientations = fetchOrientation(projectId, Platform.IOS),
+            ipBlocks = fetchIpBlocks(),
+        )
+    }

test_runner/src/main/kotlin/ftl/api/OsVersion.kt

@@ -21,11 +21,11 @@ object OsVersion {
     }
 
     data class Ios(
-        val id: String,
-        val majorVersion: Int,
-        val minorVersion: Int,
-        val supportedXcodeVersionIds: List<String>,
-        val tags: List<String>,
+        val id: String?,
+        val majorVersion: Int?,
+        val minorVersion: Int?,
+        val supportedXcodeVersionIds: List<String>?,
+        val tags: List<String>?,
     ) {
         interface Fetch : (String) -> List<Ios>
     }

test_runner/src/main/kotlin/ftl/api/TestEnvironment.kt

@@ -0,0 +1,34 @@
+package ftl.api
+
+import com.google.testing.model.ProvidedSoftwareCatalog
+import ftl.adapter.FetchGoogleTestEnvironmentAndroid
+import ftl.adapter.FetchGoogleTestEnvironmentIos
+
+val fetchAndroidTestEnvironment: TestEnvironment.Android.Fetch get() = FetchGoogleTestEnvironmentAndroid
+val fetchIosTestEnvironment: TestEnvironment.Ios.Fetch get() = FetchGoogleTestEnvironmentIos
+
+object TestEnvironment {
+    data class Android(
+        val osVersions: List<OsVersion.Android>,
+        val models: List<DeviceModel.Android>,
+        val locales: List<Locale>,
+        val softwareCatalog: ProvidedSoftwareCatalog,
+        val networkProfiles: List<NetworkProfile>,
+        val orientations: List<Orientation>,
+        val ipBlocks: List<IpBlock>
+    ) {
+        interface Fetch : (String) -> Android
+    }
+
+    data class Ios(
+        val osVersions: List<OsVersion.Ios>,
+        val models: List<DeviceModel.Ios>,
+        val locales: List<Locale>,
+        val softwareCatalog: ProvidedSoftwareCatalog,
+        val networkProfiles: List<NetworkProfile>,
+        val orientations: List<Orientation>,
+        val ipBlocks: List<IpBlock>
+    ) {
+        interface Fetch : (String) -> Ios
+    }
+}

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

@@ -6,7 +6,7 @@ import com.google.testing.model.Orientation
 import ftl.config.Device
 import ftl.environment.getLocaleDescription
 import ftl.environment.ios.getDescription
-import ftl.environment.ios.toCliTable
+import ftl.environment.ios.iosVersionsToCliTable
 import ftl.gc.GcTesting
 import ftl.http.executeWithRetry
 
@@ -21,7 +21,7 @@ object IosCatalog {
 
     fun getModels(projectId: String): List<IosModel> = iosDeviceCatalog(projectId).models.orEmpty()
 
-    fun softwareVersionsAsTable(projectId: String) = getVersionsList(projectId).toCliTable()
+    fun softwareVersionsAsTable(projectId: String) = getVersionsList(projectId).iosVersionsToCliTable()
 
     fun describeSoftwareVersion(projectId: String, versionId: String) =
         getVersionsList(projectId).getDescription(versionId)

test_runner/src/main/kotlin/ftl/domain/DescribeAndroidTestEnvironment.kt

@@ -1,34 +1,14 @@
 package ftl.domain
 
-import flank.common.logLn
-import ftl.api.Locale.Identity
-import ftl.api.Platform
-import ftl.api.fetchAndroidOsVersion
-import ftl.api.fetchDeviceModelAndroid
-import ftl.api.fetchIpBlocks
-import ftl.api.fetchLocales
-import ftl.api.fetchNetworkProfiles
-import ftl.api.fetchOrientation
-import ftl.api.fetchSoftwareCatalog
+import ftl.api.fetchAndroidTestEnvironment
 import ftl.args.AndroidArgs
-import ftl.environment.android.toCliTable
-import ftl.environment.common.toCliTable
-import ftl.environment.toCliTable
-import ftl.presentation.cli.firebase.test.locale.toCliTable
+import ftl.presentation.Output
 import java.nio.file.Paths
 
-interface DescribeAndroidTestEnvironment {
+interface DescribeAndroidTestEnvironment : Output {
     val configPath: String
 }
 
 fun DescribeAndroidTestEnvironment.invoke() {
-    val projectId = AndroidArgs.loadOrDefault(Paths.get(configPath)).project
-    // TODO move toCliTable() to presentation layer during refactor of presentation after #1728
-    logLn(fetchAndroidOsVersion(projectId).toCliTable())
-    logLn(fetchDeviceModelAndroid(projectId).toCliTable()) // TODO move toCliTable() to presentation layer during refactor of presentation after #1728
-    logLn(fetchLocales(Identity(projectId, Platform.ANDROID)).toCliTable())
-    logLn(fetchSoftwareCatalog().toCliTable())
-    logLn(fetchNetworkProfiles().toCliTable())
-    logLn(fetchOrientation(projectId, Platform.ANDROID).toCliTable()) // TODO move toCliTable() to presentation layer during refactor of presentation after #1728
-    logLn(fetchIpBlocks().toCliTable()) // TODO move toCliTable() to presentation layer during refactor of presentation after #1728
+    fetchAndroidTestEnvironment(AndroidArgs.loadOrDefault(Paths.get(configPath)).project).out()
 }

test_runner/src/main/kotlin/ftl/domain/DescribeIosTestEnvironment.kt

@@ -1,33 +1,15 @@
 package ftl.domain
 
-import flank.common.logLn
-import ftl.api.Locale.Identity
-import ftl.api.Platform
-import ftl.api.fetchDeviceModelIos
-import ftl.api.fetchIpBlocks
-import ftl.api.fetchLocales
-import ftl.api.fetchNetworkProfiles
-import ftl.api.fetchOrientation
-import ftl.api.fetchSoftwareCatalog
+import ftl.api.fetchIosTestEnvironment
 import ftl.args.IosArgs
-import ftl.client.google.IosCatalog
-import ftl.environment.common.toCliTable
-import ftl.environment.ios.toCliTable
-import ftl.environment.toCliTable
-import ftl.presentation.cli.firebase.test.locale.toCliTable
+import ftl.presentation.Output
 import java.nio.file.Paths
 
-interface DescribeIosTestEnvironment {
+interface DescribeIosTestEnvironment : Output {
     val configPath: String
 }
 
 operator fun DescribeIosTestEnvironment.invoke() {
     val projectId = IosArgs.loadOrDefault(Paths.get(configPath)).project
-    logLn(fetchDeviceModelIos(projectId).toCliTable()) // TODO move toCliTable() and printing presentation layer during refactor of presentation after #1728
-    logLn(IosCatalog.softwareVersionsAsTable(projectId))
-    logLn(fetchLocales(Identity(projectId, Platform.IOS)).toCliTable())
-    logLn(fetchSoftwareCatalog().toCliTable())
-    logLn(fetchNetworkProfiles().toCliTable())
-    logLn(fetchOrientation(projectId, Platform.IOS).toCliTable()) // TODO move toCliTable() and printing presentation layer during refactor of presentation after #1728
-    logLn(fetchIpBlocks().toCliTable()) // TODO move toCliTable() and printing presentation layer during refactor of presentation after #1728
+    fetchIosTestEnvironment(projectId).out()
 }

test_runner/src/main/kotlin/ftl/environment/ios/ListIOsSofwareVersions.kt

@@ -1,6 +1,7 @@
 package ftl.environment.ios
 
 import com.google.testing.model.IosVersion
+import ftl.api.OsVersion
 import ftl.environment.OS_VERSION_ID
 import ftl.environment.TAGS
 import ftl.environment.TestEnvironmentInfo
@@ -11,9 +12,23 @@ import ftl.environment.tagToSystemOutColorMapper
 import ftl.util.applyColorsUsing
 import ftl.util.buildTable
 
-fun List<IosVersion>.toCliTable() = createTestEnvironmentInfo().createIOsSoftwareVersionsTable()
+fun List<OsVersion.Ios>.toCliTable() = createTestEnvironmentInfo().createIOsSoftwareVersionsTable()
 
-private fun List<IosVersion>.createTestEnvironmentInfo() =
+private fun List<OsVersion.Ios>.createTestEnvironmentInfo() =
+    fold(mutableMapOf<String, MutableList<String>>()) { softwareInfo, softwareVersion ->
+        softwareInfo.apply {
+            getOrCreateList(OS_VERSION_ID).add(softwareVersion.id.orUnknown())
+            getOrCreateList(MAJOR_VERSION).add(softwareVersion.majorVersion?.toString().orUnknown())
+            getOrCreateList(MINOR_VERSION).add(softwareVersion.minorVersion?.toString().orUnknown())
+            getOrCreateList(TAGS).add(softwareVersion.tags.orEmpty().joinToString())
+            getOrCreateList(SUPPORTED_XCODE_VERSION_IDS).add(softwareVersion.supportedXcodeVersionIds.orEmpty().joinToString())
+        }
+    }
+
+// todo code duplicated for backward compatibility -- will be removed in one of future refactor tasks
+fun List<IosVersion>.iosVersionsToCliTable() = createTestEnvironmentInfoFromIosVersions().createIOsSoftwareVersionsTable()
+
+private fun List<IosVersion>.createTestEnvironmentInfoFromIosVersions() =
     fold(mutableMapOf<String, MutableList<String>>()) { softwareInfo, softwareVersion ->
         softwareInfo.apply {
             getOrCreateList(OS_VERSION_ID).add(softwareVersion.id.orUnknown())

test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/android/AndroidTestEnvironmentCommand.kt

@@ -1,8 +1,12 @@
 package ftl.presentation.cli.firebase.test.android
 
+import ftl.api.TestEnvironment
 import ftl.config.FtlConstants
 import ftl.domain.DescribeAndroidTestEnvironment
 import ftl.domain.invoke
+import ftl.presentation.cli.firebase.test.environment.prepareOutputString
+import ftl.presentation.outputLogger
+import ftl.presentation.throwUnknownType
 import picocli.CommandLine
 
 @CommandLine.Command(
@@ -40,4 +44,11 @@ class AndroidTestEnvironmentCommand :
     var usageHelpRequested: Boolean = false
 
     override fun run() = invoke()
+
+    override val out = outputLogger {
+        when (this) {
+            is TestEnvironment.Android -> prepareOutputString()
+            else -> throwUnknownType()
+        }
+    }
 }

test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/environment/TestEnvironmentInfo.kt

@@ -0,0 +1,28 @@
+package ftl.presentation.cli.firebase.test.environment
+
+import ftl.api.TestEnvironment
+import ftl.environment.android.toCliTable
+import ftl.environment.common.toCliTable
+import ftl.environment.ios.toCliTable
+import ftl.environment.toCliTable
+import ftl.presentation.cli.firebase.test.locale.toCliTable
+
+fun TestEnvironment.Android.prepareOutputString() = buildString {
+    appendLine(osVersions.toCliTable())
+    appendLine(models.toCliTable())
+    appendLine(locales.toCliTable())
+    appendLine(softwareCatalog.toCliTable())
+    appendLine(networkProfiles.toCliTable())
+    appendLine(orientations.toCliTable())
+    appendLine(ipBlocks.toCliTable())
+}
+
+fun TestEnvironment.Ios.prepareOutputString() = buildString {
+    appendLine(osVersions.toCliTable())
+    appendLine(models.toCliTable())
+    appendLine(locales.toCliTable())
+    appendLine(softwareCatalog.toCliTable())
+    appendLine(networkProfiles.toCliTable())
+    appendLine(orientations.toCliTable())
+    appendLine(ipBlocks.toCliTable())
+}

test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/ios/IosTestEnvironmentCommand.kt

@@ -1,8 +1,12 @@
 package ftl.presentation.cli.firebase.test.ios
 
+import ftl.api.TestEnvironment
 import ftl.config.FtlConstants
 import ftl.domain.DescribeIosTestEnvironment
 import ftl.domain.invoke
+import ftl.presentation.cli.firebase.test.environment.prepareOutputString
+import ftl.presentation.outputLogger
+import ftl.presentation.throwUnknownType
 import picocli.CommandLine
 
 @CommandLine.Command(
@@ -40,4 +44,11 @@ class IosTestEnvironmentCommand :
     var usageHelpRequested: Boolean = false
 
     override fun run() = invoke()
+
+    override val out = outputLogger {
+        when (this) {
+            is TestEnvironment.Ios -> prepareOutputString()
+            else -> throwUnknownType()
+        }
+    }
 }