Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings
This repository was archived by the owner on Aug 30, 2024. It is now read-only.
/coder-v1-cliPublic archive

Commit9477995

Browse files
authored
Restructure go util packages (#166)
1 parentc3802f8 commit9477995

35 files changed

+85
-89
lines changed

‎.golangci.yml

Lines changed: 3 additions & 3 deletions
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

Lines changed: 1 addition & 1 deletion
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
funcTestDevURLCLI(t*testing.T) {

‎ci/integration/envs_test.go

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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
funcTestSecrets(t*testing.T) {

‎ci/integration/setup_test.go

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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
funcTestSSH(t*testing.T) {

‎ci/integration/users_test.go

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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
funcmain() {

‎coder-sdk/devurl.go

Lines changed: 5 additions & 5 deletions
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
typeDevURLstruct {
11-
IDstring`json:"id"tab:"ID"`
12-
URLstring`json:"url"tab:"URL"`
13-
Portint`json:"port"tab:"Port"`
14-
Accessstring`json:"access"tab:"Access"`
15-
Namestring`json:"name"tab:"Name"`
11+
IDstring`json:"id"table:"ID"`
12+
URLstring`json:"url"table:"URL"`
13+
Portint`json:"port"table:"Port"`
14+
Accessstring`json:"access"table:"Access"`
15+
Namestring`json:"name"table:"Name"`
1616
}
1717

1818
typedelDevURLRequeststruct {

‎coder-sdk/env.go

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -13,32 +13,32 @@ import (
1313

1414
// Environment describes a Coder environment
1515
typeEnvironmentstruct {
16-
IDstring`json:"id"tab:"-"`
17-
Namestring`json:"name"tab:"Name"`
18-
ImageIDstring`json:"image_id"tab:"-"`
19-
ImageTagstring`json:"image_tag"tab:"ImageTag"`
20-
OrganizationIDstring`json:"organization_id"tab:"-"`
21-
UserIDstring`json:"user_id"tab:"-"`
22-
LastBuiltAt time.Time`json:"last_built_at"tab:"-"`
23-
CPUCoresfloat32`json:"cpu_cores"tab:"CPUCores"`
24-
MemoryGBfloat32`json:"memory_gb"tab:"MemoryGB"`
25-
DiskGBint`json:"disk_gb"tab:"DiskGB"`
26-
GPUsint`json:"gpus"tab:"GPUs"`
27-
Updatingbool`json:"updating"tab:"Updating"`
28-
LatestStatEnvironmentStat`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+
IDstring`json:"id"table:"-"`
17+
Namestring`json:"name"table:"Name"`
18+
ImageIDstring`json:"image_id"table:"-"`
19+
ImageTagstring`json:"image_tag"table:"ImageTag"`
20+
OrganizationIDstring`json:"organization_id"table:"-"`
21+
UserIDstring`json:"user_id"table:"-"`
22+
LastBuiltAt time.Time`json:"last_built_at"table:"-"`
23+
CPUCoresfloat32`json:"cpu_cores"table:"CPUCores"`
24+
MemoryGBfloat32`json:"memory_gb"table:"MemoryGB"`
25+
DiskGBint`json:"disk_gb"table:"DiskGB"`
26+
GPUsint`json:"gpus"table:"GPUs"`
27+
Updatingbool`json:"updating"table:"Updating"`
28+
LatestStatEnvironmentStat`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
typeRebuildMessagestruct {
3939
Textstring`json:"text"`
4040
Requiredbool`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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ import (
88

99
// Secret describes a Coder secret
1010
typeSecretstruct {
11-
IDstring`json:"id"tab:"-"`
12-
Namestring`json:"name"tab:"Name"`
13-
Valuestring`json:"value,omitempty"tab:"Value"`
14-
Descriptionstring`json:"description"tab:"Description"`
15-
CreatedAt time.Time`json:"created_at"tab:"CreatedAt"`
16-
UpdatedAt time.Time`json:"updated_at"tab:"-"`
11+
IDstring`json:"id"table:"-"`
12+
Namestring`json:"name"table:"Name"`
13+
Valuestring`json:"value,omitempty"table:"Value"`
14+
Descriptionstring`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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ import (
88

99
// User describes a Coder user account.
1010
typeUserstruct {
11-
IDstring`json:"id"tab:"-"`
12-
Emailstring`json:"email"tab:"Email"`
13-
Usernamestring`json:"username"tab:"Username"`
14-
Namestring`json:"name"tab:"Name"`
15-
CreatedAt time.Time`json:"created_at"tab:"CreatedAt"`
16-
UpdatedAt time.Time`json:"updated_at"tab:"-"`
11+
IDstring`json:"id"table:"-"`
12+
Emailstring`json:"email"table:"Email"`
13+
Usernamestring`json:"username"table:"Username"`
14+
Namestring`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

Lines changed: 1 addition & 1 deletion
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
constpushInterval=time.Minute

‎internal/cmd/auth.go

Lines changed: 1 addition & 1 deletion
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
varerrNeedLogin=clog.Fatal(

‎internal/cmd/ceapi.go

Lines changed: 1 addition & 1 deletion
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

Lines changed: 3 additions & 3 deletions
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
switchoutputFmt {
6464
case"human":
65-
err:=xtabwriter.WriteTable(len(envs),func(iint)interface{} {
65+
err:=tablewriter.WriteTable(len(envs),func(iint)interface{} {
6666
returnenvs[i]
6767
})
6868
iferr!=nil {

‎internal/cmd/login.go

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 3 additions & 3 deletions
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
funcsecretsCmd()*cobra.Command {
@@ -159,7 +159,7 @@ func listSecretsCmd(userEmail *string) func(cmd *cobra.Command, _ []string) erro
159159
returnnil
160160
}
161161

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

‎internal/cmd/shell.go

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 8 additions & 8 deletions
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
funcurlCmd()*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
typeDevURLstruct {
54-
IDstring`json:"id"tab:"-"`
55-
URLstring`json:"url"tab:"URL"`
56-
Portint`json:"port"tab:"Port"`
57-
Namestring`json:"name"tab:"-"`
58-
Accessstring`json:"access"tab:"Access"`
54+
IDstring`json:"id"table:"-"`
55+
URLstring`json:"url"table:"URL"`
56+
Portint`json:"port"table:"Port"`
57+
Namestring`json:"name"table:"-"`
58+
Accessstring`json:"access"table:"Access"`
5959
}
6060

6161
varurlAccessLevel=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
returnnil
106106
}
107-
err:=xtabwriter.WriteTable(len(devURLs),func(iint)interface{} {
107+
err:=tablewriter.WriteTable(len(devURLs),func(iint)interface{} {
108108
returndevURLs[i]
109109
})
110110
iferr!=nil {

‎internal/cmd/users.go

Lines changed: 2 additions & 3 deletions
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
funcusersCmd()*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(iint)interface{} {returnusers[i] }
50-
iferr:=xtabwriter.WriteTable(len(users),each);err!=nil {
49+
iferr:=tablewriter.WriteTable(len(users),each);err!=nil {
5150
returnxerrors.Errorf("write table: %w",err)
5251
}
5352
case"json":

‎internal/sync/sync.go

Lines changed: 1 addition & 1 deletion
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.gorenamed to‎pkg/clog/doc.go

Lines changed: 1 addition & 1 deletion
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.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp