fluxcd
/
source-controller
mirror of https://github.com/fluxcd/source-controller.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change all file permissions to octal format 

This better represent permissions as Linux handles such information in
octal format, meaning that the left-most 0 has an important meaning
and is not to be ignored as normally integers would.

See https://github.com/fluxcd/source-controller/issues/603

Signed-off-by: Peter Gundel <mail@petergundel.de>
This commit is contained in:
Peter Gundel 2022-04-04 16:36:23 +02:00
parent fe17137c62
commit 0949d0adb9
No known key found for this signature in database
GPG Key ID: 46FF813D9CC4452B
11 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
controllers/helmchart_controller.go
View File

@ -580,7 +580,7 @@ func (r *HelmChartReconciler) buildFromTarballArtifact(ctx context.Context, obj
// Create directory to untar source into
sourceDir := filepath.Join(tmpDir, "source")
if err := os.Mkdir(sourceDir, 0700); err != nil {
if err := os.Mkdir(sourceDir, 0o700); err != nil {
e := &serror.Event{
Err: fmt.Errorf("failed to create directory to untar source into: %w", err),
Reason: sourcev1.DirCreationFailedReason,

4
controllers/storage.go
View File

@ -112,7 +112,7 @@ func (s Storage) SetHostname(URL string) string {
// MkdirAll calls os.MkdirAll for the given v1beta1.Artifact base dir.
func (s *Storage) MkdirAll(artifact sourcev1.Artifact) error {
dir := filepath.Dir(s.LocalPath(artifact))
return os.MkdirAll(dir, 0777)
return os.MkdirAll(dir, 0o777)
}
// RemoveAll calls os.RemoveAll for the given v1beta1.Artifact base dir.
@ -432,7 +432,7 @@ func (s *Storage) Archive(artifact *sourcev1.Artifact, dir string, filter Archiv
return err
}
if err := os.Chmod(tmpName, 0644); err != nil {
if err := os.Chmod(tmpName, 0o644); err != nil {
return err
}

8
controllers/storage_test.go
View File

@ -136,7 +136,7 @@ func TestStorage_Archive(t *testing.T) {
}
for name, b := range files {
absPath := filepath.Join(dir, name)
if err = os.MkdirAll(filepath.Dir(absPath), 0755); err != nil {
if err = os.MkdirAll(filepath.Dir(absPath), 0o755); err != nil {
return
}
f, err := os.Create(absPath)
@ -316,7 +316,7 @@ func TestStorageRemoveAllButCurrent(t *testing.T) {
// Create artifact dir and artifacts.
artifactDir := path.Join(dir, "foo", "bar")
g.Expect(os.MkdirAll(artifactDir, 0755)).NotTo(HaveOccurred())
g.Expect(os.MkdirAll(artifactDir, 0o755)).NotTo(HaveOccurred())
current := []string{
path.Join(artifactDir, "artifact1.tar.gz"),
}
@ -378,7 +378,7 @@ func TestStorageRemoveAll(t *testing.T) {
}
if tt.createArtifactPath {
g.Expect(os.MkdirAll(path.Join(dir, tt.artifactPath), 0755)).ToNot(HaveOccurred())
g.Expect(os.MkdirAll(path.Join(dir, tt.artifactPath), 0o755)).ToNot(HaveOccurred())
}
deleted, err := s.RemoveAll(artifact)
@ -412,7 +412,7 @@ func TestStorageCopyFromPath(t *testing.T) {
}
t.Cleanup(cleanupStoragePath(dir))
absPath = filepath.Join(dir, file.Name)
if err = os.MkdirAll(filepath.Dir(absPath), 0755); err != nil {
if err = os.MkdirAll(filepath.Dir(absPath), 0o755); err != nil {
return
}
f, err := os.Create(absPath)

38
internal/fs/fs_test.go
View File

@ -42,12 +42,12 @@ func TestRenameWithFallback(t *testing.T) {
}
srcpath = filepath.Join(dir, "a")
if err = os.MkdirAll(srcpath, 0777); err != nil {
if err = os.MkdirAll(srcpath, 0o777); err != nil {
t.Fatal(err)
}
dstpath := filepath.Join(dir, "b")
if err = os.MkdirAll(dstpath, 0777); err != nil {
if err = os.MkdirAll(dstpath, 0o777); err != nil {
t.Fatal(err)
}
@ -64,7 +64,7 @@ func TestCopyDir(t *testing.T) {
defer os.RemoveAll(dir)
srcdir := filepath.Join(dir, "src")
if err := os.MkdirAll(srcdir, 0755); err != nil {
if err := os.MkdirAll(srcdir, 0o755); err != nil {
t.Fatal(err)
}
@ -81,7 +81,7 @@ func TestCopyDir(t *testing.T) {
for i, file := range files {
fn := filepath.Join(srcdir, file.path)
dn := filepath.Dir(fn)
if err = os.MkdirAll(dn, 0755); err != nil {
if err = os.MkdirAll(dn, 0o755); err != nil {
t.Fatal(err)
}
@ -151,7 +151,7 @@ func TestCopyDirFail_SrcInaccessible(t *testing.T) {
cleanup := setupInaccessibleDir(t, func(dir string) error {
srcdir = filepath.Join(dir, "src")
return os.MkdirAll(srcdir, 0755)
return os.MkdirAll(srcdir, 0o755)
})
defer cleanup()
@ -184,7 +184,7 @@ func TestCopyDirFail_DstInaccessible(t *testing.T) {
defer os.RemoveAll(dir)
srcdir = filepath.Join(dir, "src")
if err = os.MkdirAll(srcdir, 0755); err != nil {
if err = os.MkdirAll(srcdir, 0o755); err != nil {
t.Fatal(err)
}
@ -235,12 +235,12 @@ func TestCopyDirFail_DstExists(t *testing.T) {
defer os.RemoveAll(dir)
srcdir = filepath.Join(dir, "src")
if err = os.MkdirAll(srcdir, 0755); err != nil {
if err = os.MkdirAll(srcdir, 0o755); err != nil {
t.Fatal(err)
}
dstdir = filepath.Join(dir, "dst")
if err = os.MkdirAll(dstdir, 0755); err != nil {
if err = os.MkdirAll(dstdir, 0o755); err != nil {
t.Fatal(err)
}
@ -256,7 +256,7 @@ func TestCopyDirFail_DstExists(t *testing.T) {
func TestCopyDirFailOpen(t *testing.T) {
if runtime.GOOS == "windows" {
// XXX: setting permissions works differently in
// Microsoft Windows. os.Chmod(..., 0222) below is not
// Microsoft Windows. os.Chmod(..., 0o222) below is not
// enough for the file to be readonly, and os.Chmod(...,
// 0000) returns an invalid argument error. Skipping
// this this until a compatible implementation is
@ -273,7 +273,7 @@ func TestCopyDirFailOpen(t *testing.T) {
defer os.RemoveAll(dir)
srcdir = filepath.Join(dir, "src")
if err = os.MkdirAll(srcdir, 0755); err != nil {
if err = os.MkdirAll(srcdir, 0o755); err != nil {
t.Fatal(err)
}
@ -285,7 +285,7 @@ func TestCopyDirFailOpen(t *testing.T) {
srcf.Close()
// setup source file so that it cannot be read
if err = os.Chmod(srcfn, 0222); err != nil {
if err = os.Chmod(srcfn, 0o222); err != nil {
t.Fatal(err)
}
@ -419,11 +419,11 @@ func TestCopyFileLongFilePath(t *testing.T) {
}
fullPath := filepath.Join(dir, dirName, string(os.PathSeparator))
if err := os.MkdirAll(fullPath, 0755); err != nil && !os.IsExist(err) {
if err := os.MkdirAll(fullPath, 0o755); err != nil && !os.IsExist(err) {
t.Fatalf("%+v", fmt.Errorf("unable to create temp directory: %s", fullPath))
}
err = os.WriteFile(fullPath+"src", []byte(nil), 0644)
err = os.WriteFile(fullPath+"src", []byte(nil), 0o644)
if err != nil {
t.Fatalf("%+v", err)
}
@ -460,7 +460,7 @@ func TestCopyFileFail(t *testing.T) {
cleanup := setupInaccessibleDir(t, func(dir string) error {
dstdir = filepath.Join(dir, "dir")
return os.Mkdir(dstdir, 0777)
return os.Mkdir(dstdir, 0o777)
})
defer cleanup()
@ -493,7 +493,7 @@ func setupInaccessibleDir(t *testing.T, op func(dir string) error) func() {
subdir := filepath.Join(dir, "dir")
cleanup := func() {
if err := os.Chmod(subdir, 0777); err != nil {
if err := os.Chmod(subdir, 0o777); err != nil {
t.Error(err)
}
if err := os.RemoveAll(dir); err != nil {
@ -501,7 +501,7 @@ func setupInaccessibleDir(t *testing.T, op func(dir string) error) func() {
}
}
if err := os.Mkdir(subdir, 0777); err != nil {
if err := os.Mkdir(subdir, 0o777); err != nil {
cleanup()
t.Fatal(err)
return nil
@ -513,7 +513,7 @@ func setupInaccessibleDir(t *testing.T, op func(dir string) error) func() {
return nil
}
if err := os.Chmod(subdir, 0666); err != nil {
if err := os.Chmod(subdir, 0o666); err != nil {
cleanup()
t.Fatal(err)
return nil
@ -532,7 +532,7 @@ func TestIsDir(t *testing.T) {
cleanup := setupInaccessibleDir(t, func(dir string) error {
dn = filepath.Join(dir, "dir")
return os.Mkdir(dn, 0777)
return os.Mkdir(dn, 0o777)
})
defer cleanup()
@ -575,7 +575,7 @@ func TestIsSymlink(t *testing.T) {
defer os.RemoveAll(dir)
dirPath := filepath.Join(dir, "directory")
if err = os.MkdirAll(dirPath, 0777); err != nil {
if err = os.MkdirAll(dirPath, 0o777); err != nil {
t.Fatal(err)
}

4
internal/helm/chart/builder_local_test.go
View File

@ -201,7 +201,7 @@ fullnameOverride: "full-foo-name-override"`),
// Write value file in the base dir.
for _, f := range tt.valuesFiles {
vPath := filepath.Join(localRef.WorkDir, f.Name)
g.Expect(os.WriteFile(vPath, f.Data, 0644)).ToNot(HaveOccurred())
g.Expect(os.WriteFile(vPath, f.Data, 0o644)).ToNot(HaveOccurred())
}
// Write chart dependencies in the base dir.
@ -336,7 +336,7 @@ func Test_mergeFileValues(t *testing.T) {
defer os.RemoveAll(baseDir)
for _, f := range tt.files {
g.Expect(os.WriteFile(filepath.Join(baseDir, f.Name), f.Data, 0644)).To(Succeed())
g.Expect(os.WriteFile(filepath.Join(baseDir, f.Name), f.Data, 0o644)).To(Succeed())
}
got, err := mergeFileValues(baseDir, tt.paths)

4
internal/helm/chart/metadata_test.go
View File

@ -140,7 +140,7 @@ func TestLoadChartMetadataFromDir(t *testing.T) {
copy.Copy("../testdata/charts/helmchart", tmpDir)
bigRequirementsFile := filepath.Join(tmpDir, "requirements.yaml")
data := make([]byte, helm.MaxChartFileSize+10)
g.Expect(os.WriteFile(bigRequirementsFile, data, 0644)).ToNot(HaveOccurred())
g.Expect(os.WriteFile(bigRequirementsFile, data, 0o644)).ToNot(HaveOccurred())
tests := []struct {
name string
@ -205,7 +205,7 @@ func TestLoadChartMetadataFromArchive(t *testing.T) {
defer os.RemoveAll(tmpDir)
bigArchiveFile := filepath.Join(tmpDir, "chart.tgz")
data := make([]byte, helm.MaxChartSize+10)
g.Expect(os.WriteFile(bigArchiveFile, data, 0644)).ToNot(HaveOccurred())
g.Expect(os.WriteFile(bigArchiveFile, data, 0o644)).ToNot(HaveOccurred())
tests := []struct {
name string

2
internal/helm/repository/chart_repository_test.go
View File

@ -363,7 +363,7 @@ func TestChartRepository_LoadIndexFromFile(t *testing.T) {
defer os.RemoveAll(tmpDir)
bigIndexFile := filepath.Join(tmpDir, "index.yaml")
data := make([]byte, helm.MaxIndexSize+10)
g.Expect(os.WriteFile(bigIndexFile, data, 0644)).ToNot(HaveOccurred())
g.Expect(os.WriteFile(bigIndexFile, data, 0o644)).ToNot(HaveOccurred())
tests := []struct {
name string

2
main.go
View File

@ -299,7 +299,7 @@ func mustInitStorage(path string, storageAdvAddr string, artifactRetentionTTL ti
if path == "" {
p, _ := os.Getwd()
path = filepath.Join(p, "bin")
os.MkdirAll(path, 0777)
os.MkdirAll(path, 0o777)
}
storage, err := controllers.NewStorage(path, storageAdvAddr, artifactRetentionTTL, artifactRetentionRecords)

4
pkg/gcp/gcp.go
View File

@ -118,7 +118,7 @@ func (c *GCSClient) FGetObject(ctx context.Context, bucketName, objectName, loca
objectDir, _ := filepath.Split(localPath)
if objectDir != "" {
// Create any missing top level directories.
if err := os.MkdirAll(objectDir, 0700); err != nil {
if err := os.MkdirAll(objectDir, 0o700); err != nil {
return "", err
}
}
@ -130,7 +130,7 @@ func (c *GCSClient) FGetObject(ctx context.Context, bucketName, objectName, loca
}
// Prepare target file.
objectFile, err := os.OpenFile(localPath, os.O_CREATE|os.O_WRONLY, 0600)
objectFile, err := os.OpenFile(localPath, os.O_CREATE|os.O_WRONLY, 0o600)
if err != nil {
return "", err
}

4
pkg/sourceignore/sourceignore_test.go
View File

@ -209,10 +209,10 @@ func TestLoadExcludePatterns(t *testing.T) {
"a/b/.sourceignore": "subdir.txt",
}
for n, c := range files {
if err = os.MkdirAll(filepath.Join(tmpDir, filepath.Dir(n)), 0755); err != nil {
if err = os.MkdirAll(filepath.Join(tmpDir, filepath.Dir(n)), 0o755); err != nil {
t.Fatal(err)
}
if err = os.WriteFile(filepath.Join(tmpDir, n), []byte(c), 0644); err != nil {
if err = os.WriteFile(filepath.Join(tmpDir, n), []byte(c), 0o644); err != nil {
t.Fatal(err)
}
}

2
tests/fuzz/gitrepository_fuzzer.go
View File

@ -494,7 +494,7 @@ func createRandomFiles(f *fuzz.ConsumeFuzzer, fs billy.Filesystem, wt *git.Workt
return errors.New("Dir contains '..'")
}
err = fs.MkdirAll(dirPath, 0777)
err = fs.MkdirAll(dirPath, 0o777)
if err != nil {
return errors.New("Could not create the subDir")
}