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

2026-01-31 00:05:47 -05:00
parent fbb820d7b3
commit b5bec57dfa
776 changed files with 18945 additions and 2052 deletions
--- a/services/gateway/Dockerfile
+++ b/services/gateway/Dockerfile
@@ -1,27 +1,44 @@
-ARG BASE_IMAGE=cloud_base_go
-FROM ${BASE_IMAGE} as builder-go
+# syntax=docker/dockerfile:1

-WORKDIR /build/gateway_go
+# Build stage
+FROM golang:1.25-alpine AS builder

-COPY ./gateway_go/go.mod ./gateway_go/go.sum ./
-RUN go mod edit -replace fiskerinc.com/modules=../fiskerinc.com/modules \
-    && go mod download
+RUN apk add --no-cache git ca-certificates tzdata

-COPY ./gateway_go ./
-RUN go mod edit -replace fiskerinc.com/modules=../fiskerinc.com/modules \
-    && go build -tags musl
+WORKDIR /app

-FROM alpine:3.17
+# Copy go.work and module files for dependency caching
+COPY go.work ./
+COPY pkg/go.mod pkg/go.sum ./pkg/
+COPY pkg/can-go/go.mod pkg/can-go/go.sum ./pkg/can-go/
+COPY services/gateway/go.mod services/gateway/go.sum ./services/gateway/

-RUN apk add --no-cache librdkafka --repository=https://dl-cdn.alpinelinux.org/alpine/edge/community \
-  && apk add --no-cache ca-certificates
+# Download dependencies (cached layer)
+RUN --mount=type=cache,target=/go/pkg/mod \
+    go mod download -x

-COPY ./modules_go/logger/log_config .
-ENV LOG_CONFIG=log_config
+# Copy source
+COPY pkg/ ./pkg/
+COPY services/gateway/ ./services/gateway/

-COPY ./gateway_go/docs ./docs
-COPY --from=builder-go /build/gateway_go/gateway .
+# Build static binary
+WORKDIR /app/services/gateway
+RUN --mount=type=cache,target=/go/pkg/mod \
+    --mount=type=cache,target=/root/.cache/go-build \
+    CGO_ENABLED=0 GOOS=linux GOARCH=amd64 \
+    go build -ldflags="-s -w" -trimpath -o /gateway .

-EXPOSE 8077
+# Runtime stage - distroless for minimal attack surface
+FROM gcr.io/distroless/static-debian12:nonroot

-CMD ./gateway
+COPY --from=builder /gateway /gateway
+COPY --from=builder /app/services/gateway/docs /docs
+COPY --from=builder /app/pkg/logger/log_config /log_config
+COPY --from=builder /usr/share/zoneinfo /usr/share/zoneinfo
+
+ENV LOG_CONFIG=/log_config
+ENV TZ=UTC
+
+EXPOSE 8077 11011
+
+ENTRYPOINT ["/gateway"]
--- a/services/gateway/README.md
+++ b/services/gateway/README.md
@@ -0,0 +1,54 @@
+# Gateway Service
+
+WebSocket API gateway for vehicle (TRex), HMI, and mobile app connections.
+
+## What it does
+
+- Authenticates WebSocket connections via JWT
+- Routes messages to Kafka topics
+- Manages connection state in Redis
+- Serves Swagger docs
+
+## Ports
+
+| Port | Purpose |
+|------|---------|
+| 8077 | HTTP/WebSocket |
+| 11011 | Health check |
+
+## WebSocket Endpoints
+
+- `/ws/trex` - Vehicle connections
+- `/ws/hmi` - HMI connections  
+- `/ws/mobile` - Mobile app connections
+
+## Build
+
+```bash
+# Local
+go build .
+
+# Docker
+docker build -t gateway -f Dockerfile ../..
+```
+
+## Run
+
+```bash
+# Required env vars
+export KAFKA_HOSTS=localhost:9092
+export REDIS_HOST=localhost
+export JWK_URL=https://keycloak.example.com/realms/consumer/protocol/openid-connect/certs
+
+./gateway
+```
+
+## Configuration
+
+See `deploy/base/configmap-common.yaml` for all options.
+
+Key settings:
+- `KAFKA_HOSTS` - Kafka bootstrap servers
+- `REDIS_HOST/PORT` - Redis for session state
+- `JWK_URL` - JWKS endpoint for JWT validation
+- `LOG_LEVEL` - debug, info, warn, error
--- a/services/gateway/controllers/health_check.go
+++ b/services/gateway/controllers/health_check.go
@@ -1,8 +1,8 @@
 package controllers

 import (
-	"fiskerinc.com/modules/health"
-	"fiskerinc.com/modules/logger"
+	"github.com/fiskerinc/cloud-services/pkg/health"
+	"github.com/fiskerinc/cloud-services/pkg/logger"
 )

 func HealthCheck() {
--- a/services/gateway/go.mod
+++ b/services/gateway/go.mod
@@ -1,8 +1,8 @@
 module github.com/fiskerinc/cloud-services/services/gateway

-go 1.24
+go 1.25

-toolchain go1.24.3
+toolchain go1.25.6

 require (
 	github.com/fiskerinc/cloud-services/pkg v0.0.0
@@ -23,8 +23,12 @@ require (
 	github.com/moby/sys/sequential v0.5.0 // indirect
 	github.com/onsi/ginkgo v1.16.5 // indirect
 	github.com/onsi/gomega v1.25.0 // indirect
+	github.com/pierrec/lz4/v4 v4.1.22 // indirect
 	github.com/redis/go-redis/v9 v9.5.1 // indirect
 	github.com/stretchr/objx v0.5.2 // indirect
+	github.com/twmb/franz-go v1.20.6 // indirect
+	github.com/twmb/franz-go/pkg/kadm v1.17.2 // indirect
+	github.com/twmb/franz-go/pkg/kmsg v1.12.0 // indirect
 )

 require (
@@ -34,7 +38,6 @@ require (
 	github.com/DataDog/datadog-go/v5 v5.3.0 // indirect
 	github.com/DataDog/go-tuf v1.0.2-0.5.2 // indirect
 	github.com/DataDog/sketches-go v1.4.2 // indirect
-	github.com/Fisker-Inc/project-ai-can-go v1.3.1 // indirect
 	github.com/KyleBanks/depth v1.2.1 // indirect
 	github.com/Microsoft/go-winio v0.6.1 // indirect
 	github.com/ReneKroon/ttlcache/v2 v2.11.0 // indirect
@@ -69,7 +72,7 @@ require (
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/julienschmidt/httprouter v1.3.0 // indirect
-	github.com/klauspost/compress v1.17.1 // indirect
+	github.com/klauspost/compress v1.18.2 // indirect
 	github.com/leodido/go-urn v1.2.4 // indirect
 	github.com/lestrrat-go/backoff/v2 v2.0.8 // indirect
 	github.com/lestrrat-go/blackmagic v1.0.1 // indirect
@@ -107,14 +110,14 @@ require (
 	go.uber.org/atomic v1.11.0 // indirect
 	go4.org/intern v0.0.0-20230525184215-6c62f75575cb // indirect
 	go4.org/unsafe/assume-no-moving-gc v0.0.0-20231121144256-b99613f794b6 // indirect
-	golang.org/x/crypto v0.32.0 // indirect
-	golang.org/x/mod v0.20.0 // indirect
-	golang.org/x/net v0.33.0 // indirect
-	golang.org/x/sync v0.10.0 // indirect
-	golang.org/x/sys v0.29.0 // indirect
-	golang.org/x/text v0.21.0 // indirect
+	golang.org/x/crypto v0.45.0 // indirect
+	golang.org/x/mod v0.29.0 // indirect
+	golang.org/x/net v0.47.0 // indirect
+	golang.org/x/sync v0.18.0 // indirect
+	golang.org/x/sys v0.38.0 // indirect
+	golang.org/x/text v0.31.0 // indirect
 	golang.org/x/time v0.8.0 // indirect
-	golang.org/x/tools v0.24.0 // indirect
+	golang.org/x/tools v0.38.0 // indirect
 	golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	inet.af/netaddr v0.0.0-20230525184311-b8eac61e914a // indirect
--- a/services/gateway/go.sum
+++ b/services/gateway/go.sum
@@ -18,8 +18,6 @@ github.com/DataDog/gostackparse v0.7.0 h1:i7dLkXHvYzHV308hnkvVGDL3BR4FWl7IsXNPz/
 github.com/DataDog/gostackparse v0.7.0/go.mod h1:lTfqcJKqS9KnXQGnyQMCugq3u1FP6UZMfWR0aitKFMM=
 github.com/DataDog/sketches-go v1.4.2 h1:gppNudE9d19cQ98RYABOetxIhpTCl4m7CnbRZjvVA/o=
 github.com/DataDog/sketches-go v1.4.2/go.mod h1:xJIXldczJyyjnbDop7ZZcLxJdV3+7Kra7H1KMgpgkLk=
-github.com/Fisker-Inc/project-ai-can-go v1.3.1 h1:OjqeBun9kQwZA0VP61dANOtMqsdYoDjwBCnDOE4zZsE=
-github.com/Fisker-Inc/project-ai-can-go v1.3.1/go.mod h1:8YrzRtqxRfiXEmvXpcQlUvmfCGLlpn+rJE02HiGUm/I=
 github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc=
 github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE=
 github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
@@ -174,8 +172,7 @@ github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8Hm
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U=
 github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
-github.com/klauspost/compress v1.17.1 h1:NE3C767s2ak2bweCZo3+rdP4U/HoyVXLv/X9f2gPS5g=
-github.com/klauspost/compress v1.17.1/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
+github.com/klauspost/compress v1.18.2 h1:iiPHWW0YrcFgpBYhsA6D1+fqHssJscY/Tm/y2Uqnapk=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
@@ -247,6 +244,7 @@ github.com/outcaste-io/ristretto v0.2.3 h1:AK4zt/fJ76kjlYObOeNwh4T3asEuaCmp26pOv
 github.com/outcaste-io/ristretto v0.2.3/go.mod h1:W8HywhmtlopSB1jeMg3JtdIhf+DYkLAr0VN/s4+MHac=
 github.com/philhofer/fwd v1.1.2 h1:bnDivRJ1EWPjUIRXV5KfORO897HTbpFAQddBdE8t7Gw=
 github.com/philhofer/fwd v1.1.2/go.mod h1:qkPdfjR2SIEbspLqpe1tO4n5yICnr2DY7mqEx2tUTP0=
+github.com/pierrec/lz4/v4 v4.1.22 h1:cKFw6uJDK+/gfw5BcDL0JL5aBsAFdsIT18eRtLj7VIU=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
@@ -302,6 +300,9 @@ github.com/tinylib/msgp v1.1.8 h1:FCXC1xanKO4I8plpHGH2P7koL/RzZs12l/+r7vakfm0=
 github.com/tinylib/msgp v1.1.8/go.mod h1:qkpG+2ldGg4xRFmx+jfTvZPxfGFhi64BcnL9vkCm/Tw=
 github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc h1:9lRDQMhESg+zvGYmW5DyG0UqvY96Bu5QYsTLvCHdrgo=
 github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc/go.mod h1:bciPuU6GHm1iF1pBvUfxfsH0Wmnc2VbpgvbI9ZWuIRs=
+github.com/twmb/franz-go v1.20.6 h1:TpQTt4QcixJ1cHEmQGPOERvTzo99s8jAutmS7rbSD6w=
+github.com/twmb/franz-go/pkg/kadm v1.17.2 h1:g5f1sAxnTkYC6G96pV5u715HWhxd66hWaDZUAQ8xHY8=
+github.com/twmb/franz-go/pkg/kmsg v1.12.0 h1:CbatD7ers1KzDNgJqPbKOq0Bz/WLBdsTH75wgzeVaPc=
 github.com/vmihailenco/bufpool v0.1.11 h1:gOq2WmBrq0i2yW5QJ16ykccQ4wH9UyEsgLm6czKAd94=
 github.com/vmihailenco/bufpool v0.1.11/go.mod h1:AFf/MOy3l2CFTKbxwt0mp2MwnqjNEs5H/UxrkA5jxTQ=
 github.com/vmihailenco/msgpack/v5 v5.3.4/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc=
@@ -353,8 +354,7 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=
-golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
-golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
+golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
@@ -367,8 +367,7 @@ golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0=
-golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.29.0 h1:HV8lRxZC4l2cr3Zq1LvtOsi/ThTgWnUk/y64QSs8GwA=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -387,8 +386,7 @@ golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qx
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
 golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
-golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
-golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
+golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -397,8 +395,7 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
-golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -428,8 +425,7 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
-golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -442,8 +438,7 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
-golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
+golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
 golang.org/x/time v0.8.0 h1:9i3RxcPv3PZnitoVGMPDKZSq1xW1gK1Xy3ArNOGZfEg=
 golang.org/x/time v0.8.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -461,8 +456,7 @@ golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.8/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.4.0/go.mod h1:UE5sM2OK9E/d67R0ANs2xJizIymRP5gJU295PvKXxjQ=
-golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24=
-golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ=
+golang.org/x/tools v0.38.0 h1:Hx2Xv8hISq8Lm16jvBZ2VQf+RLmbd7wVUsALibYI/IQ=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -512,8 +506,6 @@ gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU=
-gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU=
 honnef.co/go/gotraceui v0.2.0 h1:dmNsfQ9Vl3GwbiVD7Z8d/osC6WtGGrasyrC2suc4ZIQ=
 honnef.co/go/gotraceui v0.2.0/go.mod h1:qHo4/W75cA3bX0QQoSvDjbJa4R8mAyyFjbWAj63XElc=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
--- a/services/gateway/handlers/static.go
+++ b/services/gateway/handlers/static.go
@@ -3,7 +3,7 @@ package handlers
 import (
 	"net/http"

-	"fiskerinc.com/modules/utils/envtool"
+	"github.com/fiskerinc/cloud-services/pkg/utils/envtool"
 )

 // DocsHandler serves API docs for the gateway
--- a/services/gateway/handlers/static_test.go
+++ b/services/gateway/handlers/static_test.go
@@ -5,11 +5,11 @@ import (
 	"os"
 	"testing"

-	"gateway/handlers"
+	"github.com/fiskerinc/cloud-services/services/gateway/handlers"

-	"fiskerinc.com/modules/httpclient/tester"
-	"fiskerinc.com/modules/testhelper"
-	"fiskerinc.com/modules/testrunner"
+	"github.com/fiskerinc/cloud-services/pkg/httpclient/tester"
+	"github.com/fiskerinc/cloud-services/pkg/testhelper"
+	"github.com/fiskerinc/cloud-services/pkg/testrunner"
 )

 func TestDocsHandler(t *testing.T) {
--- a/services/gateway/handlers/websocket.go
+++ b/services/gateway/handlers/websocket.go
@@ -4,11 +4,11 @@ import (
 	"context"
 	"net/http"

-	"gateway/services"
+	"github.com/fiskerinc/cloud-services/services/gateway/services"

-	"gateway/websocket"
+	"github.com/fiskerinc/cloud-services/services/gateway/websocket"

-	"fiskerinc.com/modules/logger"
+	"github.com/fiskerinc/cloud-services/pkg/logger"
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer"
 )

--- a/services/gateway/main.go
+++ b/services/gateway/main.go
@@ -3,14 +3,14 @@ package main
 import (
 	"context"

-	"gateway/controllers"
-	"gateway/server"
-	"gateway/services"
-	"gateway/sloppy"
+	"github.com/fiskerinc/cloud-services/services/gateway/controllers"
+	"github.com/fiskerinc/cloud-services/services/gateway/server"
+	"github.com/fiskerinc/cloud-services/services/gateway/services"
+	"github.com/fiskerinc/cloud-services/services/gateway/sloppy"

-	"fiskerinc.com/modules/logger"
-	"fiskerinc.com/modules/tracer"
-	"fiskerinc.com/modules/utils/app"
+	"github.com/fiskerinc/cloud-services/pkg/logger"
+	"github.com/fiskerinc/cloud-services/pkg/tracer"
+	"github.com/fiskerinc/cloud-services/pkg/utils/app"
 )

 func init() {
--- a/services/gateway/server/server_http.go
+++ b/services/gateway/server/server_http.go
@@ -4,10 +4,10 @@ import (
 	"context"
 	"net/http"

-	"gateway/handlers"
+	"github.com/fiskerinc/cloud-services/services/gateway/handlers"

-	"fiskerinc.com/modules/httphandlers"
-	"fiskerinc.com/modules/logger"
+	"github.com/fiskerinc/cloud-services/pkg/httphandlers"
+	"github.com/fiskerinc/cloud-services/pkg/logger"
 	httptrace "gopkg.in/DataDog/dd-trace-go.v1/contrib/net/http"
 )

--- a/services/gateway/server/server_redis.go
+++ b/services/gateway/server/server_redis.go
@@ -6,9 +6,9 @@ import (
 	"io"
 	"time"

-	"gateway/services"
+	"github.com/fiskerinc/cloud-services/services/gateway/services"

-	"fiskerinc.com/modules/logger"
+	"github.com/fiskerinc/cloud-services/pkg/logger"
 )

 func logRedisErr(err error) {
--- a/services/gateway/services/connections.go
+++ b/services/gateway/services/connections.go
@@ -3,10 +3,10 @@ package services
 import (
 	"sync"

-	"gateway/websocket"
+	"github.com/fiskerinc/cloud-services/services/gateway/websocket"

-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/logger"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/logger"
 )

 var connections *websocket.Connections
--- a/services/gateway/services/kafka.go
+++ b/services/gateway/services/kafka.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"sync"

-	"fiskerinc.com/modules/kafka"
-	"fiskerinc.com/modules/logger"
+	"github.com/fiskerinc/cloud-services/pkg/kafka"
+	"github.com/fiskerinc/cloud-services/pkg/logger"
 )

 var producer kafka.ProducerInterface
--- a/services/gateway/services/redis.go
+++ b/services/gateway/services/redis.go
@@ -3,8 +3,8 @@ package services
 import (
 	"sync"

-	"fiskerinc.com/modules/logger"
-	"fiskerinc.com/modules/redis"
+	"github.com/fiskerinc/cloud-services/pkg/logger"
+	"github.com/fiskerinc/cloud-services/pkg/redis"
 	"github.com/pkg/errors"
 )

--- a/services/gateway/sloppy/db.go
+++ b/services/gateway/sloppy/db.go
@@ -3,9 +3,9 @@ package sloppy
 import (
 	"sync"

-	"fiskerinc.com/modules/db"
-	"fiskerinc.com/modules/db/queries"
-	"fiskerinc.com/modules/logger"
+	"github.com/fiskerinc/cloud-services/pkg/db"
+	"github.com/fiskerinc/cloud-services/pkg/db/queries"
+	"github.com/fiskerinc/cloud-services/pkg/logger"
 )

 var (
--- a/services/gateway/sloppy/vinBlocker.go
+++ b/services/gateway/sloppy/vinBlocker.go
@@ -5,8 +5,8 @@ import (
 	"sync"
 	"time"

-	"fiskerinc.com/modules/logger"
-	"fiskerinc.com/modules/utils/whereami"
+	"github.com/fiskerinc/cloud-services/pkg/logger"
+	"github.com/fiskerinc/cloud-services/pkg/utils/whereami"
 )

 var vinblocker *VINBlocker
--- a/services/gateway/websocket/auth.go
+++ b/services/gateway/websocket/auth.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"net/http"

-	"fiskerinc.com/modules/httpclient"
-	"fiskerinc.com/modules/jwt"
-	"fiskerinc.com/modules/utils/envtool"
+	"github.com/fiskerinc/cloud-services/pkg/httpclient"
+	"github.com/fiskerinc/cloud-services/pkg/jwt"
+	"github.com/fiskerinc/cloud-services/pkg/utils/envtool"
 	"github.com/pkg/errors"
 )

--- a/services/gateway/websocket/auth_test.go
+++ b/services/gateway/websocket/auth_test.go
@@ -4,9 +4,9 @@ import (
 	"net/http"
 	"testing"

-	"fiskerinc.com/modules/httpclient"
-	"fiskerinc.com/modules/httpclient/mock"
-	"fiskerinc.com/modules/testhelper"
+	"github.com/fiskerinc/cloud-services/pkg/httpclient"
+	"github.com/fiskerinc/cloud-services/pkg/httpclient/mock"
+	"github.com/fiskerinc/cloud-services/pkg/testhelper"
 )

 func TestVerifyTokenAuthorized(t *testing.T) {
--- a/services/gateway/websocket/connections.go
+++ b/services/gateway/websocket/connections.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"sync"

-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/logger"
-	"fiskerinc.com/modules/scheduler"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/logger"
+	"github.com/fiskerinc/cloud-services/pkg/scheduler"
 	"github.com/pkg/errors"
 	"github.com/robfig/cron"
 )
--- a/services/gateway/websocket/connections_test.go
+++ b/services/gateway/websocket/connections_test.go
@@ -7,9 +7,9 @@ import (
 	"testing"
 	"time"

-	kafka "fiskerinc.com/modules/kafka/mock"
-	"fiskerinc.com/modules/logger"
-	"fiskerinc.com/modules/redis"
+	kafka "github.com/fiskerinc/cloud-services/pkg/kafka/mock"
+	"github.com/fiskerinc/cloud-services/pkg/logger"
+	"github.com/fiskerinc/cloud-services/pkg/redis"
 )

 func AddRemoveRedisListeners(add bool, id string, pubsub *redis.PubSub, queueRef *redis.Queues) {
--- a/services/gateway/websocket/helpers_test.go
+++ b/services/gateway/websocket/helpers_test.go
@@ -4,9 +4,9 @@ import (
 	"net/http"
 	"testing"

-	"gateway/websocket"
+	"github.com/fiskerinc/cloud-services/services/gateway/websocket"

-	"fiskerinc.com/modules/testhelper"
+	"github.com/fiskerinc/cloud-services/pkg/testhelper"
 )

 func TestParseDeviceAndVersionFromRequest(t *testing.T) {
--- a/services/gateway/websocket/session.go
+++ b/services/gateway/websocket/session.go
@@ -5,21 +5,21 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"gateway/sloppy"	
+	"github.com/fiskerinc/cloud-services/services/gateway/sloppy"	
 	"io"
 	"net"
 	"net/http"
 	"strings"
 	"time"

-	"fiskerinc.com/modules/grpc/kafka_grpc"
+	"github.com/fiskerinc/cloud-services/pkg/grpc/kafka_grpc"

-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/kafka"
-	"fiskerinc.com/modules/logger"
-	"fiskerinc.com/modules/utils"
-	"fiskerinc.com/modules/utils/envtool"
-	"fiskerinc.com/modules/validator"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/kafka"
+	"github.com/fiskerinc/cloud-services/pkg/logger"
+	"github.com/fiskerinc/cloud-services/pkg/utils"
+	"github.com/fiskerinc/cloud-services/pkg/utils/envtool"
+	"github.com/fiskerinc/cloud-services/pkg/validator"
 	"google.golang.org/protobuf/proto"
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer"

--- a/services/gateway/websocket/session_hmi.go
+++ b/services/gateway/websocket/session_hmi.go
@@ -7,12 +7,12 @@ import (
 	"net/http"
 	"time"

-	"fiskerinc.com/modules/grpc/kafka_grpc"
+	"github.com/fiskerinc/cloud-services/pkg/grpc/kafka_grpc"

-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/kafka"
-	"fiskerinc.com/modules/logger"
-	"fiskerinc.com/modules/security"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/kafka"
+	"github.com/fiskerinc/cloud-services/pkg/logger"
+	"github.com/fiskerinc/cloud-services/pkg/security"
 	"github.com/gobwas/ws"
 	"github.com/pkg/errors"
 	"google.golang.org/protobuf/proto"
--- a/services/gateway/websocket/session_hmi_test.go
+++ b/services/gateway/websocket/session_hmi_test.go
@@ -9,9 +9,9 @@ import (
 	"net/http/httptest"
 	"testing"

-	"fiskerinc.com/modules/common"
-	kafka "fiskerinc.com/modules/kafka/mock"
-	"fiskerinc.com/modules/testhelper"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	kafka "github.com/fiskerinc/cloud-services/pkg/kafka/mock"
+	"github.com/fiskerinc/cloud-services/pkg/testhelper"

 	"github.com/gobwas/ws"
 	"github.com/gobwas/ws/wsutil"
--- a/services/gateway/websocket/session_mobile.go
+++ b/services/gateway/websocket/session_mobile.go
@@ -6,11 +6,11 @@ import (
 	"net/http"
 	"time"

-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/jwt"
-	"fiskerinc.com/modules/kafka"
-	"fiskerinc.com/modules/logger"
-	"fiskerinc.com/modules/validator"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/jwt"
+	"github.com/fiskerinc/cloud-services/pkg/kafka"
+	"github.com/fiskerinc/cloud-services/pkg/logger"
+	"github.com/fiskerinc/cloud-services/pkg/validator"
 	"google.golang.org/protobuf/proto"

 	"github.com/gobwas/ws"
--- a/services/gateway/websocket/session_mobile_test.go
+++ b/services/gateway/websocket/session_mobile_test.go
@@ -8,8 +8,8 @@ import (
 	"net/http/httptest"
 	"testing"

-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/testhelper"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/testhelper"

 	"github.com/gobwas/ws"
 	"github.com/gobwas/ws/wsutil"
--- a/services/gateway/websocket/session_test.go
+++ b/services/gateway/websocket/session_test.go
@@ -11,11 +11,11 @@ import (
 	"testing"
 	"time"

-	m "fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/httpclient"
-	"fiskerinc.com/modules/httpclient/mock"
-	kafka "fiskerinc.com/modules/kafka/mock"
-	"fiskerinc.com/modules/testhelper"
+	m "github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/httpclient"
+	"github.com/fiskerinc/cloud-services/pkg/httpclient/mock"
+	kafka "github.com/fiskerinc/cloud-services/pkg/kafka/mock"
+	"github.com/fiskerinc/cloud-services/pkg/testhelper"

 	"github.com/gobwas/httphead"
 	"github.com/gobwas/ws"
--- a/services/gateway/websocket/session_trex.go
+++ b/services/gateway/websocket/session_trex.go
@@ -6,13 +6,13 @@ import (
 	"net/http"
 	"time"

-	"fiskerinc.com/modules/dbc/models"
+	"github.com/fiskerinc/cloud-services/pkg/dbc/models"
 	"google.golang.org/protobuf/proto"

-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/grpc/kafka_grpc"
-	"fiskerinc.com/modules/kafka"
-	"fiskerinc.com/modules/logger"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/grpc/kafka_grpc"
+	"github.com/fiskerinc/cloud-services/pkg/kafka"
+	"github.com/fiskerinc/cloud-services/pkg/logger"

 	"github.com/gobwas/ws"
 	"github.com/gobwas/ws/wsflate"
--- a/services/gateway/websocket/session_trex_test.go
+++ b/services/gateway/websocket/session_trex_test.go
@@ -9,10 +9,10 @@ import (
 	"net/http/httptest"
 	"testing"

-	"fiskerinc.com/modules/common"
-	"fiskerinc.com/modules/grpc/kafka_grpc"
-	kafka "fiskerinc.com/modules/kafka/mock"
-	"fiskerinc.com/modules/testhelper"
+	"github.com/fiskerinc/cloud-services/pkg/common"
+	"github.com/fiskerinc/cloud-services/pkg/grpc/kafka_grpc"
+	kafka "github.com/fiskerinc/cloud-services/pkg/kafka/mock"
+	"github.com/fiskerinc/cloud-services/pkg/testhelper"

 	"github.com/gobwas/ws"
 	"github.com/gobwas/ws/wsutil"