Skip to content
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

Update gopsutil to v3 to fix MacOS deprecation warnings #16321

Merged
merged 4 commits into from Jul 20, 2022

Conversation

austingebauer
Copy link
Member

This PR updates the github.com/shirou/gopsutil dependency to address a build-time deprecation warning in MacOS Monterey (12.0+). This fixes #16062.

Additionally, this brings in a fix from gopsutil/pull/1310 which will allow us to update the golang.org/x/sys dependency without breaking our OpenBSD releases. I tested that the OpenBSD builds are successful with an updated golang.org/x/sys dependency in a separate branch.

The CI run looks good, but I plan to do some more testing to ensure this doesn't introduce regressions.

Steps:

$ go get github.com/shirou/gopsutil/v3@v3.22.6
$ go mod tidy

Copy link
Contributor

@stevendpclark stevendpclark left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm, thanks for doing this.

@austingebauer
Copy link
Member Author

Example of the diff between fields in the Vault host-info response when going from gopsutil v2 to v3.

host-info-field-diff

Copy link
Contributor

@swenson swenson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

helper/hostutil/hostinfo.go Show resolved Hide resolved
@austingebauer austingebauer merged commit 3bf7313 into main Jul 20, 2022
@austingebauer austingebauer deleted the update-gopsutil branch July 20, 2022 23:37
@tsaarni tsaarni mentioned this pull request Aug 5, 2022
mpalmi pushed a commit that referenced this pull request Dec 20, 2022
* Update gopsutil to v3

* Adds v2 field names in host-info response to allow eventual deprecation in favor of v3 field names

* Map v3 to v2 field names to keep host-info api compat

* copy gopsutil license into source

* Bump klog version to fix compilation issues
mpalmi pushed a commit that referenced this pull request Dec 20, 2022
* Update gopsutil to v3

* Adds v2 field names in host-info response to allow eventual deprecation in favor of v3 field names

* Map v3 to v2 field names to keep host-info api compat

* copy gopsutil license into source

* bump klog version to fix builds
mpalmi added a commit that referenced this pull request Dec 20, 2022
* update golang/x/net

* Update gopsutil to v3 to fix MacOS deprecation warnings (#16321)

* Update gopsutil to v3

* Adds v2 field names in host-info response to allow eventual deprecation in favor of v3 field names

* Map v3 to v2 field names to keep host-info api compat

* copy gopsutil license into source

* Bump klog version to fix compilation issues

Co-authored-by: Mike Palmiotto <mike.palmiotto@hashicorp.com>
Co-authored-by: Austin Gebauer <34121980+austingebauer@users.noreply.github.com>
mpalmi added a commit that referenced this pull request Dec 20, 2022
* update golang/x/net

* Update gopsutil to v3 to fix MacOS deprecation warnings (#16321)

* Update gopsutil to v3

* Adds v2 field names in host-info response to allow eventual deprecation in favor of v3 field names

* Map v3 to v2 field names to keep host-info api compat

* copy gopsutil license into source

* bump klog version to fix builds

Co-authored-by: Mike Palmiotto <mike.palmiotto@hashicorp.com>
Co-authored-by: Austin Gebauer <34121980+austingebauer@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

updated gopsutil to fix mac deprication
3 participants