[TT] drop instanceId from server

Author: whyoleg

.github/workflows/run-tests-compatibility.yml

@@ -35,7 +35,7 @@ jobs:
           ${{ matrix.target }}ProviderTest
           --continue
           -Pckbuild.providerTests.step=compatibility.generate
-          -Pckbuild.testtool.instanceId=${{ matrix.os }}-${{ matrix.target }}
+          -Pckbuild.testtool.enabled=true
 
       - name: Run tests (android)
         if: ${{ matrix.target == 'connectedAndroid' }}
@@ -47,7 +47,7 @@ jobs:
             ${{ matrix.target }}ProviderTest
             --continue
             -Pckbuild.providerTests.step=compatibility.generate
-            -Pckbuild.testtool.instanceId=${{ matrix.os }}-${{ matrix.target }}
+            -Pckbuild.testtool.enabled=true
 
       - name: Dump testtool server-storage
         run: tar -cf ${{ matrix.os }}-${{ matrix.target }}.tar build/testtool/server-storage
@@ -92,7 +92,7 @@ jobs:
           ${{ matrix.target }}ProviderTest
           --continue
           -Pckbuild.providerTests.step=compatibility.validate
-          -Pckbuild.testtool.instanceId=${{ matrix.os }}-${{ matrix.target }}
+          -Pckbuild.testtool.enabled=true
 
       - name: Run tests (android)
         if: ${{ matrix.target == 'connectedAndroid' }}
@@ -104,4 +104,4 @@ jobs:
             ${{ matrix.target }}ProviderTest
             --continue
             -Pckbuild.providerTests.step=compatibility.validate
-            -Pckbuild.testtool.instanceId=${{ matrix.os }}-${{ matrix.target }}
+            -Pckbuild.testtool.enabled=true

testtool/plugin/src/main/kotlin/TesttoolServerConfiguration.kt

@@ -13,7 +13,6 @@ class TesttoolServerConfiguration(rootProject: Project) {
         require(rootProject == rootProject.rootProject) { "Root project required" }
     }
 
-    val instanceId: Provider<String> = rootProject.providers.gradleProperty("ckbuild.testtool.instanceId")
-    val buildDir: Provider<Directory> = rootProject.layout.buildDirectory.dir("testtool")
-    val serverStorageDir: Provider<Directory> = buildDir.map { it.dir("server-storage") }
+    val enabled = rootProject.providers.gradleProperty("ckbuild.testtool.enabled").orNull?.toBoolean() == true
+    val serverStorageDir: Provider<Directory> = rootProject.layout.buildDirectory.dir("testtool/server-storage")
 }

testtool/plugin/src/main/kotlin/TesttoolServerPlugin.kt

@@ -7,26 +7,24 @@ package dev.whyoleg.cryptography.testtool.plugin
 import com.android.build.gradle.internal.tasks.*
 import org.gradle.api.*
 import org.gradle.api.tasks.testing.*
-import org.gradle.kotlin.dsl.*
 
 open class TesttoolServerPlugin : Plugin<Project> {
     override fun apply(target: Project): Unit = with(target) {
-        val instance = TesttoolServerConfiguration(rootProject)
+        val configuration = TesttoolServerConfiguration(rootProject)
         val serverProvider = gradle.sharedServices.registerIfAbsent(
             "testtool-server-service",
             TesttoolServerService::class.java
         ) {
             it.parameters {
-                it.instanceId.set(instance.instanceId)
-                it.storage.set(instance.serverStorageDir)
+                it.storageDirectory.set(configuration.serverStorageDir)
             }
         }
 
         tasks.matching {
             it is AbstractTestTask || it is AndroidTestTask
         }.configureEach {
             it.doFirst {
-                if (instance.instanceId.isPresent) serverProvider.get()
+                if (configuration.enabled) serverProvider.get()
             }
             it.usesService(serverProvider)
         }

testtool/plugin/src/main/kotlin/TesttoolServerService.kt

@@ -6,20 +6,15 @@ package dev.whyoleg.cryptography.testtool.plugin
 
 import dev.whyoleg.cryptography.testtool.server.*
 import org.gradle.api.file.*
-import org.gradle.api.provider.*
 import org.gradle.api.services.*
-import java.util.*
 
 abstract class TesttoolServerService : BuildService<TesttoolServerService.Parameters>, AutoCloseable {
     interface Parameters : BuildServiceParameters {
-        val instanceId: Property<String>
-        val storage: DirectoryProperty
+        val storageDirectory: DirectoryProperty
     }
 
-    // use random prefix to easy local dev
     private val server = startTesttoolServer(
-        instanceId = "${parameters.instanceId.get()}-${UUID.randomUUID()}",
-        storagePath = parameters.storage.get().asFile.toPath()
+        storagePath = parameters.storageDirectory.get().asFile.toPath()
     )
 
     override fun close(): Unit = server.close()

testtool/server/src/main/kotlin/TesttoolServer.kt

@@ -20,10 +20,7 @@ import java.io.*
 import java.nio.file.*
 import kotlin.io.path.*
 
-fun startTesttoolServer(
-    instanceId: String,
-    storagePath: Path,
-): Closeable {
+fun startTesttoolServer(storagePath: Path): Closeable {
     println("TesttoolServer: starting...")
     val server = startServer(storagePath)
     println("TesttoolServer: started")