New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Bug 1855577: Updating the golang.org/x/text version to v0.3.3 #408
Bug 1855577: Updating the golang.org/x/text version to v0.3.3 #408
Conversation
@LalatenduMohanty: This pull request references Bugzilla bug 1855577, which is valid. The bug has been updated to refer to the pull request using the external bug tracker. 3 validation(s) were run on this bug
In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
With this change |
There are indirect dependency on
However with this PR go module is getting the right version
|
Another approach #406. However we need to merge the fix asap. |
cc83dfa
to
9c29db7
Compare
go.mod
Outdated
@@ -25,6 +25,7 @@ require ( | |||
github.com/spf13/cobra v0.0.5 | |||
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 | |||
golang.org/x/sys v0.0.0-20191003212358-c178f38b412c // indirect | |||
golang.org/x/text v0.3.3 // indirect |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
replace
would ensure other packages won't overwrite that
588d2bc
to
2021b86
Compare
Using replace directive to force the 0.3.3 version Signed-off-by: Lalatendu Mohanty <lmohanty@redhat.com>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/approve
/lgtm
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: LalatenduMohanty, vrutkovs The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
/cherry-pick release-4.5 |
@vrutkovs: once the present PR merges, I will cherry-pick it on top of release-4.5 in a new PR and assign it to you. In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
/retest Please review the full test history for this PR and help us cut down flakes. |
1 similar comment
/retest Please review the full test history for this PR and help us cut down flakes. |
/test e2e |
@LalatenduMohanty: All pull requests linked via external trackers have merged: openshift/cluster-version-operator#408. Bugzilla bug 1855577 has been moved to the MODIFIED state. In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
@vrutkovs: new pull request created: #409 In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
Generated with: $ go mod vendor using: $ go version go version go1.14.4 linux/amd64 addressing [1]: Building github.com/openshift/cluster-version-operator (v1.0.0-302-g13e97af4-dirty) # golang.org/x/text/unicode/norm vendor/golang.org/x/text/unicode/norm/composition.go:466:2: undefined: recompMapOnce ... I'd guessed these slipped through in 2021b86 (Bug 1855577: Updating the golang.org/x/text version to v0.3.3, 2020-07-15, openshift#408). $ go1.13.5 mod vendor pulls them in too, so I'm not entirely clear on how they slipped through. But they seem to be fatal for 1.14 builds and non-fatal for 1.13 builds. [1]: https://prow.ci.openshift.org/view/gs/origin-ci-test/pr-logs/pull/openshift_cluster-version-operator/414/pull-ci-openshift-cluster-version-operator-master-images/1286049697189859328
Generated with: $ go mod vendor using: $ go version go version go1.14.4 linux/amd64 addressing [1]: Building github.com/openshift/cluster-version-operator (v1.0.0-302-g13e97af4-dirty) # golang.org/x/text/unicode/norm vendor/golang.org/x/text/unicode/norm/composition.go:466:2: undefined: recompMapOnce ... I'd guessed these slipped through in 2021b86 (Bug 1855577: Updating the golang.org/x/text version to v0.3.3, 2020-07-15, openshift#408). $ go1.13.5 mod vendor pulls them in too, so I'm not entirely clear on how they slipped through. But they seem to be fatal for 1.14 builds and non-fatal for 1.13 builds. [1]: https://prow.ci.openshift.org/view/gs/origin-ci-test/pr-logs/pull/openshift_cluster-version-operator/414/pull-ci-openshift-cluster-version-operator-master-images/1286049697189859328
Pulling in [1,2]. Generated with: $ emacs go.mod # removing the golang.org/x/text replace $ go get -u github.com/openshift/client-go@83993cebb5aee533bf2f2dded2d87b9e32835f4a go: github.com/openshift/client-go 83993cebb5aee533bf2f2dded2d87b9e32835f4a => v0.0.0-20200623090625-83993cebb5ae $ go get -u github.com/openshift/library-go@cc498c355c99983057e9e01f3abcceb40ca5c298 go: github.com/openshift/library-go cc498c355c99983057e9e01f3abcceb40ca5c298 => v0.0.0-20200709151624-cc498c355c99 $ go mod tidy $ go mod vendor $ git add -A go.* vendor using: $ go version go version go1.14.4 linux/amd64 This pulls in the client-go bump which in turn addresses the golang.org/x/text v0.3.3 to address CVE-2020-14040 [3]. $ grep '# golang.org/x/text' vendor/modules.txt # golang.org/x/text v0.3.3 We'd previously addressed the CVE with the explicit 'replace' from 2021b86 (Bug 1855577: Updating the golang.org/x/text version to v0.3.3, 2020-07-15, openshift#408), but it's more elegant to not have to have explicit overrides for our indirect dependencies. [1]: openshift/client-go@83993ce [2]: openshift/library-go@cc498c3 [3]: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-14040
Pulling in [1,2]. Generated with: $ emacs go.mod # removing the golang.org/x/text replace $ go get -u github.com/openshift/client-go@83993cebb5aee533bf2f2dded2d87b9e32835f4a go: github.com/openshift/client-go 83993cebb5aee533bf2f2dded2d87b9e32835f4a => v0.0.0-20200623090625-83993cebb5ae $ go get -u github.com/openshift/library-go@cc498c355c99983057e9e01f3abcceb40ca5c298 go: github.com/openshift/library-go cc498c355c99983057e9e01f3abcceb40ca5c298 => v0.0.0-20200709151624-cc498c355c99 $ go mod tidy $ go mod vendor $ git add -A go.* vendor using: $ go version go version go1.14.4 linux/amd64 This pulls in the client-go bump which in turn addresses the golang.org/x/text v0.3.3 to address CVE-2020-14040 [3]. $ grep '# golang.org/x/text' vendor/modules.txt # golang.org/x/text v0.3.3 We'd previously addressed the CVE with the explicit 'replace' from 2021b86 (Bug 1855577: Updating the golang.org/x/text version to v0.3.3, 2020-07-15, openshift#408), but it's more elegant to not have to have explicit overrides for our indirect dependencies. [1]: openshift/client-go@83993ce [2]: openshift/library-go@cc498c3 [3]: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-14040
Signed-off-by: Lalatendu Mohanty lmohanty@redhat.com