summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorYTCai <qazxcv367tasi@gmail.com>2022-11-16 03:18:09 +0800
committerGitHub <noreply@github.com>2022-11-15 14:18:09 -0500
commit1c35fc5b387389051cef132516f8547f7f4e9aaa (patch)
tree668e600e615e172a7688eec2f5b41e1d66648fa1 /pkg
parentccb749f141b100934c550843098c547f21a95fd9 (diff)
fix: update application config sample & replace the deprecated ioutil pkg (#492)
* docs: update application config sample Signed-off-by: CaiYueTing <qazxcv367tasi@gmail.com> * fix: use os read/write instead of deprecated ioutil read/write package Signed-off-by: CaiYueTing <qazxcv367tasi@gmail.com> * fix: use io, os pkg instead of all of the ioutil pkg Signed-off-by: CaiYueTing <qazxcv367tasi@gmail.com> Signed-off-by: CaiYueTing <qazxcv367tasi@gmail.com>
Diffstat (limited to 'pkg')
-rw-r--r--pkg/argocd/git.go11
-rw-r--r--pkg/argocd/update_test.go9
-rw-r--r--pkg/registry/config.go4
3 files changed, 11 insertions, 13 deletions
diff --git a/pkg/argocd/git.go b/pkg/argocd/git.go
index d97d0a5..6aa4b42 100644
--- a/pkg/argocd/git.go
+++ b/pkg/argocd/git.go
@@ -5,7 +5,6 @@ import (
"crypto/sha256"
"encoding/hex"
"fmt"
- "io/ioutil"
"os"
"path"
"path/filepath"
@@ -136,7 +135,7 @@ func commitChangesGit(app *v1alpha1.Application, wbc *WriteBackConfig, changeLis
}
var gitC git.Client
if wbc.GitClient == nil {
- tempRoot, err := ioutil.TempDir(os.TempDir(), fmt.Sprintf("git-%s", app.Name))
+ tempRoot, err := os.MkdirTemp(os.TempDir(), fmt.Sprintf("git-%s", app.Name))
if err != nil {
return err
}
@@ -220,12 +219,12 @@ func commitChangesGit(app *v1alpha1.Application, wbc *WriteBackConfig, changeLis
commitOpts := &git.CommitOptions{}
if wbc.GitCommitMessage != "" {
- cm, err := ioutil.TempFile("", "image-updater-commit-msg")
+ cm, err := os.CreateTemp("", "image-updater-commit-msg")
if err != nil {
return fmt.Errorf("cold not create temp file: %v", err)
}
logCtx.Debugf("Writing commit message to %s", cm.Name())
- err = ioutil.WriteFile(cm.Name(), []byte(wbc.GitCommitMessage), 0600)
+ err = os.WriteFile(cm.Name(), []byte(wbc.GitCommitMessage), 0600)
if err != nil {
_ = cm.Close()
return fmt.Errorf("could not write commit message to %s: %v", cm.Name(), err)
@@ -269,7 +268,7 @@ func writeOverrides(app *v1alpha1.Application, wbc *WriteBackConfig, gitC git.Cl
// our generated new file is the same as the existing one, and if yes, we
// don't proceed further for commit.
if targetExists {
- data, err := ioutil.ReadFile(targetFile)
+ data, err := os.ReadFile(targetFile)
if err != nil {
return err, false
}
@@ -279,7 +278,7 @@ func writeOverrides(app *v1alpha1.Application, wbc *WriteBackConfig, gitC git.Cl
}
}
- err = ioutil.WriteFile(targetFile, override, 0600)
+ err = os.WriteFile(targetFile, override, 0600)
if err != nil {
return
}
diff --git a/pkg/argocd/update_test.go b/pkg/argocd/update_test.go
index c18e3ee..ea5cdcc 100644
--- a/pkg/argocd/update_test.go
+++ b/pkg/argocd/update_test.go
@@ -3,7 +3,6 @@ package argocd
import (
"errors"
"fmt"
- "io/ioutil"
"os"
"path/filepath"
"strings"
@@ -1816,7 +1815,7 @@ func Test_CommitUpdates(t *testing.T) {
gitMock, dir, cleanup := mockGit(t)
defer cleanup()
kf := filepath.Join(dir, "kustomization.yml")
- assert.NoError(t, ioutil.WriteFile(kf, []byte(`
+ assert.NoError(t, os.WriteFile(kf, []byte(`
kind: Kustomization
apiVersion: kustomize.config.k8s.io/v1beta1
@@ -1838,7 +1837,7 @@ replacements: []
err = commitChanges(app, wbc, nil)
assert.NoError(t, err)
- kust, err := ioutil.ReadFile(kf)
+ kust, err := os.ReadFile(kf)
assert.NoError(t, err)
assert.YAMLEq(t, `
kind: Kustomization
@@ -1857,7 +1856,7 @@ replacements: []
app.Spec.Source.Kustomize.Images = v1alpha1.KustomizeImages{"foo:123", "bar=qux"}
err = commitChanges(app, wbc, nil)
assert.NoError(t, err)
- kust, err = ioutil.ReadFile(kf)
+ kust, err = os.ReadFile(kf)
assert.NoError(t, err)
assert.YAMLEq(t, `
kind: Kustomization
@@ -2044,7 +2043,7 @@ func Test_parseTarget(t *testing.T) {
}
func mockGit(t *testing.T) (gitMock *gitmock.Client, dir string, cleanup func()) {
- dir, err := ioutil.TempDir("", "wb-kust")
+ dir, err := os.MkdirTemp("", "wb-kust")
assert.NoError(t, err)
gitMock = &gitmock.Client{}
gitMock.On("Root").Return(dir)
diff --git a/pkg/registry/config.go b/pkg/registry/config.go
index 0592648..0b6dbe9 100644
--- a/pkg/registry/config.go
+++ b/pkg/registry/config.go
@@ -2,7 +2,7 @@ package registry
import (
"fmt"
- "io/ioutil"
+ "os"
"time"
"github.com/argoproj-labs/argocd-image-updater/pkg/log"
@@ -40,7 +40,7 @@ func clearRegistries() {
// LoadRegistryConfiguration loads a YAML-formatted registry configuration from
// a given file at path.
func LoadRegistryConfiguration(path string, clear bool) error {
- registryBytes, err := ioutil.ReadFile(path)
+ registryBytes, err := os.ReadFile(path)
if err != nil {
return err
}