Skip to content

Dse/reduce code scan alerts prod 14136 #838

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sellisd merged 3 commits into from
Dec 18, 2024
Merged

Dse/reduce code scan alerts prod 14136 #838

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7fe8b4e
chore: bump to include patches
sellisd Dec 12, 2024
f4286f1
chore: upgrade and fix broken tests
sellisd Dec 17, 2024
be41fde
style: sort imports according to style
sellisd Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ plugins {
kotlin("plugin.spring") version kotlinVersion apply false
id("pl.allegro.tech.build.axion-release") version "1.15.5"
id("com.diffplug.spotless") version "6.22.0"
id("org.springframework.boot") version "3.2.10" apply false
id("org.springframework.boot") version "3.3.6" apply false
id("project-report")
id("org.owasp.dependencycheck") version "9.0.2"
id("com.github.jk1.dependency-license-report") version "2.5"
id("org.jetbrains.kotlinx.kover") version "0.7.4"
id("io.gitlab.arturbosch.detekt") version "1.23.6"
id("org.openapi.generator") version "7.8.0" apply false
id("com.google.cloud.tools.jib") version "3.4.0" apply false
id("com.google.cloud.tools.jib") version "3.4.4" apply false
}

scmVersion { tag { prefix.set("") } }
Expand All @@ -50,21 +50,21 @@ version = scmVersion.version

// Required versions
val jacksonVersion = "2.15.3"
val springWebVersion = "6.1.4"
val springWebVersion = "6.1.16"

// Implementation
val kotlinJvmTarget = 21
val cosmotechApiCommonVersion = "2.0.1-SNAPSHOT"
val jedisVersion = "4.4.6"
val springOauthVersion = "6.2.2"
val redisOmSpringVersion = "0.9.1"
val kotlinCoroutinesCoreVersion = "1.7.3"
val kotlinCoroutinesCoreVersion = "1.8.1"
val oktaSpringBootVersion = "3.0.5"
val springDocVersion = "2.5.0"
val swaggerParserVersion = "2.1.22"
val commonsCsvVersion = "1.10.0"
val apiValidationVersion = "3.0.2"
val kubernetesClientVersion = "21.0.0"
val kubernetesClientVersion = "22.0.0"

// Checks
val detektVersion = "1.23.6"
Expand Down
8 changes: 4 additions & 4 deletions run/src/test/kotlin/com/cosmotech/run/workflow/argo/WorkflowBuildersTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import kotlin.test.Test
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Assertions.assertNotNull
import org.junit.jupiter.api.Assertions.assertNull
import org.junit.jupiter.api.Assertions.assertTrue

private const val DEFAULT_ENTRY_POINT = "entrypoint.py"
private const val csmSimulationId = "simulationrunid"
Expand Down Expand Up @@ -109,15 +110,14 @@ class WorkflowBuildersTests {
fun `Template has simulator no entrypoint`() {
val src = getRunContainer()
val template = buildTemplate(ORGANIZATION_ID, WORKSPACE_ID, src, csmPlatformProperties)
assertNull(template.container?.command)
assertTrue(template.container?.command!!.isEmpty())
}

@Test
fun `Template has default entrypoint if not defined`() {
val src = getRunContainer()
val template = buildTemplate(ORGANIZATION_ID, WORKSPACE_ID, src, csmPlatformProperties)
val expected: String? = null
assertEquals(expected, template.container?.command)
assertTrue(template.container?.command!!.isEmpty())
}

@Test
Expand Down Expand Up @@ -511,7 +511,7 @@ class WorkflowBuildersTests {
val src = getRunContainer()
val template = buildTemplate(ORGANIZATION_ID, null, src, csmPlatformProperties, true)
assertNotNull(template.container)
assertNull(template.container!!.envFrom)
assertTrue(template.container!!.envFrom.isEmpty())
}

private fun getRunContainer(name: String = "default"): RunContainer {
Expand Down
Loading