Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit41455d0

Browse files
committed
Remove unused API references
Many of these are out of date, and it seems Moshi is more strict aboutparsing because when a property is missing it will error. For now, paredown the SDK to just the values we are using, but ideally we wouldgenerate this from coder/coder itself.
1 parentfc934dd commit41455d0

17 files changed

+18
-389
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ open class BaseCoderRestClient(
194194
}
195195

196196
funstartWorkspace(workspace:Workspace):WorkspaceBuild {
197-
val buildRequest=CreateWorkspaceBuildRequest(null,WorkspaceTransition.START,null,null,null,null)
197+
val buildRequest=CreateWorkspaceBuildRequest(null,WorkspaceTransition.START)
198198
val buildResponse= retroRestClient.createWorkspaceBuild(workspace.id, buildRequest).execute()
199199
if (buildResponse.code()!=HttpURLConnection.HTTP_CREATED) {
200200
throwWorkspaceResponseException(error("start workspace${workspace.name}", buildResponse))
@@ -204,7 +204,7 @@ open class BaseCoderRestClient(
204204
}
205205

206206
funstopWorkspace(workspace:Workspace):WorkspaceBuild {
207-
val buildRequest=CreateWorkspaceBuildRequest(null,WorkspaceTransition.STOP,null,null,null,null)
207+
val buildRequest=CreateWorkspaceBuildRequest(null,WorkspaceTransition.STOP)
208208
val buildResponse= retroRestClient.createWorkspaceBuild(workspace.id, buildRequest).execute()
209209
if (buildResponse.code()!=HttpURLConnection.HTTP_CREATED) {
210210
throwWorkspaceResponseException(error("stop workspace${workspace.name}", buildResponse))
@@ -226,7 +226,7 @@ open class BaseCoderRestClient(
226226
val template= template(workspace.templateID)
227227

228228
val buildRequest=
229-
CreateWorkspaceBuildRequest(template.activeVersionID,WorkspaceTransition.START,null,null,null,null)
229+
CreateWorkspaceBuildRequest(template.activeVersionID,WorkspaceTransition.START)
230230
val buildResponse= retroRestClient.createWorkspaceBuild(workspace.id, buildRequest).execute()
231231
if (buildResponse.code()!=HttpURLConnection.HTTP_CREATED) {
232232
throwWorkspaceResponseException(error("update workspace${workspace.name}", buildResponse))

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

Lines changed: 0 additions & 15 deletions
This file was deleted.

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

Lines changed: 0 additions & 23 deletions
This file was deleted.

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

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,10 @@ import com.squareup.moshi.Json
44
importjava.util.UUID
55

66
data classCreateWorkspaceBuildRequest(
7+
// Use to update the workspace to a new template version.
78
@Json(name="template_version_id")valtemplateVersionID:UUID?,
9+
// Use to start and stop the workspace.
810
@Json(name="transition")valtransition:WorkspaceTransition,
9-
@Json(name="dry_run")valdryRun:Boolean?,
10-
@Json(name="state")valprovisionerState:Array<Byte>?,
11-
// Orphan may be set for the Destroy transition.
12-
@Json(name="orphan")valorphan:Boolean?,
13-
@Json(name="parameter_values")valparameterValues:Array<CreateParameterRequest>?
1411
) {
1512
overridefunequals(other:Any?):Boolean {
1613
if (this=== other)returntrue
@@ -20,27 +17,13 @@ data class CreateWorkspaceBuildRequest(
2017

2118
if (templateVersionID!= other.templateVersionID)returnfalse
2219
if (transition!= other.transition)returnfalse
23-
if (dryRun!= other.dryRun)returnfalse
24-
if (provisionerState!=null) {
25-
if (other.provisionerState==null)returnfalse
26-
if (!provisionerState.contentEquals(other.provisionerState))returnfalse
27-
}elseif (other.provisionerState!=null)returnfalse
28-
if (orphan!= other.orphan)returnfalse
29-
if (parameterValues!=null) {
30-
if (other.parameterValues==null)returnfalse
31-
if (!parameterValues.contentEquals(other.parameterValues))returnfalse
32-
}elseif (other.parameterValues!=null)returnfalse
3320

3421
returntrue
3522
}
3623

3724
overridefunhashCode():Int {
3825
var result= templateVersionID?.hashCode()?:0
3926
result=31* result+ transition.hashCode()
40-
result=31* result+ (dryRun?.hashCode()?:0)
41-
result=31* result+ (provisionerState?.contentHashCode()?:0)
42-
result=31* result+ (orphan?.hashCode()?:0)
43-
result=31* result+ (parameterValues?.contentHashCode()?:0)
4427
return result
4528
}
4629
}

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

Lines changed: 0 additions & 27 deletions
This file was deleted.

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

Lines changed: 0 additions & 27 deletions
This file was deleted.
Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,9 @@
11
packagecom.coder.gateway.sdk.v2.models
22

33
importcom.squareup.moshi.Json
4-
importjava.time.Instant
54
importjava.util.UUID
65

76
data classTemplate(
87
@Json(name="id")valid:UUID,
9-
@Json(name="created_at")valcreatedAt:Instant,
10-
@Json(name="updated_at")valupdatedAt:Instant,
11-
@Json(name="organization_id")valorganizationIterator:UUID,
12-
@Json(name="name")valname:String,
13-
@Json(name="display_name")valdisplayName:String,
14-
@Json(name="provisioner")valprovisioner:ProvisionerType,
158
@Json(name="active_version_id")valactiveVersionID:UUID,
16-
@Json(name="workspace_owner_count")valworkspaceOwnerCount:Int,
17-
@Json(name="active_user_count")valactiveUserCount:Int,
18-
@Json(name="build_time_stats")valbuildTimeStats:Map<WorkspaceTransition,TransitionStats>,
19-
@Json(name="description")valdescription:String,
20-
@Json(name="icon")valicon:String,
21-
@Json(name="default_ttl_ms")valdefaultTTLMillis:Long,
22-
@Json(name="created_by_id")valcreatedByID:UUID,
23-
@Json(name="created_by_name")valcreatedByName:String,
24-
@Json(name="allow_user_cancel_workspace_jobs")valallowUserCancelWorkspaceJobs:Boolean,
259
)
26-
27-
enumclassProvisionerType {
28-
@Json(name="echo")ECHO,
29-
@Json(name="terraform")TERRAFORM
30-
}
31-
32-
data classTransitionStats(valp50:Long,valp95:Long)
Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,7 @@
11
packagecom.coder.gateway.sdk.v2.models
22

33
importcom.squareup.moshi.Json
4-
importjava.time.Instant
5-
importjava.util.UUID
64

75
data classUser(
8-
@Json(name="id")valid:UUID,
96
@Json(name="username")valusername:String,
10-
@Json(name="email")valemail:String,
11-
@Json(name="created_at")valcreatedAt:Instant,
12-
@Json(name="last_seen_at")vallastSeenAt:Instant,
13-
14-
@Json(name="status")valstatus:UserStatus,
15-
@Json(name="organization_ids")valorganizationIDs:List<UUID>,
16-
@Json(name="roles")valroles:List<Role>?,
17-
@Json(name="avatar_url")valavatarURL:String,
187
)
19-
20-
enumclassUserStatus {
21-
@Json(name="active")ACTIVE,
22-
@Json(name="suspended")SUSPENDED
23-
}

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,20 @@ package com.coder.gateway.sdk.v2.models
22

33
importcom.coder.gateway.models.WorkspaceAgentListModel
44
importcom.squareup.moshi.Json
5-
importjava.time.Instant
65
importjava.util.*
76

87
/**
98
* Represents a deployment of a template. It references a specific version and can be updated.
109
*/
1110
data classWorkspace(
1211
@Json(name="id")valid:UUID,
13-
@Json(name="created_at")valcreatedAt:Instant,
14-
@Json(name="updated_at")valupdatedAt:Instant,
15-
@Json(name="owner_id")valownerID:UUID,
16-
@Json(name="owner_name")valownerName:String,
1712
@Json(name="template_id")valtemplateID:UUID,
1813
@Json(name="template_name")valtemplateName:String,
1914
@Json(name="template_display_name")valtemplateDisplayName:String,
2015
@Json(name="template_icon")valtemplateIcon:String,
21-
@Json(name="template_allow_user_cancel_workspace_jobs")valtemplateAllowUserCancelWorkspaceJobs:Boolean,
2216
@Json(name="latest_build")vallatestBuild:WorkspaceBuild,
2317
@Json(name="outdated")valoutdated:Boolean,
2418
@Json(name="name")valname:String,
25-
@Json(name="autostart_schedule")valautostartSchedule:String?,
26-
@Json(name="ttl_ms")valttlMillis:Long?,
27-
@Json(name="last_used_at")vallastUsedAt:Instant,
2819
)
2920

3021
/**

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

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,16 @@ package com.coder.gateway.sdk.v2.models
33
importcom.coder.gateway.util.Arch
44
importcom.coder.gateway.util.OS
55
importcom.squareup.moshi.Json
6-
importjava.time.Instant
76
importjava.util.*
87

98
data classWorkspaceAgent(
109
@Json(name="id")valid:UUID,
11-
@Json(name="created_at")valcreatedAt:Instant,
12-
@Json(name="updated_at")valupdatedAt:Instant,
13-
@Json(name="first_connected_at")valfirstConnectedAt:Instant?,
14-
@Json(name="last_connected_at")vallastConnectedAt:Instant?,
15-
@Json(name="disconnected_at")valdisconnectedAt:Instant?,
1610
@Json(name="status")valstatus:WorkspaceAgentStatus,
1711
@Json(name="name")valname:String,
18-
@Json(name="resource_id")valresourceID:UUID,
19-
@Json(name="instance_id")valinstanceID:String?,
2012
@Json(name="architecture")valarchitecture:Arch?,
21-
@Json(name="environment_variables")valenvVariables:Map<String,String>,
2213
@Json(name="operating_system")valoperatingSystem:OS?,
23-
@Json(name="startup_script")valstartupScript:String?,
2414
@Json(name="directory")valdirectory:String?,
2515
@Json(name="expanded_directory")valexpandedDirectory:String?,
26-
@Json(name="version")valversion:String,
27-
@Json(name="apps")valapps:List<WorkspaceApp>,
28-
@Json(name="latency")valderpLatency:Map<String,DERPRegion>?,
29-
@Json(name="connection_timeout_seconds")valconnectionTimeoutSeconds:Int,
30-
@Json(name="troubleshooting_url")valtroubleshootingURL:String,
3116
@Json(name="lifecycle_state")vallifecycleState:WorkspaceAgentLifecycleState,
3217
@Json(name="login_before_ready")valloginBeforeReady:Boolean?,
3318
)
@@ -50,8 +35,3 @@ enum class WorkspaceAgentLifecycleState {
5035
@Json(name="shutdown_error")SHUTDOWN_ERROR,
5136
@Json(name="off")OFF,
5237
}
53-
54-
data classDERPRegion(
55-
@Json(name="preferred")valpreferred:Boolean,
56-
@Json(name="latency_ms")vallatencyMillis:Double,
57-
)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp