Skip to content
This repository was archived by the owner on Aug 30, 2024. It is now read-only.

Commit 9477995

Browse files
cmoogcmoog
authored
Restructure go util packages (#166)
1 parent c3802f8 commit 9477995

35 files changed

+85
-89
lines changed

‎.golangci.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ linters-settings:
1212
settings:
1313
printf:
1414
funcs: # Run `go tool vet help printf` to see available settings for `printf` analyzer.
15-
- (cdr.dev/coder-cli/internal/clog).Tipf
16-
- (cdr.dev/coder-cli/internal/clog).Hintf
17-
- (cdr.dev/coder-cli/internal/clog).Causef
15+
- (cdr.dev/coder-cli/pkg/clog).Tipf
16+
- (cdr.dev/coder-cli/pkg/clog).Hintf
17+
- (cdr.dev/coder-cli/pkg/clog).Causef

‎ci/integration/devurls_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55
"testing"
66

7-
"cdr.dev/coder-cli/ci/tcli"
7+
"cdr.dev/coder-cli/pkg/tcli"
88
)
99

1010
func TestDevURLCLI(t *testing.T) {

‎ci/integration/envs_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
"testing"
1010
"time"
1111

12-
"cdr.dev/coder-cli/ci/tcli"
1312
"cdr.dev/coder-cli/coder-sdk"
13+
"cdr.dev/coder-cli/pkg/tcli"
1414
"cdr.dev/slog"
1515
"cdr.dev/slog/sloggers/slogtest"
1616
"cdr.dev/slog/sloggers/slogtest/assert"

‎ci/integration/integration_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"testing"
77
"time"
88

9-
"cdr.dev/coder-cli/ci/tcli"
9+
"cdr.dev/coder-cli/pkg/tcli"
1010
"cdr.dev/slog/sloggers/slogtest/assert"
1111
)
1212

‎ci/integration/secrets_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"regexp"
77
"testing"
88

9-
"cdr.dev/coder-cli/ci/tcli"
9+
"cdr.dev/coder-cli/pkg/tcli"
1010
)
1111

1212
func TestSecrets(t *testing.T) {

‎ci/integration/setup_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"strings"
1010
"testing"
1111

12-
"cdr.dev/coder-cli/ci/tcli"
12+
"cdr.dev/coder-cli/pkg/tcli"
1313
"golang.org/x/xerrors"
1414
)
1515

‎ci/integration/ssh_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"context"
55
"testing"
66

7-
"cdr.dev/coder-cli/ci/tcli"
87
"cdr.dev/coder-cli/coder-sdk"
8+
"cdr.dev/coder-cli/pkg/tcli"
99
)
1010

1111
func TestSSH(t *testing.T) {

‎ci/integration/users_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"context"
55
"testing"
66

7-
"cdr.dev/coder-cli/ci/tcli"
87
"cdr.dev/coder-cli/coder-sdk"
8+
"cdr.dev/coder-cli/pkg/tcli"
99
"cdr.dev/slog/sloggers/slogtest/assert"
1010
)
1111

‎cmd/coder/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import (
99
"os"
1010
"runtime"
1111

12-
"cdr.dev/coder-cli/internal/clog"
1312
"cdr.dev/coder-cli/internal/cmd"
1413
"cdr.dev/coder-cli/internal/version"
1514
"cdr.dev/coder-cli/internal/x/xterminal"
15+
"cdr.dev/coder-cli/pkg/clog"
1616
)
1717

1818
func main() {

‎coder-sdk/devurl.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ import (
88

99
// DevURL is the parsed json response record for a devURL from cemanager.
1010
type DevURL struct {
11-
ID string `json:"id" tab:"ID"`
12-
URL string `json:"url" tab:"URL"`
13-
Port int `json:"port" tab:"Port"`
14-
Access string `json:"access" tab:"Access"`
15-
Name string `json:"name" tab:"Name"`
11+
ID string `json:"id" table:"ID"`
12+
URL string `json:"url" table:"URL"`
13+
Port int `json:"port" table:"Port"`
14+
Access string `json:"access" table:"Access"`
15+
Name string `json:"name" table:"Name"`
1616
}
1717

1818
type delDevURLRequest struct {

‎coder-sdk/env.go

+20-20
Original file line numberDiff line numberDiff line change
@@ -13,32 +13,32 @@ import (
1313

1414
// Environment describes a Coder environment
1515
type Environment struct {
16-
ID string `json:"id" tab:"-"`
17-
Name string `json:"name" tab:"Name"`
18-
ImageID string `json:"image_id" tab:"-"`
19-
ImageTag string `json:"image_tag" tab:"ImageTag"`
20-
OrganizationID string `json:"organization_id" tab:"-"`
21-
UserID string `json:"user_id" tab:"-"`
22-
LastBuiltAt time.Time `json:"last_built_at" tab:"-"`
23-
CPUCores float32 `json:"cpu_cores" tab:"CPUCores"`
24-
MemoryGB float32 `json:"memory_gb" tab:"MemoryGB"`
25-
DiskGB int `json:"disk_gb" tab:"DiskGB"`
26-
GPUs int `json:"gpus" tab:"GPUs"`
27-
Updating bool `json:"updating" tab:"Updating"`
28-
LatestStat EnvironmentStat `json:"latest_stat" tab:"Status"`
29-
RebuildMessages []RebuildMessage `json:"rebuild_messages" tab:"-"`
30-
CreatedAt time.Time `json:"created_at" tab:"-"`
31-
UpdatedAt time.Time `json:"updated_at" tab:"-"`
32-
LastOpenedAt time.Time `json:"last_opened_at" tab:"-"`
33-
LastConnectionAt time.Time `json:"last_connection_at" tab:"-"`
34-
AutoOffThreshold xjson.MSDuration `json:"auto_off_threshold" tab:"-"`
16+
ID string `json:"id" table:"-"`
17+
Name string `json:"name" table:"Name"`
18+
ImageID string `json:"image_id" table:"-"`
19+
ImageTag string `json:"image_tag" table:"ImageTag"`
20+
OrganizationID string `json:"organization_id" table:"-"`
21+
UserID string `json:"user_id" table:"-"`
22+
LastBuiltAt time.Time `json:"last_built_at" table:"-"`
23+
CPUCores float32 `json:"cpu_cores" table:"CPUCores"`
24+
MemoryGB float32 `json:"memory_gb" table:"MemoryGB"`
25+
DiskGB int `json:"disk_gb" table:"DiskGB"`
26+
GPUs int `json:"gpus" table:"GPUs"`
27+
Updating bool `json:"updating" table:"Updating"`
28+
LatestStat EnvironmentStat `json:"latest_stat" table:"Status"`
29+
RebuildMessages []RebuildMessage `json:"rebuild_messages" table:"-"`
30+
CreatedAt time.Time `json:"created_at" table:"-"`
31+
UpdatedAt time.Time `json:"updated_at" table:"-"`
32+
LastOpenedAt time.Time `json:"last_opened_at" table:"-"`
33+
LastConnectionAt time.Time `json:"last_connection_at" table:"-"`
34+
AutoOffThreshold xjson.MSDuration `json:"auto_off_threshold" table:"-"`
3535
}
3636

3737
// RebuildMessage defines the message shown when an Environment requires a rebuild for it can be accessed.
3838
type RebuildMessage struct {
3939
Text string `json:"text"`
4040
Required bool `json:"required"`
41-
AutoOffThreshold xjson.MSDuration `json:"auto_off_threshold" tab:"-"`
41+
AutoOffThreshold xjson.MSDuration `json:"auto_off_threshold" table:"-"`
4242
}
4343

4444
// EnvironmentStat represents the state of an environment

‎coder-sdk/secrets.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ import (
88

99
// Secret describes a Coder secret
1010
type Secret struct {
11-
ID string `json:"id" tab:"-"`
12-
Name string `json:"name" tab:"Name"`
13-
Value string `json:"value,omitempty" tab:"Value"`
14-
Description string `json:"description" tab:"Description"`
15-
CreatedAt time.Time `json:"created_at" tab:"CreatedAt"`
16-
UpdatedAt time.Time `json:"updated_at" tab:"-"`
11+
ID string `json:"id" table:"-"`
12+
Name string `json:"name" table:"Name"`
13+
Value string `json:"value,omitempty" table:"Value"`
14+
Description string `json:"description" table:"Description"`
15+
CreatedAt time.Time `json:"created_at" table:"CreatedAt"`
16+
UpdatedAt time.Time `json:"updated_at" table:"-"`
1717
}
1818

1919
// Secrets gets all secrets for the given user

‎coder-sdk/users.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ import (
88

99
// User describes a Coder user account.
1010
type User struct {
11-
ID string `json:"id" tab:"-"`
12-
Email string `json:"email" tab:"Email"`
13-
Username string `json:"username" tab:"Username"`
14-
Name string `json:"name" tab:"Name"`
15-
CreatedAt time.Time `json:"created_at" tab:"CreatedAt"`
16-
UpdatedAt time.Time `json:"updated_at" tab:"-"`
11+
ID string `json:"id" table:"-"`
12+
Email string `json:"email" table:"Email"`
13+
Username string `json:"username" table:"Username"`
14+
Name string `json:"name" table:"Name"`
15+
CreatedAt time.Time `json:"created_at" table:"CreatedAt"`
16+
UpdatedAt time.Time `json:"updated_at" table:"-"`
1717
}
1818

1919
// Me gets the details of the authenticated user.

‎internal/activity/pusher.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"golang.org/x/time/rate"
99

1010
"cdr.dev/coder-cli/coder-sdk"
11-
"cdr.dev/coder-cli/internal/clog"
11+
"cdr.dev/coder-cli/pkg/clog"
1212
)
1313

1414
const pushInterval = time.Minute

‎internal/cmd/auth.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99
"golang.org/x/xerrors"
1010

1111
"cdr.dev/coder-cli/coder-sdk"
12-
"cdr.dev/coder-cli/internal/clog"
1312
"cdr.dev/coder-cli/internal/config"
1413
"cdr.dev/coder-cli/internal/version"
14+
"cdr.dev/coder-cli/pkg/clog"
1515
)
1616

1717
var errNeedLogin = clog.Fatal(

‎internal/cmd/ceapi.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"strings"
77

88
"cdr.dev/coder-cli/coder-sdk"
9-
"cdr.dev/coder-cli/internal/clog"
9+
"cdr.dev/coder-cli/pkg/clog"
1010
"golang.org/x/xerrors"
1111
)
1212

‎internal/cmd/envs.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"os"
88

99
"cdr.dev/coder-cli/coder-sdk"
10-
"cdr.dev/coder-cli/internal/clog"
11-
"cdr.dev/coder-cli/internal/x/xtabwriter"
10+
"cdr.dev/coder-cli/pkg/clog"
11+
"cdr.dev/coder-cli/pkg/tablewriter"
1212

1313
"github.com/manifoldco/promptui"
1414
"github.com/spf13/cobra"
@@ -62,7 +62,7 @@ func lsEnvsCommand(user *string) *cobra.Command {
6262

6363
switch outputFmt {
6464
case "human":
65-
err := xtabwriter.WriteTable(len(envs), func(i int) interface{} {
65+
err := tablewriter.WriteTable(len(envs), func(i int) interface{} {
6666
return envs[i]
6767
})
6868
if err != nil {

‎internal/cmd/login.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99
"strings"
1010

1111
"cdr.dev/coder-cli/coder-sdk"
12-
"cdr.dev/coder-cli/internal/clog"
1312
"cdr.dev/coder-cli/internal/config"
1413
"cdr.dev/coder-cli/internal/loginsrv"
14+
"cdr.dev/coder-cli/pkg/clog"
1515
"github.com/pkg/browser"
1616
"github.com/spf13/cobra"
1717
"golang.org/x/sync/errgroup"

‎internal/cmd/logout.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package cmd
33
import (
44
"os"
55

6-
"cdr.dev/coder-cli/internal/clog"
76
"cdr.dev/coder-cli/internal/config"
7+
"cdr.dev/coder-cli/pkg/clog"
88
"github.com/spf13/cobra"
99
"golang.org/x/xerrors"
1010
)

‎internal/cmd/rebuild.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"time"
99

1010
"cdr.dev/coder-cli/coder-sdk"
11-
"cdr.dev/coder-cli/internal/clog"
11+
"cdr.dev/coder-cli/pkg/clog"
1212
"github.com/briandowns/spinner"
1313
"github.com/fatih/color"
1414
"github.com/manifoldco/promptui"

‎internal/cmd/resourcemanager.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"text/tabwriter"
99

1010
"cdr.dev/coder-cli/coder-sdk"
11-
"cdr.dev/coder-cli/internal/clog"
11+
"cdr.dev/coder-cli/pkg/clog"
1212
"github.com/spf13/cobra"
1313
"golang.org/x/xerrors"
1414
)

‎internal/cmd/secrets.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
"golang.org/x/xerrors"
1111

1212
"cdr.dev/coder-cli/coder-sdk"
13-
"cdr.dev/coder-cli/internal/clog"
14-
"cdr.dev/coder-cli/internal/x/xtabwriter"
13+
"cdr.dev/coder-cli/pkg/clog"
14+
"cdr.dev/coder-cli/pkg/tablewriter"
1515
)
1616

1717
func secretsCmd() *cobra.Command {
@@ -159,7 +159,7 @@ func listSecretsCmd(userEmail *string) func(cmd *cobra.Command, _ []string) erro
159159
return nil
160160
}
161161

162-
err = xtabwriter.WriteTable(len(secrets), func(i int) interface{} {
162+
err = tablewriter.WriteTable(len(secrets), func(i int) interface{} {
163163
s := secrets[i]
164164
s.Value = "******" // value is omitted from bulk responses
165165
return s

‎internal/cmd/shell.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import (
1616

1717
"cdr.dev/coder-cli/coder-sdk"
1818
"cdr.dev/coder-cli/internal/activity"
19-
"cdr.dev/coder-cli/internal/clog"
2019
"cdr.dev/coder-cli/internal/x/xterminal"
20+
"cdr.dev/coder-cli/pkg/clog"
2121
"cdr.dev/wsep"
2222
)
2323

‎internal/cmd/sync.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
"strings"
1010

1111
"cdr.dev/coder-cli/coder-sdk"
12-
"cdr.dev/coder-cli/internal/clog"
1312
"cdr.dev/coder-cli/internal/sync"
13+
"cdr.dev/coder-cli/pkg/clog"
1414
"github.com/spf13/cobra"
1515
"golang.org/x/xerrors"
1616
)

‎internal/cmd/urls.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import (
1414
"golang.org/x/xerrors"
1515

1616
"cdr.dev/coder-cli/coder-sdk"
17-
"cdr.dev/coder-cli/internal/clog"
18-
"cdr.dev/coder-cli/internal/x/xtabwriter"
17+
"cdr.dev/coder-cli/pkg/clog"
18+
"cdr.dev/coder-cli/pkg/tablewriter"
1919
)
2020

2121
func urlCmd() *cobra.Command {
@@ -51,11 +51,11 @@ func urlCmd() *cobra.Command {
5151

5252
// DevURL is the parsed json response record for a devURL from cemanager
5353
type DevURL struct {
54-
ID string `json:"id" tab:"-"`
55-
URL string `json:"url" tab:"URL"`
56-
Port int `json:"port" tab:"Port"`
57-
Name string `json:"name" tab:"-"`
58-
Access string `json:"access" tab:"Access"`
54+
ID string `json:"id" table:"-"`
55+
URL string `json:"url" table:"URL"`
56+
Port int `json:"port" table:"Port"`
57+
Name string `json:"name" table:"-"`
58+
Access string `json:"access" table:"Access"`
5959
}
6060

6161
var urlAccessLevel = map[string]string{
@@ -104,7 +104,7 @@ func listDevURLsCmd(outputFmt *string) func(cmd *cobra.Command, args []string) e
104104
clog.LogInfo(fmt.Sprintf("no devURLs found for environment %q", envName))
105105
return nil
106106
}
107-
err := xtabwriter.WriteTable(len(devURLs), func(i int) interface{} {
107+
err := tablewriter.WriteTable(len(devURLs), func(i int) interface{} {
108108
return devURLs[i]
109109
})
110110
if err != nil {

‎internal/cmd/users.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@ import (
44
"encoding/json"
55
"os"
66

7+
"cdr.dev/coder-cli/pkg/tablewriter"
78
"github.com/spf13/cobra"
89
"golang.org/x/xerrors"
9-
10-
"cdr.dev/coder-cli/internal/x/xtabwriter"
1110
)
1211

1312
func usersCmd() *cobra.Command {
@@ -47,7 +46,7 @@ func listUsers(outputFmt *string) func(cmd *cobra.Command, args []string) error
4746
case "human":
4847
// For each element, return the user.
4948
each := func(i int) interface{} { return users[i] }
50-
if err := xtabwriter.WriteTable(len(users), each); err != nil {
49+
if err := tablewriter.WriteTable(len(users), each); err != nil {
5150
return xerrors.Errorf("write table: %w", err)
5251
}
5352
case "json":

‎internal/sync/sync.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323

2424
"cdr.dev/coder-cli/coder-sdk"
2525
"cdr.dev/coder-cli/internal/activity"
26-
"cdr.dev/coder-cli/internal/clog"
26+
"cdr.dev/coder-cli/pkg/clog"
2727
"cdr.dev/wsep"
2828
)
2929

‎internal/clog/doc.go renamed to ‎pkg/clog/doc.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// package clog provides rich error types and logging helpers for coder-cli.
1+
// Package clog provides rich error types and logging helpers for coder-cli.
22
//
33
// clog encourages returning error types rather than
44
// logging them and failing with os.Exit as they happen.

‎internal/clog/errgroup.go renamed to ‎pkg/clog/errgroup.go

File renamed without changes.

‎internal/clog/error.go renamed to ‎pkg/clog/error.go

File renamed without changes.

0 commit comments

Comments
 (0)