Skip to content

Commit

Permalink
Merge pull request #27 from azaurus1/hhe-small-fix
Browse files Browse the repository at this point in the history
Fixes tests
  • Loading branch information
hendoxc authored Mar 3, 2024
2 parents 67cc7f0 + 80795b8 commit 973e7ff
Show file tree
Hide file tree
Showing 3 changed files with 101 additions and 98 deletions.
9 changes: 4 additions & 5 deletions integration-test/container/pinot.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ type Pinot struct {
}

func randomShortUUID() string {
uuid := uuid.New()
return uuid.String()[:8]
return uuid.New().String()[:8]
}

func randomisePinotURI(uri string) string {
Expand Down Expand Up @@ -72,7 +71,7 @@ func RunPinotContainer(ctx context.Context) (*Pinot, error) {
ContainerRequest: testcontainers.ContainerRequest{
Networks: []string{networkName},
NetworkAliases: map[string][]string{
networkName: {"pinot-controller"}, // this does work btrw
networkName: {"pinot-controller"}, // this does work btw
},
Name: pinotURI,
Image: "apachepinot/pinot:latest",
Expand Down Expand Up @@ -119,7 +118,7 @@ func RunPinotContainer(ctx context.Context) (*Pinot, error) {
}, nil
}

func (p *Pinot) CreateUser(ctx context.Context, userBytes []byte) (*model.UserActionResponse, error) {
func (p *Pinot) CreateUser(_ context.Context, userBytes []byte) (*model.UserActionResponse, error) {
client := goPinotAPI.NewPinotAPIClient("http://" + p.URI)

userCreationResponse, err := client.CreateUser(userBytes)
Expand All @@ -131,7 +130,7 @@ func (p *Pinot) CreateUser(ctx context.Context, userBytes []byte) (*model.UserAc

}

func (p *Pinot) GetUsers(ctx context.Context) (*model.GetUsersResponse, error) {
func (p *Pinot) GetUsers(_ context.Context) (*model.GetUsersResponse, error) {
client := goPinotAPI.NewPinotAPIClient("http://" + p.URI)

userResp, err := client.GetUsers()
Expand Down
58 changes: 29 additions & 29 deletions integration-test/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@ module integration-test
go 1.22.0

require (
github.com/azaurus1/go-pinot-api v0.0.0-20240303131441-0eaeb79e8758
github.com/google/uuid v1.6.0
github.com/hamba/avro/v2 v2.20.0
github.com/stretchr/testify v1.8.4
github.com/stretchr/testify v1.9.0
github.com/testcontainers/testcontainers-go v0.28.0
github.com/testcontainers/testcontainers-go/modules/kafka v0.28.0
github.com/testcontainers/testcontainers-go/modules/redpanda v0.28.0
Expand All @@ -18,26 +20,24 @@ require (
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/Microsoft/hcsshim v0.11.4 // indirect
github.com/azaurus1/go-pinot-api v0.0.0-20240225103742-eef15208f812 // indirect
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
github.com/containerd/containerd v1.7.12 // indirect
github.com/containerd/containerd v1.7.13 // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/cpuguy83/dockercfg v0.3.1 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/distribution/reference v0.5.0 // indirect
github.com/docker/docker v25.0.2+incompatible // indirect
github.com/docker/docker v25.0.3+incompatible // indirect
github.com/docker/go-connections v0.5.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/felixge/httpsnoop v1.0.3 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-ole/go-ole v1.2.6 // indirect
github.com/go-ole/go-ole v1.3.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.17.5 // indirect
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
github.com/klauspost/compress v1.17.7 // indirect
github.com/lufia/plan9stats v0.0.0-20240226150601-1dcf7310316a // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/moby/patternmatcher v0.6.0 // indirect
Expand All @@ -48,29 +48,29 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/morikuni/aec v1.0.0 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
github.com/pierrec/lz4/v4 v4.1.19 // indirect
github.com/opencontainers/image-spec v1.1.0 // indirect
github.com/pierrec/lz4/v4 v4.1.21 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
github.com/shirou/gopsutil/v3 v3.23.12 // indirect
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
github.com/shirou/gopsutil/v3 v3.24.2 // indirect
github.com/shoenig/go-m1cpu v0.1.6 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/tklauser/go-sysconf v0.3.12 // indirect
github.com/tklauser/numcpus v0.6.1 // indirect
github.com/tklauser/go-sysconf v0.3.13 // indirect
github.com/tklauser/numcpus v0.7.0 // indirect
github.com/twmb/franz-go/pkg/kmsg v1.7.0 // indirect
github.com/yusufpapurcu/wmi v1.2.3 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect
go.opentelemetry.io/otel v1.19.0 // indirect
go.opentelemetry.io/otel/metric v1.19.0 // indirect
go.opentelemetry.io/otel/trace v1.19.0 // indirect
golang.org/x/crypto v0.17.0 // indirect
golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea // indirect
golang.org/x/mod v0.14.0 // indirect
golang.org/x/sys v0.16.0 // indirect
golang.org/x/tools v0.13.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
google.golang.org/grpc v1.58.3 // indirect
google.golang.org/protobuf v1.31.0 // indirect
github.com/yusufpapurcu/wmi v1.2.4 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
go.opentelemetry.io/otel v1.24.0 // indirect
go.opentelemetry.io/otel/metric v1.24.0 // indirect
go.opentelemetry.io/otel/trace v1.24.0 // indirect
golang.org/x/crypto v0.20.0 // indirect
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
golang.org/x/mod v0.15.0 // indirect
golang.org/x/sys v0.17.0 // indirect
golang.org/x/tools v0.18.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240228224816-df926f6c8641 // indirect
google.golang.org/grpc v1.62.0 // indirect
google.golang.org/protobuf v1.32.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading

0 comments on commit 973e7ff

Please sign in to comment.