Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

EX-3119-cio-disconn-event #441

Open
wants to merge 13 commits into
base: main
Choose a base branch
from
+233 −92
Open

EX-3119-cio-disconn-event #441

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
43f1781
cio event for software disconnection
Allyson-English Jan 30, 2025
38201bd
lint
Allyson-English Jan 30, 2025
2942f71
lint
Allyson-English Jan 30, 2025
8176d29
err
Allyson-English Jan 30, 2025
71978d6
secret
Allyson-English Jan 30, 2025
abb25d8
vehicle id err
Allyson-English Jan 30, 2025
4f76aeb
Add an underscore to the secret path
elffjs Feb 3, 2025
e893c85
add synth device addr and manuf tid
Allyson-English Feb 3, 2025
89b39a2
Merge branch 'main' into EX-3119-cio-disconn-event
Allyson-English Feb 3, 2025
4f158c6
checksum addrs
Allyson-English Feb 3, 2025
7b48d12
track only; update addr
Allyson-English Feb 4, 2025
86a2742
check if vehicle minted and owner exists
Allyson-English Feb 4, 2025
6d99ef7
Merge branch 'main' into EX-3119-cio-disconn-event
Allyson-English Feb 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions charts/devices-api/templates/secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,9 @@ spec:
- remoteRef:
key: {{ .Release.Namespace }}/rewards/clickhouse/pass
secretKey: CLICKHOUSE_PASSWORD
- remoteRef:
Allyson-English marked this conversation as resolved.
Show resolved Hide resolved
key: {{ .Release.Namespace }}/devices/cio/api_key
secretKey: CUSTOMER_IO_API_KEY
secretStoreRef:
kind: ClusterSecretStore
name: aws-secretsmanager-secret-store
Expand Down
1 change: 1 addition & 0 deletions charts/devices-api/values-prod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ env:
VEHICLE_DECODING_GRPC_ADDR: vehicle-signal-decoding-prod:8086
DEVICE_DEFINITIONS_GET_BY_KSUID_ENDPOINT: https://device-definitions-api.dimo.zone/device-definitions/
TESLA_REQUIRED_SCOPES: vehicle_device_data,vehicle_location
ACCOUNTS_API_GRPC_ADDR: accounts-api-prod:8086
ingress:
enabled: true
className: nginx
Expand Down
1 change: 1 addition & 0 deletions charts/devices-api/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ env:
CLICKHOUSE_DATABASE: dimo
DEVICE_DEFINITIONS_GET_BY_KSUID_ENDPOINT: https://device-definitions-api.dev.dimo.zone/device-definitions/
TESLA_REQUIRED_SCOPES: vehicle_device_data,vehicle_location
ACCOUNTS_API_GRPC_ADDR: accounts-api-dev:8086
service:
type: ClusterIP
ports:
Expand Down
19 changes: 18 additions & 1 deletion cmd/devices-api/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,15 @@ import (
"time"

"github.com/google/subcommands"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"

pb_accounts "github.com/DIMO-Network/accounts-api/pkg/grpc"
_ "github.com/DIMO-Network/devices-api/docs"
"github.com/DIMO-Network/devices-api/internal/config"
"github.com/DIMO-Network/devices-api/internal/kafka"
"github.com/DIMO-Network/devices-api/internal/services"
"github.com/DIMO-Network/devices-api/internal/services/cio"
"github.com/DIMO-Network/shared"
"github.com/DIMO-Network/shared/db"
"github.com/IBM/sarama"
Expand Down Expand Up @@ -226,7 +230,20 @@ func startTaskStatusConsumer(logger zerolog.Logger, settings *config.Settings, p

ddSvc := services.NewDeviceDefinitionService(pdb.DBS, &logger, settings)

taskStatusService := services.NewTaskStatusListener(pdb.DBS, &logger, ddSvc, kp, settings)
accountsConn, err := grpc.NewClient(settings.AccountsAPIGRPCAddr, grpc.WithTransportCredentials(insecure.NewCredentials()))
if err != nil {
logger.Fatal().Err(err).Msg("Failed to create accounts API client.")
}
defer accountsConn.Close()

acctClient := pb_accounts.NewAccountsClient(accountsConn)

cioSvc, err := cio.New(settings.CustomerIOAPIKey, acctClient, &logger)
if err != nil {
logger.Fatal().Err(err).Msg("failed to create customer io service")
}

taskStatusService := services.NewTaskStatusListener(pdb.DBS, &logger, ddSvc, kp, cioSvc, settings)
consumer.Start(context.Background(), taskStatusService.ProcessTaskUpdates)

logger.Info().Msg("Task status consumer started")
Expand Down
53 changes: 29 additions & 24 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module github.com/DIMO-Network/devices-api

go 1.22.8
go 1.23

toolchain go1.23.2
toolchain go1.23.5

require (
github.com/DIMO-Network/device-data-api v0.9.10
Expand All @@ -23,7 +23,7 @@ require (
github.com/ericlagergren/decimal v0.0.0-20240411145413-00de7ca16731 // Do not touch.
github.com/friendsofgo/errors v0.9.2
github.com/go-ozzo/ozzo-validation/v4 v4.3.0
github.com/goccy/go-json v0.10.2
github.com/goccy/go-json v0.10.4
github.com/gofiber/fiber/v2 v2.52.5
github.com/golang-jwt/jwt/v5 v5.2.1
github.com/google/subcommands v1.2.0
Expand All @@ -35,24 +35,28 @@ require (
github.com/nats-io/nats-server/v2 v2.10.18
github.com/nats-io/nats.go v1.36.0
github.com/pkg/errors v0.9.1
github.com/pressly/goose/v3 v3.22.1
github.com/prometheus/client_golang v1.20.1
github.com/pressly/goose/v3 v3.23.1
github.com/prometheus/client_golang v1.20.5
github.com/rs/zerolog v1.33.0
github.com/segmentio/ksuid v1.0.4
github.com/stretchr/testify v1.9.0
github.com/swaggo/swag v1.16.3
github.com/stretchr/testify v1.10.0
github.com/swaggo/swag v1.16.4
github.com/testcontainers/testcontainers-go v0.33.0
github.com/tidwall/gjson v1.17.3
github.com/volatiletech/null/v8 v8.1.2
github.com/volatiletech/sqlboiler/v4 v4.16.2
github.com/volatiletech/strmangle v0.0.6
github.com/volatiletech/sqlboiler/v4 v4.17.1
github.com/volatiletech/strmangle v0.0.8
go.uber.org/automaxprocs v1.5.3
go.uber.org/mock v0.4.0
golang.org/x/mod v0.21.0
golang.org/x/oauth2 v0.23.0
)

require github.com/DIMO-Network/vehicle-signal-decoding v0.10.17
require (
github.com/DIMO-Network/accounts-api v0.2.8
github.com/DIMO-Network/vehicle-signal-decoding v0.10.17
github.com/customerio/cdp-analytics-go v0.0.0-20241122010508-c8b722f2b82c
)

require (
dario.cat/mergo v1.0.1 // indirect
Expand All @@ -62,20 +66,20 @@ require (
github.com/avast/retry-go v3.0.0+incompatible // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.5 // indirect
github.com/bits-and-blooms/bitset v1.13.0 // indirect
github.com/btcsuite/btcd/btcec/v2 v2.3.4 // indirect
github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0 // indirect
github.com/consensys/bavard v0.1.13 // indirect
github.com/consensys/gnark-crypto v0.13.0 // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/containerd/platforms v0.2.1 // indirect
github.com/cpuguy83/dockercfg v0.3.1 // indirect
github.com/cpuguy83/dockercfg v0.3.2 // indirect
github.com/crate-crypto/go-ipa v0.0.0-20240223125850-b1e8a79f509c // indirect
github.com/crate-crypto/go-kzg-4844 v1.1.0 // indirect
github.com/deckarep/golang-set/v2 v2.6.0 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
github.com/distribution/reference v0.6.0 // indirect
github.com/dnwe/otelsarama v0.0.0-20231212173111-631a0a53d5d4 // indirect
github.com/elastic/elastic-transport-go/v8 v8.4.0 // indirect
github.com/ethereum/c-kzg-4844 v1.0.3 // indirect
github.com/ethereum/go-verkle v0.1.1-0.20240829091221-dffa7562dbe9 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/go-faster/city v1.0.1 // indirect
Expand Down Expand Up @@ -109,6 +113,7 @@ require (
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
github.com/rivo/uniseg v0.4.7 // indirect
github.com/segmentio/asm v1.2.0 // indirect
github.com/segmentio/backo-go v1.0.0 // indirect
github.com/sethvargo/go-retry v0.3.0 // indirect
github.com/shirou/gopsutil v3.21.11+incompatible // indirect
github.com/shirou/gopsutil/v3 v3.24.5 // indirect
Expand All @@ -121,15 +126,15 @@ require (
github.com/tklauser/numcpus v0.8.0 // indirect
github.com/yusufpapurcu/wmi v1.2.4 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
go.opentelemetry.io/otel v1.29.0 // indirect
go.opentelemetry.io/otel v1.31.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect
go.opentelemetry.io/otel/metric v1.29.0 // indirect
go.opentelemetry.io/otel/trace v1.29.0 // indirect
go.opentelemetry.io/otel/metric v1.31.0 // indirect
go.opentelemetry.io/otel/trace v1.31.0 // indirect
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sync v0.10.0 // indirect
golang.org/x/time v0.5.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 // indirect
rsc.io/tmplfunc v0.0.3 // indirect
)
Expand Down Expand Up @@ -189,9 +194,9 @@ require (
github.com/prometheus/common v0.55.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
golang.org/x/crypto v0.28.0 // indirect
google.golang.org/grpc v1.67.1
google.golang.org/protobuf v1.35.1
golang.org/x/crypto v0.31.0 // indirect
google.golang.org/grpc v1.69.0
google.golang.org/protobuf v1.35.2
)

require (
Expand All @@ -201,7 +206,7 @@ require (
github.com/andybalholm/brotli v1.1.1 // indirect
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/ethereum/go-ethereum v1.14.8
github.com/ethereum/go-ethereum v1.14.12
github.com/go-openapi/jsonpointer v0.21.0 // indirect
github.com/go-openapi/jsonreference v0.21.0 // indirect
github.com/go-openapi/spec v0.21.0 // indirect
Expand All @@ -225,8 +230,8 @@ require (
github.com/volatiletech/randomize v0.0.1 // indirect
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
golang.org/x/net v0.30.0 // indirect
golang.org/x/sys v0.26.0 // indirect
golang.org/x/text v0.19.0 // indirect
golang.org/x/sys v0.28.0 // indirect
golang.org/x/text v0.21.0 // indirect
golang.org/x/tools v0.26.0 // indirect
golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9 // indirect
)
Expand Down
Loading
Loading