Linter fixes. Makefile fixes.

Makefile

@@ -56,7 +56,7 @@ generate-swagger:
 generate-swaggers:
 	go install github.com/swaggo/swag/cmd/swag@latest
 	set -xe; \
-	[ -d cmd ] && find ./cmd -mindepth 1 -maxdepth 1 -type d -print | grep -v 'fixture' | sed 's/\.\///g' | while read service; do \
+	[ -d cmd ] && find ./cmd -mindepth 1 -maxdepth 1 -type d -print | grep -v 'fixture' | grep -v 'scripts' | sed 's/\.\///g' | while read service; do \
 		env SERVICE=$${service} $(MAKE) generate-swagger; \
 	done;
 
@@ -65,7 +65,7 @@ format-swagger:
 
 format-swaggers:
 	set -xe; \
-	[ -d cmd ] && find ./cmd -mindepth 1 -maxdepth 1 -type d -print | grep -v 'fixture' | sed 's/\.\///g' | while read service; do \
+	[ -d cmd ] && find ./cmd -mindepth 1 -maxdepth 1 -type d -print | grep -v 'fixture' | grep -v 'scripts' | sed 's/\.\///g' | while read service; do \
 		env SERVICE=$${service} $(MAKE) format-swagger; \
 	done;
 
@@ -202,7 +202,7 @@ endif
 # note: it requires make-4.3+ to run that
 buildMultiPlatformDockerImage:
 	set -xe; \
-	find ./cmd -mindepth 1 -maxdepth 1 -type d -print | grep -v 'fixture' | while read service; do \
+	find ./cmd -mindepth 1 -maxdepth 1 -type d -print | grep -v 'fixture' | grep -v 'scripts' | while read service; do \
 		for arch in amd64 arm64 s390x ppc64le; do \
 			docker buildx build \
 				--platform linux/$${arch} \

badges/badges.go

@@ -11,15 +11,15 @@ import (
 	"github.com/pkg/errors"
 
 	"github.com/ice-blockchain/eskimo/users"
-	appCfg "github.com/ice-blockchain/wintr/config"
+	appcfg "github.com/ice-blockchain/wintr/config"
 	messagebroker "github.com/ice-blockchain/wintr/connectors/message_broker"
 	storage "github.com/ice-blockchain/wintr/connectors/storage/v2"
 	"github.com/ice-blockchain/wintr/time"
 )
 
 func New(ctx context.Context, _ context.CancelFunc) Repository {
 	var cfg config
-	appCfg.MustLoadFromKey(applicationYamlKey, &cfg)
+	appcfg.MustLoadFromKey(applicationYamlKey, &cfg)
 
 	db := storage.MustConnect(ctx, ddl, applicationYamlKey)
 
@@ -32,7 +32,7 @@ func New(ctx context.Context, _ context.CancelFunc) Repository {
 
 func StartProcessor(ctx context.Context, cancel context.CancelFunc) Processor {
 	var cfg config
-	appCfg.MustLoadFromKey(applicationYamlKey, &cfg)
+	appcfg.MustLoadFromKey(applicationYamlKey, &cfg)
 
 	var mbConsumer messagebroker.Client
 	prc := &processor{repository: &repository{
@@ -170,7 +170,7 @@ func IsBadgeGroupAchieved(actual *users.Enum[Type], expectedGroupType GroupType)
 }
 
 func requestingUserID(ctx context.Context) (requestingUserID string) {
-	requestingUserID, _ = ctx.Value(requestingUserIDCtxValueKey).(string) //nolint:errcheck // Not needed.
+	requestingUserID, _ = ctx.Value(requestingUserIDCtxValueKey).(string) //nolint:errcheck,revive // Not needed.
 
 	return
 }

badges/contract.go

@@ -274,7 +274,7 @@ type (
 	}
 	Processor interface {
 		Repository
-		CheckHealth(context.Context) error
+		CheckHealth(ctx context.Context) error
 	}
 )
 

badges/get_badges_test.go

@@ -258,7 +258,7 @@ func Test_Repository_calculateUnachievedPercentages(t *testing.T) {
 			// so sum of percentages is 100-usersWhoOwnsLastBadge.
 			lastBadgeAchievedBy := tt.stats[len(AllGroups[tt.group])].AchievedBy
 			lastBadgeAchievedByPercentage := float64(lastBadgeAchievedBy*percent100) / float64(totalUsers)
-			assert.Equal(t, percent100-lastBadgeAchievedByPercentage, sum)
+			assert.Equal(t, percent100-lastBadgeAchievedByPercentage, sum) //nolint:testifylint // .
 		})
 	}
 }

cmd/santa-sleigh/contract.go

@@ -4,7 +4,7 @@ package main
 
 import (
 	"github.com/ice-blockchain/santa/badges"
-	friendsInvited "github.com/ice-blockchain/santa/friends-invited"
+	friendsinvited "github.com/ice-blockchain/santa/friends-invited"
 	levelsandroles "github.com/ice-blockchain/santa/levels-and-roles"
 	"github.com/ice-blockchain/santa/tasks"
 )
@@ -38,7 +38,7 @@ type (
 		tasksProcessor          tasks.Processor
 		levelsAndRolesProcessor levelsandroles.Processor
 		badgesProcessor         badges.Processor
-		friendsProcessor        friendsInvited.Processor
+		friendsProcessor        friendsinvited.Processor
 	}
 	config struct {
 		Host    string `yaml:"host"`

cmd/santa-sleigh/santa_sleigh.go

@@ -10,10 +10,10 @@ import (
 
 	"github.com/ice-blockchain/santa/badges"
 	"github.com/ice-blockchain/santa/cmd/santa-sleigh/api"
-	friendsInvited "github.com/ice-blockchain/santa/friends-invited"
-	levelsAndRoles "github.com/ice-blockchain/santa/levels-and-roles"
+	friendsinvited "github.com/ice-blockchain/santa/friends-invited"
+	levelsandroles "github.com/ice-blockchain/santa/levels-and-roles"
 	"github.com/ice-blockchain/santa/tasks"
-	appCfg "github.com/ice-blockchain/wintr/config"
+	appcfg "github.com/ice-blockchain/wintr/config"
 	"github.com/ice-blockchain/wintr/log"
 	"github.com/ice-blockchain/wintr/server"
 )
@@ -31,7 +31,7 @@ func main() {
 	defer cancel()
 
 	var cfg config
-	appCfg.MustLoadFromKey(applicationYamlKey, &cfg)
+	appcfg.MustLoadFromKey(applicationYamlKey, &cfg)
 	api.SwaggerInfo.Host = cfg.Host
 	api.SwaggerInfo.Version = cfg.Version
 	server.New(new(service), applicationYamlKey, swaggerRoot).ListenAndServe(ctx, cancel)
@@ -43,9 +43,9 @@ func (s *service) RegisterRoutes(router *server.Router) {
 
 func (s *service) Init(ctx context.Context, cancel context.CancelFunc) {
 	s.tasksProcessor = tasks.StartProcessor(ctx, cancel)
-	s.levelsAndRolesProcessor = levelsAndRoles.StartProcessor(ctx, cancel)
+	s.levelsAndRolesProcessor = levelsandroles.StartProcessor(ctx, cancel)
 	s.badgesProcessor = badges.StartProcessor(ctx, cancel)
-	s.friendsProcessor = friendsInvited.StartProcessor(ctx, cancel)
+	s.friendsProcessor = friendsinvited.StartProcessor(ctx, cancel)
 }
 
 func (s *service) Close(ctx context.Context) error {

cmd/santa/santa.go

@@ -12,7 +12,7 @@ import (
 	"github.com/ice-blockchain/santa/cmd/santa/api"
 	levelsandroles "github.com/ice-blockchain/santa/levels-and-roles"
 	"github.com/ice-blockchain/santa/tasks"
-	appCfg "github.com/ice-blockchain/wintr/config"
+	appcfg "github.com/ice-blockchain/wintr/config"
 	"github.com/ice-blockchain/wintr/log"
 	"github.com/ice-blockchain/wintr/server"
 )
@@ -30,7 +30,7 @@ func main() {
 	defer cancel()
 
 	var cfg config
-	appCfg.MustLoadFromKey(applicationYamlKey, &cfg)
+	appcfg.MustLoadFromKey(applicationYamlKey, &cfg)
 	api.SwaggerInfo.Host = cfg.Host
 	api.SwaggerInfo.Version = cfg.Version
 	server.New(new(service), applicationYamlKey, swaggerRoot).ListenAndServe(ctx, cancel)

cmd/scripts/update_santa_badges_levels_and_roles_tasks/update_santa_badges_levels_and_roles_tasks.go

@@ -16,8 +16,8 @@ import (
 	"github.com/ice-blockchain/eskimo/users"
 	"github.com/ice-blockchain/santa/badges"
 	levelsandroles "github.com/ice-blockchain/santa/levels-and-roles"
-	appCfg "github.com/ice-blockchain/wintr/config"
-	storagePG "github.com/ice-blockchain/wintr/connectors/storage/v2"
+	appcfg "github.com/ice-blockchain/wintr/config"
+	storagepg "github.com/ice-blockchain/wintr/connectors/storage/v2"
 	"github.com/ice-blockchain/wintr/log"
 )
 
@@ -40,8 +40,8 @@ type (
 		RequiredFriendsInvited                   uint64                                `yaml:"requiredFriendsInvited"`
 	}
 	updater struct {
-		dbSanta  *storagePG.DB
-		dbEskimo *storagePG.DB
+		dbSanta  *storagepg.DB
+		dbEskimo *storagepg.DB
 	}
 	eskimoUser struct {
 		ID             string `json:"id" example:"did:ethr:0x4B73C58370AEfcEf86A6021afCDe5673511376B2" db:"id"`
@@ -59,10 +59,10 @@ type (
 )
 
 func main() {
-	appCfg.MustLoadFromKey(applicationYamlKeySanta, &cfgSanta)
+	appcfg.MustLoadFromKey(applicationYamlKeySanta, &cfgSanta)
 
-	dbEskimo := storagePG.MustConnect(context.Background(), "", applicationYamlUsersKey)
-	dbSanta := storagePG.MustConnect(context.Background(), "", applicationYamlKeySanta)
+	dbEskimo := storagepg.MustConnect(context.Background(), "", applicationYamlUsersKey)
+	dbSanta := storagepg.MustConnect(context.Background(), "", applicationYamlKeySanta)
 
 	if err := dbEskimo.Ping(context.Background()); err != nil {
 		log.Panic("can't ping users db", err)
@@ -105,7 +105,7 @@ func (u *updater) update(ctx context.Context) {
 				GROUP BY u.id
 				LIMIT $1
 				OFFSET $2`
-		usrs, err := storagePG.Select[eskimoUser](ctx, u.dbEskimo, sql, maxLimit, offset)
+		usrs, err := storagepg.Select[eskimoUser](ctx, u.dbEskimo, sql, maxLimit, offset)
 		if err != nil {
 			log.Panic("error on trying to get actual friends invited values crossed with already updated values", err)
 		}
@@ -138,7 +138,7 @@ func (u *updater) update(ctx context.Context) {
 					JOIN badge_progress bp
 						ON tp.user_id = bp.user_id
 					WHERE tp.user_id = ANY($1)`
-		res, err := storagePG.Select[commonUser](ctx, u.dbSanta, sql, userKeysProgress)
+		res, err := storagepg.Select[commonUser](ctx, u.dbSanta, sql, userKeysProgress)
 		if err != nil {
 			log.Panic("error on trying to get tasks", userKeysProgress, err)
 		}
@@ -202,7 +202,7 @@ func (u *updater) updateBadgesAndStatistics(ctx context.Context, usr *commonUser
 								  AND (friends_invited != $2
 								  	   OR COALESCE(badge_progress.achieved_badges, ARRAY[]::TEXT[]) != COALESCE($3, ARRAY[]::TEXT[]))
 									   OR $4 = TRUE`, completedLevelsSQL)
-	if _, err := storagePG.Exec(ctx, u.dbSanta, sql, usr.UserID, actualFriendsInvited, achievedBadges, completedLevelsSQL != ""); err != nil {
+	if _, err := storagepg.Exec(ctx, u.dbSanta, sql, usr.UserID, actualFriendsInvited, achievedBadges, completedLevelsSQL != ""); err != nil {
 		return errors.Wrapf(err, "failed to update badge_progress, userID:%v, friendsInvited:%v", usr.UserID, actualFriendsInvited)
 	}
 	var mErr *multierror.Error
@@ -218,7 +218,7 @@ func (u *updater) updateBadgesAndStatistics(ctx context.Context, usr *commonUser
 		sql = fmt.Sprintf(`UPDATE badge_statistics
 										SET achieved_by = GREATEST(achieved_by %v $1, 0)
 									WHERE badge_type = $2`, sign)
-		_, err := storagePG.Exec(ctx, u.dbSanta, sql, val, badgeType)
+		_, err := storagepg.Exec(ctx, u.dbSanta, sql, val, badgeType)
 		mErr = multierror.Append(errors.Wrapf(err, "failed to update badge_statistics, userID:%v, badgeType:%v, val:%v", usr.UserID, badgeType, val))
 	}
 
@@ -270,7 +270,7 @@ func (u *updater) updateLevelsAndRoles(ctx context.Context, usr *commonUser, act
 								  AND (friends_invited != $2 
 								  OR COALESCE(levels_and_roles_progress.enabled_roles, ARRAY[]::TEXT[]) != COALESCE($3, ARRAY[]::TEXT[])
 								  OR $4 = TRUE)`, completedTasksSQL, completedLevelsSQL)
-	_, err := storagePG.Exec(ctx, u.dbSanta, sql, usr.UserID, actualFriendsInvited, enabledRoles, (completedTasksSQL != "" || completedLevelsSQL != ""))
+	_, err := storagepg.Exec(ctx, u.dbSanta, sql, usr.UserID, actualFriendsInvited, enabledRoles, (completedTasksSQL != "" || completedLevelsSQL != ""))
 
 	return errors.Wrapf(err, "failed to update levels_and_roles_progress, userID:%v, friendsInvited:%v", usr.UserID, actualFriendsInvited)
 }
@@ -287,7 +287,7 @@ func (u *updater) updateTasks(ctx context.Context, usr *commonUser, actualFriend
 								%v
 							WHERE user_id = $1
 								  AND (friends_invited != $2 %v OR $3 = TRUE)`, completedTasksSQL, whereSQL)
-	_, err := storagePG.Exec(ctx, u.dbSanta, sql, usr.UserID, actualFriendsInvited, completedTasksSQL != "")
+	_, err := storagepg.Exec(ctx, u.dbSanta, sql, usr.UserID, actualFriendsInvited, completedTasksSQL != "")
 
 	return errors.Wrapf(err, "failed to update task_progress, userID:%v, friendsInvited:%v", usr.UserID, actualFriendsInvited)
 }
@@ -297,7 +297,7 @@ func (u *updater) updateFriendsInvited(ctx context.Context, usr *commonUser, act
 				   SET invited_count = $2
 				   WHERE user_id = $1
 				   		 AND friends_invited.invited_count != $2`
-	_, err := storagePG.Exec(ctx, u.dbSanta, sql, usr.UserID, actualFriendsInvited)
+	_, err := storagepg.Exec(ctx, u.dbSanta, sql, usr.UserID, actualFriendsInvited)
 
 	return errors.Wrapf(err, "failed to update friends invited, userID:%v, friendsInvited:%v", usr.UserID, actualFriendsInvited)
 }

friends-invited/contract.go

@@ -14,7 +14,7 @@ import (
 type (
 	Processor interface {
 		io.Closer
-		CheckHealth(context.Context) error
+		CheckHealth(ctx context.Context) error
 	}
 
 	Count struct {

friends-invited/friends-invited.go

@@ -11,7 +11,7 @@ import (
 	"github.com/hashicorp/go-multierror"
 	"github.com/pkg/errors"
 
-	appCfg "github.com/ice-blockchain/wintr/config"
+	appcfg "github.com/ice-blockchain/wintr/config"
 	messagebroker "github.com/ice-blockchain/wintr/connectors/message_broker"
 	"github.com/ice-blockchain/wintr/connectors/storage/v2"
 	"github.com/ice-blockchain/wintr/log"
@@ -20,7 +20,7 @@ import (
 
 func StartProcessor(ctx context.Context, cancel context.CancelFunc) Processor {
 	var cfg config
-	appCfg.MustLoadFromKey(applicationYamlKey, &cfg)
+	appcfg.MustLoadFromKey(applicationYamlKey, &cfg)
 
 	var mbConsumer messagebroker.Client
 	prc := &processor{repository: &repository{

go.mod

@@ -5,7 +5,7 @@ go 1.21
 require (
 	github.com/goccy/go-json v0.10.2
 	github.com/hashicorp/go-multierror v1.1.1
-	github.com/ice-blockchain/eskimo v1.171.0
+	github.com/ice-blockchain/eskimo v1.172.0
 	github.com/ice-blockchain/wintr v1.125.0
 	github.com/pkg/errors v0.9.1
 	github.com/stretchr/testify v1.8.4
@@ -43,7 +43,7 @@ require (
 	github.com/docker/docker v24.0.6+incompatible // indirect
 	github.com/docker/go-connections v0.4.0 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
-	github.com/fsnotify/fsnotify v1.6.0 // indirect
+	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.3 // indirect
 	github.com/gaukas/godicttls v0.0.4 // indirect
 	github.com/georgysavva/scany/v2 v2.0.0 // indirect
@@ -81,7 +81,7 @@ require (
 	github.com/joho/godotenv v1.5.1 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/compress v1.17.1 // indirect
+	github.com/klauspost/compress v1.17.2 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.5 // indirect
 	github.com/leodido/go-urn v1.2.4 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
@@ -119,9 +119,9 @@ require (
 	github.com/swaggo/files v1.0.1 // indirect
 	github.com/swaggo/gin-swagger v1.6.0 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
-	github.com/twmb/franz-go v1.15.0 // indirect
-	github.com/twmb/franz-go/pkg/kadm v1.9.2 // indirect
-	github.com/twmb/franz-go/pkg/kmsg v1.6.1 // indirect
+	github.com/twmb/franz-go v1.15.1 // indirect
+	github.com/twmb/franz-go/pkg/kadm v1.10.0 // indirect
+	github.com/twmb/franz-go/pkg/kmsg v1.7.0 // indirect
 	github.com/ugorji/go/codec v1.2.11 // indirect
 	github.com/vmihailenco/msgpack/v5 v5.4.0 // indirect
 	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect

go.sum

@@ -128,8 +128,8 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY=
 github.com/frankban/quicktest v1.14.4/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
-github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
-github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
+github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
+github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
 github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0=
 github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk=
 github.com/gaukas/godicttls v0.0.4 h1:NlRaXb3J6hAnTmWdsEKb9bcSBD6BvcIjdGdeb0zfXbk=
@@ -281,8 +281,8 @@ github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/ice-blockchain/eskimo v1.171.0 h1:ACAlyemaU9BKngNs7h7UZr1VI60BA3QZgjUm4K1BTxM=
-github.com/ice-blockchain/eskimo v1.171.0/go.mod h1:wnROoQhxpMKt+rI1Zd/ADGQxpRLBcJztFgY7xAS21Jo=
+github.com/ice-blockchain/eskimo v1.172.0 h1:NhFc7EQea3KPY3kGcimlVgtLoDtClqQSZqWCjTRR2tI=
+github.com/ice-blockchain/eskimo v1.172.0/go.mod h1:qpi4Q9tjOLmEUnASKU2F5t4+/W0djInw1zAOoz5Rqd8=
 github.com/ice-blockchain/go-tarantool-client v0.0.0-20230327200757-4fc71fa3f7bb h1:8TnFP3mc7O+tc44kv2e0/TpZKnEVUaKH+UstwfBwRkk=
 github.com/ice-blockchain/go-tarantool-client v0.0.0-20230327200757-4fc71fa3f7bb/go.mod h1:ZsQU7i3mxhgBBu43Oev7WPFbIjP4TniN/b1UPNGbrq8=
 github.com/ice-blockchain/wintr v1.125.0 h1:pk/SVyztstUF19+JDCufJRMXJeNpchVA4O26xp47l3Y=
@@ -309,8 +309,8 @@ github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-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.17.2 h1:RlWWUY/Dr4fL8qk9YG7DTZ7PDgME2V4csBXA8L/ixi4=
+github.com/klauspost/compress v1.17.2/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
 github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
 github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg=
 github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
@@ -435,12 +435,12 @@ github.com/testcontainers/testcontainers-go v0.15.0 h1:3Ex7PUGFv0b2bBsdOv6R42+SK
 github.com/testcontainers/testcontainers-go v0.15.0/go.mod h1:PkohMRH2X8Hib0IWtifVexDfLPVT+tb5E9hsf7cW12w=
 github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
 github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
-github.com/twmb/franz-go v1.15.0 h1:bw5n1COKJzWpkCXG/kMtHrurcS9HSWV6e3If5CUdc+M=
-github.com/twmb/franz-go v1.15.0/go.mod h1:nMAvTC2kHtK+ceaSHeHm4dlxC78389M/1DjpOswEgu4=
-github.com/twmb/franz-go/pkg/kadm v1.9.2 h1:2Aj7DOaSFT5TyJ5BLEbAanXuby7CeWjpXW9ht8fy73c=
-github.com/twmb/franz-go/pkg/kadm v1.9.2/go.mod h1:hUMoV4SRho+2ij/S9cL39JaLsr+XINjn0ZkCdBY2DXc=
-github.com/twmb/franz-go/pkg/kmsg v1.6.1 h1:tm6hXPv5antMHLasTfKv9R+X03AjHSkSkXhQo2c5ALM=
-github.com/twmb/franz-go/pkg/kmsg v1.6.1/go.mod h1:se9Mjdt0Nwzc9lnjJ0HyDtLyBnaBDAd7pCje47OhSyw=
+github.com/twmb/franz-go v1.15.1 h1:ina2HNm9D5TRn+5fm0VAboOVCqF11XBAJA0JwQJnWyQ=
+github.com/twmb/franz-go v1.15.1/go.mod h1:aos+d/UBuigWkOs+6WoqEPto47EvC2jipLAO5qrAu48=
+github.com/twmb/franz-go/pkg/kadm v1.10.0 h1:3oYKNP+e3HGo4GYadrDeRxOaAIsOXmX6LBVMz9PxpCU=
+github.com/twmb/franz-go/pkg/kadm v1.10.0/go.mod h1:hUMoV4SRho+2ij/S9cL39JaLsr+XINjn0ZkCdBY2DXc=
+github.com/twmb/franz-go/pkg/kmsg v1.7.0 h1:a457IbvezYfA5UkiBvyV3zj0Is3y1i8EJgqjJYoij2E=
+github.com/twmb/franz-go/pkg/kmsg v1.7.0/go.mod h1:se9Mjdt0Nwzc9lnjJ0HyDtLyBnaBDAd7pCje47OhSyw=
 github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU=
 github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
 github.com/vmihailenco/msgpack/v5 v5.4.0 h1:hRM0digJwyR6vll33NNAwCFguy5JuBD6jxDmQP3l608=
@@ -618,7 +618,6 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=