pkg/loop: reinitialise standard capabilities

Author: jmank88

pkg/loop/internal/core/services/capability/standard/standard_capabilities.go

@@ -42,7 +42,8 @@ type StandardCapabilitiesClient struct {
 	*goplugin.ServiceClient
 	*net.BrokerExt
 
-	resources []net.Resource
+	resources      []net.Resource
+	initializeDeps *core.StandardCapabilitiesDependencies
 }
 
 var _ StandardCapabilities = (*StandardCapabilitiesClient)(nil)
@@ -58,6 +59,14 @@ func NewStandardCapabilitiesClient(brokerCfg net.BrokerConfig) *StandardCapabili
 	}
 }
 
+// Reinitialise calls Initialise with cached deps from the previous call, if one was already made.
+func (c *StandardCapabilitiesClient) Reinitialise(ctx context.Context) error {
+	if c.initializeDeps == nil {
+		return nil
+	}
+	return c.Initialise(ctx, *c.initializeDeps)
+}
+
 func (c *StandardCapabilitiesClient) Initialise(ctx context.Context, dependencies core.StandardCapabilitiesDependencies) error {
 	config := dependencies.Config
 	telemetryService := dependencies.TelemetryService
@@ -187,6 +196,7 @@ func (c *StandardCapabilitiesClient) Initialise(ctx context.Context, dependencie
 	}
 
 	c.resources = resources
+	c.initializeDeps = &dependencies
 
 	return nil
 }

pkg/loop/standard_capabilities.go

@@ -69,11 +69,11 @@ type StandardCapabilitiesService struct {
 
 func NewStandardCapabilitiesService(lggr logger.Logger, grpcOpts GRPCOpts, cmd func() *exec.Cmd) *StandardCapabilitiesService {
 	newService := func(ctx context.Context, instance any) (StandardCapabilities, services.HealthReporter, error) {
-		scs, ok := instance.(StandardCapabilities)
+		scs, ok := instance.(*standardcapability.StandardCapabilitiesClient)
 		if !ok {
 			return nil, nil, fmt.Errorf("expected StandardCapabilities but got %T", instance)
 		}
-		return scs, scs, nil
+		return scs, scs, scs.Reinitialise(ctx)
 	}
 	stopCh := make(chan struct{})
 	lggr = logger.Named(lggr, "StandardCapabilities")