Skip to content

Commit ddcc959

Browse files
fioan89fioan89
committed
Use proper naming convention in enums
1 parent eb1e60a commit ddcc959

File tree

5 files changed

+51
-28
lines changed

5 files changed

+51
-28
lines changed

‎src/main/kotlin/com/coder/gateway/sdk/CoderCLIManager.kt

+7-7
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,19 @@ class CoderCLIManager(private val url: URL, buildVersion: String) {
2121
}
2222
return when (os) {
2323
OS.WINDOWS -> when (arch) {
24-
Arch.amd64 -> "coder-windows-amd64"
25-
Arch.arm64 -> "coder-windows-arm64"
24+
Arch.AMD64 -> "coder-windows-amd64"
25+
Arch.ARM64 -> "coder-windows-arm64"
2626
else -> "coder-windows-amd64"
2727
}
2828
OS.LINUX -> when (arch) {
29-
Arch.amd64 -> "coder-linux-amd64"
30-
Arch.arm64 -> "coder-linux-arm64"
31-
Arch.armv7 -> "coder-linux-armv7"
29+
Arch.AMD64 -> "coder-linux-amd64"
30+
Arch.ARM64 -> "coder-linux-arm64"
31+
Arch.ARMV7 -> "coder-linux-armv7"
3232
else -> "coder-linux-amd64"
3333
}
3434
OS.MAC -> when (arch) {
35-
Arch.amd64 -> "coder-darwin-amd64"
36-
Arch.arm64 -> "coder-darwin-arm64"
35+
Arch.AMD64 -> "coder-darwin-amd64"
36+
Arch.ARM64 -> "coder-darwin-arm64"
3737
else -> "coder-darwin-amd64"
3838
}
3939
}

‎src/main/kotlin/com/coder/gateway/sdk/os.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ fun getOS(): OS? {
1919
fun getArch(): Arch? {
2020
val arch = System.getProperty("os.arch").toLowerCase()
2121
return when {
22-
arch.contains("amd64", true) || arch.contains("x86_64", true) -> Arch.amd64
23-
arch.contains("arm64", true) || arch.contains("aarch64", true) -> Arch.arm64
24-
arch.contains("armv7", true) -> Arch.armv7
22+
arch.contains("amd64", true) || arch.contains("x86_64", true) -> Arch.AMD64
23+
arch.contains("arm64", true) || arch.contains("aarch64", true) -> Arch.ARM64
24+
arch.contains("armv7", true) -> Arch.ARMV7
2525
else -> null
2626
}
2727
}
@@ -31,5 +31,5 @@ enum class OS {
3131
}
3232

3333
enum class Arch {
34-
amd64, arm64, armv7
34+
AMD64, ARM64, ARMV7
3535
}

‎src/main/kotlin/com/coder/gateway/sdk/v2/models/ProvisionerJob.kt

+17-1
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,21 @@ data class ProvisionerJob(
1515
)
1616

1717
enum class ProvisionerJobStatus {
18-
canceled, canceling, failed, pending, running, succeeded
18+
@SerializedName("canceled")
19+
CANCELED,
20+
21+
@SerializedName("canceling")
22+
CANCELING,
23+
24+
@SerializedName("failed")
25+
FAILED,
26+
27+
@SerializedName("pending")
28+
PENDING,
29+
30+
@SerializedName("running")
31+
RUNNING,
32+
33+
@SerializedName("succeeded")
34+
SUCCEEDED
1935
}

‎src/main/kotlin/com/coder/gateway/sdk/v2/models/WorkspaceBuild.kt

+8-1
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,12 @@ data class WorkspaceBuild(
2424
)
2525

2626
enum class WorkspaceBuildTransition {
27-
start, stop, delete
27+
@SerializedName("start")
28+
START,
29+
30+
@SerializedName("stop")
31+
STOP,
32+
33+
@SerializedName("delete")
34+
DELETE
2835
}

‎src/main/kotlin/com/coder/gateway/views/steps/WorkspaceCellRenderer.kt

+15-15
Original file line numberDiff line numberDiff line change
@@ -51,27 +51,27 @@ class WorkspaceCellRenderer : ListCellRenderer<Workspace> {
5151
}
5252

5353
private fun iconForStatus(workspace: Workspace) = when (workspace.latestBuild.job.status) {
54-
ProvisionerJobStatus.succeeded -> if (workspace.latestBuild.workspaceTransition == WorkspaceBuildTransition.start) GREEN_CIRCLE else RED_CIRCLE
55-
ProvisionerJobStatus.running -> when (workspace.latestBuild.workspaceTransition) {
56-
WorkspaceBuildTransition.start, WorkspaceBuildTransition.stop, WorkspaceBuildTransition.delete -> GRAY_CIRCLE
54+
ProvisionerJobStatus.SUCCEEDED -> if (workspace.latestBuild.workspaceTransition == WorkspaceBuildTransition.START) GREEN_CIRCLE else RED_CIRCLE
55+
ProvisionerJobStatus.RUNNING -> when (workspace.latestBuild.workspaceTransition) {
56+
WorkspaceBuildTransition.START, WorkspaceBuildTransition.STOP, WorkspaceBuildTransition.DELETE -> GRAY_CIRCLE
5757
}
5858
else -> RED_CIRCLE
5959
}
6060

6161
private fun labelForStatus(workspace: Workspace) = when (workspace.latestBuild.job.status) {
62-
ProvisionerJobStatus.pending -> "◍ Queued"
63-
ProvisionerJobStatus.running -> when (workspace.latestBuild.workspaceTransition) {
64-
WorkspaceBuildTransition.start -> "⦿ Starting"
65-
WorkspaceBuildTransition.stop -> "◍ Stopping"
66-
WorkspaceBuildTransition.delete -> "⦸ Deleting"
62+
ProvisionerJobStatus.PENDING -> "◍ Queued"
63+
ProvisionerJobStatus.RUNNING -> when (workspace.latestBuild.workspaceTransition) {
64+
WorkspaceBuildTransition.START -> "⦿ Starting"
65+
WorkspaceBuildTransition.STOP -> "◍ Stopping"
66+
WorkspaceBuildTransition.DELETE -> "⦸ Deleting"
6767
}
68-
ProvisionerJobStatus.succeeded -> when (workspace.latestBuild.workspaceTransition) {
69-
WorkspaceBuildTransition.start -> "⦿ Running"
70-
WorkspaceBuildTransition.stop -> "◍ Stopped"
71-
WorkspaceBuildTransition.delete -> "⦸ Deleted"
68+
ProvisionerJobStatus.SUCCEEDED -> when (workspace.latestBuild.workspaceTransition) {
69+
WorkspaceBuildTransition.START -> "⦿ Running"
70+
WorkspaceBuildTransition.STOP -> "◍ Stopped"
71+
WorkspaceBuildTransition.DELETE -> "⦸ Deleted"
7272
}
73-
ProvisionerJobStatus.canceling -> "◍ Canceling action"
74-
ProvisionerJobStatus.canceled -> "◍ Canceled action"
75-
ProvisionerJobStatus.failed -> "ⓧ Failed"
73+
ProvisionerJobStatus.CANCELING -> "◍ Canceling action"
74+
ProvisionerJobStatus.CANCELED -> "◍ Canceled action"
75+
ProvisionerJobStatus.FAILED -> "ⓧ Failed"
7676
}
7777
}

0 commit comments

Comments
 (0)