Skip to content

Commit 323a509

Browse files
authored
Fix test failure due to breaking change from CodeCatalyst API (#3691)
1 parent bf5cd6a commit 323a509

File tree

1 file changed

+14
-5
lines changed

1 file changed

+14
-5
lines changed

jetbrains-gateway/it/software/aws/toolkits/jetbrains/gateway/DevEnvConnectTest.kt

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import org.junit.jupiter.api.extension.ExtensionContext
3232
import org.junit.jupiter.api.extension.RegisterExtension
3333
import org.junit.jupiter.api.io.TempDir
3434
import software.amazon.awssdk.services.codecatalyst.CodeCatalystClient
35+
import software.amazon.awssdk.services.codecatalyst.model.ConflictException
3536
import software.amazon.awssdk.services.codecatalyst.model.DevEnvironmentStatus
3637
import software.amazon.awssdk.services.codecatalyst.model.InstanceType
3738
import software.aws.toolkits.core.utils.Waiters.waitUntil
@@ -82,14 +83,22 @@ class DevEnvConnectTest : AfterAllCallback {
8283
}
8384
} ?: error("CodeCatalyst user doesn't have access to a paid space")
8485

85-
val project = client.createProject {
86-
it.spaceName(space)
87-
it.displayName("aws-jetbrains-toolkit-integ-test-project")
88-
it.description("Project used by AWS Toolkit Jetbrains integration tests")
86+
val projectName = "aws-jetbrains-toolkit-integ-test-project"
87+
val project = try {
88+
client.createProject {
89+
it.spaceName(space)
90+
it.displayName(projectName)
91+
it.description("Project used by AWS Toolkit Jetbrains integration tests")
92+
}.name()
93+
} catch (e: ConflictException) {
94+
client.getProject {
95+
it.spaceName(space)
96+
it.name(projectName)
97+
}.name()
8998
}
9099

91100
builder.spaceName(space)
92-
builder.projectName(project.name())
101+
builder.projectName(project)
93102
builder.ides({ ide ->
94103
ide.name("IntelliJ")
95104
ide.runtime("public.ecr.aws/jetbrains/iu:release")

0 commit comments

Comments
 (0)