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

pkg/cache/apitokens.go

@@ -4,10 +4,10 @@ import (
 	"sync"
 	"time"
 
-	"fiskerinc.com/modules/common"
+	"github.com/fiskerinc/cloud-services/pkg/common"
 	"github.com/pkg/errors"
 
-	"fiskerinc.com/modules/db/queries"
+	"github.com/fiskerinc/cloud-services/pkg/db/queries"
 	"github.com/ReneKroon/ttlcache/v2"
 )
 

pkg/cache/apitokens_test.go

@@ -3,13 +3,13 @@ package cache_test
 import (
 	"testing"
 
-	"fiskerinc.com/modules/adminroles"
-	"fiskerinc.com/modules/cache"
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/db"
-	"fiskerinc.com/modules/db/queries"
-	"fiskerinc.com/modules/redis"
-	"fiskerinc.com/modules/testhelper"
+	"github.com/fiskerinc/cloud-services/pkg/adminroles"
+	"github.com/fiskerinc/cloud-services/pkg/cache"
+	"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/redis"
+	"github.com/fiskerinc/cloud-services/pkg/testhelper"
 )
 
 func TestIntegration(t *testing.T) {

pkg/cache/car_dtcs.go

@@ -1,7 +1,7 @@
 package cache
 
 import (
-	"fiskerinc.com/modules/common"
+	"github.com/fiskerinc/cloud-services/pkg/common"
 )
 
 type CarDTCsCacheInterface interface {

pkg/cache/car_dtcs_test.go

@@ -3,8 +3,8 @@ package cache_test
 import (
 	"testing"
 
-	m "fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/cache"
+	m "github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/cache"
 
 	"github.com/stretchr/testify/assert"
 )

pkg/cache/digital_twin.go

@@ -7,10 +7,10 @@ import (
 	"strings"
 	"time"
 
-	"fiskerinc.com/modules/dbc/state"
-	"fiskerinc.com/modules/logger"
-	"fiskerinc.com/modules/redis"
-	"fiskerinc.com/modules/utils/querystring"
+	"github.com/fiskerinc/cloud-services/pkg/dbc/state"
+	"github.com/fiskerinc/cloud-services/pkg/logger"
+	"github.com/fiskerinc/cloud-services/pkg/redis"
+	"github.com/fiskerinc/cloud-services/pkg/utils/querystring"
 	redigo "github.com/gomodule/redigo/redis"
 	"github.com/pkg/errors"
 )

pkg/cache/drivers.go

@@ -1,10 +1,10 @@
 package cache
 
 import (
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/db/queries"
-	"fiskerinc.com/modules/logger"
-	"fiskerinc.com/modules/redis"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/db/queries"
+	"github.com/fiskerinc/cloud-services/pkg/logger"
+	"github.com/fiskerinc/cloud-services/pkg/redis"
 	"github.com/pkg/errors"
 )
 

pkg/cache/drivers_test.go

@@ -4,12 +4,12 @@ import (
 	"encoding/json"
 	"testing"
 
-	"fiskerinc.com/modules/cache"
-	"fiskerinc.com/modules/db/queries"
-	"fiskerinc.com/modules/db/queries/mocks"
-	"fiskerinc.com/modules/redis"
-	"fiskerinc.com/modules/redis/tester"
-	"fiskerinc.com/modules/testhelper"
+	"github.com/fiskerinc/cloud-services/pkg/cache"
+	"github.com/fiskerinc/cloud-services/pkg/db/queries"
+	"github.com/fiskerinc/cloud-services/pkg/db/queries/mocks"
+	"github.com/fiskerinc/cloud-services/pkg/redis"
+	"github.com/fiskerinc/cloud-services/pkg/redis/tester"
+	"github.com/fiskerinc/cloud-services/pkg/testhelper"
 )
 
 var mockRedis redis.Client

pkg/cache/fileids.go

@@ -3,10 +3,10 @@ package cache
 import (
 	"encoding/json"
 
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/db/queries"
-	"fiskerinc.com/modules/logger"
-	"fiskerinc.com/modules/redis"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/db/queries"
+	"github.com/fiskerinc/cloud-services/pkg/logger"
+	"github.com/fiskerinc/cloud-services/pkg/redis"
 
 	r "github.com/gomodule/redigo/redis"
 	"github.com/pkg/errors"

pkg/cache/fileids_test.go

@@ -3,12 +3,12 @@ package cache_test
 import (
 	"testing"
 
-	"fiskerinc.com/modules/cache"
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/db"
-	"fiskerinc.com/modules/db/queries"
-	"fiskerinc.com/modules/db/queries/mocks"
-	"fiskerinc.com/modules/redis"
+	"github.com/fiskerinc/cloud-services/pkg/cache"
+	"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/db/queries/mocks"
+	"github.com/fiskerinc/cloud-services/pkg/redis"
 )
 
 func TestRetrieveFileEncryptionParams(t *testing.T) {

pkg/cache/filters.go

@@ -1,8 +1,8 @@
 package cache
 
 import (
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/redis"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/redis"
 )
 
 func FillCarFilterOnline(redisCLI redis.Client, filter *common.CarSearch) error {

pkg/cache/filters_test.go

@@ -3,9 +3,9 @@ package cache_test
 import (
 	"testing"
 
-	"fiskerinc.com/modules/cache"
-	m "fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/redis/tester"
+	"github.com/fiskerinc/cloud-services/pkg/cache"
+	m "github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/redis/tester"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 )

pkg/cache/ringmap_test.go

@@ -5,7 +5,7 @@ import (
 	"strconv"
 	"testing"
 
-	"fiskerinc.com/modules/cache"
+	"github.com/fiskerinc/cloud-services/pkg/cache"
 
 	"github.com/stretchr/testify/assert"
 )

pkg/cache/subscription_types.go

@@ -3,11 +3,11 @@ package cache
 import (
 	"encoding/json"
 
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/db/queries"
-	"fiskerinc.com/modules/duration"
-	"fiskerinc.com/modules/logger"
-	"fiskerinc.com/modules/redis"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/db/queries"
+	"github.com/fiskerinc/cloud-services/pkg/duration"
+	"github.com/fiskerinc/cloud-services/pkg/logger"
+	"github.com/fiskerinc/cloud-services/pkg/redis"
 	"github.com/google/uuid"
 	"github.com/pkg/errors"
 )

pkg/cache/subscription_types_test.go

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

pkg/cache/vehicle_config.go

@@ -3,13 +3,13 @@ package cache
 import (
 	"encoding/json"
 
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/logger"
-	"fiskerinc.com/modules/mongo"
-	"fiskerinc.com/modules/redis"
-	"fiskerinc.com/modules/utils/envtool"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/logger"
+	"github.com/fiskerinc/cloud-services/pkg/mongo"
+	"github.com/fiskerinc/cloud-services/pkg/redis"
+	"github.com/fiskerinc/cloud-services/pkg/utils/envtool"
 
-	"fiskerinc.com/modules/utils/elptr"
+	"github.com/fiskerinc/cloud-services/pkg/utils/elptr"
 	redigo "github.com/gomodule/redigo/redis"
 	"github.com/pkg/errors"
 )

pkg/cache/vehicle_config_test.go

@@ -5,12 +5,12 @@ import (
 	"sort"
 	"testing"
 
-	"fiskerinc.com/modules/cache"
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/mongo"
-	"fiskerinc.com/modules/redis"
-	"fiskerinc.com/modules/testhelper"
-	"fiskerinc.com/modules/utils/elptr"
+	"github.com/fiskerinc/cloud-services/pkg/cache"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/mongo"
+	"github.com/fiskerinc/cloud-services/pkg/redis"
+	"github.com/fiskerinc/cloud-services/pkg/testhelper"
+	"github.com/fiskerinc/cloud-services/pkg/utils/elptr"
 	redigo "github.com/gomodule/redigo/redis"
 	"github.com/stretchr/testify/assert"
 )

pkg/cache/vehicle_state.go

@@ -6,11 +6,11 @@ import (
 	"strings"
 	"time"
 
-	"fiskerinc.com/modules/common"
-	dt "fiskerinc.com/modules/dbc/state"
-	"fiskerinc.com/modules/logger"
-	"fiskerinc.com/modules/redis"
-	"fiskerinc.com/modules/utils/querystring"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	dt "github.com/fiskerinc/cloud-services/pkg/dbc/state"
+	"github.com/fiskerinc/cloud-services/pkg/logger"
+	"github.com/fiskerinc/cloud-services/pkg/redis"
+	"github.com/fiskerinc/cloud-services/pkg/utils/querystring"
 
 	redigo "github.com/gomodule/redigo/redis"
 	"github.com/pkg/errors"

pkg/cache/vehicle_state_multi.go

@@ -1,9 +1,9 @@
 package cache
 
 import (
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/logger"
-	"fiskerinc.com/modules/redis"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/logger"
+	"github.com/fiskerinc/cloud-services/pkg/redis"
 
 	redigo "github.com/gomodule/redigo/redis"
 	"github.com/pkg/errors"

pkg/cache/vehicle_state_test.go

@@ -5,10 +5,10 @@ import (
 	"testing"
 	"time"
 
-	"fiskerinc.com/modules/cache"
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/redis"
-	"fiskerinc.com/modules/redis/tester"
+	"github.com/fiskerinc/cloud-services/pkg/cache"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/redis"
+	"github.com/fiskerinc/cloud-services/pkg/redis/tester"
 	"github.com/stretchr/testify/assert"
 )
 

pkg/cache/vehicles.go

@@ -2,8 +2,8 @@ package cache
 
 import (
 	"encoding/json"
-	"fiskerinc.com/modules/common"
-	orm "fiskerinc.com/modules/db/queries"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	orm "github.com/fiskerinc/cloud-services/pkg/db/queries"
 	"fmt"
 	"github.com/ReneKroon/ttlcache/v2"
 	"github.com/pkg/errors"

pkg/cache/verify.go

@@ -1,10 +1,10 @@
 package cache
 
 import (
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/db/queries"
-	"fiskerinc.com/modules/logger"
-	"fiskerinc.com/modules/redis"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/db/queries"
+	"github.com/fiskerinc/cloud-services/pkg/logger"
+	"github.com/fiskerinc/cloud-services/pkg/redis"
 
 	redigo "github.com/gomodule/redigo/redis"
 	"github.com/pkg/errors"

pkg/cache/verify_test.go

@@ -3,12 +3,12 @@ package cache_test
 import (
 	"testing"
 
-	"fiskerinc.com/modules/cache"
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/db/queries/mocks"
-	"fiskerinc.com/modules/redis"
-	"fiskerinc.com/modules/redis/tester"
-	"fiskerinc.com/modules/testhelper"
+	"github.com/fiskerinc/cloud-services/pkg/cache"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/db/queries/mocks"
+	"github.com/fiskerinc/cloud-services/pkg/redis"
+	"github.com/fiskerinc/cloud-services/pkg/redis/tester"
+	"github.com/fiskerinc/cloud-services/pkg/testhelper"
 
 	redigo "github.com/gomodule/redigo/redis"
 )

pkg/cache/vins.go

@@ -3,10 +3,10 @@ package cache
 import (
 	"errors"
 
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/db/queries"
-	"fiskerinc.com/modules/logger"
-	"fiskerinc.com/modules/redis"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/db/queries"
+	"github.com/fiskerinc/cloud-services/pkg/logger"
+	"github.com/fiskerinc/cloud-services/pkg/redis"
 )
 
 // RetrieveVINs retrieves VINs from redis or from DB based on driver ID and proceeds to cache VINs

pkg/cache/vins_test.go

@@ -4,9 +4,9 @@ import (
 	"encoding/json"
 	"testing"
 
-	"fiskerinc.com/modules/cache"
-	"fiskerinc.com/modules/redis"
-	"fiskerinc.com/modules/testhelper"
+	"github.com/fiskerinc/cloud-services/pkg/cache"
+	"github.com/fiskerinc/cloud-services/pkg/redis"
+	"github.com/fiskerinc/cloud-services/pkg/testhelper"
 )
 
 type mockRedisCacheVINs struct {