Skip to content

Commit 1f51343

Browse files
committed
fix: fix lint issues and update tests for removed show -f/--force alias
- Remove unused (*Action).printReminder shim from handler_shims.go - Remove unused cryptoBackend type alias from base.go - Add blank line before return in queue/background.go (nlreturn) - Update integration tests to use 'show -u' instead of 'show -f' since the --force/-f aliases for show --unsafe were intentionally dropped - Add .doctor to commandsWithError in main_test.go
1 parent bd288b3 commit 1f51343

8 files changed

Lines changed: 22 additions & 26 deletions

File tree

‎internal/action/base.go‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,3 @@ func newBase(cfg *config.Config, sv semver.Version) *base {
114114
Store: root.New(cfg),
115115
}
116116
}
117-
118-
// Crypto backend type alias used by setup_handler shims.
119-
type cryptoBackend = backend.Crypto

‎internal/action/handler_shims.go‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,9 +203,6 @@ func (s *Action) CompletionZSH(a *cli.App) error { return s.misc.Completi
203203
func (s *Action) Config(c *cli.Context) error { return s.misc.Config(c) }
204204
func (s *Action) ConfigComplete(c *cli.Context) { s.misc.ConfigComplete(c) }
205205

206-
// Internal methods accessed from tests.
207-
func (s *Action) printReminder(ctx context.Context) { s.misc.printReminder(ctx) }
208-
209206
func (s *Action) newGopassCompleter(c *cli.Context) *gopassCompleter {
210207
return s.misc.newGopassCompleter(c)
211208
}

‎internal/queue/background.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ func (q *Queue) Add(t Task) Task {
106106
if q.closed {
107107
q.mu.Unlock()
108108
debug.Log("queue closed, returning task for inline execution")
109+
109110
return t
110111
}
111112
q.wg.Add(1)

‎main_test.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ var commandsWithError = set.Map([]string{
6767
".copy",
6868
".create",
6969
".delete",
70+
".doctor",
7071
".edit",
7172
".env",
7273
".find",

‎tests/copy_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ func TestCopy(t *testing.T) {
4949
require.NoError(t, err)
5050
assert.Empty(t, out)
5151

52-
orig, err := ts.run("show -f foo/bar")
52+
orig, err := ts.run("show -u foo/bar")
5353
require.NoError(t, err)
5454

55-
cp, err := ts.run("show -f foo/baz")
55+
cp, err := ts.run("show -u foo/baz")
5656
require.NoError(t, err)
5757

5858
assert.Equal(t, orig, cp)

‎tests/insert_test.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,19 @@ func TestInsert(t *testing.T) {
2525
require.NoError(t, err)
2626

2727
t.Run("Regression test for #1573 without actual pipes", func(t *testing.T) {
28-
out, err = ts.run("show -f some/secret")
28+
out, err = ts.run("show -u some/secret")
2929
require.NoError(t, err)
3030
assert.Equal(t, "moar", out)
3131

32-
out, err = ts.run("show -f some/newsecret")
32+
out, err = ts.run("show -u some/newsecret")
3333
require.NoError(t, err)
3434
assert.Equal(t, "and\nmoar", out)
3535

36-
out, err = ts.run("show -f some/secret")
36+
out, err = ts.run("show -u some/secret")
3737
require.NoError(t, err)
3838
assert.Equal(t, "moar", out)
3939

40-
out, err = ts.run("show -f some/newsecret")
40+
out, err = ts.run("show -u some/newsecret")
4141
require.NoError(t, err)
4242
assert.Equal(t, "and\nmoar", out)
4343
})
@@ -128,7 +128,7 @@ glossary": {
128128
require.NoError(t, err)
129129

130130
// using show -n to disable parsing
131-
out, err = ts.run("show -f -n some/json")
131+
out, err = ts.run("show -u -n some/json")
132132
require.NoError(t, err)
133133
assert.Equal(t, json, out) //nolint:testifylint
134134
})
@@ -143,7 +143,7 @@ test2
143143
require.NoError(t, err)
144144

145145
// using show -n to disable parsing
146-
out, err = ts.run("show -f -n some/multilinewithbraces")
146+
out, err = ts.run("show -u -n some/multilinewithbraces")
147147
require.NoError(t, err)
148148
assert.Equal(t, input, out)
149149
})
@@ -158,7 +158,7 @@ user: second user`
158158
require.NoError(t, err)
159159

160160
// using show -n to disable parsing
161-
out, err = ts.run("show -f -n some/multikey")
161+
out, err = ts.run("show -u -n some/multikey")
162162
require.NoError(t, err)
163163
assert.Equal(t, input, out)
164164
})
@@ -179,7 +179,7 @@ user: second user`
179179
_, err = ts.runCmd([]string{ts.Binary, "insert", "some/multikeyvalues"}, []byte(input))
180180
require.NoError(t, err)
181181

182-
out, err = ts.run("show -f some/multikeyvalues")
182+
out, err = ts.run("show -u some/multikeyvalues")
183183
require.NoError(t, err)
184184
assert.Equal(t, output, out)
185185
})
@@ -197,12 +197,12 @@ user: 83`
197197
require.NoError(t, err)
198198

199199
// with parsing we have 0123 interpreted as octal for 83
200-
out, err = ts.run("show -f some/yamloctal")
200+
out, err = ts.run("show -u some/yamloctal")
201201
require.NoError(t, err)
202202
assert.Equal(t, output, out)
203203

204204
// using show -n to disable parsing
205-
out, err = ts.run("show -f -n some/yamloctal")
205+
out, err = ts.run("show -u -n some/yamloctal")
206206
require.NoError(t, err)
207207
assert.Equal(t, input, out)
208208
})
@@ -217,15 +217,15 @@ url: test.com/`
217217
_, err = ts.runCmd([]string{ts.Binary, "insert", "some/kvwithspace"}, []byte(input))
218218
require.NoError(t, err)
219219

220-
out, err = ts.run("show -f some/kvwithspace")
220+
out, err = ts.run("show -u some/kvwithspace")
221221
require.NoError(t, err)
222222
assert.Equal(t, input, out)
223223

224-
out, err = ts.run("show -f some/kvwithspace url")
224+
out, err = ts.run("show -u some/kvwithspace url")
225225
require.NoError(t, err)
226226
assert.Equal(t, "test.com/", out)
227227

228-
out, err = ts.run("show -f some/kvwithspace user")
228+
out, err = ts.run("show -u some/kvwithspace user")
229229
require.Error(t, err)
230230
})
231231
}

‎tests/mount_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ func TestMountShadowing(t *testing.T) {
6868
_, err := ts.runCmd([]string{ts.Binary, "insert", "mnt/m1/secret"}, []byte("moar"))
6969
require.NoError(t, err)
7070

71-
out, err := ts.run("show -f mnt/m1/secret")
71+
out, err := ts.run("show -u mnt/m1/secret")
7272
require.NoError(t, err)
7373
assert.Equal(t, "moar", out)
7474

@@ -85,7 +85,7 @@ func TestMountShadowing(t *testing.T) {
8585
assert.Equal(t, strings.TrimSpace(want), out)
8686

8787
// check that the mount is not containing our shadowed secret
88-
out, err = ts.run("show -f mnt/m1/secret")
88+
out, err = ts.run("show -u mnt/m1/secret")
8989
require.Error(t, err)
9090
assert.Contains(t, out, "entry is not in the password store")
9191

@@ -94,7 +94,7 @@ func TestMountShadowing(t *testing.T) {
9494
require.NoError(t, err)
9595

9696
// check that the mount is containing our new secret shadowing the old one
97-
out, err = ts.run("show -f mnt/m1/secret")
97+
out, err = ts.run("show -u mnt/m1/secret")
9898
require.NoError(t, err)
9999
assert.Equal(t, "food", out)
100100

‎tests/move_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@ func TestMove(t *testing.T) {
5252
})
5353

5454
t.Run("show source secret", func(t *testing.T) {
55-
_, err := ts.run("show -f bar/bar")
55+
_, err := ts.run("show -u bar/bar")
5656
require.NoError(t, err)
5757
})
5858

5959
t.Run("show secret", func(t *testing.T) {
60-
_, err := ts.run("show -f baz")
60+
_, err := ts.run("show -u baz")
6161
require.NoError(t, err)
6262
})
6363
}

0 commit comments

Comments
 (0)
⌂ 换网址