Refactor kafka to pure Go (franz-go), fix DBC stubs, update Dockerfile

pkg/db/db.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"sync"
 
-	"fiskerinc.com/modules/logger"
-	"fiskerinc.com/modules/utils/envtool"
+	"github.com/fiskerinc/cloud-services/pkg/logger"
+	"github.com/fiskerinc/cloud-services/pkg/utils/envtool"
 	"github.com/go-pg/pg/v10"
 	"github.com/go-pg/pg/v10/orm"
 	"github.com/pkg/errors"

pkg/db/db_test.go

@@ -5,9 +5,9 @@ import (
 
 	"github.com/go-pg/pg/v10"
 
-	m "fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/db"
-	"fiskerinc.com/modules/testhelper"
+	m "github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/db"
+	"github.com/fiskerinc/cloud-services/pkg/testhelper"
 )
 
 func TestDBClient(t *testing.T) {

pkg/db/migrator.go

@@ -12,7 +12,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/vmihailenco/tagparser"
 
-	"fiskerinc.com/modules/logger"
+	"github.com/fiskerinc/cloud-services/pkg/logger"
 )
 
 type Migrator struct {

pkg/db/migrator_test.go

@@ -4,9 +4,9 @@ import (
 	"reflect"
 	"testing"
 
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/common/dbbasemodel"
-	"fiskerinc.com/modules/db"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/common/dbbasemodel"
+	"github.com/fiskerinc/cloud-services/pkg/db"
 )
 
 var instance db.Migrator

pkg/db/queries/action_logs.go

@@ -1,7 +1,7 @@
 package queries
 
 import (
-	"fiskerinc.com/modules/common/actionlogger"
+	"github.com/fiskerinc/cloud-services/pkg/common/actionlogger"
 	"github.com/pkg/errors"
 )
 

pkg/db/queries/apicalls.go

@@ -3,8 +3,8 @@ package queries
 import (
 	"strings"
 
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/validator"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/validator"
 
 	"github.com/go-pg/pg/v10/orm"
 	"github.com/pkg/errors"

pkg/db/queries/apitokens.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"time"
 
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/validator"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/validator"
 	"github.com/go-pg/pg/v10/orm"
 	"github.com/pkg/errors"
 )

pkg/db/queries/car_config_data.go

@@ -1,7 +1,7 @@
 package queries
 
 import (
-	"fiskerinc.com/modules/common"
+	"github.com/fiskerinc/cloud-services/pkg/common"
 	"github.com/pkg/errors"
 )
 

pkg/db/queries/car_versions_log.go

@@ -3,7 +3,7 @@ package queries
 import (
 	"time"
 
-	"fiskerinc.com/modules/common"
+	"github.com/fiskerinc/cloud-services/pkg/common"
 
 	"github.com/go-pg/pg/v10/orm"
 	"github.com/pkg/errors"

pkg/db/queries/cars.go

@@ -7,10 +7,10 @@ import (
 	"strings"
 	"time"
 
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/logger"
-	"fiskerinc.com/modules/validator"
-	"fiskerinc.com/modules/vindecoder"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/logger"
+	"github.com/fiskerinc/cloud-services/pkg/validator"
+	"github.com/fiskerinc/cloud-services/pkg/vindecoder"
 
 	"github.com/go-pg/pg/v10"
 	"github.com/go-pg/pg/v10/orm"

pkg/db/queries/cars_test.go

@@ -7,14 +7,14 @@ import (
 
 	"github.com/go-pg/pg/v10/orm"
 
-	m "fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/db"
-	"fiskerinc.com/modules/db/queries"
-	"fiskerinc.com/modules/testhelper"
+	m "github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/db"
+	"github.com/fiskerinc/cloud-services/pkg/db/queries"
+	"github.com/fiskerinc/cloud-services/pkg/testhelper"
 
 	"github.com/go-pg/pg/v10"
 	"github.com/google/uuid"
-	"fiskerinc.com/modules/utils/elptr"
+	"github.com/fiskerinc/cloud-services/pkg/utils/elptr"
 )
 
 const testCarVIN = "1GNGC26R1XJ407649"

pkg/db/queries/carupdates.go

@@ -3,10 +3,10 @@ package queries
 import (
 	"fmt"
 
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/common/carupdatestatus"
-	"fiskerinc.com/modules/logger"
-	"fiskerinc.com/modules/validator"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/common/carupdatestatus"
+	"github.com/fiskerinc/cloud-services/pkg/logger"
+	"github.com/fiskerinc/cloud-services/pkg/validator"
 
 	"github.com/go-pg/pg/v10"
 	"github.com/go-pg/pg/v10/orm"

pkg/db/queries/carupdates_test.go

@@ -6,10 +6,10 @@ import (
 
 	"github.com/go-pg/pg/v10/orm"
 
-	m "fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/db"
-	"fiskerinc.com/modules/db/queries"
-	"fiskerinc.com/modules/testhelper"
+	m "github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/db"
+	"github.com/fiskerinc/cloud-services/pkg/db/queries"
+	"github.com/fiskerinc/cloud-services/pkg/testhelper"
 )
 
 const testCarUpdateVIN = "FISKER1234"

pkg/db/queries/certificates.go

@@ -1,9 +1,9 @@
 package queries
 
 import (
-	"fiskerinc.com/modules/common"
-	s "fiskerinc.com/modules/security"
-	"fiskerinc.com/modules/validator"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	s "github.com/fiskerinc/cloud-services/pkg/security"
+	"github.com/fiskerinc/cloud-services/pkg/validator"
 	"github.com/go-pg/pg/v10"
 	"github.com/go-pg/pg/v10/orm"
 	"github.com/pkg/errors"

pkg/db/queries/certificates_test.go

@@ -3,8 +3,8 @@ package queries_test
 import (
 	"testing"
 
-	"fiskerinc.com/modules/db"
-	"fiskerinc.com/modules/db/queries"
+	"github.com/fiskerinc/cloud-services/pkg/db"
+	"github.com/fiskerinc/cloud-services/pkg/db/queries"
 )
 
 func TestSelectMostRecents(t *testing.T) {

pkg/db/queries/driver_emails.go

@@ -1,7 +1,7 @@
 package queries
 
 import (
-	"fiskerinc.com/modules/common"
+	"github.com/fiskerinc/cloud-services/pkg/common"
 	"github.com/pkg/errors"
 )
 

pkg/db/queries/drivers.go

@@ -1,8 +1,8 @@
 package queries
 
 import (
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/validator"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/validator"
 
 	"github.com/go-pg/pg/v10/orm"
 	"github.com/pkg/errors"

pkg/db/queries/ecckeys.go

@@ -1,9 +1,9 @@
 package queries
 
 import (
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/logger"
-	s "fiskerinc.com/modules/security"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/logger"
+	s "github.com/fiskerinc/cloud-services/pkg/security"
 	"github.com/go-pg/pg/v10"
 	"github.com/go-pg/pg/v10/orm"
 	"github.com/pkg/errors"

pkg/db/queries/ecckeys_test.go

@@ -4,10 +4,10 @@ import (
 	"encoding/json"
 	"testing"
 
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/db"
-	"fiskerinc.com/modules/db/queries"
-	"fiskerinc.com/modules/testhelper"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/db"
+	"github.com/fiskerinc/cloud-services/pkg/db/queries"
+	"github.com/fiskerinc/cloud-services/pkg/testhelper"
 )
 
 func TestSelectAllPrivateKeysByVIN(t *testing.T) {

pkg/db/queries/ecu_dtc.go

@@ -2,7 +2,7 @@ package queries
 
 import (
 	"time"
-	"fiskerinc.com/modules/common"
+	"github.com/fiskerinc/cloud-services/pkg/common"
 
 	"github.com/go-pg/pg/v10/orm"
 	"github.com/pkg/errors"

pkg/db/queries/ecu_dtc_test.go

@@ -3,10 +3,10 @@ package queries_test
 import (
 	"testing"
 
-	m "fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/db"
-	"fiskerinc.com/modules/db/queries"
-	"fiskerinc.com/modules/testhelper"
+	m "github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/db"
+	"github.com/fiskerinc/cloud-services/pkg/db/queries"
+	"github.com/fiskerinc/cloud-services/pkg/testhelper"
 )
 
 func TestDTCIntegration(t *testing.T) {

pkg/db/queries/filekeys.go

@@ -3,9 +3,9 @@ package queries
 import (
 	"sync"
 
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/security"
-	"fiskerinc.com/modules/validator"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/security"
+	"github.com/fiskerinc/cloud-services/pkg/validator"
 
 	"github.com/go-pg/pg/v10"
 	"github.com/go-pg/pg/v10/orm"

pkg/db/queries/filekeys_test.go

@@ -3,11 +3,11 @@ package queries_test
 import (
 	"testing"
 
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/db/queries"
-	"fiskerinc.com/modules/testhelper"
-	th "fiskerinc.com/modules/testhelper"
-	"fiskerinc.com/modules/validator"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/db/queries"
+	"github.com/fiskerinc/cloud-services/pkg/testhelper"
+	th "github.com/fiskerinc/cloud-services/pkg/testhelper"
+	"github.com/fiskerinc/cloud-services/pkg/validator"
 )
 
 const testFileID string = "07a4ed515543d4d8"

pkg/db/queries/helper.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"fiskerinc.com/modules/validator"
+	"github.com/fiskerinc/cloud-services/pkg/validator"
 
 	"github.com/gorilla/schema"
 	"github.com/pkg/errors"

pkg/db/queries/issue_images.go

@@ -1,7 +1,7 @@
 package queries
 
 import (
-	"fiskerinc.com/modules/common"
+	"github.com/fiskerinc/cloud-services/pkg/common"
 
 	"github.com/go-pg/pg/v10/orm"
 	"github.com/pkg/errors"

pkg/db/queries/issue_images_test.go

@@ -3,11 +3,11 @@ package queries_test
 import (
 	"testing"
 
-	"fiskerinc.com/modules/common"
-	m "fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/db"
-	"fiskerinc.com/modules/db/queries"
-	"fiskerinc.com/modules/testhelper"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	m "github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/db"
+	"github.com/fiskerinc/cloud-services/pkg/db/queries"
+	"github.com/fiskerinc/cloud-services/pkg/testhelper"
 )
 
 func TestIssueImageIntegration(t *testing.T) {

pkg/db/queries/issues.go

@@ -3,8 +3,8 @@ package queries
 import (
 	"fmt"
 
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/validator"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/validator"
 
 	"github.com/go-pg/pg/v10/orm"
 	"github.com/pkg/errors"

pkg/db/queries/issues_test.go

@@ -4,11 +4,11 @@ import (
 	"testing"
 	"time"
 
-	"fiskerinc.com/modules/common"
-	m "fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/db"
-	"fiskerinc.com/modules/db/queries"
-	"fiskerinc.com/modules/testhelper"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	m "github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/db"
+	"github.com/fiskerinc/cloud-services/pkg/db/queries"
+	"github.com/fiskerinc/cloud-services/pkg/testhelper"
 )
 
 func TestIssueIntegration(t *testing.T) {

pkg/db/queries/mocks/apicalls.go

@@ -1,8 +1,8 @@
 package mocks
 
 import (
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/db/queries"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/db/queries"
 	"github.com/go-pg/pg/v10/orm"
 )
 

pkg/db/queries/mocks/apitokens.go

@@ -1,8 +1,8 @@
 package mocks
 
 import (
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/db/queries"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/db/queries"
 	"github.com/go-pg/pg/v10/orm"
 )
 

pkg/db/queries/mocks/car_config_data.go

@@ -1,7 +1,7 @@
 package mocks
 
 import (
-	"fiskerinc.com/modules/common"
+	"github.com/fiskerinc/cloud-services/pkg/common"
 )
 
 type MockCarConfigData struct {

pkg/db/queries/mocks/car_versions_log.go

@@ -3,8 +3,8 @@ package mocks
 import (
 	"time"
 
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/db/queries"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/db/queries"
 	"github.com/go-pg/pg/v10/orm"
 )
 

pkg/db/queries/mocks/cars.go

@@ -3,9 +3,9 @@ package mocks
 import (
 	"github.com/go-pg/pg/v10/orm"
 
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/db/queries"
-	"fiskerinc.com/modules/validator"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/db/queries"
+	"github.com/fiskerinc/cloud-services/pkg/validator"
 	"github.com/jinzhu/copier"
 )
 

pkg/db/queries/mocks/carupdates.go

@@ -5,9 +5,9 @@ import (
 
 	"github.com/go-pg/pg/v10/orm"
 
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/db/queries"
-	"fiskerinc.com/modules/validator"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/db/queries"
+	"github.com/fiskerinc/cloud-services/pkg/validator"
 )
 
 type MockCarUpdates struct {

pkg/db/queries/mocks/certificates.go

@@ -3,8 +3,8 @@ package mocks
 import (
 	"github.com/go-pg/pg/v10/orm"
 
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/validator"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/validator"
 )
 
 // CarUpdate query methods

pkg/db/queries/mocks/dbhttptest.go

@@ -7,8 +7,8 @@ import (
 	"regexp"
 	"testing"
 
-	th "fiskerinc.com/modules/testhelper"
-	"fiskerinc.com/modules/validator"
+	th "github.com/fiskerinc/cloud-services/pkg/testhelper"
+	"github.com/fiskerinc/cloud-services/pkg/validator"
 	"github.com/julienschmidt/httprouter"
 )
 

pkg/db/queries/mocks/dbmockhelper.go

@@ -3,7 +3,7 @@ package mocks
 import (
 	"fmt"
 
-	"fiskerinc.com/modules/db/queries"
+	"github.com/fiskerinc/cloud-services/pkg/db/queries"
 	"github.com/go-pg/pg/v10/orm"
 )
 

pkg/db/queries/mocks/dbtestcase.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"testing"
 
-	"fiskerinc.com/modules/db/queries"
-	th "fiskerinc.com/modules/testhelper"
+	"github.com/fiskerinc/cloud-services/pkg/db/queries"
+	th "github.com/fiskerinc/cloud-services/pkg/testhelper"
 )
 
 type DBTestCase struct {

pkg/db/queries/mocks/drivers.go

@@ -3,8 +3,8 @@ package mocks
 import (
 	"github.com/go-pg/pg/v10/orm"
 
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/validator"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/validator"
 )
 
 // MockDrivers

pkg/db/queries/mocks/ecckeys.go

@@ -1,7 +1,7 @@
 package mocks
 
 import (
-	"fiskerinc.com/modules/common"
+	"github.com/fiskerinc/cloud-services/pkg/common"
 
 	"github.com/go-pg/pg/v10/orm"
 	"github.com/jinzhu/copier"

pkg/db/queries/mocks/ecu_dtc.go

@@ -1,8 +1,8 @@
 package mocks
 
 import (
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/db/queries"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/db/queries"
 	"github.com/go-pg/pg/v10/orm"
 )
 

pkg/db/queries/mocks/filekeys.go

@@ -1,8 +1,8 @@
 package mocks
 
 import (
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/validator"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/validator"
 
 	"github.com/go-pg/pg/v10/orm"
 )

pkg/db/queries/mocks/issues.go

@@ -6,9 +6,9 @@ import (
 
 	"github.com/go-pg/pg/v10/orm"
 
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/db/queries"
-	"fiskerinc.com/modules/validator"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/db/queries"
+	"github.com/fiskerinc/cloud-services/pkg/validator"
 )
 
 type MockIssue struct {

pkg/db/queries/mocks/rate_plan.go

@@ -1,8 +1,8 @@
 package mocks
 
 import (
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/db/queries"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/db/queries"
 )
 
 type MockRatePlan struct {

pkg/db/queries/mocks/signed_images.go

@@ -3,7 +3,7 @@ package mocks
 import (
 	"github.com/go-pg/pg/v10/orm"
 
-	"fiskerinc.com/modules/common"
+	"github.com/fiskerinc/cloud-services/pkg/common"
 )
 
 // EccKey query methods

pkg/db/queries/mocks/subscription_configurations.go

@@ -1,8 +1,8 @@
 package mocks
 
 import (
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/db/queries"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/db/queries"
 
 	"github.com/go-pg/pg/v10/orm"
 )

pkg/db/queries/mocks/subscription_features.go

@@ -1,8 +1,8 @@
 package mocks
 
 import (
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/db/queries"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/db/queries"
 
 	"github.com/go-pg/pg/v10/orm"
 	"github.com/google/uuid"

pkg/db/queries/mocks/subscription_packages.go

@@ -1,8 +1,8 @@
 package mocks
 
 import (
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/db/queries"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/db/queries"
 
 	"github.com/go-pg/pg/v10/orm"
 	"github.com/google/uuid"

pkg/db/queries/mocks/subscriptions.go

@@ -3,8 +3,8 @@ package mocks
 import (
 	"time"
 
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/db/queries"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/db/queries"
 
 	"github.com/go-pg/pg/v10/orm"
 )

pkg/db/queries/mocks/subscriptiontypes.go

@@ -1,7 +1,7 @@
 package mocks
 
 import (
-	"fiskerinc.com/modules/common"
+	"github.com/fiskerinc/cloud-services/pkg/common"
 
 	"github.com/go-pg/pg/v10/orm"
 )

pkg/db/queries/mocks/sums_versions.go

@@ -1,8 +1,8 @@
 package mocks
 
 import (
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/db/queries"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/db/queries"
 	"github.com/go-pg/pg/v10/orm"
 )
 

pkg/db/queries/mocks/supplier_accounts.go

@@ -1,8 +1,8 @@
 package mocks
 
 import (
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/db/queries"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/db/queries"
 
 	"github.com/go-pg/pg/v10/orm"
 )

pkg/db/queries/mocks/supplier_organizations.go

@@ -1,8 +1,8 @@
 package mocks
 
 import (
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/db/queries"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/db/queries"
 	"github.com/go-pg/pg/v10/orm"
 )
 

pkg/db/queries/mocks/swversion_rxswin.go

@@ -1,8 +1,8 @@
 package mocks
 
 import (
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/db/queries"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/db/queries"
 	"github.com/go-pg/pg/v10/orm"
 )
 

pkg/db/queries/mocks/symkeys.go

@@ -3,7 +3,7 @@ package mocks
 import (
 	"github.com/go-pg/pg/v10/orm"
 
-	"fiskerinc.com/modules/common"
+	"github.com/fiskerinc/cloud-services/pkg/common"
 )
 
 // SymKey query methods

pkg/db/queries/mocks/tags.go

@@ -1,8 +1,8 @@
 package mocks
 
 import (
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/db/queries"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/db/queries"
 	"github.com/go-pg/pg/v10/orm"
 )
 

pkg/db/queries/mocks/updatemanifests.go

@@ -4,9 +4,9 @@ import (
 	"encoding/json"
 	"time"
 
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/db/queries"
-	"fiskerinc.com/modules/validator"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/db/queries"
+	"github.com/fiskerinc/cloud-services/pkg/validator"
 
 	"github.com/go-pg/pg/v10/orm"
 	"github.com/pkg/errors"

pkg/db/queries/querybase.go

@@ -3,7 +3,7 @@ package queries
 import (
 	"sync"
 
-	"fiskerinc.com/modules/db"
+	"github.com/fiskerinc/cloud-services/pkg/db"
 	"github.com/go-pg/pg/v10"
 	"github.com/go-pg/pg/v10/orm"
 	"github.com/pkg/errors"

pkg/db/queries/rate_plan_tomobile.go

@@ -3,7 +3,7 @@ package queries
 import (
 	"fmt"
 
-	"fiskerinc.com/modules/common"
+	"github.com/fiskerinc/cloud-services/pkg/common"
 	"github.com/go-pg/pg/v10/orm"
 	"github.com/pkg/errors"
 )

pkg/db/queries/rate_plan_tomobile_test.go

@@ -3,8 +3,8 @@ package queries_test
 import (
 	"testing"
 
-	m "fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/db/queries"
+	m "github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/db/queries"
 )
 
 func TestCreateSelectQuery(t *testing.T) {

pkg/db/queries/signed_images.go

@@ -1,8 +1,8 @@
 package queries
 
 import (
-	"fiskerinc.com/modules/common"
-	s "fiskerinc.com/modules/security"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	s "github.com/fiskerinc/cloud-services/pkg/security"
 	"github.com/go-pg/pg/v10/orm"
 	"github.com/pkg/errors"
 )

pkg/db/queries/signed_images_test.go

@@ -3,11 +3,11 @@ package queries_test
 import (
 	"testing"
 
-	"fiskerinc.com/modules/common"
-	m "fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/db"
-	"fiskerinc.com/modules/db/queries"
-	"fiskerinc.com/modules/testhelper"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	m "github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/db"
+	"github.com/fiskerinc/cloud-services/pkg/db/queries"
+	"github.com/fiskerinc/cloud-services/pkg/testhelper"
 	"github.com/go-pg/pg/v10"
 	"github.com/pkg/errors"
 )

pkg/db/queries/subscription_configurations.go

@@ -1,7 +1,7 @@
 package queries
 
 import (
-	"fiskerinc.com/modules/common"
+	"github.com/fiskerinc/cloud-services/pkg/common"
 
 	"github.com/go-pg/pg/v10/orm"
 	"github.com/google/uuid"

pkg/db/queries/subscription_features.go

@@ -1,8 +1,8 @@
 package queries
 
 import (
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/validator"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/validator"
 
 	"github.com/go-pg/pg/v10/orm"
 	"github.com/google/uuid"

pkg/db/queries/subscription_packages.go

@@ -1,7 +1,7 @@
 package queries
 
 import (
-	"fiskerinc.com/modules/common"
+	"github.com/fiskerinc/cloud-services/pkg/common"
 
 	"github.com/go-pg/pg/v10/orm"
 	"github.com/google/uuid"

pkg/db/queries/subscription_packages_test.go

@@ -3,10 +3,10 @@ package queries_test
 import (
 	"testing"
 
-	m "fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/db"
-	"fiskerinc.com/modules/db/queries"
-	th "fiskerinc.com/modules/testhelper"
+	m "github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/db"
+	"github.com/fiskerinc/cloud-services/pkg/db/queries"
+	th "github.com/fiskerinc/cloud-services/pkg/testhelper"
 
 	"github.com/google/uuid"
 )

pkg/db/queries/subscriptions._test.go

@@ -3,10 +3,10 @@ package queries_test
 import (
 	"testing"
 
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/db"
-	"fiskerinc.com/modules/db/queries"
-	"fiskerinc.com/modules/testhelper"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/db"
+	"github.com/fiskerinc/cloud-services/pkg/db/queries"
+	"github.com/fiskerinc/cloud-services/pkg/testhelper"
 	"github.com/google/uuid"
 )
 

pkg/db/queries/subscriptions.go

@@ -3,8 +3,8 @@ package queries
 import (
 	"time"
 
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/validator"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/validator"
 
 	"github.com/go-pg/pg/v10/orm"
 	"github.com/google/uuid"

pkg/db/queries/subscriptiontypes._test.go

@@ -4,11 +4,11 @@ import (
 	"errors"
 	"testing"
 
-	"fiskerinc.com/modules/common"
-	m "fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/db"
-	"fiskerinc.com/modules/db/queries"
-	"fiskerinc.com/modules/testhelper"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	m "github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/db"
+	"github.com/fiskerinc/cloud-services/pkg/db/queries"
+	"github.com/fiskerinc/cloud-services/pkg/testhelper"
 	"github.com/google/uuid"
 )
 

pkg/db/queries/subscriptiontypes.go

@@ -1,8 +1,8 @@
 package queries
 
 import (
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/validator"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/validator"
 
 	"github.com/go-pg/pg/v10/orm"
 	"github.com/google/uuid"

pkg/db/queries/sums_versions.go

@@ -1,7 +1,7 @@
 package queries
 
 import (
-	"fiskerinc.com/modules/common"
+	"github.com/fiskerinc/cloud-services/pkg/common"
 	"github.com/go-pg/pg/v10/orm"
 	"github.com/pkg/errors"
 )

pkg/db/queries/supplier_accounts.go

@@ -3,7 +3,7 @@ package queries
 import (
 	"fmt"
 
-	"fiskerinc.com/modules/common"
+	"github.com/fiskerinc/cloud-services/pkg/common"
 
 	"github.com/go-pg/pg/v10"
 	"github.com/go-pg/pg/v10/orm"

pkg/db/queries/supplier_organizations.go

@@ -1,8 +1,8 @@
 package queries
 
 import (
-	"fiskerinc.com/modules/common"
-	s "fiskerinc.com/modules/security"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	s "github.com/fiskerinc/cloud-services/pkg/security"
 	"github.com/go-pg/pg/v10/orm"
 )
 

pkg/db/queries/swversion_rxswin.go

@@ -1,7 +1,7 @@
 package queries
 
 import (
-	"fiskerinc.com/modules/common"
+	"github.com/fiskerinc/cloud-services/pkg/common"
 	"github.com/go-pg/pg/v10/orm"
 	"github.com/pkg/errors"
 )

pkg/db/queries/symkeys.go

@@ -1,8 +1,8 @@
 package queries
 
 import (
-	"fiskerinc.com/modules/common"
-	s "fiskerinc.com/modules/security"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	s "github.com/fiskerinc/cloud-services/pkg/security"
 	"github.com/go-pg/pg/v10/orm"
 	"github.com/pkg/errors"
 )

pkg/db/queries/tags.go

@@ -1,7 +1,7 @@
 package queries
 
 import (
-	"fiskerinc.com/modules/common"
+	"github.com/fiskerinc/cloud-services/pkg/common"
 	"github.com/go-pg/pg/v10"
 	"github.com/go-pg/pg/v10/orm"
 )

pkg/db/queries/updatemanifests.go

@@ -3,10 +3,10 @@ package queries
 import (
 	"fmt"
 
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/db"
-	"fiskerinc.com/modules/logger"
-	"fiskerinc.com/modules/validator"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/db"
+	"github.com/fiskerinc/cloud-services/pkg/logger"
+	"github.com/fiskerinc/cloud-services/pkg/validator"
 
 	"github.com/go-pg/pg/v10"
 	"github.com/go-pg/pg/v10/orm"

pkg/db/queries/updatemanifests_test.go

@@ -5,10 +5,10 @@ import (
 	"testing"
 	"time"
 
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/db"
-	"fiskerinc.com/modules/db/queries"
-	"fiskerinc.com/modules/testhelper"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/db"
+	"github.com/fiskerinc/cloud-services/pkg/db/queries"
+	"github.com/fiskerinc/cloud-services/pkg/testhelper"
 )
 
 func TestUpdatePackagesManifest(t *testing.T) {

pkg/db/sqllogger.go

@@ -3,7 +3,7 @@ package db
 import (
 	"context"
 
-	"fiskerinc.com/modules/logger"
+	"github.com/fiskerinc/cloud-services/pkg/logger"
 	pg "github.com/go-pg/pg/v10"
 )