Other: Add v2 to module name

internal/store/address.go

@@ -18,7 +18,7 @@
 package store
 
 import (
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 	"github.com/sirupsen/logrus"
 	bolt "go.etcd.io/bbolt"
 )

internal/store/address_mailbox.go

@@ -20,7 +20,7 @@ package store
 import (
 	"fmt"
 
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 )
 
 // ListMailboxes returns all mailboxes.

internal/store/address_message.go

@@ -18,7 +18,7 @@
 package store
 
 import (
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 	bolt "go.etcd.io/bbolt"
 )
 

internal/store/cache.go

@@ -21,9 +21,9 @@ import (
 	"context"
 
 	"github.com/ProtonMail/gopenpgp/v2/crypto"
-	"github.com/ProtonMail/proton-bridge/internal/store/cache"
-	"github.com/ProtonMail/proton-bridge/pkg/message"
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/internal/store/cache"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/message"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 	bolt "go.etcd.io/bbolt"
 )
 

internal/store/cache/disk.go

@@ -29,12 +29,14 @@ import (
 	"path/filepath"
 	"sync"
 
-	"github.com/ProtonMail/proton-bridge/pkg/semaphore"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/semaphore"
 	"github.com/ricochet2200/go-disk-usage/du"
 )
 
-var ErrMsgCorrupted = errors.New("ecrypted file was corrupted")
-var ErrLowSpace = errors.New("not enough free space left on device")
+var (
+	ErrMsgCorrupted = errors.New("ecrypted file was corrupted")
+	ErrLowSpace     = errors.New("not enough free space left on device")
+)
 
 // IsOnDiskCache will return true if Cache is type of onDiskCache.
 func IsOnDiskCache(c Cache) bool {
@@ -58,7 +60,7 @@ type onDiskCache struct {
 }
 
 func NewOnDiskCache(path string, cmp Compressor, opts Options) (Cache, error) {
-	if err := os.MkdirAll(path, 0700); err != nil {
+	if err := os.MkdirAll(path, 0o700); err != nil {
 		return nil, err
 	}
 
@@ -114,7 +116,7 @@ func (c *onDiskCache) Unlock(userID string, passphrase []byte) error {
 		return err
 	}
 
-	if err := os.MkdirAll(c.getUserPath(userID), 0700); err != nil {
+	if err := os.MkdirAll(c.getUserPath(userID), 0o700); err != nil {
 		return err
 	}
 
@@ -239,7 +241,7 @@ func (c *onDiskCache) writeFile(path string, b []byte) error {
 	defer c.update()
 
 	// NOTE(GODT-1158): What happens when this fails? Should be fixed eventually.
-	return ioutil.WriteFile(filepath.Clean(path), b, 0600)
+	return ioutil.WriteFile(filepath.Clean(path), b, 0o600)
 }
 
 func (c *onDiskCache) hasSpace(size int) bool {

internal/store/cache_test.go

@@ -20,7 +20,7 @@ package store
 import (
 	"testing"
 
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/require"
 )

internal/store/cache_watcher.go

@@ -21,7 +21,7 @@ import (
 	"context"
 	"time"
 
-	"github.com/ProtonMail/proton-bridge/internal/store/cache"
+	"github.com/ProtonMail/proton-bridge/v2/internal/store/cache"
 )
 
 func (store *Store) StartWatcher() {

internal/store/cache_worker_test.go

@@ -20,7 +20,7 @@ package store
 import (
 	"testing"
 
-	storemocks "github.com/ProtonMail/proton-bridge/internal/store/mocks"
+	storemocks "github.com/ProtonMail/proton-bridge/v2/internal/store/mocks"
 	"github.com/golang/mock/gomock"
 	"github.com/pkg/errors"
 )

internal/store/change.go

@@ -18,7 +18,7 @@
 package store
 
 import (
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 )
 
 type ChangeNotifier interface {

internal/store/change_test.go

@@ -20,7 +20,7 @@ package store
 import (
 	"testing"
 
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/require"
 )

internal/store/event_loop.go

@@ -22,9 +22,9 @@ import (
 	"math/rand"
 	"time"
 
-	bridgeEvents "github.com/ProtonMail/proton-bridge/internal/events"
-	"github.com/ProtonMail/proton-bridge/pkg/listener"
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	bridgeEvents "github.com/ProtonMail/proton-bridge/v2/internal/events"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/listener"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )

internal/store/event_loop_test.go

@@ -23,7 +23,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/require"
 )

internal/store/mailbox.go

@@ -23,7 +23,7 @@ import (
 	"strings"
 	"sync/atomic"
 
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 	"github.com/sirupsen/logrus"
 	bolt "go.etcd.io/bbolt"
 )

internal/store/mailbox_counts.go

@@ -22,7 +22,7 @@ import (
 	"encoding/json"
 	"sort"
 
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 	"github.com/pkg/errors"
 	bolt "go.etcd.io/bbolt"
 )

internal/store/mailbox_counts_test.go

@@ -20,7 +20,7 @@ package store
 import (
 	"testing"
 
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 	a "github.com/stretchr/testify/assert"
 )
 

internal/store/mailbox_ids.go

@@ -24,7 +24,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/ProtonMail/proton-bridge/internal/imap/uidplus"
+	"github.com/ProtonMail/proton-bridge/v2/internal/imap/uidplus"
 	"github.com/pkg/errors"
 	bolt "go.etcd.io/bbolt"
 )

internal/store/mailbox_ids_test.go

@@ -21,7 +21,7 @@ import (
 	"net/mail"
 	"testing"
 
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 	a "github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

internal/store/mailbox_message.go

@@ -18,7 +18,7 @@
 package store
 
 import (
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	bolt "go.etcd.io/bbolt"

internal/store/message.go

@@ -22,8 +22,8 @@ import (
 	"bytes"
 	"net/textproto"
 
-	pkgMsg "github.com/ProtonMail/proton-bridge/pkg/message"
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	pkgMsg "github.com/ProtonMail/proton-bridge/v2/pkg/message"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 	bolt "go.etcd.io/bbolt"
 )
 

internal/store/mocks/mocks.go

@@ -1,5 +1,5 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/ProtonMail/proton-bridge/internal/store (interfaces: PanicHandler,BridgeUser,ChangeNotifier,Storer)
+// Source: github.com/ProtonMail/proton-bridge/v2/internal/store (interfaces: PanicHandler,BridgeUser,ChangeNotifier,Storer)
 
 // Package mocks is a generated GoMock package.
 package mocks
@@ -8,7 +8,7 @@ import (
 	context "context"
 	reflect "reflect"
 
-	pmapi "github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	pmapi "github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 	gomock "github.com/golang/mock/gomock"
 )
 

internal/store/mocks/utils_mocks.go

@@ -1,5 +1,5 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/ProtonMail/proton-bridge/pkg/listener (interfaces: Listener)
+// Source: github.com/ProtonMail/proton-bridge/v2/pkg/listener (interfaces: Listener)
 
 // Package mocks is a generated GoMock package.
 package mocks

internal/store/store.go

@@ -25,12 +25,12 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ProtonMail/proton-bridge/internal/sentry"
-	"github.com/ProtonMail/proton-bridge/internal/store/cache"
-	"github.com/ProtonMail/proton-bridge/pkg/listener"
-	"github.com/ProtonMail/proton-bridge/pkg/message"
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
-	"github.com/ProtonMail/proton-bridge/pkg/pool"
+	"github.com/ProtonMail/proton-bridge/v2/internal/sentry"
+	"github.com/ProtonMail/proton-bridge/v2/internal/store/cache"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/listener"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/message"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pool"
 	"github.com/hashicorp/go-multierror"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
@@ -223,7 +223,7 @@ func openBoltDatabase(filePath string) (db *bolt.DB, err error) {
 	l := log.WithField("path", filePath)
 	l.Debug("Opening bolt database")
 
-	if db, err = bolt.Open(filePath, 0600, &bolt.Options{Timeout: 1 * time.Second}); err != nil {
+	if db, err = bolt.Open(filePath, 0o600, &bolt.Options{Timeout: 1 * time.Second}); err != nil {
 		l.WithError(err).Error("Could not open bolt database")
 		return
 	}

internal/store/store_test.go

@@ -28,12 +28,12 @@ import (
 	"time"
 
 	"github.com/ProtonMail/gopenpgp/v2/crypto"
-	"github.com/ProtonMail/proton-bridge/internal/store/cache"
-	storemocks "github.com/ProtonMail/proton-bridge/internal/store/mocks"
-	"github.com/ProtonMail/proton-bridge/pkg/message"
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
-	pmapimocks "github.com/ProtonMail/proton-bridge/pkg/pmapi/mocks"
-	tests "github.com/ProtonMail/proton-bridge/test"
+	"github.com/ProtonMail/proton-bridge/v2/internal/store/cache"
+	storemocks "github.com/ProtonMail/proton-bridge/v2/internal/store/mocks"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/message"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
+	pmapimocks "github.com/ProtonMail/proton-bridge/v2/pkg/pmapi/mocks"
+	tests "github.com/ProtonMail/proton-bridge/v2/test"
 	"github.com/golang/mock/gomock"
 
 	"github.com/stretchr/testify/require"

internal/store/store_test_exports.go

@@ -21,7 +21,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 	"github.com/stretchr/testify/assert"
 	bolt "go.etcd.io/bbolt"
 )

internal/store/sync.go

@@ -22,7 +22,7 @@ import (
 	"math"
 	"sync"
 
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 	"github.com/pkg/errors"
 )
 

internal/store/sync_test.go

@@ -24,7 +24,7 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

internal/store/types.go

@@ -20,7 +20,7 @@ package store
 import (
 	"context"
 
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 )
 
 type PanicHandler interface {

internal/store/user_address.go

@@ -21,7 +21,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 	"github.com/pkg/errors"
 	bolt "go.etcd.io/bbolt"
 )

internal/store/user_address_info.go

@@ -21,7 +21,7 @@ import (
 	"encoding/json"
 	"strings"
 
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 	"github.com/pkg/errors"
 	bolt "go.etcd.io/bbolt"
 )

internal/store/user_mailbox.go

@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 	"github.com/pkg/errors"
 )
 

internal/store/user_message.go

@@ -27,8 +27,8 @@ import (
 	"strings"
 
 	"github.com/ProtonMail/gopenpgp/v2/crypto"
-	"github.com/ProtonMail/proton-bridge/internal/store/cache"
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/internal/store/cache"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	bolt "go.etcd.io/bbolt"
@@ -43,7 +43,8 @@ func (store *Store) CreateDraft(
 	attachmentReaders []io.Reader,
 	attachedPublicKey,
 	attachedPublicKeyName string,
-	parentID string) (*pmapi.Message, []*pmapi.Attachment, error) {
+	parentID string,
+) (*pmapi.Message, []*pmapi.Attachment, error) {
 	attachments := store.prepareDraftAttachments(message, attachmentReaders, attachedPublicKey, attachedPublicKeyName)
 
 	if err := encryptDraft(kr, message, attachments); err != nil {
@@ -90,7 +91,8 @@ func (store *Store) prepareDraftAttachments(
 	message *pmapi.Message,
 	attachmentReaders []io.Reader,
 	attachedPublicKey,
-	attachedPublicKeyName string) []*draftAttachment {
+	attachedPublicKeyName string,
+) []*draftAttachment {
 	attachments := []*draftAttachment{}
 	for idx, attachment := range message.Attachments {
 		attachments = append(attachments, &draftAttachment{

internal/store/user_message_test.go

@@ -24,8 +24,8 @@ import (
 	"strings"
 	"testing"
 
-	pkgMsg "github.com/ProtonMail/proton-bridge/pkg/message"
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	pkgMsg "github.com/ProtonMail/proton-bridge/v2/pkg/message"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/require"
 	bolt "go.etcd.io/bbolt"

internal/store/user_sync.go

@@ -23,15 +23,17 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	bolt "go.etcd.io/bbolt"
 )
 
-const syncFinishTimeKey = "sync_state" // The original key was sync_state and we want to keep compatibility.
-const syncIDRangesKey = "id_ranges"
-const syncIDsToBeDeletedKey = "ids_to_be_deleted"
+const (
+	syncFinishTimeKey     = "sync_state" // The original key was sync_state and we want to keep compatibility.
+	syncIDRangesKey       = "id_ranges"
+	syncIDsToBeDeletedKey = "ids_to_be_deleted"
+)
 
 // updateCountsFromServer will download and set the counts.
 func (store *Store) updateCountsFromServer() error {
@@ -204,7 +206,6 @@ func (store *Store) loadSyncState() *syncState {
 
 		return
 	})
-
 	if err != nil {
 		store.log.WithError(err).Error("Failed to load sync state")
 	}

internal/store/user_sync_test.go

@@ -21,7 +21,7 @@ import (
 	"sort"
 	"testing"
 
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )