Other: Add v2 to module name

test/accounts/account.go

@@ -25,7 +25,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 )
 
 const (

test/accounts/accounts.go

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

test/api_checks_test.go

@@ -24,8 +24,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
-	"github.com/ProtonMail/proton-bridge/test/accounts"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/test/accounts"
 	"github.com/cucumber/godog"
 	"github.com/stretchr/testify/assert"
 )

test/bdd_test.go

@@ -20,7 +20,7 @@ package tests
 import (
 	"context"
 
-	testContext "github.com/ProtonMail/proton-bridge/test/context"
+	testContext "github.com/ProtonMail/proton-bridge/v2/test/context"
 	"github.com/cucumber/godog"
 )
 

test/benchmarks/bench_test.go

@@ -22,8 +22,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ProtonMail/proton-bridge/test/context"
-	"github.com/ProtonMail/proton-bridge/test/mocks"
+	"github.com/ProtonMail/proton-bridge/v2/test/context"
+	"github.com/ProtonMail/proton-bridge/v2/test/mocks"
 )
 
 func benchTestContext() (*context.TestContext, *mocks.IMAPClient) {
@@ -157,7 +157,6 @@ func BenchmarkIMAPOutlook(b *testing.B) {
 	b.Run("default", func(b *testing.B) {
 		for i := 0; i < b.N; i++ {
 			for _, command := range []string{
-
 				/*
 					"ID ("+
 						`"name" "Mac OS X Mail" `+

test/context/accounts.go

@@ -20,7 +20,7 @@ package context
 import (
 	"os"
 
-	"github.com/ProtonMail/proton-bridge/test/accounts"
+	"github.com/ProtonMail/proton-bridge/v2/test/accounts"
 )
 
 func newTestAccounts() *accounts.TestAccounts {

test/context/bridge.go

@@ -21,16 +21,16 @@ import (
 	"time"
 
 	"github.com/ProtonMail/go-autostart"
-	"github.com/ProtonMail/proton-bridge/internal/bridge"
-	"github.com/ProtonMail/proton-bridge/internal/config/settings"
-	"github.com/ProtonMail/proton-bridge/internal/config/useragent"
-	"github.com/ProtonMail/proton-bridge/internal/constants"
-	"github.com/ProtonMail/proton-bridge/internal/sentry"
-	"github.com/ProtonMail/proton-bridge/internal/store/cache"
-	"github.com/ProtonMail/proton-bridge/internal/users"
-	"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/v2/internal/bridge"
+	"github.com/ProtonMail/proton-bridge/v2/internal/config/settings"
+	"github.com/ProtonMail/proton-bridge/v2/internal/config/useragent"
+	"github.com/ProtonMail/proton-bridge/v2/internal/constants"
+	"github.com/ProtonMail/proton-bridge/v2/internal/sentry"
+	"github.com/ProtonMail/proton-bridge/v2/internal/store/cache"
+	"github.com/ProtonMail/proton-bridge/v2/internal/users"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/listener"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/message"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 )
 
 // GetBridge returns bridge instance.

test/context/context.go

@@ -21,13 +21,13 @@ package context
 import (
 	"sync"
 
-	"github.com/ProtonMail/proton-bridge/internal/bridge"
-	"github.com/ProtonMail/proton-bridge/internal/config/useragent"
-	"github.com/ProtonMail/proton-bridge/internal/users"
-	"github.com/ProtonMail/proton-bridge/pkg/listener"
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
-	"github.com/ProtonMail/proton-bridge/test/accounts"
-	"github.com/ProtonMail/proton-bridge/test/mocks"
+	"github.com/ProtonMail/proton-bridge/v2/internal/bridge"
+	"github.com/ProtonMail/proton-bridge/v2/internal/config/useragent"
+	"github.com/ProtonMail/proton-bridge/v2/internal/users"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/listener"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/test/accounts"
+	"github.com/ProtonMail/proton-bridge/v2/test/mocks"
 	"github.com/sirupsen/logrus"
 )
 
@@ -169,6 +169,7 @@ func (ctx *TestContext) GetLastError() error {
 func (ctx *TestContext) MessagePreparationStarted(username string) {
 	ctx.pmapiController.LockEvents(username)
 }
+
 func (ctx *TestContext) MessagePreparationFinished(username string) {
 	ctx.pmapiController.UnlockEvents(username)
 }

test/context/credentials.go

@@ -20,7 +20,7 @@ package context
 import (
 	"strings"
 
-	"github.com/ProtonMail/proton-bridge/internal/users/credentials"
+	"github.com/ProtonMail/proton-bridge/v2/internal/users/credentials"
 	"github.com/pkg/errors"
 )
 

test/context/globals.go

@@ -20,7 +20,7 @@ package context
 import (
 	"os"
 
-	"github.com/ProtonMail/proton-bridge/test/liveapi"
+	"github.com/ProtonMail/proton-bridge/v2/test/liveapi"
 )
 
 // BeforeRun does necessary setup.

test/context/imap.go

@@ -21,11 +21,11 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/ProtonMail/proton-bridge/internal/bridge"
-	"github.com/ProtonMail/proton-bridge/internal/config/settings"
-	"github.com/ProtonMail/proton-bridge/internal/config/tls"
-	"github.com/ProtonMail/proton-bridge/internal/imap"
-	"github.com/ProtonMail/proton-bridge/test/mocks"
+	"github.com/ProtonMail/proton-bridge/v2/internal/bridge"
+	"github.com/ProtonMail/proton-bridge/v2/internal/config/settings"
+	"github.com/ProtonMail/proton-bridge/v2/internal/config/tls"
+	"github.com/ProtonMail/proton-bridge/v2/internal/imap"
+	"github.com/ProtonMail/proton-bridge/v2/test/mocks"
 	"github.com/stretchr/testify/require"
 )
 

test/context/pmapi_controller.go

@@ -20,12 +20,12 @@ package context
 import (
 	"os"
 
-	"github.com/ProtonMail/proton-bridge/internal/events"
-	"github.com/ProtonMail/proton-bridge/pkg/listener"
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
-	"github.com/ProtonMail/proton-bridge/test/accounts"
-	"github.com/ProtonMail/proton-bridge/test/fakeapi"
-	"github.com/ProtonMail/proton-bridge/test/liveapi"
+	"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/ProtonMail/proton-bridge/v2/test/accounts"
+	"github.com/ProtonMail/proton-bridge/v2/test/fakeapi"
+	"github.com/ProtonMail/proton-bridge/v2/test/liveapi"
 )
 
 type PMAPIController interface {

test/context/settings.go

@@ -21,7 +21,7 @@ import (
 	"io/ioutil"
 	"math/rand"
 
-	"github.com/ProtonMail/proton-bridge/internal/config/settings"
+	"github.com/ProtonMail/proton-bridge/v2/internal/config/settings"
 )
 
 type fakeSettings struct {

test/context/smtp.go

@@ -21,11 +21,11 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/ProtonMail/proton-bridge/internal/bridge"
-	"github.com/ProtonMail/proton-bridge/internal/config/settings"
-	"github.com/ProtonMail/proton-bridge/internal/config/tls"
-	"github.com/ProtonMail/proton-bridge/internal/smtp"
-	"github.com/ProtonMail/proton-bridge/test/mocks"
+	"github.com/ProtonMail/proton-bridge/v2/internal/bridge"
+	"github.com/ProtonMail/proton-bridge/v2/internal/config/settings"
+	"github.com/ProtonMail/proton-bridge/v2/internal/config/tls"
+	"github.com/ProtonMail/proton-bridge/v2/internal/smtp"
+	"github.com/ProtonMail/proton-bridge/v2/test/mocks"
 	"github.com/stretchr/testify/require"
 )
 

test/context/updater.go

@@ -18,7 +18,7 @@
 package context
 
 import (
-	"github.com/ProtonMail/proton-bridge/internal/updater"
+	"github.com/ProtonMail/proton-bridge/v2/internal/updater"
 )
 
 type fakeUpdater struct{}

test/context/users.go

@@ -25,9 +25,9 @@ import (
 	"time"
 
 	"github.com/ProtonMail/go-srp"
-	"github.com/ProtonMail/proton-bridge/internal/store"
-	"github.com/ProtonMail/proton-bridge/internal/users"
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/internal/store"
+	"github.com/ProtonMail/proton-bridge/v2/internal/users"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 )

test/fakeapi/attachments.go

@@ -26,7 +26,7 @@ import (
 	"io/ioutil"
 	"net/textproto"
 
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 )
 
 // dataPacketOutlineLightInstagram48png is data packet with encrypted data and

test/fakeapi/auth.go

@@ -20,7 +20,7 @@ package fakeapi
 import (
 	"context"
 
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 )
 
 func (api *FakePMAPI) Auth2FA(_ context.Context, twoFactorCode string) error {

test/fakeapi/contacts.go

@@ -23,7 +23,7 @@ import (
 	"net/url"
 	"strconv"
 
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 )
 
 func (api *FakePMAPI) DecryptAndVerifyCards(cards []pmapi.Card) ([]pmapi.Card, error) {

test/fakeapi/controller.go

@@ -20,8 +20,8 @@ package fakeapi
 import (
 	"sync"
 
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
-	"github.com/ProtonMail/proton-bridge/test/context/calls"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/test/context/calls"
 	"github.com/sirupsen/logrus"
 )
 

test/fakeapi/controller_calls.go

@@ -20,7 +20,7 @@ package fakeapi
 import (
 	"encoding/json"
 
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 )
 
 type method string

test/fakeapi/controller_control.go

@@ -24,8 +24,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
-	"github.com/ProtonMail/proton-bridge/test/accounts"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/test/accounts"
 )
 
 var systemLabelNameToID = map[string]string{ //nolint:gochecknoglobals

test/fakeapi/controller_session.go

@@ -21,7 +21,7 @@ import (
 	"bytes"
 	"errors"
 
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 )
 
 type fakeSession struct {

test/fakeapi/controller_user.go

@@ -17,7 +17,7 @@
 
 package fakeapi
 
-import "github.com/ProtonMail/proton-bridge/pkg/pmapi"
+import "github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 
 type fakeUser struct {
 	user     *pmapi.User

test/fakeapi/counts.go

@@ -20,7 +20,7 @@ package fakeapi
 import (
 	"context"
 
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 )
 
 func (api *FakePMAPI) CountMessages(_ context.Context, addressID string) ([]*pmapi.MessagesCount, error) {

test/fakeapi/events.go

@@ -20,7 +20,7 @@ package fakeapi
 import (
 	"context"
 
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 )
 
 func (api *FakePMAPI) GetEvent(_ context.Context, eventID string) (*pmapi.Event, error) {

test/fakeapi/fakeapi.go

@@ -22,7 +22,7 @@ import (
 	"fmt"
 
 	"github.com/ProtonMail/gopenpgp/v2/crypto"
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 	"github.com/sirupsen/logrus"
 )
 

test/fakeapi/keys.go

@@ -20,7 +20,7 @@ package fakeapi
 import (
 	"context"
 
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 )
 
 // publicKey is used from pmapi unit tests.

test/fakeapi/labels.go

@@ -21,7 +21,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 )
 
 func (api *FakePMAPI) isLabelFolder(labelID string) bool {

test/fakeapi/manager.go

@@ -24,7 +24,7 @@ import (
 	"time"
 
 	"github.com/ProtonMail/gopenpgp/v2/crypto"
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 	"github.com/sirupsen/logrus"
 )
 

test/fakeapi/messages.go

@@ -23,8 +23,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/ProtonMail/proton-bridge/pkg/message"
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/message"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 	"github.com/pkg/errors"
 )
 

test/fakeapi/user.go

@@ -21,7 +21,7 @@ import (
 	"context"
 
 	"github.com/ProtonMail/gopenpgp/v2/crypto"
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 )
 
 func (api *FakePMAPI) GetMailSettings(context.Context) (pmapi.MailSettings, error) {

test/imap_actions_messages_test.go

@@ -25,7 +25,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ProtonMail/proton-bridge/test/mocks"
+	"github.com/ProtonMail/proton-bridge/v2/test/mocks"
 	"github.com/cucumber/godog"
 	"golang.org/x/net/html/charset"
 )

test/liveapi/cleanup.go

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

test/liveapi/controller.go

@@ -21,8 +21,8 @@ import (
 	"net/http"
 	"sync"
 
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
-	"github.com/ProtonMail/proton-bridge/test/context/calls"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/test/context/calls"
 	"github.com/sirupsen/logrus"
 )
 

test/liveapi/labels.go

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

test/liveapi/messages.go

@@ -20,8 +20,8 @@ package liveapi
 import (
 	"context"
 
-	messageUtils "github.com/ProtonMail/proton-bridge/pkg/message"
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	messageUtils "github.com/ProtonMail/proton-bridge/v2/pkg/message"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 	"github.com/pkg/errors"
 )
 

test/liveapi/persistent_clients.go

@@ -24,8 +24,8 @@ import (
 	"sync"
 
 	"github.com/ProtonMail/go-srp"
-	"github.com/ProtonMail/proton-bridge/internal/constants"
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/internal/constants"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )

test/liveapi/users.go

@@ -20,8 +20,8 @@ package liveapi
 import (
 	"context"
 
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
-	"github.com/ProtonMail/proton-bridge/test/accounts"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/test/accounts"
 	"github.com/cucumber/godog"
 	"github.com/pkg/errors"
 )

test/main_test.go

@@ -22,7 +22,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/ProtonMail/proton-bridge/internal/constants"
+	"github.com/ProtonMail/proton-bridge/v2/internal/constants"
 	"github.com/cucumber/godog"
 	"github.com/cucumber/godog/colors"
 )

test/mocks/imap_client.go

@@ -25,7 +25,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ProtonMail/proton-bridge/pkg/message"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/message"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

test/mocks/imap_response.go

@@ -51,7 +51,6 @@ func (ir *IMAPResponse) sendCommand(reqTag string, reqIndex int, command string,
 	var section string
 	for {
 		line, err := response.ReadString('\n')
-
 		if err != nil {
 			ir.err = errors.Wrap(err, "read response failed")
 			debug.printErr(ir.err.Error() + "\n")

test/smtp_actions_test.go

@@ -111,9 +111,11 @@ func smtpClientNamedSendsMessageWithBCC(clientID, bcc string, message *godog.Doc
 func smtpClientSendsCommand(command string) error {
 	return smtpClientNamedSendsCommand("smtp", command)
 }
+
 func smtpClientSendsCommandMultiline(command *godog.DocString) error {
 	return smtpClientNamedSendsCommand("smtp", command.Content)
 }
+
 func smtpClientNamedSendsCommand(clientName, command string) error {
 	command = strings.ReplaceAll(command, "\\r", "\r")
 	command = strings.ReplaceAll(command, "\\n", "\n")

test/store_checks_test.go

@@ -23,9 +23,9 @@ import (
 	"time"
 
 	"github.com/ProtonMail/go-rfc5322"
-	"github.com/ProtonMail/proton-bridge/internal/store"
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
-	"github.com/ProtonMail/proton-bridge/test/accounts"
+	"github.com/ProtonMail/proton-bridge/v2/internal/store"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/test/accounts"
 	"github.com/cucumber/godog"
 	"github.com/cucumber/messages-go/v16"
 	"github.com/hashicorp/go-multierror"

test/store_setup_test.go

@@ -25,7 +25,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 	"github.com/cucumber/godog"
 )