Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 3609cdb

Browse files
committed
fix defer
1 parent 5e2b987 commit 3609cdb

File tree

2 files changed

+8
-12
lines changed

2 files changed

+8
-12
lines changed

cli/start.go

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,10 @@ import (
1515
"os/signal"
1616
"time"
1717

18-
"github.com/briandowns/spinner"
19-
"github.com/coreos/go-systemd/daemon"
20-
"github.com/spf13/cobra"
21-
"golang.org/x/xerrors"
22-
"google.golang.org/api/idtoken"
23-
"google.golang.org/api/option"
24-
25-
"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer"
26-
2718
"cdr.dev/slog"
2819
"cdr.dev/slog/sloggers/sloghuman"
2920
"github.com/coder/coder/cli/cliflag"
21+
"github.com/briandowns/spinner"
3022
"github.com/coder/coder/cli/cliui"
3123
"github.com/coder/coder/cli/config"
3224
"github.com/coder/coder/coderd"
@@ -38,6 +30,12 @@ import (
3830
"github.com/coder/coder/provisionerd"
3931
"github.com/coder/coder/provisionersdk"
4032
"github.com/coder/coder/provisionersdk/proto"
33+
"github.com/coreos/go-systemd/daemon"
34+
"github.com/spf13/cobra"
35+
"golang.org/x/xerrors"
36+
"google.golang.org/api/idtoken"
37+
"google.golang.org/api/option"
38+
"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer"
4139
)
4240

4341
func start() *cobra.Command {

cli/start_test.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -205,9 +205,7 @@ func TestStart(t *testing.T) {
205205
ctx, cancelFunc := context.WithCancel(context.Background())
206206
defer cancelFunc()
207207
os.Setenv("CODER_TRACE_DATADOG", "true")
208-
defer func() {
209-
os.Unsetenv("CODER_TRACE_DATADOG")
210-
}()
208+
defer os.Unsetenv("CODER_TRACE_DATADOG")
211209
root, _ := clitest.New(t, "start", "--dev", "--tunnel=false", "--address", ":0")
212210
done := make(chan struct{})
213211
go func() {

0 commit comments

Comments
 (0)