diff --git a/agent/agent.go b/agent/agent.go index dd00707d30..5386ef19a1 100644 --- a/agent/agent.go +++ b/agent/agent.go @@ -37,7 +37,6 @@ import ( "tailscale.com/util/clientmetric" "cdr.dev/slog/v3" - "github.com/coder/clistat" "github.com/coder/coder/v2/agent/agentcontainers" "github.com/coder/coder/v2/agent/agentexec" diff --git a/agent/agent_internal_test.go b/agent/agent_internal_test.go index 098d624533..0650df3091 100644 --- a/agent/agent_internal_test.go +++ b/agent/agent_internal_test.go @@ -7,9 +7,7 @@ import ( "github.com/stretchr/testify/require" "cdr.dev/slog/v3" - "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/agent/proto" "github.com/coder/coder/v2/testutil" ) diff --git a/agent/agent_test.go b/agent/agent_test.go index f9e1ee89c8..46d727ba6b 100644 --- a/agent/agent_test.go +++ b/agent/agent_test.go @@ -25,10 +25,6 @@ import ( "testing" "time" - "go.uber.org/goleak" - "tailscale.com/net/speedtest" - "tailscale.com/tailcfg" - "github.com/bramvdbogaerde/go-scp" "github.com/google/uuid" "github.com/ory/dockertest/v3" @@ -40,13 +36,14 @@ import ( "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.uber.org/goleak" "golang.org/x/crypto/ssh" "golang.org/x/xerrors" + "tailscale.com/net/speedtest" + "tailscale.com/tailcfg" "cdr.dev/slog/v3" - "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/agent" "github.com/coder/coder/v2/agent/agentcontainers" "github.com/coder/coder/v2/agent/agentssh" diff --git a/agent/agentcontainers/api.go b/agent/agentcontainers/api.go index 67f5496f82..8e056fa666 100644 --- a/agent/agentcontainers/api.go +++ b/agent/agentcontainers/api.go @@ -27,7 +27,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/agent/agentcontainers/ignore" "github.com/coder/coder/v2/agent/agentcontainers/watcher" "github.com/coder/coder/v2/agent/agentexec" diff --git a/agent/agentcontainers/api_test.go b/agent/agentcontainers/api_test.go index 1048cf17b8..ee6775b5c5 100644 --- a/agent/agentcontainers/api_test.go +++ b/agent/agentcontainers/api_test.go @@ -28,11 +28,8 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "cdr.dev/slog/v3/sloggers/sloghuman" - "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/agent/agentcontainers" "github.com/coder/coder/v2/agent/agentcontainers/acmock" "github.com/coder/coder/v2/agent/agentcontainers/watcher" diff --git a/agent/agentcontainers/devcontainer.go b/agent/agentcontainers/devcontainer.go index 15377b7ec3..438e51187d 100644 --- a/agent/agentcontainers/devcontainer.go +++ b/agent/agentcontainers/devcontainer.go @@ -8,7 +8,6 @@ import ( "github.com/google/uuid" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/codersdk" ) diff --git a/agent/agentcontainers/devcontainercli.go b/agent/agentcontainers/devcontainercli.go index ec68190eb0..d21a87e725 100644 --- a/agent/agentcontainers/devcontainercli.go +++ b/agent/agentcontainers/devcontainercli.go @@ -14,7 +14,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/agent/agentexec" "github.com/coder/coder/v2/codersdk" ) diff --git a/agent/agentcontainers/devcontainercli_test.go b/agent/agentcontainers/devcontainercli_test.go index 3a616d6b43..d7447fae84 100644 --- a/agent/agentcontainers/devcontainercli_test.go +++ b/agent/agentcontainers/devcontainercli_test.go @@ -22,9 +22,7 @@ import ( "github.com/stretchr/testify/require" "cdr.dev/slog/v3" - "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/agent/agentcontainers" "github.com/coder/coder/v2/agent/agentexec" "github.com/coder/coder/v2/codersdk" diff --git a/agent/agentcontainers/execer.go b/agent/agentcontainers/execer.go index 0dad7913fa..0f85687893 100644 --- a/agent/agentcontainers/execer.go +++ b/agent/agentcontainers/execer.go @@ -8,7 +8,6 @@ import ( "strings" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/agent/agentexec" "github.com/coder/coder/v2/agent/usershell" "github.com/coder/coder/v2/pty" diff --git a/agent/agentcontainers/subagent.go b/agent/agentcontainers/subagent.go index db47f354e9..3dbd18ab8f 100644 --- a/agent/agentcontainers/subagent.go +++ b/agent/agentcontainers/subagent.go @@ -8,7 +8,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - agentproto "github.com/coder/coder/v2/agent/proto" "github.com/coder/coder/v2/codersdk" ) diff --git a/agent/agentscripts/agentscripts.go b/agent/agentscripts/agentscripts.go index f957198c29..333f0aca8e 100644 --- a/agent/agentscripts/agentscripts.go +++ b/agent/agentscripts/agentscripts.go @@ -21,7 +21,6 @@ import ( "google.golang.org/protobuf/types/known/timestamppb" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/agent/agentssh" "github.com/coder/coder/v2/agent/proto" "github.com/coder/coder/v2/coderd/database/dbtime" diff --git a/agent/agentsocket/server.go b/agent/agentsocket/server.go index 43cc5ea6af..fad48d6eaa 100644 --- a/agent/agentsocket/server.go +++ b/agent/agentsocket/server.go @@ -11,7 +11,6 @@ import ( "storj.io/drpc/drpcserver" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/agent/agentsocket/proto" "github.com/coder/coder/v2/agent/unit" "github.com/coder/coder/v2/codersdk/drpcsdk" diff --git a/agent/agentsocket/server_test.go b/agent/agentsocket/server_test.go index 121cc56b82..6f1bc468ae 100644 --- a/agent/agentsocket/server_test.go +++ b/agent/agentsocket/server_test.go @@ -11,7 +11,6 @@ import ( "github.com/stretchr/testify/require" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/agent" "github.com/coder/coder/v2/agent/agentsocket" "github.com/coder/coder/v2/agent/agenttest" diff --git a/agent/agentsocket/service.go b/agent/agentsocket/service.go index 10d9101985..b72e8f769b 100644 --- a/agent/agentsocket/service.go +++ b/agent/agentsocket/service.go @@ -7,7 +7,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/agent/agentsocket/proto" "github.com/coder/coder/v2/agent/unit" ) diff --git a/agent/agentsocket/service_test.go b/agent/agentsocket/service_test.go index 8bb3bdf220..83c53ee4b8 100644 --- a/agent/agentsocket/service_test.go +++ b/agent/agentsocket/service_test.go @@ -9,7 +9,6 @@ import ( "github.com/stretchr/testify/require" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/agent/agentsocket" "github.com/coder/coder/v2/agent/unit" "github.com/coder/coder/v2/testutil" diff --git a/agent/agentssh/agentssh.go b/agent/agentssh/agentssh.go index f9b50f082b..0d3eeb8dcc 100644 --- a/agent/agentssh/agentssh.go +++ b/agent/agentssh/agentssh.go @@ -28,7 +28,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/agent/agentcontainers" "github.com/coder/coder/v2/agent/agentexec" "github.com/coder/coder/v2/agent/agentrsa" diff --git a/agent/agentssh/agentssh_test.go b/agent/agentssh/agentssh_test.go index 3f42a0d3cc..c2b439eeca 100644 --- a/agent/agentssh/agentssh_test.go +++ b/agent/agentssh/agentssh_test.go @@ -26,7 +26,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/agent/agentexec" "github.com/coder/coder/v2/agent/agentssh" "github.com/coder/coder/v2/pty/ptytest" diff --git a/agent/agenttest/client.go b/agent/agenttest/client.go index 294cb7667e..9391e51cd2 100644 --- a/agent/agenttest/client.go +++ b/agent/agenttest/client.go @@ -22,7 +22,6 @@ import ( "tailscale.com/tailcfg" "cdr.dev/slog/v3" - agentproto "github.com/coder/coder/v2/agent/proto" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/codersdk/agentsdk" diff --git a/agent/apphealth.go b/agent/apphealth.go index f8380c1cfd..333e07c81a 100644 --- a/agent/apphealth.go +++ b/agent/apphealth.go @@ -10,7 +10,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/codersdk/agentsdk" "github.com/coder/quartz" diff --git a/agent/boundary_logs_test.go b/agent/boundary_logs_test.go index 335778039e..bb6ee3d166 100644 --- a/agent/boundary_logs_test.go +++ b/agent/boundary_logs_test.go @@ -15,7 +15,6 @@ import ( "google.golang.org/protobuf/types/known/timestamppb" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/agent/boundarylogproxy" "github.com/coder/coder/v2/agent/boundarylogproxy/codec" agentproto "github.com/coder/coder/v2/agent/proto" diff --git a/agent/boundarylogproxy/proxy.go b/agent/boundarylogproxy/proxy.go index 9878093ac2..d8a3cab5e5 100644 --- a/agent/boundarylogproxy/proxy.go +++ b/agent/boundarylogproxy/proxy.go @@ -15,7 +15,6 @@ import ( "google.golang.org/protobuf/proto" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/agent/boundarylogproxy/codec" agentproto "github.com/coder/coder/v2/agent/proto" ) diff --git a/agent/checkpoint_internal_test.go b/agent/checkpoint_internal_test.go index 1d98dcbc17..8b2a6ac843 100644 --- a/agent/checkpoint_internal_test.go +++ b/agent/checkpoint_internal_test.go @@ -7,7 +7,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/testutil" ) diff --git a/agent/files.go b/agent/files.go index 01f4b66567..b4df9b42fa 100644 --- a/agent/files.go +++ b/agent/files.go @@ -18,7 +18,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/httpapi" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/codersdk/workspacesdk" diff --git a/agent/metrics.go b/agent/metrics.go index 54b1219223..a4011fb745 100644 --- a/agent/metrics.go +++ b/agent/metrics.go @@ -10,7 +10,6 @@ import ( "tailscale.com/util/clientmetric" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/agent/proto" ) diff --git a/agent/proto/resourcesmonitor/resources_monitor.go b/agent/proto/resourcesmonitor/resources_monitor.go index 3cb46bf06a..c618100824 100644 --- a/agent/proto/resourcesmonitor/resources_monitor.go +++ b/agent/proto/resourcesmonitor/resources_monitor.go @@ -5,7 +5,6 @@ import ( "time" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/agent/proto" "github.com/coder/quartz" ) diff --git a/agent/proto/resourcesmonitor/resources_monitor_test.go b/agent/proto/resourcesmonitor/resources_monitor_test.go index 4f0691ff38..909027eea9 100644 --- a/agent/proto/resourcesmonitor/resources_monitor_test.go +++ b/agent/proto/resourcesmonitor/resources_monitor_test.go @@ -10,7 +10,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/sloghuman" - "github.com/coder/coder/v2/agent/proto" "github.com/coder/coder/v2/agent/proto/resourcesmonitor" "github.com/coder/quartz" diff --git a/agent/reconnectingpty/buffered.go b/agent/reconnectingpty/buffered.go index baec5bc5a8..25ba1ee136 100644 --- a/agent/reconnectingpty/buffered.go +++ b/agent/reconnectingpty/buffered.go @@ -13,7 +13,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/agent/agentexec" "github.com/coder/coder/v2/pty" ) diff --git a/agent/reconnectingpty/reconnectingpty.go b/agent/reconnectingpty/reconnectingpty.go index a06fedee81..82b018cf7b 100644 --- a/agent/reconnectingpty/reconnectingpty.go +++ b/agent/reconnectingpty/reconnectingpty.go @@ -14,7 +14,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/agent/agentexec" "github.com/coder/coder/v2/codersdk/workspacesdk" "github.com/coder/coder/v2/pty" diff --git a/agent/reconnectingpty/screen.go b/agent/reconnectingpty/screen.go index cddd890f11..221713d212 100644 --- a/agent/reconnectingpty/screen.go +++ b/agent/reconnectingpty/screen.go @@ -19,7 +19,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/agent/agentexec" "github.com/coder/coder/v2/pty" ) diff --git a/agent/reconnectingpty/server.go b/agent/reconnectingpty/server.go index 33387e1b20..cedd86bbd4 100644 --- a/agent/reconnectingpty/server.go +++ b/agent/reconnectingpty/server.go @@ -14,7 +14,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/agent/agentcontainers" "github.com/coder/coder/v2/agent/agentssh" "github.com/coder/coder/v2/agent/usershell" diff --git a/agent/stats.go b/agent/stats.go index 32835aa6b7..3df0fd44df 100644 --- a/agent/stats.go +++ b/agent/stats.go @@ -10,7 +10,6 @@ import ( "tailscale.com/types/netlogtype" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/agent/proto" ) diff --git a/agent/stats_internal_test.go b/agent/stats_internal_test.go index 96ac687de0..e35fa9d3e2 100644 --- a/agent/stats_internal_test.go +++ b/agent/stats_internal_test.go @@ -10,7 +10,6 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/protobuf/types/known/durationpb" "tailscale.com/types/ipproto" - "tailscale.com/types/netlogtype" "github.com/coder/coder/v2/agent/proto" diff --git a/cli/agent.go b/cli/agent.go index 6d4ad020e8..7788a5fcca 100644 --- a/cli/agent.go +++ b/cli/agent.go @@ -16,18 +16,14 @@ import ( "strings" "time" + "github.com/prometheus/client_golang/prometheus" "golang.org/x/xerrors" "gopkg.in/natefinch/lumberjack.v2" - "github.com/prometheus/client_golang/prometheus" - "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/sloghuman" "cdr.dev/slog/v3/sloggers/slogjson" "cdr.dev/slog/v3/sloggers/slogstackdriver" - - "github.com/coder/serpent" - "github.com/coder/coder/v2/agent" "github.com/coder/coder/v2/agent/agentcontainers" "github.com/coder/coder/v2/agent/agentexec" @@ -38,6 +34,7 @@ import ( "github.com/coder/coder/v2/cli/clilog" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/codersdk/agentsdk" + "github.com/coder/serpent" ) func workspaceAgent() *serpent.Command { diff --git a/cli/clilog/clilog.go b/cli/clilog/clilog.go index cea4084d87..50a7b1c834 100644 --- a/cli/clilog/clilog.go +++ b/cli/clilog/clilog.go @@ -15,7 +15,6 @@ import ( "cdr.dev/slog/v3/sloggers/sloghuman" "cdr.dev/slog/v3/sloggers/slogjson" "cdr.dev/slog/v3/sloggers/slogstackdriver" - "github.com/coder/coder/v2/coderd/tracing" "github.com/coder/coder/v2/codersdk" "github.com/coder/serpent" diff --git a/cli/clilog/clilog_test.go b/cli/clilog/clilog_test.go index c861f65b91..18a3c8a10e 100644 --- a/cli/clilog/clilog_test.go +++ b/cli/clilog/clilog_test.go @@ -7,13 +7,13 @@ import ( "strings" "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/coder/coder/v2/cli/clilog" "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/codersdk" "github.com/coder/serpent" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" ) func TestBuilder(t *testing.T) { diff --git a/cli/clitest/clitest.go b/cli/clitest/clitest.go index 2fc055e0b8..f1d7e6a1ce 100644 --- a/cli/clitest/clitest.go +++ b/cli/clitest/clitest.go @@ -19,7 +19,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/cli" "github.com/coder/coder/v2/cli/config" "github.com/coder/coder/v2/codersdk" diff --git a/cli/cliui/provisionerjob_test.go b/cli/cliui/provisionerjob_test.go index 77310e9536..304e0608b8 100644 --- a/cli/cliui/provisionerjob_test.go +++ b/cli/cliui/provisionerjob_test.go @@ -13,12 +13,11 @@ import ( "github.com/stretchr/testify/assert" - "github.com/coder/coder/v2/testutil" - "github.com/coder/coder/v2/cli/cliui" "github.com/coder/coder/v2/coderd/database/dbtime" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/pty/ptytest" + "github.com/coder/coder/v2/testutil" "github.com/coder/serpent" ) diff --git a/cli/configssh.go b/cli/configssh.go index 7676e82c4a..b4f20fe894 100644 --- a/cli/configssh.go +++ b/cli/configssh.go @@ -22,10 +22,9 @@ import ( "golang.org/x/exp/constraints" "golang.org/x/xerrors" - "github.com/coder/serpent" - "github.com/coder/coder/v2/cli/cliui" "github.com/coder/coder/v2/codersdk" + "github.com/coder/serpent" ) const ( diff --git a/cli/connect.go b/cli/connect.go index d1245147f3..cd8b1bddf7 100644 --- a/cli/connect.go +++ b/cli/connect.go @@ -1,9 +1,8 @@ package cli import ( - "github.com/coder/serpent" - "github.com/coder/coder/v2/codersdk/workspacesdk" + "github.com/coder/serpent" ) func (r *RootCmd) connectCmd() *serpent.Command { diff --git a/cli/connect_test.go b/cli/connect_test.go index 031cd2f95b..ced62f902a 100644 --- a/cli/connect_test.go +++ b/cli/connect_test.go @@ -9,11 +9,10 @@ import ( "github.com/stretchr/testify/require" "tailscale.com/net/tsaddr" - "github.com/coder/serpent" - "github.com/coder/coder/v2/cli" "github.com/coder/coder/v2/codersdk/workspacesdk" "github.com/coder/coder/v2/testutil" + "github.com/coder/serpent" ) func TestConnectExists_Running(t *testing.T) { diff --git a/cli/create.go b/cli/create.go index 225d05950e..79f9c8e2df 100644 --- a/cli/create.go +++ b/cli/create.go @@ -12,13 +12,12 @@ import ( "github.com/google/uuid" "golang.org/x/xerrors" - "github.com/coder/pretty" - "github.com/coder/coder/v2/cli/cliui" "github.com/coder/coder/v2/cli/cliutil" "github.com/coder/coder/v2/coderd/util/ptr" "github.com/coder/coder/v2/coderd/util/slice" "github.com/coder/coder/v2/codersdk" + "github.com/coder/pretty" "github.com/coder/serpent" ) diff --git a/cli/delete_test.go b/cli/delete_test.go index 271f5342ea..2701241dcd 100644 --- a/cli/delete_test.go +++ b/cli/delete_test.go @@ -10,23 +10,21 @@ import ( "time" "github.com/google/uuid" - - "github.com/coder/coder/v2/coderd/database" - "github.com/coder/coder/v2/coderd/database/dbgen" - "github.com/coder/coder/v2/coderd/database/pubsub" - "github.com/coder/quartz" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/coder/coder/v2/cli/clitest" "github.com/coder/coder/v2/coderd/coderdtest" + "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" + "github.com/coder/coder/v2/coderd/database/dbgen" "github.com/coder/coder/v2/coderd/database/dbtestutil" + "github.com/coder/coder/v2/coderd/database/pubsub" "github.com/coder/coder/v2/coderd/rbac" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/pty/ptytest" "github.com/coder/coder/v2/testutil" + "github.com/coder/quartz" ) func TestDelete(t *testing.T) { diff --git a/cli/dotfiles.go b/cli/dotfiles.go index 40bf174173..f70e78ac1a 100644 --- a/cli/dotfiles.go +++ b/cli/dotfiles.go @@ -13,9 +13,8 @@ import ( "golang.org/x/xerrors" - "github.com/coder/pretty" - "github.com/coder/coder/v2/cli/cliui" + "github.com/coder/pretty" "github.com/coder/serpent" ) diff --git a/cli/exp_rpty_test.go b/cli/exp_rpty_test.go index 9b5c0ffe22..eb29190c6f 100644 --- a/cli/exp_rpty_test.go +++ b/cli/exp_rpty_test.go @@ -7,6 +7,8 @@ import ( "github.com/google/uuid" "github.com/ory/dockertest/v3" "github.com/ory/dockertest/v3/docker" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" "github.com/coder/coder/v2/agent" "github.com/coder/coder/v2/agent/agentcontainers" @@ -15,9 +17,6 @@ import ( "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/pty/ptytest" "github.com/coder/coder/v2/testutil" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" ) func TestExpRpty(t *testing.T) { diff --git a/cli/exp_scaletest.go b/cli/exp_scaletest.go index 88d39f65fa..5b4f16322f 100644 --- a/cli/exp_scaletest.go +++ b/cli/exp_scaletest.go @@ -26,7 +26,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/sloghuman" - "github.com/coder/coder/v2/cli/cliui" "github.com/coder/coder/v2/coderd/httpapi" "github.com/coder/coder/v2/coderd/tracing" diff --git a/cli/exp_scaletest_dynamicparameters.go b/cli/exp_scaletest_dynamicparameters.go index 61510066e8..40e11dac61 100644 --- a/cli/exp_scaletest_dynamicparameters.go +++ b/cli/exp_scaletest_dynamicparameters.go @@ -10,15 +10,12 @@ import ( "github.com/prometheus/client_golang/prometheus/promhttp" "golang.org/x/xerrors" - "github.com/coder/coder/v2/scaletest/loadtestutil" - "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/sloghuman" - - "github.com/coder/serpent" - "github.com/coder/coder/v2/scaletest/dynamicparameters" "github.com/coder/coder/v2/scaletest/harness" + "github.com/coder/coder/v2/scaletest/loadtestutil" + "github.com/coder/serpent" ) const ( diff --git a/cli/exp_scaletest_notifications.go b/cli/exp_scaletest_notifications.go index cc4612a40b..b2e4ba6cf0 100644 --- a/cli/exp_scaletest_notifications.go +++ b/cli/exp_scaletest_notifications.go @@ -18,14 +18,12 @@ import ( "github.com/prometheus/client_golang/prometheus/promhttp" "golang.org/x/xerrors" - "github.com/coder/coder/v2/scaletest/loadtestutil" - "cdr.dev/slog/v3" - notificationsLib "github.com/coder/coder/v2/coderd/notifications" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/scaletest/createusers" "github.com/coder/coder/v2/scaletest/harness" + "github.com/coder/coder/v2/scaletest/loadtestutil" "github.com/coder/coder/v2/scaletest/notifications" "github.com/coder/serpent" ) diff --git a/cli/exp_scaletest_prebuilds.go b/cli/exp_scaletest_prebuilds.go index 34fee3b9eb..b8bd2b09e9 100644 --- a/cli/exp_scaletest_prebuilds.go +++ b/cli/exp_scaletest_prebuilds.go @@ -13,10 +13,9 @@ import ( "github.com/prometheus/client_golang/prometheus/promhttp" "golang.org/x/xerrors" - "github.com/coder/coder/v2/scaletest/loadtestutil" - "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/scaletest/harness" + "github.com/coder/coder/v2/scaletest/loadtestutil" "github.com/coder/coder/v2/scaletest/prebuilds" "github.com/coder/quartz" "github.com/coder/serpent" diff --git a/cli/exp_scaletest_smtp.go b/cli/exp_scaletest_smtp.go index e36a4e6419..980c4504ba 100644 --- a/cli/exp_scaletest_smtp.go +++ b/cli/exp_scaletest_smtp.go @@ -11,7 +11,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/sloghuman" - "github.com/coder/coder/v2/scaletest/smtpmock" "github.com/coder/serpent" ) diff --git a/cli/exp_scaletest_taskstatus.go b/cli/exp_scaletest_taskstatus.go index f4e8ca0a2c..578e6e8e12 100644 --- a/cli/exp_scaletest_taskstatus.go +++ b/cli/exp_scaletest_taskstatus.go @@ -14,16 +14,13 @@ import ( "github.com/prometheus/client_golang/prometheus/promhttp" "golang.org/x/xerrors" - "github.com/coder/coder/v2/scaletest/loadtestutil" - "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/sloghuman" - - "github.com/coder/serpent" - "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/scaletest/harness" + "github.com/coder/coder/v2/scaletest/loadtestutil" "github.com/coder/coder/v2/scaletest/taskstatus" + "github.com/coder/serpent" ) const ( diff --git a/cli/exp_scaletest_test.go b/cli/exp_scaletest_test.go index 147db049d2..942b104564 100644 --- a/cli/exp_scaletest_test.go +++ b/cli/exp_scaletest_test.go @@ -8,7 +8,6 @@ import ( "github.com/stretchr/testify/require" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/cli/clitest" "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/pty/ptytest" diff --git a/cli/exptest/exptest_scaletest_test.go b/cli/exptest/exptest_scaletest_test.go index 2edce4e2ab..ecb4fc9325 100644 --- a/cli/exptest/exptest_scaletest_test.go +++ b/cli/exptest/exptest_scaletest_test.go @@ -8,7 +8,6 @@ import ( "github.com/stretchr/testify/require" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/cli/clitest" "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/codersdk" diff --git a/cli/favorite_test.go b/cli/favorite_test.go index 0668f03361..60bf2dcc09 100644 --- a/cli/favorite_test.go +++ b/cli/favorite_test.go @@ -4,12 +4,12 @@ import ( "bytes" "testing" + "github.com/stretchr/testify/require" + "github.com/coder/coder/v2/cli/clitest" "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbfake" - - "github.com/stretchr/testify/require" ) func TestFavoriteUnfavorite(t *testing.T) { diff --git a/cli/login.go b/cli/login.go index d95eb7475d..2871876b9f 100644 --- a/cli/login.go +++ b/cli/login.go @@ -16,12 +16,11 @@ import ( "github.com/pkg/browser" "golang.org/x/xerrors" - "github.com/coder/pretty" - "github.com/coder/coder/v2/cli/cliui" "github.com/coder/coder/v2/cli/sessionstore" "github.com/coder/coder/v2/coderd/userpassword" "github.com/coder/coder/v2/codersdk" + "github.com/coder/pretty" "github.com/coder/serpent" ) diff --git a/cli/login_test.go b/cli/login_test.go index 9a86e7caad..1616481da1 100644 --- a/cli/login_test.go +++ b/cli/login_test.go @@ -11,14 +11,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/coder/pretty" - "github.com/coder/coder/v2/cli/clitest" "github.com/coder/coder/v2/cli/cliui" "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/pty/ptytest" "github.com/coder/coder/v2/testutil" + "github.com/coder/pretty" ) func TestLogin(t *testing.T) { diff --git a/cli/logs.go b/cli/logs.go index 8f6dbb7b0d..928550bf07 100644 --- a/cli/logs.go +++ b/cli/logs.go @@ -8,13 +8,13 @@ import ( "strings" "time" - "github.com/coder/coder/v2/cli/cliui" - "github.com/coder/coder/v2/codersdk" - "github.com/coder/serpent" - "github.com/google/uuid" "golang.org/x/sync/errgroup" "golang.org/x/xerrors" + + "github.com/coder/coder/v2/cli/cliui" + "github.com/coder/coder/v2/codersdk" + "github.com/coder/serpent" ) func (r *RootCmd) logs() *serpent.Command { diff --git a/cli/logs_test.go b/cli/logs_test.go index 3fcb0e8997..93b827dd4a 100644 --- a/cli/logs_test.go +++ b/cli/logs_test.go @@ -5,15 +5,15 @@ import ( "strings" "testing" + "github.com/google/uuid" + "github.com/stretchr/testify/require" + "github.com/coder/coder/v2/cli/clitest" "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbfake" "github.com/coder/coder/v2/coderd/database/dbgen" "github.com/coder/coder/v2/testutil" - - "github.com/google/uuid" - "github.com/stretchr/testify/require" ) func TestLogsCmd(t *testing.T) { diff --git a/cli/notifications.go b/cli/notifications.go index 5cd06c7f38..f6d5fa2dd4 100644 --- a/cli/notifications.go +++ b/cli/notifications.go @@ -5,9 +5,8 @@ import ( "golang.org/x/xerrors" - "github.com/coder/serpent" - "github.com/coder/coder/v2/codersdk" + "github.com/coder/serpent" ) func (r *RootCmd) notifications() *serpent.Command { diff --git a/cli/ping.go b/cli/ping.go index 31a4d26f9a..532c1850b5 100644 --- a/cli/ping.go +++ b/cli/ping.go @@ -10,25 +10,21 @@ import ( "strings" "time" + "github.com/briandowns/spinner" "golang.org/x/xerrors" "tailscale.com/ipn/ipnstate" "tailscale.com/tailcfg" "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/sloghuman" - - "github.com/briandowns/spinner" - - "github.com/coder/pretty" - - "github.com/coder/serpent" - "github.com/coder/coder/v2/cli/cliui" "github.com/coder/coder/v2/cli/cliutil" "github.com/coder/coder/v2/coderd/util/ptr" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/codersdk/healthsdk" "github.com/coder/coder/v2/codersdk/workspacesdk" + "github.com/coder/pretty" + "github.com/coder/serpent" ) type pingSummary struct { diff --git a/cli/portforward.go b/cli/portforward.go index a6285c1a44..741279c54f 100644 --- a/cli/portforward.go +++ b/cli/portforward.go @@ -17,7 +17,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/sloghuman" - "github.com/coder/coder/v2/agent/agentssh" "github.com/coder/coder/v2/cli/cliui" "github.com/coder/coder/v2/codersdk" diff --git a/cli/publickey.go b/cli/publickey.go index 4862edf760..001b3c3ee1 100644 --- a/cli/publickey.go +++ b/cli/publickey.go @@ -5,11 +5,10 @@ import ( "golang.org/x/xerrors" - "github.com/coder/pretty" - "github.com/coder/serpent" - "github.com/coder/coder/v2/cli/cliui" "github.com/coder/coder/v2/codersdk" + "github.com/coder/pretty" + "github.com/coder/serpent" ) func (r *RootCmd) publickey() *serpent.Command { diff --git a/cli/rename.go b/cli/rename.go index 1e7413fed5..402124b753 100644 --- a/cli/rename.go +++ b/cli/rename.go @@ -5,11 +5,10 @@ import ( "golang.org/x/xerrors" - "github.com/coder/pretty" - "github.com/coder/serpent" - "github.com/coder/coder/v2/cli/cliui" "github.com/coder/coder/v2/codersdk" + "github.com/coder/pretty" + "github.com/coder/serpent" ) func (r *RootCmd) rename() *serpent.Command { diff --git a/cli/resetpassword.go b/cli/resetpassword.go index b43ddde4e2..b7fb81cd74 100644 --- a/cli/resetpassword.go +++ b/cli/resetpassword.go @@ -9,15 +9,13 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/sloghuman" - + "github.com/coder/coder/v2/cli/cliui" + "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/awsiamrds" + "github.com/coder/coder/v2/coderd/userpassword" "github.com/coder/coder/v2/codersdk" "github.com/coder/pretty" "github.com/coder/serpent" - - "github.com/coder/coder/v2/cli/cliui" - "github.com/coder/coder/v2/coderd/database" - "github.com/coder/coder/v2/coderd/userpassword" ) func (*RootCmd) resetPassword() *serpent.Command { diff --git a/cli/root.go b/cli/root.go index 161106d77c..24228114a3 100644 --- a/cli/root.go +++ b/cli/root.go @@ -29,10 +29,6 @@ import ( "golang.org/x/mod/semver" "golang.org/x/xerrors" - "github.com/coder/pretty" - - "github.com/coder/serpent" - "github.com/coder/coder/v2/buildinfo" "github.com/coder/coder/v2/cli/cliui" "github.com/coder/coder/v2/cli/config" @@ -41,6 +37,8 @@ import ( "github.com/coder/coder/v2/cli/telemetry" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/codersdk/agentsdk" + "github.com/coder/pretty" + "github.com/coder/serpent" ) var ( diff --git a/cli/server.go b/cli/server.go index 61fccf0120..c17db2aa5f 100644 --- a/cli/server.go +++ b/cli/server.go @@ -56,14 +56,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/sloghuman" - - "github.com/coder/coder/v2/coderd/pproflabel" - "github.com/coder/pretty" - "github.com/coder/quartz" - "github.com/coder/retry" - "github.com/coder/serpent" - "github.com/coder/wgtunnel/tunnelsdk" - "github.com/coder/coder/v2/buildinfo" "github.com/coder/coder/v2/cli/clilog" "github.com/coder/coder/v2/cli/cliui" @@ -87,6 +79,7 @@ import ( "github.com/coder/coder/v2/coderd/notifications" "github.com/coder/coder/v2/coderd/notifications/reports" "github.com/coder/coder/v2/coderd/oauthpki" + "github.com/coder/coder/v2/coderd/pproflabel" "github.com/coder/coder/v2/coderd/prometheusmetrics" "github.com/coder/coder/v2/coderd/prometheusmetrics/insights" "github.com/coder/coder/v2/coderd/promoauth" @@ -112,6 +105,11 @@ import ( "github.com/coder/coder/v2/provisionersdk" sdkproto "github.com/coder/coder/v2/provisionersdk/proto" "github.com/coder/coder/v2/tailnet" + "github.com/coder/pretty" + "github.com/coder/quartz" + "github.com/coder/retry" + "github.com/coder/serpent" + "github.com/coder/wgtunnel/tunnelsdk" ) func createOIDCConfig(ctx context.Context, logger slog.Logger, vals *codersdk.DeploymentValues) (*coderd.OIDCConfig, error) { diff --git a/cli/server_createadminuser.go b/cli/server_createadminuser.go index 121f9b8671..c8daeb2ab5 100644 --- a/cli/server_createadminuser.go +++ b/cli/server_createadminuser.go @@ -11,7 +11,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/sloghuman" - "github.com/coder/coder/v2/cli/cliui" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/awsiamrds" diff --git a/cli/server_internal_test.go b/cli/server_internal_test.go index fe12bceac8..22a53d030b 100644 --- a/cli/server_internal_test.go +++ b/cli/server_internal_test.go @@ -13,7 +13,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/sloghuman" - "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/testutil" "github.com/coder/serpent" diff --git a/cli/server_regenerate_vapid_keypair.go b/cli/server_regenerate_vapid_keypair.go index ce8954a33e..577454adca 100644 --- a/cli/server_regenerate_vapid_keypair.go +++ b/cli/server_regenerate_vapid_keypair.go @@ -9,7 +9,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/sloghuman" - "github.com/coder/coder/v2/cli/cliui" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/awsiamrds" diff --git a/cli/server_test.go b/cli/server_test.go index 8df9354301..89e8c4d597 100644 --- a/cli/server_test.go +++ b/cli/server_test.go @@ -42,7 +42,6 @@ import ( "tailscale.com/types/key" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/buildinfo" "github.com/coder/coder/v2/cli" "github.com/coder/coder/v2/cli/clitest" diff --git a/cli/sharing.go b/cli/sharing.go index f0f067fec0..c1d9519850 100644 --- a/cli/sharing.go +++ b/cli/sharing.go @@ -5,9 +5,8 @@ import ( "fmt" "regexp" - "golang.org/x/xerrors" - "github.com/google/uuid" + "golang.org/x/xerrors" "github.com/coder/coder/v2/cli/cliui" "github.com/coder/coder/v2/codersdk" diff --git a/cli/show.go b/cli/show.go index 0a78a9e861..c1b9956e38 100644 --- a/cli/show.go +++ b/cli/show.go @@ -4,9 +4,8 @@ import ( "sort" "sync" - "golang.org/x/xerrors" - "github.com/google/uuid" + "golang.org/x/xerrors" "github.com/coder/coder/v2/agent/agentcontainers" "github.com/coder/coder/v2/cli/cliui" diff --git a/cli/speedtest.go b/cli/speedtest.go index 6eb49df5d6..ea4ead2bb9 100644 --- a/cli/speedtest.go +++ b/cli/speedtest.go @@ -12,7 +12,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/sloghuman" - "github.com/coder/coder/v2/cli/cliui" "github.com/coder/coder/v2/codersdk/workspacesdk" "github.com/coder/serpent" diff --git a/cli/ssh.go b/cli/ssh.go index 16b69d73ea..39a14e0750 100644 --- a/cli/ssh.go +++ b/cli/ssh.go @@ -34,7 +34,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/sloghuman" - "github.com/coder/coder/v2/agent/agentssh" "github.com/coder/coder/v2/cli/cliui" "github.com/coder/coder/v2/cli/cliutil" diff --git a/cli/ssh_internal_test.go b/cli/ssh_internal_test.go index 3bc512ce76..da6e36b96a 100644 --- a/cli/ssh_internal_test.go +++ b/cli/ssh_internal_test.go @@ -19,11 +19,9 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/slogtest" - - "github.com/coder/quartz" - "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/testutil" + "github.com/coder/quartz" ) const ( diff --git a/cli/state_test.go b/cli/state_test.go index 44b92b2c79..af2d032113 100644 --- a/cli/state_test.go +++ b/cli/state_test.go @@ -9,13 +9,12 @@ import ( "strings" "testing" - "github.com/coder/coder/v2/coderd/database" - "github.com/coder/coder/v2/coderd/database/dbfake" - "github.com/stretchr/testify/require" "github.com/coder/coder/v2/cli/clitest" "github.com/coder/coder/v2/coderd/coderdtest" + "github.com/coder/coder/v2/coderd/database" + "github.com/coder/coder/v2/coderd/database/dbfake" "github.com/coder/coder/v2/coderd/rbac" "github.com/coder/coder/v2/provisioner/echo" ) diff --git a/cli/support.go b/cli/support.go index 4fd28d656d..f181f76131 100644 --- a/cli/support.go +++ b/cli/support.go @@ -14,15 +14,13 @@ import ( "text/tabwriter" "time" - "github.com/coder/coder/v2/cli/cliutil" - "github.com/google/uuid" "golang.org/x/xerrors" "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/sloghuman" - "github.com/coder/coder/v2/cli/cliui" + "github.com/coder/coder/v2/cli/cliutil" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/support" "github.com/coder/serpent" diff --git a/cli/support_test.go b/cli/support_test.go index a079c5e66e..639b9d738f 100644 --- a/cli/support_test.go +++ b/cli/support_test.go @@ -15,11 +15,10 @@ import ( "testing" "time" - "tailscale.com/ipn/ipnstate" - "github.com/google/uuid" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "tailscale.com/ipn/ipnstate" "github.com/coder/coder/v2/agent" "github.com/coder/coder/v2/agent/agenttest" diff --git a/cli/sync_start.go b/cli/sync_start.go index c114a9b4ad..ee6b2a394d 100644 --- a/cli/sync_start.go +++ b/cli/sync_start.go @@ -6,11 +6,10 @@ import ( "golang.org/x/xerrors" - "github.com/coder/serpent" - "github.com/coder/coder/v2/agent/agentsocket" "github.com/coder/coder/v2/agent/unit" "github.com/coder/coder/v2/cli/cliui" + "github.com/coder/serpent" ) const ( diff --git a/cli/sync_status.go b/cli/sync_status.go index 87e3c4ccdf..586727c751 100644 --- a/cli/sync_status.go +++ b/cli/sync_status.go @@ -5,11 +5,10 @@ import ( "golang.org/x/xerrors" - "github.com/coder/serpent" - "github.com/coder/coder/v2/agent/agentsocket" "github.com/coder/coder/v2/agent/unit" "github.com/coder/coder/v2/cli/cliui" + "github.com/coder/serpent" ) func (*RootCmd) syncStatus(socketPath *string) *serpent.Command { diff --git a/cli/sync_test.go b/cli/sync_test.go index 8865daaba3..2e4a5b2f2b 100644 --- a/cli/sync_test.go +++ b/cli/sync_test.go @@ -13,7 +13,6 @@ import ( "github.com/stretchr/testify/require" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/agent/agentsocket" "github.com/coder/coder/v2/cli/clitest" "github.com/coder/coder/v2/testutil" diff --git a/cli/sync_want.go b/cli/sync_want.go index 10df920563..8bdc9b23a8 100644 --- a/cli/sync_want.go +++ b/cli/sync_want.go @@ -3,11 +3,10 @@ package cli import ( "golang.org/x/xerrors" - "github.com/coder/serpent" - "github.com/coder/coder/v2/agent/agentsocket" "github.com/coder/coder/v2/agent/unit" "github.com/coder/coder/v2/cli/cliui" + "github.com/coder/serpent" ) func (*RootCmd) syncWant(socketPath *string) *serpent.Command { diff --git a/cli/task_delete.go b/cli/task_delete.go index ac41b0192f..4c0cb6705d 100644 --- a/cli/task_delete.go +++ b/cli/task_delete.go @@ -7,10 +7,9 @@ import ( "golang.org/x/xerrors" - "github.com/coder/pretty" - "github.com/coder/coder/v2/cli/cliui" "github.com/coder/coder/v2/codersdk" + "github.com/coder/pretty" "github.com/coder/serpent" ) diff --git a/cli/task_list_test.go b/cli/task_list_test.go index 1b63a7a69e..4a055efeb0 100644 --- a/cli/task_list_test.go +++ b/cli/task_list_test.go @@ -14,7 +14,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/sloghuman" - "github.com/coder/coder/v2/cli/clitest" "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/coderd/database" diff --git a/cli/task_logs_test.go b/cli/task_logs_test.go index bad8811c10..33189c5e2b 100644 --- a/cli/task_logs_test.go +++ b/cli/task_logs_test.go @@ -12,7 +12,6 @@ import ( "github.com/stretchr/testify/require" agentapisdk "github.com/coder/agentapi-sdk-go" - "github.com/coder/coder/v2/cli/clitest" "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/coderd/httpapi" diff --git a/cli/task_send_test.go b/cli/task_send_test.go index e36fce443f..f5a32282f4 100644 --- a/cli/task_send_test.go +++ b/cli/task_send_test.go @@ -12,7 +12,6 @@ import ( "github.com/stretchr/testify/require" agentapisdk "github.com/coder/agentapi-sdk-go" - "github.com/coder/coder/v2/cli/clitest" "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/coderd/httpapi" diff --git a/cli/templatecreate.go b/cli/templatecreate.go index bd4f076d17..d1bc545181 100644 --- a/cli/templatecreate.go +++ b/cli/templatecreate.go @@ -8,12 +8,11 @@ import ( "golang.org/x/xerrors" - "github.com/coder/pretty" - "github.com/coder/serpent" - "github.com/coder/coder/v2/cli/cliui" "github.com/coder/coder/v2/coderd/util/ptr" "github.com/coder/coder/v2/codersdk" + "github.com/coder/pretty" + "github.com/coder/serpent" ) func (r *RootCmd) templateCreate() *serpent.Command { diff --git a/cli/templatedelete.go b/cli/templatedelete.go index 0b2d0b91d0..9130af6565 100644 --- a/cli/templatedelete.go +++ b/cli/templatedelete.go @@ -7,10 +7,9 @@ import ( "golang.org/x/xerrors" - "github.com/coder/pretty" - "github.com/coder/coder/v2/cli/cliui" "github.com/coder/coder/v2/codersdk" + "github.com/coder/pretty" "github.com/coder/serpent" ) diff --git a/cli/templatedelete_test.go b/cli/templatedelete_test.go index d81a3235f5..1472fc5331 100644 --- a/cli/templatedelete_test.go +++ b/cli/templatedelete_test.go @@ -8,14 +8,13 @@ import ( "github.com/stretchr/testify/require" - "github.com/coder/pretty" - "github.com/coder/coder/v2/cli/clitest" "github.com/coder/coder/v2/cli/cliui" "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/coderd/rbac" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/pty/ptytest" + "github.com/coder/pretty" ) func TestTemplateDelete(t *testing.T) { diff --git a/cli/templateedit.go b/cli/templateedit.go index 1f8c7ff5b1..242e009918 100644 --- a/cli/templateedit.go +++ b/cli/templateedit.go @@ -7,11 +7,10 @@ import ( "golang.org/x/xerrors" - "github.com/coder/pretty" - "github.com/coder/serpent" - "github.com/coder/coder/v2/cli/cliui" "github.com/coder/coder/v2/codersdk" + "github.com/coder/pretty" + "github.com/coder/serpent" ) func (r *RootCmd) templateEdit() *serpent.Command { diff --git a/cli/tokens_test.go b/cli/tokens_test.go index 1981892b69..565084fad8 100644 --- a/cli/tokens_test.go +++ b/cli/tokens_test.go @@ -7,9 +7,8 @@ import ( "fmt" "testing" - "github.com/stretchr/testify/require" - "github.com/google/uuid" + "github.com/stretchr/testify/require" "github.com/coder/coder/v2/cli/clitest" "github.com/coder/coder/v2/coderd/coderdtest" diff --git a/cli/usercreate.go b/cli/usercreate.go index c818ce5c26..5db55cef40 100644 --- a/cli/usercreate.go +++ b/cli/usercreate.go @@ -8,11 +8,10 @@ import ( "github.com/google/uuid" "golang.org/x/xerrors" - "github.com/coder/pretty" - "github.com/coder/coder/v2/cli/cliui" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/cryptorand" + "github.com/coder/pretty" "github.com/coder/serpent" ) diff --git a/cli/userstatus.go b/cli/userstatus.go index 54bbfdea66..4efd0741e4 100644 --- a/cli/userstatus.go +++ b/cli/userstatus.go @@ -6,10 +6,9 @@ import ( "golang.org/x/xerrors" - "github.com/coder/pretty" - "github.com/coder/coder/v2/cli/cliui" "github.com/coder/coder/v2/codersdk" + "github.com/coder/pretty" "github.com/coder/serpent" ) diff --git a/cli/version.go b/cli/version.go index c8a4968135..479f95802e 100644 --- a/cli/version.go +++ b/cli/version.go @@ -5,11 +5,10 @@ import ( "strings" "time" - "github.com/coder/pretty" - "github.com/coder/serpent" - "github.com/coder/coder/v2/buildinfo" "github.com/coder/coder/v2/cli/cliui" + "github.com/coder/pretty" + "github.com/coder/serpent" ) // versionInfo wraps the stuff we get from buildinfo so that it's diff --git a/cli/vpndaemon_darwin.go b/cli/vpndaemon_darwin.go index b9cf7f0c5f..175dc24ec2 100644 --- a/cli/vpndaemon_darwin.go +++ b/cli/vpndaemon_darwin.go @@ -6,7 +6,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/vpn" "github.com/coder/serpent" ) diff --git a/cli/vpndaemon_windows.go b/cli/vpndaemon_windows.go index e7a66a174c..2fa540e156 100644 --- a/cli/vpndaemon_windows.go +++ b/cli/vpndaemon_windows.go @@ -7,7 +7,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/sloghuman" - "github.com/coder/coder/v2/vpn" "github.com/coder/serpent" ) diff --git a/cli/vscodessh.go b/cli/vscodessh.go index 8cc5aee3dd..eb91950f0a 100644 --- a/cli/vscodessh.go +++ b/cli/vscodessh.go @@ -16,7 +16,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/sloghuman" - "github.com/coder/coder/v2/cli/cliui" "github.com/coder/coder/v2/cli/cliutil" "github.com/coder/coder/v2/codersdk" diff --git a/coderd/agentapi/api.go b/coderd/agentapi/api.go index 486136ab74..57c2a24b62 100644 --- a/coderd/agentapi/api.go +++ b/coderd/agentapi/api.go @@ -16,7 +16,6 @@ import ( "tailscale.com/tailcfg" "cdr.dev/slog/v3" - agentproto "github.com/coder/coder/v2/agent/proto" "github.com/coder/coder/v2/coderd/agentapi/resourcesmonitor" "github.com/coder/coder/v2/coderd/appearance" diff --git a/coderd/agentapi/apps.go b/coderd/agentapi/apps.go index 9369383836..b3d93259e7 100644 --- a/coderd/agentapi/apps.go +++ b/coderd/agentapi/apps.go @@ -7,7 +7,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - agentproto "github.com/coder/coder/v2/agent/proto" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/wspubsub" diff --git a/coderd/agentapi/boundary_logs.go b/coderd/agentapi/boundary_logs.go index 2fe23f2472..cea5a900cb 100644 --- a/coderd/agentapi/boundary_logs.go +++ b/coderd/agentapi/boundary_logs.go @@ -7,7 +7,6 @@ import ( "github.com/google/uuid" "cdr.dev/slog/v3" - agentproto "github.com/coder/coder/v2/agent/proto" ) diff --git a/coderd/agentapi/connectionlog.go b/coderd/agentapi/connectionlog.go index da1333b8b7..1b3ba652d6 100644 --- a/coderd/agentapi/connectionlog.go +++ b/coderd/agentapi/connectionlog.go @@ -10,7 +10,6 @@ import ( "google.golang.org/protobuf/types/known/emptypb" "cdr.dev/slog/v3" - agentproto "github.com/coder/coder/v2/agent/proto" "github.com/coder/coder/v2/coderd/connectionlog" "github.com/coder/coder/v2/coderd/database" diff --git a/coderd/agentapi/lifecycle.go b/coderd/agentapi/lifecycle.go index 128a7c06eb..06d3097187 100644 --- a/coderd/agentapi/lifecycle.go +++ b/coderd/agentapi/lifecycle.go @@ -12,7 +12,6 @@ import ( "google.golang.org/protobuf/types/known/timestamppb" "cdr.dev/slog/v3" - agentproto "github.com/coder/coder/v2/agent/proto" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbtime" diff --git a/coderd/agentapi/logs.go b/coderd/agentapi/logs.go index eb351bed2e..443099d7d5 100644 --- a/coderd/agentapi/logs.go +++ b/coderd/agentapi/logs.go @@ -8,7 +8,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - agentproto "github.com/coder/coder/v2/agent/proto" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbtime" diff --git a/coderd/agentapi/metadata.go b/coderd/agentapi/metadata.go index 49c1b8510c..ca2708092c 100644 --- a/coderd/agentapi/metadata.go +++ b/coderd/agentapi/metadata.go @@ -10,7 +10,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - agentproto "github.com/coder/coder/v2/agent/proto" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" diff --git a/coderd/agentapi/resources_monitoring.go b/coderd/agentapi/resources_monitoring.go index c4d3c5d62c..a7e40907c9 100644 --- a/coderd/agentapi/resources_monitoring.go +++ b/coderd/agentapi/resources_monitoring.go @@ -8,12 +8,10 @@ import ( "sync" "time" + "github.com/google/uuid" "golang.org/x/xerrors" "cdr.dev/slog/v3" - - "github.com/google/uuid" - "github.com/coder/coder/v2/agent/proto" "github.com/coder/coder/v2/coderd/agentapi/resourcesmonitor" "github.com/coder/coder/v2/coderd/database" diff --git a/coderd/agentapi/stats.go b/coderd/agentapi/stats.go index e13824d619..b75adc1c30 100644 --- a/coderd/agentapi/stats.go +++ b/coderd/agentapi/stats.go @@ -8,7 +8,6 @@ import ( "google.golang.org/protobuf/types/known/durationpb" "cdr.dev/slog/v3" - agentproto "github.com/coder/coder/v2/agent/proto" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" diff --git a/coderd/agentapi/subagent.go b/coderd/agentapi/subagent.go index bf32316ca2..a3f71ccb8a 100644 --- a/coderd/agentapi/subagent.go +++ b/coderd/agentapi/subagent.go @@ -14,14 +14,12 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - - "github.com/coder/quartz" - agentproto "github.com/coder/coder/v2/agent/proto" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/provisioner" + "github.com/coder/quartz" ) type SubAgentAPI struct { diff --git a/coderd/agentapi/subagent_test.go b/coderd/agentapi/subagent_test.go index 1918fb2ff7..732bc157e9 100644 --- a/coderd/agentapi/subagent_test.go +++ b/coderd/agentapi/subagent_test.go @@ -14,7 +14,6 @@ import ( "github.com/stretchr/testify/require" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/agent/proto" "github.com/coder/coder/v2/coderd/agentapi" "github.com/coder/coder/v2/coderd/database" diff --git a/coderd/aitasks.go b/coderd/aitasks.go index a99653945f..8023917f68 100644 --- a/coderd/aitasks.go +++ b/coderd/aitasks.go @@ -15,8 +15,6 @@ import ( "github.com/google/uuid" "golang.org/x/xerrors" - "github.com/coder/coder/v2/coderd/taskname" - aiagentapi "github.com/coder/agentapi-sdk-go" "github.com/coder/coder/v2/coderd/audit" "github.com/coder/coder/v2/coderd/database" @@ -27,6 +25,7 @@ import ( "github.com/coder/coder/v2/coderd/rbac" "github.com/coder/coder/v2/coderd/rbac/policy" "github.com/coder/coder/v2/coderd/searchquery" + "github.com/coder/coder/v2/coderd/taskname" "github.com/coder/coder/v2/coderd/util/ptr" "github.com/coder/coder/v2/codersdk" ) diff --git a/coderd/apikey.go b/coderd/apikey.go index 1944898f0c..3354124be3 100644 --- a/coderd/apikey.go +++ b/coderd/apikey.go @@ -13,7 +13,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/apikey" "github.com/coder/coder/v2/coderd/audit" "github.com/coder/coder/v2/coderd/database" diff --git a/coderd/audit.go b/coderd/audit.go index b3e492f7e4..f1fd7668f7 100644 --- a/coderd/audit.go +++ b/coderd/audit.go @@ -16,7 +16,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/audit" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/db2sdk" diff --git a/coderd/audit/request.go b/coderd/audit/request.go index 279d57737f..0c9a4bc4a2 100644 --- a/coderd/audit/request.go +++ b/coderd/audit/request.go @@ -15,7 +15,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbtime" "github.com/coder/coder/v2/coderd/httpmw" diff --git a/coderd/audit_test.go b/coderd/audit_test.go index 2bbda9f545..721e133fc7 100644 --- a/coderd/audit_test.go +++ b/coderd/audit_test.go @@ -12,7 +12,6 @@ import ( "github.com/stretchr/testify/require" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/coderd/audit" "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/coderd/database" diff --git a/coderd/authorize.go b/coderd/authorize.go index f1290912f2..563b772d5f 100644 --- a/coderd/authorize.go +++ b/coderd/authorize.go @@ -8,7 +8,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/httpapi" "github.com/coder/coder/v2/coderd/httpmw" "github.com/coder/coder/v2/coderd/rbac" diff --git a/coderd/autobuild/lifecycle_executor.go b/coderd/autobuild/lifecycle_executor.go index 794ff9fd55..c3a5873dbf 100644 --- a/coderd/autobuild/lifecycle_executor.go +++ b/coderd/autobuild/lifecycle_executor.go @@ -19,17 +19,15 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - - "github.com/coder/coder/v2/coderd/files" - "github.com/coder/coder/v2/coderd/pproflabel" - "github.com/coder/coder/v2/coderd/audit" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" "github.com/coder/coder/v2/coderd/database/dbtime" "github.com/coder/coder/v2/coderd/database/provisionerjobs" "github.com/coder/coder/v2/coderd/database/pubsub" + "github.com/coder/coder/v2/coderd/files" "github.com/coder/coder/v2/coderd/notifications" + "github.com/coder/coder/v2/coderd/pproflabel" "github.com/coder/coder/v2/coderd/provisionerdserver" "github.com/coder/coder/v2/coderd/schedule" "github.com/coder/coder/v2/coderd/wsbuilder" diff --git a/coderd/autobuild/lifecycle_executor_test.go b/coderd/autobuild/lifecycle_executor_test.go index 46def42d90..22a7a8c7f9 100644 --- a/coderd/autobuild/lifecycle_executor_test.go +++ b/coderd/autobuild/lifecycle_executor_test.go @@ -7,12 +7,6 @@ import ( "testing" "time" - "github.com/coder/coder/v2/coderd/database/dbgen" - "github.com/coder/coder/v2/coderd/database/pubsub" - "github.com/coder/coder/v2/coderd/provisionerdserver" - "github.com/coder/coder/v2/coderd/rbac" - "github.com/coder/quartz" - "github.com/google/uuid" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -20,14 +14,17 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/coderd/autobuild" "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" + "github.com/coder/coder/v2/coderd/database/dbgen" "github.com/coder/coder/v2/coderd/database/dbtestutil" + "github.com/coder/coder/v2/coderd/database/pubsub" "github.com/coder/coder/v2/coderd/notifications" "github.com/coder/coder/v2/coderd/notifications/notificationstest" + "github.com/coder/coder/v2/coderd/provisionerdserver" + "github.com/coder/coder/v2/coderd/rbac" "github.com/coder/coder/v2/coderd/schedule" "github.com/coder/coder/v2/coderd/schedule/cron" "github.com/coder/coder/v2/coderd/util/ptr" @@ -35,6 +32,7 @@ import ( "github.com/coder/coder/v2/provisioner/echo" "github.com/coder/coder/v2/provisionersdk/proto" "github.com/coder/coder/v2/testutil" + "github.com/coder/quartz" ) func TestMain(m *testing.M) { diff --git a/coderd/coderd.go b/coderd/coderd.go index 932f9c729e..607b7f0ea1 100644 --- a/coderd/coderd.go +++ b/coderd/coderd.go @@ -21,12 +21,6 @@ import ( "sync/atomic" "time" - "github.com/coder/coder/v2/coderd/oauth2provider" - "github.com/coder/coder/v2/coderd/pproflabel" - "github.com/coder/coder/v2/coderd/prebuilds" - "github.com/coder/coder/v2/coderd/usage" - "github.com/coder/coder/v2/coderd/wsbuilder" - "github.com/andybalholm/brotli" "github.com/go-chi/chi/v5" "github.com/go-chi/chi/v5/middleware" @@ -46,22 +40,7 @@ import ( "tailscale.com/types/key" "tailscale.com/util/singleflight" - "github.com/coder/coder/v2/provisionerd/proto" - "cdr.dev/slog/v3" - - "github.com/coder/quartz" - "github.com/coder/serpent" - - "github.com/coder/coder/v2/codersdk/drpcsdk" - - "github.com/coder/coder/v2/coderd/cryptokeys" - "github.com/coder/coder/v2/coderd/entitlements" - "github.com/coder/coder/v2/coderd/files" - "github.com/coder/coder/v2/coderd/idpsync" - "github.com/coder/coder/v2/coderd/runtimeconfig" - "github.com/coder/coder/v2/coderd/webpush" - agentproto "github.com/coder/coder/v2/agent/proto" "github.com/coder/coder/v2/buildinfo" _ "github.com/coder/coder/v2/coderd/apidoc" // Used for swagger docs. @@ -69,41 +48,56 @@ import ( "github.com/coder/coder/v2/coderd/audit" "github.com/coder/coder/v2/coderd/awsidentity" "github.com/coder/coder/v2/coderd/connectionlog" + "github.com/coder/coder/v2/coderd/cryptokeys" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" "github.com/coder/coder/v2/coderd/database/dbrollup" "github.com/coder/coder/v2/coderd/database/dbtime" "github.com/coder/coder/v2/coderd/database/pubsub" + "github.com/coder/coder/v2/coderd/entitlements" "github.com/coder/coder/v2/coderd/externalauth" + "github.com/coder/coder/v2/coderd/files" "github.com/coder/coder/v2/coderd/gitsshkey" "github.com/coder/coder/v2/coderd/healthcheck" "github.com/coder/coder/v2/coderd/healthcheck/derphealth" "github.com/coder/coder/v2/coderd/httpapi" "github.com/coder/coder/v2/coderd/httpmw" "github.com/coder/coder/v2/coderd/httpmw/loggermw" + "github.com/coder/coder/v2/coderd/idpsync" "github.com/coder/coder/v2/coderd/metricscache" "github.com/coder/coder/v2/coderd/notifications" + "github.com/coder/coder/v2/coderd/oauth2provider" "github.com/coder/coder/v2/coderd/portsharing" + "github.com/coder/coder/v2/coderd/pproflabel" + "github.com/coder/coder/v2/coderd/prebuilds" "github.com/coder/coder/v2/coderd/prometheusmetrics" "github.com/coder/coder/v2/coderd/provisionerdserver" "github.com/coder/coder/v2/coderd/proxyhealth" "github.com/coder/coder/v2/coderd/rbac" "github.com/coder/coder/v2/coderd/rbac/policy" "github.com/coder/coder/v2/coderd/rbac/rolestore" + "github.com/coder/coder/v2/coderd/runtimeconfig" "github.com/coder/coder/v2/coderd/schedule" "github.com/coder/coder/v2/coderd/telemetry" "github.com/coder/coder/v2/coderd/tracing" "github.com/coder/coder/v2/coderd/updatecheck" + "github.com/coder/coder/v2/coderd/usage" "github.com/coder/coder/v2/coderd/util/slice" + "github.com/coder/coder/v2/coderd/webpush" "github.com/coder/coder/v2/coderd/workspaceapps" "github.com/coder/coder/v2/coderd/workspaceapps/appurl" "github.com/coder/coder/v2/coderd/workspacestats" + "github.com/coder/coder/v2/coderd/wsbuilder" "github.com/coder/coder/v2/codersdk" + "github.com/coder/coder/v2/codersdk/drpcsdk" "github.com/coder/coder/v2/codersdk/healthsdk" sharedhttpmw "github.com/coder/coder/v2/httpmw" + "github.com/coder/coder/v2/provisionerd/proto" "github.com/coder/coder/v2/provisionersdk" "github.com/coder/coder/v2/site" "github.com/coder/coder/v2/tailnet" + "github.com/coder/quartz" + "github.com/coder/serpent" ) // We must only ever instantiate one httpSwagger.Handler because of a data race diff --git a/coderd/coderd_test.go b/coderd/coderd_test.go index 4608a4aad9..c77ddf50a5 100644 --- a/coderd/coderd_test.go +++ b/coderd/coderd_test.go @@ -19,17 +19,16 @@ import ( "go.uber.org/goleak" "tailscale.com/tailcfg" - "github.com/coder/coder/v2/coderd/database" - "github.com/coder/coder/v2/coderd/database/dbfake" - "github.com/coder/coder/v2/codersdk/workspacesdk" - "github.com/coder/coder/v2/provisionersdk/proto" - "github.com/coder/coder/v2/agent/agenttest" "github.com/coder/coder/v2/buildinfo" "github.com/coder/coder/v2/coderd" "github.com/coder/coder/v2/coderd/coderdtest" + "github.com/coder/coder/v2/coderd/database" + "github.com/coder/coder/v2/coderd/database/dbfake" "github.com/coder/coder/v2/codersdk" + "github.com/coder/coder/v2/codersdk/workspacesdk" "github.com/coder/coder/v2/provisioner/echo" + "github.com/coder/coder/v2/provisionersdk/proto" "github.com/coder/coder/v2/tailnet" tailnetproto "github.com/coder/coder/v2/tailnet/proto" "github.com/coder/coder/v2/testutil" diff --git a/coderd/coderdtest/coderdtest.go b/coderd/coderdtest/coderdtest.go index 9cb3a5c912..a82663dea8 100644 --- a/coderd/coderdtest/coderdtest.go +++ b/coderd/coderdtest/coderdtest.go @@ -53,13 +53,7 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/sloghuman" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/archive" - "github.com/coder/coder/v2/coderd/files" - "github.com/coder/coder/v2/coderd/provisionerdserver" - "github.com/coder/coder/v2/coderd/wsbuilder" - "github.com/coder/quartz" - "github.com/coder/coder/v2/coderd" "github.com/coder/coder/v2/coderd/audit" "github.com/coder/coder/v2/coderd/autobuild" @@ -73,11 +67,13 @@ import ( "github.com/coder/coder/v2/coderd/database/dbtestutil" "github.com/coder/coder/v2/coderd/database/pubsub" "github.com/coder/coder/v2/coderd/externalauth" + "github.com/coder/coder/v2/coderd/files" "github.com/coder/coder/v2/coderd/gitsshkey" "github.com/coder/coder/v2/coderd/httpmw" "github.com/coder/coder/v2/coderd/jobreaper" "github.com/coder/coder/v2/coderd/notifications" "github.com/coder/coder/v2/coderd/notifications/notificationstest" + "github.com/coder/coder/v2/coderd/provisionerdserver" "github.com/coder/coder/v2/coderd/rbac" "github.com/coder/coder/v2/coderd/rbac/policy" "github.com/coder/coder/v2/coderd/runtimeconfig" @@ -89,6 +85,7 @@ import ( "github.com/coder/coder/v2/coderd/workspaceapps" "github.com/coder/coder/v2/coderd/workspaceapps/appurl" "github.com/coder/coder/v2/coderd/workspacestats" + "github.com/coder/coder/v2/coderd/wsbuilder" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/codersdk/agentsdk" "github.com/coder/coder/v2/codersdk/drpcsdk" @@ -101,6 +98,7 @@ import ( sdkproto "github.com/coder/coder/v2/provisionersdk/proto" "github.com/coder/coder/v2/tailnet" "github.com/coder/coder/v2/testutil" + "github.com/coder/quartz" ) const defaultTestDaemonName = "test-daemon" diff --git a/coderd/coderdtest/oidctest/idp.go b/coderd/coderdtest/oidctest/idp.go index 8e80311be7..5f6a8587dd 100644 --- a/coderd/coderdtest/oidctest/idp.go +++ b/coderd/coderdtest/oidctest/idp.go @@ -37,7 +37,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/coderd" "github.com/coder/coder/v2/coderd/externalauth" "github.com/coder/coder/v2/coderd/httpapi" diff --git a/coderd/coderdtest/oidctest/idp_test.go b/coderd/coderdtest/oidctest/idp_test.go index 043b60ae2f..622dd7b013 100644 --- a/coderd/coderdtest/oidctest/idp_test.go +++ b/coderd/coderdtest/oidctest/idp_test.go @@ -7,13 +7,12 @@ import ( "testing" "time" + "github.com/coreos/go-oidc/v3/oidc" "github.com/golang-jwt/jwt/v4" "github.com/stretchr/testify/assert" - "golang.org/x/xerrors" - - "github.com/coreos/go-oidc/v3/oidc" "github.com/stretchr/testify/require" "golang.org/x/oauth2" + "golang.org/x/xerrors" "github.com/coder/coder/v2/coderd" "github.com/coder/coder/v2/coderd/coderdtest/oidctest" diff --git a/coderd/cryptokeys/cache.go b/coderd/cryptokeys/cache.go index e72b8c6bc0..de40324df1 100644 --- a/coderd/cryptokeys/cache.go +++ b/coderd/cryptokeys/cache.go @@ -12,7 +12,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" "github.com/coder/coder/v2/codersdk" diff --git a/coderd/cryptokeys/rotate.go b/coderd/cryptokeys/rotate.go index 0d7807bf60..e768d53273 100644 --- a/coderd/cryptokeys/rotate.go +++ b/coderd/cryptokeys/rotate.go @@ -10,7 +10,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" "github.com/coder/coder/v2/coderd/database/dbtime" diff --git a/coderd/csp.go b/coderd/csp.go index 819df9faaa..2c6c189b37 100644 --- a/coderd/csp.go +++ b/coderd/csp.go @@ -4,10 +4,9 @@ import ( "encoding/json" "net/http" + "cdr.dev/slog/v3" "github.com/coder/coder/v2/coderd/httpapi" "github.com/coder/coder/v2/codersdk" - - "cdr.dev/slog/v3" ) type cspViolation struct { diff --git a/coderd/database/db2sdk/db2sdk.go b/coderd/database/db2sdk/db2sdk.go index 8126ea435e..ef9180aa6f 100644 --- a/coderd/database/db2sdk/db2sdk.go +++ b/coderd/database/db2sdk/db2sdk.go @@ -17,8 +17,6 @@ import ( "golang.org/x/xerrors" "tailscale.com/tailcfg" - previewtypes "github.com/coder/preview/types" - agentproto "github.com/coder/coder/v2/agent/proto" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/rbac" @@ -30,6 +28,7 @@ import ( "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/provisionersdk/proto" "github.com/coder/coder/v2/tailnet" + previewtypes "github.com/coder/preview/types" ) // List is a helper function to reduce boilerplate when converting slices of diff --git a/coderd/database/dbauthz/customroles_test.go b/coderd/database/dbauthz/customroles_test.go index b54d176eb7..52b905a04f 100644 --- a/coderd/database/dbauthz/customroles_test.go +++ b/coderd/database/dbauthz/customroles_test.go @@ -8,7 +8,6 @@ import ( "github.com/stretchr/testify/require" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/db2sdk" diff --git a/coderd/database/dbauthz/dbauthz_test.go b/coderd/database/dbauthz/dbauthz_test.go index ad705b5dc8..2921704894 100644 --- a/coderd/database/dbauthz/dbauthz_test.go +++ b/coderd/database/dbauthz/dbauthz_test.go @@ -20,7 +20,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/db2sdk" diff --git a/coderd/database/dbauthz/groupsauth_test.go b/coderd/database/dbauthz/groupsauth_test.go index ce789fed2e..ae5cf650fd 100644 --- a/coderd/database/dbauthz/groupsauth_test.go +++ b/coderd/database/dbauthz/groupsauth_test.go @@ -9,7 +9,6 @@ import ( "github.com/stretchr/testify/require" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" diff --git a/coderd/database/dbauthz/setup_test.go b/coderd/database/dbauthz/setup_test.go index 909c89e159..aaead40d00 100644 --- a/coderd/database/dbauthz/setup_test.go +++ b/coderd/database/dbauthz/setup_test.go @@ -21,7 +21,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" diff --git a/coderd/database/dbfake/dbfake.go b/coderd/database/dbfake/dbfake.go index ce72d74d79..78783d78cf 100644 --- a/coderd/database/dbfake/dbfake.go +++ b/coderd/database/dbfake/dbfake.go @@ -14,7 +14,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" "github.com/coder/coder/v2/coderd/database/dbgen" diff --git a/coderd/database/dbgen/dbgen.go b/coderd/database/dbgen/dbgen.go index 6700054808..5906cc308b 100644 --- a/coderd/database/dbgen/dbgen.go +++ b/coderd/database/dbgen/dbgen.go @@ -14,13 +14,12 @@ import ( "testing" "time" - "cdr.dev/slog/v3" - "github.com/google/uuid" "github.com/sqlc-dev/pqtype" "github.com/stretchr/testify/require" "golang.org/x/xerrors" + "cdr.dev/slog/v3" "github.com/coder/coder/v2/coderd/apikey" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/db2sdk" diff --git a/coderd/database/dbmetrics/dbmetrics.go b/coderd/database/dbmetrics/dbmetrics.go index 22fa67adce..1166c07ce0 100644 --- a/coderd/database/dbmetrics/dbmetrics.go +++ b/coderd/database/dbmetrics/dbmetrics.go @@ -9,7 +9,6 @@ import ( "github.com/prometheus/client_golang/prometheus" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/database" ) diff --git a/coderd/database/dbmetrics/dbmetrics_test.go b/coderd/database/dbmetrics/dbmetrics_test.go index 83ae412a79..739e019cca 100644 --- a/coderd/database/dbmetrics/dbmetrics_test.go +++ b/coderd/database/dbmetrics/dbmetrics_test.go @@ -10,7 +10,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/sloghuman" - "github.com/coder/coder/v2/coderd/coderdtest/promhelp" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbmetrics" diff --git a/coderd/database/dbpurge/dbpurge.go b/coderd/database/dbpurge/dbpurge.go index 9b4ff9ced8..e650aefbc8 100644 --- a/coderd/database/dbpurge/dbpurge.go +++ b/coderd/database/dbpurge/dbpurge.go @@ -5,12 +5,10 @@ import ( "io" "time" + "github.com/prometheus/client_golang/prometheus" "golang.org/x/xerrors" - "github.com/prometheus/client_golang/prometheus" - "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" "github.com/coder/coder/v2/coderd/database/dbtime" diff --git a/coderd/database/dbpurge/dbpurge_test.go b/coderd/database/dbpurge/dbpurge_test.go index 891115d4bb..2fd084988b 100644 --- a/coderd/database/dbpurge/dbpurge_test.go +++ b/coderd/database/dbpurge/dbpurge_test.go @@ -21,7 +21,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/coderd/coderdtest/promhelp" "github.com/coder/coder/v2/coderd/database" diff --git a/coderd/database/dbrollup/dbrollup.go b/coderd/database/dbrollup/dbrollup.go index 6f75310e47..b21e7b99a9 100644 --- a/coderd/database/dbrollup/dbrollup.go +++ b/coderd/database/dbrollup/dbrollup.go @@ -8,7 +8,6 @@ import ( "golang.org/x/sync/errgroup" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" ) diff --git a/coderd/database/dbrollup/dbrollup_test.go b/coderd/database/dbrollup/dbrollup_test.go index f210139843..ebcb6852a3 100644 --- a/coderd/database/dbrollup/dbrollup_test.go +++ b/coderd/database/dbrollup/dbrollup_test.go @@ -12,7 +12,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbgen" "github.com/coder/coder/v2/coderd/database/dbrollup" diff --git a/coderd/database/dbtestutil/cleaner.go b/coderd/database/dbtestutil/cleaner.go index 2843b45334..6d9a2bbc87 100644 --- a/coderd/database/dbtestutil/cleaner.go +++ b/coderd/database/dbtestutil/cleaner.go @@ -15,7 +15,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/sloghuman" - "github.com/coder/retry" ) diff --git a/coderd/database/dbtestutil/db.go b/coderd/database/dbtestutil/db.go index 13079c5d44..6179b26ead 100644 --- a/coderd/database/dbtestutil/db.go +++ b/coderd/database/dbtestutil/db.go @@ -18,7 +18,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/pubsub" "github.com/coder/coder/v2/testutil" diff --git a/coderd/database/pubsub/pubsub.go b/coderd/database/pubsub/pubsub.go index 75f3e352a3..d227063ba8 100644 --- a/coderd/database/pubsub/pubsub.go +++ b/coderd/database/pubsub/pubsub.go @@ -15,9 +15,8 @@ import ( "github.com/prometheus/client_golang/prometheus" "golang.org/x/xerrors" - "github.com/coder/coder/v2/coderd/database" - "cdr.dev/slog/v3" + "github.com/coder/coder/v2/coderd/database" ) // Listener represents a pubsub handler. diff --git a/coderd/database/pubsub/pubsub_linux_test.go b/coderd/database/pubsub/pubsub_linux_test.go index a8c0bf42ea..990c4e8241 100644 --- a/coderd/database/pubsub/pubsub_linux_test.go +++ b/coderd/database/pubsub/pubsub_linux_test.go @@ -18,7 +18,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/sloghuman" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/coderd/database/dbtestutil" "github.com/coder/coder/v2/coderd/database/pubsub" "github.com/coder/coder/v2/coderd/database/pubsub/psmock" diff --git a/coderd/database/pubsub/pubsub_test.go b/coderd/database/pubsub/pubsub_test.go index d42718c519..1ee2801bd4 100644 --- a/coderd/database/pubsub/pubsub_test.go +++ b/coderd/database/pubsub/pubsub_test.go @@ -12,7 +12,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/coderd/database/dbtestutil" "github.com/coder/coder/v2/coderd/database/pubsub" "github.com/coder/coder/v2/testutil" diff --git a/coderd/database/pubsub/watchdog.go b/coderd/database/pubsub/watchdog.go index 677c228473..82a1e8ffab 100644 --- a/coderd/database/pubsub/watchdog.go +++ b/coderd/database/pubsub/watchdog.go @@ -8,7 +8,6 @@ import ( "time" "cdr.dev/slog/v3" - "github.com/coder/quartz" ) diff --git a/coderd/database/pubsub/watchdog_test.go b/coderd/database/pubsub/watchdog_test.go index 9ffc3b2f1f..5569291222 100644 --- a/coderd/database/pubsub/watchdog_test.go +++ b/coderd/database/pubsub/watchdog_test.go @@ -8,7 +8,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/coderd/database/pubsub" "github.com/coder/coder/v2/testutil" "github.com/coder/quartz" diff --git a/coderd/database/querier_test.go b/coderd/database/querier_test.go index 74fed24c0e..9086a032dc 100644 --- a/coderd/database/querier_test.go +++ b/coderd/database/querier_test.go @@ -19,7 +19,6 @@ import ( "github.com/stretchr/testify/require" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/db2sdk" diff --git a/coderd/debug.go b/coderd/debug.go index cb7ee14936..4fe96f0b83 100644 --- a/coderd/debug.go +++ b/coderd/debug.go @@ -14,7 +14,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/audit" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/httpapi" diff --git a/coderd/debug_test.go b/coderd/debug_test.go index 80d5b804cc..63021dcb38 100644 --- a/coderd/debug_test.go +++ b/coderd/debug_test.go @@ -13,7 +13,6 @@ import ( "github.com/stretchr/testify/require" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/codersdk/healthsdk" "github.com/coder/coder/v2/testutil" diff --git a/coderd/devtunnel/tunnel.go b/coderd/devtunnel/tunnel.go index 718132f3cf..8671b40071 100644 --- a/coderd/devtunnel/tunnel.go +++ b/coderd/devtunnel/tunnel.go @@ -15,7 +15,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/cli/cliui" "github.com/coder/coder/v2/cryptorand" "github.com/coder/pretty" diff --git a/coderd/dynamicparameters/render.go b/coderd/dynamicparameters/render.go index 562517b6db..aa2fc04bd8 100644 --- a/coderd/dynamicparameters/render.go +++ b/coderd/dynamicparameters/render.go @@ -9,6 +9,7 @@ import ( "time" "github.com/google/uuid" + "github.com/hashicorp/hcl/v2" "github.com/zclconf/go-cty/cty" "golang.org/x/xerrors" @@ -18,8 +19,6 @@ import ( "github.com/coder/coder/v2/coderd/files" "github.com/coder/preview" previewtypes "github.com/coder/preview/types" - - "github.com/hashicorp/hcl/v2" ) // Renderer is able to execute and evaluate terraform with the given inputs. diff --git a/coderd/dynamicparameters/tags_internal_test.go b/coderd/dynamicparameters/tags_internal_test.go index 2636996520..f975b2744f 100644 --- a/coderd/dynamicparameters/tags_internal_test.go +++ b/coderd/dynamicparameters/tags_internal_test.go @@ -11,9 +11,8 @@ import ( "github.com/stretchr/testify/require" archivefs "github.com/coder/coder/v2/archive/fs" - "github.com/coder/preview" - "github.com/coder/coder/v2/testutil" + "github.com/coder/preview" ) func Test_DynamicWorkspaceTagDefaultsFromFile(t *testing.T) { diff --git a/coderd/externalauth/externalauth.go b/coderd/externalauth/externalauth.go index 2957efd698..c4e2aa8241 100644 --- a/coderd/externalauth/externalauth.go +++ b/coderd/externalauth/externalauth.go @@ -15,12 +15,11 @@ import ( "time" "github.com/dustin/go-humanize" - "golang.org/x/oauth2" - "golang.org/x/xerrors" - "github.com/google/go-github/v43/github" "github.com/sqlc-dev/pqtype" + "golang.org/x/oauth2" xgithub "golang.org/x/oauth2/github" + "golang.org/x/xerrors" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbtime" diff --git a/coderd/files.go b/coderd/files.go index c30dc49b96..bf1f613993 100644 --- a/coderd/files.go +++ b/coderd/files.go @@ -16,7 +16,6 @@ import ( "github.com/google/uuid" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/archive" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbtime" diff --git a/coderd/files/cache_test.go b/coderd/files/cache_test.go index ece4f40cde..b6618a129e 100644 --- a/coderd/files/cache_test.go +++ b/coderd/files/cache_test.go @@ -15,7 +15,6 @@ import ( "golang.org/x/sync/errgroup" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/coderd/coderdtest/promhelp" "github.com/coder/coder/v2/coderd/database" diff --git a/coderd/gitsshkey/gitsshkey.go b/coderd/gitsshkey/gitsshkey.go index 5afc80be79..2d14013845 100644 --- a/coderd/gitsshkey/gitsshkey.go +++ b/coderd/gitsshkey/gitsshkey.go @@ -12,11 +12,10 @@ import ( "encoding/pem" "flag" "io" + insecurerand "math/rand" "strings" "time" - insecurerand "math/rand" - "golang.org/x/crypto/ssh" "golang.org/x/xerrors" ) diff --git a/coderd/healthcheck/health/model_test.go b/coderd/healthcheck/health/model_test.go index 2ff51652f3..886caae0d8 100644 --- a/coderd/healthcheck/health/model_test.go +++ b/coderd/healthcheck/health/model_test.go @@ -3,9 +3,9 @@ package health_test import ( "testing" - "github.com/coder/coder/v2/coderd/healthcheck/health" - "github.com/stretchr/testify/assert" + + "github.com/coder/coder/v2/coderd/healthcheck/health" ) func Test_MessageURL(t *testing.T) { diff --git a/coderd/healthcheck/workspaceproxy_internal_test.go b/coderd/healthcheck/workspaceproxy_internal_test.go index be367ee206..aca882fa41 100644 --- a/coderd/healthcheck/workspaceproxy_internal_test.go +++ b/coderd/healthcheck/workspaceproxy_internal_test.go @@ -4,11 +4,11 @@ import ( "fmt" "testing" - "github.com/coder/coder/v2/coderd/healthcheck/health" - "github.com/coder/coder/v2/coderd/util/ptr" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/coder/coder/v2/coderd/healthcheck/health" + "github.com/coder/coder/v2/coderd/util/ptr" ) func Test_WorkspaceProxyReport_appendErrors(t *testing.T) { diff --git a/coderd/httpapi/httpapi.go b/coderd/httpapi/httpapi.go index 15b27434f2..84a5a7b32d 100644 --- a/coderd/httpapi/httpapi.go +++ b/coderd/httpapi/httpapi.go @@ -16,12 +16,11 @@ import ( "github.com/go-playground/validator/v10" "golang.org/x/xerrors" - "github.com/coder/websocket" - "github.com/coder/websocket/wsjson" - "github.com/coder/coder/v2/coderd/httpapi/httpapiconstraints" "github.com/coder/coder/v2/coderd/tracing" "github.com/coder/coder/v2/codersdk" + "github.com/coder/websocket" + "github.com/coder/websocket/wsjson" ) var Validate *validator.Validate diff --git a/coderd/httpapi/websocket.go b/coderd/httpapi/websocket.go index 072b87bcbc..397d7b94ab 100644 --- a/coderd/httpapi/websocket.go +++ b/coderd/httpapi/websocket.go @@ -8,7 +8,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/websocket" ) diff --git a/coderd/httpmw/apikey.go b/coderd/httpmw/apikey.go index d0e326eb90..32e0d54cee 100644 --- a/coderd/httpmw/apikey.go +++ b/coderd/httpmw/apikey.go @@ -18,7 +18,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/apikey" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" diff --git a/coderd/httpmw/clitelemetry.go b/coderd/httpmw/clitelemetry.go index ade5b668d2..59eb8ea1d4 100644 --- a/coderd/httpmw/clitelemetry.go +++ b/coderd/httpmw/clitelemetry.go @@ -11,7 +11,6 @@ import ( "tailscale.com/tstime/rate" "cdr.dev/slog/v3" - clitelemetry "github.com/coder/coder/v2/cli/telemetry" "github.com/coder/coder/v2/coderd/telemetry" "github.com/coder/coder/v2/codersdk" diff --git a/coderd/httpmw/loggermw/logger.go b/coderd/httpmw/loggermw/logger.go index 324547cab6..94c681cf22 100644 --- a/coderd/httpmw/loggermw/logger.go +++ b/coderd/httpmw/loggermw/logger.go @@ -12,7 +12,6 @@ import ( "github.com/go-chi/chi/v5" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/httpapi" "github.com/coder/coder/v2/coderd/tracing" ) diff --git a/coderd/httpmw/loggermw/logger_full.go b/coderd/httpmw/loggermw/logger_full.go index bfea76a3a9..663c3db661 100644 --- a/coderd/httpmw/loggermw/logger_full.go +++ b/coderd/httpmw/loggermw/logger_full.go @@ -8,7 +8,6 @@ import ( "time" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/rbac" ) diff --git a/coderd/httpmw/loggermw/logger_internal_test.go b/coderd/httpmw/loggermw/logger_internal_test.go index d114f5fe45..150a773c5c 100644 --- a/coderd/httpmw/loggermw/logger_internal_test.go +++ b/coderd/httpmw/loggermw/logger_internal_test.go @@ -16,7 +16,6 @@ import ( "github.com/stretchr/testify/require" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/rbac" "github.com/coder/coder/v2/coderd/tracing" "github.com/coder/coder/v2/testutil" diff --git a/coderd/httpmw/prometheus.go b/coderd/httpmw/prometheus.go index 7ace256182..1823edde11 100644 --- a/coderd/httpmw/prometheus.go +++ b/coderd/httpmw/prometheus.go @@ -7,12 +7,11 @@ import ( "time" "github.com/go-chi/chi/v5" + "github.com/prometheus/client_golang/prometheus" + "github.com/prometheus/client_golang/prometheus/promauto" "github.com/coder/coder/v2/coderd/httpapi" "github.com/coder/coder/v2/coderd/tracing" - - "github.com/prometheus/client_golang/prometheus" - "github.com/prometheus/client_golang/prometheus/promauto" ) func Prometheus(register prometheus.Registerer) func(http.Handler) http.Handler { diff --git a/coderd/httpmw/taskparam.go b/coderd/httpmw/taskparam.go index 3ce285bbdc..00235600b8 100644 --- a/coderd/httpmw/taskparam.go +++ b/coderd/httpmw/taskparam.go @@ -11,7 +11,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/httpapi" "github.com/coder/coder/v2/coderd/httpmw/loggermw" diff --git a/coderd/httpmw/workspaceagentparam.go b/coderd/httpmw/workspaceagentparam.go index 00f04770fe..38f572c434 100644 --- a/coderd/httpmw/workspaceagentparam.go +++ b/coderd/httpmw/workspaceagentparam.go @@ -7,7 +7,6 @@ import ( "github.com/go-chi/chi/v5" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/httpapi" "github.com/coder/coder/v2/coderd/httpmw/loggermw" diff --git a/coderd/httpmw/workspaceagentparam_test.go b/coderd/httpmw/workspaceagentparam_test.go index 5710cbd885..30f8fc46ef 100644 --- a/coderd/httpmw/workspaceagentparam_test.go +++ b/coderd/httpmw/workspaceagentparam_test.go @@ -12,7 +12,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" diff --git a/coderd/httpmw/workspaceparam.go b/coderd/httpmw/workspaceparam.go index 2a53f62e07..49810206e7 100644 --- a/coderd/httpmw/workspaceparam.go +++ b/coderd/httpmw/workspaceparam.go @@ -10,7 +10,6 @@ import ( "github.com/google/uuid" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/httpapi" "github.com/coder/coder/v2/coderd/httpmw/loggermw" diff --git a/coderd/idpsync/group.go b/coderd/idpsync/group.go index c50f53053f..f8875b9d17 100644 --- a/coderd/idpsync/group.go +++ b/coderd/idpsync/group.go @@ -11,7 +11,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/db2sdk" "github.com/coder/coder/v2/coderd/database/dbauthz" diff --git a/coderd/idpsync/group_test.go b/coderd/idpsync/group_test.go index 6412027951..d9c6ddbc01 100644 --- a/coderd/idpsync/group_test.go +++ b/coderd/idpsync/group_test.go @@ -13,7 +13,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/db2sdk" diff --git a/coderd/idpsync/idpsync.go b/coderd/idpsync/idpsync.go index afc21218be..cc9994855c 100644 --- a/coderd/idpsync/idpsync.go +++ b/coderd/idpsync/idpsync.go @@ -11,7 +11,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/httpapi" "github.com/coder/coder/v2/coderd/runtimeconfig" diff --git a/coderd/idpsync/organization.go b/coderd/idpsync/organization.go index 60bb12bbee..18d18dfd64 100644 --- a/coderd/idpsync/organization.go +++ b/coderd/idpsync/organization.go @@ -10,7 +10,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/db2sdk" "github.com/coder/coder/v2/coderd/database/dbauthz" diff --git a/coderd/idpsync/organizations_test.go b/coderd/idpsync/organizations_test.go index ab56975bbd..02f3768585 100644 --- a/coderd/idpsync/organizations_test.go +++ b/coderd/idpsync/organizations_test.go @@ -10,7 +10,6 @@ import ( "github.com/stretchr/testify/require" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/db2sdk" "github.com/coder/coder/v2/coderd/database/dbfake" diff --git a/coderd/idpsync/role.go b/coderd/idpsync/role.go index 22e46b8dd4..230622e3fb 100644 --- a/coderd/idpsync/role.go +++ b/coderd/idpsync/role.go @@ -10,7 +10,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" "github.com/coder/coder/v2/coderd/rbac" diff --git a/coderd/idpsync/role_test.go b/coderd/idpsync/role_test.go index cda69e22d6..08e25789dd 100644 --- a/coderd/idpsync/role_test.go +++ b/coderd/idpsync/role_test.go @@ -12,7 +12,6 @@ import ( "go.uber.org/mock/gomock" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" "github.com/coder/coder/v2/coderd/database/dbgen" diff --git a/coderd/inboxnotifications.go b/coderd/inboxnotifications.go index 2c29a119f1..6c35e33dc7 100644 --- a/coderd/inboxnotifications.go +++ b/coderd/inboxnotifications.go @@ -11,7 +11,6 @@ import ( "github.com/google/uuid" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbtime" "github.com/coder/coder/v2/coderd/httpapi" diff --git a/coderd/insights_test.go b/coderd/insights_test.go index 2bd324b9b7..09850e4d57 100644 --- a/coderd/insights_test.go +++ b/coderd/insights_test.go @@ -19,7 +19,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/agent/agenttest" agentproto "github.com/coder/coder/v2/agent/proto" "github.com/coder/coder/v2/coderd/coderdtest" diff --git a/coderd/jobreaper/detector.go b/coderd/jobreaper/detector.go index a075df3e4e..a24d18d7e3 100644 --- a/coderd/jobreaper/detector.go +++ b/coderd/jobreaper/detector.go @@ -7,12 +7,10 @@ import ( "fmt" //#nosec // this is only used for shuffling an array to pick random jobs to unhang "time" + "github.com/google/uuid" "golang.org/x/xerrors" - "github.com/google/uuid" - "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" "github.com/coder/coder/v2/coderd/database/dbtime" diff --git a/coderd/jobreaper/detector_test.go b/coderd/jobreaper/detector_test.go index a81e4ccba4..5d12ac34fc 100644 --- a/coderd/jobreaper/detector_test.go +++ b/coderd/jobreaper/detector_test.go @@ -15,7 +15,6 @@ import ( "go.uber.org/goleak" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" diff --git a/coderd/mcp/mcp.go b/coderd/mcp/mcp.go index b80d1de4a4..1400b1e61b 100644 --- a/coderd/mcp/mcp.go +++ b/coderd/mcp/mcp.go @@ -13,7 +13,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/buildinfo" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/codersdk/toolsdk" diff --git a/coderd/mcp_http.go b/coderd/mcp_http.go index 02cfc1958e..859222b400 100644 --- a/coderd/mcp_http.go +++ b/coderd/mcp_http.go @@ -5,7 +5,6 @@ import ( "net/http" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/httpapi" "github.com/coder/coder/v2/coderd/httpmw" "github.com/coder/coder/v2/coderd/mcp" diff --git a/coderd/metricscache/metricscache.go b/coderd/metricscache/metricscache.go index fc876ba3aa..43cda28ceb 100644 --- a/coderd/metricscache/metricscache.go +++ b/coderd/metricscache/metricscache.go @@ -11,7 +11,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" "github.com/coder/coder/v2/coderd/database/dbtime" diff --git a/coderd/metricscache/metricscache_test.go b/coderd/metricscache/metricscache_test.go index 901330fce6..f730dcc240 100644 --- a/coderd/metricscache/metricscache_test.go +++ b/coderd/metricscache/metricscache_test.go @@ -13,7 +13,6 @@ import ( "github.com/stretchr/testify/require" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" "github.com/coder/coder/v2/coderd/database/dbgen" diff --git a/coderd/notifications.go b/coderd/notifications.go index 40ca249a3b..fd57946dbf 100644 --- a/coderd/notifications.go +++ b/coderd/notifications.go @@ -10,7 +10,6 @@ import ( "github.com/google/uuid" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/audit" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" diff --git a/coderd/notifications/dispatch/inbox.go b/coderd/notifications/dispatch/inbox.go index b49b44948a..e877938356 100644 --- a/coderd/notifications/dispatch/inbox.go +++ b/coderd/notifications/dispatch/inbox.go @@ -5,12 +5,10 @@ import ( "encoding/json" "text/template" + "github.com/google/uuid" "golang.org/x/xerrors" "cdr.dev/slog/v3" - - "github.com/google/uuid" - "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbtime" "github.com/coder/coder/v2/coderd/database/pubsub" diff --git a/coderd/notifications/dispatch/inbox_test.go b/coderd/notifications/dispatch/inbox_test.go index 31de1d0944..bccfec9a44 100644 --- a/coderd/notifications/dispatch/inbox_test.go +++ b/coderd/notifications/dispatch/inbox_test.go @@ -4,12 +4,11 @@ import ( "context" "testing" - "cdr.dev/slog/v3" - "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/google/uuid" "github.com/stretchr/testify/require" + "cdr.dev/slog/v3" + "cdr.dev/slog/v3/sloggers/slogtest" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbgen" "github.com/coder/coder/v2/coderd/database/dbtestutil" diff --git a/coderd/notifications/dispatch/smtp.go b/coderd/notifications/dispatch/smtp.go index 54c39d6894..066065ba68 100644 --- a/coderd/notifications/dispatch/smtp.go +++ b/coderd/notifications/dispatch/smtp.go @@ -26,7 +26,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/notifications/render" "github.com/coder/coder/v2/coderd/notifications/types" markdown "github.com/coder/coder/v2/coderd/render" diff --git a/coderd/notifications/dispatch/smtp_test.go b/coderd/notifications/dispatch/smtp_test.go index cbb22742d3..7b6e5ebc2d 100644 --- a/coderd/notifications/dispatch/smtp_test.go +++ b/coderd/notifications/dispatch/smtp_test.go @@ -16,14 +16,12 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/slogtest" - - "github.com/coder/serpent" - "github.com/coder/coder/v2/coderd/notifications/dispatch" "github.com/coder/coder/v2/coderd/notifications/dispatch/smtptest" "github.com/coder/coder/v2/coderd/notifications/types" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/testutil" + "github.com/coder/serpent" ) func TestMain(m *testing.M) { diff --git a/coderd/notifications/dispatch/webhook.go b/coderd/notifications/dispatch/webhook.go index 6e0c4dcd86..7be193644b 100644 --- a/coderd/notifications/dispatch/webhook.go +++ b/coderd/notifications/dispatch/webhook.go @@ -14,7 +14,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/notifications/types" markdown "github.com/coder/coder/v2/coderd/render" "github.com/coder/coder/v2/codersdk" diff --git a/coderd/notifications/dispatch/webhook_test.go b/coderd/notifications/dispatch/webhook_test.go index c161265c0b..ebd41569f4 100644 --- a/coderd/notifications/dispatch/webhook_test.go +++ b/coderd/notifications/dispatch/webhook_test.go @@ -16,13 +16,11 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/slogtest" - - "github.com/coder/serpent" - "github.com/coder/coder/v2/coderd/notifications/dispatch" "github.com/coder/coder/v2/coderd/notifications/types" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/testutil" + "github.com/coder/serpent" ) func TestWebhook(t *testing.T) { diff --git a/coderd/notifications/enqueuer.go b/coderd/notifications/enqueuer.go index 461067c2cd..86751c55f8 100644 --- a/coderd/notifications/enqueuer.go +++ b/coderd/notifications/enqueuer.go @@ -12,14 +12,12 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - - "github.com/coder/quartz" - "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbtime" "github.com/coder/coder/v2/coderd/notifications/render" "github.com/coder/coder/v2/coderd/notifications/types" "github.com/coder/coder/v2/codersdk" + "github.com/coder/quartz" ) var ( diff --git a/coderd/notifications/manager.go b/coderd/notifications/manager.go index f789d13780..f65fc3ff7f 100644 --- a/coderd/notifications/manager.go +++ b/coderd/notifications/manager.go @@ -11,7 +11,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/pubsub" "github.com/coder/coder/v2/coderd/notifications/dispatch" diff --git a/coderd/notifications/manager_test.go b/coderd/notifications/manager_test.go index 30af0c88b8..19a457dd8c 100644 --- a/coderd/notifications/manager_test.go +++ b/coderd/notifications/manager_test.go @@ -13,9 +13,6 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/xerrors" - "github.com/coder/quartz" - "github.com/coder/serpent" - "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" "github.com/coder/coder/v2/coderd/database/dbgen" @@ -24,6 +21,8 @@ import ( "github.com/coder/coder/v2/coderd/notifications/dispatch" "github.com/coder/coder/v2/coderd/notifications/types" "github.com/coder/coder/v2/testutil" + "github.com/coder/quartz" + "github.com/coder/serpent" ) func TestBufferedUpdates(t *testing.T) { diff --git a/coderd/notifications/metrics_test.go b/coderd/notifications/metrics_test.go index 975a6db0dd..e9856601c1 100644 --- a/coderd/notifications/metrics_test.go +++ b/coderd/notifications/metrics_test.go @@ -17,9 +17,6 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/coder/quartz" - "github.com/coder/serpent" - "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" "github.com/coder/coder/v2/coderd/database/dbtestutil" @@ -27,6 +24,8 @@ import ( "github.com/coder/coder/v2/coderd/notifications/dispatch" "github.com/coder/coder/v2/coderd/notifications/types" "github.com/coder/coder/v2/testutil" + "github.com/coder/quartz" + "github.com/coder/serpent" ) func TestMetrics(t *testing.T) { diff --git a/coderd/notifications/notifications_test.go b/coderd/notifications/notifications_test.go index a6a9a98ae2..d70fa7456d 100644 --- a/coderd/notifications/notifications_test.go +++ b/coderd/notifications/notifications_test.go @@ -36,10 +36,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/sloghuman" - - "github.com/coder/quartz" - "github.com/coder/serpent" - "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" @@ -53,6 +49,8 @@ import ( "github.com/coder/coder/v2/coderd/util/syncmap" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/testutil" + "github.com/coder/quartz" + "github.com/coder/serpent" ) // updateGoldenFiles is a flag that can be set to update golden files. diff --git a/coderd/notifications/notifier.go b/coderd/notifications/notifier.go index 330c14437b..391c7c9bdb 100644 --- a/coderd/notifications/notifier.go +++ b/coderd/notifications/notifier.go @@ -11,16 +11,14 @@ import ( "golang.org/x/sync/errgroup" "golang.org/x/xerrors" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbtime" "github.com/coder/coder/v2/coderd/notifications/dispatch" "github.com/coder/coder/v2/coderd/notifications/render" "github.com/coder/coder/v2/coderd/notifications/types" "github.com/coder/coder/v2/codersdk" "github.com/coder/quartz" - - "cdr.dev/slog/v3" - - "github.com/coder/coder/v2/coderd/database" ) const ( diff --git a/coderd/notifications/render/gotmpl_test.go b/coderd/notifications/render/gotmpl_test.go index c49cab7b99..2ed76d2100 100644 --- a/coderd/notifications/render/gotmpl_test.go +++ b/coderd/notifications/render/gotmpl_test.go @@ -6,7 +6,6 @@ import ( "github.com/stretchr/testify/require" "github.com/coder/coder/v2/coderd/notifications/render" - "github.com/coder/coder/v2/coderd/notifications/types" ) diff --git a/coderd/notifications/reports/generator.go b/coderd/notifications/reports/generator.go index 2fe3352ddb..a9b3367a0d 100644 --- a/coderd/notifications/reports/generator.go +++ b/coderd/notifications/reports/generator.go @@ -12,15 +12,13 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - - "github.com/coder/quartz" - "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" "github.com/coder/coder/v2/coderd/database/dbtime" "github.com/coder/coder/v2/coderd/notifications" "github.com/coder/coder/v2/coderd/util/slice" "github.com/coder/coder/v2/codersdk" + "github.com/coder/quartz" ) const ( diff --git a/coderd/notifications/reports/generator_internal_test.go b/coderd/notifications/reports/generator_internal_test.go index c82a7d8c7b..5cc7b3e9df 100644 --- a/coderd/notifications/reports/generator_internal_test.go +++ b/coderd/notifications/reports/generator_internal_test.go @@ -13,9 +13,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/slogtest" - - "github.com/coder/quartz" - "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" @@ -25,6 +22,7 @@ import ( "github.com/coder/coder/v2/coderd/notifications" "github.com/coder/coder/v2/coderd/notifications/notificationstest" "github.com/coder/coder/v2/coderd/rbac" + "github.com/coder/quartz" ) const dayDuration = 24 * time.Hour diff --git a/coderd/notifications/utils_test.go b/coderd/notifications/utils_test.go index ce071cc6a0..c2750d4354 100644 --- a/coderd/notifications/utils_test.go +++ b/coderd/notifications/utils_test.go @@ -11,14 +11,13 @@ import ( "github.com/google/uuid" "github.com/prometheus/client_golang/prometheus" - "github.com/coder/serpent" - "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbgen" "github.com/coder/coder/v2/coderd/notifications" "github.com/coder/coder/v2/coderd/notifications/dispatch" "github.com/coder/coder/v2/coderd/notifications/types" "github.com/coder/coder/v2/codersdk" + "github.com/coder/serpent" ) func defaultNotificationsConfig(method database.NotificationMethod) codersdk.NotificationsConfig { diff --git a/coderd/notifications_test.go b/coderd/notifications_test.go index f1a081b3e8..f49ec8e0ad 100644 --- a/coderd/notifications_test.go +++ b/coderd/notifications_test.go @@ -7,8 +7,6 @@ import ( "github.com/stretchr/testify/require" - "github.com/coder/serpent" - "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbgen" @@ -16,6 +14,7 @@ import ( "github.com/coder/coder/v2/coderd/notifications/notificationstest" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/testutil" + "github.com/coder/serpent" ) func createOpts(t *testing.T) *coderdtest.Options { diff --git a/coderd/oauth2provider/app_secrets.go b/coderd/oauth2provider/app_secrets.go index aa3cd6617b..723761aa9e 100644 --- a/coderd/oauth2provider/app_secrets.go +++ b/coderd/oauth2provider/app_secrets.go @@ -6,7 +6,6 @@ import ( "github.com/google/uuid" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/audit" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbtime" diff --git a/coderd/oauth2provider/apps.go b/coderd/oauth2provider/apps.go index c40e3a847d..c94b5fc538 100644 --- a/coderd/oauth2provider/apps.go +++ b/coderd/oauth2provider/apps.go @@ -10,7 +10,6 @@ import ( "github.com/sqlc-dev/pqtype" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/audit" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/db2sdk" diff --git a/coderd/oauth2provider/registration.go b/coderd/oauth2provider/registration.go index b52a354d1e..0fbb656e1d 100644 --- a/coderd/oauth2provider/registration.go +++ b/coderd/oauth2provider/registration.go @@ -15,9 +15,7 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/apikey" - "github.com/coder/coder/v2/coderd/audit" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" diff --git a/coderd/oauth2provider/revoke.go b/coderd/oauth2provider/revoke.go index 2fcb0856ae..6c553423d1 100644 --- a/coderd/oauth2provider/revoke.go +++ b/coderd/oauth2provider/revoke.go @@ -9,12 +9,10 @@ import ( "net/http" "strings" + "github.com/google/uuid" "golang.org/x/xerrors" - "github.com/google/uuid" - "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/apikey" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" diff --git a/coderd/prebuilds/claim.go b/coderd/prebuilds/claim.go index cf072dc82c..de7dc308e0 100644 --- a/coderd/prebuilds/claim.go +++ b/coderd/prebuilds/claim.go @@ -8,7 +8,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/database/pubsub" "github.com/coder/coder/v2/codersdk/agentsdk" ) diff --git a/coderd/prebuilds/claim_test.go b/coderd/prebuilds/claim_test.go index 5549920bf4..fc7df39038 100644 --- a/coderd/prebuilds/claim_test.go +++ b/coderd/prebuilds/claim_test.go @@ -10,7 +10,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/coderd/database/pubsub" "github.com/coder/coder/v2/coderd/prebuilds" "github.com/coder/coder/v2/codersdk/agentsdk" diff --git a/coderd/prebuilds/global_snapshot.go b/coderd/prebuilds/global_snapshot.go index a46c589bd5..3ee98f7ac0 100644 --- a/coderd/prebuilds/global_snapshot.go +++ b/coderd/prebuilds/global_snapshot.go @@ -7,7 +7,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/util/slice" "github.com/coder/quartz" diff --git a/coderd/prebuilds/preset_snapshot.go b/coderd/prebuilds/preset_snapshot.go index fc3244c31d..544d1e3ca4 100644 --- a/coderd/prebuilds/preset_snapshot.go +++ b/coderd/prebuilds/preset_snapshot.go @@ -10,13 +10,10 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - - "github.com/coder/quartz" - - tf_provider_helpers "github.com/coder/terraform-provider-coder/v2/provider/helpers" - "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/schedule/cron" + "github.com/coder/quartz" + tf_provider_helpers "github.com/coder/terraform-provider-coder/v2/provider/helpers" ) // ActionType represents the type of action needed to reconcile prebuilds. diff --git a/coderd/prometheusmetrics/aggregator.go b/coderd/prometheusmetrics/aggregator.go index ba1e595804..028e1b00fb 100644 --- a/coderd/prometheusmetrics/aggregator.go +++ b/coderd/prometheusmetrics/aggregator.go @@ -12,11 +12,9 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - agentproto "github.com/coder/coder/v2/agent/proto" "github.com/coder/coder/v2/coderd/agentmetrics" "github.com/coder/coder/v2/coderd/pproflabel" - "github.com/coder/quartz" ) diff --git a/coderd/prometheusmetrics/aggregator_internal_test.go b/coderd/prometheusmetrics/aggregator_internal_test.go index bd723b0c70..08e3f41b9a 100644 --- a/coderd/prometheusmetrics/aggregator_internal_test.go +++ b/coderd/prometheusmetrics/aggregator_internal_test.go @@ -8,7 +8,6 @@ import ( "github.com/stretchr/testify/require" "cdr.dev/slog/v3/sloggers/slogtest" - agentproto "github.com/coder/coder/v2/agent/proto" "github.com/coder/coder/v2/coderd/agentmetrics" "github.com/coder/coder/v2/testutil" diff --git a/coderd/prometheusmetrics/aggregator_test.go b/coderd/prometheusmetrics/aggregator_test.go index d69344fba8..829cbca3ba 100644 --- a/coderd/prometheusmetrics/aggregator_test.go +++ b/coderd/prometheusmetrics/aggregator_test.go @@ -15,10 +15,8 @@ import ( "github.com/stretchr/testify/require" "cdr.dev/slog/v3/sloggers/slogtest" - - "github.com/coder/coder/v2/coderd/agentmetrics" - agentproto "github.com/coder/coder/v2/agent/proto" + "github.com/coder/coder/v2/coderd/agentmetrics" "github.com/coder/coder/v2/coderd/prometheusmetrics" "github.com/coder/coder/v2/cryptorand" "github.com/coder/coder/v2/testutil" diff --git a/coderd/prometheusmetrics/insights/metricscollector.go b/coderd/prometheusmetrics/insights/metricscollector.go index a88456d3ff..dc1d3e5363 100644 --- a/coderd/prometheusmetrics/insights/metricscollector.go +++ b/coderd/prometheusmetrics/insights/metricscollector.go @@ -12,7 +12,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/pproflabel" "github.com/coder/coder/v2/coderd/util/slice" diff --git a/coderd/prometheusmetrics/insights/metricscollector_test.go b/coderd/prometheusmetrics/insights/metricscollector_test.go index c0ba76c5bd..7c6a80d780 100644 --- a/coderd/prometheusmetrics/insights/metricscollector_test.go +++ b/coderd/prometheusmetrics/insights/metricscollector_test.go @@ -18,7 +18,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/slogtest" - agentproto "github.com/coder/coder/v2/agent/proto" "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/coderd/database" diff --git a/coderd/prometheusmetrics/prometheusmetrics.go b/coderd/prometheusmetrics/prometheusmetrics.go index 4b1b2d2d4a..f1962cc287 100644 --- a/coderd/prometheusmetrics/prometheusmetrics.go +++ b/coderd/prometheusmetrics/prometheusmetrics.go @@ -16,7 +16,6 @@ import ( "tailscale.com/tailcfg" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/agentmetrics" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" diff --git a/coderd/prometheusmetrics/prometheusmetrics_test.go b/coderd/prometheusmetrics/prometheusmetrics_test.go index b629160ca4..d762dd76f1 100644 --- a/coderd/prometheusmetrics/prometheusmetrics_test.go +++ b/coderd/prometheusmetrics/prometheusmetrics_test.go @@ -20,7 +20,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/slogtest" - agentproto "github.com/coder/coder/v2/agent/proto" "github.com/coder/coder/v2/coderd/agentmetrics" "github.com/coder/coder/v2/coderd/coderdtest" diff --git a/coderd/provisionerdserver/acquirer.go b/coderd/provisionerdserver/acquirer.go index 32deb1978a..adb508de10 100644 --- a/coderd/provisionerdserver/acquirer.go +++ b/coderd/provisionerdserver/acquirer.go @@ -14,7 +14,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbtime" "github.com/coder/coder/v2/coderd/database/provisionerjobs" diff --git a/coderd/provisionerdserver/provisionerdserver.go b/coderd/provisionerdserver/provisionerdserver.go index b7e2d01fb3..5417c9fe20 100644 --- a/coderd/provisionerdserver/provisionerdserver.go +++ b/coderd/provisionerdserver/provisionerdserver.go @@ -28,7 +28,6 @@ import ( protobuf "google.golang.org/protobuf/proto" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/apikey" "github.com/coder/coder/v2/coderd/audit" "github.com/coder/coder/v2/coderd/database" diff --git a/coderd/provisionerdserver/provisionerdserver_test.go b/coderd/provisionerdserver/provisionerdserver_test.go index e280e3b9d1..507a15fcd0 100644 --- a/coderd/provisionerdserver/provisionerdserver_test.go +++ b/coderd/provisionerdserver/provisionerdserver_test.go @@ -26,13 +26,8 @@ import ( "storj.io/drpc" "cdr.dev/slog/v3/sloggers/slogtest" - - "github.com/coder/coder/v2/coderd" - "github.com/coder/coder/v2/coderd/util/ptr" - "github.com/coder/quartz" - "github.com/coder/serpent" - "github.com/coder/coder/v2/buildinfo" + "github.com/coder/coder/v2/coderd" "github.com/coder/coder/v2/coderd/audit" "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/coderd/database" @@ -52,6 +47,7 @@ import ( "github.com/coder/coder/v2/coderd/telemetry" "github.com/coder/coder/v2/coderd/usage" "github.com/coder/coder/v2/coderd/usage/usagetypes" + "github.com/coder/coder/v2/coderd/util/ptr" "github.com/coder/coder/v2/coderd/wspubsub" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/codersdk/agentsdk" @@ -59,6 +55,8 @@ import ( "github.com/coder/coder/v2/provisionersdk" sdkproto "github.com/coder/coder/v2/provisionersdk/proto" "github.com/coder/coder/v2/testutil" + "github.com/coder/quartz" + "github.com/coder/serpent" ) func testTemplateScheduleStore() *atomic.Pointer[schedule.TemplateScheduleStore] { diff --git a/coderd/provisionerjobs.go b/coderd/provisionerjobs.go index 9af195882d..d93571644a 100644 --- a/coderd/provisionerjobs.go +++ b/coderd/provisionerjobs.go @@ -14,7 +14,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/db2sdk" "github.com/coder/coder/v2/coderd/database/dbauthz" diff --git a/coderd/rbac/error_test.go b/coderd/rbac/error_test.go index cd9d319dab..e213e9a5bf 100644 --- a/coderd/rbac/error_test.go +++ b/coderd/rbac/error_test.go @@ -3,10 +3,10 @@ package rbac_test import ( "testing" - "github.com/coder/coder/v2/coderd/rbac" - "github.com/stretchr/testify/require" "golang.org/x/xerrors" + + "github.com/coder/coder/v2/coderd/rbac" ) func TestIsUnauthorizedError(t *testing.T) { diff --git a/coderd/rbac/regosql/acl_mapping_var.go b/coderd/rbac/regosql/acl_mapping_var.go index 301da929ad..5e443ee28a 100644 --- a/coderd/rbac/regosql/acl_mapping_var.go +++ b/coderd/rbac/regosql/acl_mapping_var.go @@ -3,9 +3,8 @@ package regosql import ( "fmt" - "golang.org/x/xerrors" - "github.com/open-policy-agent/opa/ast" + "golang.org/x/xerrors" "github.com/coder/coder/v2/coderd/rbac/regosql/sqltypes" ) diff --git a/coderd/rbac/regosql/sqltypes/variable.go b/coderd/rbac/regosql/sqltypes/variable.go index ed7264d595..f7300af62a 100644 --- a/coderd/rbac/regosql/sqltypes/variable.go +++ b/coderd/rbac/regosql/sqltypes/variable.go @@ -1,9 +1,8 @@ package sqltypes import ( - "golang.org/x/xerrors" - "github.com/open-policy-agent/opa/ast" + "golang.org/x/xerrors" ) type VariableMatcher interface { diff --git a/coderd/rbac/roles.go b/coderd/rbac/roles.go index 91061f1647..8a693d2571 100644 --- a/coderd/rbac/roles.go +++ b/coderd/rbac/roles.go @@ -9,7 +9,6 @@ import ( "github.com/google/uuid" "github.com/open-policy-agent/opa/ast" - "golang.org/x/xerrors" "github.com/coder/coder/v2/coderd/rbac/policy" diff --git a/coderd/rbac/roles_test.go b/coderd/rbac/roles_test.go index 8ea0a9642f..c1cbfd41f9 100644 --- a/coderd/rbac/roles_test.go +++ b/coderd/rbac/roles_test.go @@ -5,13 +5,12 @@ import ( "fmt" "testing" - "github.com/coder/coder/v2/coderd/database" - "github.com/google/uuid" "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/rbac" "github.com/coder/coder/v2/coderd/rbac/policy" ) diff --git a/coderd/rbac/scopes.go b/coderd/rbac/scopes.go index 4e5babba29..dfdc19a3da 100644 --- a/coderd/rbac/scopes.go +++ b/coderd/rbac/scopes.go @@ -7,7 +7,6 @@ import ( "strings" "github.com/google/uuid" - "golang.org/x/xerrors" "github.com/coder/coder/v2/coderd/rbac/policy" diff --git a/coderd/roles.go b/coderd/roles.go index 3814cd36d2..e9c911bc72 100644 --- a/coderd/roles.go +++ b/coderd/roles.go @@ -7,12 +7,11 @@ import ( "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/db2sdk" + "github.com/coder/coder/v2/coderd/httpapi" "github.com/coder/coder/v2/coderd/httpmw" + "github.com/coder/coder/v2/coderd/rbac" "github.com/coder/coder/v2/coderd/rbac/policy" "github.com/coder/coder/v2/codersdk" - - "github.com/coder/coder/v2/coderd/httpapi" - "github.com/coder/coder/v2/coderd/rbac" ) // AssignableSiteRoles returns all site wide roles that can be assigned. diff --git a/coderd/searchquery/search.go b/coderd/searchquery/search.go index 59ec3e0492..d378fb7b7d 100644 --- a/coderd/searchquery/search.go +++ b/coderd/searchquery/search.go @@ -9,7 +9,6 @@ import ( "time" "github.com/google/uuid" - "golang.org/x/xerrors" "github.com/coder/coder/v2/coderd/database" diff --git a/coderd/tailnet.go b/coderd/tailnet.go index 7097967773..6f591835d9 100644 --- a/coderd/tailnet.go +++ b/coderd/tailnet.go @@ -24,7 +24,6 @@ import ( "tailscale.com/tailcfg" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/tracing" "github.com/coder/coder/v2/coderd/workspaceapps" "github.com/coder/coder/v2/coderd/workspaceapps/appurl" diff --git a/coderd/taskname/taskname.go b/coderd/taskname/taskname.go index fca47c03f2..8888468a7e 100644 --- a/coderd/taskname/taskname.go +++ b/coderd/taskname/taskname.go @@ -10,13 +10,12 @@ import ( "regexp" "strings" - "cdr.dev/slog/v3" - "github.com/anthropics/anthropic-sdk-go" anthropicoption "github.com/anthropics/anthropic-sdk-go/option" "github.com/moby/moby/pkg/namesgenerator" "golang.org/x/xerrors" + "cdr.dev/slog/v3" "github.com/coder/aisdk-go" strutil "github.com/coder/coder/v2/coderd/util/strings" "github.com/coder/coder/v2/codersdk" diff --git a/coderd/telemetry/telemetry.go b/coderd/telemetry/telemetry.go index 9ce3b02161..b3df9d1ac0 100644 --- a/coderd/telemetry/telemetry.go +++ b/coderd/telemetry/telemetry.go @@ -28,7 +28,6 @@ import ( "google.golang.org/protobuf/types/known/wrapperspb" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/buildinfo" clitelemetry "github.com/coder/coder/v2/cli/telemetry" "github.com/coder/coder/v2/coderd/database" diff --git a/coderd/templates.go b/coderd/templates.go index dfea621316..8303c3e7fd 100644 --- a/coderd/templates.go +++ b/coderd/templates.go @@ -15,11 +15,9 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - - "github.com/coder/coder/v2/coderd/database/db2sdk" - "github.com/coder/coder/v2/coderd/audit" "github.com/coder/coder/v2/coderd/database" + "github.com/coder/coder/v2/coderd/database/db2sdk" "github.com/coder/coder/v2/coderd/database/dbauthz" "github.com/coder/coder/v2/coderd/database/dbtime" "github.com/coder/coder/v2/coderd/httpapi" diff --git a/coderd/templateversions.go b/coderd/templateversions.go index 0f8c9629b2..6c97a4371b 100644 --- a/coderd/templateversions.go +++ b/coderd/templateversions.go @@ -22,17 +22,14 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - archivefs "github.com/coder/coder/v2/archive/fs" - "github.com/coder/coder/v2/coderd/dynamicparameters" - "github.com/coder/preview" - "github.com/coder/coder/v2/coderd/audit" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/db2sdk" "github.com/coder/coder/v2/coderd/database/dbauthz" "github.com/coder/coder/v2/coderd/database/dbtime" "github.com/coder/coder/v2/coderd/database/provisionerjobs" + "github.com/coder/coder/v2/coderd/dynamicparameters" "github.com/coder/coder/v2/coderd/externalauth" "github.com/coder/coder/v2/coderd/httpapi" "github.com/coder/coder/v2/coderd/httpmw" @@ -45,6 +42,7 @@ import ( "github.com/coder/coder/v2/examples" "github.com/coder/coder/v2/provisioner/terraform/tfparse" "github.com/coder/coder/v2/provisionersdk" + "github.com/coder/preview" ) // @Summary Get template version by ID diff --git a/coderd/tracing/exporter.go b/coderd/tracing/exporter.go index 461066346d..0fe4e55edc 100644 --- a/coderd/tracing/exporter.go +++ b/coderd/tracing/exporter.go @@ -14,12 +14,11 @@ import ( "go.opentelemetry.io/otel/sdk/resource" sdktrace "go.opentelemetry.io/otel/sdk/trace" semconv "go.opentelemetry.io/otel/semconv/v1.14.0" + "golang.org/x/xerrors" + "google.golang.org/grpc/credentials" ddotel "gopkg.in/DataDog/dd-trace-go.v1/ddtrace/opentelemetry" ddtracer "gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer" ddprofiler "gopkg.in/DataDog/dd-trace-go.v1/profiler" - - "golang.org/x/xerrors" - "google.golang.org/grpc/credentials" ) // TracerOpts specifies which telemetry exporters should be configured. diff --git a/coderd/tracing/httpmw_test.go b/coderd/tracing/httpmw_test.go index ba1e2b879c..450bfa78c3 100644 --- a/coderd/tracing/httpmw_test.go +++ b/coderd/tracing/httpmw_test.go @@ -8,11 +8,10 @@ import ( "sync/atomic" "testing" - "go.opentelemetry.io/otel/trace" - "go.opentelemetry.io/otel/trace/noop" - "github.com/go-chi/chi/v5" "github.com/stretchr/testify/require" + "go.opentelemetry.io/otel/trace" + "go.opentelemetry.io/otel/trace/noop" "github.com/coder/coder/v2/coderd/tracing" "github.com/coder/coder/v2/testutil" diff --git a/coderd/tracing/slog_test.go b/coderd/tracing/slog_test.go index 8de4dcee63..04ea03e707 100644 --- a/coderd/tracing/slog_test.go +++ b/coderd/tracing/slog_test.go @@ -7,13 +7,11 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" - "github.com/stretchr/testify/require" - "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/tracing" ) diff --git a/coderd/updatecheck/updatecheck.go b/coderd/updatecheck/updatecheck.go index 209a2aef23..1386ab4d2e 100644 --- a/coderd/updatecheck/updatecheck.go +++ b/coderd/updatecheck/updatecheck.go @@ -18,7 +18,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" ) diff --git a/coderd/updatecheck/updatecheck_test.go b/coderd/updatecheck/updatecheck_test.go index 794c0bc8c7..9878856c19 100644 --- a/coderd/updatecheck/updatecheck_test.go +++ b/coderd/updatecheck/updatecheck_test.go @@ -13,7 +13,6 @@ import ( "go.uber.org/goleak" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/coderd/database/dbtestutil" "github.com/coder/coder/v2/coderd/updatecheck" "github.com/coder/coder/v2/testutil" diff --git a/coderd/userauth.go b/coderd/userauth.go index 2d386d775a..440dcf99d8 100644 --- a/coderd/userauth.go +++ b/coderd/userauth.go @@ -24,26 +24,24 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - - "github.com/coder/coder/v2/coderd/cryptokeys" - "github.com/coder/coder/v2/coderd/idpsync" - "github.com/coder/coder/v2/coderd/jwtutils" - "github.com/coder/coder/v2/coderd/telemetry" - "github.com/coder/coder/v2/coderd/util/ptr" - "github.com/coder/coder/v2/coderd/apikey" "github.com/coder/coder/v2/coderd/audit" + "github.com/coder/coder/v2/coderd/cryptokeys" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" "github.com/coder/coder/v2/coderd/database/dbtime" "github.com/coder/coder/v2/coderd/externalauth" "github.com/coder/coder/v2/coderd/httpapi" "github.com/coder/coder/v2/coderd/httpmw" + "github.com/coder/coder/v2/coderd/idpsync" + "github.com/coder/coder/v2/coderd/jwtutils" "github.com/coder/coder/v2/coderd/notifications" "github.com/coder/coder/v2/coderd/promoauth" "github.com/coder/coder/v2/coderd/rbac" "github.com/coder/coder/v2/coderd/render" + "github.com/coder/coder/v2/coderd/telemetry" "github.com/coder/coder/v2/coderd/userpassword" + "github.com/coder/coder/v2/coderd/util/ptr" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/cryptorand" ) diff --git a/coderd/userauth_test.go b/coderd/userauth_test.go index b13813103e..da63fdea9c 100644 --- a/coderd/userauth_test.go +++ b/coderd/userauth_test.go @@ -29,7 +29,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/coderd" "github.com/coder/coder/v2/coderd/audit" "github.com/coder/coder/v2/coderd/coderdtest" diff --git a/coderd/users.go b/coderd/users.go index 79c4943833..0758642429 100644 --- a/coderd/users.go +++ b/coderd/users.go @@ -13,7 +13,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/audit" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/db2sdk" diff --git a/coderd/users_test.go b/coderd/users_test.go index 4691165930..dd4cb9d8ad 100644 --- a/coderd/users_test.go +++ b/coderd/users_test.go @@ -10,14 +10,6 @@ import ( "testing" "time" - "github.com/coder/serpent" - - "github.com/coder/coder/v2/coderd" - "github.com/coder/coder/v2/coderd/coderdtest/oidctest" - "github.com/coder/coder/v2/coderd/notifications" - "github.com/coder/coder/v2/coderd/notifications/notificationstest" - "github.com/coder/coder/v2/coderd/rbac/policy" - "github.com/golang-jwt/jwt/v4" "github.com/google/uuid" "github.com/stretchr/testify/assert" @@ -25,19 +17,25 @@ import ( "golang.org/x/sync/errgroup" "golang.org/x/xerrors" + "github.com/coder/coder/v2/coderd" "github.com/coder/coder/v2/coderd/audit" "github.com/coder/coder/v2/coderd/coderdtest" + "github.com/coder/coder/v2/coderd/coderdtest/oidctest" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/db2sdk" "github.com/coder/coder/v2/coderd/database/dbauthz" "github.com/coder/coder/v2/coderd/database/dbfake" "github.com/coder/coder/v2/coderd/database/dbgen" "github.com/coder/coder/v2/coderd/database/dbtime" + "github.com/coder/coder/v2/coderd/notifications" + "github.com/coder/coder/v2/coderd/notifications/notificationstest" "github.com/coder/coder/v2/coderd/rbac" + "github.com/coder/coder/v2/coderd/rbac/policy" "github.com/coder/coder/v2/coderd/util/ptr" "github.com/coder/coder/v2/coderd/util/slice" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/testutil" + "github.com/coder/serpent" ) func TestFirstUser(t *testing.T) { diff --git a/coderd/webpush/webpush.go b/coderd/webpush/webpush.go index b98321c0bc..201649f268 100644 --- a/coderd/webpush/webpush.go +++ b/coderd/webpush/webpush.go @@ -16,7 +16,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" "github.com/coder/coder/v2/codersdk" diff --git a/coderd/webpush/webpush_test.go b/coderd/webpush/webpush_test.go index 01b94a894f..bfb2b39c20 100644 --- a/coderd/webpush/webpush_test.go +++ b/coderd/webpush/webpush_test.go @@ -14,7 +14,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbgen" "github.com/coder/coder/v2/coderd/database/dbtestutil" diff --git a/coderd/workspaceagents.go b/coderd/workspaceagents.go index fa65c08b2f..a847519de5 100644 --- a/coderd/workspaceagents.go +++ b/coderd/workspaceagents.go @@ -24,9 +24,6 @@ import ( "tailscale.com/tailcfg" "cdr.dev/slog/v3" - - "github.com/coder/websocket" - "github.com/coder/coder/v2/coderd/agentapi" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/db2sdk" @@ -51,6 +48,7 @@ import ( "github.com/coder/coder/v2/codersdk/wsjson" "github.com/coder/coder/v2/tailnet" "github.com/coder/coder/v2/tailnet/proto" + "github.com/coder/websocket" ) // @Summary Get workspace agent by ID diff --git a/coderd/workspaceagents_internal_test.go b/coderd/workspaceagents_internal_test.go index f353c24beb..c36fcf8698 100644 --- a/coderd/workspaceagents_internal_test.go +++ b/coderd/workspaceagents_internal_test.go @@ -20,7 +20,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbmock" "github.com/coder/coder/v2/coderd/database/dbtime" diff --git a/coderd/workspaceagents_test.go b/coderd/workspaceagents_test.go index 4c831bb75b..497c8c35c6 100644 --- a/coderd/workspaceagents_test.go +++ b/coderd/workspaceagents_test.go @@ -29,10 +29,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/slogtest" - - "github.com/coder/quartz" - "github.com/coder/websocket" - "github.com/coder/coder/v2/agent" "github.com/coder/coder/v2/agent/agentcontainers" "github.com/coder/coder/v2/agent/agentcontainers/acmock" @@ -63,6 +59,8 @@ import ( tailnetproto "github.com/coder/coder/v2/tailnet/proto" "github.com/coder/coder/v2/tailnet/tailnettest" "github.com/coder/coder/v2/testutil" + "github.com/coder/quartz" + "github.com/coder/websocket" ) func TestWorkspaceAgent(t *testing.T) { diff --git a/coderd/workspaceagentsrpc.go b/coderd/workspaceagentsrpc.go index d0d4a9b21a..e2ce6e5fab 100644 --- a/coderd/workspaceagentsrpc.go +++ b/coderd/workspaceagentsrpc.go @@ -15,7 +15,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/agent/proto" "github.com/coder/coder/v2/coderd/agentapi" "github.com/coder/coder/v2/coderd/database" diff --git a/coderd/workspaceapps/db.go b/coderd/workspaceapps/db.go index a1a7f11832..32c736f547 100644 --- a/coderd/workspaceapps/db.go +++ b/coderd/workspaceapps/db.go @@ -17,7 +17,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/connectionlog" "github.com/coder/coder/v2/coderd/cryptokeys" "github.com/coder/coder/v2/coderd/database" diff --git a/coderd/workspaceapps/errors.go b/coderd/workspaceapps/errors.go index 66cd0ff2a3..22115db08d 100644 --- a/coderd/workspaceapps/errors.go +++ b/coderd/workspaceapps/errors.go @@ -7,7 +7,6 @@ import ( "path" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/site" ) diff --git a/coderd/workspaceapps/provider.go b/coderd/workspaceapps/provider.go index 989f34a2c1..5e1cda8156 100644 --- a/coderd/workspaceapps/provider.go +++ b/coderd/workspaceapps/provider.go @@ -7,7 +7,6 @@ import ( "time" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/codersdk" ) diff --git a/coderd/workspaceapps/proxy.go b/coderd/workspaceapps/proxy.go index 148e3a5880..1898ed96f6 100644 --- a/coderd/workspaceapps/proxy.go +++ b/coderd/workspaceapps/proxy.go @@ -19,7 +19,6 @@ import ( "go.opentelemetry.io/otel/trace" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/agent/agentssh" "github.com/coder/coder/v2/coderd/cryptokeys" "github.com/coder/coder/v2/coderd/database/dbtime" diff --git a/coderd/workspaceapps/request.go b/coderd/workspaceapps/request.go index aa90ead2cd..ae421c9095 100644 --- a/coderd/workspaceapps/request.go +++ b/coderd/workspaceapps/request.go @@ -9,9 +9,8 @@ import ( "strconv" "strings" - "golang.org/x/xerrors" - "github.com/google/uuid" + "golang.org/x/xerrors" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/workspaceapps/appurl" diff --git a/coderd/workspaceapps/stats.go b/coderd/workspaceapps/stats.go index 6e9d49a898..0e76cf36d0 100644 --- a/coderd/workspaceapps/stats.go +++ b/coderd/workspaceapps/stats.go @@ -9,7 +9,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/database/dbauthz" "github.com/coder/coder/v2/coderd/database/dbtime" ) diff --git a/coderd/workspaceapps/token_test.go b/coderd/workspaceapps/token_test.go index 94ee128bd9..47bcd7be8d 100644 --- a/coderd/workspaceapps/token_test.go +++ b/coderd/workspaceapps/token_test.go @@ -8,15 +8,13 @@ import ( "time" "github.com/go-jose/go-jose/v4/jwt" - - "github.com/coder/coder/v2/codersdk" - "github.com/coder/coder/v2/testutil" - "github.com/google/uuid" "github.com/stretchr/testify/require" "github.com/coder/coder/v2/coderd/jwtutils" "github.com/coder/coder/v2/coderd/workspaceapps" + "github.com/coder/coder/v2/codersdk" + "github.com/coder/coder/v2/testutil" ) func Test_TokenMatchesRequest(t *testing.T) { diff --git a/coderd/workspacebuilds.go b/coderd/workspacebuilds.go index 1110af6479..409d6567d0 100644 --- a/coderd/workspacebuilds.go +++ b/coderd/workspacebuilds.go @@ -19,7 +19,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/audit" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/db2sdk" diff --git a/coderd/workspacebuilds_test.go b/coderd/workspacebuilds_test.go index 3c473d48b1..9985980936 100644 --- a/coderd/workspacebuilds_test.go +++ b/coderd/workspacebuilds_test.go @@ -21,7 +21,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/coderd/audit" "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/coderd/coderdtest/oidctest" diff --git a/coderd/workspaceresourceauth.go b/coderd/workspaceresourceauth.go index 3642822b18..c8608ea03c 100644 --- a/coderd/workspaceresourceauth.go +++ b/coderd/workspaceresourceauth.go @@ -5,6 +5,8 @@ import ( "fmt" "net/http" + "github.com/mitchellh/mapstructure" + "github.com/coder/coder/v2/coderd/awsidentity" "github.com/coder/coder/v2/coderd/azureidentity" "github.com/coder/coder/v2/coderd/database" @@ -13,8 +15,6 @@ import ( "github.com/coder/coder/v2/coderd/provisionerdserver" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/codersdk/agentsdk" - - "github.com/mitchellh/mapstructure" ) // Azure supports instance identity verification: diff --git a/coderd/workspaces.go b/coderd/workspaces.go index e4dd17f265..504ab72755 100644 --- a/coderd/workspaces.go +++ b/coderd/workspaces.go @@ -18,7 +18,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/agent/proto" "github.com/coder/coder/v2/coderd/audit" "github.com/coder/coder/v2/coderd/database" diff --git a/coderd/workspaces_test.go b/coderd/workspaces_test.go index 19b6e24ff8..6171ea2c78 100644 --- a/coderd/workspaces_test.go +++ b/coderd/workspaces_test.go @@ -18,9 +18,6 @@ import ( "github.com/stretchr/testify/require" "cdr.dev/slog/v3" - - "github.com/coder/terraform-provider-coder/v2/provider" - "github.com/coder/coder/v2/agent/agenttest" "github.com/coder/coder/v2/coderd/audit" "github.com/coder/coder/v2/coderd/coderdtest" @@ -44,6 +41,7 @@ import ( "github.com/coder/coder/v2/provisioner/echo" "github.com/coder/coder/v2/provisionersdk/proto" "github.com/coder/coder/v2/testutil" + "github.com/coder/terraform-provider-coder/v2/provider" ) func TestWorkspace(t *testing.T) { diff --git a/coderd/workspacestats/activitybump.go b/coderd/workspacestats/activitybump.go index cf250bfc44..0cf4767ad9 100644 --- a/coderd/workspacestats/activitybump.go +++ b/coderd/workspacestats/activitybump.go @@ -8,7 +8,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/database" ) diff --git a/coderd/workspacestats/activitybump_test.go b/coderd/workspacestats/activitybump_test.go index 8952d053e3..dec683ca55 100644 --- a/coderd/workspacestats/activitybump_test.go +++ b/coderd/workspacestats/activitybump_test.go @@ -6,6 +6,8 @@ import ( "time" "github.com/google/uuid" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbgen" @@ -14,9 +16,6 @@ import ( "github.com/coder/coder/v2/coderd/util/ptr" "github.com/coder/coder/v2/coderd/workspacestats" "github.com/coder/coder/v2/testutil" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" ) func Test_ActivityBumpWorkspace(t *testing.T) { diff --git a/coderd/workspacestats/batcher.go b/coderd/workspacestats/batcher.go index 2ea4e4d021..847ef562fb 100644 --- a/coderd/workspacestats/batcher.go +++ b/coderd/workspacestats/batcher.go @@ -13,7 +13,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/sloghuman" - agentproto "github.com/coder/coder/v2/agent/proto" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" diff --git a/coderd/workspacestats/batcher_internal_test.go b/coderd/workspacestats/batcher_internal_test.go index 15db0a3c13..48983be561 100644 --- a/coderd/workspacestats/batcher_internal_test.go +++ b/coderd/workspacestats/batcher_internal_test.go @@ -9,15 +9,13 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/slogtest" - - "github.com/coder/coder/v2/codersdk" - agentproto "github.com/coder/coder/v2/agent/proto" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbgen" "github.com/coder/coder/v2/coderd/database/dbtestutil" "github.com/coder/coder/v2/coderd/database/dbtime" "github.com/coder/coder/v2/coderd/database/pubsub" + "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/cryptorand" ) diff --git a/coderd/workspacestats/reporter.go b/coderd/workspacestats/reporter.go index b3c5f37a05..58e9222e92 100644 --- a/coderd/workspacestats/reporter.go +++ b/coderd/workspacestats/reporter.go @@ -10,7 +10,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - agentproto "github.com/coder/coder/v2/agent/proto" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbtime" diff --git a/coderd/workspacestats/tracker.go b/coderd/workspacestats/tracker.go index 7b9f37dbe6..19a8d3f0ce 100644 --- a/coderd/workspacestats/tracker.go +++ b/coderd/workspacestats/tracker.go @@ -11,11 +11,10 @@ import ( "github.com/google/uuid" - "github.com/coder/coder/v2/coderd/database" - "github.com/coder/coder/v2/coderd/database/dbauthz" - "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/sloghuman" + "github.com/coder/coder/v2/coderd/database" + "github.com/coder/coder/v2/coderd/database/dbauthz" ) var DefaultFlushInterval = 60 * time.Second diff --git a/coderd/workspaceupdates.go b/coderd/workspaceupdates.go index 2367d51234..580b25ca3c 100644 --- a/coderd/workspaceupdates.go +++ b/coderd/workspaceupdates.go @@ -9,7 +9,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" "github.com/coder/coder/v2/coderd/database/pubsub" diff --git a/coderd/wsbuilder/wsbuilder.go b/coderd/wsbuilder/wsbuilder.go index 7d388966c9..9bcd310f7b 100644 --- a/coderd/wsbuilder/wsbuilder.go +++ b/coderd/wsbuilder/wsbuilder.go @@ -11,20 +11,9 @@ import ( "net/http" "time" + "github.com/google/uuid" "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hclsyntax" - - "github.com/coder/coder/v2/coderd/dynamicparameters" - "github.com/coder/coder/v2/coderd/files" - "github.com/coder/coder/v2/coderd/prebuilds" - "github.com/coder/coder/v2/coderd/rbac/policy" - "github.com/coder/coder/v2/coderd/util/ptr" - "github.com/coder/coder/v2/provisioner/terraform/tfparse" - "github.com/coder/coder/v2/provisionersdk" - sdkproto "github.com/coder/coder/v2/provisionersdk/proto" - previewtypes "github.com/coder/preview/types" - - "github.com/google/uuid" "github.com/sqlc-dev/pqtype" "golang.org/x/xerrors" @@ -33,11 +22,20 @@ import ( "github.com/coder/coder/v2/coderd/database/db2sdk" "github.com/coder/coder/v2/coderd/database/dbauthz" "github.com/coder/coder/v2/coderd/database/dbtime" + "github.com/coder/coder/v2/coderd/dynamicparameters" + "github.com/coder/coder/v2/coderd/files" "github.com/coder/coder/v2/coderd/httpapi" + "github.com/coder/coder/v2/coderd/prebuilds" "github.com/coder/coder/v2/coderd/provisionerdserver" "github.com/coder/coder/v2/coderd/rbac" + "github.com/coder/coder/v2/coderd/rbac/policy" "github.com/coder/coder/v2/coderd/tracing" + "github.com/coder/coder/v2/coderd/util/ptr" "github.com/coder/coder/v2/codersdk" + "github.com/coder/coder/v2/provisioner/terraform/tfparse" + "github.com/coder/coder/v2/provisionersdk" + sdkproto "github.com/coder/coder/v2/provisionersdk/proto" + previewtypes "github.com/coder/preview/types" ) // Builder encapsulates the business logic of inserting a new workspace build into the database. diff --git a/codersdk/agentsdk/agentsdk.go b/codersdk/agentsdk/agentsdk.go index ab1f46f2c9..0b9168832e 100644 --- a/codersdk/agentsdk/agentsdk.go +++ b/codersdk/agentsdk/agentsdk.go @@ -18,10 +18,6 @@ import ( "tailscale.com/tailcfg" "cdr.dev/slog/v3" - - "github.com/coder/retry" - "github.com/coder/websocket" - "github.com/coder/coder/v2/agent/proto" "github.com/coder/coder/v2/apiversion" "github.com/coder/coder/v2/coderd/httpapi" @@ -29,6 +25,8 @@ import ( "github.com/coder/coder/v2/codersdk/drpcsdk" "github.com/coder/coder/v2/tailnet" tailnetproto "github.com/coder/coder/v2/tailnet/proto" + "github.com/coder/retry" + "github.com/coder/websocket" ) // ExternalLogSourceID is the statically-defined ID of a log-source that diff --git a/codersdk/agentsdk/agentsdk_test.go b/codersdk/agentsdk/agentsdk_test.go index 1b10bcdbed..691fa0e3e7 100644 --- a/codersdk/agentsdk/agentsdk_test.go +++ b/codersdk/agentsdk/agentsdk_test.go @@ -13,7 +13,6 @@ import ( "tailscale.com/tailcfg" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/codersdk/agentsdk" "github.com/coder/coder/v2/testutil" ) diff --git a/codersdk/agentsdk/logs.go b/codersdk/agentsdk/logs.go index f770498c3d..2267c5e970 100644 --- a/codersdk/agentsdk/logs.go +++ b/codersdk/agentsdk/logs.go @@ -9,13 +9,11 @@ import ( "sync" "time" - "google.golang.org/protobuf/types/known/timestamppb" - "github.com/google/uuid" "golang.org/x/xerrors" + "google.golang.org/protobuf/types/known/timestamppb" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/agent/proto" "github.com/coder/coder/v2/codersdk" "github.com/coder/retry" diff --git a/codersdk/client.go b/codersdk/client.go index d6f4a17226..2932e950ed 100644 --- a/codersdk/client.go +++ b/codersdk/client.go @@ -20,10 +20,9 @@ import ( "go.opentelemetry.io/otel/semconv/v1.14.0/httpconv" "golang.org/x/xerrors" + "cdr.dev/slog/v3" "github.com/coder/coder/v2/coderd/tracing" "github.com/coder/websocket" - - "cdr.dev/slog/v3" ) // These cookies are Coder-specific. If a new one is added or changed, the name diff --git a/codersdk/client_internal_test.go b/codersdk/client_internal_test.go index 4b30cede30..08c0928a09 100644 --- a/codersdk/client_internal_test.go +++ b/codersdk/client_internal_test.go @@ -27,7 +27,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/sloghuman" - "github.com/coder/coder/v2/testutil" ) diff --git a/codersdk/deployment.go b/codersdk/deployment.go index 87f5cd06f1..045df953de 100644 --- a/codersdk/deployment.go +++ b/codersdk/deployment.go @@ -14,19 +14,17 @@ import ( "strings" "time" + "github.com/coreos/go-oidc/v3/oidc" "github.com/google/uuid" "golang.org/x/mod/semver" "golang.org/x/text/cases" "golang.org/x/text/language" "golang.org/x/xerrors" - "github.com/coreos/go-oidc/v3/oidc" - - "github.com/coder/serpent" - "github.com/coder/coder/v2/buildinfo" "github.com/coder/coder/v2/coderd/agentmetrics" "github.com/coder/coder/v2/coderd/workspaceapps/appurl" + "github.com/coder/serpent" ) // Entitlement represents whether a feature is licensed. diff --git a/codersdk/deployment_test.go b/codersdk/deployment_test.go index 7407bf40b7..bd3c597dc5 100644 --- a/codersdk/deployment_test.go +++ b/codersdk/deployment_test.go @@ -14,10 +14,9 @@ import ( "github.com/stretchr/testify/require" "gopkg.in/yaml.v3" - "github.com/coder/serpent" - "github.com/coder/coder/v2/coderd/util/ptr" "github.com/coder/coder/v2/codersdk" + "github.com/coder/serpent" ) type exclusion struct { diff --git a/codersdk/templatevariables.go b/codersdk/templatevariables.go index 19c614e796..e8fd37f5fb 100644 --- a/codersdk/templatevariables.go +++ b/codersdk/templatevariables.go @@ -8,11 +8,10 @@ import ( "sort" "strings" - "golang.org/x/xerrors" - "gopkg.in/yaml.v3" - "github.com/hashicorp/hcl/v2/hclparse" "github.com/zclconf/go-cty/cty" + "golang.org/x/xerrors" + "gopkg.in/yaml.v3" ) /** diff --git a/codersdk/toolsdk/bash.go b/codersdk/toolsdk/bash.go index 8d72f090d7..4248d20a0e 100644 --- a/codersdk/toolsdk/bash.go +++ b/codersdk/toolsdk/bash.go @@ -14,7 +14,6 @@ import ( "golang.org/x/xerrors" "github.com/coder/aisdk-go" - "github.com/coder/coder/v2/cli/cliui" "github.com/coder/coder/v2/codersdk" ) diff --git a/codersdk/toolsdk/chatgpt.go b/codersdk/toolsdk/chatgpt.go index c4bf5b5d4c..119715fdfd 100644 --- a/codersdk/toolsdk/chatgpt.go +++ b/codersdk/toolsdk/chatgpt.go @@ -6,9 +6,8 @@ import ( "fmt" "strings" - "golang.org/x/xerrors" - "github.com/google/uuid" + "golang.org/x/xerrors" "github.com/coder/aisdk-go" "github.com/coder/coder/v2/codersdk" diff --git a/codersdk/toolsdk/toolsdk.go b/codersdk/toolsdk/toolsdk.go index 454e014265..cf9fd55752 100644 --- a/codersdk/toolsdk/toolsdk.go +++ b/codersdk/toolsdk/toolsdk.go @@ -15,7 +15,6 @@ import ( "golang.org/x/xerrors" "github.com/coder/aisdk-go" - "github.com/coder/coder/v2/buildinfo" "github.com/coder/coder/v2/cli/cliui" "github.com/coder/coder/v2/coderd/workspaceapps/appurl" diff --git a/codersdk/toolsdk/toolsdk_test.go b/codersdk/toolsdk/toolsdk_test.go index b075cbd73a..df20276998 100644 --- a/codersdk/toolsdk/toolsdk_test.go +++ b/codersdk/toolsdk/toolsdk_test.go @@ -21,9 +21,8 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/goleak" - "github.com/coder/aisdk-go" - agentapi "github.com/coder/agentapi-sdk-go" + "github.com/coder/aisdk-go" "github.com/coder/coder/v2/agent" "github.com/coder/coder/v2/agent/agenttest" "github.com/coder/coder/v2/coderd/coderdtest" diff --git a/codersdk/workspaceproxy.go b/codersdk/workspaceproxy.go index 37e4c4ee34..6c780988aa 100644 --- a/codersdk/workspaceproxy.go +++ b/codersdk/workspaceproxy.go @@ -7,9 +7,8 @@ import ( "net/http" "time" - "golang.org/x/xerrors" - "github.com/google/uuid" + "golang.org/x/xerrors" ) type ProxyHealthStatus string diff --git a/codersdk/workspaces.go b/codersdk/workspaces.go index 64df4155b3..ad29c717a3 100644 --- a/codersdk/workspaces.go +++ b/codersdk/workspaces.go @@ -12,7 +12,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/tracing" ) diff --git a/codersdk/workspacesdk/agentconn.go b/codersdk/workspacesdk/agentconn.go index 92fb988d91..01fc7b98e8 100644 --- a/codersdk/workspacesdk/agentconn.go +++ b/codersdk/workspacesdk/agentconn.go @@ -22,7 +22,6 @@ import ( "tailscale.com/net/speedtest" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/tracing" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/codersdk/healthsdk" diff --git a/codersdk/workspacesdk/dialer.go b/codersdk/workspacesdk/dialer.go index cb2a9dcb9a..4221ba65f5 100644 --- a/codersdk/workspacesdk/dialer.go +++ b/codersdk/workspacesdk/dialer.go @@ -11,13 +11,11 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - - "github.com/coder/websocket" - "github.com/coder/coder/v2/buildinfo" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/tailnet" "github.com/coder/coder/v2/tailnet/proto" + "github.com/coder/websocket" ) var permanentErrorStatuses = []int{ diff --git a/codersdk/workspacesdk/dialer_test.go b/codersdk/workspacesdk/dialer_test.go index 5ada9c5ce4..ed34ff6b43 100644 --- a/codersdk/workspacesdk/dialer_test.go +++ b/codersdk/workspacesdk/dialer_test.go @@ -17,7 +17,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/apiversion" "github.com/coder/coder/v2/coderd/httpapi" "github.com/coder/coder/v2/codersdk" diff --git a/codersdk/workspacesdk/workspacesdk.go b/codersdk/workspacesdk/workspacesdk.go index acf77dbdde..1d383257c8 100644 --- a/codersdk/workspacesdk/workspacesdk.go +++ b/codersdk/workspacesdk/workspacesdk.go @@ -12,20 +12,17 @@ import ( "strconv" "strings" + "github.com/google/uuid" + "golang.org/x/xerrors" "tailscale.com/tailcfg" "tailscale.com/wgengine/capture" - "github.com/google/uuid" - "golang.org/x/xerrors" - "cdr.dev/slog/v3" - - "github.com/coder/quartz" - "github.com/coder/websocket" - "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/tailnet" "github.com/coder/coder/v2/tailnet/proto" + "github.com/coder/quartz" + "github.com/coder/websocket" ) var ErrSkipClose = xerrors.New("skip tailnet close") diff --git a/codersdk/workspacesdk/workspacesdk_test.go b/codersdk/workspacesdk/workspacesdk_test.go index f1158cf903..4ed6947f5b 100644 --- a/codersdk/workspacesdk/workspacesdk_test.go +++ b/codersdk/workspacesdk/workspacesdk_test.go @@ -15,13 +15,12 @@ import ( "tailscale.com/net/tsaddr" "tailscale.com/tailcfg" - "github.com/coder/websocket" - "github.com/coder/coder/v2/coderd/httpapi" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/codersdk/workspacesdk" "github.com/coder/coder/v2/tailnet" "github.com/coder/coder/v2/testutil" + "github.com/coder/websocket" ) func TestWorkspaceRewriteDERPMap(t *testing.T) { diff --git a/codersdk/wsjson/decoder.go b/codersdk/wsjson/decoder.go index ad6e91e96d..60547309ea 100644 --- a/codersdk/wsjson/decoder.go +++ b/codersdk/wsjson/decoder.go @@ -6,7 +6,6 @@ import ( "sync/atomic" "cdr.dev/slog/v3" - "github.com/coder/websocket" ) diff --git a/codersdk/wsjson/stream.go b/codersdk/wsjson/stream.go index 4947c04fdb..c70e0549ba 100644 --- a/codersdk/wsjson/stream.go +++ b/codersdk/wsjson/stream.go @@ -2,7 +2,6 @@ package wsjson import ( "cdr.dev/slog/v3" - "github.com/coder/websocket" ) diff --git a/enterprise/aibridged/aibridged.go b/enterprise/aibridged/aibridged.go index 570ec38a78..b001c4f942 100644 --- a/enterprise/aibridged/aibridged.go +++ b/enterprise/aibridged/aibridged.go @@ -12,7 +12,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/codersdk" "github.com/coder/retry" ) diff --git a/enterprise/aibridged/aibridged_test.go b/enterprise/aibridged/aibridged_test.go index fbc0d90da6..32469c6dfe 100644 --- a/enterprise/aibridged/aibridged_test.go +++ b/enterprise/aibridged/aibridged_test.go @@ -16,7 +16,6 @@ import ( "storj.io/drpc" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/aibridge" agplaibridge "github.com/coder/coder/v2/coderd/aibridge" "github.com/coder/coder/v2/codersdk" diff --git a/enterprise/aibridged/http.go b/enterprise/aibridged/http.go index e89c32f56e..d2a6b1a49f 100644 --- a/enterprise/aibridged/http.go +++ b/enterprise/aibridged/http.go @@ -8,7 +8,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/aibridge" agplaibridge "github.com/coder/coder/v2/coderd/aibridge" "github.com/coder/coder/v2/enterprise/aibridged/proto" diff --git a/enterprise/aibridged/mcp.go b/enterprise/aibridged/mcp.go index 8639207a5e..132139b990 100644 --- a/enterprise/aibridged/mcp.go +++ b/enterprise/aibridged/mcp.go @@ -10,7 +10,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/aibridge/mcp" "github.com/coder/coder/v2/enterprise/aibridged/proto" ) diff --git a/enterprise/aibridged/pool.go b/enterprise/aibridged/pool.go index e62af3a447..978eeffd77 100644 --- a/enterprise/aibridged/pool.go +++ b/enterprise/aibridged/pool.go @@ -13,7 +13,6 @@ import ( "tailscale.com/util/singleflight" "cdr.dev/slog/v3" - "github.com/coder/aibridge" "github.com/coder/aibridge/mcp" "github.com/coder/aibridge/tracing" diff --git a/enterprise/aibridged/pool_test.go b/enterprise/aibridged/pool_test.go index ce7f1e21ae..f99b99d6e0 100644 --- a/enterprise/aibridged/pool_test.go +++ b/enterprise/aibridged/pool_test.go @@ -12,7 +12,6 @@ import ( "go.uber.org/mock/gomock" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/aibridge/mcp" "github.com/coder/aibridge/mcpmock" "github.com/coder/coder/v2/enterprise/aibridged" diff --git a/enterprise/aibridged/translator.go b/enterprise/aibridged/translator.go index cbede0bc72..673fd77e11 100644 --- a/enterprise/aibridged/translator.go +++ b/enterprise/aibridged/translator.go @@ -10,10 +10,9 @@ import ( "google.golang.org/protobuf/types/known/structpb" "google.golang.org/protobuf/types/known/timestamppb" + "github.com/coder/aibridge" "github.com/coder/coder/v2/coderd/util/ptr" "github.com/coder/coder/v2/enterprise/aibridged/proto" - - "github.com/coder/aibridge" ) var _ aibridge.Recorder = &recorderTranslation{} diff --git a/enterprise/aibridgedserver/aibridgedserver.go b/enterprise/aibridgedserver/aibridgedserver.go index 9daf93743a..22b6ffc7b8 100644 --- a/enterprise/aibridgedserver/aibridgedserver.go +++ b/enterprise/aibridgedserver/aibridgedserver.go @@ -15,9 +15,7 @@ import ( "google.golang.org/protobuf/types/known/structpb" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/apikey" - "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" "github.com/coder/coder/v2/coderd/database/dbtime" diff --git a/enterprise/aibridgeproxyd/aibridgeproxyd.go b/enterprise/aibridgeproxyd/aibridgeproxyd.go index bb48c36df6..77ac68d9d0 100644 --- a/enterprise/aibridgeproxyd/aibridgeproxyd.go +++ b/enterprise/aibridgeproxyd/aibridgeproxyd.go @@ -19,7 +19,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/aibridge" ) diff --git a/enterprise/aibridgeproxyd/aibridgeproxyd_test.go b/enterprise/aibridgeproxyd/aibridgeproxyd_test.go index a7f830f056..f9870501e1 100644 --- a/enterprise/aibridgeproxyd/aibridgeproxyd_test.go +++ b/enterprise/aibridgeproxyd/aibridgeproxyd_test.go @@ -25,7 +25,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/enterprise/aibridgeproxyd" "github.com/coder/coder/v2/testutil" ) diff --git a/enterprise/audit/backends/slog.go b/enterprise/audit/backends/slog.go index 6cf6bca7ef..be36968087 100644 --- a/enterprise/audit/backends/slog.go +++ b/enterprise/audit/backends/slog.go @@ -8,7 +8,6 @@ import ( "github.com/sqlc-dev/pqtype" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/enterprise/audit" ) diff --git a/enterprise/audit/backends/slog_test.go b/enterprise/audit/backends/slog_test.go index 90953bdd77..9882b8321d 100644 --- a/enterprise/audit/backends/slog_test.go +++ b/enterprise/audit/backends/slog_test.go @@ -18,7 +18,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/slogjson" - "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/enterprise/audit" "github.com/coder/coder/v2/enterprise/audit/audittest" diff --git a/enterprise/cli/aibridged.go b/enterprise/cli/aibridged.go index 986e8d59df..073ab979ec 100644 --- a/enterprise/cli/aibridged.go +++ b/enterprise/cli/aibridged.go @@ -5,9 +5,8 @@ package cli import ( "context" - "golang.org/x/xerrors" - "github.com/prometheus/client_golang/prometheus" + "golang.org/x/xerrors" "github.com/coder/aibridge" "github.com/coder/coder/v2/coderd/tracing" diff --git a/enterprise/cli/create_test.go b/enterprise/cli/create_test.go index 03d31a14e8..a536f08ef7 100644 --- a/enterprise/cli/create_test.go +++ b/enterprise/cli/create_test.go @@ -9,34 +9,31 @@ import ( "testing" "time" - "github.com/coder/coder/v2/cli" - - "github.com/coder/coder/v2/coderd/wsbuilder" - "github.com/google/uuid" "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/otel/trace/noop" + "github.com/coder/coder/v2/cli" + "github.com/coder/coder/v2/cli/clitest" + "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbtestutil" "github.com/coder/coder/v2/coderd/files" "github.com/coder/coder/v2/coderd/notifications" agplprebuilds "github.com/coder/coder/v2/coderd/prebuilds" - "github.com/coder/coder/v2/enterprise/coderd/prebuilds" - "github.com/coder/coder/v2/provisioner/echo" - "github.com/coder/coder/v2/provisionersdk/proto" - "github.com/coder/coder/v2/testutil" - "github.com/coder/quartz" - - "github.com/coder/coder/v2/cli/clitest" - "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/coderd/rbac" + "github.com/coder/coder/v2/coderd/wsbuilder" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/enterprise/coderd/coderdenttest" "github.com/coder/coder/v2/enterprise/coderd/license" + "github.com/coder/coder/v2/enterprise/coderd/prebuilds" + "github.com/coder/coder/v2/provisioner/echo" + "github.com/coder/coder/v2/provisionersdk/proto" "github.com/coder/coder/v2/pty/ptytest" + "github.com/coder/coder/v2/testutil" + "github.com/coder/quartz" ) func TestEnterpriseCreate(t *testing.T) { diff --git a/enterprise/cli/externalworkspaces.go b/enterprise/cli/externalworkspaces.go index 27d88efa3c..c9029f72e2 100644 --- a/enterprise/cli/externalworkspaces.go +++ b/enterprise/cli/externalworkspaces.go @@ -12,7 +12,6 @@ import ( "github.com/coder/coder/v2/cli/cliui" "github.com/coder/coder/v2/codersdk" "github.com/coder/pretty" - "github.com/coder/serpent" ) diff --git a/enterprise/cli/groupcreate_test.go b/enterprise/cli/groupcreate_test.go index 6f5754ec93..95807a3663 100644 --- a/enterprise/cli/groupcreate_test.go +++ b/enterprise/cli/groupcreate_test.go @@ -6,8 +6,6 @@ import ( "github.com/stretchr/testify/require" - "github.com/coder/pretty" - "github.com/coder/coder/v2/cli/clitest" "github.com/coder/coder/v2/cli/cliui" "github.com/coder/coder/v2/coderd/coderdtest" @@ -16,6 +14,7 @@ import ( "github.com/coder/coder/v2/enterprise/coderd/coderdenttest" "github.com/coder/coder/v2/enterprise/coderd/license" "github.com/coder/coder/v2/pty/ptytest" + "github.com/coder/pretty" ) func TestCreateGroup(t *testing.T) { diff --git a/enterprise/cli/groupdelete_test.go b/enterprise/cli/groupdelete_test.go index 000198adfa..c812751315 100644 --- a/enterprise/cli/groupdelete_test.go +++ b/enterprise/cli/groupdelete_test.go @@ -6,8 +6,6 @@ import ( "github.com/stretchr/testify/require" - "github.com/coder/pretty" - "github.com/coder/coder/v2/cli/clitest" "github.com/coder/coder/v2/cli/cliui" "github.com/coder/coder/v2/coderd/coderdtest" @@ -16,6 +14,7 @@ import ( "github.com/coder/coder/v2/enterprise/coderd/coderdenttest" "github.com/coder/coder/v2/enterprise/coderd/license" "github.com/coder/coder/v2/pty/ptytest" + "github.com/coder/pretty" ) func TestGroupDelete(t *testing.T) { diff --git a/enterprise/cli/groupedit.go b/enterprise/cli/groupedit.go index 5d6a6b5cdb..e7f34f8f86 100644 --- a/enterprise/cli/groupedit.go +++ b/enterprise/cli/groupedit.go @@ -7,11 +7,10 @@ import ( "github.com/google/uuid" "golang.org/x/xerrors" - "github.com/coder/pretty" - agpl "github.com/coder/coder/v2/cli" "github.com/coder/coder/v2/cli/cliui" "github.com/coder/coder/v2/codersdk" + "github.com/coder/pretty" "github.com/coder/serpent" ) diff --git a/enterprise/cli/groupedit_test.go b/enterprise/cli/groupedit_test.go index e6bc8ce86a..2d5c2b3673 100644 --- a/enterprise/cli/groupedit_test.go +++ b/enterprise/cli/groupedit_test.go @@ -6,8 +6,6 @@ import ( "github.com/stretchr/testify/require" - "github.com/coder/pretty" - "github.com/coder/coder/v2/cli/clitest" "github.com/coder/coder/v2/cli/cliui" "github.com/coder/coder/v2/coderd/coderdtest" @@ -16,6 +14,7 @@ import ( "github.com/coder/coder/v2/enterprise/coderd/coderdenttest" "github.com/coder/coder/v2/enterprise/coderd/license" "github.com/coder/coder/v2/pty/ptytest" + "github.com/coder/pretty" ) func TestGroupEdit(t *testing.T) { diff --git a/enterprise/cli/prebuilds.go b/enterprise/cli/prebuilds.go index 305621903f..b3291aab06 100644 --- a/enterprise/cli/prebuilds.go +++ b/enterprise/cli/prebuilds.go @@ -5,10 +5,9 @@ import ( "golang.org/x/xerrors" - "github.com/coder/serpent" - "github.com/coder/coder/v2/cli" "github.com/coder/coder/v2/codersdk" + "github.com/coder/serpent" ) func (r *RootCmd) prebuilds() *serpent.Command { diff --git a/enterprise/cli/provisionerdaemonstart.go b/enterprise/cli/provisionerdaemonstart.go index fe1d2d0c3a..1836cad68b 100644 --- a/enterprise/cli/provisionerdaemonstart.go +++ b/enterprise/cli/provisionerdaemonstart.go @@ -19,7 +19,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/sloghuman" - agpl "github.com/coder/coder/v2/cli" "github.com/coder/coder/v2/cli/clilog" "github.com/coder/coder/v2/cli/cliui" diff --git a/enterprise/cli/proxyserver.go b/enterprise/cli/proxyserver.go index e40d0f5ce5..6a3f99a4a2 100644 --- a/enterprise/cli/proxyserver.go +++ b/enterprise/cli/proxyserver.go @@ -22,7 +22,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/cli" "github.com/coder/coder/v2/cli/clilog" "github.com/coder/coder/v2/cli/cliui" diff --git a/enterprise/cli/server.go b/enterprise/cli/server.go index 61db9b778b..a825149d44 100644 --- a/enterprise/cli/server.go +++ b/enterprise/cli/server.go @@ -14,6 +14,7 @@ import ( "tailscale.com/derp" "tailscale.com/types/key" + agplcoderd "github.com/coder/coder/v2/coderd" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/cryptorand" "github.com/coder/coder/v2/enterprise/aibridged" @@ -27,8 +28,6 @@ import ( "github.com/coder/coder/v2/tailnet" "github.com/coder/quartz" "github.com/coder/serpent" - - agplcoderd "github.com/coder/coder/v2/coderd" ) func (r *RootCmd) Server(_ func()) *serpent.Command { diff --git a/enterprise/cli/server_dbcrypt.go b/enterprise/cli/server_dbcrypt.go index 61c762076b..86e1155f90 100644 --- a/enterprise/cli/server_dbcrypt.go +++ b/enterprise/cli/server_dbcrypt.go @@ -8,17 +8,16 @@ import ( "fmt" "strings" + "golang.org/x/xerrors" + "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/sloghuman" - "github.com/coder/coder/v2/cli" "github.com/coder/coder/v2/cli/cliui" "github.com/coder/coder/v2/coderd/database/awsiamrds" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/enterprise/dbcrypt" "github.com/coder/serpent" - - "golang.org/x/xerrors" ) func (r *RootCmd) dbcryptCmd() *serpent.Command { diff --git a/enterprise/cli/workspaceproxy.go b/enterprise/cli/workspaceproxy.go index d03e10d049..70467f3ce7 100644 --- a/enterprise/cli/workspaceproxy.go +++ b/enterprise/cli/workspaceproxy.go @@ -8,10 +8,9 @@ import ( "github.com/fatih/color" "golang.org/x/xerrors" - "github.com/coder/pretty" - "github.com/coder/coder/v2/cli/cliui" "github.com/coder/coder/v2/codersdk" + "github.com/coder/pretty" "github.com/coder/serpent" ) diff --git a/enterprise/cli/workspaceproxy_test.go b/enterprise/cli/workspaceproxy_test.go index b4642f26a9..cc0155356e 100644 --- a/enterprise/cli/workspaceproxy_test.go +++ b/enterprise/cli/workspaceproxy_test.go @@ -5,7 +5,6 @@ import ( "testing" "github.com/google/uuid" - "github.com/stretchr/testify/require" "github.com/coder/coder/v2/cli/clitest" diff --git a/enterprise/coderd/aibridged.go b/enterprise/coderd/aibridged.go index 0dd409a8fa..95c06fd5c9 100644 --- a/enterprise/coderd/aibridged.go +++ b/enterprise/coderd/aibridged.go @@ -11,7 +11,6 @@ import ( "storj.io/drpc/drpcserver" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/tracing" "github.com/coder/coder/v2/codersdk/drpcsdk" "github.com/coder/coder/v2/enterprise/aibridged" diff --git a/enterprise/coderd/coderd.go b/enterprise/coderd/coderd.go index fac795c8da..b0b42faff9 100644 --- a/enterprise/coderd/coderd.go +++ b/enterprise/coderd/coderd.go @@ -13,54 +13,51 @@ import ( "sync/atomic" "time" + "github.com/cenkalti/backoff/v4" + "github.com/go-chi/chi/v5" + "github.com/prometheus/client_golang/prometheus" + "golang.org/x/xerrors" + "tailscale.com/tailcfg" + + "cdr.dev/slog/v3" "github.com/coder/coder/v2/buildinfo" + "github.com/coder/coder/v2/coderd" "github.com/coder/coder/v2/coderd/appearance" + agplaudit "github.com/coder/coder/v2/coderd/audit" + agplconnectionlog "github.com/coder/coder/v2/coderd/connectionlog" "github.com/coder/coder/v2/coderd/database" + agpldbauthz "github.com/coder/coder/v2/coderd/database/dbauthz" + "github.com/coder/coder/v2/coderd/database/dbtime" "github.com/coder/coder/v2/coderd/entitlements" + "github.com/coder/coder/v2/coderd/healthcheck" + "github.com/coder/coder/v2/coderd/httpapi" + "github.com/coder/coder/v2/coderd/httpmw" "github.com/coder/coder/v2/coderd/idpsync" agplportsharing "github.com/coder/coder/v2/coderd/portsharing" "github.com/coder/coder/v2/coderd/pproflabel" agplprebuilds "github.com/coder/coder/v2/coderd/prebuilds" + "github.com/coder/coder/v2/coderd/rbac" "github.com/coder/coder/v2/coderd/rbac/policy" + agplschedule "github.com/coder/coder/v2/coderd/schedule" agplusage "github.com/coder/coder/v2/coderd/usage" "github.com/coder/coder/v2/coderd/wsbuilder" - "github.com/coder/coder/v2/enterprise/coderd/connectionlog" - "github.com/coder/coder/v2/enterprise/coderd/enidpsync" - "github.com/coder/coder/v2/enterprise/coderd/portsharing" - "github.com/coder/coder/v2/enterprise/coderd/usage" - "github.com/coder/quartz" - - "golang.org/x/xerrors" - "tailscale.com/tailcfg" - - "github.com/cenkalti/backoff/v4" - "github.com/go-chi/chi/v5" - "github.com/prometheus/client_golang/prometheus" - - "cdr.dev/slog/v3" - - "github.com/coder/coder/v2/coderd" - agplaudit "github.com/coder/coder/v2/coderd/audit" - agplconnectionlog "github.com/coder/coder/v2/coderd/connectionlog" - agpldbauthz "github.com/coder/coder/v2/coderd/database/dbauthz" - "github.com/coder/coder/v2/coderd/database/dbtime" - "github.com/coder/coder/v2/coderd/healthcheck" - "github.com/coder/coder/v2/coderd/httpapi" - "github.com/coder/coder/v2/coderd/httpmw" - "github.com/coder/coder/v2/coderd/rbac" - agplschedule "github.com/coder/coder/v2/coderd/schedule" "github.com/coder/coder/v2/codersdk" + "github.com/coder/coder/v2/enterprise/coderd/connectionlog" "github.com/coder/coder/v2/enterprise/coderd/dbauthz" + "github.com/coder/coder/v2/enterprise/coderd/enidpsync" "github.com/coder/coder/v2/enterprise/coderd/license" + "github.com/coder/coder/v2/enterprise/coderd/portsharing" "github.com/coder/coder/v2/enterprise/coderd/prebuilds" "github.com/coder/coder/v2/enterprise/coderd/proxyhealth" "github.com/coder/coder/v2/enterprise/coderd/schedule" + "github.com/coder/coder/v2/enterprise/coderd/usage" "github.com/coder/coder/v2/enterprise/dbcrypt" "github.com/coder/coder/v2/enterprise/derpmesh" "github.com/coder/coder/v2/enterprise/replicasync" "github.com/coder/coder/v2/enterprise/tailnet" "github.com/coder/coder/v2/provisionerd/proto" agpltailnet "github.com/coder/coder/v2/tailnet" + "github.com/coder/quartz" ) // New constructs an Enterprise coderd API instance. diff --git a/enterprise/coderd/coderd_test.go b/enterprise/coderd/coderd_test.go index cb84620be1..a82882e390 100644 --- a/enterprise/coderd/coderd_test.go +++ b/enterprise/coderd/coderd_test.go @@ -26,21 +26,8 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/agent" "github.com/coder/coder/v2/agent/agenttest" - "github.com/coder/coder/v2/coderd/httpapi" - agplprebuilds "github.com/coder/coder/v2/coderd/prebuilds" - "github.com/coder/coder/v2/coderd/rbac/policy" - "github.com/coder/coder/v2/coderd/util/ptr" - "github.com/coder/coder/v2/enterprise/coderd/prebuilds" - "github.com/coder/coder/v2/provisioner/echo" - "github.com/coder/coder/v2/provisionersdk/proto" - "github.com/coder/coder/v2/tailnet/tailnettest" - - "github.com/coder/retry" - "github.com/coder/serpent" - agplcoderd "github.com/coder/coder/v2/coderd" agplaudit "github.com/coder/coder/v2/coderd/audit" "github.com/coder/coder/v2/coderd/coderdtest" @@ -51,16 +38,26 @@ import ( "github.com/coder/coder/v2/coderd/database/dbtestutil" "github.com/coder/coder/v2/coderd/database/dbtime" "github.com/coder/coder/v2/coderd/entitlements" + "github.com/coder/coder/v2/coderd/httpapi" + agplprebuilds "github.com/coder/coder/v2/coderd/prebuilds" "github.com/coder/coder/v2/coderd/rbac" + "github.com/coder/coder/v2/coderd/rbac/policy" + "github.com/coder/coder/v2/coderd/util/ptr" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/codersdk/workspacesdk" "github.com/coder/coder/v2/enterprise/audit" "github.com/coder/coder/v2/enterprise/coderd" "github.com/coder/coder/v2/enterprise/coderd/coderdenttest" "github.com/coder/coder/v2/enterprise/coderd/license" + "github.com/coder/coder/v2/enterprise/coderd/prebuilds" "github.com/coder/coder/v2/enterprise/dbcrypt" "github.com/coder/coder/v2/enterprise/replicasync" + "github.com/coder/coder/v2/provisioner/echo" + "github.com/coder/coder/v2/provisionersdk/proto" + "github.com/coder/coder/v2/tailnet/tailnettest" "github.com/coder/coder/v2/testutil" + "github.com/coder/retry" + "github.com/coder/serpent" ) func TestMain(m *testing.M) { diff --git a/enterprise/coderd/coderdenttest/coderdenttest.go b/enterprise/coderd/coderdenttest/coderdenttest.go index 65cd253553..0e5f92bc35 100644 --- a/enterprise/coderd/coderdenttest/coderdenttest.go +++ b/enterprise/coderd/coderdenttest/coderdenttest.go @@ -20,7 +20,6 @@ import ( "github.com/stretchr/testify/require" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/pubsub" diff --git a/enterprise/coderd/coderdenttest/proxytest.go b/enterprise/coderd/coderdenttest/proxytest.go index 60e612871f..ae765f5095 100644 --- a/enterprise/coderd/coderdenttest/proxytest.go +++ b/enterprise/coderd/coderdenttest/proxytest.go @@ -18,7 +18,6 @@ import ( "github.com/stretchr/testify/require" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/workspaceapps/appurl" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/enterprise/coderd" diff --git a/enterprise/coderd/connectionlog/connectionlog.go b/enterprise/coderd/connectionlog/connectionlog.go index cb64169ee8..4b24ba402c 100644 --- a/enterprise/coderd/connectionlog/connectionlog.go +++ b/enterprise/coderd/connectionlog/connectionlog.go @@ -6,7 +6,6 @@ import ( "github.com/hashicorp/go-multierror" "cdr.dev/slog/v3" - agpl "github.com/coder/coder/v2/coderd/connectionlog" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" diff --git a/enterprise/coderd/dormancy/dormantusersjob.go b/enterprise/coderd/dormancy/dormantusersjob.go index aa2ca665d0..43617f4567 100644 --- a/enterprise/coderd/dormancy/dormantusersjob.go +++ b/enterprise/coderd/dormancy/dormantusersjob.go @@ -9,7 +9,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/audit" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbtime" diff --git a/enterprise/coderd/dormancy/dormantusersjob_test.go b/enterprise/coderd/dormancy/dormantusersjob_test.go index 9ee0861aaf..7e1b1642bf 100644 --- a/enterprise/coderd/dormancy/dormantusersjob_test.go +++ b/enterprise/coderd/dormancy/dormantusersjob_test.go @@ -9,7 +9,6 @@ import ( "github.com/stretchr/testify/require" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/coderd/audit" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbtestutil" diff --git a/enterprise/coderd/enidpsync/enidpsync.go b/enterprise/coderd/enidpsync/enidpsync.go index e7fcf5d7a6..40be38cb42 100644 --- a/enterprise/coderd/enidpsync/enidpsync.go +++ b/enterprise/coderd/enidpsync/enidpsync.go @@ -2,7 +2,6 @@ package enidpsync import ( "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/entitlements" "github.com/coder/coder/v2/coderd/idpsync" "github.com/coder/coder/v2/coderd/runtimeconfig" diff --git a/enterprise/coderd/enidpsync/groups_test.go b/enterprise/coderd/enidpsync/groups_test.go index fe1bf22bf9..2ba33647a1 100644 --- a/enterprise/coderd/enidpsync/groups_test.go +++ b/enterprise/coderd/enidpsync/groups_test.go @@ -7,7 +7,6 @@ import ( "github.com/stretchr/testify/require" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/coderd/entitlements" "github.com/coder/coder/v2/coderd/idpsync" "github.com/coder/coder/v2/coderd/runtimeconfig" diff --git a/enterprise/coderd/enidpsync/organizations_test.go b/enterprise/coderd/enidpsync/organizations_test.go index 7702d91a62..47423dc588 100644 --- a/enterprise/coderd/enidpsync/organizations_test.go +++ b/enterprise/coderd/enidpsync/organizations_test.go @@ -10,7 +10,6 @@ import ( "github.com/stretchr/testify/require" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/db2sdk" diff --git a/enterprise/coderd/enidpsync/role.go b/enterprise/coderd/enidpsync/role.go index 815633f8d3..73c63b349c 100644 --- a/enterprise/coderd/enidpsync/role.go +++ b/enterprise/coderd/enidpsync/role.go @@ -10,7 +10,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/idpsync" "github.com/coder/coder/v2/coderd/runtimeconfig" diff --git a/enterprise/coderd/licenses.go b/enterprise/coderd/licenses.go index a2ec273a32..91fd4250b2 100644 --- a/enterprise/coderd/licenses.go +++ b/enterprise/coderd/licenses.go @@ -21,7 +21,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd" "github.com/coder/coder/v2/coderd/audit" "github.com/coder/coder/v2/coderd/database" diff --git a/enterprise/coderd/prebuilds/claim_test.go b/enterprise/coderd/prebuilds/claim_test.go index 7f4ffc0f28..c84358e2d2 100644 --- a/enterprise/coderd/prebuilds/claim_test.go +++ b/enterprise/coderd/prebuilds/claim_test.go @@ -16,15 +16,12 @@ import ( "go.opentelemetry.io/otel/trace/noop" "golang.org/x/xerrors" - "github.com/coder/coder/v2/coderd/database/dbtime" - - "github.com/coder/coder/v2/coderd/files" - "github.com/coder/quartz" - "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbgen" "github.com/coder/coder/v2/coderd/database/dbtestutil" + "github.com/coder/coder/v2/coderd/database/dbtime" + "github.com/coder/coder/v2/coderd/files" agplprebuilds "github.com/coder/coder/v2/coderd/prebuilds" "github.com/coder/coder/v2/coderd/rbac" "github.com/coder/coder/v2/codersdk" @@ -35,6 +32,7 @@ import ( "github.com/coder/coder/v2/provisionersdk" "github.com/coder/coder/v2/provisionersdk/proto" "github.com/coder/coder/v2/testutil" + "github.com/coder/quartz" ) type storeSpy struct { diff --git a/enterprise/coderd/prebuilds/membership.go b/enterprise/coderd/prebuilds/membership.go index 8213983013..47047ee608 100644 --- a/enterprise/coderd/prebuilds/membership.go +++ b/enterprise/coderd/prebuilds/membership.go @@ -8,7 +8,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/database" "github.com/coder/quartz" ) diff --git a/enterprise/coderd/prebuilds/membership_test.go b/enterprise/coderd/prebuilds/membership_test.go index 46120f556f..ed8a6adecd 100644 --- a/enterprise/coderd/prebuilds/membership_test.go +++ b/enterprise/coderd/prebuilds/membership_test.go @@ -9,7 +9,6 @@ import ( "github.com/stretchr/testify/require" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" diff --git a/enterprise/coderd/prebuilds/metricscollector.go b/enterprise/coderd/prebuilds/metricscollector.go index 3dba85b2d3..22f1cdff15 100644 --- a/enterprise/coderd/prebuilds/metricscollector.go +++ b/enterprise/coderd/prebuilds/metricscollector.go @@ -11,7 +11,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbtime" "github.com/coder/coder/v2/coderd/prebuilds" diff --git a/enterprise/coderd/prebuilds/metricscollector_test.go b/enterprise/coderd/prebuilds/metricscollector_test.go index 4534e0ce6f..1891caaba9 100644 --- a/enterprise/coderd/prebuilds/metricscollector_test.go +++ b/enterprise/coderd/prebuilds/metricscollector_test.go @@ -13,19 +13,17 @@ import ( "tailscale.com/types/ptr" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/coderd/coderdtest" - "github.com/coder/coder/v2/coderd/files" - "github.com/coder/quartz" - "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" "github.com/coder/coder/v2/coderd/database/dbgen" "github.com/coder/coder/v2/coderd/database/dbtestutil" "github.com/coder/coder/v2/coderd/database/dbtime" + "github.com/coder/coder/v2/coderd/files" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/enterprise/coderd/prebuilds" "github.com/coder/coder/v2/testutil" + "github.com/coder/quartz" ) func TestMetricsCollector(t *testing.T) { diff --git a/enterprise/coderd/prebuilds/reconcile.go b/enterprise/coderd/prebuilds/reconcile.go index 8a2caad2dd..2124044608 100644 --- a/enterprise/coderd/prebuilds/reconcile.go +++ b/enterprise/coderd/prebuilds/reconcile.go @@ -22,7 +22,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/audit" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" diff --git a/enterprise/coderd/prebuilds/reconcile_test.go b/enterprise/coderd/prebuilds/reconcile_test.go index 89118e2f13..c3963b7be2 100644 --- a/enterprise/coderd/prebuilds/reconcile_test.go +++ b/enterprise/coderd/prebuilds/reconcile_test.go @@ -19,7 +19,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbfake" diff --git a/enterprise/coderd/provisionerdaemons.go b/enterprise/coderd/provisionerdaemons.go index 39652d4bcd..2fbac9efef 100644 --- a/enterprise/coderd/provisionerdaemons.go +++ b/enterprise/coderd/provisionerdaemons.go @@ -19,9 +19,6 @@ import ( "storj.io/drpc/drpcserver" "cdr.dev/slog/v3" - - "github.com/coder/websocket" - "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" "github.com/coder/coder/v2/coderd/database/dbtime" @@ -37,6 +34,7 @@ import ( "github.com/coder/coder/v2/codersdk/drpcsdk" "github.com/coder/coder/v2/provisionerd/proto" "github.com/coder/coder/v2/provisionersdk" + "github.com/coder/websocket" ) func (api *API) provisionerDaemonsEnabledMW(next http.Handler) http.Handler { diff --git a/enterprise/coderd/provisionerdaemons_test.go b/enterprise/coderd/provisionerdaemons_test.go index cf8a98bdf6..3d9347bcbf 100644 --- a/enterprise/coderd/provisionerdaemons_test.go +++ b/enterprise/coderd/provisionerdaemons_test.go @@ -15,7 +15,6 @@ import ( "github.com/stretchr/testify/require" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/apiversion" "github.com/coder/coder/v2/buildinfo" "github.com/coder/coder/v2/coderd/coderdtest" diff --git a/enterprise/coderd/proxyhealth/proxyhealth.go b/enterprise/coderd/proxyhealth/proxyhealth.go index 09f5ca2e17..d32296fecb 100644 --- a/enterprise/coderd/proxyhealth/proxyhealth.go +++ b/enterprise/coderd/proxyhealth/proxyhealth.go @@ -18,7 +18,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" "github.com/coder/coder/v2/coderd/prometheusmetrics" diff --git a/enterprise/coderd/schedule/template.go b/enterprise/coderd/schedule/template.go index 938fea2717..809a851798 100644 --- a/enterprise/coderd/schedule/template.go +++ b/enterprise/coderd/schedule/template.go @@ -6,14 +6,13 @@ import ( "sync/atomic" "time" - "cdr.dev/slog/v3" - "github.com/dustin/go-humanize" "github.com/google/uuid" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" "golang.org/x/xerrors" + "cdr.dev/slog/v3" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" "github.com/coder/coder/v2/coderd/database/dbtime" diff --git a/enterprise/coderd/schedule/template_test.go b/enterprise/coderd/schedule/template_test.go index 51d9897a97..206bac7023 100644 --- a/enterprise/coderd/schedule/template_test.go +++ b/enterprise/coderd/schedule/template_test.go @@ -15,7 +15,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" "github.com/coder/coder/v2/coderd/database/dbfake" diff --git a/enterprise/coderd/templates.go b/enterprise/coderd/templates.go index f8264e2e6f..4b0f4ffcde 100644 --- a/enterprise/coderd/templates.go +++ b/enterprise/coderd/templates.go @@ -9,7 +9,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/audit" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/db2sdk" diff --git a/enterprise/coderd/templates_test.go b/enterprise/coderd/templates_test.go index 66737e2841..5073223488 100644 --- a/enterprise/coderd/templates_test.go +++ b/enterprise/coderd/templates_test.go @@ -15,7 +15,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/coderd/audit" "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/coderd/database" diff --git a/enterprise/coderd/usage/publisher.go b/enterprise/coderd/usage/publisher.go index 6c2ec5f4cb..3fb9e022ee 100644 --- a/enterprise/coderd/usage/publisher.go +++ b/enterprise/coderd/usage/publisher.go @@ -14,7 +14,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/buildinfo" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" diff --git a/enterprise/coderd/usage/publisher_test.go b/enterprise/coderd/usage/publisher_test.go index 57e099c47d..924a4a4607 100644 --- a/enterprise/coderd/usage/publisher_test.go +++ b/enterprise/coderd/usage/publisher_test.go @@ -17,7 +17,6 @@ import ( "go.uber.org/mock/gomock" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" diff --git a/enterprise/coderd/workspaceagents_test.go b/enterprise/coderd/workspaceagents_test.go index 6fc1e8aff4..18e1aa0101 100644 --- a/enterprise/coderd/workspaceagents_test.go +++ b/enterprise/coderd/workspaceagents_test.go @@ -12,27 +12,26 @@ import ( "testing" "time" - "github.com/coder/coder/v2/coderd/database" - "github.com/coder/coder/v2/coderd/database/dbfake" - "github.com/coder/coder/v2/coderd/database/dbgen" - "github.com/coder/coder/v2/coderd/database/dbtestutil" - "github.com/coder/coder/v2/provisionersdk" - "github.com/coder/serpent" - "github.com/google/uuid" "github.com/stretchr/testify/require" "github.com/coder/coder/v2/agent" "github.com/coder/coder/v2/cli/clitest" "github.com/coder/coder/v2/coderd/coderdtest" + "github.com/coder/coder/v2/coderd/database" + "github.com/coder/coder/v2/coderd/database/dbfake" + "github.com/coder/coder/v2/coderd/database/dbgen" + "github.com/coder/coder/v2/coderd/database/dbtestutil" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/codersdk/agentsdk" "github.com/coder/coder/v2/codersdk/workspacesdk" "github.com/coder/coder/v2/enterprise/coderd/coderdenttest" "github.com/coder/coder/v2/enterprise/coderd/license" "github.com/coder/coder/v2/provisioner/echo" + "github.com/coder/coder/v2/provisionersdk" "github.com/coder/coder/v2/provisionersdk/proto" "github.com/coder/coder/v2/testutil" + "github.com/coder/serpent" ) // App names for each app sharing level. diff --git a/enterprise/coderd/workspaceproxy.go b/enterprise/coderd/workspaceproxy.go index 615fa4c706..9eaf724fc0 100644 --- a/enterprise/coderd/workspaceproxy.go +++ b/enterprise/coderd/workspaceproxy.go @@ -14,7 +14,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - agpl "github.com/coder/coder/v2/coderd" "github.com/coder/coder/v2/coderd/apikey" "github.com/coder/coder/v2/coderd/audit" diff --git a/enterprise/coderd/workspaceproxy_test.go b/enterprise/coderd/workspaceproxy_test.go index ef6a303c61..f9d9db3d64 100644 --- a/enterprise/coderd/workspaceproxy_test.go +++ b/enterprise/coderd/workspaceproxy_test.go @@ -18,7 +18,6 @@ import ( "github.com/stretchr/testify/require" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/agent/agenttest" "github.com/coder/coder/v2/buildinfo" "github.com/coder/coder/v2/coderd/coderdtest" diff --git a/enterprise/coderd/workspacequota.go b/enterprise/coderd/workspacequota.go index d71102808f..a6218bf62f 100644 --- a/enterprise/coderd/workspacequota.go +++ b/enterprise/coderd/workspacequota.go @@ -10,7 +10,6 @@ import ( "github.com/google/uuid" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/httpapi" "github.com/coder/coder/v2/coderd/httpmw" diff --git a/enterprise/coderd/workspaces_test.go b/enterprise/coderd/workspaces_test.go index 665ac02df8..523f3fae1c 100644 --- a/enterprise/coderd/workspaces_test.go +++ b/enterprise/coderd/workspaces_test.go @@ -22,7 +22,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/coderd/audit" "github.com/coder/coder/v2/coderd/autobuild" "github.com/coder/coder/v2/coderd/coderdtest" diff --git a/enterprise/dbcrypt/cliutil.go b/enterprise/dbcrypt/cliutil.go index cc87defcdb..8bee1c8947 100644 --- a/enterprise/dbcrypt/cliutil.go +++ b/enterprise/dbcrypt/cliutil.go @@ -7,7 +7,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/database" ) diff --git a/enterprise/dbcrypt/dbcrypt.go b/enterprise/dbcrypt/dbcrypt.go index e0ca58cc52..08136122ad 100644 --- a/enterprise/dbcrypt/dbcrypt.go +++ b/enterprise/dbcrypt/dbcrypt.go @@ -5,11 +5,11 @@ import ( "database/sql" "encoding/base64" - "github.com/coder/coder/v2/coderd/database" - "github.com/coder/coder/v2/coderd/database/dbauthz" - "github.com/google/uuid" "golang.org/x/xerrors" + + "github.com/coder/coder/v2/coderd/database" + "github.com/coder/coder/v2/coderd/database/dbauthz" ) // testValue is the value that is stored in dbcrypt_keys.test. diff --git a/enterprise/derpmesh/derpmesh.go b/enterprise/derpmesh/derpmesh.go index 9a85190b06..861d5ea77a 100644 --- a/enterprise/derpmesh/derpmesh.go +++ b/enterprise/derpmesh/derpmesh.go @@ -13,7 +13,6 @@ import ( "tailscale.com/types/key" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/tailnet" ) diff --git a/enterprise/provisionerd/remoteprovisioners.go b/enterprise/provisionerd/remoteprovisioners.go index e910ebc893..db66970973 100644 --- a/enterprise/provisionerd/remoteprovisioners.go +++ b/enterprise/provisionerd/remoteprovisioners.go @@ -26,7 +26,6 @@ import ( "storj.io/drpc/drpcconn" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/codersdk/drpcsdk" "github.com/coder/coder/v2/provisioner/echo" diff --git a/enterprise/provisionerd/remoteprovisioners_test.go b/enterprise/provisionerd/remoteprovisioners_test.go index 904e95b81f..386b43771b 100644 --- a/enterprise/provisionerd/remoteprovisioners_test.go +++ b/enterprise/provisionerd/remoteprovisioners_test.go @@ -10,7 +10,6 @@ import ( "go.uber.org/goleak" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/enterprise/provisionerd" "github.com/coder/coder/v2/provisioner/echo" diff --git a/enterprise/replicasync/replicasync.go b/enterprise/replicasync/replicasync.go index 3642e5ab0f..f69db6ed94 100644 --- a/enterprise/replicasync/replicasync.go +++ b/enterprise/replicasync/replicasync.go @@ -17,7 +17,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/buildinfo" "github.com/coder/coder/v2/cli/cliutil" "github.com/coder/coder/v2/coderd/database" diff --git a/enterprise/tailnet/connio.go b/enterprise/tailnet/connio.go index 5fe28dde18..360548a86b 100644 --- a/enterprise/tailnet/connio.go +++ b/enterprise/tailnet/connio.go @@ -12,7 +12,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - agpl "github.com/coder/coder/v2/tailnet" "github.com/coder/coder/v2/tailnet/proto" ) diff --git a/enterprise/tailnet/handshaker.go b/enterprise/tailnet/handshaker.go index 9918d9dea9..ce5f1b0e0c 100644 --- a/enterprise/tailnet/handshaker.go +++ b/enterprise/tailnet/handshaker.go @@ -8,7 +8,6 @@ import ( "github.com/google/uuid" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/database/pubsub" ) diff --git a/enterprise/tailnet/multiagent_test.go b/enterprise/tailnet/multiagent_test.go index 331133eb04..ad22e9e5ad 100644 --- a/enterprise/tailnet/multiagent_test.go +++ b/enterprise/tailnet/multiagent_test.go @@ -8,7 +8,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/coderd/database/dbtestutil" "github.com/coder/coder/v2/enterprise/tailnet" agpl "github.com/coder/coder/v2/tailnet" diff --git a/enterprise/tailnet/pgcoord.go b/enterprise/tailnet/pgcoord.go index cb4e16970b..892ddc5c72 100644 --- a/enterprise/tailnet/pgcoord.go +++ b/enterprise/tailnet/pgcoord.go @@ -14,7 +14,6 @@ import ( gProto "google.golang.org/protobuf/proto" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbauthz" "github.com/coder/coder/v2/coderd/database/pubsub" diff --git a/enterprise/tailnet/pgcoord_internal_test.go b/enterprise/tailnet/pgcoord_internal_test.go index 6355cf3cc8..d559d5d15c 100644 --- a/enterprise/tailnet/pgcoord_internal_test.go +++ b/enterprise/tailnet/pgcoord_internal_test.go @@ -19,9 +19,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/slogtest" - - "github.com/coder/quartz" - "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbmock" "github.com/coder/coder/v2/coderd/database/dbtestutil" @@ -29,6 +26,7 @@ import ( agpl "github.com/coder/coder/v2/tailnet" "github.com/coder/coder/v2/tailnet/proto" "github.com/coder/coder/v2/testutil" + "github.com/coder/quartz" ) // UpdateGoldenFiles indicates golden files should be updated. diff --git a/enterprise/tailnet/pgcoord_test.go b/enterprise/tailnet/pgcoord_test.go index 24c455ba9b..3420f11aca 100644 --- a/enterprise/tailnet/pgcoord_test.go +++ b/enterprise/tailnet/pgcoord_test.go @@ -18,7 +18,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/dbmock" "github.com/coder/coder/v2/coderd/database/dbtestutil" diff --git a/enterprise/tailnet/workspaceproxy.go b/enterprise/tailnet/workspaceproxy.go index b7d92b7651..c2510db0aa 100644 --- a/enterprise/tailnet/workspaceproxy.go +++ b/enterprise/tailnet/workspaceproxy.go @@ -7,7 +7,6 @@ import ( "github.com/google/uuid" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/apiversion" agpl "github.com/coder/coder/v2/tailnet" ) diff --git a/enterprise/wsproxy/tokenprovider.go b/enterprise/wsproxy/tokenprovider.go index 7d4b5c43b1..cd1567fa7d 100644 --- a/enterprise/wsproxy/tokenprovider.go +++ b/enterprise/wsproxy/tokenprovider.go @@ -6,7 +6,6 @@ import ( "net/url" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/cryptokeys" "github.com/coder/coder/v2/coderd/jwtutils" "github.com/coder/coder/v2/coderd/workspaceapps" diff --git a/enterprise/wsproxy/wsproxy.go b/enterprise/wsproxy/wsproxy.go index 308107392c..cbf8faab91 100644 --- a/enterprise/wsproxy/wsproxy.go +++ b/enterprise/wsproxy/wsproxy.go @@ -26,7 +26,6 @@ import ( "tailscale.com/types/key" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/buildinfo" "github.com/coder/coder/v2/cli/cliutil" "github.com/coder/coder/v2/coderd" diff --git a/enterprise/wsproxy/wsproxy_test.go b/enterprise/wsproxy/wsproxy_test.go index 1fb19f9766..9e206a1cdc 100644 --- a/enterprise/wsproxy/wsproxy_test.go +++ b/enterprise/wsproxy/wsproxy_test.go @@ -24,7 +24,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/agent/agenttest" "github.com/coder/coder/v2/buildinfo" "github.com/coder/coder/v2/coderd/coderdtest" diff --git a/enterprise/wsproxy/wsproxysdk/wsproxysdk.go b/enterprise/wsproxy/wsproxysdk/wsproxysdk.go index 975d4ff832..0285f04e3e 100644 --- a/enterprise/wsproxy/wsproxysdk/wsproxysdk.go +++ b/enterprise/wsproxy/wsproxysdk/wsproxysdk.go @@ -13,7 +13,6 @@ import ( "tailscale.com/tailcfg" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/httpmw" "github.com/coder/coder/v2/coderd/workspaceapps" "github.com/coder/coder/v2/codersdk" diff --git a/httpmw/recover.go b/httpmw/recover.go index 5de09899b5..fba2a2a7f3 100644 --- a/httpmw/recover.go +++ b/httpmw/recover.go @@ -6,7 +6,6 @@ import ( "runtime/debug" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/httpapi" "github.com/coder/coder/v2/coderd/tracing" ) diff --git a/provisioner/echo/serve.go b/provisioner/echo/serve.go index ad06cc43bd..2a695aebaf 100644 --- a/provisioner/echo/serve.go +++ b/provisioner/echo/serve.go @@ -17,7 +17,6 @@ import ( protobuf "google.golang.org/protobuf/proto" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/provisionersdk" "github.com/coder/coder/v2/provisionersdk/proto" ) diff --git a/provisioner/terraform/cleanup_test.go b/provisioner/terraform/cleanup_test.go index 49636f5dc0..969e36c3fd 100644 --- a/provisioner/terraform/cleanup_test.go +++ b/provisioner/terraform/cleanup_test.go @@ -18,7 +18,6 @@ import ( "github.com/stretchr/testify/require" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/provisioner/terraform" "github.com/coder/coder/v2/testutil" ) diff --git a/provisioner/terraform/convertstate_test.go b/provisioner/terraform/convertstate_test.go index 91da206aff..3e5cdbc7fb 100644 --- a/provisioner/terraform/convertstate_test.go +++ b/provisioner/terraform/convertstate_test.go @@ -15,7 +15,6 @@ import ( "github.com/stretchr/testify/require" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/provisioner/terraform" "github.com/coder/coder/v2/testutil" ) diff --git a/provisioner/terraform/executor.go b/provisioner/terraform/executor.go index f8df501e4f..60d91d09d4 100644 --- a/provisioner/terraform/executor.go +++ b/provisioner/terraform/executor.go @@ -21,11 +21,9 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - - "github.com/coder/coder/v2/provisionersdk/tfpath" - "github.com/coder/coder/v2/coderd/tracing" "github.com/coder/coder/v2/provisionersdk/proto" + "github.com/coder/coder/v2/provisionersdk/tfpath" ) var ( diff --git a/provisioner/terraform/provision.go b/provisioner/terraform/provision.go index b1845f5253..8f428525f5 100644 --- a/provisioner/terraform/provision.go +++ b/provisioner/terraform/provision.go @@ -18,13 +18,11 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - - "github.com/coder/terraform-provider-coder/v2/provider" - "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/tracing" "github.com/coder/coder/v2/provisionersdk" "github.com/coder/coder/v2/provisionersdk/proto" + "github.com/coder/terraform-provider-coder/v2/provider" ) const staleTerraformPluginRetention = 30 * 24 * time.Hour diff --git a/provisioner/terraform/provision_test.go b/provisioner/terraform/provision_test.go index adc1c32465..72d7565fa8 100644 --- a/provisioner/terraform/provision_test.go +++ b/provisioner/terraform/provision_test.go @@ -22,7 +22,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/codersdk/drpcsdk" "github.com/coder/coder/v2/provisioner/terraform" "github.com/coder/coder/v2/provisionersdk" diff --git a/provisioner/terraform/resources.go b/provisioner/terraform/resources.go index 205df1779d..2938707c5c 100644 --- a/provisioner/terraform/resources.go +++ b/provisioner/terraform/resources.go @@ -8,22 +8,19 @@ import ( "github.com/awalterschulze/gographviz" "github.com/google/uuid" + tfaddr "github.com/hashicorp/go-terraform-address" tfjson "github.com/hashicorp/terraform-json" "github.com/mitchellh/mapstructure" "golang.org/x/xerrors" "cdr.dev/slog/v3" - - "github.com/coder/terraform-provider-coder/v2/provider" - - tfaddr "github.com/hashicorp/go-terraform-address" - "github.com/coder/coder/v2/coderd/util/slice" stringutil "github.com/coder/coder/v2/coderd/util/strings" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/provisioner" "github.com/coder/coder/v2/provisionersdk" "github.com/coder/coder/v2/provisionersdk/proto" + "github.com/coder/terraform-provider-coder/v2/provider" ) type agentMetadata struct { diff --git a/provisioner/terraform/resources_test.go b/provisioner/terraform/resources_test.go index 7b177bccb9..049f15e675 100644 --- a/provisioner/terraform/resources_test.go +++ b/provisioner/terraform/resources_test.go @@ -20,12 +20,10 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/slogtest" - - "github.com/coder/coder/v2/testutil" - "github.com/coder/coder/v2/cryptorand" "github.com/coder/coder/v2/provisioner/terraform" "github.com/coder/coder/v2/provisionersdk/proto" + "github.com/coder/coder/v2/testutil" ) func ctxAndLogger(t *testing.T) (context.Context, slog.Logger) { diff --git a/provisioner/terraform/serve.go b/provisioner/terraform/serve.go index 009de40a9e..43bc4591be 100644 --- a/provisioner/terraform/serve.go +++ b/provisioner/terraform/serve.go @@ -14,12 +14,10 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - - "github.com/coder/coder/v2/provisionersdk/tfpath" - "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/jobreaper" "github.com/coder/coder/v2/provisionersdk" + "github.com/coder/coder/v2/provisionersdk/tfpath" ) type ServeOptions struct { diff --git a/provisioner/terraform/tfparse/tfparse.go b/provisioner/terraform/tfparse/tfparse.go index 453fa12bb3..eab1c2e754 100644 --- a/provisioner/terraform/tfparse/tfparse.go +++ b/provisioner/terraform/tfparse/tfparse.go @@ -12,10 +12,6 @@ import ( "strconv" "strings" - "github.com/coder/coder/v2/archive" - "github.com/coder/coder/v2/provisionersdk" - "github.com/coder/coder/v2/provisionersdk/proto" - "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hclparse" "github.com/hashicorp/hcl/v2/hclsyntax" @@ -25,6 +21,9 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" + "github.com/coder/coder/v2/archive" + "github.com/coder/coder/v2/provisionersdk" + "github.com/coder/coder/v2/provisionersdk/proto" ) // NOTE: This is duplicated from coderd but we can't import it here without diff --git a/provisioner/terraform/tfparse/tfparse_test.go b/provisioner/terraform/tfparse/tfparse_test.go index 762e8edf15..28b858e8d9 100644 --- a/provisioner/terraform/tfparse/tfparse_test.go +++ b/provisioner/terraform/tfparse/tfparse_test.go @@ -10,7 +10,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/sloghuman" - "github.com/coder/coder/v2/provisioner/terraform/tfparse" "github.com/coder/coder/v2/testutil" ) diff --git a/provisionerd/localprovisioners.go b/provisionerd/localprovisioners.go index 0e495f536d..e85e0c3590 100644 --- a/provisionerd/localprovisioners.go +++ b/provisionerd/localprovisioners.go @@ -6,7 +6,6 @@ import ( "golang.org/x/xerrors" "github.com/coder/coder/v2/provisionerd/proto" - sdkproto "github.com/coder/coder/v2/provisionersdk/proto" ) diff --git a/provisionerd/provisionerd.go b/provisionerd/provisionerd.go index 47f9999db1..36eac83266 100644 --- a/provisionerd/provisionerd.go +++ b/provisionerd/provisionerd.go @@ -22,15 +22,13 @@ import ( protobuf "google.golang.org/protobuf/proto" "cdr.dev/slog/v3" - - "github.com/coder/coder/v2/codersdk/drpcsdk" - "github.com/coder/retry" - "github.com/coder/coder/v2/coderd/tracing" "github.com/coder/coder/v2/codersdk" + "github.com/coder/coder/v2/codersdk/drpcsdk" "github.com/coder/coder/v2/provisionerd/proto" "github.com/coder/coder/v2/provisionerd/runner" sdkproto "github.com/coder/coder/v2/provisionersdk/proto" + "github.com/coder/retry" ) // Dialer represents the function to create a daemon client connection. diff --git a/provisionerd/provisionerd_test.go b/provisionerd/provisionerd_test.go index 27ee862093..f11aa8984c 100644 --- a/provisionerd/provisionerd_test.go +++ b/provisionerd/provisionerd_test.go @@ -22,7 +22,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/codersdk/drpcsdk" "github.com/coder/coder/v2/provisionerd" "github.com/coder/coder/v2/provisionerd/proto" diff --git a/provisionerd/runner/apply.go b/provisionerd/runner/apply.go index 8f6e92a537..18c8fee2d0 100644 --- a/provisionerd/runner/apply.go +++ b/provisionerd/runner/apply.go @@ -5,7 +5,6 @@ import ( "time" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/provisionerd/proto" sdkproto "github.com/coder/coder/v2/provisionersdk/proto" ) diff --git a/provisionerd/runner/graph.go b/provisionerd/runner/graph.go index 5459e30088..1ca2f7a3e0 100644 --- a/provisionerd/runner/graph.go +++ b/provisionerd/runner/graph.go @@ -5,7 +5,6 @@ import ( "time" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/tracing" "github.com/coder/coder/v2/provisionerd/proto" sdkproto "github.com/coder/coder/v2/provisionersdk/proto" diff --git a/provisionerd/runner/init.go b/provisionerd/runner/init.go index 63aab52da2..558ed302aa 100644 --- a/provisionerd/runner/init.go +++ b/provisionerd/runner/init.go @@ -6,7 +6,6 @@ import ( "time" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/tracing" "github.com/coder/coder/v2/provisionerd/proto" sdkproto "github.com/coder/coder/v2/provisionersdk/proto" diff --git a/provisionerd/runner/plan.go b/provisionerd/runner/plan.go index 8aba42e0cb..4bc91ff2de 100644 --- a/provisionerd/runner/plan.go +++ b/provisionerd/runner/plan.go @@ -5,7 +5,6 @@ import ( "time" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/tracing" "github.com/coder/coder/v2/provisionerd/proto" sdkproto "github.com/coder/coder/v2/provisionersdk/proto" diff --git a/provisionerd/runner/runner.go b/provisionerd/runner/runner.go index 53db181601..007365c9d2 100644 --- a/provisionerd/runner/runner.go +++ b/provisionerd/runner/runner.go @@ -20,11 +20,9 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - - strings2 "github.com/coder/coder/v2/coderd/util/strings" - "github.com/coder/coder/v2/coderd/tracing" "github.com/coder/coder/v2/coderd/util/ptr" + strings2 "github.com/coder/coder/v2/coderd/util/strings" "github.com/coder/coder/v2/provisionerd/proto" sdkproto "github.com/coder/coder/v2/provisionersdk/proto" ) diff --git a/provisionersdk/agent_test.go b/provisionersdk/agent_test.go index cd642d6765..be36507744 100644 --- a/provisionersdk/agent_test.go +++ b/provisionersdk/agent_test.go @@ -23,9 +23,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/coder/coder/v2/testutil" - "github.com/coder/coder/v2/provisionersdk" + "github.com/coder/coder/v2/testutil" ) // mimicking the --version output which we use to test the binary (see provisionersdk/scripts/bootstrap_*). diff --git a/provisionersdk/archive.go b/provisionersdk/archive.go index 22e9a83564..05383ed053 100644 --- a/provisionersdk/archive.go +++ b/provisionersdk/archive.go @@ -11,7 +11,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/util/xio" ) diff --git a/provisionersdk/archive_test.go b/provisionersdk/archive_test.go index fcb2aaf8ae..73efa052f9 100644 --- a/provisionersdk/archive_test.go +++ b/provisionersdk/archive_test.go @@ -11,7 +11,6 @@ import ( "github.com/stretchr/testify/require" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/provisionersdk" ) diff --git a/provisionersdk/cleanup_test.go b/provisionersdk/cleanup_test.go index 40dd5a700b..902e22b96a 100644 --- a/provisionersdk/cleanup_test.go +++ b/provisionersdk/cleanup_test.go @@ -11,7 +11,6 @@ import ( "github.com/stretchr/testify/require" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/provisionersdk/tfpath" "github.com/coder/coder/v2/testutil" ) diff --git a/provisionersdk/provisionertags_test.go b/provisionersdk/provisionertags_test.go index 070285aea6..4da1c802c6 100644 --- a/provisionersdk/provisionertags_test.go +++ b/provisionersdk/provisionertags_test.go @@ -3,10 +3,10 @@ package provisionersdk_test import ( "testing" - "github.com/coder/coder/v2/provisionersdk" - "github.com/google/uuid" "github.com/stretchr/testify/require" + + "github.com/coder/coder/v2/provisionersdk" ) func TestMutateTags(t *testing.T) { diff --git a/provisionersdk/serve.go b/provisionersdk/serve.go index 04ca0e1bda..d8f52374c3 100644 --- a/provisionersdk/serve.go +++ b/provisionersdk/serve.go @@ -15,11 +15,9 @@ import ( "storj.io/drpc/drpcserver" "cdr.dev/slog/v3" - + "github.com/coder/coder/v2/coderd/tracing" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/codersdk/drpcsdk" - - "github.com/coder/coder/v2/coderd/tracing" "github.com/coder/coder/v2/provisionersdk/proto" ) diff --git a/provisionersdk/session.go b/provisionersdk/session.go index 4b6575fa29..ddf88c5b7d 100644 --- a/provisionersdk/session.go +++ b/provisionersdk/session.go @@ -11,17 +11,14 @@ import ( "github.com/google/uuid" "github.com/spf13/afero" "golang.org/x/xerrors" - - "cdr.dev/slog/v3" - - "github.com/coder/coder/v2/codersdk" - "github.com/coder/coder/v2/codersdk/drpcsdk" - "github.com/coder/coder/v2/provisionersdk/tfpath" - "github.com/coder/coder/v2/provisionersdk/tfpath/x" - protobuf "google.golang.org/protobuf/proto" + "cdr.dev/slog/v3" + "github.com/coder/coder/v2/codersdk" + "github.com/coder/coder/v2/codersdk/drpcsdk" "github.com/coder/coder/v2/provisionersdk/proto" + "github.com/coder/coder/v2/provisionersdk/tfpath" + "github.com/coder/coder/v2/provisionersdk/tfpath/x" ) // protoServer is a wrapper that translates the dRPC protocol into a Session with method calls into the Server. diff --git a/provisionersdk/tfpath/x/tfpath.go b/provisionersdk/tfpath/x/tfpath.go index 8f2a5d77e3..9a344b13f1 100644 --- a/provisionersdk/tfpath/x/tfpath.go +++ b/provisionersdk/tfpath/x/tfpath.go @@ -20,7 +20,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/provisionersdk/proto" "github.com/coder/coder/v2/provisionersdk/tfpath" ) diff --git a/pty/pty_windows.go b/pty/pty_windows.go index 987ef02eb2..eaf92b9ed2 100644 --- a/pty/pty_windows.go +++ b/pty/pty_windows.go @@ -11,7 +11,6 @@ import ( "unsafe" "golang.org/x/sys/windows" - "golang.org/x/xerrors" ) diff --git a/pty/start_windows_test.go b/pty/start_windows_test.go index 4f6b8bce6f..a067a98691 100644 --- a/pty/start_windows_test.go +++ b/pty/start_windows_test.go @@ -9,13 +9,14 @@ import ( "os/exec" "testing" - "github.com/coder/coder/v2/pty" - "github.com/coder/coder/v2/pty/ptytest" - "github.com/coder/coder/v2/testutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/goleak" "golang.org/x/xerrors" + + "github.com/coder/coder/v2/pty" + "github.com/coder/coder/v2/pty/ptytest" + "github.com/coder/coder/v2/testutil" ) func TestMain(m *testing.M) { diff --git a/scaletest/agentconn/run.go b/scaletest/agentconn/run.go index 7c99d31e19..4375455c08 100644 --- a/scaletest/agentconn/run.go +++ b/scaletest/agentconn/run.go @@ -15,7 +15,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/sloghuman" - "github.com/coder/coder/v2/coderd/tracing" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/codersdk/workspacesdk" diff --git a/scaletest/autostart/run.go b/scaletest/autostart/run.go index 48333f260e..8b851eeeba 100644 --- a/scaletest/autostart/run.go +++ b/scaletest/autostart/run.go @@ -10,7 +10,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/sloghuman" - "github.com/coder/coder/v2/coderd/tracing" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/scaletest/createusers" diff --git a/scaletest/createusers/run.go b/scaletest/createusers/run.go index cc63091e05..3ed692a5f2 100644 --- a/scaletest/createusers/run.go +++ b/scaletest/createusers/run.go @@ -10,7 +10,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/sloghuman" - "github.com/coder/coder/v2/coderd/tracing" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/cryptorand" diff --git a/scaletest/createworkspaces/run.go b/scaletest/createworkspaces/run.go index 6ca6738aa3..2a63588fc0 100644 --- a/scaletest/createworkspaces/run.go +++ b/scaletest/createworkspaces/run.go @@ -11,7 +11,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/sloghuman" - "github.com/coder/coder/v2/coderd/tracing" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/scaletest/agentconn" diff --git a/scaletest/createworkspaces/run_test.go b/scaletest/createworkspaces/run_test.go index 8a66374809..05c0a779f2 100644 --- a/scaletest/createworkspaces/run_test.go +++ b/scaletest/createworkspaces/run_test.go @@ -13,7 +13,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/agent" "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/coderd/httpapi" diff --git a/scaletest/dashboard/chromedp.go b/scaletest/dashboard/chromedp.go index a98fe97c32..80b3994fdf 100644 --- a/scaletest/dashboard/chromedp.go +++ b/scaletest/dashboard/chromedp.go @@ -13,9 +13,8 @@ import ( "github.com/chromedp/chromedp" "golang.org/x/xerrors" - "github.com/coder/coder/v2/cryptorand" - "cdr.dev/slog/v3" + "github.com/coder/coder/v2/cryptorand" ) // Action is just a function that does something. diff --git a/scaletest/dashboard/config.go b/scaletest/dashboard/config.go index 812c713018..44ee41ae4a 100644 --- a/scaletest/dashboard/config.go +++ b/scaletest/dashboard/config.go @@ -5,9 +5,9 @@ import ( "net/url" "time" - "cdr.dev/slog/v3" - "golang.org/x/xerrors" + + "cdr.dev/slog/v3" ) type Config struct { diff --git a/scaletest/dashboard/run.go b/scaletest/dashboard/run.go index eca31f3a82..82ca843ea8 100644 --- a/scaletest/dashboard/run.go +++ b/scaletest/dashboard/run.go @@ -10,7 +10,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/scaletest/harness" ) diff --git a/scaletest/dashboard/run_test.go b/scaletest/dashboard/run_test.go index 1aa345b47b..ababa4691e 100644 --- a/scaletest/dashboard/run_test.go +++ b/scaletest/dashboard/run_test.go @@ -15,7 +15,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/scaletest/dashboard" "github.com/coder/coder/v2/testutil" diff --git a/scaletest/dynamicparameters/run_test.go b/scaletest/dynamicparameters/run_test.go index 30612d492d..c62cd7c63f 100644 --- a/scaletest/dynamicparameters/run_test.go +++ b/scaletest/dynamicparameters/run_test.go @@ -8,7 +8,6 @@ import ( "github.com/stretchr/testify/require" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/scaletest/dynamicparameters" "github.com/coder/coder/v2/testutil" diff --git a/scaletest/dynamicparameters/template.go b/scaletest/dynamicparameters/template.go index 275881e26f..6741d290ff 100644 --- a/scaletest/dynamicparameters/template.go +++ b/scaletest/dynamicparameters/template.go @@ -15,7 +15,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/cryptorand" "github.com/coder/coder/v2/scaletest/loadtestutil" diff --git a/scaletest/dynamicparameters/template_internal_test.go b/scaletest/dynamicparameters/template_internal_test.go index 5c3e34246c..c43665e7b7 100644 --- a/scaletest/dynamicparameters/template_internal_test.go +++ b/scaletest/dynamicparameters/template_internal_test.go @@ -11,7 +11,6 @@ import ( "github.com/stretchr/testify/require" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/testutil" "github.com/coder/quartz" diff --git a/scaletest/notifications/config.go b/scaletest/notifications/config.go index 5296577396..372199bf93 100644 --- a/scaletest/notifications/config.go +++ b/scaletest/notifications/config.go @@ -5,9 +5,8 @@ import ( "sync" "time" - "golang.org/x/xerrors" - "github.com/google/uuid" + "golang.org/x/xerrors" "github.com/coder/coder/v2/scaletest/createusers" ) diff --git a/scaletest/notifications/run.go b/scaletest/notifications/run.go index 2e632925a1..bfc305d974 100644 --- a/scaletest/notifications/run.go +++ b/scaletest/notifications/run.go @@ -17,7 +17,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/sloghuman" - "github.com/coder/coder/v2/coderd/tracing" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/scaletest/createusers" diff --git a/scaletest/prebuilds/run.go b/scaletest/prebuilds/run.go index ee3c792e9a..c227afe412 100644 --- a/scaletest/prebuilds/run.go +++ b/scaletest/prebuilds/run.go @@ -8,13 +8,11 @@ import ( "io" "time" - "golang.org/x/xerrors" - "github.com/google/uuid" + "golang.org/x/xerrors" "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/sloghuman" - "github.com/coder/coder/v2/coderd/tracing" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/scaletest/harness" diff --git a/scaletest/reconnectingpty/run.go b/scaletest/reconnectingpty/run.go index 49920ff5df..f17e812931 100644 --- a/scaletest/reconnectingpty/run.go +++ b/scaletest/reconnectingpty/run.go @@ -13,7 +13,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/sloghuman" - "github.com/coder/coder/v2/coderd/tracing" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/codersdk/workspacesdk" diff --git a/scaletest/smtpmock/server_test.go b/scaletest/smtpmock/server_test.go index e7df291393..ef5848ee45 100644 --- a/scaletest/smtpmock/server_test.go +++ b/scaletest/smtpmock/server_test.go @@ -14,7 +14,6 @@ import ( "github.com/stretchr/testify/require" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/scaletest/smtpmock" "github.com/coder/coder/v2/testutil" ) diff --git a/scaletest/taskstatus/client.go b/scaletest/taskstatus/client.go index 27ef495d69..48e934e5dd 100644 --- a/scaletest/taskstatus/client.go +++ b/scaletest/taskstatus/client.go @@ -9,7 +9,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/codersdk/agentsdk" "github.com/coder/quartz" diff --git a/scaletest/taskstatus/run.go b/scaletest/taskstatus/run.go index 9baa3991e5..c727e86349 100644 --- a/scaletest/taskstatus/run.go +++ b/scaletest/taskstatus/run.go @@ -13,7 +13,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/sloghuman" - "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/codersdk/agentsdk" "github.com/coder/coder/v2/scaletest/harness" diff --git a/scaletest/taskstatus/run_internal_test.go b/scaletest/taskstatus/run_internal_test.go index 0126e70e40..47914f7323 100644 --- a/scaletest/taskstatus/run_internal_test.go +++ b/scaletest/taskstatus/run_internal_test.go @@ -15,12 +15,10 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/sloghuman" - - "github.com/coder/quartz" - "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/codersdk/agentsdk" "github.com/coder/coder/v2/testutil" + "github.com/coder/quartz" ) // fakeClient implements the client interface for testing diff --git a/scaletest/workspacebuild/run.go b/scaletest/workspacebuild/run.go index 4a11454aae..214af3da9a 100644 --- a/scaletest/workspacebuild/run.go +++ b/scaletest/workspacebuild/run.go @@ -12,7 +12,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/sloghuman" - "github.com/coder/coder/v2/coderd/tracing" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/scaletest/harness" diff --git a/scaletest/workspacebuild/run_test.go b/scaletest/workspacebuild/run_test.go index 145e0b2417..8565ba9824 100644 --- a/scaletest/workspacebuild/run_test.go +++ b/scaletest/workspacebuild/run_test.go @@ -14,7 +14,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/agent" "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/codersdk" diff --git a/scaletest/workspacetraffic/run.go b/scaletest/workspacetraffic/run.go index 6fd239fb0e..8e2ab35ada 100644 --- a/scaletest/workspacetraffic/run.go +++ b/scaletest/workspacetraffic/run.go @@ -15,7 +15,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/sloghuman" - "github.com/coder/coder/v2/coderd/tracing" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/scaletest/harness" diff --git a/scaletest/workspaceupdates/run.go b/scaletest/workspaceupdates/run.go index 8ec11e7feb..a310bd646a 100644 --- a/scaletest/workspaceupdates/run.go +++ b/scaletest/workspaceupdates/run.go @@ -9,11 +9,8 @@ import ( "golang.org/x/xerrors" - "github.com/coder/websocket" - "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/sloghuman" - "github.com/coder/coder/v2/coderd/tracing" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/codersdk/workspacesdk" @@ -23,6 +20,7 @@ import ( "github.com/coder/coder/v2/scaletest/workspacebuild" "github.com/coder/coder/v2/tailnet" tailnetproto "github.com/coder/coder/v2/tailnet/proto" + "github.com/coder/websocket" ) type Runner struct { diff --git a/scripts/clidocgen/gen.go b/scripts/clidocgen/gen.go index af86cc1644..d48c5a0890 100644 --- a/scripts/clidocgen/gen.go +++ b/scripts/clidocgen/gen.go @@ -1,6 +1,7 @@ package main import ( + _ "embed" "fmt" "io" "os" @@ -8,8 +9,6 @@ import ( "strings" "text/template" - _ "embed" - "github.com/acarl005/stripansi" "github.com/coder/coder/v2/buildinfo" diff --git a/scripts/release/main.go b/scripts/release/main.go index df38c48a78..58c8f370c1 100644 --- a/scripts/release/main.go +++ b/scripts/release/main.go @@ -21,7 +21,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/sloghuman" - "github.com/coder/coder/v2/cli/cliui" "github.com/coder/serpent" ) diff --git a/scripts/releasemigrations/main.go b/scripts/releasemigrations/main.go index 249d1891f9..fc70c8e1dc 100644 --- a/scripts/releasemigrations/main.go +++ b/scripts/releasemigrations/main.go @@ -7,9 +7,8 @@ import ( "os/exec" "strings" - "golang.org/x/xerrors" - "golang.org/x/mod/semver" + "golang.org/x/xerrors" ) // main will print out the number of migrations added between each release. diff --git a/scripts/testidp/main.go b/scripts/testidp/main.go index b20ac6dc20..7496c680ed 100644 --- a/scripts/testidp/main.go +++ b/scripts/testidp/main.go @@ -16,7 +16,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/sloghuman" - "github.com/coder/coder/v2/coderd/coderdtest/oidctest" "github.com/coder/coder/v2/codersdk" ) diff --git a/site/site.go b/site/site.go index 41553e5025..79df6cc3d6 100644 --- a/site/site.go +++ b/site/site.go @@ -35,7 +35,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/appearance" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/db2sdk" diff --git a/support/support.go b/support/support.go index 00f71fef5c..ae9149c725 100644 --- a/support/support.go +++ b/support/support.go @@ -18,7 +18,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/sloghuman" - "github.com/coder/coder/v2/coderd/healthcheck/derphealth" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/codersdk/agentsdk" diff --git a/support/support_test.go b/support/support_test.go index 0340d785a3..f3c374347c 100644 --- a/support/support_test.go +++ b/support/support_test.go @@ -17,7 +17,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/sloghuman" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/agent" "github.com/coder/coder/v2/agent/agenttest" "github.com/coder/coder/v2/coderd/coderdtest" diff --git a/tailnet/client.go b/tailnet/client.go index 483026e2f3..de1e9f527a 100644 --- a/tailnet/client.go +++ b/tailnet/client.go @@ -8,7 +8,6 @@ import ( "golang.org/x/xerrors" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/codersdk/drpcsdk" "github.com/coder/coder/v2/tailnet/proto" ) diff --git a/tailnet/configmaps.go b/tailnet/configmaps.go index eb3517f018..7d61610368 100644 --- a/tailnet/configmaps.go +++ b/tailnet/configmaps.go @@ -28,7 +28,6 @@ import ( "tailscale.com/wgengine/wgcfg/nmcfg" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/tailnet/proto" "github.com/coder/quartz" ) diff --git a/tailnet/conn.go b/tailnet/conn.go index 2c29212af7..e9f0899405 100644 --- a/tailnet/conn.go +++ b/tailnet/conn.go @@ -42,7 +42,6 @@ import ( "tailscale.com/wgengine/router" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/cryptorand" "github.com/coder/coder/v2/tailnet/proto" ) diff --git a/tailnet/conn_test.go b/tailnet/conn_test.go index f4c60c554d..7e8ac53474 100644 --- a/tailnet/conn_test.go +++ b/tailnet/conn_test.go @@ -14,7 +14,6 @@ import ( "go.uber.org/goleak" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/tailnet" "github.com/coder/coder/v2/tailnet/proto" "github.com/coder/coder/v2/tailnet/tailnettest" diff --git a/tailnet/controllers.go b/tailnet/controllers.go index c167f5c395..b51ddcdffe 100644 --- a/tailnet/controllers.go +++ b/tailnet/controllers.go @@ -22,13 +22,11 @@ import ( "tailscale.com/util/dnsname" "cdr.dev/slog/v3" - - "github.com/coder/quartz" - "github.com/coder/retry" - "github.com/coder/coder/v2/coderd/util/ptr" "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/tailnet/proto" + "github.com/coder/quartz" + "github.com/coder/retry" ) // A Controller connects to the tailnet control plane, and then uses the control protocols to diff --git a/tailnet/controllers_test.go b/tailnet/controllers_test.go index 120d141fe1..247698d6c0 100644 --- a/tailnet/controllers_test.go +++ b/tailnet/controllers_test.go @@ -29,7 +29,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/tailnet" "github.com/coder/coder/v2/tailnet/proto" "github.com/coder/coder/v2/tailnet/tailnettest" diff --git a/tailnet/coordinator.go b/tailnet/coordinator.go index 9fb852eca2..c3df906b4d 100644 --- a/tailnet/coordinator.go +++ b/tailnet/coordinator.go @@ -16,7 +16,6 @@ import ( "tailscale.com/types/key" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/tailnet/proto" ) diff --git a/tailnet/coordinator_test.go b/tailnet/coordinator_test.go index 76fa6d4a09..fb7ecc73dc 100644 --- a/tailnet/coordinator_test.go +++ b/tailnet/coordinator_test.go @@ -10,7 +10,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/tailnet" "github.com/coder/coder/v2/tailnet/proto" "github.com/coder/coder/v2/tailnet/test" diff --git a/tailnet/derp.go b/tailnet/derp.go index 3bf67b17cd..f14afb430e 100644 --- a/tailnet/derp.go +++ b/tailnet/derp.go @@ -14,7 +14,6 @@ import ( "tailscale.com/tailcfg" "cdr.dev/slog/v3" - "github.com/coder/websocket" ) diff --git a/tailnet/node.go b/tailnet/node.go index 532d15aad8..bb193dc272 100644 --- a/tailnet/node.go +++ b/tailnet/node.go @@ -13,7 +13,6 @@ import ( "tailscale.com/wgengine" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/database/dbtime" ) diff --git a/tailnet/peer.go b/tailnet/peer.go index 4e4638443f..34179821a1 100644 --- a/tailnet/peer.go +++ b/tailnet/peer.go @@ -4,12 +4,10 @@ import ( "context" "time" + "github.com/google/uuid" "golang.org/x/xerrors" - "github.com/google/uuid" - "cdr.dev/slog/v3" - "github.com/coder/coder/v2/tailnet/proto" ) diff --git a/tailnet/service.go b/tailnet/service.go index 438d233db4..6ae02876a4 100644 --- a/tailnet/service.go +++ b/tailnet/service.go @@ -16,7 +16,6 @@ import ( "tailscale.com/tailcfg" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/apiversion" "github.com/coder/coder/v2/codersdk/drpcsdk" "github.com/coder/coder/v2/tailnet/proto" diff --git a/tailnet/test/integration/integration.go b/tailnet/test/integration/integration.go index ede850f3ae..4f27d50386 100644 --- a/tailnet/test/integration/integration.go +++ b/tailnet/test/integration/integration.go @@ -35,7 +35,6 @@ import ( "tailscale.com/wgengine/capture" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/coderd/httpapi" "github.com/coder/coder/v2/coderd/httpmw/loggermw" "github.com/coder/coder/v2/coderd/tracing" diff --git a/tailnet/test/integration/network.go b/tailnet/test/integration/network.go index daa4b66fb0..a5ed0a8e9f 100644 --- a/tailnet/test/integration/network.go +++ b/tailnet/test/integration/network.go @@ -18,7 +18,6 @@ import ( "tailscale.com/tailcfg" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/cryptorand" ) diff --git a/tailnet/test/integration/suite.go b/tailnet/test/integration/suite.go index 36003c951b..810ccfb33d 100644 --- a/tailnet/test/integration/suite.go +++ b/tailnet/test/integration/suite.go @@ -13,7 +13,6 @@ import ( "github.com/stretchr/testify/require" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/tailnet" "github.com/coder/coder/v2/testutil" ) diff --git a/testutil/pty.go b/testutil/pty.go index 3ada3408a6..c967835e82 100644 --- a/testutil/pty.go +++ b/testutil/pty.go @@ -6,9 +6,8 @@ import ( "strings" "testing" - "golang.org/x/xerrors" - "github.com/hinshun/vt10x" + "golang.org/x/xerrors" ) // TerminalReader emulates a terminal and allows matching output. It's important in cases where we diff --git a/vpn/client.go b/vpn/client.go index bbaadf15bc..561c598311 100644 --- a/vpn/client.go +++ b/vpn/client.go @@ -7,19 +7,16 @@ import ( "net/url" "time" + "github.com/google/uuid" + "github.com/tailscale/wireguard-go/tun" "golang.org/x/xerrors" - "tailscale.com/ipn/ipnstate" "tailscale.com/net/dns" "tailscale.com/net/netmon" "tailscale.com/tailcfg" "tailscale.com/wgengine/router" - "github.com/google/uuid" - "github.com/tailscale/wireguard-go/tun" - "cdr.dev/slog/v3" - "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/codersdk/workspacesdk" "github.com/coder/coder/v2/tailnet" diff --git a/vpn/client_test.go b/vpn/client_test.go index 396f9b6762..b4a1ff0e37 100644 --- a/vpn/client_test.go +++ b/vpn/client_test.go @@ -9,14 +9,13 @@ import ( "testing" "time" - "tailscale.com/util/dnsname" - "github.com/google/uuid" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" "tailscale.com/net/dns" "tailscale.com/tailcfg" + "tailscale.com/util/dnsname" "github.com/coder/coder/v2/coderd/httpapi" "github.com/coder/coder/v2/codersdk" diff --git a/vpn/dylib/lib.go b/vpn/dylib/lib.go index 34bf19df43..35d2d8d5cb 100644 --- a/vpn/dylib/lib.go +++ b/vpn/dylib/lib.go @@ -10,7 +10,6 @@ import ( "golang.org/x/sys/unix" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/vpn" ) diff --git a/vpn/speaker_internal_test.go b/vpn/speaker_internal_test.go index 7bd8a64e5b..412c0831a2 100644 --- a/vpn/speaker_internal_test.go +++ b/vpn/speaker_internal_test.go @@ -15,7 +15,6 @@ import ( "cdr.dev/slog/v3" "cdr.dev/slog/v3/sloggers/slogtest" - "github.com/coder/coder/v2/testutil" ) diff --git a/vpn/tun_windows.go b/vpn/tun_windows.go index 7a9ff8220a..fadf6caf27 100644 --- a/vpn/tun_windows.go +++ b/vpn/tun_windows.go @@ -21,7 +21,6 @@ import ( "tailscale.com/wgengine/router" "cdr.dev/slog/v3" - "github.com/coder/coder/v2/tailnet" "github.com/coder/retry" ) diff --git a/vpn/tunnel.go b/vpn/tunnel.go index 1a0af979ac..2734495e89 100644 --- a/vpn/tunnel.go +++ b/vpn/tunnel.go @@ -27,11 +27,9 @@ import ( "tailscale.com/wgengine/router" "cdr.dev/slog/v3" - - "github.com/coder/quartz" - "github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/tailnet" + "github.com/coder/quartz" ) // netStatusInterval is the interval at which the tunnel records latencies, diff --git a/vpn/tunnel_internal_test.go b/vpn/tunnel_internal_test.go index c21fd20251..32ac8c6401 100644 --- a/vpn/tunnel_internal_test.go +++ b/vpn/tunnel_internal_test.go @@ -19,12 +19,11 @@ import ( "tailscale.com/tailcfg" "tailscale.com/util/dnsname" - "github.com/coder/quartz" - maputil "github.com/coder/coder/v2/coderd/util/maps" "github.com/coder/coder/v2/tailnet" "github.com/coder/coder/v2/tailnet/proto" "github.com/coder/coder/v2/testutil" + "github.com/coder/quartz" ) func newFakeClient(ctx context.Context, t *testing.T) *fakeClient {