Skip to content

Commit e39b8a2

Browse files
spikecurtisspikecurtis
committed
appease fmt & link
Signed-off-by: Spike Curtis <spike@coder.com>
1 parent 39d6065 commit e39b8a2

File tree

7 files changed

+25
-22
lines changed

7 files changed

+25
-22
lines changed

‎provisioner/echo/serve.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,11 +123,10 @@ func readResponses(sess *provisionersdk.Session, trans string, suffix string) ([
123123
break
124124
}
125125
}
126-
return responses, nil
127126
}
128127

129128
// Parse reads requests from the provided directory to stream responses.
130-
func (e *echo) Parse(sess *provisionersdk.Session, _ *proto.ParseRequest, _ <-chan struct{}) *proto.ParseComplete {
129+
func (*echo) Parse(sess *provisionersdk.Session, _ *proto.ParseRequest, _ <-chan struct{}) *proto.ParseComplete {
131130
responses, err := readResponses(sess, "unspecified", "parse.protobuf")
132131
if err != nil {
133132
return &proto.ParseComplete{Error: err.Error()}
@@ -146,7 +145,7 @@ func (e *echo) Parse(sess *provisionersdk.Session, _ *proto.ParseRequest, _ <-ch
146145
}
147146

148147
// Plan reads requests from the provided directory to stream responses.
149-
func (e *echo) Plan(sess *provisionersdk.Session, req *proto.PlanRequest, canceledOrComplete <-chan struct{}) *proto.PlanComplete {
148+
func (*echo) Plan(sess *provisionersdk.Session, req *proto.PlanRequest, canceledOrComplete <-chan struct{}) *proto.PlanComplete {
150149
responses, err := readResponses(
151150
sess,
152151
strings.ToLower(req.GetMetadata().GetWorkspaceTransition().String()),
@@ -169,7 +168,7 @@ func (e *echo) Plan(sess *provisionersdk.Session, req *proto.PlanRequest, cancel
169168
}
170169

171170
// Apply reads requests from the provided directory to stream responses.
172-
func (e *echo) Apply(sess *provisionersdk.Session, req *proto.ApplyRequest, canceledOrComplete <-chan struct{}) *proto.ApplyComplete {
171+
func (*echo) Apply(sess *provisionersdk.Session, req *proto.ApplyRequest, canceledOrComplete <-chan struct{}) *proto.ApplyComplete {
173172
responses, err := readResponses(
174173
sess,
175174
strings.ToLower(req.GetMetadata().GetWorkspaceTransition().String()),

‎provisioner/echo/serve_test.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ func TestEcho(t *testing.T) {
5252
Type: &proto.Response_Parse{
5353
Parse: &proto.ParseComplete{},
5454
},
55-
}}
55+
},
56+
}
5657
data, err := echo.Tar(&echo.Responses{
5758
Parse: responses,
5859
})
@@ -69,6 +70,7 @@ func TestEcho(t *testing.T) {
6970
require.NoError(t, err)
7071

7172
err = client.Send(&proto.Request{Type: &proto.Request_Parse{Parse: &proto.ParseRequest{}}})
73+
require.NoError(t, err)
7274
log, err := client.Recv()
7375
require.NoError(t, err)
7476
require.Equal(t, responses[0].GetLog().Output, log.GetLog().Output)

‎provisioner/terraform/provision.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
package terraform
22

33
import (
4-
"cdr.dev/slog"
54
"context"
65
"fmt"
76
"os"
87
"strings"
98
"time"
109

10+
"cdr.dev/slog"
11+
1112
"github.com/coder/coder/v2/coderd/tracing"
1213
"github.com/coder/coder/v2/provisionersdk"
1314
"github.com/coder/coder/v2/provisionersdk/proto"

‎provisioner/terraform/provision_test.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,7 @@ func configure(ctx context.Context, t *testing.T, client proto.DRPCProvisionerCl
9696
}
9797

9898
func readProvisionLog(t *testing.T, response proto.DRPCProvisioner_SessionClient) string {
99-
var (
100-
logBuf strings.Builder
101-
)
99+
var logBuf strings.Builder
102100
for {
103101
msg, err := response.Recv()
104102
require.NoError(t, err)
@@ -647,7 +645,6 @@ func TestProvision(t *testing.T) {
647645
require.NoError(t, err)
648646
require.Equal(t, string(resourcesWant), string(resourcesGot))
649647
}
650-
651648
}
652649

653650
if !gotExpectedLog {
@@ -740,7 +737,7 @@ func TestProvision_SafeEnv(t *testing.T) {
740737

741738
_ = readProvisionLog(t, sess)
742739

743-
err = sess.Send(&proto.Request{Type: &proto.Request_Apply{Apply: &proto.ApplyRequest{}}})
740+
err = sendApply(sess, proto.WorkspaceTransition_START)
744741
require.NoError(t, err)
745742

746743
log := readProvisionLog(t, sess)

‎provisionerd/runner/runner.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -440,8 +440,7 @@ func (r *Runner) do(ctx context.Context) (*proto.CompletedJob, *proto.FailedJob)
440440
}
441441

442442
func (r *Runner) configure(config *sdkproto.Config) *proto.FailedJob {
443-
var err error
444-
err = r.session.Send(&sdkproto.Request{Type: &sdkproto.Request_Config{Config: config}})
443+
err := r.session.Send(&sdkproto.Request{Type: &sdkproto.Request_Config{Config: config}})
445444
if err != nil {
446445
return r.failedJobf("send config: %s", err)
447446
}
@@ -941,7 +940,7 @@ func (r *Runner) runWorkspaceBuild(ctx context.Context) (*proto.CompletedJob, *p
941940
return nil, r.failedWorkspaceBuildf("invalid message type %T received from provisioner", resp.Type)
942941
}
943942
if planComplete.Error != "" {
944-
r.logger.Warn(context.Background(), "plan failed",
943+
r.logger.Warn(context.Background(), "plan request failed",
945944
slog.F("error", planComplete.Error),
946945
)
947946

@@ -954,7 +953,7 @@ func (r *Runner) runWorkspaceBuild(ctx context.Context) (*proto.CompletedJob, *p
954953
}
955954
}
956955

957-
r.logger.Info(context.Background(), "plan successful",
956+
r.logger.Info(context.Background(), "plan request successful",
958957
slog.F("resource_count", len(planComplete.Resources)),
959958
slog.F("resources", planComplete.Resources),
960959
)

‎provisionersdk/serve_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,14 @@ func TestProvisionerSDK(t *testing.T) {
7878

7979
type unimplementedServer struct{}
8080

81-
func (_ unimplementedServer) Parse(_ *provisionersdk.Session, _ *proto.ParseRequest, _ <-chan struct{}) *proto.ParseComplete {
81+
func (unimplementedServer) Parse(_ *provisionersdk.Session, _ *proto.ParseRequest, _ <-chan struct{}) *proto.ParseComplete {
8282
return &proto.ParseComplete{Error: "unimplemented"}
8383
}
8484

85-
func (_ unimplementedServer) Plan(_ *provisionersdk.Session, _ *proto.PlanRequest, _ <-chan struct{}) *proto.PlanComplete {
85+
func (unimplementedServer) Plan(_ *provisionersdk.Session, _ *proto.PlanRequest, _ <-chan struct{}) *proto.PlanComplete {
8686
return &proto.PlanComplete{}
8787
}
8888

89-
func (_ unimplementedServer) Apply(_ *provisionersdk.Session, _ *proto.ApplyRequest, _ <-chan struct{}) *proto.ApplyComplete {
89+
func (unimplementedServer) Apply(_ *provisionersdk.Session, _ *proto.ApplyRequest, _ <-chan struct{}) *proto.ApplyComplete {
9090
return &proto.ApplyComplete{Error: "unimplemented"}
9191
}

‎provisionersdk/session.go

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,18 @@ package provisionersdk
33
import (
44
"archive/tar"
55
"bytes"
6-
"cdr.dev/slog"
76
"context"
87
"fmt"
9-
"golang.org/x/xerrors"
108
"io"
119
"os"
1210
"path/filepath"
1311
"strings"
1412
"time"
1513

14+
"cdr.dev/slog"
15+
16+
"golang.org/x/xerrors"
17+
1618
"github.com/coder/coder/v2/provisionersdk/proto"
1719
)
1820

@@ -197,6 +199,7 @@ func (s *Session) ExtractArchive() error {
197199
if !filepath.IsLocal(header.Name) {
198200
return xerrors.Errorf("refusing to extract to non-local path")
199201
}
202+
// nolint: gosec
200203
headerPath := filepath.Join(s.WorkDirectory, header.Name)
201204
if !strings.HasPrefix(headerPath, filepath.Clean(s.WorkDirectory)) {
202205
return xerrors.New("tar attempts to target relative upper directory")
@@ -291,8 +294,10 @@ func (r *request[R, C]) do() (C, error) {
291294
if req.GetCancel() != nil {
292295
return c, nil
293296
}
294-
return c, xerrors.Errorf("got new request or nil while old request still processing",
295-
slog.F("request", req))
297+
if req == nil {
298+
return c, xerrors.New("got nil while old request still processing")
299+
}
300+
return c, xerrors.Errorf("got new request %T while old request still processing", req.Type)
296301
case c := <-result:
297302
close(canceledOrComplete)
298303
return c, nil

0 commit comments

Comments
 (0)