Merge branch 'master' into 2068_analytics_to_flank_wrapper

Flank · Jul 14, 2021 · e174d3e · e174d3e
2 parents dd4020c + f44162e
commit e174d3e
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/test_runner/src/main/kotlin/ftl/run/platform/android/UploadOtherFiles.kt b/test_runner/src/main/kotlin/ftl/run/platform/android/UploadOtherFiles.kt
@@ -4,6 +4,7 @@ import ftl.api.RemoteStorage
 import ftl.api.uploadToRemoteStorage
 import ftl.args.AndroidArgs
 import ftl.args.IArgs
+import ftl.config.FtlConstants.GCS_PREFIX
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
@@ -24,9 +25,9 @@ internal suspend fun AndroidArgs.uploadObbFiles(): Map<String, String> = corouti
     }.awaitAll().toMap()
 }
 
-fun upload(file: String, rootGcsBucket: String, runGcsPath: String): String {
-    return uploadToRemoteStorage(
+fun upload(file: String, rootGcsBucket: String, runGcsPath: String): String =
+    if (file.startsWith(GCS_PREFIX)) file
+    else uploadToRemoteStorage(
         RemoteStorage.Dir(rootGcsBucket, runGcsPath),
         RemoteStorage.Data(file, Files.readAllBytes(Paths.get(file)))
     )
-}