Removed AgentEnvName.AGENT_VERSION (#1919)

nulls · web-flow · commit 817fbcdfd344 · 2023-03-03T09:58:30.000Z
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -29,8 +29,8 @@ jobs:
           java-version: 11
           distribution: temurin
       - name: Install system packages
-        # libcurl is needed for ktor-client-curl, libc-bin for orchestrator
-        run: sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev libc-bin
+        # libcurl is needed for ktor-client-curl
+        run: sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev
       - name: Retrieve Kotlin version
         run: |
           kv=$(cat gradle/libs.versions.toml | grep '^kotlin =' | awk -F'[=]' '{print $2}' | tr -d '" ')
@@ -40,21 +40,8 @@ jobs:
         with:
           path: ~/.konan
           key: ${{ runner.os }}-gradle-konan-${{ env.KOTLIN_VERSION }}
-      # https://gvisor.dev/docs/user_guide/install/
-      - name: Install gvisor runsc runtime
-        run: |
-          ARCH=$(uname -m)
-          URL=https://storage.googleapis.com/gvisor/releases/release/latest/${ARCH}
-          wget -nv ${URL}/runsc ${URL}/runsc.sha512 \
-            ${URL}/containerd-shim-runsc-v1 ${URL}/containerd-shim-runsc-v1.sha512
-          sha512sum -c runsc.sha512 \
-            -c containerd-shim-runsc-v1.sha512
-          rm -f *.sha512
-          chmod a+rx runsc containerd-shim-runsc-v1
-          sudo mv runsc containerd-shim-runsc-v1 /usr/local/bin
-          sudo /usr/local/bin/runsc install
-          sudo systemctl reload docker
-      - uses: gradle/gradle-build-action@v2
+      - name: Build all (excluding tests for save-orchestrator-common)
+        uses: gradle/gradle-build-action@v2
         with:
           gradle-version: wrapper
           gradle-home-cache-cleanup: true
@@ -63,6 +50,22 @@ jobs:
             -x detekt
             -x spotlessCheck
             -x :save-agent:linkDebugExecutableLinuxX64
+            -x :save-orchestrator-common:check
+            -Pdetekt.multiplatform.disabled=true
+            -PgprUser=${{ github.actor }}
+            -PgprKey=${{ secrets.GITHUB_TOKEN }}
+            --scan
+            --build-cache
+      - name: Check save-orchestrator-common
+        uses: gradle/gradle-build-action@v2
+        with:
+          gradle-version: wrapper
+          gradle-home-cache-cleanup: true
+          arguments: |
+            :save-orchestrator-common:check
+            -x detekt
+            -x spotlessCheck
+            -x :save-agent:linkDebugExecutableLinuxX64
             -Pdetekt.multiplatform.disabled=true
             -PgprUser=${{ github.actor }}
             -PgprKey=${{ secrets.GITHUB_TOKEN }}
diff --git a/gradle/plugins/src/main/kotlin/com/saveourtool/save/buildutils/save-cli-configuration.gradle.kts b/gradle/plugins/src/main/kotlin/com/saveourtool/save/buildutils/save-cli-configuration.gradle.kts
@@ -51,13 +51,11 @@ dependencies {
     )
 }
 
-// todo: this logic is duplicated between agent and frontend, can be moved to a shared plugin in gradle/plugins
 val generateVersionFileTaskProvider = tasks.register("generateVersionFile") {
     val versionsFile = File("$buildDir/generated/src/generated/Versions.kt")
 
     dependsOn(rootProject.tasks.named("getSaveCliVersion"))
     inputs.file(pathToSaveCliVersion)
-    inputs.property("project version", version.toString())
     outputs.file(versionsFile)
 
     doFirst {
@@ -68,7 +66,6 @@ val generateVersionFileTaskProvider = tasks.register("generateVersionFile") {
             package generated
 
             internal const val SAVE_CORE_VERSION = "$saveCliVersion"
-            internal const val SAVE_CLOUD_VERSION = "$version"
 
             """.trimIndent()
         )
diff --git a/gradle/plugins/src/main/kotlin/com/saveourtool/save/buildutils/save-cloud-version-file-configuration.gradle.kts b/gradle/plugins/src/main/kotlin/com/saveourtool/save/buildutils/save-cloud-version-file-configuration.gradle.kts
@@ -0,0 +1,26 @@
+/**
+ * Configuration utilities for projects which needs a generated file with SAVE_CLOUD_VERSION
+ */
+
+package com.saveourtool.save.buildutils
+
+import java.io.File
+
+tasks.register("generateSaveCloudVersionFile") {
+    val outputDir = File("$buildDir/generated/src")
+    val versionsFile = outputDir.resolve("generated/SaveCloudVersion.kt")
+    inputs.property("project version", version.toString())
+    outputs.dir("$buildDir/generated/src")
+
+    doFirst {
+        versionsFile.parentFile.mkdirs()
+        versionsFile.writeText(
+            """
+            package generated
+
+            internal const val SAVE_CLOUD_VERSION = "$version"
+
+            """.trimIndent()
+        )
+    }
+}
diff --git a/save-agent/build.gradle.kts b/save-agent/build.gradle.kts
@@ -7,6 +7,7 @@ plugins {
     kotlin("multiplatform")
     alias(libs.plugins.kotlin.plugin.serialization)
     id("com.saveourtool.save.buildutils.code-quality-convention")
+    id("com.saveourtool.save.buildutils.save-cloud-version-file-configuration")
 }
 
 kotlin {
@@ -37,6 +38,13 @@ kotlin {
         }
 
         commonMain {
+            kotlin {
+                srcDir(
+                    tasks.named("generateSaveCloudVersionFile").map {
+                        it.outputs.files.singleFile
+                    }
+                )
+            }
             dependencies {
                 implementation(libs.save.common)
                 implementation(projects.saveCloudCommon)
diff --git a/save-agent/src/commonMain/kotlin/com/saveourtool/save/agent/AgentConfiguration.kt b/save-agent/src/commonMain/kotlin/com/saveourtool/save/agent/AgentConfiguration.kt
@@ -10,6 +10,7 @@ import com.saveourtool.save.agent.utils.requiredEnv
 import com.saveourtool.save.core.config.LogType
 import com.saveourtool.save.core.config.OutputStreamType
 import com.saveourtool.save.core.config.ReportType
+import generated.SAVE_CLOUD_VERSION
 
 import kotlinx.serialization.Serializable
 
@@ -46,7 +47,7 @@ data class AgentConfiguration(
             info = AgentInfo(
                 containerId = requiredEnv(AgentEnvName.CONTAINER_ID),
                 containerName = requiredEnv(AgentEnvName.CONTAINER_NAME),
-                version = requiredEnv(AgentEnvName.AGENT_VERSION),
+                version = SAVE_CLOUD_VERSION,
             ),
             heartbeat = HeartbeatConfig(
                 url = requiredEnv(AgentEnvName.HEARTBEAT_URL),
diff --git a/save-agent/src/commonMain/kotlin/com/saveourtool/save/agent/utils/Utils.kt b/save-agent/src/commonMain/kotlin/com/saveourtool/save/agent/utils/Utils.kt
@@ -20,7 +20,6 @@ internal fun AgentConfiguration.updateFromEnv(): AgentConfiguration {
         info = info.copy(
             containerId = optionalEnv(AgentEnvName.CONTAINER_ID) ?: info.containerId,
             containerName = optionalEnv(AgentEnvName.CONTAINER_NAME) ?: info.containerName,
-            version = optionalEnv(AgentEnvName.AGENT_VERSION) ?: info.version,
         ),
         heartbeat = heartbeat.copy(
             url = optionalEnv(AgentEnvName.HEARTBEAT_URL) ?: heartbeat.url,
diff --git a/save-agent/src/commonTest/kotlin/com/saveourtool/save/agent/SaveAgentTest.kt b/save-agent/src/commonTest/kotlin/com/saveourtool/save/agent/SaveAgentTest.kt
@@ -29,7 +29,6 @@ open class SaveAgentTest {
     init {
         setenv(AgentEnvName.CONTAINER_ID.name, "agent-for-test")
         setenv(AgentEnvName.CONTAINER_NAME.name, "save-agent-for-test")
-        setenv(AgentEnvName.AGENT_VERSION.name, "save-agent-version")
         setenv(AgentEnvName.HEARTBEAT_URL.name, HEARTBEAT_ENDPOINT.toLocalhostUrl())
         setenv(AgentEnvName.CLI_COMMAND.name, "echo Doing nothing it test mode")
         setenv(AgentEnvName.EXECUTION_ID.name, "1")
diff --git a/save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/RunExecutionController.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/RunExecutionController.kt
@@ -18,7 +18,6 @@ import com.saveourtool.save.utils.*
 import com.saveourtool.save.v1
 
 import com.fasterxml.jackson.databind.ObjectMapper
-import generated.SAVE_CLOUD_VERSION
 import io.micrometer.core.instrument.MeterRegistry
 import org.slf4j.Logger
 import org.springframework.boot.web.reactive.function.client.WebClientCustomizer
@@ -206,7 +205,6 @@ class RunExecutionController(
         .contentType(MediaType.APPLICATION_JSON)
         .bodyValue(
             execution.toRunRequest(
-                saveAgentVersion = SAVE_CLOUD_VERSION,
                 saveAgentUrl = internalFileStorage.generateRequiredUrlToDownload(InternalFileKey.saveAgentKey),
             )
         )
diff --git a/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/agent/AgentEnvName.kt b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/agent/AgentEnvName.kt
@@ -4,7 +4,6 @@ package com.saveourtool.save.agent
  * Env names which agent supports and expects
  */
 enum class AgentEnvName {
-    AGENT_VERSION,
     CLI_COMMAND,
     CONTAINER_ID,
     CONTAINER_NAME,
diff --git a/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/request/RunExecutionRequest.kt b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/request/RunExecutionRequest.kt
@@ -6,13 +6,11 @@ import kotlinx.serialization.Serializable
 /**
  * @property executionId ID of [com.saveourtool.save.entities.Execution]
  * @property sdk
- * @property saveAgentVersion version of save-agent [generated.SAVE_CLOUD_VERSION]
  * @property saveAgentUrl URL to download save-agent
  */
 @Serializable
 data class RunExecutionRequest(
     val executionId: Long,
     val sdk: Sdk,
-    val saveAgentVersion: String,
     val saveAgentUrl: String,
 )
diff --git a/save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/entities/Execution.kt b/save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/entities/Execution.kt
@@ -120,12 +120,10 @@ class Execution(
     )
 
     /**
-     * @param saveAgentVersion version of save-agent [generated.SAVE_CLOUD_VERSION]
      * @param saveAgentUrl an url to download save-agent
      * @return [RunExecutionRequest] created from current entity
      */
     fun toRunRequest(
-        saveAgentVersion: String,
         saveAgentUrl: URL,
     ): RunExecutionRequest {
         require(status == ExecutionStatus.PENDING) {
@@ -134,7 +132,6 @@ class Execution(
         return RunExecutionRequest(
             executionId = requiredId(),
             sdk = sdk.toSdk(),
-            saveAgentVersion = saveAgentVersion,
             saveAgentUrl = saveAgentUrl.toString(),
         )
     }
diff --git a/save-frontend/build.gradle.kts b/save-frontend/build.gradle.kts
@@ -8,6 +8,7 @@ plugins {
     kotlin("js")
     id("com.saveourtool.save.buildutils.build-frontend-image-configuration")
     id("com.saveourtool.save.buildutils.code-quality-convention")
+    id("com.saveourtool.save.buildutils.save-cloud-version-file-configuration")
     alias(libs.plugins.kotlin.plugin.serialization)
 }
 
@@ -199,34 +200,12 @@ tasks.named<KotlinJsTest>("browserTest").configure {
     inputs.file(mswScriptTargetFile)
 }
 
-// generate kotlin file with project version to include in web page
-val generateVersionFileTaskProvider = tasks.register("generateVersionFile") {
-    val versionsFile = File("$buildDir/generated/src/generated/Versions.kt")
-
-    inputs.property("project version", version.toString())
-    outputs.file(versionsFile)
-
-    doFirst {
-        versionsFile.parentFile.mkdirs()
-        versionsFile.writeText(
-            """
-            package generated
-
-            internal const val SAVE_VERSION = "$version"
-
-            """.trimIndent()
-        )
-    }
-}
 kotlin.sourceSets.getByName("main") {
-    kotlin.srcDir("$buildDir/generated/src")
-}
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile> {
-    dependsOn(generateVersionFileTaskProvider)
-    inputs.file("$buildDir/generated/src/generated/Versions.kt")
-}
-tasks.named<org.gradle.jvm.tasks.Jar>("kotlinSourcesJar") {
-    dependsOn(generateVersionFileTaskProvider)
+    kotlin.srcDir(
+        tasks.named("generateSaveCloudVersionFile").map {
+            it.outputs.files.singleFile
+        }
+    )
 }
 
 tasks.withType<org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpack> {
diff --git a/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/Footer.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/Footer.kt
@@ -2,7 +2,7 @@ package com.saveourtool.save.frontend.components
 
 import com.saveourtool.save.frontend.utils.CComponent
 import csstype.ClassName
-import generated.SAVE_VERSION
+import generated.SAVE_CLOUD_VERSION
 import react.*
 import react.dom.html.ReactHTML.br
 import react.dom.html.ReactHTML.div
@@ -26,7 +26,7 @@ class Footer : CComponent<Props, State>() {
                     span {
                         +"Copyright ${js("String.fromCharCode(169)")} SAVE 2021-2022"
                         br {}
-                        +"Version $SAVE_VERSION"
+                        +"Version $SAVE_CLOUD_VERSION"
                     }
                 }
             }
diff --git a/save-frontend/src/test/kotlin/com/saveourtool/save/frontend/components/FooterTest.kt b/save-frontend/src/test/kotlin/com/saveourtool/save/frontend/components/FooterTest.kt
@@ -3,7 +3,7 @@ package com.saveourtool.save.frontend.components
 import com.saveourtool.save.frontend.externals.render
 import com.saveourtool.save.frontend.externals.screen
 
-import generated.SAVE_VERSION
+import generated.SAVE_CLOUD_VERSION
 import react.createElement
 import react.react
 
@@ -18,7 +18,7 @@ class FooterTest {
             createElement(type = Footer::class.react),
         )
 
-        val versionLabel = screen.queryByText("Version $SAVE_VERSION",
+        val versionLabel = screen.queryByText("Version $SAVE_CLOUD_VERSION",
             options = jso {
                 // match substring
                 exact = false
diff --git a/save-orchestrator-common/build.gradle.kts b/save-orchestrator-common/build.gradle.kts
@@ -4,7 +4,6 @@ plugins {
     id("com.saveourtool.save.buildutils.kotlin-jvm-configuration")
     id("com.saveourtool.save.buildutils.spring-boot-configuration")
     id("com.saveourtool.save.buildutils.code-quality-convention")
-    id("org.gradle.test-retry") version "1.5.1"
 }
 
 tasks.withType<KotlinCompile> {
@@ -13,16 +12,6 @@ tasks.withType<KotlinCompile> {
     }
 }
 
-tasks.withType<Test> {
-    retry {
-        // There once were flaky tests in orchestrator, but it seems like they became stable.
-        // Settings can be restored or removed, as required.
-        failOnPassedAfterRetry.set(false)
-        maxFailures.set(5)
-        maxRetries.set(1)
-    }
-}
-
 dependencies {
     api(projects.saveCloudCommon)
     implementation(libs.dockerJava.core)
@@ -35,4 +24,6 @@ dependencies {
     implementation(libs.spring.kafka)
     testImplementation(projects.testUtils)
     testImplementation(libs.fabric8.kubernetes.server.mock)
+    testImplementation(libs.testcontainers)
+    testImplementation(libs.logback.core)
 }
diff --git a/save-orchestrator-common/src/main/kotlin/com/saveourtool/save/orchestrator/Utils.kt b/save-orchestrator-common/src/main/kotlin/com/saveourtool/save/orchestrator/Utils.kt
@@ -86,17 +86,14 @@ internal fun DockerClient.findImage(imageId: String, meterRegistry: MeterRegistr
  * Build map of env variables that can be read by save-agent to override settings from properties file
  *
  * @param agentSettings configuration of save-agent loaded from save-orchestrator
- * @param agentVersion version of save-agent
  * @param executionId ID of [com.saveourtool.save.entities.Execution] which to be processed
  * @return map of env variables with their values
  */
 internal fun fillAgentPropertiesFromConfiguration(
     agentSettings: AgentSettings,
-    agentVersion: String,
     executionId: Long,
 ): Map<AgentEnvName, String> = buildMap {
     put(AgentEnvName.EXECUTION_ID, executionId.toString())
-    put(AgentEnvName.AGENT_VERSION, agentVersion)
 
     with(agentSettings) {
         put(AgentEnvName.HEARTBEAT_URL, heartbeatUrl)
diff --git a/save-orchestrator-common/src/main/kotlin/com/saveourtool/save/orchestrator/config/Beans.kt b/save-orchestrator-common/src/main/kotlin/com/saveourtool/save/orchestrator/config/Beans.kt
@@ -26,7 +26,7 @@ class Beans {
      * @return instance of [DockerClient]
      */
     @Bean
-    @Profile("!kubernetes")
+    @Profile("!kubernetes && !docker-test")
     fun dockerClient(
         configProperties: ConfigProperties,
     ): DockerClient {
diff --git a/save-orchestrator-common/src/main/kotlin/com/saveourtool/save/orchestrator/service/ContainerService.kt b/save-orchestrator-common/src/main/kotlin/com/saveourtool/save/orchestrator/service/ContainerService.kt
@@ -112,7 +112,6 @@ class ContainerService(
     private fun prepareConfigurationForExecution(request: RunExecutionRequest): RunConfiguration {
         val env = fillAgentPropertiesFromConfiguration(
             configProperties.agentSettings,
-            request.saveAgentVersion,
             request.executionId,
         )
 
diff --git a/save-orchestrator-common/src/test/kotlin/com/saveourtool/save/orchestrator/SaveOrchestratorCommonTestApplication.kt b/save-orchestrator-common/src/test/kotlin/com/saveourtool/save/orchestrator/SaveOrchestratorCommonTestApplication.kt
@@ -4,8 +4,7 @@ import io.micrometer.core.instrument.MeterRegistry
 import io.micrometer.core.instrument.composite.CompositeMeterRegistry
 import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.context.annotation.*
-
-internal const val SAVE_AGENT_VERSION = "save-agent-version"
+import org.springframework.test.context.ActiveProfiles
 
 @SpringBootApplication
 @Import(SaveOrchestratorCommonConfiguration::class)
diff --git a/save-orchestrator-common/src/test/kotlin/com/saveourtool/save/orchestrator/controller/agents/AgentsControllerTest.kt b/save-orchestrator-common/src/test/kotlin/com/saveourtool/save/orchestrator/controller/agents/AgentsControllerTest.kt
diff --git a/save-orchestrator-common/src/test/kotlin/com/saveourtool/save/orchestrator/docker/DockerContainerManagerTest.kt b/save-orchestrator-common/src/test/kotlin/com/saveourtool/save/orchestrator/docker/DockerContainerManagerTest.kt
diff --git a/save-orchestrator-common/src/test/kotlin/com/saveourtool/save/orchestrator/service/ContainerServiceTest.kt b/save-orchestrator-common/src/test/kotlin/com/saveourtool/save/orchestrator/service/ContainerServiceTest.kt
diff --git a/save-orchestrator-common/src/test/kotlin/com/saveourtool/save/orchestrator/utils/DockerClientTestConfiguration.kt b/save-orchestrator-common/src/test/kotlin/com/saveourtool/save/orchestrator/utils/DockerClientTestConfiguration.kt
diff --git a/save-sandbox/src/main/kotlin/com/saveourtool/save/sandbox/entity/SandboxExecution.kt b/save-sandbox/src/main/kotlin/com/saveourtool/save/sandbox/entity/SandboxExecution.kt
diff --git a/save-sandbox/src/main/kotlin/com/saveourtool/save/sandbox/service/SandboxOrchestratorAgentService.kt b/save-sandbox/src/main/kotlin/com/saveourtool/save/sandbox/service/SandboxOrchestratorAgentService.kt

Original file line number	Diff line number	Diff line change
`@@ -51,13 +51,11 @@ dependencies {`
`51`	`51`	`)`
`52`	`52`	`}`
`53`	`53`
`54`		`-// todo: this logic is duplicated between agent and frontend, can be moved to a shared plugin in gradle/plugins`
`55`	`54`	`val generateVersionFileTaskProvider = tasks.register("generateVersionFile") {`
`56`	`55`	`val versionsFile = File("$buildDir/generated/src/generated/Versions.kt")`
`57`	`56`
`58`	`57`	`dependsOn(rootProject.tasks.named("getSaveCliVersion"))`
`59`	`58`	`inputs.file(pathToSaveCliVersion)`
`60`		`- inputs.property("project version", version.toString())`
`61`	`59`	`outputs.file(versionsFile)`
`62`	`60`
`63`	`61`	`doFirst {`
`@@ -68,7 +66,6 @@ val generateVersionFileTaskProvider = tasks.register("generateVersionFile") {`
`68`	`66`	`package generated`
`69`	`67`
`70`	`68`	`internal const val SAVE_CORE_VERSION = "$saveCliVersion"`
`71`		`- internal const val SAVE_CLOUD_VERSION = "$version"`
`72`	`69`
`73`	`70`	`""".trimIndent()`
`74`	`71`	`)`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@ import com.saveourtool.save.utils.*`
`18`	`18`	`import com.saveourtool.save.v1`
`19`	`19`
`20`	`20`	`import com.fasterxml.jackson.databind.ObjectMapper`
`21`		`-import generated.SAVE_CLOUD_VERSION`
`22`	`21`	`import io.micrometer.core.instrument.MeterRegistry`
`23`	`22`	`import org.slf4j.Logger`
`24`	`23`	`import org.springframework.boot.web.reactive.function.client.WebClientCustomizer`
`@@ -206,7 +205,6 @@ class RunExecutionController(`
`206`	`205`	`.contentType(MediaType.APPLICATION_JSON)`
`207`	`206`	`.bodyValue(`
`208`	`207`	`execution.toRunRequest(`
`209`		`- saveAgentVersion = SAVE_CLOUD_VERSION,`
`210`	`208`	`saveAgentUrl = internalFileStorage.generateRequiredUrlToDownload(InternalFileKey.saveAgentKey),`
`211`	`209`	`)`
`212`	`210`	`)`