Skip to content

Commit

Permalink
Merge pull request #501 from cyberark/update-golang.org/x/net-0.7.0
Browse files Browse the repository at this point in the history 
Update golang.org/x/net to v0.7.0
  • Loading branch information
@andytinkham
andytinkham authored Feb 24, 2023
2 parents d2e296c + 876457c commit 7137964
Show file tree
Hide file tree
Showing 2 changed files with 66 additions and 66 deletions.
106 changes: 54 additions & 52 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@ require (
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.7.0 // indirect
go.opentelemetry.io/otel/sdk v1.7.0 // indirect
go.opentelemetry.io/otel/trace v1.10.0 // indirect
golang.org/x/net v0.1.1-0.20221104162952-702349b0e862 // indirect
golang.org/x/net v0.7.0 // indirect
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
golang.org/x/sys v0.1.0 // indirect
golang.org/x/term v0.1.0 // indirect
golang.org/x/text v0.4.0 // indirect
golang.org/x/sys v0.5.0 // indirect
golang.org/x/term v0.5.0 // indirect
golang.org/x/text v0.7.0 // indirect
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.28.0 // indirect
Expand All @@ -66,11 +66,11 @@ require (

// Automated release process replaces
// DO NOT EDIT: CHANGES TO THE 3 BELOW LINES WILL BREAK AUTOMATED RELEASES
replace github.com/cyberark/conjur-api-go => github.com/cyberark/conjur-api-go v0.10.2
replace github.com/cyberark/conjur-api-go => github.com/cyberark/conjur-api-go latest

replace github.com/cyberark/conjur-authn-k8s-client => github.com/cyberark/conjur-authn-k8s-client v0.23.8
replace github.com/cyberark/conjur-authn-k8s-client => github.com/cyberark/conjur-authn-k8s-client latest

replace github.com/cyberark/conjur-opentelemetry-tracer => github.com/cyberark/conjur-opentelemetry-tracer v0.0.1-655
replace github.com/cyberark/conjur-opentelemetry-tracer => github.com/cyberark/conjur-opentelemetry-tracer latest

// Security fixes to ensure we don't have old vulnerable packages in our
// dependency tree. Only put specific versions on the left side of the =>
Expand All @@ -94,95 +94,97 @@ replace golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 => golang.org/x/c

replace golang.org/x/crypto v0.0.0-20220214200702-86341886e292 => golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e

replace golang.org/x/net v0.0.0-20180826012351-8a410e7b638d => golang.org/x/net v0.0.0-20220923203811-8be639271d50
replace golang.org/x/net v0.0.0-20180826012351-8a410e7b638d => golang.org/x/net v0.7.0

replace golang.org/x/net v0.0.0-20180724234803-3673e40ba225 => golang.org/x/net v0.0.0-20220923203811-8be639271d50
replace golang.org/x/net v0.0.0-20180724234803-3673e40ba225 => golang.org/x/net v0.7.0

replace golang.org/x/net v0.0.0-20180906233101-161cd47e91fd => golang.org/x/net v0.0.0-20220923203811-8be639271d50
replace golang.org/x/net v0.0.0-20180906233101-161cd47e91fd => golang.org/x/net v0.7.0

replace golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e => golang.org/x/net v0.0.0-20220923203811-8be639271d50
replace golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e => golang.org/x/net v0.7.0

replace golang.org/x/net v0.0.0-20190213061140-3a22650c66bd => golang.org/x/net v0.0.0-20220923203811-8be639271d50
replace golang.org/x/net v0.0.0-20190213061140-3a22650c66bd => golang.org/x/net v0.7.0

replace golang.org/x/net v0.0.0-20190311183353-d8887717615a => golang.org/x/net v0.0.0-20220923203811-8be639271d50
replace golang.org/x/net v0.0.0-20190311183353-d8887717615a => golang.org/x/net v0.7.0

replace golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 => golang.org/x/net v0.0.0-20220923203811-8be639271d50
replace golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 => golang.org/x/net v0.7.0

replace golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09 => golang.org/x/net v0.0.0-20220923203811-8be639271d50
replace golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09 => golang.org/x/net v0.7.0

replace golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c => golang.org/x/net v0.0.0-20220923203811-8be639271d50
replace golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c => golang.org/x/net v0.7.0

replace golang.org/x/net v0.0.0-20190603091049-60506f45cf65 => golang.org/x/net v0.0.0-20220923203811-8be639271d50
replace golang.org/x/net v0.0.0-20190603091049-60506f45cf65 => golang.org/x/net v0.7.0

replace golang.org/x/net v0.0.0-20190620200207-3b0461eec859 => golang.org/x/net v0.0.0-20220923203811-8be639271d50
replace golang.org/x/net v0.0.0-20190620200207-3b0461eec859 => golang.org/x/net v0.7.0

replace golang.org/x/net v0.0.0-20190628185345-da137c7871d7 => golang.org/x/net v0.0.0-20220923203811-8be639271d50
replace golang.org/x/net v0.0.0-20190628185345-da137c7871d7 => golang.org/x/net v0.7.0

replace golang.org/x/net v0.0.0-20190724013045-ca1201d0de80 => golang.org/x/net v0.0.0-20220923203811-8be639271d50
replace golang.org/x/net v0.0.0-20190724013045-ca1201d0de80 => golang.org/x/net v0.7.0

replace golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297 => golang.org/x/net v0.0.0-20220923203811-8be639271d50
replace golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297 => golang.org/x/net v0.7.0

replace golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 => golang.org/x/net v0.0.0-20220923203811-8be639271d50
replace golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 => golang.org/x/net v0.7.0

replace golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa => golang.org/x/net v0.0.0-20220923203811-8be639271d50
replace golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa => golang.org/x/net v0.7.0

replace golang.org/x/net v0.0.0-20200202094626-16171245cfb2 => golang.org/x/net v0.0.0-20220923203811-8be639271d50
replace golang.org/x/net v0.0.0-20200202094626-16171245cfb2 => golang.org/x/net v0.7.0

replace golang.org/x/net v0.0.0-20200222125558-5a598a2470a0 => golang.org/x/net v0.0.0-20220923203811-8be639271d50
replace golang.org/x/net v0.0.0-20200222125558-5a598a2470a0 => golang.org/x/net v0.7.0

replace golang.org/x/net v0.0.0-20200226121028-0de0cce0169b => golang.org/x/net v0.0.0-20220923203811-8be639271d50
replace golang.org/x/net v0.0.0-20200226121028-0de0cce0169b => golang.org/x/net v0.7.0

replace golang.org/x/net v0.0.0-20200301022130-244492dfa37a => golang.org/x/net v0.0.0-20220923203811-8be639271d50
replace golang.org/x/net v0.0.0-20200301022130-244492dfa37a => golang.org/x/net v0.7.0

replace golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e => golang.org/x/net v0.0.0-20220923203811-8be639271d50
replace golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e => golang.org/x/net v0.7.0

replace golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5 => golang.org/x/net v0.0.0-20220923203811-8be639271d50
replace golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5 => golang.org/x/net v0.7.0

replace golang.org/x/net v0.0.0-20200506145744-7e3656a0809f => golang.org/x/net v0.0.0-20220923203811-8be639271d50
replace golang.org/x/net v0.0.0-20200506145744-7e3656a0809f => golang.org/x/net v0.7.0

replace golang.org/x/net v0.0.0-20200513185701-a91f0712d120 => golang.org/x/net v0.0.0-20220923203811-8be639271d50
replace golang.org/x/net v0.0.0-20200513185701-a91f0712d120 => golang.org/x/net v0.7.0

replace golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7 => golang.org/x/net v0.0.0-20220923203811-8be639271d50
replace golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7 => golang.org/x/net v0.7.0

replace golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2 => golang.org/x/net v0.0.0-20220923203811-8be639271d50
replace golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2 => golang.org/x/net v0.7.0

replace golang.org/x/net v0.0.0-20200625001655-4c5254603344 => golang.org/x/net v0.0.0-20220923203811-8be639271d50
replace golang.org/x/net v0.0.0-20200625001655-4c5254603344 => golang.org/x/net v0.7.0

replace golang.org/x/net v0.0.0-20200707034311-ab3426394381 => golang.org/x/net v0.0.0-20220923203811-8be639271d50
replace golang.org/x/net v0.0.0-20200707034311-ab3426394381 => golang.org/x/net v0.7.0

replace golang.org/x/net v0.0.0-20200822124328-c89045814202 => golang.org/x/net v0.0.0-20220923203811-8be639271d50
replace golang.org/x/net v0.0.0-20200822124328-c89045814202 => golang.org/x/net v0.7.0

replace golang.org/x/net v0.0.0-20201021035429-f5854403a974 => golang.org/x/net v0.0.0-20220923203811-8be639271d50
replace golang.org/x/net v0.0.0-20201021035429-f5854403a974 => golang.org/x/net v0.7.0

replace golang.org/x/net v0.0.0-20201031054903-ff519b6c9102 => golang.org/x/net v0.0.0-20220923203811-8be639271d50
replace golang.org/x/net v0.0.0-20201031054903-ff519b6c9102 => golang.org/x/net v0.7.0

replace golang.org/x/net v0.0.0-20201110031124-69a78807bb2b => golang.org/x/net v0.0.0-20220923203811-8be639271d50
replace golang.org/x/net v0.0.0-20201110031124-69a78807bb2b => golang.org/x/net v0.7.0

replace golang.org/x/net v0.0.0-20201209123823-ac852fbbde11 => golang.org/x/net v0.0.0-20220923203811-8be639271d50
replace golang.org/x/net v0.0.0-20201209123823-ac852fbbde11 => golang.org/x/net v0.7.0

replace golang.org/x/net v0.0.0-20210119194325-5f4716e94777 => golang.org/x/net v0.0.0-20220923203811-8be639271d50
replace golang.org/x/net v0.0.0-20210119194325-5f4716e94777 => golang.org/x/net v0.7.0

replace golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 => golang.org/x/net v0.0.0-20220923203811-8be639271d50
replace golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 => golang.org/x/net v0.7.0

replace golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4 => golang.org/x/net v0.0.0-20220923203811-8be639271d50
replace golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4 => golang.org/x/net v0.7.0

replace golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 => golang.org/x/net v0.0.0-20220923203811-8be639271d50
replace golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 => golang.org/x/net v0.7.0

replace golang.org/x/net v0.0.0-20210428140749-89ef3d95e781 => golang.org/x/net v0.0.0-20220923203811-8be639271d50
replace golang.org/x/net v0.0.0-20210428140749-89ef3d95e781 => golang.org/x/net v0.7.0

replace golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420 => golang.org/x/net v0.0.0-20220923203811-8be639271d50
replace golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420 => golang.org/x/net v0.7.0

replace golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f => golang.org/x/net v0.0.0-20220923203811-8be639271d50
replace golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f => golang.org/x/net v0.7.0

replace golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 => golang.org/x/net v0.0.0-20220923203811-8be639271d50
replace golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 => golang.org/x/net v0.7.0

replace golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd => golang.org/x/net v0.0.0-20220923203811-8be639271d50
replace golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd => golang.org/x/net v0.7.0

replace golang.org/x/net v0.0.0-20220923203811-8be639271d50 => golang.org/x/net v0.0.0-20220923203811-8be639271d50
replace golang.org/x/net v0.0.0-20220923203811-8be639271d50 => golang.org/x/net v0.7.0

replace golang.org/x/net v0.0.0-20220225172249-27dd8689420f => golang.org/x/net v0.0.0-20220923203811-8be639271d50
replace golang.org/x/net v0.0.0-20220225172249-27dd8689420f => golang.org/x/net v0.7.0

replace golang.org/x/net v0.0.0-20220722155237-a158d28d115b => golang.org/x/net v0.0.0-20220923203811-8be639271d50
replace golang.org/x/net v0.0.0-20220722155237-a158d28d115b => golang.org/x/net v0.7.0

replace golang.org/x/net v0.1.1-0.20221104162952-702349b0e862 => golang.org/x/net v0.7.0

replace golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c => golang.org/x/text v0.4.0

Expand Down
26 changes: 12 additions & 14 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGX
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/cyberark/conjur-api-go v0.10.2 h1:V2zip069ybE1ubAi2xsay4WGdXG4vIQZ1z7GXPRt7IY=
github.com/cyberark/conjur-api-go v0.10.2/go.mod h1:8+qYC7L6wPY1e56hoZmHSdGa2fHALck8PtS+cUky75Y=
github.com/cyberark/conjur-authn-k8s-client v0.23.8 h1:R33DsjpwXV49kQLoL0RliZM2GbkCIZcTZ+3brPajDBE=
github.com/cyberark/conjur-authn-k8s-client v0.23.8/go.mod h1:+Yeek99Ijq2IB3WYHx+Wp9aUfyMm42WjZshVlbtIKcg=
github.com/cyberark/conjur-opentelemetry-tracer v0.0.1-655 h1:Bj3Z5iQZGUL6xpJI8WkSLwlP635Bcus+yvb7sRDIjAk=
github.com/cyberark/conjur-opentelemetry-tracer v0.0.1-655/go.mod h1:IU6D7QQezwoCi6GaKa+79ZrBNyJzFCbIAep0VrLHK6o=
github.com/cyberark/conjur-authn-k8s-client v0.24.0 h1:M8Xd6+ztymxQiXUMfVdvpfsTQXJE059CfKVFMDyP1qo=
github.com/cyberark/conjur-authn-k8s-client v0.24.0/go.mod h1:+Yeek99Ijq2IB3WYHx+Wp9aUfyMm42WjZshVlbtIKcg=
github.com/cyberark/conjur-opentelemetry-tracer v0.0.1-820 h1:NbEmFGPTY6vzeNSACrAJlbMe1YkwZoLroDaYTHGrJGc=
github.com/cyberark/conjur-opentelemetry-tracer v0.0.1-820/go.mod h1:IU6D7QQezwoCi6GaKa+79ZrBNyJzFCbIAep0VrLHK6o=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
Expand Down Expand Up @@ -249,9 +249,8 @@ golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzB
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.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
golang.org/x/net v0.0.0-20220923203811-8be639271d50/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
golang.org/x/net v0.1.1-0.20221104162952-702349b0e862 h1:KrLJ+iz8J6j6VVr/OCfULAcK+xozUmWE43fKpMR4MlI=
golang.org/x/net v0.1.1-0.20221104162952-702349b0e862/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
Expand Down Expand Up @@ -299,16 +298,15 @@ golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220111092808-5a964db01320/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U=
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
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.1.0 h1:g6Z6vPFA9dYBAF7DWcH6sCcOntplXsDKcliusYijMlw=
golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY=
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg=
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
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=
Expand Down

0 comments on commit 7137964

Please sign in to comment.