RegisteredLimit Actuator and Status

On-behalf-of: SAP nils.gondermann@sap.com

Author: gndrmnn

internal/controllers/registeredlimit/actuator.go

@@ -31,6 +31,7 @@ import (
 	"github.com/k-orc/openstack-resource-controller/v2/internal/controllers/generic/progress"
 	"github.com/k-orc/openstack-resource-controller/v2/internal/logging"
 	"github.com/k-orc/openstack-resource-controller/v2/internal/osclients"
+	"github.com/k-orc/openstack-resource-controller/v2/internal/util/dependency"
 	orcerrors "github.com/k-orc/openstack-resource-controller/v2/internal/util/errors"
 )
 
@@ -70,27 +71,65 @@ func (actuator registeredlimitActuator) ListOSResourcesForAdoption(ctx context.C
 		return nil, false
 	}
 
-	// TODO(scaffolding) If you need to filter resources on fields that the List() function
-	// of gophercloud does not support, it's possible to perform client-side filtering.
-	// Check osclients.ResourceFilter
+	service, _ := dependency.FetchDependency[*orcv1alpha1.Service](
+		ctx, actuator.k8sClient, orcObject.Namespace, &resourceSpec.ServiceRef, "Service",
+		orcv1alpha1.IsAvailable,
+	)
+
+	if service.Status.ID == nil {
+		return nil, false
+	}
+
+	var filters []osclients.ResourceFilter[osResourceT]
+
+	// Add client-side filters
+	if resourceSpec.Description != nil {
+		filters = append(filters, func(f *registeredlimits.RegisteredLimit) bool {
+			return f.Description == *resourceSpec.Description
+		})
+	}
 
 	listOpts := registeredlimits.ListOpts{
-		// TODO(scaffolding): Add import filters
+		ResourceName: resourceSpec.ResourceName,
+		ServiceID:    ptr.Deref(service.Status.ID, ""),
 	}
 
-	return actuator.osClient.ListRegisteredLimits(ctx, listOpts), true
+	return actuator.listOSResources(ctx, filters, listOpts), true
 }
 
 func (actuator registeredlimitActuator) ListOSResourcesForImport(ctx context.Context, obj orcObjectPT, filter filterT) (iter.Seq2[*osResourceT, error], progress.ReconcileStatus) {
-	// TODO(scaffolding) If you need to filter resources on fields that the List() function
-	// of gophercloud does not support, it's possible to perform client-side filtering.
-	// Check osclients.ResourceFilter
+	var reconcileStatus progress.ReconcileStatus
+
+	service, rs := dependency.FetchDependency[*orcv1alpha1.Service](
+		ctx, actuator.k8sClient, obj.Namespace, filter.ServiceRef, "Service",
+		orcv1alpha1.IsAvailable,
+	)
+	reconcileStatus = reconcileStatus.WithReconcileStatus(rs)
+
+	if needsReschedule, _ := reconcileStatus.NeedsReschedule(); needsReschedule {
+		return nil, reconcileStatus
+	}
+
+	var filters []osclients.ResourceFilter[osResourceT]
+
+	// Add client-side filters
+	if filter.Description != nil {
+		filters = append(filters, func(f *registeredlimits.RegisteredLimit) bool {
+			return f.Description == *filter.Description
+		})
+	}
 
 	listOpts := registeredlimits.ListOpts{
-		// TODO(scaffolding): Add import filters
+		ResourceName: ptr.Deref(filter.ResourceName, ""),
+		ServiceID:    ptr.Deref(service.Status.ID, ""),
 	}
 
-	return actuator.osClient.ListRegisteredLimits(ctx, listOpts), nil
+	return actuator.listOSResources(ctx, filters, listOpts), nil
+}
+
+func (actuator registeredlimitActuator) listOSResources(ctx context.Context, filters []osclients.ResourceFilter[osResourceT], listOpts registeredlimits.ListOptsBuilder) iter.Seq2[*registeredlimits.RegisteredLimit, error] {
+	registeredLimits := actuator.osClient.ListRegisteredLimits(ctx, listOpts)
+	return osclients.Filter(registeredLimits, filters...)
 }
 
 func (actuator registeredlimitActuator) CreateResource(ctx context.Context, obj orcObjectPT) (*osResourceT, progress.ReconcileStatus) {
@@ -115,9 +154,10 @@ func (actuator registeredlimitActuator) CreateResource(ctx context.Context, obj
 		return nil, reconcileStatus
 	}
 	createOpts := registeredlimits.CreateOpts{
-		Description: ptr.Deref(resource.Description, ""),
-		ServiceID:   serviceID,
-		// TODO(scaffolding): Add more fields
+		ServiceID:    serviceID,
+		ResourceName: resource.ResourceName,
+		DefaultLimit: int(*resource.DefaultLimit),
+		Description:  ptr.Deref(resource.Description, ""),
 	}
 	batchCreateOpts := registeredlimits.BatchCreateOpts{
 		createOpts,
@@ -181,7 +221,7 @@ func needsUpdate(updateOpts registeredlimits.UpdateOpts) (bool, error) {
 		return false, err
 	}
 
-	updateMap, ok := updateOptsMap["registered_limits"].(map[string]any)
+	updateMap, ok := updateOptsMap["registered_limit"].(map[string]any)
 	if !ok {
 		updateMap = make(map[string]any)
 	}

internal/controllers/registeredlimit/status.go

@@ -50,10 +50,9 @@ func (registeredlimitStatusWriter) ResourceAvailableStatus(orcObject *orcv1alpha
 
 func (registeredlimitStatusWriter) ApplyResourceStatus(log logr.Logger, osResource *osResourceT, statusApply *statusApplyT) {
 	resourceStatus := orcapplyconfigv1alpha1.RegisteredLimitResourceStatus().
-		WithServiceID(osResource.ServiceID)
-
-	// TODO(scaffolding): add all of the fields supported in the RegisteredLimitResourceStatus struct
-	// If a zero-value isn't expected in the response, place it behind a conditional
+		WithServiceID(osResource.ServiceID).
+		WithDefaultLimit(int32(osResource.DefaultLimit)).
+		WithResourceName(osResource.ResourceName)
 
 	if osResource.Description != "" {
 		resourceStatus.WithDescription(osResource.Description)