Skip to content

Commit d3c8df9

Browse files
BrunoQuaresmaBrunoQuaresma
committed
Merge branch 'main' into bq/refactor-rename-feature
2 parents 8da592a + 2a8a147 commit d3c8df9

File tree

38 files changed

+239
-86
lines changed

38 files changed

+239
-86
lines changed

‎cli/speedtest.go

+18-13
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ import (
1919

2020
func speedtest() *cobra.Command {
2121
var (
22-
direct bool
23-
duration time.Duration
24-
reverse bool
22+
direct bool
23+
duration time.Duration
24+
direction string
2525
)
2626
cmd := &cobra.Command{
2727
Annotations: workspaceCommand,
@@ -48,7 +48,7 @@ func speedtest() *cobra.Command {
4848
return client.WorkspaceAgent(ctx, workspaceAgent.ID)
4949
},
5050
})
51-
if err != nil {
51+
if err != nil && !xerrors.Is(err, cliui.AgentStartError) {
5252
return xerrors.Errorf("await agent: %w", err)
5353
}
5454
logger := slog.Make(sloghuman.Sink(cmd.ErrOrStderr()))
@@ -94,25 +94,29 @@ func speedtest() *cobra.Command {
9494
} else {
9595
conn.AwaitReachable(ctx)
9696
}
97-
dir := tsspeedtest.Download
98-
if reverse {
99-
dir = tsspeedtest.Upload
97+
var tsDir tsspeedtest.Direction
98+
switch direction {
99+
case "up":
100+
tsDir = tsspeedtest.Upload
101+
case "down":
102+
tsDir = tsspeedtest.Download
103+
default:
104+
return xerrors.Errorf("invalid direction: %q", direction)
100105
}
101-
cmd.Printf("Starting a %ds %s test...\n", int(duration.Seconds()), dir)
102-
results, err := conn.Speedtest(ctx, dir, duration)
106+
cmd.Printf("Starting a %ds %s test...\n", int(duration.Seconds()), tsDir)
107+
results, err := conn.Speedtest(ctx, tsDir, duration)
103108
if err != nil {
104109
return err
105110
}
106111
tableWriter := cliui.Table()
107-
tableWriter.AppendHeader(table.Row{"Interval", "Transfer", "Bandwidth"})
112+
tableWriter.AppendHeader(table.Row{"Interval", "Throughput"})
108113
startTime := results[0].IntervalStart
109114
for _, r := range results {
110115
if r.Total {
111116
tableWriter.AppendSeparator()
112117
}
113118
tableWriter.AppendRow(table.Row{
114119
fmt.Sprintf("%.2f-%.2f sec", r.IntervalStart.Sub(startTime).Seconds(), r.IntervalEnd.Sub(startTime).Seconds()),
115-
fmt.Sprintf("%.4f MBits", r.MegaBits()),
116120
fmt.Sprintf("%.4f Mbits/sec", r.MBitsPerSecond()),
117121
})
118122
}
@@ -122,8 +126,9 @@ func speedtest() *cobra.Command {
122126
}
123127
cliflag.BoolVarP(cmd.Flags(), &direct, "direct", "d", "", false,
124128
"Specifies whether to wait for a direct connection before testing speed.")
125-
cliflag.BoolVarP(cmd.Flags(), &reverse, "reverse", "r", "", false,
126-
"Specifies whether to run in reverse mode where the client receives and the server sends.")
129+
cliflag.StringVarP(cmd.Flags(), &direction, "direction", "", "", "down",
130+
"Specifies whether to run in reverse mode where the client receives and the server sends. (up|down)",
131+
)
127132
cmd.Flags().DurationVarP(&duration, "time", "t", tsspeedtest.DefaultDuration,
128133
"Specifies the duration to monitor traffic.")
129134
return cmd

‎cli/templatepull.go

+24-26
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
package cli
22

33
import (
4+
"bytes"
45
"fmt"
5-
"io/fs"
66
"os"
77
"sort"
88

9+
"github.com/codeclysm/extract"
910
"github.com/spf13/cobra"
1011
"golang.org/x/xerrors"
1112

@@ -14,6 +15,7 @@ import (
1415
)
1516

1617
func templatePull() *cobra.Command {
18+
var tarMode bool
1719
cmd := &cobra.Command{
1820
Use: "pull <name> [destination]",
1921
Short: "Download the latest version of a template to a path.",
@@ -75,48 +77,44 @@ func templatePull() *cobra.Command {
7577
return xerrors.Errorf("unexpected Content-Type %q, expecting %q", ctype, codersdk.ContentTypeTar)
7678
}
7779

78-
// If the destination is empty then we write to stdout
79-
// and bail early.
80-
if dest == "" {
80+
if tarMode {
8181
_, err = cmd.OutOrStdout().Write(raw)
82-
if err != nil {
83-
return xerrors.Errorf("write stdout: %w", err)
84-
}
85-
return nil
82+
return err
8683
}
8784

88-
// Stat the destination to ensure nothing exists already.
89-
fi, err := os.Stat(dest)
90-
if err != nil && !xerrors.Is(err, fs.ErrNotExist) {
91-
return xerrors.Errorf("stat destination: %w", err)
85+
if dest == "" {
86+
dest = templateName + "/"
9287
}
9388

94-
if fi != nil && fi.IsDir() {
95-
// If the destination is a directory we just bail.
96-
return xerrors.Errorf("%q already exists.", dest)
89+
err = os.MkdirAll(dest, 0o750)
90+
if err != nil {
91+
return xerrors.Errorf("mkdirall %q: %w", dest, err)
9792
}
9893

99-
// If a file exists at the destination prompt the user
100-
// to ensure we don't overwrite something valuable.
101-
if fi != nil {
94+
ents, err := os.ReadDir(dest)
95+
if err != nil {
96+
return xerrors.Errorf("read dir %q: %w", dest, err)
97+
}
98+
99+
if len(ents) > 0 {
102100
_, err = cliui.Prompt(cmd, cliui.PromptOptions{
103-
Text: fmt.Sprintf("%q already exists, do you want to overwrite it?", dest),
101+
Text: fmt.Sprintf("Directory %q is not empty, existing files may be overwritten.\nContinue extracting?", dest),
102+
Default: "No",
103+
Secret: false,
104104
IsConfirm: true,
105105
})
106106
if err != nil {
107-
return xerrors.Errorf("parse prompt: %w", err)
107+
return err
108108
}
109109
}
110110

111-
err = os.WriteFile(dest, raw, 0o600)
112-
if err != nil {
113-
return xerrors.Errorf("write to path: %w", err)
114-
}
115-
116-
return nil
111+
_, _ = fmt.Fprintf(cmd.OutOrStderr(), "Extracting template to %q\n", dest)
112+
err = extract.Tar(ctx, bytes.NewReader(raw), dest, nil)
113+
return err
117114
},
118115
}
119116

117+
cmd.Flags().BoolVar(&tarMode, "tar", false, "output the template as a tar archive to stdout")
120118
cliui.AllowSkipPrompt(cmd)
121119

122120
return cmd

‎cli/templatepull_test.go

+91-15
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,15 @@ package cli_test
22

33
import (
44
"bytes"
5+
"context"
6+
"io"
57
"os"
68
"path/filepath"
79
"testing"
810

11+
"github.com/codeclysm/extract"
912
"github.com/google/uuid"
13+
"github.com/ory/dockertest/v3/docker/pkg/archive"
1014
"github.com/stretchr/testify/require"
1115

1216
"github.com/coder/coder/cli/clitest"
@@ -53,7 +57,7 @@ func TestTemplatePull(t *testing.T) {
5357
// are being sorted correctly.
5458
_ = coderdtest.UpdateTemplateVersion(t, client, user.OrganizationID, source2, template.ID)
5559

56-
cmd, root := clitest.New(t, "templates", "pull", template.Name)
60+
cmd, root := clitest.New(t, "templates", "pull", "--tar", template.Name)
5761
clitest.SetupConfig(t, client, root)
5862

5963
var buf bytes.Buffer
@@ -65,9 +69,9 @@ func TestTemplatePull(t *testing.T) {
6569
require.True(t, bytes.Equal(expected, buf.Bytes()), "tar files differ")
6670
})
6771

68-
// ToFile tests that 'templates pull' pulls down the latest template
72+
// ToDir tests that 'templates pull' pulls down the latest template
6973
// and writes it to the correct directory.
70-
t.Run("ToFile", func(t *testing.T) {
74+
t.Run("ToDir", func(t *testing.T) {
7175
t.Parallel()
7276

7377
client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
@@ -93,15 +97,14 @@ func TestTemplatePull(t *testing.T) {
9397

9498
dir := t.TempDir()
9599

96-
dest := filepath.Join(dir, "actual.tar")
100+
expectedDest := filepath.Join(dir, "expected")
101+
actualDest := filepath.Join(dir, "actual")
102+
ctx := context.Background()
97103

98-
// Create the file so that we can test that the command
99-
// warns the user before overwriting a preexisting file.
100-
fi, err := os.OpenFile(dest, os.O_CREATE|os.O_RDONLY, 0o600)
104+
err = extract.Tar(ctx, bytes.NewReader(expected), expectedDest, nil)
101105
require.NoError(t, err)
102-
_ = fi.Close()
103106

104-
cmd, root := clitest.New(t, "templates", "pull", template.Name, dest)
107+
cmd, root := clitest.New(t, "templates", "pull", template.Name, actualDest)
105108
clitest.SetupConfig(t, client, root)
106109

107110
pty := ptytest.New(t)
@@ -114,16 +117,89 @@ func TestTemplatePull(t *testing.T) {
114117
errChan <- cmd.Execute()
115118
}()
116119

117-
// We expect to be prompted that a file already exists.
118-
pty.ExpectMatch("already exists")
119-
pty.WriteLine("yes")
120-
121120
require.NoError(t, <-errChan)
122121

123-
actual, err := os.ReadFile(dest)
122+
expectedTarRd, err := archive.Tar(expectedDest, archive.Uncompressed)
123+
require.NoError(t, err)
124+
expectedTar, err := io.ReadAll(expectedTarRd)
125+
require.NoError(t, err)
126+
127+
actualTarRd, err := archive.Tar(actualDest, archive.Uncompressed)
128+
require.NoError(t, err)
129+
130+
actualTar, err := io.ReadAll(actualTarRd)
131+
require.NoError(t, err)
132+
133+
require.True(t, bytes.Equal(expectedTar, actualTar), "tar files differ")
134+
})
135+
136+
// FolderConflict tests that 'templates pull' fails when a folder with has
137+
// existing
138+
t.Run("FolderConflict", func(t *testing.T) {
139+
t.Parallel()
140+
141+
client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
142+
user := coderdtest.CreateFirstUser(t, client)
143+
144+
// Create an initial template bundle.
145+
source1 := genTemplateVersionSource()
146+
// Create an updated template bundle. This will be used to ensure
147+
// that templates are correctly returned in order from latest to oldest.
148+
source2 := genTemplateVersionSource()
149+
150+
expected, err := echo.Tar(source2)
151+
require.NoError(t, err)
152+
153+
version1 := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, source1)
154+
_ = coderdtest.AwaitTemplateVersionJob(t, client, version1.ID)
155+
156+
template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version1.ID)
157+
158+
// Update the template version so that we can assert that templates
159+
// are being sorted correctly.
160+
_ = coderdtest.UpdateTemplateVersion(t, client, user.OrganizationID, source2, template.ID)
161+
162+
dir := t.TempDir()
163+
164+
expectedDest := filepath.Join(dir, "expected")
165+
conflictDest := filepath.Join(dir, "conflict")
166+
167+
err = os.MkdirAll(conflictDest, 0o700)
168+
require.NoError(t, err)
169+
170+
err = os.WriteFile(
171+
filepath.Join(conflictDest, "conflict-file"),
172+
[]byte("conflict"), 0o600,
173+
)
174+
require.NoError(t, err)
175+
176+
ctx := context.Background()
177+
178+
err = extract.Tar(ctx, bytes.NewReader(expected), expectedDest, nil)
179+
require.NoError(t, err)
180+
181+
cmd, root := clitest.New(t, "templates", "pull", template.Name, conflictDest)
182+
clitest.SetupConfig(t, client, root)
183+
184+
pty := ptytest.New(t)
185+
cmd.SetIn(pty.Input())
186+
cmd.SetOut(pty.Output())
187+
188+
errChan := make(chan error)
189+
go func() {
190+
defer close(errChan)
191+
errChan <- cmd.Execute()
192+
}()
193+
194+
pty.ExpectMatch("not empty")
195+
pty.WriteLine("no")
196+
197+
require.Error(t, <-errChan)
198+
199+
ents, err := os.ReadDir(conflictDest)
124200
require.NoError(t, err)
125201

126-
require.True(t, bytes.Equal(actual, expected), "tar files differ")
202+
require.Len(t, ents, 1, "conflict folder should have single conflict file")
127203
})
128204
}
129205

‎cli/testdata/coder_speedtest_--help.golden

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ Usage:
44
coder speedtest <workspace> [flags]
55

66
Flags:
7-
-d, --direct Specifies whether to wait for a direct connection before testing speed.
8-
-h, --help help for speedtest
9-
-r, --reverse Specifies whether to run in reverse mode where the client receives and
10-
the server sends.
11-
-t, --time duration Specifies the duration to monitor traffic. (default 5s)
7+
-d, --direct Specifies whether to wait for a direct connection before testing speed.
8+
--direction string Specifies whether to run in reverse mode where the client receives
9+
and the server sends. (up|down) (default "down")
10+
-h, --help help for speedtest
11+
-t, --time duration Specifies the duration to monitor traffic. (default 5s)
1212

1313
Global Flags:
1414
--global-config coder Path to the global coder config directory.

‎cli/testdata/coder_templates_pull_--help.golden

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Usage:
55

66
Flags:
77
-h, --help help for pull
8+
--tar output the template as a tar archive to stdout
89
-y, --yes Bypass prompts
910

1011
Global Flags:

‎coderd/database/errors.go

+10
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,13 @@ func IsUniqueViolation(err error, uniqueConstraints ...UniqueConstraint) bool {
2727

2828
return false
2929
}
30+
31+
// IsQueryCanceledError checks if the error is due to a query being canceled.
32+
func IsQueryCanceledError(err error) bool {
33+
var pqErr *pq.Error
34+
if errors.As(err, &pqErr) {
35+
return pqErr.Code.Name() == "query_canceled"
36+
}
37+
38+
return false
39+
}

‎coderd/users.go

+8
Original file line numberDiff line numberDiff line change
@@ -387,6 +387,7 @@ func (api *API) deleteUser(rw http.ResponseWriter, r *http.Request) {
387387
ctx := r.Context()
388388
auditor := *api.Auditor.Load()
389389
user := httpmw.UserParam(r)
390+
auth := httpmw.UserAuthorization(r)
390391
aReq, commitAudit := audit.InitRequest[database.User](rw, &audit.RequestParams{
391392
Audit: auditor,
392393
Log: api.Logger,
@@ -401,6 +402,13 @@ func (api *API) deleteUser(rw http.ResponseWriter, r *http.Request) {
401402
return
402403
}
403404

405+
if auth.Actor.ID == user.ID.String() {
406+
httpapi.Write(ctx, rw, http.StatusForbidden, codersdk.Response{
407+
Message: "You cannot delete yourself!",
408+
})
409+
return
410+
}
411+
404412
workspaces, err := api.Database.GetWorkspaces(ctx, database.GetWorkspacesParams{
405413
OwnerID: user.ID,
406414
})

‎coderd/users_test.go

+10
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,16 @@ func TestDeleteUser(t *testing.T) {
327327
require.ErrorAs(t, err, &apiErr)
328328
require.Equal(t, http.StatusExpectationFailed, apiErr.StatusCode())
329329
})
330+
t.Run("Self", func(t *testing.T) {
331+
t.Parallel()
332+
client := coderdtest.New(t, nil)
333+
user := coderdtest.CreateFirstUser(t, client)
334+
err := client.DeleteUser(context.Background(), user.UserID)
335+
var apiErr *codersdk.Error
336+
require.Error(t, err, "should not be able to delete self")
337+
require.ErrorAs(t, err, &apiErr, "should be a coderd error")
338+
require.Equal(t, http.StatusForbidden, apiErr.StatusCode(), "should be forbidden")
339+
})
330340
}
331341

332342
func TestPostLogout(t *testing.T) {

0 commit comments

Comments
 (0)