Skip to content

Commit 29dc50b

Browse files
andyfellerandyfeller
authored
Merge branch 'trunk' into andyfeller/export-auth-is-tenancy
2 parents 8d04841 + ecc5db7 commit 29dc50b

File tree

6 files changed

+209
-46
lines changed

6 files changed

+209
-46
lines changed

‎go.mod

+11-11
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,28 @@ go 1.21
55
require (
66
github.com/AlecAivazis/survey/v2 v2.3.7
77
github.com/MakeNowJust/heredoc v1.0.0
8-
github.com/charmbracelet/glamour v0.6.0
8+
github.com/charmbracelet/glamour v0.7.0
99
github.com/cli/browser v1.3.0
1010
github.com/cli/safeexec v1.0.0
1111
github.com/cli/shurcooL-graphql v0.0.4
1212
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
1313
github.com/henvic/httpretty v0.0.6
14-
github.com/itchyny/gojq v0.12.13
14+
github.com/itchyny/gojq v0.12.15
1515
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d
1616
github.com/muesli/reflow v0.3.0
17-
github.com/muesli/termenv v0.13.0
17+
github.com/muesli/termenv v0.15.2
1818
github.com/stretchr/testify v1.7.0
1919
github.com/thlib/go-timezone-local v0.0.0-20210907160436-ef149e42d28e
20-
golang.org/x/sys v0.13.0
20+
golang.org/x/sys v0.18.0
2121
golang.org/x/term v0.13.0
2222
golang.org/x/text v0.13.0
2323
gopkg.in/h2non/gock.v1 v1.1.2
2424
gopkg.in/yaml.v3 v3.0.1
2525
)
2626

2727
require (
28-
github.com/alecthomas/chroma v0.10.0 // indirect
29-
github.com/aymanbagabas/go-osc52 v1.0.3 // indirect
28+
github.com/alecthomas/chroma/v2 v2.8.0 // indirect
29+
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
3030
github.com/aymerick/douceur v0.2.0 // indirect
3131
github.com/davecgh/go-spew v1.1.1 // indirect
3232
github.com/dlclark/regexp2 v1.4.0 // indirect
@@ -37,14 +37,14 @@ require (
3737
github.com/kr/pretty v0.1.0 // indirect
3838
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
3939
github.com/mattn/go-colorable v0.1.13 // indirect
40-
github.com/mattn/go-isatty v0.0.19 // indirect
41-
github.com/mattn/go-runewidth v0.0.14 // indirect
40+
github.com/mattn/go-isatty v0.0.20 // indirect
41+
github.com/mattn/go-runewidth v0.0.15 // indirect
4242
github.com/microcosm-cc/bluemonday v1.0.26 // indirect
4343
github.com/olekukonko/tablewriter v0.0.5 // indirect
4444
github.com/pmezard/go-difflib v1.0.0 // indirect
45-
github.com/rivo/uniseg v0.4.4 // indirect
46-
github.com/yuin/goldmark v1.5.2 // indirect
47-
github.com/yuin/goldmark-emoji v1.0.1 // indirect
45+
github.com/rivo/uniseg v0.4.7 // indirect
46+
github.com/yuin/goldmark v1.5.4 // indirect
47+
github.com/yuin/goldmark-emoji v1.0.2 // indirect
4848
golang.org/x/net v0.17.0 // indirect
4949
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
5050
)

‎go.sum

+29-26
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,18 @@ github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ
44
github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE=
55
github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2 h1:+vx7roKuyA63nhn5WAunQHLTznkw5W8b1Xc0dNjp83s=
66
github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2/go.mod h1:HBCaDeC1lPdgDeDbhX8XFpy1jqjK0IBG8W5K+xYqA0w=
7-
github.com/alecthomas/chroma v0.10.0 h1:7XDcGkCQopCNKjZHfYrNLraA+M7e0fMiJ/Mfikbfjek=
8-
github.com/alecthomas/chroma v0.10.0/go.mod h1:jtJATyUxlIORhUOFNA9NZDWGAQ8wpxQQqNSB4rjA/1s=
9-
github.com/aymanbagabas/go-osc52 v1.0.3 h1:DTwqENW7X9arYimJrPeGZcV0ln14sGMt3pHZspWD+Mg=
10-
github.com/aymanbagabas/go-osc52 v1.0.3/go.mod h1:zT8H+Rk4VSabYN90pWyugflM3ZhpTZNC7cASDfUCdT4=
7+
github.com/alecthomas/assert/v2 v2.2.1 h1:XivOgYcduV98QCahG8T5XTezV5bylXe+lBxLG2K2ink=
8+
github.com/alecthomas/assert/v2 v2.2.1/go.mod h1:pXcQ2Asjp247dahGEmsZ6ru0UVwnkhktn7S0bBDLxvQ=
9+
github.com/alecthomas/chroma/v2 v2.8.0 h1:w9WJUjFFmHHB2e8mRpL9jjy3alYDlU0QLDezj1xE264=
10+
github.com/alecthomas/chroma/v2 v2.8.0/go.mod h1:yrkMI9807G1ROx13fhe1v6PN2DDeaR73L3d+1nmYQtw=
11+
github.com/alecthomas/repr v0.2.0 h1:HAzS41CIzNW5syS8Mf9UwXhNH1J9aix/BvDRf1Ml2Yk=
12+
github.com/alecthomas/repr v0.2.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
13+
github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=
14+
github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8=
1115
github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=
1216
github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=
13-
github.com/charmbracelet/glamour v0.6.0 h1:wi8fse3Y7nfcabbbDuwolqTqMQPMnVPeZhDM273bISc=
14-
github.com/charmbracelet/glamour v0.6.0/go.mod h1:taqWV4swIMMbWALc0m7AfE9JkPSU8om2538k9ITBxOc=
17+
github.com/charmbracelet/glamour v0.7.0 h1:2BtKGZ4iVJCDfMF229EzbeR1QRKLWztO9dMtjmqZSng=
18+
github.com/charmbracelet/glamour v0.7.0/go.mod h1:jUMh5MeihljJPQbJ/wf4ldw2+yBP59+ctV36jASy7ps=
1519
github.com/cli/browser v1.3.0 h1:LejqCrpWr+1pRqmEPDGnTZOjsMe7sehifLynZJuqJpo=
1620
github.com/cli/browser v1.3.0/go.mod h1:HH8s+fOAxjhQoBUAsKuPCbqUuxZDhQ2/aD+SzsEfBTk=
1721
github.com/cli/safeexec v1.0.0 h1:0VngyaIyqACHdcMNWfo6+KdUYnqEr2Sg+bSP1pdF+dI=
@@ -33,10 +37,12 @@ github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542 h1:2VTzZjLZBgl62/EtslC
3337
github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542/go.mod h1:Ow0tF8D4Kplbc8s8sSb3V2oUCygFHVp8gC3Dn6U4MNI=
3438
github.com/henvic/httpretty v0.0.6 h1:JdzGzKZBajBfnvlMALXXMVQWxWMF/ofTy8C3/OSUTxs=
3539
github.com/henvic/httpretty v0.0.6/go.mod h1:X38wLjWXHkXT7r2+uK8LjCMne9rsuNaBLJ+5cU2/Pmo=
40+
github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
41+
github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg=
3642
github.com/hinshun/vt10x v0.0.0-20220119200601-820417d04eec h1:qv2VnGeEQHchGaZ/u7lxST/RaJw+cv273q79D81Xbog=
3743
github.com/hinshun/vt10x v0.0.0-20220119200601-820417d04eec/go.mod h1:Q48J4R4DvxnHolD5P8pOtXigYlRuPLGl6moFx3ulM68=
38-
github.com/itchyny/gojq v0.12.13 h1:IxyYlHYIlspQHHTE0f3cJF0NKDMfajxViuhBLnHd/QU=
39-
github.com/itchyny/gojq v0.12.13/go.mod h1:JzwzAqenfhrPUuwbmEz3nu3JQmFLlQTQMUcOdnu/Sf4=
44+
github.com/itchyny/gojq v0.12.15 h1:WC1Nxbx4Ifw5U2oQWACYz32JK8G9qxNtHzrvW4KEcqI=
45+
github.com/itchyny/gojq v0.12.15/go.mod h1:uWAHCbCIla1jiNxmeT5/B5mOjSdfkCq6p8vxWg+BM10=
4046
github.com/itchyny/timefmt-go v0.1.5 h1:G0INE2la8S6ru/ZI5JecgyzbbJNs5lG1RcBqa7Jm6GE=
4147
github.com/itchyny/timefmt-go v0.1.5/go.mod h1:nEP7L+2YmAbT2kZ2HfSs1d8Xtw9LY8D2stDBckWakZ8=
4248
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
@@ -53,22 +59,21 @@ github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxec
5359
github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
5460
github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
5561
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
56-
github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
57-
github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
62+
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
63+
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
5864
github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
5965
github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
60-
github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU=
61-
github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
66+
github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
67+
github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
6268
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
6369
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d h1:5PJl274Y63IEHC+7izoQE9x6ikvDFZS2mDVS3drnohI=
6470
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
65-
github.com/microcosm-cc/bluemonday v1.0.21/go.mod h1:ytNkv4RrDrLJ2pqlsSI46O6IVXmZOBBD4SaJyDwwTkM=
6671
github.com/microcosm-cc/bluemonday v1.0.26 h1:xbqSvqzQMeEHCqMi64VAs4d8uy6Mequs3rQ0k/Khz58=
6772
github.com/microcosm-cc/bluemonday v1.0.26/go.mod h1:JyzOCs9gkyQyjs+6h10UEVSe02CGwkhd72Xdqh78TWs=
6873
github.com/muesli/reflow v0.3.0 h1:IFsN6K9NfGtjeggFP+68I4chLZV2yIKsXJFNZ+eWh6s=
6974
github.com/muesli/reflow v0.3.0/go.mod h1:pbwTDkVPibjO2kyvBQRBxTWEEGDGq0FlB1BIKtnHY/8=
70-
github.com/muesli/termenv v0.13.0 h1:wK20DRpJdDX8b7Ek2QfhvqhRQFZ237RGRO0RQ/Iqdy0=
71-
github.com/muesli/termenv v0.13.0/go.mod h1:sP1+uffeLaEYpyOTb8pLCUctGcGLnoFjSn4YJK5e2bc=
75+
github.com/muesli/termenv v0.15.2 h1:GohcuySI0QmI3wN8Ok9PtKGkgkFIk7y6Vpb5PvrY+Wo=
76+
github.com/muesli/termenv v0.15.2/go.mod h1:Epx+iuz8sNs7mNKhxzH4fWXGNpZwUaJKRS1noLXviQ8=
7277
github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32 h1:W6apQkHrMkS0Muv8G/TipAy/FJl/rCYT0+EuS8+Z0z4=
7378
github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod h1:9wM+0iRr9ahx58uYLpLIr5fm8diHn0JbqRycJi6w0Ms=
7479
github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
@@ -77,27 +82,26 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
7782
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
7883
github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
7984
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
80-
github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis=
81-
github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
85+
github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
86+
github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
8287
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
8388
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
8489
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
8590
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
8691
github.com/thlib/go-timezone-local v0.0.0-20210907160436-ef149e42d28e h1:BuzhfgfWQbX0dWzYzT1zsORLnHRv3bcRcsaUk0VmXA8=
8792
github.com/thlib/go-timezone-local v0.0.0-20210907160436-ef149e42d28e/go.mod h1:/Tnicc6m/lsJE0irFMA0LfIwTBo4QP7A8IfyIv4zZKI=
88-
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
93+
github.com/yuin/goldmark v1.3.7/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
8994
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
90-
github.com/yuin/goldmark v1.5.2 h1:ALmeCk/px5FSm1MAcFBAsVKZjDuMVj8Tm7FFIlMJnqU=
91-
github.com/yuin/goldmark v1.5.2/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
92-
github.com/yuin/goldmark-emoji v1.0.1 h1:ctuWEyzGBwiucEqxzwe0SOYDXPAucOrE9NQC18Wa1os=
93-
github.com/yuin/goldmark-emoji v1.0.1/go.mod h1:2w1E6FEWLcDQkoTE+7HU6QF1F6SLlNGjRIBbIZQFqkQ=
95+
github.com/yuin/goldmark v1.5.4 h1:2uY/xC0roWy8IBEGLgB1ywIoEJFGmRrX21YQcvGZzjU=
96+
github.com/yuin/goldmark v1.5.4/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
97+
github.com/yuin/goldmark-emoji v1.0.2 h1:c/RgTShNgHTtc6xdz2KKI74jJr6rWi7FPgnP9GAsO5s=
98+
github.com/yuin/goldmark-emoji v1.0.2/go.mod h1:RhP/RWpexdp+KHs7ghKnifRoIs/Bq4nDS7tRbCkOwKY=
9499
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
95100
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
96101
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
97102
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
98103
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
99104
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
100-
golang.org/x/net v0.0.0-20221002022538-bcab6841153b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
101105
golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
102106
golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
103107
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -109,11 +113,10 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc
109113
golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
110114
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
111115
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
112-
golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
113116
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
114117
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
115-
golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
116-
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
118+
golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
119+
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
117120
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
118121
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
119122
golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=

‎pkg/config/config.go

+15-2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ const (
2121
xdgConfigHome = "XDG_CONFIG_HOME"
2222
xdgDataHome = "XDG_DATA_HOME"
2323
xdgStateHome = "XDG_STATE_HOME"
24+
xdgCacheHome = "XDG_CACHE_HOME"
2425
)
2526

2627
var (
@@ -287,9 +288,21 @@ func DataDir() string {
287288
return path
288289
}
289290

290-
// CacheDir returns the default path for gh cli cache.
291+
// Cache path precedence: XDG_CACHE_HOME, LocalAppData (windows only), HOME, legacy gh-cli-cache.
291292
func CacheDir() string {
292-
return filepath.Join(os.TempDir(), "gh-cli-cache")
293+
if a := os.Getenv(xdgCacheHome); a != "" {
294+
return filepath.Join(a, "gh")
295+
} else if b := os.Getenv(localAppData); runtime.GOOS == "windows" && b != "" {
296+
return filepath.Join(b, "GitHub CLI")
297+
} else if c, err := os.UserHomeDir(); err == nil {
298+
return filepath.Join(c, ".cache", "gh")
299+
} else {
300+
// Note that this has a minor security issue because /tmp is world-writeable.
301+
// As such, it is possible for other users on a shared system to overwrite cached data.
302+
// The practical risk of this is low, but it's worth calling out as a risk.
303+
// I've included this here for backwards compatibility but we should consider removing it.
304+
return filepath.Join(os.TempDir(), "gh-cli-cache")
305+
}
293306
}
294307

295308
func readFile(filename string) ([]byte, error) {

‎pkg/config/config_test.go

+67-3
Original file line numberDiff line numberDiff line change
@@ -221,9 +221,73 @@ func TestDataDir(t *testing.T) {
221221
}
222222

223223
func TestCacheDir(t *testing.T) {
224-
expected := filepath.Join(os.TempDir(), "gh-cli-cache")
225-
actual := CacheDir()
226-
assert.Equal(t, expected, actual)
224+
expectedCacheDir := "/expected-cache-dir"
225+
unexpectedCacheDir := "/unexpected-cache-dir"
226+
227+
tests := []struct {
228+
name string
229+
onlyWindows bool
230+
env map[string]string
231+
output string
232+
}{
233+
{
234+
name: "XDG_CACHE_HOME is highest precedence",
235+
env: map[string]string{
236+
"XDG_CACHE_HOME": expectedCacheDir,
237+
"LocalAppData": unexpectedCacheDir,
238+
"USERPROFILE": unexpectedCacheDir,
239+
"HOME": unexpectedCacheDir,
240+
},
241+
output: filepath.Join(expectedCacheDir, "gh"),
242+
},
243+
{
244+
name: "on windows, LocalAppData is preferred to home dir",
245+
onlyWindows: true,
246+
env: map[string]string{
247+
"XDG_CACHE_HOME": "",
248+
"LocalAppData": expectedCacheDir,
249+
"USERPROFILE": unexpectedCacheDir,
250+
"HOME": unexpectedCacheDir,
251+
},
252+
output: filepath.Join(expectedCacheDir, "GitHub CLI"),
253+
},
254+
{
255+
name: "tries to use the home dir cache directory",
256+
env: map[string]string{
257+
"XDG_CACHE_HOME": "",
258+
"LocalAppData": "",
259+
"USERPROFILE": expectedCacheDir,
260+
"HOME": expectedCacheDir,
261+
},
262+
output: filepath.Join(expectedCacheDir, ".cache", "gh"),
263+
},
264+
{
265+
name: "finally falls back to tmpdir",
266+
// We set the env vars to empty strings so that no home dir should be found
267+
env: map[string]string{
268+
"XDG_CACHE_HOME": "",
269+
"LocalAppData": "",
270+
"USERPROFILE": "",
271+
"HOME": "",
272+
},
273+
output: filepath.Join(os.TempDir(), "gh-cli-cache"),
274+
},
275+
}
276+
277+
for _, tt := range tests {
278+
if tt.onlyWindows && runtime.GOOS != "windows" {
279+
continue
280+
}
281+
t.Run(tt.name, func(t *testing.T) {
282+
if tt.env != nil {
283+
for k, v := range tt.env {
284+
t.Setenv(k, v)
285+
}
286+
}
287+
assert.Equal(t, tt.output, CacheDir())
288+
})
289+
}
290+
227291
}
228292

229293
func TestLoad(t *testing.T) {

‎pkg/jq/jq.go

+28
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@ package jq
44
import (
55
"bytes"
66
"encoding/json"
7+
"errors"
78
"fmt"
89
"io"
910
"math"
1011
"os"
1112
"strconv"
13+
"strings"
1214

1315
"github.com/cli/go-gh/v2/pkg/jsonpretty"
1416
"github.com/itchyny/gojq"
@@ -29,6 +31,14 @@ func Evaluate(input io.Reader, output io.Writer, expr string) error {
2931
func EvaluateFormatted(input io.Reader, output io.Writer, expr string, indent string, colorize bool) error {
3032
query, err := gojq.Parse(expr)
3133
if err != nil {
34+
var e *gojq.ParseError
35+
if errors.As(err, &e) {
36+
str, line, column := getLineColumn(expr, e.Offset-len(e.Token))
37+
return fmt.Errorf(
38+
"failed to parse jq expression (line %d, column %d)\n %s\n %*c %w",
39+
line, column, str, column, '^', err,
40+
)
41+
}
3242
return err
3343
}
3444

@@ -65,6 +75,10 @@ func EvaluateFormatted(input io.Reader, output io.Writer, expr string, indent st
6575
break
6676
}
6777
if err, isErr := v.(error); isErr {
78+
var e *gojq.HaltError
79+
if errors.As(err, &e) && e.Value() == nil {
80+
break
81+
}
6882
return err
6983
}
7084
if text, e := jsonScalarToString(v); e == nil {
@@ -129,3 +143,17 @@ func (p prettyEncoder) Encode(v any) error {
129143
}
130144
return jsonpretty.Format(p.w, bytes.NewReader(b), p.indent, true)
131145
}
146+
147+
func getLineColumn(expr string, offset int) (string, int, int) {
148+
for line := 1; ; line++ {
149+
index := strings.Index(expr, "\n")
150+
if index < 0 {
151+
return expr, line, offset + 1
152+
}
153+
if index >= offset {
154+
return expr[:index], line, offset + 1
155+
}
156+
expr = expr[index+1:]
157+
offset -= index + 1
158+
}
159+
}

0 commit comments

Comments
 (0)