Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ require (
github.com/getsentry/sentry-go v0.14.0
github.com/gin-gonic/gin v1.10.0
github.com/go-git/go-git/v5 v5.13.2
github.com/go-resty/resty/v2 v2.7.0
github.com/golang-jwt/jwt v3.2.2+incompatible
github.com/go-resty/resty/v2 v2.17.0
github.com/golang-jwt/jwt/v5 v5.3.0
github.com/google/go-cmp v0.6.0
github.com/google/huproxy v0.0.0-20210816191033-a131ee126ce3
github.com/google/uuid v1.6.0
Expand All @@ -29,7 +29,7 @@ require (
github.com/samber/mo v1.5.1
github.com/schollz/progressbar/v3 v3.9.0
github.com/sevlyar/go-daemon v0.1.5
github.com/sirupsen/logrus v1.9.0
github.com/sirupsen/logrus v1.9.4
github.com/spf13/afero v1.9.2
github.com/spf13/cobra v1.8.1
github.com/spf13/viper v1.13.0
Expand All @@ -39,7 +39,7 @@ require (
github.com/wk8/go-ordered-map/v2 v2.0.0
github.com/writeas/go-strip-markdown v2.0.1+incompatible
golang.org/x/crypto v0.46.0
golang.org/x/text v0.32.0
golang.org/x/text v0.33.0
k8s.io/cli-runtime v0.31.1
)

Expand Down Expand Up @@ -94,9 +94,9 @@ require (
github.com/xanzy/ssh-agent v0.3.3 // indirect
golang.org/x/arch v0.8.0 // indirect
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
golang.org/x/mod v0.30.0 // indirect
golang.org/x/mod v0.31.0 // indirect
golang.org/x/sync v0.19.0 // indirect
golang.org/x/tools v0.39.0 // indirect
golang.org/x/tools v0.40.0 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
Expand Down Expand Up @@ -142,10 +142,10 @@ require (
github.com/xlab/treeprint v1.2.0 // indirect
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
golang.org/x/net v0.48.0 // indirect
golang.org/x/oauth2 v0.21.0 // indirect
golang.org/x/sys v0.39.0 // indirect
golang.org/x/term v0.38.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/oauth2 v0.34.0 // indirect
golang.org/x/sys v0.40.0 // indirect
golang.org/x/term v0.39.0 // indirect
golang.org/x/time v0.12.0 // indirect
google.golang.org/protobuf v1.34.2
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
Expand Down
41 changes: 20 additions & 21 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -153,16 +153,16 @@ github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJn
github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
github.com/go-playground/validator/v10 v10.20.0 h1:K9ISHbSaI0lyB2eWMPJo+kOS/FBExVwjEviJTixqxL8=
github.com/go-playground/validator/v10 v10.20.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
github.com/go-resty/resty/v2 v2.7.0 h1:me+K9p3uhSmXtrBZ4k9jcEAfJmuC8IivWHwaLZwPrFY=
github.com/go-resty/resty/v2 v2.7.0/go.mod h1:9PWDzw47qPphMRFfhsyk0NnSgvluHcljSMVIq3w7q0I=
github.com/go-resty/resty/v2 v2.17.0 h1:pW9DeXcaL4Rrym4EZ8v7L19zZiIlWPg5YXAcVmt+gN0=
github.com/go-resty/resty/v2 v2.17.0/go.mod h1:kCKZ3wWmwJaNc7S29BRtUhJwy7iqmn+2mLtQrOyQlVA=
github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY=
github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
github.com/golang-jwt/jwt/v5 v5.3.0 h1:pv4AsKCKKZuqlgs5sUmn4x8UlGa0kEVt/puTpKx9vvo=
github.com/golang-jwt/jwt/v5 v5.3.0/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE=
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
Expand Down Expand Up @@ -377,8 +377,8 @@ github.com/sevlyar/go-daemon v0.1.5 h1:Zy/6jLbM8CfqJ4x4RPr7MJlSKt90f00kNM1D401C+
github.com/sevlyar/go-daemon v0.1.5/go.mod h1:6dJpPatBT9eUwM5VCw9Bt6CdX9Tk6UWvhW3MebLDRKE=
github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
github.com/sirupsen/logrus v1.9.4 h1:TsZE7l11zFCLZnZ+teH4Umoq5BhEIfIzfRDZ1Uzql2w=
github.com/sirupsen/logrus v1.9.4/go.mod h1:ftWc9WdOfJ0a92nsE2jF5u5ZwH8Bv2zdeOC42RjbV2g=
github.com/skeema/knownhosts v1.3.0 h1:AM+y0rI04VksttfwjkSTNQorvGqmwATnvnAHpSgc0LY=
github.com/skeema/knownhosts v1.3.0/go.mod h1:sPINvnADmT/qYH1kfv+ePMmOBTH6Tbl7b5LvTDjFK7M=
github.com/spf13/afero v1.9.2 h1:j49Hj62F0n+DaZ1dDCvhABaPNSGNkt32oRFxI33IEMw=
Expand Down Expand Up @@ -499,8 +499,8 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.30.0 h1:fDEXFVZ/fmCKProc/yAXXUijritrDzahmwwefnjoPFk=
golang.org/x/mod v0.30.0/go.mod h1:lAsf5O2EvJeSFMiBxXDki7sCgAxEUcZHXoXMKT4GJKc=
golang.org/x/mod v0.31.0 h1:HaW9xtz0+kOcWKwli0ZXy79Ix+UW/vOfmWI5QVd2tgI=
golang.org/x/mod v0.31.0/go.mod h1:43JraMp9cGx1Rx3AqioxrbrhNsLl2l/iNAvuBkrezpg=
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
Expand Down Expand Up @@ -532,7 +532,6 @@ golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwY
golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20211029224645-99673261e6eb/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.48.0 h1:zyQRTTrjc33Lhh0fBgT/H3oZq9WuvRR5gPC70xpDiQU=
golang.org/x/net v0.48.0/go.mod h1:+ndRgGjkh8FGtu1w1FGbEC31if4VrNVMuKTgcAAnQRY=
Expand All @@ -545,8 +544,8 @@ golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ
golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs=
golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
golang.org/x/oauth2 v0.34.0 h1:hqK/t4AKgbqWkdkcAeI8XLmbK+4m4G5YeQRrmiotGlw=
golang.org/x/oauth2 v0.34.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
Expand Down Expand Up @@ -609,27 +608,27 @@ golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk=
golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ=
golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.0.0-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.38.0 h1:PQ5pkm/rLO6HnxFR7N2lJHOZX6Kez5Y1gDSJla6jo7Q=
golang.org/x/term v0.38.0/go.mod h1:bSEAKrOT1W+VSu9TSCMtoGEOUcKxOKgl3LE5QEF/xVg=
golang.org/x/term v0.39.0 h1:RclSuaJf32jOqZz74CkPA9qFuVTX7vhLlpfj/IGWlqY=
golang.org/x/term v0.39.0/go.mod h1:yxzUCTP/U+FzoxfdKmLaA0RV1WgE0VY7hXBwKtY/4ww=
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.32.0 h1:ZD01bjUt1FQ9WJ0ClOL5vxgxOI/sVCNgX1YtKwcY0mU=
golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY=
golang.org/x/text v0.33.0 h1:B3njUFyqtHDUI5jMn1YIr5B0IE2U0qck04r6d4KPAxE=
golang.org/x/text v0.33.0/go.mod h1:LuMebE6+rBincTi9+xWTY8TztLzKHc/9C1uBCG27+q8=
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
Expand Down Expand Up @@ -679,8 +678,8 @@ golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4f
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
golang.org/x/tools v0.39.0 h1:ik4ho21kwuQln40uelmciQPp9SipgNDdrafrYA4TmQQ=
golang.org/x/tools v0.39.0/go.mod h1:JnefbkDPyD8UU2kI5fuf8ZX4/yUeh9W877ZeBONxUqQ=
golang.org/x/tools v0.40.0 h1:yLkxfA+Qnul4cs9QA3KnlFu0lVmd8JJfoq+E41uSutA=
golang.org/x/tools v0.40.0/go.mod h1:Ik/tzLRlbscWpqqMRjyWYDisX8bG13FrdXp3o4Sr9lc=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
Expand Down
12 changes: 8 additions & 4 deletions pkg/auth/auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
breverrors "github.com/brevdev/brev-cli/pkg/errors"
"github.com/brevdev/brev-cli/pkg/terminal"
"github.com/fatih/color"
"github.com/golang-jwt/jwt"
"github.com/golang-jwt/jwt/v5"
"github.com/pkg/browser"
)

Expand Down Expand Up @@ -333,14 +333,18 @@ func isAccessTokenValid(token string) (bool, error) {
parser := jwt.Parser{}
ptoken, _, err := parser.ParseUnverified(token, jwt.MapClaims{})
if err != nil {
ve := &jwt.ValidationError{}
if errors.As(err, &ve) {
// ValidationErrors occurred while parsing token is handled below. jwt.ValidationErrors is removed in new jwt v5
if errors.Is(err, jwt.ErrTokenMalformed) || errors.Is(err, jwt.ErrTokenUnverifiable) {
// fmt.Printf("warning: token error validation failed | %v\n", err)
return false, nil
}
return false, breverrors.WrapAndTrace(err)
}
err = ptoken.Claims.Valid()
// Migrate from deprecated claims.Valid() to jwt v5 Validator.Validate() for standards-compliant claim validation.
validator := jwt.NewValidator(
jwt.WithIssuedAt(),
)
err = validator.Validate(ptoken.Claims)
if err != nil {
// https://pkg.go.dev/github.com/golang-jwt/jwt@v3.2.2+incompatible#MapClaims.Valid // https://github.com/dgrijalva/jwt-go/issues/383 // sometimes client clock is skew/out of sync with server who generated token
if strings.Contains(err.Error(), "Token used before issued") { // not a security issue because we always check server side as well
Expand Down
3 changes: 2 additions & 1 deletion pkg/cmd/background/background.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ func NewCmdBackground(t *terminal.Terminal, s BackgroundStore) *cobra.Command {
}
// Create logs directory if it doesn't exist
logsDir := os.Getenv("HOME") + "/brev-background-logs"
err = os.MkdirAll(logsDir, os.ModePerm)
// Suppress error by Lint to lower the permission level (os.ModePerm)
err = os.MkdirAll(logsDir, os.ModePerm) //nolint:gosec // ok: directory must be world-writable
if err != nil {
log.Fatal(err)
}
Expand Down
1 change: 1 addition & 0 deletions pkg/cmd/updatemodel/updatemodel.go
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ func (u updateModel) RunE(_ *cobra.Command, _ []string) error { //nolint:funlen
}
}
if workspace.ReposV1 != nil {
// Remove redundant reassignments of range variables; Go v1.24 no longer requires shadowing inside loops, so key/val can be used directly
for key, val := range *workspace.ReposV1 {
reposv1FromBE[key] = val
}
Expand Down
6 changes: 2 additions & 4 deletions pkg/collections/collections.go
Original file line number Diff line number Diff line change
Expand Up @@ -166,10 +166,8 @@ func Foldl[T any, R any](fn func(acc R, next T) R, base R, list []T) R {
// loops over list and returns when has returns true
func ListHas[K any](list []K, has func(l K) bool) bool {
k := Find(list, has)
if k != nil { //nolint:gosimple //ok
return true
}
return false
// Simplify nil check by returning the expression directly
return k != nil
}

func ListContains[K comparable](list []K, item K) bool {
Expand Down
2 changes: 1 addition & 1 deletion pkg/errors/errors.go
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ func CombineByString(err error) error {
}
}
errsOut := make([]error, 0, len(mapE))
for _, e := range mapEList { //nolint:gosimple //ok
for _, e := range mapEList {
errsOut = append(errsOut, e)
}
return Join(errsOut...)
Expand Down
3 changes: 2 additions & 1 deletion pkg/files/files.go
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,8 @@ func OverwriteJSON(fs afero.Fs, filepath string, v interface{}) error {
if err != nil {
return breverrors.WrapAndTrace(err)
}
err = ioutil.WriteFile(filepath, dataBytes, os.ModePerm)
// Suppress error by Lint to lower the permission level (os.ModePerm)
err = ioutil.WriteFile(filepath, dataBytes, os.ModePerm) //nolint:gosec // ok: directory must be world-writable
if err != nil {
return breverrors.WrapAndTrace(err)
}
Expand Down
3 changes: 2 additions & 1 deletion pkg/mergeshells/mergeshells.go
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,8 @@ func WriteBrevFile(t *terminal.Terminal, deps []string, gitURL string, path stri
t.Vprint(t.Yellow(strings.Join(deps, " \n")))
shellString := GenerateShellScript(path)
fmt.Println(GenerateLogs(shellString))
mderr := os.MkdirAll(filepath.Join(path, ".brev"), os.ModePerm)
// Suppress error by Lint to lower the permission level (os.ModePerm)
mderr := os.MkdirAll(filepath.Join(path, ".brev"), os.ModePerm) //nolint:gosec // ok: directory must be world-writable
if mderr == nil {
// generate a string that is the collections.Concatenation of dependency-ordering the contents of all the dependencies
// found by cat'ing the directory generated from the deps string, using the translated ruby code with go generics
Expand Down
7 changes: 5 additions & 2 deletions pkg/setupworkspace/setupworkspace.go
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ func NewWorkspaceIniter(workspaceDir string, user *user.User, params *store.Setu

params.ReposV0 = InitRepos(params.ReposV0)

// Suppress lint error to remove (params.ExecsV0 == nil), to support any edge case
if (params.ExecsV0 == nil || len(params.ExecsV0) == 0) && (params.ProjectSetupScript == nil || *params.ProjectSetupScript == "") {
defaultScript := "#!/bin/bash\n"
b64DefaultScript := base64.StdEncoding.EncodeToString([]byte(defaultScript))
Expand Down Expand Up @@ -1283,11 +1284,13 @@ func RunSetupScript(logsPath string, workingDir string, setupExecPath string, us
if err != nil {
return breverrors.WrapAndTrace(err)
}
err = os.MkdirAll(logsPath, os.ModePerm)
// Suppress error by Lint to lower the permission level (os.ModePerm)
err = os.MkdirAll(logsPath, os.ModePerm) //nolint:gosec // ok: directory must be world-writable
if err != nil {
return breverrors.WrapAndTrace(err)
}
err = os.MkdirAll(archivePath, os.ModePerm)
// Suppress error by Lint to lower the permission level (os.ModePerm)
err = os.MkdirAll(archivePath, os.ModePerm) //nolint:gosec // ok: directory must be world-writable
if err != nil {
return breverrors.WrapAndTrace(err)
}
Expand Down
3 changes: 2 additions & 1 deletion pkg/ssh/ssh_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ import (

func init() {
path := os.Getenv("HOME") + "/.config/Jetbrains/JetBrainsGateway2022.3"
err := os.MkdirAll(path, os.ModePerm)
// Suppress error by Lint to lower the permission level (os.ModePerm)
err := os.MkdirAll(path, os.ModePerm) //nolint:gosec // ok: directory must be world-writable
if err != nil {
println(err)
}
Expand Down
11 changes: 6 additions & 5 deletions pkg/terminal/terminal.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,24 +50,25 @@ func New() (t *Terminal) {
}
}

// Explicit error handling for Print functions
func (t *Terminal) Print(a string) {
fmt.Fprintln(t.out, a)
_, _ = fmt.Fprintln(t.out, a)
}

func (t *Terminal) Vprint(a string) {
fmt.Fprintln(t.verbose, a)
_, _ = fmt.Fprintln(t.verbose, a)
}

func (t *Terminal) Vprintf(format string, a ...interface{}) {
fmt.Fprintf(t.verbose, format, a...)
_, _ = fmt.Fprintf(t.verbose, format, a...)
}

func (t *Terminal) Eprint(a string) {
fmt.Fprintln(t.err, a)
_, _ = fmt.Fprintln(t.err, a)
}

func (t *Terminal) Eprintf(format string, a ...interface{}) {
fmt.Fprintf(t.err, format, a...)
_, _ = fmt.Fprintf(t.err, format, a...)
}

func (t *Terminal) Errprint(err error, a string) {
Expand Down
3 changes: 2 additions & 1 deletion pkg/workspacemanagerv2/containermanager_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,8 @@ func Test_Volumes(t *testing.T) {
localPath := fmt.Sprintf("/tmp/brevcli-test-volume/%s", uuid.New().String())
fmt.Println(localPath)

err := os.MkdirAll(localPath, os.ModePerm)
// Suppress error by Lint to lower the permission level (os.ModePerm)
err := os.MkdirAll(localPath, os.ModePerm) //nolint:gosec // ok: directory must be world-writable
assert.Nil(t, err)

_, err = os.OpenFile(filepath.Join(localPath, "original"), os.O_CREATE, 0o600) //nolint:gosec // test
Expand Down
3 changes: 2 additions & 1 deletion pkg/workspacemanagerv2/volumes.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ func (s StaticFiles) GetMountFromPath() string {

func (s StaticFiles) Setup(_ context.Context) error {
path := s.GetMountFromPath()
err := os.MkdirAll(path, os.ModePerm)
// Suppress error by Lint to lower the permission level (os.ModePerm)
err := os.MkdirAll(path, os.ModePerm) //nolint:gosec // ok: directory must be world-writable
if err != nil {
return breverrors.WrapAndTrace(err)
}
Expand Down
Loading
Loading