Skip to content

Commit 6378294

Browse files
kylecarbskylecarbs
authored
chore: upgrade from deprecated protobuf import (coder#6883)
This was displaying a warning when running `go get ./...`.
1 parent 0ba200c commit 6378294

File tree

3 files changed

+14
-13
lines changed

3 files changed

+14
-13
lines changed

‎go.mod

+5-5
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ require (
9898
github.com/golang-jwt/jwt v3.2.2+incompatible
9999
github.com/golang-jwt/jwt/v4 v4.5.0
100100
github.com/golang-migrate/migrate/v4 v4.15.2
101-
github.com/golang/protobuf v1.5.2
102101
github.com/google/go-github/v43 v43.0.1-0.20220414155304-00e42332e405
103102
github.com/google/uuid v1.3.0
104103
github.com/hashicorp/go-reap v0.0.0-20170704170343-bf58d8a43e7b
@@ -157,7 +156,7 @@ require (
157156
golang.org/x/oauth2 v0.5.0
158157
golang.org/x/sync v0.1.0
159158
golang.org/x/sys v0.6.0
160-
golang.org/x/term v0.5.0
159+
golang.org/x/term v0.6.0
161160
golang.org/x/tools v0.6.0
162161
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2
163162
golang.zx2c4.com/wireguard v0.0.0-20230223181233-21636207a675
@@ -179,6 +178,7 @@ require (
179178
github.com/dgraph-io/badger/v3 v3.2103.5 // indirect
180179
github.com/dustin/go-humanize v1.0.1 // indirect
181180
github.com/golang/glog v1.0.0 // indirect
181+
github.com/golang/protobuf v1.5.2 // indirect
182182
github.com/google/flatbuffers v23.1.21+incompatible // indirect
183183
github.com/h2non/filetype v1.1.3 // indirect
184184
github.com/json-iterator/go v1.1.12 // indirect
@@ -188,7 +188,7 @@ require (
188188
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
189189
github.com/modern-go/reflect2 v1.0.2 // indirect
190190
github.com/muesli/cancelreader v0.2.2 // indirect
191-
golang.org/x/text v0.7.0 // indirect
191+
golang.org/x/text v0.8.0 // indirect
192192
golang.zx2c4.com/wireguard/wgctrl v0.0.0-20230215201556-9c5414ab4bde // indirect
193193
)
194194

@@ -285,7 +285,7 @@ require (
285285
github.com/mdlayher/sdnotify v1.0.0 // indirect
286286
github.com/mdlayher/socket v0.2.3 // indirect
287287
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
288-
github.com/microcosm-cc/bluemonday v1.0.21 // indirect
288+
github.com/microcosm-cc/bluemonday v1.0.23 // indirect
289289
github.com/miekg/dns v1.1.45 // indirect
290290
github.com/mitchellh/copystructure v1.2.0 // indirect
291291
github.com/mitchellh/go-ps v1.0.0 // indirect
@@ -344,7 +344,7 @@ require (
344344
go.opentelemetry.io/otel/metric v0.33.0 // indirect
345345
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
346346
go4.org/mem v0.0.0-20210711025021-927187094b94 // indirect
347-
golang.org/x/net v0.7.0 // indirect
347+
golang.org/x/net v0.8.0 // indirect
348348
golang.org/x/time v0.3.0 // indirect
349349
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect
350350
golang.zx2c4.com/wireguard/windows v0.5.3 // indirect

‎go.sum

+8-7
Original file line numberDiff line numberDiff line change
@@ -1394,8 +1394,9 @@ github.com/mgechev/dots v0.0.0-20210922191527-e955255bf517/go.mod h1:KQ7+USdGKfp
13941394
github.com/mgechev/revive v1.1.2/go.mod h1:bnXsMr+ZTH09V5rssEI+jHAZ4z+ZdyhgO/zsy3EhK+0=
13951395
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b h1:j7+1HpAFS1zy5+Q4qx1fWh90gTKwiN4QCGoY9TWyyO4=
13961396
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
1397-
github.com/microcosm-cc/bluemonday v1.0.21 h1:dNH3e4PSyE4vNX+KlRGHT5KrSvjeUkoNPwEORjffHJg=
13981397
github.com/microcosm-cc/bluemonday v1.0.21/go.mod h1:ytNkv4RrDrLJ2pqlsSI46O6IVXmZOBBD4SaJyDwwTkM=
1398+
github.com/microcosm-cc/bluemonday v1.0.23 h1:SMZe2IGa0NuHvnVNAZ+6B38gsTbi5e4sViiWJyDDqFY=
1399+
github.com/microcosm-cc/bluemonday v1.0.23/go.mod h1:mN70sk7UkkF8TUr2IGBpNN0jAgStuPzlK76QuruE/z4=
13991400
github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
14001401
github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso=
14011402
github.com/miekg/dns v1.1.35/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
@@ -2228,8 +2229,8 @@ golang.org/x/net v0.0.0-20220906165146-f3363e06e74c/go.mod h1:YDH+HFinaLZZlnHAfS
22282229
golang.org/x/net v0.0.0-20220923203811-8be639271d50/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
22292230
golang.org/x/net v0.0.0-20221002022538-bcab6841153b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
22302231
golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
2231-
golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
2232-
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
2232+
golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ=
2233+
golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
22332234
golang.org/x/oauth2 v0.0.0-20180227000427-d7d64896b5ff/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
22342235
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
22352236
golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -2444,8 +2445,8 @@ golang.org/x/term v0.0.0-20210503060354-a79de5458b56/go.mod h1:tfny5GFUkzUvx4ps4
24442445
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
24452446
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
24462447
golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
2447-
golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY=
2448-
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
2448+
golang.org/x/term v0.6.0 h1:clScbb1cHjoCkyRbWwBEUZ5H/tIFu5TAXIqaZD0Gcjw=
2449+
golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
24492450
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
24502451
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
24512452
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -2456,8 +2457,8 @@ golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
24562457
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
24572458
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
24582459
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
2459-
golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
2460-
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
2460+
golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68=
2461+
golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
24612462
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
24622463
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
24632464
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=

‎provisioner/terraform/resources_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99
"strings"
1010
"testing"
1111

12-
protobuf "github.com/golang/protobuf/proto"
1312
tfjson "github.com/hashicorp/terraform-json"
1413
"github.com/stretchr/testify/require"
14+
protobuf "google.golang.org/protobuf/proto"
1515

1616
"github.com/coder/coder/cryptorand"
1717
"github.com/coder/coder/provisioner/terraform"

0 commit comments

Comments
 (0)