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

Commit2b1a0ee

Browse files
authored
chore: update v1 schema (#643)
1 parentcbb82ce commit2b1a0ee

File tree

69 files changed

+754
-621
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+754
-621
lines changed

‎.golangci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@ linters-settings:
187187
-t
188188
-id
189189
-wg
190+
-Me
190191
# Optional list of variable declarations that should be ignored completely. (defaults to empty list)
191192
# Entries must be in the form of "<variable name> <type>" or "<variable name> *<type>" for
192193
# variables, or "const <name>" for constants.

‎Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ build: site/out bin
1212
# Runs migrations to output a dump of the database.
1313
coderd/database/dump.sql:$(wildcard coderd/database/migrations/*.sql)
1414
go run coderd/database/dump/main.go
15+
.PHONY: coderd/database/dump.sql
1516

1617
# Generates Go code for querying the database.
1718
coderd/database/generate: fmt/sql coderd/database/dump.sql coderd/database/query.sql

‎cli/configssh.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ func configSSH() *cobra.Command {
5252
sshConfigContent=sshConfigContent[:startIndex-1]+sshConfigContent[endIndex+len(sshEndToken):]
5353
}
5454

55-
workspaces,err:=client.WorkspacesByUser(cmd.Context(),"")
55+
workspaces,err:=client.WorkspacesByUser(cmd.Context(),codersdk.Me)
5656
iferr!=nil {
5757
returnerr
5858
}

‎cli/configssh_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88

99
"github.com/coder/coder/cli/clitest"
1010
"github.com/coder/coder/coderd/coderdtest"
11+
"github.com/coder/coder/codersdk"
1112
"github.com/coder/coder/pty/ptytest"
1213
)
1314

@@ -21,7 +22,7 @@ func TestConfigSSH(t *testing.T) {
2122
version:=coderdtest.CreateProjectVersion(t,client,user.OrganizationID,nil)
2223
coderdtest.AwaitProjectVersionJob(t,client,version.ID)
2324
project:=coderdtest.CreateProject(t,client,user.OrganizationID,version.ID)
24-
workspace:=coderdtest.CreateWorkspace(t,client,"",project.ID)
25+
workspace:=coderdtest.CreateWorkspace(t,client,codersdk.Me,project.ID)
2526
coderdtest.AwaitWorkspaceBuildJob(t,client,workspace.LatestBuild.ID)
2627
tempFile,err:=os.CreateTemp(t.TempDir(),"")
2728
require.NoError(t,err)

‎cli/login.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,10 @@ func login() *cobra.Command {
119119
}
120120

121121
_,err=client.CreateFirstUser(cmd.Context(), codersdk.CreateFirstUserRequest{
122-
Email:email,
123-
Username:username,
124-
Organization:username,
125-
Password:password,
122+
Email:email,
123+
Username:username,
124+
OrganizationName:username,
125+
Password:password,
126126
})
127127
iferr!=nil {
128128
returnxerrors.Errorf("create initial user: %w",err)
@@ -167,7 +167,7 @@ func login() *cobra.Command {
167167
Secret:true,
168168
Validate:func(tokenstring)error {
169169
client.SessionToken=token
170-
_,err:=client.User(cmd.Context(),"me")
170+
_,err:=client.User(cmd.Context(),codersdk.Me)
171171
iferr!=nil {
172172
returnxerrors.New("That's not a valid token!")
173173
}
@@ -180,7 +180,7 @@ func login() *cobra.Command {
180180

181181
// Login to get user data - verify it is OK before persisting
182182
client.SessionToken=sessionToken
183-
resp,err:=client.User(cmd.Context(),"me")
183+
resp,err:=client.User(cmd.Context(),codersdk.Me)
184184
iferr!=nil {
185185
returnxerrors.Errorf("get user: %w",err)
186186
}

‎cli/parameters.go

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package cli
33
import (
44
"context"
55

6+
"github.com/google/uuid"
67
"github.com/spf13/cobra"
78
"golang.org/x/xerrors"
89

@@ -20,42 +21,45 @@ func parameters() *cobra.Command {
2021
returncmd
2122
}
2223

23-
funcparseScopeAndID(ctx context.Context,client*codersdk.Client,organization codersdk.Organization,rawScopestring,namestring) (codersdk.ParameterScope,string,error) {
24+
funcparseScopeAndID(ctx context.Context,client*codersdk.Client,organization codersdk.Organization,rawScopestring,namestring) (codersdk.ParameterScope,uuid.UUID,error) {
2425
scope,err:=parseParameterScope(rawScope)
2526
iferr!=nil {
26-
returnscope,"",err
27+
returnscope,uuid.Nil,err
2728
}
28-
varscopeIDstring
29+
30+
varscopeID uuid.UUID
2931
switchscope {
3032
casecodersdk.ParameterOrganization:
3133
ifname=="" {
3234
scopeID=organization.ID
3335
}else {
34-
org,err:=client.OrganizationByName(ctx,"",name)
36+
org,err:=client.OrganizationByName(ctx,codersdk.Me,name)
3537
iferr!=nil {
36-
returnscope,"",err
38+
returnscope,uuid.Nil,err
3739
}
3840
scopeID=org.ID
3941
}
4042
casecodersdk.ParameterProject:
4143
project,err:=client.ProjectByName(ctx,organization.ID,name)
4244
iferr!=nil {
43-
returnscope,"",err
45+
returnscope,uuid.Nil,err
4446
}
45-
scopeID=project.ID.String()
47+
scopeID=project.ID
4648
casecodersdk.ParameterUser:
47-
user,err:=client.User(ctx,name)
49+
uid,_:=uuid.Parse(name)
50+
user,err:=client.User(ctx,uid)
4851
iferr!=nil {
49-
returnscope,"",err
52+
returnscope,uuid.Nil,err
5053
}
5154
scopeID=user.ID
5255
casecodersdk.ParameterWorkspace:
53-
workspace,err:=client.WorkspaceByName(ctx,"",name)
56+
workspace,err:=client.WorkspaceByName(ctx,codersdk.Me,name)
5457
iferr!=nil {
55-
returnscope,"",err
58+
returnscope,uuid.Nil,err
5659
}
57-
scopeID=workspace.ID.String()
60+
scopeID=workspace.ID
5861
}
62+
5963
returnscope,scopeID,nil
6064
}
6165

‎cli/root.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ func createClient(cmd *cobra.Command) (*codersdk.Client, error) {
107107

108108
// currentOrganization returns the currently active organization for the authenticated user.
109109
funccurrentOrganization(cmd*cobra.Command,client*codersdk.Client) (codersdk.Organization,error) {
110-
orgs,err:=client.OrganizationsByUser(cmd.Context(),"me")
110+
orgs,err:=client.OrganizationsByUser(cmd.Context(),codersdk.Me)
111111
iferr!=nil {
112112
return codersdk.Organization{},nil
113113
}

‎cli/ssh.go

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,33 +32,40 @@ func ssh() *cobra.Command {
3232
iferr!=nil {
3333
returnerr
3434
}
35-
workspace,err:=client.WorkspaceByName(cmd.Context(),"",args[0])
35+
36+
workspace,err:=client.WorkspaceByName(cmd.Context(),codersdk.Me,args[0])
3637
iferr!=nil {
3738
returnerr
3839
}
40+
3941
ifworkspace.LatestBuild.Transition!=database.WorkspaceTransitionStart {
4042
returnxerrors.New("workspace must be in start transition to ssh")
4143
}
44+
4245
ifworkspace.LatestBuild.Job.CompletedAt==nil {
4346
err=cliui.WorkspaceBuild(cmd.Context(),cmd.ErrOrStderr(),client,workspace.LatestBuild.ID,workspace.CreatedAt)
4447
iferr!=nil {
4548
returnerr
4649
}
4750
}
51+
4852
ifworkspace.LatestBuild.Transition==database.WorkspaceTransitionDelete {
4953
returnxerrors.New("workspace is deleting...")
5054
}
55+
5156
resources,err:=client.WorkspaceResourcesByBuild(cmd.Context(),workspace.LatestBuild.ID)
5257
iferr!=nil {
5358
returnerr
5459
}
60+
5561
resourceByAddress:=make(map[string]codersdk.WorkspaceResource)
5662
for_,resource:=rangeresources {
5763
ifresource.Agent==nil {
5864
continue
5965
}
6066
resourceByAddress[resource.Address]=resource
6167
}
68+
6269
varresourceAddressstring
6370
iflen(args)>=2 {
6471
resourceAddress=args[1]
@@ -73,6 +80,7 @@ func ssh() *cobra.Command {
7380
break
7481
}
7582
}
83+
7684
resource,exists:=resourceByAddress[resourceAddress]
7785
if!exists {
7886
resourceKeys:=make([]string,0)
@@ -100,6 +108,7 @@ func ssh() *cobra.Command {
100108
returnerr
101109
}
102110
deferconn.Close()
111+
103112
ifstdio {
104113
rawSSH,err:=conn.SSH()
105114
iferr!=nil {
@@ -135,13 +144,16 @@ func ssh() *cobra.Command {
135144
iferr!=nil {
136145
returnerr
137146
}
147+
138148
sshSession.Stdin=cmd.InOrStdin()
139149
sshSession.Stdout=cmd.OutOrStdout()
140150
sshSession.Stderr=cmd.OutOrStdout()
151+
141152
err=sshSession.Shell()
142153
iferr!=nil {
143154
returnerr
144155
}
156+
145157
err=sshSession.Wait()
146158
iferr!=nil {
147159
returnerr

‎cli/ssh_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ func TestSSH(t *testing.T) {
5353
})
5454
coderdtest.AwaitProjectVersionJob(t,client,version.ID)
5555
project:=coderdtest.CreateProject(t,client,user.OrganizationID,version.ID)
56-
workspace:=coderdtest.CreateWorkspace(t,client,"",project.ID)
56+
workspace:=coderdtest.CreateWorkspace(t,client,codersdk.Me,project.ID)
5757
gofunc() {
5858
// Run this async so the SSH command has to wait for
5959
// the build and agent to connect!
@@ -111,7 +111,7 @@ func TestSSH(t *testing.T) {
111111
})
112112
coderdtest.AwaitProjectVersionJob(t,client,version.ID)
113113
project:=coderdtest.CreateProject(t,client,user.OrganizationID,version.ID)
114-
workspace:=coderdtest.CreateWorkspace(t,client,"",project.ID)
114+
workspace:=coderdtest.CreateWorkspace(t,client,codersdk.Me,project.ID)
115115
gofunc() {
116116
// Run this async so the SSH command has to wait for
117117
// the build and agent to connect!

‎cli/start.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ func start() *cobra.Command {
255255
_,_=fmt.Fprintln(cmd.OutOrStdout(),"\n\n"+cliui.Styles.Bold.Render("Interrupt caught. Gracefully exiting..."))
256256

257257
ifdev {
258-
workspaces,err:=client.WorkspacesByUser(cmd.Context(),"")
258+
workspaces,err:=client.WorkspacesByUser(cmd.Context(),codersdk.Me)
259259
iferr!=nil {
260260
returnxerrors.Errorf("get workspaces: %w",err)
261261
}
@@ -343,10 +343,10 @@ func start() *cobra.Command {
343343

344344
funccreateFirstUser(cmd*cobra.Command,client*codersdk.Client,cfg config.Root)error {
345345
_,err:=client.CreateFirstUser(cmd.Context(), codersdk.CreateFirstUserRequest{
346-
Email:"admin@coder.com",
347-
Username:"developer",
348-
Password:"password",
349-
Organization:"acme-corp",
346+
Email:"admin@coder.com",
347+
Username:"developer",
348+
Password:"password",
349+
OrganizationName:"acme-corp",
350350
})
351351
iferr!=nil {
352352
returnxerrors.Errorf("create first user: %w",err)

‎cli/start_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@ func TestStart(t *testing.T) {
5959
returntrue
6060
},15*time.Second,25*time.Millisecond)
6161
_,err=client.CreateFirstUser(ctx, codersdk.CreateFirstUserRequest{
62-
Email:"some@one.com",
63-
Username:"example",
64-
Password:"password",
65-
Organization:"example",
62+
Email:"some@one.com",
63+
Username:"example",
64+
Password:"password",
65+
OrganizationName:"example",
6666
})
6767
require.NoError(t,err)
6868
cancelFunc()
@@ -90,7 +90,7 @@ func TestStart(t *testing.T) {
9090
require.NoError(t,err)
9191
client:=codersdk.New(parsed)
9292
client.SessionToken=token
93-
_,err=client.User(ctx,"")
93+
_,err=client.User(ctx,codersdk.Me)
9494
require.NoError(t,err)
9595
})
9696
t.Run("TLSBadVersion",func(t*testing.T) {
@@ -182,15 +182,15 @@ func TestStart(t *testing.T) {
182182
require.NoError(t,err)
183183
client:=codersdk.New(parsed)
184184
client.SessionToken=token
185-
orgs,err:=client.OrganizationsByUser(ctx,"")
185+
orgs,err:=client.OrganizationsByUser(ctx,codersdk.Me)
186186
require.NoError(t,err)
187187
coderdtest.NewProvisionerDaemon(t,client)
188188

189189
// Create a workspace so the cleanup occurs!
190190
version:=coderdtest.CreateProjectVersion(t,client,orgs[0].ID,nil)
191191
coderdtest.AwaitProjectVersionJob(t,client,version.ID)
192192
project:=coderdtest.CreateProject(t,client,orgs[0].ID,version.ID)
193-
workspace:=coderdtest.CreateWorkspace(t,client,"",project.ID)
193+
workspace:=coderdtest.CreateWorkspace(t,client,codersdk.Me,project.ID)
194194
coderdtest.AwaitWorkspaceBuildJob(t,client,workspace.LatestBuild.ID)
195195

196196
require.NoError(t,err)

‎cli/workspaceagent_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88

99
"github.com/coder/coder/cli/clitest"
1010
"github.com/coder/coder/coderd/coderdtest"
11+
"github.com/coder/coder/codersdk"
1112
"github.com/coder/coder/provisioner/echo"
1213
"github.com/coder/coder/provisionersdk/proto"
1314
)
@@ -43,7 +44,7 @@ func TestWorkspaceAgent(t *testing.T) {
4344
})
4445
project:=coderdtest.CreateProject(t,client,user.OrganizationID,version.ID)
4546
coderdtest.AwaitProjectVersionJob(t,client,version.ID)
46-
workspace:=coderdtest.CreateWorkspace(t,client,"me",project.ID)
47+
workspace:=coderdtest.CreateWorkspace(t,client,codersdk.Me,project.ID)
4748
coderdtest.AwaitWorkspaceBuildJob(t,client,workspace.LatestBuild.ID)
4849

4950
cmd,_:=clitest.New(t,"workspaces","agent","--auth","aws-instance-identity","--url",client.URL.String())
@@ -97,7 +98,7 @@ func TestWorkspaceAgent(t *testing.T) {
9798
})
9899
project:=coderdtest.CreateProject(t,client,user.OrganizationID,version.ID)
99100
coderdtest.AwaitProjectVersionJob(t,client,version.ID)
100-
workspace:=coderdtest.CreateWorkspace(t,client,"me",project.ID)
101+
workspace:=coderdtest.CreateWorkspace(t,client,codersdk.Me,project.ID)
101102
coderdtest.AwaitWorkspaceBuildJob(t,client,workspace.LatestBuild.ID)
102103

103104
cmd,_:=clitest.New(t,"workspaces","agent","--auth","google-instance-identity","--url",client.URL.String())

‎cli/workspacecreate.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ func workspaceCreate() *cobra.Command {
7474
_,_=fmt.Fprintln(cmd.OutOrStdout(),cliui.Styles.Prompt.String()+"Creating with the "+cliui.Styles.Field.Render(project.Name)+" project...")
7575

7676
workspaceName:=args[0]
77-
_,err=client.WorkspaceByName(cmd.Context(),"",workspaceName)
77+
_,err=client.WorkspaceByName(cmd.Context(),codersdk.Me,workspaceName)
7878
iferr==nil {
7979
returnxerrors.Errorf("A workspace already exists named %q!",workspaceName)
8080
}
@@ -137,7 +137,7 @@ func workspaceCreate() *cobra.Command {
137137
}
138138

139139
before:=time.Now()
140-
workspace,err:=client.CreateWorkspace(cmd.Context(),"", codersdk.CreateWorkspaceRequest{
140+
workspace,err:=client.CreateWorkspace(cmd.Context(),codersdk.Me, codersdk.CreateWorkspaceRequest{
141141
ProjectID:project.ID,
142142
Name:workspaceName,
143143
ParameterValues:parameters,

‎cli/workspacedelete.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ func workspaceDelete() *cobra.Command {
2121
iferr!=nil {
2222
returnerr
2323
}
24-
workspace,err:=client.WorkspaceByName(cmd.Context(),"",args[0])
24+
workspace,err:=client.WorkspaceByName(cmd.Context(),codersdk.Me,args[0])
2525
iferr!=nil {
2626
returnerr
2727
}

‎cli/workspacelist.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
"github.com/spf13/cobra"
1010

1111
"github.com/coder/coder/cli/cliui"
12+
"github.com/coder/coder/codersdk"
1213
)
1314

1415
funcworkspaceList()*cobra.Command {
@@ -21,7 +22,7 @@ func workspaceList() *cobra.Command {
2122
returnerr
2223
}
2324
start:=time.Now()
24-
workspaces,err:=client.WorkspacesByUser(cmd.Context(),"")
25+
workspaces,err:=client.WorkspacesByUser(cmd.Context(),codersdk.Me)
2526
iferr!=nil {
2627
returnerr
2728
}

‎cli/workspaces.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ import (
44
"strings"
55

66
"github.com/spf13/cobra"
7+
8+
"github.com/coder/coder/codersdk"
79
)
810

911
funcworkspaces()*cobra.Command {
@@ -29,7 +31,7 @@ func validArgsWorkspaceName(cmd *cobra.Command, _ []string, toComplete string) (
2931
iferr!=nil {
3032
returnnil,cobra.ShellCompDirectiveError
3133
}
32-
workspaces,err:=client.WorkspacesByUser(cmd.Context(),"")
34+
workspaces,err:=client.WorkspacesByUser(cmd.Context(),codersdk.Me)
3335
iferr!=nil {
3436
returnnil,cobra.ShellCompDirectiveError
3537
}

0 commit comments

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