Skip to content

Commit bd149b1

Browse files
coadlercoadler
committed
chore: update v1 schema
1 parent 6ab1a68 commit bd149b1

Some content is hidden

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

67 files changed

+1011
-495
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/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
if err != nil {
128128
return xerrors.Errorf("create initial user: %w", err)
@@ -167,7 +167,7 @@ func login() *cobra.Command {
167167
Secret: true,
168168
Validate: func(token string) error {
169169
client.SessionToken = token
170-
_, err := client.User(cmd.Context(), "me")
170+
_, err := client.User(cmd.Context(), codersdk.Me)
171171
if err != nil {
172172
return xerrors.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
if err != nil {
185185
return xerrors.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
return cmd
2122
}
2223

23-
func parseScopeAndID(ctx context.Context, client *codersdk.Client, organization codersdk.Organization, rawScope string, name string) (codersdk.ParameterScope, string, error) {
24+
func parseScopeAndID(ctx context.Context, client *codersdk.Client, organization codersdk.Organization, rawScope string, name string) (codersdk.ParameterScope, uuid.UUID, error) {
2425
scope, err := parseParameterScope(rawScope)
2526
if err != nil {
26-
return scope, "", err
27+
return scope, uuid.Nil, err
2728
}
28-
var scopeID string
29+
30+
var scopeID uuid.UUID
2931
switch scope {
3032
case codersdk.ParameterOrganization:
3133
if name == "" {
3234
scopeID = organization.ID
3335
} else {
34-
org, err := client.OrganizationByName(ctx, "", name)
36+
org, err := client.OrganizationByName(ctx, codersdk.Me, name)
3537
if err != nil {
36-
return scope, "", err
38+
return scope, uuid.Nil, err
3739
}
3840
scopeID = org.ID
3941
}
4042
case codersdk.ParameterProject:
4143
project, err := client.ProjectByName(ctx, organization.ID, name)
4244
if err != nil {
43-
return scope, "", err
45+
return scope, uuid.Nil, err
4446
}
45-
scopeID = project.ID.String()
47+
scopeID = project.ID
4648
case codersdk.ParameterUser:
47-
user, err := client.User(ctx, name)
49+
uid, _ := uuid.Parse(name)
50+
user, err := client.User(ctx, uid)
4851
if err != nil {
49-
return scope, "", err
52+
return scope, uuid.Nil, err
5053
}
5154
scopeID = user.ID
5255
case codersdk.ParameterWorkspace:
53-
workspace, err := client.WorkspaceByName(ctx, "", name)
56+
workspace, err := client.WorkspaceByName(ctx, codersdk.Me, name)
5457
if err != nil {
55-
return scope, "", err
58+
return scope, uuid.Nil, err
5659
}
57-
scopeID = workspace.ID.String()
60+
scopeID = workspace.ID
5861
}
62+
5963
return scope, 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
func currentOrganization(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
if err != nil {
112112
return codersdk.Organization{}, nil
113113
}

‎cli/ssh.go

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,30 +21,36 @@ func ssh() *cobra.Command {
2121
if err != nil {
2222
return err
2323
}
24-
workspace, err := client.WorkspaceByName(cmd.Context(), "", args[0])
24+
25+
workspace, err := client.WorkspaceByName(cmd.Context(), codersdk.Me, args[0])
2526
if err != nil {
2627
return err
2728
}
29+
2830
if workspace.LatestBuild.Job.CompletedAt == nil {
2931
err = cliui.WorkspaceBuild(cmd, client, workspace.LatestBuild.ID, workspace.CreatedAt)
3032
if err != nil {
3133
return err
3234
}
3335
}
36+
3437
if workspace.LatestBuild.Transition == database.WorkspaceTransitionDelete {
3538
return xerrors.New("workspace is deleting...")
3639
}
40+
3741
resources, err := client.WorkspaceResourcesByBuild(cmd.Context(), workspace.LatestBuild.ID)
3842
if err != nil {
3943
return err
4044
}
45+
4146
resourceByAddress := make(map[string]codersdk.WorkspaceResource)
4247
for _, resource := range resources {
4348
if resource.Agent == nil {
4449
continue
4550
}
4651
resourceByAddress[resource.Address] = resource
4752
}
53+
4854
var resourceAddress string
4955
if len(args) >= 2 {
5056
resourceAddress = args[1]
@@ -59,6 +65,7 @@ func ssh() *cobra.Command {
5965
break
6066
}
6167
}
68+
6269
resource, exists := resourceByAddress[resourceAddress]
6370
if !exists {
6471
resourceKeys := make([]string, 0)
@@ -67,6 +74,7 @@ func ssh() *cobra.Command {
6774
}
6875
return xerrors.Errorf("no sshable agent with address %q: %+v", resourceAddress, resourceKeys)
6976
}
77+
7078
err = cliui.Agent(cmd, cliui.AgentOptions{
7179
WorkspaceName: workspace.Name,
7280
Fetch: func(ctx context.Context) (codersdk.WorkspaceResource, error) {
@@ -84,6 +92,7 @@ func ssh() *cobra.Command {
8492
return err
8593
}
8694
defer conn.Close()
95+
8796
sshClient, err := conn.SSHClient()
8897
if err != nil {
8998
return err
@@ -100,13 +109,16 @@ func ssh() *cobra.Command {
100109
if err != nil {
101110
return err
102111
}
112+
103113
sshSession.Stdin = cmd.InOrStdin()
104114
sshSession.Stdout = cmd.OutOrStdout()
105115
sshSession.Stderr = cmd.OutOrStdout()
116+
106117
err = sshSession.Shell()
107118
if err != nil {
108119
return err
109120
}
121+
110122
err = sshSession.Wait()
111123
if err != nil {
112124
return err

‎cli/ssh_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func TestSSH(t *testing.T) {
4848
})
4949
coderdtest.AwaitProjectVersionJob(t, client, version.ID)
5050
project := coderdtest.CreateProject(t, client, user.OrganizationID, version.ID)
51-
workspace := coderdtest.CreateWorkspace(t, client, "", project.ID)
51+
workspace := coderdtest.CreateWorkspace(t, client, codersdk.Me, project.ID)
5252
go func() {
5353
// Run this async so the SSH command has to wait for
5454
// the build and agent to connect!

‎cli/start.go

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

255255
if dev {
256-
workspaces, err := client.WorkspacesByUser(cmd.Context(), "")
256+
workspaces, err := client.WorkspacesByUser(cmd.Context(), codersdk.Me)
257257
if err != nil {
258258
return xerrors.Errorf("get workspaces: %w", err)
259259
}
@@ -340,10 +340,10 @@ func start() *cobra.Command {
340340

341341
func createFirstUser(cmd *cobra.Command, client *codersdk.Client, cfg config.Root) error {
342342
_, err := client.CreateFirstUser(cmd.Context(), codersdk.CreateFirstUserRequest{
343-
Email: "admin@coder.com",
344-
Username: "developer",
345-
Password: "password",
346-
Organization: "acme-corp",
343+
Email: "admin@coder.com",
344+
Username: "developer",
345+
Password: "password",
346+
OrganizationName: "acme-corp",
347347
})
348348
if err != nil {
349349
return xerrors.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
return true
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())

0 commit comments

Comments
 (0)