kairos/kairos-sdk
1
0
Fork 0
mirror of https://github.com/kairos-io/kairos-sdk.git synced 2025-09-02 15:54:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

art: Move from io/ioutil to io and os packages (#470)

Browse Source 
refactor: move from io/ioutil to io and os packages

The io/ioutil package has been deprecated as of Go 1.16 [1]. This commit
replaces the existing io/ioutil functions with their new definitions in
io and os packages.

[1]: https://golang.org/doc/go1.16#ioutil
Signed-off-by: Eng Zer Jun <engzerjun@gmail.com>
This commit is contained in:
Eng Zer Jun
2022-11-22 01:11:03 +08:00
committed by Itxaka
parent 5f43f69352
commit b92c2eaf6b
5 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sdk/bundles/bundle_test.go
View File

@@ -1,7 +1,6 @@
package bundles_test package bundles_test
import ( import (
"io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
@@ -13,7 +12,7 @@ import (
var _ = Describe("Bundle", func() { var _ = Describe("Bundle", func() {
Context("install", func() { Context("install", func() {
PIt("installs packages from luet repos", func() { PIt("installs packages from luet repos", func() {
dir, err := ioutil.TempDir("", "test") dir, err := os.MkdirTemp("", "test")
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
defer os.RemoveAll(dir) defer os.RemoveAll(dir)
os.MkdirAll(filepath.Join(dir, "var", "tmp", "luet"), os.ModePerm) os.MkdirAll(filepath.Join(dir, "var", "tmp", "luet"), os.ModePerm)
@@ -23,7 +22,7 @@ var _ = Describe("Bundle", func() {
}) })
It("installs from container images", func() { It("installs from container images", func() {
dir, err := ioutil.TempDir("", "test") dir, err := os.MkdirTemp("", "test")
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
defer os.RemoveAll(dir) defer os.RemoveAll(dir)
err = RunBundles([]BundleOption{WithDBPath(dir), WithRootFS(dir), WithTarget("container://quay.io/mocaccino/extra:edgevpn-utils-0.15.0")}) err = RunBundles([]BundleOption{WithDBPath(dir), WithRootFS(dir), WithTarget("container://quay.io/mocaccino/extra:edgevpn-utils-0.15.0")})

3
sdk/bundles/bundles.go
View File

@@ -2,7 +2,6 @@ package bundles
import ( import (
"fmt" "fmt"
"io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
"strings" "strings"
@@ -143,7 +142,7 @@ type ContainerRunner struct{}
func (l *ContainerRunner) Install(config *BundleConfig) error { func (l *ContainerRunner) Install(config *BundleConfig) error {
tempDir, err := ioutil.TempDir("", "containerrunner") tempDir, err := os.MkdirTemp("", "containerrunner")
if err != nil { if err != nil {
return err return err
} }

8
sdk/profile/build.go
View File

@@ -2,7 +2,7 @@ package profile
import ( import (
"fmt" "fmt"
"io/ioutil" "os"
"strings" "strings"
"github.com/kairos-io/kairos/pkg/utils" "github.com/kairos-io/kairos/pkg/utils"
@@ -19,7 +19,7 @@ type profileFileStruct struct {
} }
func BuildFlavor(flavor string, profileFile string, directory string) error { func BuildFlavor(flavor string, profileFile string, directory string) error {
dat, err := ioutil.ReadFile(profileFile) dat, err := os.ReadFile(profileFile)
if err != nil { if err != nil {
return fmt.Errorf("error while reading profile: %w", err) return fmt.Errorf("error while reading profile: %w", err)
@@ -55,7 +55,7 @@ func BuildFlavor(flavor string, profileFile string, directory string) error {
func readProfilePackages(profile string, profileFile string) ([]string, error) { func readProfilePackages(profile string, profileFile string) ([]string, error) {
res := []string{} res := []string{}
dat, err := ioutil.ReadFile(profileFile) dat, err := os.ReadFile(profileFile)
if err != nil { if err != nil {
return res, fmt.Errorf("error while reading profile: %w", err) return res, fmt.Errorf("error while reading profile: %w", err)
} }
@@ -86,7 +86,7 @@ func readProfilePackages(profile string, profileFile string) ([]string, error) {
func readCommonPackages(profileFile string) ([]string, error) { func readCommonPackages(profileFile string) ([]string, error) {
res := []string{} res := []string{}
dat, err := ioutil.ReadFile(profileFile) dat, err := os.ReadFile(profileFile)
if err != nil { if err != nil {
return res, fmt.Errorf("error while reading profile: %w", err) return res, fmt.Errorf("error while reading profile: %w", err)
} }

4
sdk/state/state.go
View File

@@ -3,7 +3,7 @@ package state
import ( import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"io/ioutil" "os"
"strings" "strings"
"github.com/itchyny/gojq" "github.com/itchyny/gojq"
@@ -59,7 +59,7 @@ func detectPartition(b *block.Partition) PartitionState {
} }
func detectBoot() Boot { func detectBoot() Boot {
cmdline, err := ioutil.ReadFile("/proc/cmdline") cmdline, err := os.ReadFile("/proc/cmdline")
if err != nil { if err != nil {
return Unknown return Unknown
} }

3
sdk/system/cloudconfig.go
View File

@@ -2,7 +2,6 @@ package system
import ( import (
"fmt" "fmt"
"io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
@@ -45,7 +44,7 @@ func writeCloudConfig(oem state.PartitionState, cloudConfig, subpath, filename s
machine.Umount(mountPath) //nolint:errcheck machine.Umount(mountPath) //nolint:errcheck
}() }()
_ = os.MkdirAll(filepath.Join(mountPath, subpath), 0650) _ = os.MkdirAll(filepath.Join(mountPath, subpath), 0650)
return ioutil.WriteFile(filepath.Join(mountPath, subpath, fmt.Sprintf("%s.yaml", filename)), []byte(cloudConfig), 0650) return os.WriteFile(filepath.Join(mountPath, subpath, fmt.Sprintf("%s.yaml", filename)), []byte(cloudConfig), 0650)
} }
// WriteCloudConfigData adds cloud config data to oem (/oem or /usr/local/cloud-config, depending if OEM partition exists). // WriteCloudConfigData adds cloud config data to oem (/oem or /usr/local/cloud-config, depending if OEM partition exists).