From a553ced97986fa5e680644305773eee229bf1b25 Mon Sep 17 00:00:00 2001 From: James Houlahan Date: Fri, 28 Oct 2022 10:13:34 +0200 Subject: [PATCH] Other: go mod tidy/goimports/gofumpt after rebase on devel --- internal/bridge/files.go | 6 +++--- internal/bridge/files_test.go | 8 ++++---- internal/bridge/imap.go | 2 +- internal/cookies/jar_test.go | 4 ++-- internal/focus/proto/focus.pb.go | 5 +++-- internal/focus/proto/focus_grpc.pb.go | 1 + internal/frontend/cli/system.go | 4 ++-- internal/frontend/grpc/bridge.pb.go | 5 +++-- internal/frontend/grpc/bridge_grpc.pb.go | 1 + internal/frontend/grpc/event_factory.go | 1 + 10 files changed, 21 insertions(+), 16 deletions(-) diff --git a/internal/bridge/files.go b/internal/bridge/files.go index 42e9a0e6..6c00cdfe 100644 --- a/internal/bridge/files.go +++ b/internal/bridge/files.go @@ -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 } diff --git a/internal/bridge/files_test.go b/internal/bridge/files_test.go index 729a6194..118efdb8 100644 --- a/internal/bridge/files_test.go +++ b/internal/bridge/files_test.go @@ -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) } diff --git a/internal/bridge/imap.go b/internal/bridge/imap.go index dff7bf27..86dafcc3 100644 --- a/internal/bridge/imap.go +++ b/internal/bridge/imap.go @@ -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) } } diff --git a/internal/cookies/jar_test.go b/internal/cookies/jar_test.go index a7594b32..7529a4e9 100644 --- a/internal/cookies/jar_test.go +++ b/internal/cookies/jar_test.go @@ -185,7 +185,7 @@ func newTestPersister(tb testing.TB) *testPersister { path := filepath.Join(tb.TempDir(), "cookies.json") if _, err := os.Stat(path); errors.Is(err, fs.ErrNotExist) { - if err := os.WriteFile(path, []byte{}, 0600); err != nil { + if err := os.WriteFile(path, []byte{}, 0o600); err != nil { panic(err) } } @@ -198,5 +198,5 @@ func (p *testPersister) GetCookies() ([]byte, error) { } func (p *testPersister) SetCookies(rawCookies []byte) error { - return os.WriteFile(p.path, rawCookies, 0600) + return os.WriteFile(p.path, rawCookies, 0o600) } diff --git a/internal/focus/proto/focus.pb.go b/internal/focus/proto/focus.pb.go index b4d15c6c..c52907f3 100644 --- a/internal/focus/proto/focus.pb.go +++ b/internal/focus/proto/focus.pb.go @@ -24,11 +24,12 @@ package proto import ( + reflect "reflect" + sync "sync" + protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" emptypb "google.golang.org/protobuf/types/known/emptypb" - reflect "reflect" - sync "sync" ) const ( diff --git a/internal/focus/proto/focus_grpc.pb.go b/internal/focus/proto/focus_grpc.pb.go index 0f322a82..672d5406 100644 --- a/internal/focus/proto/focus_grpc.pb.go +++ b/internal/focus/proto/focus_grpc.pb.go @@ -8,6 +8,7 @@ package proto import ( context "context" + grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/internal/frontend/cli/system.go b/internal/frontend/cli/system.go index f326e1ca..aa185bd3 100644 --- a/internal/frontend/cli/system.go +++ b/internal/frontend/cli/system.go @@ -212,12 +212,12 @@ func (f *frontendCLI) exportTLSCerts(c *ishell.Context) { if location := f.readStringInAttempts("Enter a path to which to export the TLS certificate used for IMAP and SMTP", c.ReadLine, f.isCacheLocationUsable); location != "" { cert, key := f.bridge.GetBridgeTLSCert() - if err := os.WriteFile(filepath.Join(location, "cert.pem"), cert, 0600); err != nil { + if err := os.WriteFile(filepath.Join(location, "cert.pem"), cert, 0o600); err != nil { f.printAndLogError(err) return } - if err := os.WriteFile(filepath.Join(location, "key.pem"), key, 0600); err != nil { + if err := os.WriteFile(filepath.Join(location, "key.pem"), key, 0o600); err != nil { f.printAndLogError(err) return } diff --git a/internal/frontend/grpc/bridge.pb.go b/internal/frontend/grpc/bridge.pb.go index 675196cc..8aea0d23 100644 --- a/internal/frontend/grpc/bridge.pb.go +++ b/internal/frontend/grpc/bridge.pb.go @@ -24,12 +24,13 @@ package grpc import ( + reflect "reflect" + sync "sync" + protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" emptypb "google.golang.org/protobuf/types/known/emptypb" wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" - reflect "reflect" - sync "sync" ) const ( diff --git a/internal/frontend/grpc/bridge_grpc.pb.go b/internal/frontend/grpc/bridge_grpc.pb.go index 03af65f2..9fe2d4b7 100644 --- a/internal/frontend/grpc/bridge_grpc.pb.go +++ b/internal/frontend/grpc/bridge_grpc.pb.go @@ -8,6 +8,7 @@ package grpc import ( context "context" + grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/internal/frontend/grpc/event_factory.go b/internal/frontend/grpc/event_factory.go index 04d27b04..2e1180f1 100644 --- a/internal/frontend/grpc/event_factory.go +++ b/internal/frontend/grpc/event_factory.go @@ -114,6 +114,7 @@ func NewCacheChangeLocalCacheFinishedEvent(willRestart bool) *StreamEvent { func NewDiskCachePathChanged(path string) *StreamEvent { return cacheEvent(&CacheEvent{Event: &CacheEvent_DiskCachePathChanged{DiskCachePathChanged: &DiskCachePathChanged{Path: path}}}) } + func NewMailSettingsErrorEvent(err MailSettingsErrorType) *StreamEvent { return mailSettingsEvent(&MailSettingsEvent{Event: &MailSettingsEvent_Error{Error: &MailSettingsErrorEvent{Type: err}}}) }