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

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"