yesBad/proton-bridge
1
0
Fork 0
forked from Silverfish/proton-bridge
Code Actions Activity

Other: go mod tidy/goimports/gofumpt after rebase on devel

Browse Source
This commit is contained in:
James Houlahan
2022-10-28 10:13:34 +02:00
parent 82987a1835
commit a553ced979
10 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/bridge/files.go
View File

@ -30,7 +30,7 @@ func moveDir(from, to string) error {
for _, entry := range entries {
if entry.IsDir() {
if err := os.Mkdir(filepath.Join(to, entry.Name()), 0700); err != nil {
if err := os.Mkdir(filepath.Join(to, entry.Name()), 0o700); err != nil {
return err
}
@ -52,7 +52,7 @@ func moveDir(from, to string) error {
}
func move(from, to string) error {
if err := os.MkdirAll(filepath.Dir(to), 0700); err != nil {
if err := os.MkdirAll(filepath.Dir(to), 0o700); err != nil {
return err
}
@ -68,7 +68,7 @@ func move(from, to string) error {
}
defer func() { _ = f.Close() }()
if err := os.Chmod(to, 0600); err != nil {
if err := os.Chmod(to, 0o600); err != nil {
return err
}

8
internal/bridge/files_test.go
View File

@ -27,16 +27,16 @@ func TestMoveDir(t *testing.T) {
from, to := t.TempDir(), t.TempDir()
// Create some files in from.
if err := os.WriteFile(filepath.Join(from, "a"), []byte("a"), 0600); err != nil {
if err := os.WriteFile(filepath.Join(from, "a"), []byte("a"), 0o600); err != nil {
t.Fatal(err)
}
if err := os.WriteFile(filepath.Join(from, "b"), []byte("b"), 0600); err != nil {
if err := os.WriteFile(filepath.Join(from, "b"), []byte("b"), 0o600); err != nil {
t.Fatal(err)
}
if err := os.Mkdir(filepath.Join(from, "c"), 0700); err != nil {
if err := os.Mkdir(filepath.Join(from, "c"), 0o700); err != nil {
t.Fatal(err)
}
if err := os.WriteFile(filepath.Join(from, "c", "d"), []byte("d"), 0600); err != nil {
if err := os.WriteFile(filepath.Join(from, "c", "d"), []byte("d"), 0o600); err != nil {
t.Fatal(err)
}

2
internal/bridge/imap.go
View File

@ -141,7 +141,7 @@ func getGluonDir(encVault *vault.Vault) (string, error) {
}
if !exists {
if err := os.MkdirAll(encVault.GetGluonDir(), 0700); err != nil {
if err := os.MkdirAll(encVault.GetGluonDir(), 0o700); err != nil {
return "", fmt.Errorf("failed to create gluon dir: %w", err)
}
}