chore(builder): remove io/ioutil

duanhongyi · duanhongyi · commit 40586cd85d6b · 2023-10-23T14:42:28.000+08:00
diff --git a/pkg/cleaner/cleaner.go b/pkg/cleaner/cleaner.go
@@ -5,7 +5,7 @@ package cleaner
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
+	"os"
 	"path/filepath"
 	"regexp"
 	"strings"
@@ -28,7 +28,7 @@ const (
 // localDirs returns all of the local directories immediately under gitHome that filter returns true for.
 // filter will receive only the names of each of the top level directories (not their fully qualified paths), and should return true if it should be included in the output
 func localDirs(gitHome string, filter func(string) bool) ([]string, error) {
-	fileInfos, err := ioutil.ReadDir(gitHome)
+	fileInfos, err := os.ReadDir(gitHome)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/conf/config.go b/pkg/conf/config.go
@@ -2,9 +2,9 @@ package conf
 
 import (
 	"fmt"
-	"io/ioutil"
 	"net"
 	"net/url"
+	"os"
 	"strings"
 
 	"github.com/drycc/builder/pkg/sys"
@@ -26,7 +26,7 @@ type Parameters map[string]interface{}
 
 // GetBuilderKey returns the key to be used as token to interact with drycc-controller
 func GetBuilderKey() (string, error) {
-	builderKeyBytes, err := ioutil.ReadFile(BuilderKeyLocation)
+	builderKeyBytes, err := os.ReadFile(BuilderKeyLocation)
 	if err != nil {
 		return "", fmt.Errorf("couldn't get builder key from %s (%s)", BuilderKeyLocation, err)
 	}
diff --git a/pkg/conf/config_test.go b/pkg/conf/config_test.go
@@ -1,7 +1,6 @@
 package conf
 
 import (
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"testing"
@@ -33,7 +32,7 @@ func TestGetStorageParams(t *testing.T) {
 }
 
 func TestGetControllerClient(t *testing.T) {
-	tmpDir, err := ioutil.TempDir("", "tmpdir")
+	tmpDir, err := os.MkdirTemp("", "tmpdir")
 	if err != nil {
 		t.Fatalf("error creating temp directory (%s)", err)
 	}
@@ -46,7 +45,7 @@ func TestGetControllerClient(t *testing.T) {
 
 	BuilderKeyLocation = filepath.Join(tmpDir, "builder-key")
 	data := []byte("testbuilderkey")
-	if err := ioutil.WriteFile(BuilderKeyLocation, data, 0644); err != nil {
+	if err := os.WriteFile(BuilderKeyLocation, data, 0644); err != nil {
 		t.Fatalf("error creating %s (%s)", BuilderKeyLocation, err)
 	}
 
diff --git a/pkg/controller/utils_test.go b/pkg/controller/utils_test.go
@@ -3,7 +3,6 @@ package controller
 import (
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"testing"
@@ -15,7 +14,7 @@ import (
 )
 
 func TestNew(t *testing.T) {
-	tmpDir, err := ioutil.TempDir("", "tmpdir")
+	tmpDir, err := os.MkdirTemp("", "tmpdir")
 	if err != nil {
 		t.Fatalf("error creating temp directory (%s)", err)
 	}
@@ -28,7 +27,7 @@ func TestNew(t *testing.T) {
 
 	builderconf.BuilderKeyLocation = filepath.Join(tmpDir, "builder-key")
 	data := []byte("testbuilderkey")
-	if err := ioutil.WriteFile(builderconf.BuilderKeyLocation, data, 0644); err != nil {
+	if err := os.WriteFile(builderconf.BuilderKeyLocation, data, 0644); err != nil {
 		t.Fatalf("error creating %s (%s)", builderconf.BuilderKeyLocation, err)
 	}
 
diff --git a/pkg/git/git_test.go b/pkg/git/git_test.go
@@ -2,7 +2,6 @@ package git
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -16,7 +15,7 @@ func TestCreatePreReceiveHook(t *testing.T) {
 	gopath := os.Getenv("GOPATH")
 	repoPath := filepath.Join(gopath, "src", "github.com", "drycc", "builder", "testdata")
 	assert.Equal(t, createPreReceiveHook(gitHome, repoPath), nil)
-	hookBytes, err := ioutil.ReadFile(filepath.Join(repoPath, "hooks", "pre-receive"))
+	hookBytes, err := os.ReadFile(filepath.Join(repoPath, "hooks", "pre-receive"))
 	assert.Equal(t, err, nil)
 	hookStr := string(hookBytes)
 	gitHomeIdx := strings.Index(hookStr, fmt.Sprintf("GIT_HOME=%s", gitHome))
diff --git a/pkg/gitreceive/build.go b/pkg/gitreceive/build.go
@@ -6,7 +6,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -81,7 +80,7 @@ func build(
 		return fmt.Errorf("making the build directory %s (%s)", buildDir, err)
 	}
 
-	tmpDir, err := ioutil.TempDir(buildDir, "tmp")
+	tmpDir, err := os.MkdirTemp(buildDir, "tmp")
 	if err != nil {
 		return fmt.Errorf("unable to create tmpdir %s (%s)", buildDir, err)
 	}
@@ -122,7 +121,7 @@ func build(
 
 	stack := getStack(tmpDir, appConf)
 
-	appTgzdata, err := ioutil.ReadFile(absAppTgz)
+	appTgzdata, err := os.ReadFile(absAppTgz)
 	if err != nil {
 		return fmt.Errorf("error while reading file %s: (%s)", appTgz, err)
 	}
@@ -304,7 +303,7 @@ func prettyPrintJSON(data interface{}) (string, error) {
 func getProcfile(dirName string) (dryccAPI.ProcessType, error) {
 	procfile := dryccAPI.ProcessType{}
 	if _, err := os.Stat(fmt.Sprintf("%s/Procfile", dirName)); err == nil {
-		rawProcFile, err := ioutil.ReadFile(fmt.Sprintf("%s/Procfile", dirName))
+		rawProcFile, err := os.ReadFile(fmt.Sprintf("%s/Procfile", dirName))
 		if err != nil {
 			return nil, fmt.Errorf("error in reading %s/Procfile (%s)", dirName, err)
 		}
@@ -319,7 +318,7 @@ func getProcfile(dirName string) (dryccAPI.ProcessType, error) {
 func getDockerfile(dirName string, stack map[string]string) (string, error) {
 	if stack["name"] == "container" {
 		if _, err := os.Stat(fmt.Sprintf("%s/Dockerfile", dirName)); err == nil {
-			rawDockerfile, err := ioutil.ReadFile(fmt.Sprintf("%s/Dockerfile", dirName))
+			rawDockerfile, err := os.ReadFile(fmt.Sprintf("%s/Dockerfile", dirName))
 			if err != nil {
 				return "", fmt.Errorf("error in reading %s/Dockerfile (%s)", dirName, err)
 			}
diff --git a/pkg/gitreceive/build_test.go b/pkg/gitreceive/build_test.go
@@ -3,7 +3,6 @@ package gitreceive
 import (
 	"bytes"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -35,7 +34,7 @@ func TestBuild(t *testing.T) {
 	// NOTE(bacongobbler): there's a little easter egg here... ;)
 	sha := "0462cef5812ce31fe12f25596ff68dc614c708af"
 
-	tmpDir, err := ioutil.TempDir("", "tmpdir")
+	tmpDir, err := os.MkdirTemp("", "tmpdir")
 	if err != nil {
 		t.Fatalf("error creating temp directory (%s)", err)
 	}
@@ -81,7 +80,7 @@ func TestBuild(t *testing.T) {
 
 	builderconf.BuilderKeyLocation = filepath.Join(tmpDir, "builder-key")
 	data := []byte("testbuilderkey")
-	if err := ioutil.WriteFile(builderconf.BuilderKeyLocation, data, 0644); err != nil {
+	if err := os.WriteFile(builderconf.BuilderKeyLocation, data, 0644); err != nil {
 		t.Fatalf("error creating %s (%s)", builderconf.BuilderKeyLocation, err)
 	}
 
@@ -98,12 +97,12 @@ func TestRepoCmd(t *testing.T) {
 }
 
 func TestGetProcfileFromRepoSuccess(t *testing.T) {
-	tmpDir, err := ioutil.TempDir("", "tmpdir")
+	tmpDir, err := os.MkdirTemp("", "tmpdir")
 	if err != nil {
 		t.Fatalf("error creating temp directory (%s)", err)
 	}
 	data := []byte("web: example-go")
-	if err := ioutil.WriteFile(tmpDir+"/Procfile", data, 0644); err != nil {
+	if err := os.WriteFile(tmpDir+"/Procfile", data, 0644); err != nil {
 		t.Fatalf("error creating %s/Procfile (%s)", tmpDir, err)
 	}
 	defer func() {
@@ -123,12 +122,12 @@ func TestGetProcfileFromRepoSuccess(t *testing.T) {
 }
 
 func TestGetProcfileFromRepoFailure(t *testing.T) {
-	tmpDir, err := ioutil.TempDir("", "tmpdir")
+	tmpDir, err := os.MkdirTemp("", "tmpdir")
 	if err != nil {
 		t.Fatalf("error creating temp directory (%s)", err)
 	}
 	data := []byte("web= example-go")
-	if err := ioutil.WriteFile(tmpDir+"/Procfile", data, 0644); err != nil {
+	if err := os.WriteFile(tmpDir+"/Procfile", data, 0644); err != nil {
 		t.Fatalf("error creating %s/Procfile (%s)", tmpDir, err)
 	}
 	defer func() {
diff --git a/pkg/gitreceive/build_type.go b/pkg/gitreceive/build_type.go
@@ -3,7 +3,6 @@ package gitreceive
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"os"
 
 	"github.com/drycc/controller-sdk-go/api"
@@ -28,7 +27,7 @@ var Stacks []map[string]string
 
 // initStack load stack by config
 func initStack() error {
-	data, err := ioutil.ReadFile("/etc/imagebuilder/images.json")
+	data, err := os.ReadFile("/etc/imagebuilder/images.json")
 	if err == nil {
 		return json.Unmarshal(data, &Stacks)
 	}
diff --git a/pkg/gitreceive/k8s_util.go b/pkg/gitreceive/k8s_util.go
@@ -52,7 +52,7 @@ func createBuilderJob(
 	nodeSelector map[string]string,
 ) *batchv1.Job {
 
-	job := buildJob(debug, name, namespace, pullPolicy, securityContext, nodeSelector, env)
+	job := buildJob(debug, name, namespace, builderName, pullPolicy, securityContext, nodeSelector, env)
 	job.Spec.Template.Spec.Containers[0].Name = builderName
 	job.Spec.Template.Spec.Containers[0].Image = builderImage
 
@@ -74,8 +74,8 @@ func newInt32(i int32) *int32 {
 func buildJob(
 	debug bool,
 	name,
-	namespace string,
-	//pullPolicy api.PullPolicy,
+	namespace,
+	builderName string,
 	pullPolicy corev1.PullPolicy,
 	securityContext corev1.SecurityContext,
 	nodeSelector map[string]string,
@@ -95,7 +95,8 @@ func buildJob(
 			Template: corev1.PodTemplateSpec{
 				ObjectMeta: metav1.ObjectMeta{
 					Labels: map[string]string{
-						"heritage": name,
+						"app":      builderName,
+						"heritage": "drycc",
 					},
 				},
 				Spec: corev1.PodSpec{
@@ -112,7 +113,8 @@ func buildJob(
 			Name:      name,
 			Namespace: namespace,
 			Labels: map[string]string{
-				"heritage": name,
+				"app":      builderName,
+				"heritage": "drycc",
 			},
 		},
 	}
diff --git a/pkg/sshd/server.go b/pkg/sshd/server.go
@@ -7,8 +7,8 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net"
+	"os"
 	"strings"
 
 	"github.com/drycc/builder/pkg/controller"
@@ -84,7 +84,7 @@ func Configure(cnf *Config) (*ssh.ServerConfig, error) {
 	for _, t := range hostKeyTypes {
 		path := fmt.Sprintf(pathTpl, t)
 
-		key, err := ioutil.ReadFile(path)
+		key, err := os.ReadFile(path)
 		if err != nil {
 			log.Debug("Failed to read key %s (skipping): %s", path, err)
 			return nil, err
diff --git a/pkg/sys/fs.go b/pkg/sys/fs.go
@@ -2,7 +2,6 @@ package sys
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 )
 
@@ -26,7 +25,7 @@ type realFS struct{}
 
 // ReadFile is the interface implementation for FS.
 func (r *realFS) ReadFile(name string) ([]byte, error) {
-	return ioutil.ReadFile(name)
+	return os.ReadFile(name)
 }
 
 // RemoveAll is the interface implementation for FS.
diff --git a/pkg/sys/fs_test.go b/pkg/sys/fs_test.go
@@ -2,7 +2,6 @@ package sys
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"testing"
 )
@@ -18,7 +17,7 @@ func TestRealFS(t *testing.T) {
 		t.Error("expected to receive error when real file does not exist")
 	}
 
-	tmpfile, err := ioutil.TempFile("", testFilename)
+	tmpfile, err := os.CreateTemp("", testFilename)
 	if err != nil {
 		t.Fatal(err)
 	}
