Address review comments.

filters/openpolicyagent/openpolicyagent.go

@@ -478,54 +478,51 @@ func (registry *OpenPolicyAgentRegistry) new(store storage.Store, configBytes []
 // policies, report status, etc.
 func (opa *OpenPolicyAgentInstance) Start(ctx context.Context, timeout time.Duration) error {
 	discoveryPlugin := discovery.Lookup(opa.manager)
-	bundlePlugin := bundle.Lookup(opa.manager)
 
 	if discoveryPlugin == nil {
 		return errors.New("discovery plugin not found")
 	}
-	if bundlePlugin == nil {
-		return errors.New("bundle plugin not found")
-	}
 
 	done := make(chan struct{})
-	defer close(done)
-	failed := make(chan error)
-	defer close(failed)
+	failed := make(chan error) //ToDO ensure these channels are closed.
 
 	discoveryPlugin.RegisterListener("startuplistener", func(status bundle.Status) {
 		if len(status.Errors) > 0 {
-			select {
-			case failed <- fmt.Errorf("discovery download failed: %w", errors.Join(status.Errors...)):
-			default:
-			}
+			failed <- fmt.Errorf("discovery download failed: %w", errors.Join(status.Errors...))
 			return
 		}
 
-		// Add listener for bundle plugin on discovery plugin OK, because bundlePlugin is dependent on the configuration
-		// discovered using the discovery configs
-		bundlePlugin.Register("startuplistener", func(status bundle.Status) {
-			if len(status.Errors) > 0 {
-				select {
-				case failed <- fmt.Errorf("bundle activation failed: %w", errors.Join(status.Errors...)):
-				default:
-				}
+		discoveryStatus := opa.manager.PluginStatus()["discovery"]
+		if discoveryStatus != nil && discoveryStatus.State == plugins.StateOK {
+			bundlePlugin := bundle.Lookup(opa.manager)
+			if bundlePlugin == nil {
+				failed <- fmt.Errorf("bundle plugin not found")
 				return
 			}
 
-			select {
-			case done <- struct{}{}:
-			default:
-			}
-		})
+			bundlePlugin.Register("startuplistener", func(status bundle.Status) {
+				if len(status.Errors) > 0 {
+					failed <- fmt.Errorf("bundle activation failed: %w", errors.Join(status.Errors...))
+					return
+				}
+
+				close(done)
+			})
+			defer bundlePlugin.Unregister("startuplistener")
+		}
 	})
-	defer bundlePlugin.Unregister("startuplistener")
 
 	opa.manager.RegisterPluginStatusListener("startuplistener", func(status map[string]*plugins.Status) {
-		for _, pluginstatus := range status {
-			if pluginstatus != nil && pluginstatus.State != plugins.StateOK {
-				return
-			}
+		discoveryStatus, ok := status["discovery"]
+		if !ok || discoveryStatus.State != plugins.StateOK {
+			return
 		}
+
+		bundleStatus, ok := status["bundle"]
+		if !ok || bundleStatus.State != plugins.StateOK {
+			return
+		}
+
 		close(done)
 	})
 	defer opa.manager.UnregisterPluginStatusListener("startuplistener")

filters/openpolicyagent/openpolicyagent_test.go

@@ -258,7 +258,7 @@ func TestOpaEngineStartFailureWithTimeoutForBundlePlugin(t *testing.T) {
 
 	err = engine.Start(ctx, cfg.startupTimeout)
 	assert.True(t, engine.stopped)
-	assert.Contains(t, err.Error(), "bundle plugin not found")
+	assert.Contains(t, err.Error(), "one or more open policy agent plugins failed to start in 1s")
 }
 
 func TestOpaActivationSuccessWithDiscovery(t *testing.T) {
@@ -339,7 +339,7 @@ func TestOpaActivationTimeOutWithDiscoveryPointingWrongBundle(t *testing.T) {
 
 	instance, err := registry.NewOpenPolicyAgentInstance("test", *cfg, "testfilter")
 	assert.Nil(t, instance)
-	assert.Contains(t, err.Error(), "one or more open policy agent plugins failed to start in 1s with error: timed out while starting: context deadline exceeded")
+	assert.Contains(t, err.Error(), "one or more open policy agent plugins failed to start in 1s with error: context deadline exceeded")
 	assert.Equal(t, 0, len(registry.instances))
 }
 
@@ -353,7 +353,7 @@ func TestOpaActivationTimeOutWithDiscoveryParsingError(t *testing.T) {
 
 	instance, err := registry.NewOpenPolicyAgentInstance("test", *cfg, "testfilter")
 	assert.Nil(t, instance)
-	assert.Contains(t, err.Error(), "one or more open policy agent plugins failed to start in 1s with error: timed out while starting: context deadline exceeded")
+	assert.Contains(t, err.Error(), "one or more open policy agent plugins failed to start in 1s with error: context deadline exceeded")
 	assert.Equal(t, 0, len(registry.instances))
 }