Skip to content

Commit

Permalink
Switch to buf.build/mpapenbr/iracelog
Browse files Browse the repository at this point in the history
Fixes #43
  • Loading branch information
mpapenbr committed May 31, 2024
1 parent 6c7c6ca commit 7d9ed69
Show file tree
Hide file tree
Showing 20 changed files with 52 additions and 56 deletions.
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,12 @@ require (
)

require (
buf.build/gen/go/mpapenbr/testrepo/grpc/go v1.3.0-20240523183733-5b92f15cfcf7.3
buf.build/gen/go/mpapenbr/testrepo/protocolbuffers/go v1.34.1-20240523183733-5b92f15cfcf7.1
buf.build/gen/go/mpapenbr/iracelog/grpc/go v1.3.0-20240531140606-7b7655704e96.3
buf.build/gen/go/mpapenbr/iracelog/protocolbuffers/go v1.34.1-20240531140606-7b7655704e96.1
github.com/google/uuid v1.6.0
github.com/mpapenbr/goirsdk v0.6.0
github.com/samber/lo v1.39.0
github.com/stretchr/testify v1.9.0
golang.org/x/exp v0.0.0-20231214170342-aacd6d4b4611
golang.org/x/mod v0.17.0
google.golang.org/grpc v1.64.0
Expand All @@ -30,7 +31,6 @@ require (
github.com/sagikazarmark/locafero v0.4.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
github.com/stretchr/testify v1.9.0 // indirect
golang.org/x/net v0.22.0 // indirect
golang.org/x/sys v0.19.0 // indirect
golang.org/x/text v0.14.0 // indirect
Expand Down
14 changes: 5 additions & 9 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
buf.build/gen/go/mpapenbr/testrepo/grpc/go v1.3.0-20240523183733-5b92f15cfcf7.3 h1:9JIpCIAk448k7iPGfhrTFX//TYp6+7ylw8oT6xLjNvQ=
buf.build/gen/go/mpapenbr/testrepo/grpc/go v1.3.0-20240523183733-5b92f15cfcf7.3/go.mod h1:nS+UgKpmgU3eOvFLPyW/PSCfhVci3TGRZ5cFRmof/o0=
buf.build/gen/go/mpapenbr/testrepo/protocolbuffers/go v1.34.0-20240523183733-5b92f15cfcf7.1/go.mod h1:ckOdVOpLqC7n2OAGA29NlgbZZw2XyBEhWAltS1xpCqY=
buf.build/gen/go/mpapenbr/testrepo/protocolbuffers/go v1.34.1-20240523183733-5b92f15cfcf7.1 h1:qQM1J0ZuMSB+oSuTEZOYdam0y+kr31t2SfoYnc6FbtA=
buf.build/gen/go/mpapenbr/testrepo/protocolbuffers/go v1.34.1-20240523183733-5b92f15cfcf7.1/go.mod h1:HxQ3PIxtvhyT+nJ+gvlkc0U8Rm/7LakWTH1NwQyv7UQ=
buf.build/gen/go/protocolbuffers/wellknowntypes/grpc/go v1.3.0-20240313220449-3186086b2a8e.3/go.mod h1:2qo5pFSOMF9klg1yp5TiphKlFqgSNy783secsN7cSXI=
buf.build/gen/go/protocolbuffers/wellknowntypes/protocolbuffers/go v1.34.0-20240313220449-3186086b2a8e.1/go.mod h1:XB6Q6aLsF4grHrI1Fft5X5ehSTde5IKPsr4PE96Uq08=
buf.build/gen/go/protocolbuffers/wellknowntypes/protocolbuffers/go v1.34.1-20240313220449-3186086b2a8e.1/go.mod h1:dqLDqTqSwZ1fKJqQRrWjryyHdhLsRaXc0pQgKa5TJ+E=
buf.build/gen/go/mpapenbr/iracelog/grpc/go v1.3.0-20240531140606-7b7655704e96.3 h1:1ocoY/qpl2ie2bnBXFLxHrOI5UFtAI0WJuHcBa47lS4=
buf.build/gen/go/mpapenbr/iracelog/grpc/go v1.3.0-20240531140606-7b7655704e96.3/go.mod h1:B7QCNWPThkM5Lzpt1Gjy9WcF/ShmhjFMPHhFyAuCA6w=
buf.build/gen/go/mpapenbr/iracelog/protocolbuffers/go v1.34.0-20240531140606-7b7655704e96.1/go.mod h1:A9x9avzwQ0YvgZh6rOMI5zpUJ6a3D9nVVBIssa9+pjs=
buf.build/gen/go/mpapenbr/iracelog/protocolbuffers/go v1.34.1-20240531140606-7b7655704e96.1 h1:kQWzzYPQDunXx9m7QnCY8LrXgQj8OtIqUvuUg++WhT4=
buf.build/gen/go/mpapenbr/iracelog/protocolbuffers/go v1.34.1-20240531140606-7b7655704e96.1/go.mod h1:F6oJysEKOA8fIxkEFlsWFbjb8Qst1UkT2mtwMqlcduQ=
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
Expand Down Expand Up @@ -1462,7 +1459,6 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
Expand Down
2 changes: 1 addition & 1 deletion internal/processor/cardata.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package processor
import (
"fmt"

racestatev1 "buf.build/gen/go/mpapenbr/testrepo/protocolbuffers/go/testrepo/racestate/v1"
racestatev1 "buf.build/gen/go/mpapenbr/iracelog/protocolbuffers/go/iracelog/racestate/v1"
"github.com/mpapenbr/goirsdk/irsdk"

"github.com/mpapenbr/go-racelogger/log"
Expand Down
2 changes: 1 addition & 1 deletion internal/processor/cars.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"reflect"
"sort"

racestatev1 "buf.build/gen/go/mpapenbr/testrepo/protocolbuffers/go/testrepo/racestate/v1"
racestatev1 "buf.build/gen/go/mpapenbr/iracelog/protocolbuffers/go/iracelog/racestate/v1"
"github.com/mpapenbr/goirsdk/irsdk"
"github.com/mpapenbr/goirsdk/yaml"
"golang.org/x/exp/slices"
Expand Down
8 changes: 4 additions & 4 deletions internal/processor/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package processor
import (
"reflect"

carv1 "buf.build/gen/go/mpapenbr/testrepo/protocolbuffers/go/testrepo/car/v1"
commonv1 "buf.build/gen/go/mpapenbr/testrepo/protocolbuffers/go/testrepo/common/v1"
driverv1 "buf.build/gen/go/mpapenbr/testrepo/protocolbuffers/go/testrepo/driver/v1"
racestatev1 "buf.build/gen/go/mpapenbr/testrepo/protocolbuffers/go/testrepo/racestate/v1"
carv1 "buf.build/gen/go/mpapenbr/iracelog/protocolbuffers/go/iracelog/car/v1"
commonv1 "buf.build/gen/go/mpapenbr/iracelog/protocolbuffers/go/iracelog/common/v1"
driverv1 "buf.build/gen/go/mpapenbr/iracelog/protocolbuffers/go/iracelog/driver/v1"
racestatev1 "buf.build/gen/go/mpapenbr/iracelog/protocolbuffers/go/iracelog/racestate/v1"
"github.com/mpapenbr/goirsdk/irsdk"
"github.com/mpapenbr/goirsdk/yaml"
"golang.org/x/exp/slices"
Expand Down
2 changes: 1 addition & 1 deletion internal/processor/laptime.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"math"

racestatev1 "buf.build/gen/go/mpapenbr/testrepo/protocolbuffers/go/testrepo/racestate/v1"
racestatev1 "buf.build/gen/go/mpapenbr/iracelog/protocolbuffers/go/iracelog/racestate/v1"

"github.com/mpapenbr/go-racelogger/log"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/processor/message.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package processor
import (
"fmt"

racestatev1 "buf.build/gen/go/mpapenbr/testrepo/protocolbuffers/go/testrepo/racestate/v1"
racestatev1 "buf.build/gen/go/mpapenbr/iracelog/protocolbuffers/go/iracelog/racestate/v1"

"github.com/mpapenbr/go-racelogger/log"
)
Expand Down
8 changes: 4 additions & 4 deletions internal/processor/processor.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package processor
import (
"time"

commonv1 "buf.build/gen/go/mpapenbr/testrepo/protocolbuffers/go/testrepo/common/v1"
eventv1 "buf.build/gen/go/mpapenbr/testrepo/protocolbuffers/go/testrepo/event/v1"
racestatev1 "buf.build/gen/go/mpapenbr/testrepo/protocolbuffers/go/testrepo/racestate/v1"
trackv1 "buf.build/gen/go/mpapenbr/testrepo/protocolbuffers/go/testrepo/track/v1"
commonv1 "buf.build/gen/go/mpapenbr/iracelog/protocolbuffers/go/iracelog/common/v1"
eventv1 "buf.build/gen/go/mpapenbr/iracelog/protocolbuffers/go/iracelog/event/v1"
racestatev1 "buf.build/gen/go/mpapenbr/iracelog/protocolbuffers/go/iracelog/racestate/v1"
trackv1 "buf.build/gen/go/mpapenbr/iracelog/protocolbuffers/go/iracelog/track/v1"
"github.com/mpapenbr/goirsdk/irsdk"
iryaml "github.com/mpapenbr/goirsdk/yaml"
"google.golang.org/protobuf/types/known/timestamppb"
Expand Down
2 changes: 1 addition & 1 deletion internal/processor/session.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package processor

import (
racestatev1 "buf.build/gen/go/mpapenbr/testrepo/protocolbuffers/go/testrepo/racestate/v1"
racestatev1 "buf.build/gen/go/mpapenbr/iracelog/protocolbuffers/go/iracelog/racestate/v1"
"github.com/mpapenbr/goirsdk/irsdk"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/processor/speedmap.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"math"

speedmapv1 "buf.build/gen/go/mpapenbr/testrepo/protocolbuffers/go/testrepo/speedmap/v1"
speedmapv1 "buf.build/gen/go/mpapenbr/iracelog/protocolbuffers/go/iracelog/speedmap/v1"
"github.com/mpapenbr/goirsdk/irsdk"
"github.com/samber/lo"
"golang.org/x/exp/slices"
Expand Down
2 changes: 1 addition & 1 deletion internal/processor/speedmap_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"math"
"testing"

trackv1 "buf.build/gen/go/mpapenbr/testrepo/protocolbuffers/go/testrepo/track/v1"
trackv1 "buf.build/gen/go/mpapenbr/iracelog/protocolbuffers/go/iracelog/track/v1"
)

func defaultTestSpeedmapProc() *SpeedmapProc {
Expand Down
4 changes: 2 additions & 2 deletions internal/processor/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"regexp"
"strconv"

carv1 "buf.build/gen/go/mpapenbr/testrepo/protocolbuffers/go/testrepo/car/v1"
commonv1 "buf.build/gen/go/mpapenbr/testrepo/protocolbuffers/go/testrepo/common/v1"
carv1 "buf.build/gen/go/mpapenbr/iracelog/protocolbuffers/go/iracelog/car/v1"
commonv1 "buf.build/gen/go/mpapenbr/iracelog/protocolbuffers/go/iracelog/common/v1"
"github.com/mpapenbr/goirsdk/irsdk"
"github.com/mpapenbr/goirsdk/yaml"
"golang.org/x/exp/slices"
Expand Down
10 changes: 5 additions & 5 deletions internal/racelogger.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import (
"strings"
"time"

eventv1 "buf.build/gen/go/mpapenbr/testrepo/protocolbuffers/go/testrepo/event/v1"
providerv1 "buf.build/gen/go/mpapenbr/testrepo/protocolbuffers/go/testrepo/provider/v1"
racestatev1 "buf.build/gen/go/mpapenbr/testrepo/protocolbuffers/go/testrepo/racestate/v1"
trackv1 "buf.build/gen/go/mpapenbr/testrepo/protocolbuffers/go/testrepo/track/v1"
eventv1 "buf.build/gen/go/mpapenbr/iracelog/protocolbuffers/go/iracelog/event/v1"
providerv1 "buf.build/gen/go/mpapenbr/iracelog/protocolbuffers/go/iracelog/provider/v1"
racestatev1 "buf.build/gen/go/mpapenbr/iracelog/protocolbuffers/go/iracelog/racestate/v1"
trackv1 "buf.build/gen/go/mpapenbr/iracelog/protocolbuffers/go/iracelog/track/v1"
"github.com/google/uuid"
"github.com/mpapenbr/goirsdk/irsdk"
"github.com/mpapenbr/goirsdk/yaml"
Expand Down Expand Up @@ -234,7 +234,7 @@ func (r *Racelogger) createTrackInfo(irYaml *yaml.IrsdkYaml) *trackv1.Track {
trackLength, _ := processor.GetTrackLengthInMeters(irYaml.WeekendInfo.TrackLength)
pitSpeed, _ := processor.GetMetricUnit(irYaml.WeekendInfo.TrackPitSpeedLimit)
ret := trackv1.Track{
Id: &trackv1.TrackId{Id: uint32(irYaml.WeekendInfo.TrackID)},
Id: uint32(irYaml.WeekendInfo.TrackID),
Name: irYaml.WeekendInfo.TrackDisplayName,
ShortName: irYaml.WeekendInfo.TrackDisplayShortName,
Config: irYaml.WeekendInfo.TrackConfigName,
Expand Down
4 changes: 2 additions & 2 deletions pkg/cmd/check/check.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package check
import (
"context"

"buf.build/gen/go/mpapenbr/testrepo/grpc/go/testrepo/provider/v1/providerv1grpc"
providerv1 "buf.build/gen/go/mpapenbr/testrepo/protocolbuffers/go/testrepo/provider/v1"
"buf.build/gen/go/mpapenbr/iracelog/grpc/go/iracelog/provider/v1/providerv1grpc"
providerv1 "buf.build/gen/go/mpapenbr/iracelog/protocolbuffers/go/iracelog/provider/v1"
"github.com/spf13/cobra"
"google.golang.org/grpc"

Expand Down
6 changes: 3 additions & 3 deletions pkg/cmd/logimport/import.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"io"
"os"

commonv1 "buf.build/gen/go/mpapenbr/testrepo/protocolbuffers/go/testrepo/common/v1"
providerv1 "buf.build/gen/go/mpapenbr/testrepo/protocolbuffers/go/testrepo/provider/v1"
racestatev1 "buf.build/gen/go/mpapenbr/testrepo/protocolbuffers/go/testrepo/racestate/v1"
commonv1 "buf.build/gen/go/mpapenbr/iracelog/protocolbuffers/go/iracelog/common/v1"
providerv1 "buf.build/gen/go/mpapenbr/iracelog/protocolbuffers/go/iracelog/provider/v1"
racestatev1 "buf.build/gen/go/mpapenbr/iracelog/protocolbuffers/go/iracelog/racestate/v1"
"github.com/spf13/cobra"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
Expand Down
4 changes: 2 additions & 2 deletions pkg/cmd/ping/ping.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"context"
"time"

"buf.build/gen/go/mpapenbr/testrepo/grpc/go/testrepo/provider/v1/providerv1grpc"
providerv1 "buf.build/gen/go/mpapenbr/testrepo/protocolbuffers/go/testrepo/provider/v1"
"buf.build/gen/go/mpapenbr/iracelog/grpc/go/iracelog/provider/v1/providerv1grpc"
providerv1 "buf.build/gen/go/mpapenbr/iracelog/protocolbuffers/go/iracelog/provider/v1"
"github.com/spf13/cobra"
"google.golang.org/grpc"

Expand Down
4 changes: 2 additions & 2 deletions pkg/cmd/record/record.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"os/signal"
"time"

"buf.build/gen/go/mpapenbr/testrepo/grpc/go/testrepo/provider/v1/providerv1grpc"
providerv1 "buf.build/gen/go/mpapenbr/testrepo/protocolbuffers/go/testrepo/provider/v1"
"buf.build/gen/go/mpapenbr/iracelog/grpc/go/iracelog/provider/v1/providerv1grpc"
providerv1 "buf.build/gen/go/mpapenbr/iracelog/protocolbuffers/go/iracelog/provider/v1"
"github.com/spf13/cobra"
"google.golang.org/grpc"

Expand Down
16 changes: 8 additions & 8 deletions pkg/grpc/dataprovider.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ import (
"context"
"io"

eventv1grpc "buf.build/gen/go/mpapenbr/testrepo/grpc/go/testrepo/event/v1/eventv1grpc"
providerv1grpc "buf.build/gen/go/mpapenbr/testrepo/grpc/go/testrepo/provider/v1/providerv1grpc"
racestatev1grpc "buf.build/gen/go/mpapenbr/testrepo/grpc/go/testrepo/racestate/v1/racestatev1grpc"
commonv1 "buf.build/gen/go/mpapenbr/testrepo/protocolbuffers/go/testrepo/common/v1"
eventv1 "buf.build/gen/go/mpapenbr/testrepo/protocolbuffers/go/testrepo/event/v1"
providerv1 "buf.build/gen/go/mpapenbr/testrepo/protocolbuffers/go/testrepo/provider/v1"
racestatev1 "buf.build/gen/go/mpapenbr/testrepo/protocolbuffers/go/testrepo/racestate/v1"
trackv1 "buf.build/gen/go/mpapenbr/testrepo/protocolbuffers/go/testrepo/track/v1"
eventv1grpc "buf.build/gen/go/mpapenbr/iracelog/grpc/go/iracelog/event/v1/eventv1grpc"
providerv1grpc "buf.build/gen/go/mpapenbr/iracelog/grpc/go/iracelog/provider/v1/providerv1grpc"
racestatev1grpc "buf.build/gen/go/mpapenbr/iracelog/grpc/go/iracelog/racestate/v1/racestatev1grpc"
commonv1 "buf.build/gen/go/mpapenbr/iracelog/protocolbuffers/go/iracelog/common/v1"
eventv1 "buf.build/gen/go/mpapenbr/iracelog/protocolbuffers/go/iracelog/event/v1"
providerv1 "buf.build/gen/go/mpapenbr/iracelog/protocolbuffers/go/iracelog/provider/v1"
racestatev1 "buf.build/gen/go/mpapenbr/iracelog/protocolbuffers/go/iracelog/racestate/v1"
trackv1 "buf.build/gen/go/mpapenbr/iracelog/protocolbuffers/go/iracelog/track/v1"
"google.golang.org/grpc"
"google.golang.org/grpc/metadata"

Expand Down
4 changes: 2 additions & 2 deletions pkg/grpc/logger/msglogger.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"io"
"sync"

providerv1 "buf.build/gen/go/mpapenbr/testrepo/protocolbuffers/go/testrepo/provider/v1"
racestatev1 "buf.build/gen/go/mpapenbr/testrepo/protocolbuffers/go/testrepo/racestate/v1"
providerv1 "buf.build/gen/go/mpapenbr/iracelog/protocolbuffers/go/iracelog/provider/v1"
racestatev1 "buf.build/gen/go/mpapenbr/iracelog/protocolbuffers/go/iracelog/racestate/v1"
"google.golang.org/protobuf/proto"
"google.golang.org/protobuf/reflect/protoreflect"

Expand Down
6 changes: 3 additions & 3 deletions pkg/grpc/logger/msglogger_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"testing"
"time"

commonv1 "buf.build/gen/go/mpapenbr/testrepo/protocolbuffers/go/testrepo/common/v1"
providerv1 "buf.build/gen/go/mpapenbr/testrepo/protocolbuffers/go/testrepo/provider/v1"
racestatev1 "buf.build/gen/go/mpapenbr/testrepo/protocolbuffers/go/testrepo/racestate/v1"
commonv1 "buf.build/gen/go/mpapenbr/iracelog/protocolbuffers/go/iracelog/common/v1"
providerv1 "buf.build/gen/go/mpapenbr/iracelog/protocolbuffers/go/iracelog/provider/v1"
racestatev1 "buf.build/gen/go/mpapenbr/iracelog/protocolbuffers/go/iracelog/racestate/v1"
"github.com/stretchr/testify/assert"
"google.golang.org/protobuf/reflect/protoreflect"
"google.golang.org/protobuf/types/known/timestamppb"
Expand Down

0 comments on commit 7d9ed69

Please sign in to comment.