Skip to content

Commit 10127b2

Browse files
sreyasreya
committed
pr comments
1 parent a54a322 commit 10127b2

File tree

3 files changed

+36
-109
lines changed

3 files changed

+36
-109
lines changed

‎cli/create_test.go

+1-14
Original file line numberDiff line numberDiff line change
@@ -259,20 +259,7 @@ func TestCreate(t *testing.T) {
259259
Parse: []*proto.Parse_Response{{
260260
Type: &proto.Parse_Response_Complete{
261261
Complete: &proto.Parse_Complete{
262-
ParameterSchemas: []*proto.ParameterSchema{
263-
{
264-
AllowOverrideSource: true,
265-
Name: echo.ParameterExecKey,
266-
Description: "description 1",
267-
DefaultSource: &proto.ParameterSource{
268-
Scheme: proto.ParameterSource_DATA,
269-
Value: echo.ParameterSucceed(),
270-
},
271-
DefaultDestination: &proto.ParameterDestination{
272-
Scheme: proto.ParameterDestination_PROVISIONER_VARIABLE,
273-
},
274-
},
275-
},
262+
ParameterSchemas: echo.ParameterSuccess,
276263
},
277264
},
278265
}},

‎provisioner/echo/serve.go

+15
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,21 @@ var (
4949
Complete: &proto.Provision_Complete{},
5050
},
5151
}}
52+
53+
ParameterSuccess = []*proto.ParameterSchema{
54+
{
55+
AllowOverrideSource: true,
56+
Name: ParameterExecKey,
57+
Description: "description 1",
58+
DefaultSource: &proto.ParameterSource{
59+
Scheme: proto.ParameterSource_DATA,
60+
Value: formatExecValue(successKey, ""),
61+
},
62+
DefaultDestination: &proto.ParameterDestination{
63+
Scheme: proto.ParameterDestination_PROVISIONER_VARIABLE,
64+
},
65+
},
66+
}
5267
)
5368

5469
// Serve starts the echo provisioner.

‎site/src/api/typesGenerated.ts

+20-95
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
// Code generated by 'make coder/scripts/apitypings/main.go'. DO NOT EDIT.
22

3-
<<<<<<< HEAD
4-
// From codersdk/workspaceagents.go:36:6
5-
=======
6-
// From codersdk/users.go:49:6
3+
// From codersdk/users.go:54:6
74
export interface APIKey {
85
readonly id: string
96
readonly user_id: string
@@ -15,8 +12,7 @@ export interface APIKey {
1512
readonly lifetime_seconds: number
1613
}
1714

18-
// From codersdk/workspaceagents.go:35:6
19-
>>>>>>> make gen
15+
// From codersdk/workspaceagents.go:36:6
2016
export interface AWSInstanceIdentityToken {
2117
readonly signature: string
2218
readonly document: string
@@ -28,11 +24,7 @@ export interface AgentGitSSHKey {
2824
readonly private_key: string
2925
}
3026

31-
<<<<<<< HEAD
32-
// From codersdk/users.go:156:6
33-
=======
34-
// From codersdk/users.go:169:6
35-
>>>>>>> make gen
27+
// From codersdk/users.go:174:6
3628
export interface AuthMethods {
3729
readonly password: boolean
3830
readonly github: boolean
@@ -57,33 +49,21 @@ export interface ComputedParameter extends Parameter {
5749
readonly default_source_value: boolean
5850
}
5951

60-
<<<<<<< HEAD
61-
// From codersdk/users.go:47:6
62-
=======
63-
// From codersdk/users.go:60:6
64-
>>>>>>> make gen
52+
// From codersdk/users.go:65:6
6553
export interface CreateFirstUserRequest {
6654
readonly email: string
6755
readonly username: string
6856
readonly password: string
6957
readonly organization: string
7058
}
7159

72-
<<<<<<< HEAD
73-
// From codersdk/users.go:55:6
74-
=======
75-
// From codersdk/users.go:68:6
76-
>>>>>>> make gen
60+
// From codersdk/users.go:73:6
7761
export interface CreateFirstUserResponse {
7862
readonly user_id: string
7963
readonly organization_id: string
8064
}
8165

82-
<<<<<<< HEAD
83-
// From codersdk/users.go:151:6
84-
=======
85-
// From codersdk/users.go:164:6
86-
>>>>>>> make gen
66+
// From codersdk/users.go:169:6
8767
export interface CreateOrganizationRequest {
8868
readonly name: string
8969
}
@@ -122,11 +102,7 @@ export interface CreateTemplateVersionRequest {
122102
readonly parameter_values?: CreateParameterRequest[]
123103
}
124104

125-
<<<<<<< HEAD
126-
// From codersdk/users.go:60:6
127-
=======
128-
// From codersdk/users.go:73:6
129-
>>>>>>> make gen
105+
// From codersdk/users.go:78:6
130106
export interface CreateUserRequest {
131107
readonly email: string
132108
readonly username: string
@@ -152,11 +128,7 @@ export interface CreateWorkspaceRequest {
152128
readonly parameter_values?: CreateParameterRequest[]
153129
}
154130

155-
<<<<<<< HEAD
156-
// From codersdk/users.go:147:6
157-
=======
158-
// From codersdk/users.go:160:6
159-
>>>>>>> make gen
131+
// From codersdk/users.go:165:6
160132
export interface GenerateAPIKeyResponse {
161133
readonly key: string
162134
}
@@ -174,21 +146,13 @@ export interface GoogleInstanceIdentityToken {
174146
readonly json_web_token: string
175147
}
176148

177-
<<<<<<< HEAD
178-
// From codersdk/users.go:136:6
179-
=======
180-
// From codersdk/users.go:149:6
181-
>>>>>>> make gen
149+
// From codersdk/users.go:154:6
182150
export interface LoginWithPasswordRequest {
183151
readonly email: string
184152
readonly password: string
185153
}
186154

187-
<<<<<<< HEAD
188-
// From codersdk/users.go:142:6
189-
=======
190-
// From codersdk/users.go:155:6
191-
>>>>>>> make gen
155+
// From codersdk/users.go:160:6
192156
export interface LoginWithPasswordResponse {
193157
readonly session_token: string
194158
}
@@ -331,11 +295,7 @@ export interface UpdateActiveTemplateVersion {
331295
readonly id: string
332296
}
333297

334-
<<<<<<< HEAD
335-
// From codersdk/users.go:76:6
336-
=======
337-
// From codersdk/users.go:89:6
338-
>>>>>>> make gen
298+
// From codersdk/users.go:94:6
339299
export interface UpdateRoles {
340300
readonly roles: string[]
341301
}
@@ -347,21 +307,13 @@ export interface UpdateTemplateMeta {
347307
readonly min_autostart_interval_ms?: number
348308
}
349309

350-
<<<<<<< HEAD
351-
// From codersdk/users.go:71:6
352-
=======
353-
// From codersdk/users.go:84:6
354-
>>>>>>> make gen
310+
// From codersdk/users.go:89:6
355311
export interface UpdateUserPasswordRequest {
356312
readonly old_password: string
357313
readonly password: string
358314
}
359315

360-
<<<<<<< HEAD
361-
// From codersdk/users.go:67:6
362-
=======
363-
// From codersdk/users.go:80:6
364-
>>>>>>> make gen
316+
// From codersdk/users.go:85:6
365317
export interface UpdateUserProfileRequest {
366318
readonly username: string
367319
}
@@ -381,11 +333,7 @@ export interface UploadResponse {
381333
readonly hash: string
382334
}
383335

384-
<<<<<<< HEAD
385-
// From codersdk/users.go:37:6
386-
=======
387-
// From codersdk/users.go:39:6
388-
>>>>>>> make gen
336+
// From codersdk/users.go:44:6
389337
export interface User {
390338
readonly id: string
391339
readonly email: string
@@ -396,58 +344,35 @@ export interface User {
396344
readonly roles: Role[]
397345
}
398346

399-
<<<<<<< HEAD
400-
// From codersdk/users.go:101:6
401-
=======
402-
// From codersdk/users.go:114:6
403-
>>>>>>> make gen
347+
// From codersdk/users.go:119:6
404348
export interface UserAuthorization {
405349
readonly object: UserAuthorizationObject
406350
readonly action: string
407351
}
408352

409-
<<<<<<< HEAD
410-
// From codersdk/users.go:117:6
411-
=======
412-
// From codersdk/users.go:130:6
413-
>>>>>>> make gen
353+
// From codersdk/users.go:135:6
414354
export interface UserAuthorizationObject {
415355
readonly resource_type: string
416356
readonly owner_id?: string
417357
readonly organization_id?: string
418358
readonly resource_id?: string
419359
}
420360

421-
<<<<<<< HEAD
422-
// From codersdk/users.go:90:6
423-
=======
424-
// From codersdk/users.go:103:6
425-
>>>>>>> make gen
361+
// From codersdk/users.go:108:6
426362
export interface UserAuthorizationRequest {
427363
readonly checks: Record<string, UserAuthorization>
428364
}
429365

430-
<<<<<<< HEAD
431-
// From codersdk/users.go:85:6
366+
// From codersdk/users.go:103:6
432367
export type UserAuthorizationResponse = Record<string, boolean>
433368

434-
// From codersdk/users.go:80:6
435-
=======
436369
// From codersdk/users.go:98:6
437-
export type UserAuthorizationResponse = Record<string, boolean>
438-
439-
// From codersdk/users.go:93:6
440-
>>>>>>> make gen
441370
export interface UserRoles {
442371
readonly roles: string[]
443372
readonly organization_roles: Record<string, string[]>
444373
}
445374

446-
<<<<<<< HEAD
447-
// From codersdk/users.go:25:6
448-
=======
449-
// From codersdk/users.go:31:6
450-
>>>>>>> make gen
375+
// From codersdk/users.go:32:6
451376
export interface UsersRequest extends Pagination {
452377
readonly q?: string
453378
}
@@ -587,7 +512,7 @@ export type LogLevel = "debug" | "error" | "info" | "trace" | "warn"
587512
// From codersdk/provisionerdaemons.go:21:6
588513
export type LogSource = "provisioner" | "provisioner_daemon"
589514

590-
// From codersdk/users.go:24:6
515+
// From codersdk/users.go:25:6
591516
export type LoginType = "github" | "password"
592517

593518
// From codersdk/parameters.go:29:6

0 commit comments

Comments
 (0)