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

pkg/common/actionlogger/actionlogger.go

@@ -3,7 +3,7 @@ package actionlogger
 import (
 	"time"
 
-	"fiskerinc.com/modules/common/dbbasemodel"
+	"github.com/fiskerinc/cloud-services/pkg/common/dbbasemodel"
 	"github.com/google/uuid"
 )
 

pkg/common/apitoken.go

@@ -3,7 +3,7 @@ package common
 import (
 	"fmt"
 	"time"
-	"fiskerinc.com/modules/common/dbbasemodel"
+	"github.com/fiskerinc/cloud-services/pkg/common/dbbasemodel"
 )
 
 type APIToken struct {

pkg/common/authproviders/authproviders.go

@@ -1,6 +1,6 @@
 package authproviders
 
-import "fiskerinc.com/modules/utils/envtool"
+import "github.com/fiskerinc/cloud-services/pkg/utils/envtool"
 
 const (
 	Default      = "Default" // This is for any provider

pkg/common/binary_hex._test.go

@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"testing"
 
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/testhelper"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/testhelper"
 )
 
 type testHexBinary struct {

pkg/common/can.go

@@ -3,7 +3,7 @@ package common
 import (
 	"time"
 
-	"fiskerinc.com/modules/grpc/kafka_grpc"
+	"github.com/fiskerinc/cloud-services/pkg/grpc/kafka_grpc"
 )
 
 // CANFrame provides struct for can bus messages

pkg/common/car.go

@@ -3,7 +3,7 @@ package common
 import (
 	"fmt"
 
-	"fiskerinc.com/modules/common/dbbasemodel"
+	"github.com/fiskerinc/cloud-services/pkg/common/dbbasemodel"
 )
 
 const (

pkg/common/car_data.go

@@ -3,7 +3,7 @@ package common
 import (
 	"encoding/json"
 
-	"fiskerinc.com/modules/grpc/kafka_grpc"
+	"github.com/fiskerinc/cloud-services/pkg/grpc/kafka_grpc"
 	"github.com/pkg/errors"
 )
 

pkg/common/car_ecu.go

@@ -5,7 +5,7 @@ import (
 	"encoding/hex"
 	"fmt"
 
-	"fiskerinc.com/modules/common/dbbasemodel"
+	"github.com/fiskerinc/cloud-services/pkg/common/dbbasemodel"
 )
 
 type CarECU struct {

pkg/common/car_setting.go

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

pkg/common/car_update.go

@@ -2,7 +2,7 @@ package common
 
 import (
 	"fmt"
-	"fiskerinc.com/modules/common/dbbasemodel"
+	"github.com/fiskerinc/cloud-services/pkg/common/dbbasemodel"
 )
 
 // CarUpdate schema

pkg/common/car_update_progress_test.go

@@ -3,8 +3,8 @@ package common_test
 import (
 	"testing"
 
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/testhelper"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/testhelper"
 )
 
 func TestCarUpdateProgressCombine(t *testing.T) {

pkg/common/car_update_status.go

@@ -1,7 +1,7 @@
 package common
 
 import (
-	"fiskerinc.com/modules/common/dbbasemodel"
+	"github.com/fiskerinc/cloud-services/pkg/common/dbbasemodel"
 )
 
 // CarUpdateStatus database model for logging history of car updates

pkg/common/certificate.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"time"
 
-	"fiskerinc.com/modules/common/dbbasemodel"
+	"github.com/fiskerinc/cloud-services/pkg/common/dbbasemodel"
 )
 
 // CertificateRequest schema

pkg/common/certificate_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"fiskerinc.com/modules/common"
+	"github.com/fiskerinc/cloud-services/pkg/common"
 	"github.com/stretchr/testify/assert"
 )
 

pkg/common/configuration.go

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

pkg/common/consumer_payload.go

@@ -5,8 +5,8 @@ import (
 	"log"
 	"time"
 
-	"fiskerinc.com/modules/grpc/kafka_grpc"
-	"fiskerinc.com/modules/logger"
+	"github.com/fiskerinc/cloud-services/pkg/grpc/kafka_grpc"
+	"github.com/fiskerinc/cloud-services/pkg/logger"
 	"github.com/google/uuid"
 )
 

pkg/common/consumer_payload_input.go

@@ -3,8 +3,8 @@ package common
 import (
 	"encoding/json"
 
-	"fiskerinc.com/modules/grpc/kafka_grpc"
-	"fiskerinc.com/modules/logger"
+	"github.com/fiskerinc/cloud-services/pkg/grpc/kafka_grpc"
+	"github.com/fiskerinc/cloud-services/pkg/logger"
 )
 
 func DepotRouteTRexToGRPC(input MessageRawJSON) *kafka_grpc.GRPC_DepotPayload {

pkg/common/consumer_payload_test.go

@@ -5,8 +5,8 @@ import (
 	"testing"
 	"time"
 
-	"fiskerinc.com/modules/grpc/kafka_grpc"
-	"fiskerinc.com/modules/utils/elptr"
+	"github.com/fiskerinc/cloud-services/pkg/grpc/kafka_grpc"
+	"github.com/fiskerinc/cloud-services/pkg/utils/elptr"
 )
 
 func TestDepotRouteHMIPayload(t *testing.T) {

pkg/common/dbc_desc.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	can "github.com/Fisker-Inc/project-ai-can-go/pkg/descriptor"
+	can "github.com/fiskerinc/cloud-services/pkg/can-go/pkg/descriptor"
 )
 
 // SignalDesc is copied from project-ai-can-go and modified for local needs.

pkg/common/dbc_desc_test.go

@@ -3,8 +3,8 @@ package common_test
 import (
 	"testing"
 
-	"fiskerinc.com/modules/common"
-	"github.com/Fisker-Inc/project-ai-can-go/pkg/descriptor"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/can-go/pkg/descriptor"
 	"github.com/stretchr/testify/assert"
 )
 

pkg/common/driver.go

@@ -3,7 +3,7 @@ package common
 import (
 	"fmt"
 
-	"fiskerinc.com/modules/common/dbbasemodel"
+	"github.com/fiskerinc/cloud-services/pkg/common/dbbasemodel"
 )
 
 // DriverAccount model

pkg/common/ecc_keys.go

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

pkg/common/ecu_dtc.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"fiskerinc.com/modules/common/dbbasemodel"
+	"github.com/fiskerinc/cloud-services/pkg/common/dbbasemodel"
 )
 
 type AddDTCRequest struct {

pkg/common/ecu_list.go

@@ -3,8 +3,8 @@ package common
 import (
 	"strings"
 
-	"fiskerinc.com/modules/utils/envtool"
-	"fiskerinc.com/modules/utils/whereami"
+	"github.com/fiskerinc/cloud-services/pkg/utils/envtool"
+	"github.com/fiskerinc/cloud-services/pkg/utils/whereami"
 )
 
 var EcuMap = map[string]string{

pkg/common/file_key.go

@@ -3,7 +3,7 @@ package common
 import (
 	b64 "encoding/base64"
 
-	"fiskerinc.com/modules/common/dbbasemodel"
+	"github.com/fiskerinc/cloud-services/pkg/common/dbbasemodel"
 )
 
 type FileKey struct {

pkg/common/hmi_rx_test.go

@@ -4,10 +4,10 @@ import (
 	"testing"
 	"time"
 
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/common/dbbasemodel"
-	"fiskerinc.com/modules/common/handlers"
-	"fiskerinc.com/modules/testhelper"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/common/dbbasemodel"
+	"github.com/fiskerinc/cloud-services/pkg/common/handlers"
+	"github.com/fiskerinc/cloud-services/pkg/testhelper"
 )
 
 func TestHMIRXMessages(t *testing.T) {

pkg/common/hmi_tx_test.go

@@ -4,9 +4,9 @@ import (
 	"testing"
 	"time"
 
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/common/dbbasemodel"
-	"fiskerinc.com/modules/testhelper"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/common/dbbasemodel"
+	"github.com/fiskerinc/cloud-services/pkg/testhelper"
 )
 
 func TestHMITXMessages(t *testing.T) {

pkg/common/manifestfingerprintparams/manifestfingerprintparams.go

@@ -4,7 +4,7 @@ import (
 	"sync"
 	"time"
 
-	"fiskerinc.com/modules/utils/envtool"
+	"github.com/fiskerinc/cloud-services/pkg/utils/envtool"
 )
 
 var fpParams FingerprintParamer

pkg/common/mobile_rx_test.go

@@ -4,9 +4,9 @@ import (
 	"testing"
 	"time"
 
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/common/dbbasemodel"
-	"fiskerinc.com/modules/testhelper"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/common/dbbasemodel"
+	"github.com/fiskerinc/cloud-services/pkg/testhelper"
 	"github.com/google/uuid"
 )
 

pkg/common/mobile_tx_test.go

@@ -4,11 +4,11 @@ import (
 	"testing"
 	"time"
 
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/common/dbbasemodel"
-	"fiskerinc.com/modules/testhelper"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/common/dbbasemodel"
+	"github.com/fiskerinc/cloud-services/pkg/testhelper"
 	"github.com/google/uuid"
-	"fiskerinc.com/modules/utils/elptr"
+	"github.com/fiskerinc/cloud-services/pkg/utils/elptr"
 )
 
 func TestMobileTXMessages(t *testing.T) {

pkg/common/order_updated.go

@@ -5,7 +5,7 @@ import (
 	"encoding/xml"
 	"time"
 
-	"fiskerinc.com/modules/grpc/kafka_grpc"
+	"github.com/fiskerinc/cloud-services/pkg/grpc/kafka_grpc"
 )
 
 type OrderUpdated struct {

pkg/common/product.go

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

pkg/common/rate_plan_mobile.go

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

pkg/common/signed_image.go

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

pkg/common/subscription.go

@@ -3,7 +3,7 @@ package common
 import (
 	"time"
 
-	"fiskerinc.com/modules/common/dbbasemodel"
+	"github.com/fiskerinc/cloud-services/pkg/common/dbbasemodel"
 	"github.com/google/uuid"
 )
 

pkg/common/subscription_configuration.go

@@ -3,7 +3,7 @@ package common
 import (
 	"fmt"
 
-	"fiskerinc.com/modules/common/dbbasemodel"
+	"github.com/fiskerinc/cloud-services/pkg/common/dbbasemodel"
 	"github.com/google/uuid"
 )
 

pkg/common/subscription_feature.go

@@ -3,7 +3,7 @@ package common
 import (
 	"fmt"
 
-	"fiskerinc.com/modules/common/dbbasemodel"
+	"github.com/fiskerinc/cloud-services/pkg/common/dbbasemodel"
 	"github.com/google/uuid"
 )
 

pkg/common/subscription_package.go

@@ -3,7 +3,7 @@ package common
 import (
 	"fmt"
 
-	"fiskerinc.com/modules/common/dbbasemodel"
+	"github.com/fiskerinc/cloud-services/pkg/common/dbbasemodel"
 	"github.com/google/uuid"
 )
 

pkg/common/subscription_type.go

@@ -3,7 +3,7 @@ package common
 import (
 	"time"
 
-	"fiskerinc.com/modules/common/dbbasemodel"
+	"github.com/fiskerinc/cloud-services/pkg/common/dbbasemodel"
 	"github.com/google/uuid"
 )
 

pkg/common/supplier_account.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 	"time"
 
-	"fiskerinc.com/modules/common/dbbasemodel"
+	"github.com/fiskerinc/cloud-services/pkg/common/dbbasemodel"
 )
 
 type SupplierAccount struct {

pkg/common/supplier_account_test.go

@@ -4,9 +4,9 @@ import (
 	"testing"
 	"time"
 
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/common/dbbasemodel"
-	"fiskerinc.com/modules/testhelper"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/common/dbbasemodel"
+	"github.com/fiskerinc/cloud-services/pkg/testhelper"
 )
 
 func TestSupplierAccount(t *testing.T) {

pkg/common/supplier_organizations.go

@@ -3,7 +3,7 @@ package common
 import (
 	"fmt"
 
-	"fiskerinc.com/modules/common/dbbasemodel"
+	"github.com/fiskerinc/cloud-services/pkg/common/dbbasemodel"
 )
 
 type SupplierOrganization struct {

pkg/common/supplier_signing_certs.go

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

pkg/common/swversion_rxswin.go

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

pkg/common/sym_keys.go

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

pkg/common/tests/trex_config_test.go

@@ -3,8 +3,8 @@ package tests
 import (
 	"testing"
 
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/validator"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/validator"
 )
 
 func TestCANBusValidator(t *testing.T) {

pkg/common/trex_config.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"strings"
 
-	"fiskerinc.com/modules/logger"
+	"github.com/fiskerinc/cloud-services/pkg/logger"
 	"github.com/go-playground/validator/v10"
 	"github.com/pkg/errors"
 	"go.mongodb.org/mongo-driver/bson"

pkg/common/trex_config_test.go

@@ -3,7 +3,7 @@ package common
 import (
 	"testing"
 	"reflect"
-	"fiskerinc.com/modules/logger"
+	"github.com/fiskerinc/cloud-services/pkg/logger"
 )
 
 func TestStringToTrexLogLevel(t *testing.T){

pkg/common/trex_error.go

@@ -3,7 +3,7 @@ package common
 import (
 	"encoding/json"
 
-	"fiskerinc.com/modules/grpc/kafka_grpc"
+	"github.com/fiskerinc/cloud-services/pkg/grpc/kafka_grpc"
 	"github.com/pkg/errors"
 )
 

pkg/common/trex_log.go

@@ -3,7 +3,7 @@ package common
 import (
 	"encoding/json"
 
-	"fiskerinc.com/modules/grpc/kafka_grpc"
+	"github.com/fiskerinc/cloud-services/pkg/grpc/kafka_grpc"
 	"github.com/pkg/errors"
 )
 

pkg/common/trex_rx_test.go

@@ -3,10 +3,10 @@ package common_test
 import (
 	"testing"
 
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/common/handlers"
-	"fiskerinc.com/modules/testhelper"
-	"fiskerinc.com/modules/utils/elptr"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/common/handlers"
+	"github.com/fiskerinc/cloud-services/pkg/testhelper"
+	"github.com/fiskerinc/cloud-services/pkg/utils/elptr"
 )
 
 func TestTRexRXMessages(t *testing.T) {

pkg/common/trex_setting.go

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

pkg/common/trex_tx_test.go

@@ -3,9 +3,9 @@ package common_test
 import (
 	"testing"
 
-	"fiskerinc.com/modules/common"
-	s "fiskerinc.com/modules/common/carupdatestatus"
-	"fiskerinc.com/modules/testhelper"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	s "github.com/fiskerinc/cloud-services/pkg/common/carupdatestatus"
+	"github.com/fiskerinc/cloud-services/pkg/testhelper"
 )
 
 func TestTRexTXMessages(t *testing.T) {

pkg/common/update_manifest_versions.go

@@ -3,7 +3,7 @@ package common
 import (
 	"fmt"
 
-	"fiskerinc.com/modules/common/dbbasemodel"
+	"github.com/fiskerinc/cloud-services/pkg/common/dbbasemodel"
 )
 
 type SUMSVersion struct {

pkg/common/updatemanifest.go

@@ -9,12 +9,12 @@ import (
 	"strings"
 	"time"
 
-	v "fiskerinc.com/modules/utils/vod"
-	"fiskerinc.com/modules/vindecoder"
-	"fiskerinc.com/modules/vod_decoder"
+	v "github.com/fiskerinc/cloud-services/pkg/utils/vod"
+	"github.com/fiskerinc/cloud-services/pkg/vindecoder"
+	"github.com/fiskerinc/cloud-services/pkg/vod_decoder"
 
-	"fiskerinc.com/modules/common/dbbasemodel"
-	"fiskerinc.com/modules/utils/envtool"
+	"github.com/fiskerinc/cloud-services/pkg/common/dbbasemodel"
+	"github.com/fiskerinc/cloud-services/pkg/utils/envtool"
 	"github.com/albenik/bcd"
 	"github.com/jinzhu/copier"
 	"github.com/pkg/errors"

pkg/common/updatemanifest_ecu.go

@@ -7,8 +7,8 @@ import (
 	"strconv"
 
 	"github.com/pkg/errors"
-	"fiskerinc.com/modules/common/dbbasemodel"
-	"fiskerinc.com/modules/vindecoder"
+	"github.com/fiskerinc/cloud-services/pkg/common/dbbasemodel"
+	"github.com/fiskerinc/cloud-services/pkg/vindecoder"
 )
 
 // Any changes need to be made to modules_go/db/queries/updatemanifests.go ECURollback() on getRollbacksOld

pkg/common/updatemanifest_ecu_test.go

@@ -3,7 +3,7 @@ package common
 import (
 	"testing"
 
-	"fiskerinc.com/modules/utils/elptr"
+	"github.com/fiskerinc/cloud-services/pkg/utils/elptr"
 )
 
 func TestRemoveParsedS19HexFiles(t *testing.T) {

pkg/common/updatemanifest_file.go

@@ -1,7 +1,7 @@
 package common
 
 import (
-	"fiskerinc.com/modules/common/dbbasemodel"
+	"github.com/fiskerinc/cloud-services/pkg/common/dbbasemodel"
 )
 
 type ManifestFileType string

pkg/common/updatemanifest_test.go

@@ -8,11 +8,11 @@ import (
 	"testing"
 	"time"
 
-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/common/dbbasemodel"
-	th "fiskerinc.com/modules/testhelper"
-	v "fiskerinc.com/modules/utils/vod"
-	"fiskerinc.com/modules/utils/elptr"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/common/dbbasemodel"
+	th "github.com/fiskerinc/cloud-services/pkg/testhelper"
+	v "github.com/fiskerinc/cloud-services/pkg/utils/vod"
+	"github.com/fiskerinc/cloud-services/pkg/utils/elptr"
 )
 
 func TestUpdatePackageManifest(t *testing.T) {