Bump to latest Hive to pull job NewGroup() fixes

joamaki · joamaki · commit 3d1520764677 · 2025-05-22T16:19:07.000+02:00
This pulls in cilium/hive#51 and fixes the usage. Signed-off-by: Jussi Maki <jussi.maki@isovalent.com>
diff --git a/derive.go b/derive.go
@@ -52,14 +52,12 @@ type DeriveParams[In, Out any] struct {
 //	)
 func Derive[In, Out any](jobName string, transform func(obj In, deleted bool) (Out, DeriveResult)) func(DeriveParams[In, Out]) {
 	return func(p DeriveParams[In, Out]) {
-		g := p.Jobs.NewGroup(p.Health)
+		g := p.Jobs.NewGroup(p.Health, p.Lifecycle)
 		g.Add(job.OneShot(
 			jobName,
 			derive[In, Out]{p, jobName, transform}.loop),
 		)
-		p.Lifecycle.Append(g)
 	}
-
 }
 
 type derive[In, Out any] struct {
diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/cilium/statedb
 go 1.23
 
 require (
-	github.com/cilium/hive v0.0.0-20241213121623-605c1412b9b3
+	github.com/cilium/hive v0.0.0-20250522123230-2946c4940f41
 	github.com/cilium/stream v0.0.0-20240209152734-a0792b51812d
 	github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de
 	github.com/spf13/cobra v1.8.0
@@ -18,6 +18,7 @@ require (
 require (
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
+	github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
diff --git a/go.sum b/go.sum
@@ -2,6 +2,10 @@ github.com/cilium/hive v0.0.0-20241213101835-553aca42f74a h1:KuDVdRWFhuntkXMuXBr
 github.com/cilium/hive v0.0.0-20241213101835-553aca42f74a/go.mod h1:pI2GJ1n3SLKIQVFrKF7W6A6gb6BQkZ+3Hp4PAEo5SuI=
 github.com/cilium/hive v0.0.0-20241213121623-605c1412b9b3 h1:RfmUH1ouzj0LzORYJRhp43e1rlGpx6GNv4NIRUakU2w=
 github.com/cilium/hive v0.0.0-20241213121623-605c1412b9b3/go.mod h1:pI2GJ1n3SLKIQVFrKF7W6A6gb6BQkZ+3Hp4PAEo5SuI=
+github.com/cilium/hive v0.0.0-20250409150907-8eacab6fab5b h1:00k4EwXiIZ2J3cMt0xvawCqYu/oULGIpKta3o/U8CgE=
+github.com/cilium/hive v0.0.0-20250409150907-8eacab6fab5b/go.mod h1:3DSFWuYTjYtWkanf84uwMgDvP1pjJ313zXJxMfkz/Eg=
+github.com/cilium/hive v0.0.0-20250522123230-2946c4940f41 h1:H3y9UKJpLlMhkuu+008rotTY52gGIE8U2wEUJKp+hoc=
+github.com/cilium/hive v0.0.0-20250522123230-2946c4940f41/go.mod h1:3DSFWuYTjYtWkanf84uwMgDvP1pjJ313zXJxMfkz/Eg=
 github.com/cilium/stream v0.0.0-20240209152734-a0792b51812d h1:p6MgATaKEB9o7iAsk9rlzXNDMNCeKPAkx4Y8f+Zq8X8=
 github.com/cilium/stream v0.0.0-20240209152734-a0792b51812d/go.mod h1:3VLiLgs8wfjirkuYqos4t0IBPQ+sXtf3tFkChLm6ARM=
 github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
@@ -13,6 +17,8 @@ github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHk
 github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 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/go-viper/mapstructure/v2 v2.2.1 h1:ZAaOCxANMuZx5RCeg0mBdEZk7DZasvvZIxtHqx8aGss=
+github.com/go-viper/mapstructure/v2 v2.2.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
diff --git a/reconciler/builder.go b/reconciler/builder.go
@@ -79,14 +79,12 @@ func Register[Obj comparable](
 		primaryIndexer:       idx,
 	}
 
-	g := params.Jobs.NewGroup(params.Health)
+	g := params.Jobs.NewGroup(params.Health, params.Lifecycle)
 
 	g.Add(job.OneShot("reconcile", r.reconcileLoop))
 	if r.config.RefreshInterval > 0 {
 		g.Add(job.OneShot("refresh", r.refreshLoop))
 	}
-	params.Lifecycle.Append(g)
-
 	return r, nil
 }
 
diff --git a/reconciler/multi_test.go b/reconciler/multi_test.go
@@ -84,9 +84,7 @@ func TestMultipleReconcilers(t *testing.T) {
 			cell.NewSimpleHealth,
 			reconciler.NewExpVarMetrics,
 			func(r job.Registry, h cell.Health, lc cell.Lifecycle) job.Group {
-				g := r.NewGroup(h)
-				lc.Append(g)
-				return g
+				return r.NewGroup(h, lc)
 			},
 		),
 		cell.Invoke(func(db_ *statedb.DB) error {

Original file line number	Diff line number	Diff line change
`@@ -52,14 +52,12 @@ type DeriveParams[In, Out any] struct {`
`52`	`52`	`// )`
`53`	`53`	`func Derive[In, Out any](jobName string, transform func(obj In, deleted bool) (Out, DeriveResult)) func(DeriveParams[In, Out]) {`
`54`	`54`	`return func(p DeriveParams[In, Out]) {`
`55`		`- g := p.Jobs.NewGroup(p.Health)`
	`55`	`+ g := p.Jobs.NewGroup(p.Health, p.Lifecycle)`
`56`	`56`	`g.Add(job.OneShot(`
`57`	`57`	`jobName,`
`58`	`58`	`derive[In, Out]{p, jobName, transform}.loop),`
`59`	`59`	`)`
`60`		`- p.Lifecycle.Append(g)`
`61`	`60`	`}`
`62`		`-`
`63`	`61`	`}`
`64`	`62`
`65`	`63`	`type derive[In, Out any] struct {`
Original file line number	Diff line number	Diff line change
`@@ -79,14 +79,12 @@ func Register[Obj comparable](`
`79`	`79`	`primaryIndexer: idx,`
`80`	`80`	`}`
`81`	`81`
`82`		`- g := params.Jobs.NewGroup(params.Health)`
	`82`	`+ g := params.Jobs.NewGroup(params.Health, params.Lifecycle)`
`83`	`83`
`84`	`84`	`g.Add(job.OneShot("reconcile", r.reconcileLoop))`
`85`	`85`	`if r.config.RefreshInterval > 0 {`
`86`	`86`	`g.Add(job.OneShot("refresh", r.refreshLoop))`
`87`	`87`	`}`
`88`		`- params.Lifecycle.Append(g)`
`89`		`-`
`90`	`88`	`return r, nil`
`91`	`89`	`}`
`92`	`90`