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

Commit d664df2

Browse files
cmoogcmoog
committed
Remove "failed to" from errs
1 parent 5f7d205 commit d664df2

File tree

9 files changed

+31
-31
lines changed

9 files changed

+31
-31
lines changed

‎ci/integration/setup_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func build(path string) error {
3939

4040
out, err := cmd.CombinedOutput()
4141
if err != nil {
42-
return xerrors.Errorf("failed to build coder-cli (%v): %w", string(out), err)
42+
return xerrors.Errorf("build coder-cli (%v): %w", string(out), err)
4343
}
4444
return nil
4545
}

‎ci/tcli/tcli.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ func NewContainerRunner(ctx context.Context, config *ContainerConfig) (*Containe
7676
out, err := cmd.CombinedOutput()
7777
if err != nil {
7878
return nil, xerrors.Errorf(
79-
"failed to start testing container %q, (%s): %w",
79+
"start testing container %q, (%s): %w",
8080
config.Name, string(out), err)
8181
}
8282

@@ -97,7 +97,7 @@ func (r *ContainerRunner) Close() error {
9797
out, err := cmd.CombinedOutput()
9898
if err != nil {
9999
return xerrors.Errorf(
100-
"failed to stop testing container %q, (%s): %w",
100+
"stop testing container %q, (%s): %w",
101101
r.name, string(out), err)
102102
}
103103
return nil
@@ -290,7 +290,7 @@ func matches(t *testing.T, name, pattern string, target []byte) {
290290

291291
ok, err := regexp.Match(pattern, target)
292292
if err != nil {
293-
slogtest.Fatal(t, "failed to attempt regexp match", append(fields, slog.Error(err))...)
293+
slogtest.Fatal(t, "attempt regexp match", append(fields, slog.Error(err))...)
294294
}
295295
if !ok {
296296
slogtest.Fatal(t, "expected to find pattern, no match found", fields...)

‎cmd/coder/ceapi.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ func getEnvs(client *entclient.Client) ([]entclient.Environment, error) {
5959
func findEnv(client *entclient.Client, name string) (*entclient.Environment, error) {
6060
envs, err := getEnvs(client)
6161
if err != nil {
62-
return nil, xerrors.Errorf("failed to get environments: %w", err)
62+
return nil, xerrors.Errorf("get environments: %w", err)
6363
}
6464

6565
var found []string

‎cmd/coder/configssh.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ func configSSH(filepath *string, remove *bool) func(c *cli.Context) error {
6666
// SSH configs are not always already there.
6767
currentConfig = ""
6868
} else if err != nil {
69-
return xerrors.Errorf("failed to read ssh config file %q: %w", filepath, err)
69+
return xerrors.Errorf("read ssh config file %q: %w", filepath, err)
7070
}
7171

7272
startIndex := strings.Index(currentConfig, startToken)
@@ -80,7 +80,7 @@ func configSSH(filepath *string, remove *bool) func(c *cli.Context) error {
8080

8181
err = writeStr(*filepath, currentConfig)
8282
if err != nil {
83-
return xerrors.Errorf("failed to write to ssh config file %q: %v", *filepath, err)
83+
return xerrors.Errorf("write to ssh config file %q: %v", *filepath, err)
8484
}
8585

8686
return nil
@@ -95,7 +95,7 @@ func configSSH(filepath *string, remove *bool) func(c *cli.Context) error {
9595

9696
me, err := entClient.Me()
9797
if err != nil {
98-
return xerrors.Errorf("failed to fetch username: %w", err)
98+
return xerrors.Errorf("fetch username: %w", err)
9999
}
100100

101101
envs, err := getEnvs(entClient)
@@ -107,7 +107,7 @@ func configSSH(filepath *string, remove *bool) func(c *cli.Context) error {
107107
}
108108
newConfig, err := makeNewConfigs(me.Username, envs, startToken, startMessage, endToken)
109109
if err != nil {
110-
return xerrors.Errorf("failed to make new ssh configurations: %w", err)
110+
return xerrors.Errorf("make new ssh configurations: %w", err)
111111
}
112112

113113
// if we find the old config, remove those chars from the string
@@ -117,11 +117,11 @@ func configSSH(filepath *string, remove *bool) func(c *cli.Context) error {
117117

118118
err = writeStr(*filepath, currentConfig+newConfig)
119119
if err != nil {
120-
return xerrors.Errorf("failed to write new configurations to ssh config file %q: %w", filepath, err)
120+
return xerrors.Errorf("write new configurations to ssh config file %q: %w", filepath, err)
121121
}
122122
err = writeSSHKey(ctx, entClient)
123123
if err != nil {
124-
return xerrors.Errorf("failed to fetch and write ssh key: %w", err)
124+
return xerrors.Errorf("fetch and write ssh key: %w", err)
125125
}
126126

127127
fmt.Printf("An auto-generated ssh config was written to %q\n", *filepath)

‎cmd/coder/envs.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ func makeEnvsCommand() cli.Command {
2121
Name: "ls",
2222
Usage: "list all environments owned by the active user",
2323
Description: "List all Coder environments owned by the active user.",
24-
ArgsUsage: "[...flags]>",
24+
ArgsUsage: "[...flags]",
2525
Action: func(c *cli.Context) error {
2626
entClient := requireAuth()
2727
envs, err := getEnvs(entClient)
@@ -35,12 +35,12 @@ func makeEnvsCommand() cli.Command {
3535
return envs[i]
3636
})
3737
if err != nil {
38-
return xerrors.Errorf("failed to write table: %w", err)
38+
return xerrors.Errorf("write table: %w", err)
3939
}
4040
case "json":
4141
err := json.NewEncoder(os.Stdout).Encode(envs)
4242
if err != nil {
43-
return xerrors.Errorf("failed to write environments as JSON: %w", err)
43+
return xerrors.Errorf("write environments as JSON: %w", err)
4444
}
4545
default:
4646
return xerrors.Errorf("unknown --output value %q", outputFmt)

‎cmd/coder/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func main() {
2727

2828
stdoutState, err := xterminal.MakeOutputRaw(os.Stdout.Fd())
2929
if err != nil {
30-
flog.Fatal("failed to set output to raw: %v", err)
30+
flog.Fatal("set output to raw: %v", err)
3131
}
3232
defer xterminal.Restore(os.Stdout.Fd(), stdoutState)
3333

‎cmd/coder/secrets.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ func makeCreateSecret() cli.Command {
8383
} else if fromFile != "" {
8484
contents, err := ioutil.ReadFile(fromFile)
8585
if err != nil {
86-
return xerrors.Errorf("failed to read file: %w", err)
86+
return xerrors.Errorf("read file: %w", err)
8787
}
8888
value = string(contents)
8989
} else {
@@ -99,7 +99,7 @@ func makeCreateSecret() cli.Command {
9999
}
100100
value, err = prompt.Run()
101101
if err != nil {
102-
return xerrors.Errorf("failed to prompt for value: %w", err)
102+
return xerrors.Errorf("prompt for value: %w", err)
103103
}
104104
}
105105

@@ -109,7 +109,7 @@ func makeCreateSecret() cli.Command {
109109
Description: description,
110110
})
111111
if err != nil {
112-
return xerrors.Errorf("failed to insert secret: %w", err)
112+
return xerrors.Errorf("insert secret: %w", err)
113113
}
114114
return nil
115115
},
@@ -144,7 +144,7 @@ func listSecrets(_ *cli.Context) error {
144144

145145
secrets, err := client.Secrets()
146146
if err != nil {
147-
return xerrors.Errorf("failed to get secrets: %w", err)
147+
return xerrors.Errorf("get secrets: %w", err)
148148
}
149149

150150
if len(secrets) < 1 {
@@ -158,7 +158,7 @@ func listSecrets(_ *cli.Context) error {
158158
return s
159159
})
160160
if err != nil {
161-
return xerrors.Errorf("failed to write table of secrets: %w", err)
161+
return xerrors.Errorf("write table of secrets: %w", err)
162162
}
163163
return nil
164164
}
@@ -174,12 +174,12 @@ func viewSecret(c *cli.Context) error {
174174

175175
secret, err := client.SecretByName(name)
176176
if err != nil {
177-
return xerrors.Errorf("failed to get secret by name: %w", err)
177+
return xerrors.Errorf("get secret by name: %w", err)
178178
}
179179

180180
_, err = fmt.Fprintln(os.Stdout, secret.Value)
181181
if err != nil {
182-
return xerrors.Errorf("failed to write: %w", err)
182+
return xerrors.Errorf("write secret value: %w", err)
183183
}
184184
return nil
185185
}

‎cmd/coder/urls.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -123,12 +123,12 @@ func makeListDevURLs(outputFmt *string) func(c *cli.Context) error {
123123
return devURLs[i]
124124
})
125125
if err != nil {
126-
return xerrors.Errorf("failed to write table: %w", err)
126+
return xerrors.Errorf("write table: %w", err)
127127
}
128128
case "json":
129129
err := json.NewEncoder(os.Stdout).Encode(devURLs)
130130
if err != nil {
131-
return xerrors.Errorf("failed to encode DevURLs to json: %w", err)
131+
return xerrors.Errorf("encode DevURLs as json: %w", err)
132132
}
133133
default:
134134
return xerrors.Errorf("unknown --output value %q", *outputFmt)
@@ -208,13 +208,13 @@ func makeCreateDevURL() cli.Command {
208208
flog.Info("Updating devurl for port %v", port)
209209
err := entClient.UpdateDevURL(env.ID, urlID, portNum, urlname, access)
210210
if err != nil {
211-
return xerrors.Errorf("failed to update DevURL: %w", err)
211+
return xerrors.Errorf("update DevURL: %w", err)
212212
}
213213
} else {
214214
flog.Info("Adding devurl for port %v", port)
215215
err := entClient.InsertDevURL(env.ID, portNum, urlname, access)
216216
if err != nil {
217-
return xerrors.Errorf("failed to insert DevURL: %w", err)
217+
return xerrors.Errorf("insert DevURL: %w", err)
218218
}
219219
}
220220
return nil
@@ -248,7 +248,7 @@ func removeDevURL(c *cli.Context) error {
248248

249249
portNum, err := validatePort(port)
250250
if err != nil {
251-
return xerrors.Errorf("failed to validate port: %w", err)
251+
return xerrors.Errorf("validate port: %w", err)
252252
}
253253

254254
entClient := requireAuth()
@@ -271,7 +271,7 @@ func removeDevURL(c *cli.Context) error {
271271

272272
err = entClient.DelDevURL(env.ID, urlID)
273273
if err != nil {
274-
return xerrors.Errorf("failed to delete DevURL: %w", err)
274+
return xerrors.Errorf("delete DevURL: %w", err)
275275
}
276276
return nil
277277
}

‎cmd/coder/users.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func listUsers(outputFmt *string) func(c *cli.Context) error {
3939

4040
users, err := entClient.Users()
4141
if err != nil {
42-
return xerrors.Errorf("failed to get users: %w", err)
42+
return xerrors.Errorf("get users: %w", err)
4343
}
4444

4545
switch *outputFmt {
@@ -48,12 +48,12 @@ func listUsers(outputFmt *string) func(c *cli.Context) error {
4848
return users[i]
4949
})
5050
if err != nil {
51-
return xerrors.Errorf("failed to write table: %w", err)
51+
return xerrors.Errorf("write table: %w", err)
5252
}
5353
case "json":
5454
err = json.NewEncoder(os.Stdout).Encode(users)
5555
if err != nil {
56-
return xerrors.Errorf("failed to encode users to json: %w", err)
56+
return xerrors.Errorf("encode users as json: %w", err)
5757
}
5858
default:
5959
return xerrors.New("unknown value for --output")

0 commit comments

Comments
 (0)