Namespace fallback for annotation logs

[tun0]

Ref:

notification-controller/internal/server/receiver_handlers.go

Lines 96 to 105 in 7448a66

	for _, resource := range receiver.Spec.Resources {
	if err := s.annotate(ctx, resource, receiver.Namespace); err != nil {
	logger.Error(err, fmt.Sprintf("unable to annotate resource '%s/%s.%s'",
	resource.Kind, resource.Name, resource.Namespace))
	withErrors = true
	} else {
	logger.Info(fmt.Sprintf("resource '%s/%s.%s' annotated",
	resource.Kind, resource.Name, resource.Namespace))
	}
	}

Currently my logs are showing like resource '<Kind>/<Name>.' annotated. Note the trailing dot after <Name>. It would be nice to either:

• Make that dot optional when resource.Namespace isn't defined.
• Fallback to receiver.Namespace if resource.Namespace isn't defined.

[knutgoetz]

Isn't this already fixed and can be closed?
Right now the defaultNamespace is set as the namespace and as far as i can tell the method is always called with defaultName set to the namespace of the relevant Receiver resource.

notification-controller/internal/server/receiver_handlers.go

Lines 367 to 371 in 820fe53

	func (s *ReceiverServer) requestReconciliation(ctx context.Context, logger logr.Logger, resource apiv1.CrossNamespaceObjectReference, defaultNamespace string) error {
	namespace := defaultNamespace
	if resource.Namespace != "" {
	namespace = resource.Namespace
	}

Updated original snippet:

notification-controller/internal/server/receiver_handlers.go

Lines 411 to 417 in 820fe53

	for i, resource := range resources.Items {
	if err := s.annotate(ctx, &resources.Items[i]); err != nil {
	return fmt.Errorf("failed to annotate resource: '%s/%s.%s': %w", resource.Kind, resource.Name, namespace, err)
	} else {
	logger.Info(fmt.Sprintf("resource '%s/%s.%s' annotated",
	resource.Kind, resource.Name, namespace))
	}

[makkes]

Good catch. Yes, this has been fixed as a side effect of #482 and is included in all version starting from 1.0.0 (i.e. Flux 2.0.0+).