Add descrioption to filter

Author: aldokimi

api/v1alpha1/volumesnapshot_types.go

@@ -56,6 +56,12 @@ type VolumeSnapshotFilter struct {
 	// +optional
 	Name *OpenStackName `json:"name,omitempty"`
 
+	// description of the existing resource
+	// +kubebuilder:validation:MinLength:=1
+	// +kubebuilder:validation:MaxLength:=255
+	// +optional
+	Description *string `json:"description,omitempty"`
+
 	// status of the existing resource
 	// +kubebuilder:validation:MinLength:=1
 	// +kubebuilder:validation:MaxLength:=255

api/v1alpha1/zz_generated.deepcopy.go

@@ -91,6 +91,11 @@ spec:
                       error state and will not continue to retry.
                     minProperties: 1
                     properties:
+                      description:
+                        description: description of the existing resource
+                        maxLength: 255
+                        minLength: 1
+                        type: string
                       name:
                         description: name of the existing resource
                         maxLength: 255

cmd/models-schema/zz_generated.openapi.go

@@ -92,13 +92,21 @@ func (actuator volumesnapshotActuator) ListOSResourcesForAdoption(ctx context.Co
 }
 
 func (actuator volumesnapshotActuator) ListOSResourcesForImport(ctx context.Context, obj orcObjectPT, filter filterT) (iter.Seq2[*osResourceT, error], progress.ReconcileStatus) {
+	var filters []osclients.ResourceFilter[osResourceT]
+
+	if filter.Description != nil {
+		filters = append(filters, func(s *snapshots.Snapshot) bool {
+			return s.Description == *filter.Description
+		})
+	}
+
 	listOpts := snapshots.ListOpts{
 		Name:     string(ptr.Deref(filter.Name, "")),
 		Status:   ptr.Deref(filter.Status, ""),
 		VolumeID: ptr.Deref(filter.VolumeID, ""),
 	}
 
-	return actuator.osClient.ListVolumeSnapshots(ctx, listOpts), nil
+	return actuator.listOSResources(ctx, filters, listOpts), nil
 }
 
 func (actuator volumesnapshotActuator) listOSResources(ctx context.Context, filters []osclients.ResourceFilter[osResourceT], listOpts snapshots.ListOptsBuilder) iter.Seq2[*snapshots.Snapshot, error] {

config/crd/bases/openstack.k-orc.cloud_volumesnapshots.yaml

@@ -21,7 +21,6 @@ spec:
     secretName: openstack-clouds
   managementPolicy: managed
   resource:
-    name: volumesnapshot-import-error-external
     description: VolumeSnapshot from "import error" test
     volumeRef: volumesnapshot-import-error
 ---
@@ -35,6 +34,5 @@ spec:
     secretName: openstack-clouds
   managementPolicy: managed
   resource:
-    name: volumesnapshot-import-error-external
     description: VolumeSnapshot from "import error" test
     volumeRef: volumesnapshot-import-error

internal/controllers/volumesnapshot/actuator.go

@@ -10,4 +10,4 @@ spec:
   managementPolicy: unmanaged
   import:
     filter:
-      name: volumesnapshot-import-error-external
+      description: VolumeSnapshot from "import error" test

internal/controllers/volumesnapshot/tests/volumesnapshot-import-error/00-create-resources.yaml

@@ -4420,6 +4420,7 @@ _Appears in:_
 | Field | Description | Default | Validation |
 | --- | --- | --- | --- |
 | `name` _[OpenStackName](#openstackname)_ | name of the existing resource |  | MaxLength: 255 <br />MinLength: 1 <br />Pattern: `^[^,]+$` <br /> |
+| `description` _string_ | description of the existing resource |  | MaxLength: 255 <br />MinLength: 1 <br /> |
 | `status` _string_ | status of the existing resource |  | MaxLength: 255 <br />MinLength: 1 <br /> |
 | `volumeID` _string_ | volumeID is the ID of the volume the snapshot was created from |  | MaxLength: 255 <br />MinLength: 1 <br /> |