8000 Make resource type required on the typescript · coder/coder@899eccc · GitHub
[go: up one dir, main page]
Skip to content

Commit 899eccc

Browse files
EmyrkEmyrk
committed
Make resource type required on the typescript
1 parent 79c0886 commit 899eccc

File tree

2 files changed

+20
-21
lines changed

2 files changed

+20
-21
lines changed

‎codersdk/users.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ type UserPermissionCheck struct {
111111
type UserPermissionCheckObject struct {
112112
// ResourceType is the name of the resource.
113113
// './coderd/rbac/object.go' has the list of valid resource types.
114-
ResourceType string `json:"resource_type,omitempty"`
114+
ResourceType string `json:"resource_type"`
115115
// OwnerID (optional) is a user_id. It adds the set constraint to all resources owned
116116
// by a given user.
117117
OwnerID string `json:"owner_id,omitempty"`

‎site/src/api/typesGenerated.ts

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export interface AgentGitSSHKey {
1212
readonly private_key: string
1313
}
1414

15-
// From codersdk/users.go:123:6
15+
// From codersdk/users.go:150:6
1616
export interface AuthMethods {
1717
readonly password: boolean
1818
readonly github: boolean
@@ -30,21 +30,21 @@ export interface BuildInfoResponse {
3030
readonly version: string
3131
}
3232

33-
// From codersdk/users.go:43:6
33+
// From codersdk/users.go:41:6
3434
export interface CreateFirstUserRequest {
3535
readonly email: string
3636
readonly username: string
3737
readonly password: string
3838
readonly organization: string
3939
}
4040

41-
// From codersdk/users.go:51:6
41+
// From codersdk/users.go:49:6
4242
export interface CreateFirstUserResponse {
4343
readonly user_id: string
4444
readonly organization_id: string
4545
}
4646

47-
// From codersdk/users.go:118:6
47+
// From codersdk/users.go:145:6
4848
export interface CreateOrganizationRequest {
4949
readonly name: string
5050
}
@@ -77,7 +77,7 @@ export interface CreateTemplateVersionRequest {
7777
readonly parameter_values: CreateParameterRequest[]
7878
}
7979

80-
// From codersdk/users.go:56:6
80+
// From codersdk/users.go:54:6
8181
export interface CreateUserRequest {
8282
readonly email: string
8383
readonly username: string
@@ -101,7 +101,7 @@ export interface CreateWorkspaceRequest {
101101
readonly parameter_values: CreateParameterRequest[]
102102
}
103103

104-
// From codersdk/users.go:114:6
104+
// From codersdk/users.go:141:6
105105
export interface GenerateAPIKeyResponse {
106106
readonly key: string
107107
}
@@ -119,13 +119,13 @@ export interface GoogleInstanceIdentityToken {
119119
readonly json_web_token: string
120120
}
121121

122-
// From codersdk/users.go:103:6
122+
// From codersdk/users.go:130:6
123123
export interface LoginWithPasswordRequest {
124124
readonly email: string
125125
readonly password: string
126126
}
127127

128-
// From codersdk/users.go:109:6
128+
// From codersdk/users.go:136:6
129129
export interface LoginWithPasswordResponse {
130130
readonly session_token: string
131131
}
@@ -273,17 +273,17 @@ export interface UpdateActiveTemplateVersion {
273273
readonly id: string
274274
}
275275

276-
// From codersdk/users.go:72:6
276+
// From codersdk/users.go:70:6
277277
export interface UpdateRoles {
278278
readonly roles: string[]
279279
}
280280

281-
// From codersdk/users.go:68:6
281+
// From codersdk/users.go:66:6
282282
export interface UpdateUserPasswordRequest {
283283
readonly password: string
284284
}
285285

286-
// From codersdk/users.go:63:6
286+
// From codersdk/users.go:61:6
287287
export interface UpdateUserProfileRequest {
288288
readonly email: string
289289
readonly username: string
@@ -304,7 +304,7 @@ export interface UploadResponse {
304304
readonly hash: string
305305
}
306306

307-
// From codersdk/users.go:33:6
307+
// From codersdk/users.go:31:6
308308
export interface User {
309309
readonly id: string
310310
readonly email: string
@@ -315,33 +315,32 @@ export interface User {
315315
readonly roles: Role[]
316316
}
317317

318-
// From codersdk/users.go:97:6
318+
// From codersdk/users.go:95:6
319319
export interface UserPermissionCheck {
320320
readonly object: UserPermissionCheckObject
321-
// This is likely an enum in an external package ("github.com/coder/coder/coderd/rbac.Action")
322321
readonly action: string
323322
}
324323

325-
// From codersdk/users.go:81:6
324+
// From codersdk/users.go:111:6
326325
export interface UserPermissionCheckObject {
327-
readonly resource_type?: string
326+
readonly resource_type: string
328327
readonly owner_id?: string
329328
readonly organization_id?: string
330329
readonly resource_id?: string
331330
}
332331

333-
// From codersdk/users.go:93:6
332+
// From codersdk/users.go:84:6
334333
export interface UserPermissionCheckRequest {
335334
readonly checks: Record<string, UserPermissionCheck>
336335
}
337336

338-
// From codersdk/users.go:76:6
337+
// From codersdk/users.go:74:6
339338
export interface UserRoles {
340339
readonly roles: string[]
341340
readonly organization_roles: Record<string, string[]>
342341
}
343342

344-
// From codersdk/users.go:25:6
343+
// From codersdk/users.go:23:6
345344
export interface UsersRequest extends Pagination {
346345
readonly search: string
347346
readonly status: string
@@ -442,7 +441,7 @@ export type ParameterScope = "organization" | "template" | "user" | "workspace"
442441
// From codersdk/provisionerdaemons.go:26:6
443442
export type ProvisionerJobStatus = "canceled" | "canceling" | "failed" | "pending" | "running" | "succeeded"
444443

445-
// From codersdk/users.go:18:6
444+
// From codersdk/users.go:16:6
446445
export type UserStatus = "active" | "suspended"
447446

448447
// From codersdk/workspaceresources.go:15:6

0 commit comments

Comments
 (0)
0