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.

Sign up for GitHub

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

Jump to bottom

lxd: Remove use of ioutil #12400

Merged
merged 4 commits into from
Oct 18, 2023
Merged

lxd: Remove use of ioutil #12400

merged 4 commits into from
Oct 18, 2023

Conversation

simondeziel
Copy link
Member

Fixes #12399

@simondeziel simondeziel marked this pull request as ready for review October 17, 2023 17:05
tomponline
tomponline requested changes Oct 17, 2023
View reviewed changes
Copy link
Member

@tomponline tomponline left a comment

Choose a reason for hiding this comment

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

Please can you split this into several commits to allow back porting.

tomponline
tomponline requested changes Oct 17, 2023
View reviewed changes
Copy link
Member

@tomponline tomponline left a comment

Choose a reason for hiding this comment

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

Also is there something we can do in ci checks to block reintroduction of this package?

@stgraber @simondeziel
storage/backend_lxd: Replace ioutil.ReadAll() by io.ReadAll()
e62ac52 
Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
Signed-off-by: Simon Deziel <simon.deziel@canonical.com>
@stgraber @simondeziel
lxd-metadata: Replace ioutil.{Read,Write}File() by os.{Read,Write}File()
a063187 
Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
Signed-off-by: Simon Deziel <simon.deziel@canonical.com>
@stgraber @simondeziel
lxd/apparmor/rsync: Replace ioutil.WriteFile() by os.WriteFile()
ac39ead 
Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
Signed-off-by: Simon Deziel <simon.deziel@canonical.com>
@stgraber @simondeziel
lxd/device_utils_generic: Replace ioutil.ReadDir() by os.ReadDir()
5d6fdda 
Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
Signed-off-by: Simon Deziel <simon.deziel@canonical.com>
@simondeziel
Copy link
Member Author

simondeziel commented Oct 17, 2023 •
edited
Loading

Please can you split this into several commits to allow back porting.

As you can imagine, cherry-pick didn't like the path changes so I ended up manually patching most files. The incus equivalent of lxd/device/device_utils_generic.go had already been patched by another commit (lxc/incus@19f8027). That second commit was authored by Gabriel but Gabriel's commit in LXD used ioutil.

This makes attribution a bit hard to track. In the rework commit set, I went with Author+Signed-off to Stéphane to be safe.

@tomponline tomponline merged commit bd9abdf into canonical:main Oct 18, 2023
26 checks passed
@simondeziel simondeziel deleted the ioutil-is-deprecated branch October 18, 2023 14:40
@simondeziel simondeziel mentioned this pull request Oct 19, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tomponline tomponline tomponline approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

io/ioutil is deprecated
3 participants
@simondeziel @tomponline @stgraber