Move OS and arch helpers to util

code-asher · code-asher · commit 0ecee00a40d8 · 2024-02-14T17:46:31.000-09:00
sdk seems like the wrong place for it.
diff --git a/src/main/kotlin/com/coder/gateway/models/WorkspaceAgentModel.kt b/src/main/kotlin/com/coder/gateway/models/WorkspaceAgentModel.kt
@@ -1,7 +1,7 @@
 package com.coder.gateway.models
 
-import com.coder.gateway.sdk.Arch
-import com.coder.gateway.sdk.OS
+import com.coder.gateway.util.Arch
+import com.coder.gateway.util.OS
 import com.coder.gateway.sdk.v2.models.WorkspaceStatus
 import com.coder.gateway.sdk.v2.models.WorkspaceTransition
 import java.util.UUID
diff --git a/src/main/kotlin/com/coder/gateway/sdk/CoderCLIManager.kt b/src/main/kotlin/com/coder/gateway/sdk/CoderCLIManager.kt
@@ -2,6 +2,10 @@ package com.coder.gateway.sdk
 
 import com.coder.gateway.models.WorkspaceAgentModel
 import com.coder.gateway.services.CoderSettingsState
+import com.coder.gateway.util.Arch
+import com.coder.gateway.util.OS
+import com.coder.gateway.util.getArch
+import com.coder.gateway.util.getOS
 import com.coder.gateway.views.steps.CoderWorkspacesStepView
 import com.google.gson.Gson
 import com.google.gson.JsonSyntaxException
diff --git a/src/main/kotlin/com/coder/gateway/sdk/CoderRestClientService.kt b/src/main/kotlin/com/coder/gateway/sdk/CoderRestClientService.kt
@@ -15,6 +15,8 @@ import com.coder.gateway.sdk.v2.models.WorkspaceBuild
 import com.coder.gateway.sdk.v2.models.WorkspaceTransition
 import com.coder.gateway.sdk.v2.models.toAgentModels
 import com.coder.gateway.services.CoderSettingsState
+import com.coder.gateway.util.OS
+import com.coder.gateway.util.getOS
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
 import com.intellij.ide.plugins.PluginManagerCore
diff --git a/src/main/kotlin/com/coder/gateway/sdk/v2/models/Workspace.kt b/src/main/kotlin/com/coder/gateway/sdk/v2/models/Workspace.kt
@@ -3,8 +3,8 @@ package com.coder.gateway.sdk.v2.models
 import com.coder.gateway.models.WorkspaceAgentModel
 import com.coder.gateway.models.WorkspaceAndAgentStatus
 import com.coder.gateway.models.WorkspaceVersionStatus
-import com.coder.gateway.sdk.Arch
-import com.coder.gateway.sdk.OS
+import com.coder.gateway.util.Arch
+import com.coder.gateway.util.OS
 import com.google.gson.annotations.SerializedName
 import java.time.Instant
 import java.util.UUID
diff --git a/src/main/kotlin/com/coder/gateway/util/OS.kt b/src/main/kotlin/com/coder/gateway/util/OS.kt
@@ -1,4 +1,4 @@
-package com.coder.gateway.sdk
+package com.coder.gateway.util
 
 import java.util.Locale
 
diff --git a/src/main/kotlin/com/coder/gateway/views/steps/CoderLocateRemoteProjectStepView.kt b/src/main/kotlin/com/coder/gateway/views/steps/CoderLocateRemoteProjectStepView.kt
@@ -5,10 +5,10 @@ import com.coder.gateway.CoderRemoteConnectionHandle
 import com.coder.gateway.icons.CoderIcons
 import com.coder.gateway.models.CoderWorkspacesWizardModel
 import com.coder.gateway.models.WorkspaceAgentModel
-import com.coder.gateway.sdk.Arch
+import com.coder.gateway.util.Arch
 import com.coder.gateway.sdk.CoderCLIManager
 import com.coder.gateway.sdk.CoderRestClientService
-import com.coder.gateway.sdk.OS
+import com.coder.gateway.util.OS
 import com.coder.gateway.sdk.humanizeDuration
 import com.coder.gateway.sdk.isCancellation
 import com.coder.gateway.sdk.isWorkerTimeout
diff --git a/src/main/kotlin/com/coder/gateway/views/steps/CoderWorkspacesStepView.kt b/src/main/kotlin/com/coder/gateway/views/steps/CoderWorkspacesStepView.kt
@@ -12,7 +12,7 @@ import com.coder.gateway.sdk.CoderRestClientService
 import com.coder.gateway.sdk.CoderSemVer
 import com.coder.gateway.sdk.IncompatibleVersionException
 import com.coder.gateway.sdk.InvalidVersionException
-import com.coder.gateway.sdk.OS
+import com.coder.gateway.util.OS
 import com.coder.gateway.sdk.ResponseException
 import com.coder.gateway.sdk.TemplateIconDownloader
 import com.coder.gateway.sdk.ex.AuthenticationResponseException

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.coder.gateway.sdk`
	`1`	`+package com.coder.gateway.util`
`2`	`2`
`3`	`3`	`import java.util.Locale`
`4`	`4`