Skip to content

Commit

Permalink
Merge pull request #109 from cyberark/update-golang.org/x/net
Browse files Browse the repository at this point in the history 
Upgrade terraform sdk to 2.23.0 and forced latest golang.org/x/net
  • Loading branch information
@andytinkham
andytinkham authored Sep 26, 2022
2 parents 963c65d + 62b3409 commit 7bb3994
Show file tree
Hide file tree
Showing 4 changed files with 160 additions and 425 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [Unreleased]
### Security
- Forced golang.org/x/net to use v0.0.0-20220923203811-8be639271d50 to resolve CVE-2022-27664
[cyberark/terraform-provider-conjur#109](https://github.com/cyberark/terraform-provider-conjur/pull/109)

## [0.6.3] - 2022-08-17
### Changed
Expand Down
4 changes: 2 additions & 2 deletions NOTICES.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ SECTION 1: Apache License 2.0

SECTION 2: Mozilla Public License 2.0

>>> github.com/hashicorp/terraform-plugin-sdk@v2.4.3
>>> github.com/hashicorp/terraform-plugin-sdk@v2.23.0
https://github.com/hashicorp/terraform-plugin-sdk/blob/v2.4.3/LICENSE


Expand Down Expand Up @@ -52,7 +52,7 @@ Apache License 2.0 is applicable to the following component(s).
Mozilla Public License 2.0 is applicable to the following component(s).


>>> github.com/hashicorp/terraform-plugin-sdk@v2.4.3
>>> github.com/hashicorp/terraform-plugin-sdk@v2.23.0

This Source Code Form is subject to the
terms of the Mozilla Public License, v.
Expand Down
122 changes: 64 additions & 58 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,46 +2,50 @@ module github.com/cyberark/terraform-provider-conjur

require (
github.com/cyberark/conjur-api-go v0.10.1
github.com/hashicorp/terraform-plugin-sdk/v2 v2.4.3
github.com/hashicorp/terraform-plugin-sdk/v2 v2.23.0
)

require (
github.com/agext/levenshtein v1.2.2 // indirect
github.com/apparentlymart/go-textseg/v12 v12.0.0 // indirect
github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
github.com/fatih/color v1.7.0 // indirect
github.com/golang/protobuf v1.4.2 // indirect
github.com/google/go-cmp v0.5.5 // indirect
github.com/fatih/color v1.13.0 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/hashicorp/errwrap v1.0.0 // indirect
github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 // indirect
github.com/hashicorp/go-hclog v0.15.0 // indirect
github.com/hashicorp/go-multierror v1.0.0 // indirect
github.com/hashicorp/go-plugin v1.4.0 // indirect
github.com/hashicorp/go-uuid v1.0.1 // indirect
github.com/hashicorp/go-version v1.3.0 // indirect
github.com/hashicorp/hcl/v2 v2.8.2 // indirect
github.com/hashicorp/terraform-plugin-go v0.2.1 // indirect
github.com/hashicorp/go-hclog v1.2.1 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/go-plugin v1.4.4 // indirect
github.com/hashicorp/go-uuid v1.0.3 // indirect
github.com/hashicorp/go-version v1.6.0 // indirect
github.com/hashicorp/hcl/v2 v2.14.0 // indirect
github.com/hashicorp/logutils v1.0.0 // indirect
github.com/hashicorp/terraform-plugin-go v0.14.0 // indirect
github.com/hashicorp/terraform-plugin-log v0.7.0 // indirect
github.com/hashicorp/terraform-registry-address v0.0.0-20220623143253-7d51757b572c // indirect
github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734 // indirect
github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d // indirect
github.com/mattn/go-colorable v0.1.4 // indirect
github.com/mattn/go-isatty v0.0.10 // indirect
github.com/mitchellh/copystructure v1.0.0 // indirect
github.com/mitchellh/go-testing-interface v1.0.4 // indirect
github.com/mattn/go-colorable v0.1.12 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
github.com/mitchellh/mapstructure v1.1.2 // indirect
github.com/mitchellh/reflectwalk v1.0.1 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/oklog/run v1.0.0 // indirect
github.com/sirupsen/logrus v1.8.1 // indirect
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
github.com/zclconf/go-cty v1.8.2 // indirect
github.com/vmihailenco/msgpack/v4 v4.3.12 // indirect
github.com/vmihailenco/tagparser v0.1.1 // indirect
github.com/zclconf/go-cty v1.11.0 // indirect
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 // indirect
golang.org/x/sys v0.0.0-20220517195934-5e4e11fc645e // indirect
golang.org/x/text v0.3.6 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
golang.org/x/text v0.3.7 // indirect
google.golang.org/appengine v1.6.6 // indirect
google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d // indirect
google.golang.org/grpc v1.32.0 // indirect
google.golang.org/protobuf v1.25.0 // indirect
google.golang.org/grpc v1.48.0 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
)

Expand Down Expand Up @@ -88,73 +92,75 @@ replace golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a => golang.org/x/c

replace golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 => golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b

replace golang.org/x/net v0.0.0-20180530234432-1e491301e022 => golang.org/x/net v0.0.0-20211209124913-491a49abca63
replace golang.org/x/net v0.0.0-20180530234432-1e491301e022 => golang.org/x/net v0.0.0-20220923203811-8be639271d50

replace golang.org/x/net v0.0.0-20180724234803-3673e40ba225 => golang.org/x/net v0.0.0-20211209124913-491a49abca63
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-20180811021610-c39426892332 => golang.org/x/net v0.0.0-20211209124913-491a49abca63
replace golang.org/x/net v0.0.0-20180811021610-c39426892332 => golang.org/x/net v0.0.0-20220923203811-8be639271d50

replace golang.org/x/net v0.0.0-20180826012351-8a410e7b638d => golang.org/x/net v0.0.0-20211209124913-491a49abca63
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-20190108225652-1e06a53dbb7e => golang.org/x/net v0.0.0-20211209124913-491a49abca63
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-20190213061140-3a22650c66bd => golang.org/x/net v0.0.0-20211209124913-491a49abca63
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-20190311183353-d8887717615a => golang.org/x/net v0.0.0-20211209124913-491a49abca63
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-20190404232315-eb5bcb51f2a3 => golang.org/x/net v0.0.0-20211209124913-491a49abca63
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-20190501004415-9ce7a6920f09 => golang.org/x/net v0.0.0-20211209124913-491a49abca63
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-20190503192946-f4e77d36d62c => golang.org/x/net v0.0.0-20211209124913-491a49abca63
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-20190603091049-60506f45cf65 => golang.org/x/net v0.0.0-20211209124913-491a49abca63
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-20190620200207-3b0461eec859 => golang.org/x/net v0.0.0-20211209124913-491a49abca63
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-20190628185345-da137c7871d7 => golang.org/x/net v0.0.0-20211209124913-491a49abca63
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-20190724013045-ca1201d0de80 => golang.org/x/net v0.0.0-20211209124913-491a49abca63
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-20191009170851-d66e71096ffb => golang.org/x/net v0.0.0-20211209124913-491a49abca63
replace golang.org/x/net v0.0.0-20191009170851-d66e71096ffb => golang.org/x/net v0.0.0-20220923203811-8be639271d50

replace golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 => golang.org/x/net v0.0.0-20211209124913-491a49abca63
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-20200114155413-6afb5195e5aa => golang.org/x/net v0.0.0-20211209124913-491a49abca63
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-20200202094626-16171245cfb2 => golang.org/x/net v0.0.0-20211209124913-491a49abca63
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-20200222125558-5a598a2470a0 => golang.org/x/net v0.0.0-20211209124913-491a49abca63
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-20200226121028-0de0cce0169b => golang.org/x/net v0.0.0-20211209124913-491a49abca63
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-20200301022130-244492dfa37a => golang.org/x/net v0.0.0-20211209124913-491a49abca63
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-20200324143707-d3edc9973b7e => golang.org/x/net v0.0.0-20211209124913-491a49abca63
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-20200501053045-e0ff5e5a1de5 => golang.org/x/net v0.0.0-20211209124913-491a49abca63
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-20200506145744-7e3656a0809f => golang.org/x/net v0.0.0-20211209124913-491a49abca63
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-20200513185701-a91f0712d120 => golang.org/x/net v0.0.0-20211209124913-491a49abca63
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-20200520182314-0ba52f642ac2 => golang.org/x/net v0.0.0-20211209124913-491a49abca63
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-20200625001655-4c5254603344 => golang.org/x/net v0.0.0-20211209124913-491a49abca63
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-20200707034311-ab3426394381 => golang.org/x/net v0.0.0-20211209124913-491a49abca63
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-20200822124328-c89045814202 => golang.org/x/net v0.0.0-20211209124913-491a49abca63
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-20201021035429-f5854403a974 => golang.org/x/net v0.0.0-20211209124913-491a49abca63
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-20201110031124-69a78807bb2b => golang.org/x/net v0.0.0-20211209124913-491a49abca63
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-20210226172049-e18ecbb05110 => golang.org/x/net v0.0.0-20211209124913-491a49abca63
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-20210326060303-6b1517762897 => golang.org/x/net v0.0.0-20211209124913-491a49abca63
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-20211112202133-69e39bad7dc2 => golang.org/x/net v0.0.0-20211209124913-491a49abca63
replace golang.org/x/net v0.0.0-20210326060303-6b1517762897 => golang.org/x/net v0.0.0-20220923203811-8be639271d50

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

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

Expand Down
Loading

0 comments on commit 7bb3994

Please sign in to comment.