Skip to content

Commit dca0e65

Browse files
authored
refactor: switch to fork of go-keyring library (#17)
* refactor: switch to fork of go-keyring library - Replace internal keyring wrapper with direct use of github.com/zalando/go-keyring - Use replace directive to point to github.com/kitproj/go-keyring fork - Update tests to clear keyring before testing missing token scenarios * chore: update go-keyring fork to v0.2.9
1 parent e081cab commit dca0e65

10 files changed

Lines changed: 18 additions & 330 deletions

File tree

go.mod

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@ module github.com/kitproj/slack-cli
22

33
go 1.24.4
44

5+
replace github.com/zalando/go-keyring => github.com/kitproj/go-keyring v0.2.10
6+
57
require (
68
github.com/mark3labs/mcp-go v0.42.0
79
github.com/slack-go/slack v0.17.3
8-
github.com/zalando/go-keyring v0.2.6
10+
github.com/zalando/go-keyring v0.2.10
911
golang.org/x/term v0.36.0
1012
)
1113

1214
require (
13-
al.essio.dev/pkg/shellescape v1.5.1 // indirect
1415
github.com/bahlo/generic-list-go v0.2.0 // indirect
1516
github.com/buger/jsonparser v1.1.1 // indirect
1617
github.com/danieljoos/wincred v1.2.2 // indirect

go.sum

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
al.essio.dev/pkg/shellescape v1.5.1 h1:86HrALUujYS/h+GtqoB26SBEdkWfmMI6FubjXlsXyho=
2-
al.essio.dev/pkg/shellescape v1.5.1/go.mod h1:6sIqp7X2P6mThCQ7twERpZTuigpr6KbZWtls1U8I890=
31
github.com/bahlo/generic-list-go v0.2.0 h1:5sz/EEAK+ls5wF+NeqDpk5+iNdMDXrh3z3nPnH1Wvgk=
42
github.com/bahlo/generic-list-go v0.2.0/go.mod h1:2KvAjgMlE5NNynlg/5iLrrCCZ2+5xWbdbCW3pNTGyYg=
53
github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs=
@@ -16,15 +14,15 @@ github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
1614
github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
1715
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
1816
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
19-
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
20-
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
2117
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
2218
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
2319
github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
2420
github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
2521
github.com/invopop/jsonschema v0.13.0 h1:KvpoAJWEjR3uD9Kbm2HWJmqsEaHt8lBUpd0qHcIi21E=
2622
github.com/invopop/jsonschema v0.13.0/go.mod h1:ffZ5Km5SWWRAIN6wbDXItl95euhFz2uON45H2qjYt+0=
2723
github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
24+
github.com/kitproj/go-keyring v0.2.10 h1:ZjwJOV8mIG8pYrWSGxtdGj62sYg6uAdMVa8kPbeMicQ=
25+
github.com/kitproj/go-keyring v0.2.10/go.mod h1:yhtJhnoQt44WWzPtoc44uANw82MILytMeDc01iKC8cM=
2826
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
2927
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
3028
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
@@ -49,8 +47,6 @@ github.com/wk8/go-ordered-map/v2 v2.1.8 h1:5h/BUHu93oj4gIdvHHHGsScSTMijfx5PeYkE/
4947
github.com/wk8/go-ordered-map/v2 v2.1.8/go.mod h1:5nJHM5DyteebpVlHnWMV0rPz6Zp7+xBAnxjb1X5vnTw=
5048
github.com/yosida95/uritemplate/v3 v3.0.2 h1:Ed3Oyj9yrmi9087+NczuL5BwkIc4wvTb5zIM+UJPGz4=
5149
github.com/yosida95/uritemplate/v3 v3.0.2/go.mod h1:ILOh0sOhIJR3+L/8afwt/kE++YT040gmv5BQTMR2HP4=
52-
github.com/zalando/go-keyring v0.2.6 h1:r7Yc3+H+Ux0+M72zacZoItR3UDxeWfKTcabvkI8ua9s=
53-
github.com/zalando/go-keyring v0.2.6/go.mod h1:2TCrxYrbUNYfNS/Kgy/LSrkSQzZ5UPVH85RwfczwvcI=
5450
golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ=
5551
golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
5652
golang.org/x/term v0.36.0 h1:zMPR+aF8gfksFprF/Nc/rd1wRS1EI6nDBGyWAvDzx2Q=

internal/keyring/keyring.go

Lines changed: 0 additions & 22 deletions
This file was deleted.

internal/keyring/keyring_darwin.go

Lines changed: 0 additions & 24 deletions
This file was deleted.

internal/keyring/keyring_linux.go

Lines changed: 0 additions & 96 deletions
This file was deleted.

internal/keyring/keyring_test.go

Lines changed: 0 additions & 153 deletions
This file was deleted.

internal/keyring/keyring_windows.go

Lines changed: 0 additions & 24 deletions
This file was deleted.

main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
"strings"
1111
"syscall"
1212

13-
"github.com/kitproj/slack-cli/internal/keyring"
1413
"github.com/slack-go/slack"
14+
"github.com/zalando/go-keyring"
1515
"golang.org/x/term"
1616
)
1717

0 commit comments

Comments
 (0)