Skip to content

Commit b9e6098

Browse files
blaqbernblaqbern
authored
bump viper incrementally (#168)
#159 attempts to bump `spf13/viper` from `1.19.0` to `1.20.1`, but there is a failing GHA because the `e2e-tests` job gets the diff of the PR from the GitHub API, and the diff is so huge that it exceeds the max number of lines that can be returned from the GET pull request endpoint (ripping out a bunch of unneeded code). So this PR bumps the version incrementally to `1.20.0-alpha.1` which accounts for roughly half the changes, and passes the `e2e-tests` job. We can then immediately upgrade from `1.20.0-alpha.1` to `1.20.1` and I believe that diff should be small enough as well. This means we'd be on an alpha version for a brief time, which is a bit dicey, but I think acceptable. In any event, I'm not sure how else we're going to get around this issue, unless we want to dig into what the test is doing and try to come up with an acceptable substitute, but that feels substantially riskier, actually. Thoughts?
1 parent 9e31145 commit b9e6098

84 files changed

Lines changed: 2448 additions & 7045 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎go.mod‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require (
77
github.com/google/go-querystring v1.1.0 // indirect
88
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00
99
github.com/sourcegraph/go-diff v0.6.1
10-
github.com/spf13/viper v1.19.0
10+
github.com/spf13/viper v1.20.0-alpha.1
1111
github.com/stretchr/testify v1.10.0
1212
golang.org/x/oauth2 v0.30.0
1313
)
@@ -21,12 +21,14 @@ require (
2121

2222
require (
2323
dario.cat/mergo v1.0.1 // indirect
24-
github.com/sagikazarmark/locafero v0.4.0 // indirect
25-
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
24+
github.com/go-viper/mapstructure/v2 v2.0.0 // indirect
25+
github.com/hashicorp/hcl v1.0.0 // indirect
26+
github.com/magiconair/properties v1.8.7 // indirect
27+
github.com/sagikazarmark/locafero v0.6.0 // indirect
2628
github.com/sourcegraph/conc v0.3.0 // indirect
2729
go.uber.org/atomic v1.9.0 // indirect
2830
go.uber.org/multierr v1.9.0 // indirect
29-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
31+
gopkg.in/ini.v1 v1.67.0 // indirect
3032
)
3133

3234
require (
@@ -39,17 +41,14 @@ require (
3941
github.com/google/uuid v1.6.0 // indirect
4042
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
4143
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
42-
github.com/hashicorp/hcl v1.0.0 // indirect
4344
github.com/huandu/xstrings v1.5.0 // indirect
4445
github.com/iancoleman/strcase v0.3.0 // indirect
4546
github.com/kyoh86/xdg v1.2.0 // indirect
4647
github.com/launchdarkly/api-client-go/v15 v15.1.0
4748
github.com/launchdarkly/json-patch v0.0.0-20180720210516-dd68d883319f // indirect
48-
github.com/magiconair/properties v1.8.7 // indirect
4949
github.com/mattn/go-isatty v0.0.20 // indirect
5050
github.com/mattn/go-runewidth v0.0.9 // indirect
5151
github.com/mitchellh/copystructure v1.2.0 // indirect
52-
github.com/mitchellh/mapstructure v1.5.0 // indirect
5352
github.com/mitchellh/reflectwalk v1.0.2 // indirect
5453
github.com/morikuni/aec v1.0.0 // indirect
5554
github.com/olekukonko/tablewriter v0.0.5 // indirect
@@ -68,7 +67,6 @@ require (
6867
golang.org/x/sys v0.30.0 // indirect
6968
golang.org/x/text v0.22.0 // indirect
7069
golang.org/x/tools v0.28.0 // indirect
71-
gopkg.in/ini.v1 v1.67.0 // indirect
7270
gopkg.in/yaml.v2 v2.4.0 // indirect
7371
gopkg.in/yaml.v3 v3.0.1 // indirect
7472
)

‎go.sum‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ github.com/go-git/go-git/v5 v5.13.0/go.mod h1:Wjo7/JyVKtQgUNdXYXIepzWfJQkUEIGvkv
6868
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
6969
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
7070
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
71+
github.com/go-viper/mapstructure/v2 v2.0.0 h1:dhn8MZ1gZ0mzeodTG3jt5Vj/o87xZKuNAprG2mQfMfc=
72+
github.com/go-viper/mapstructure/v2 v2.0.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
7173
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
7274
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
7375
github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@@ -170,8 +172,6 @@ github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/Qd
170172
github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
171173
github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
172174
github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s=
173-
github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
174-
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
175175
github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
176176
github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
177177
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 h1:n6/2gBQ3RWajuToeY6ZtZTIKv2v7ThUy5KKusIT0yc0=
@@ -197,10 +197,8 @@ github.com/rakyll/statik v0.1.7/go.mod h1:AlZONWzMtEnMs7W4e/1LURLiI49pIMmp6V9Ung
197197
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
198198
github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
199199
github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
200-
github.com/sagikazarmark/locafero v0.4.0 h1:HApY1R9zGo4DBgr7dqsTH/JJxLTTsOt7u6keLGt6kNQ=
201-
github.com/sagikazarmark/locafero v0.4.0/go.mod h1:Pe1W6UlPYUk/+wc/6KFhbORCfqzgYEpgQ3O5fPuL3H4=
202-
github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE=
203-
github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ=
200+
github.com/sagikazarmark/locafero v0.6.0 h1:ON7AQg37yzcRPU69mt7gwhFEBwxI6P9T4Qu3N51bwOk=
201+
github.com/sagikazarmark/locafero v0.6.0/go.mod h1:77OmuIc6VTraTXKXIs/uvUxKGUXjE1GbemJYHqdNjX0=
204202
github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k=
205203
github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME=
206204
github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk=
@@ -215,8 +213,8 @@ github.com/spf13/cast v1.7.0 h1:ntdiHjuueXFgm5nzDRdOS4yfT43P5Fnud6DH50rz/7w=
215213
github.com/spf13/cast v1.7.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
216214
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
217215
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
218-
github.com/spf13/viper v1.19.0 h1:RWq5SEjt8o25SROyN3z2OrDB9l7RPd3lwTWU8EcEdcI=
219-
github.com/spf13/viper v1.19.0/go.mod h1:GQUN9bilAbhU/jgc1bKs99f/suXKeUMct8Adx5+Ntkg=
216+
github.com/spf13/viper v1.20.0-alpha.1 h1:ScUDXU3yX4i/I1ovQQtaGe9kwl63fGzG3UsFr+pGtyY=
217+
github.com/spf13/viper v1.20.0-alpha.1/go.mod h1:VJcuMrHwg6XArbUYF9KBRrFpavzx9NrQMFtdcRsZCLs=
220218
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
221219
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
222220
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
@@ -262,8 +260,6 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
262260
golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
263261
golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
264262
golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
265-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8=
266-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
267263
golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
268264
golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
269265
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=

vendor/github.com/sagikazarmark/slog-shim/.editorconfig renamed to vendor/github.com/go-viper/mapstructure/v2/.editorconfig

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/go-viper/mapstructure/v2/.envrc‎

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/go-viper/mapstructure/v2/.gitignore‎

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/go-viper/mapstructure/v2/.golangci.yaml‎

Lines changed: 23 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/mitchellh/mapstructure/CHANGELOG.md renamed to vendor/github.com/go-viper/mapstructure/v2/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/mitchellh/mapstructure/LICENSE renamed to vendor/github.com/go-viper/mapstructure/v2/LICENSE

File renamed without changes.

‎vendor/github.com/go-viper/mapstructure/v2/README.md‎

Lines changed: 80 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)