Update snapshots data_source filters

closed #344
outscale · Oct 13, 2023 · c0f8121 · c0f8121
1 parent 12d9373
commit c0f8121
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 5 deletions.
diff --git a/outscale/data_source_outscale_snapshot.go b/outscale/data_source_outscale_snapshot.go
@@ -9,6 +9,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/nav-inc/datetime"
 	oscgo "github.com/outscale/osc-sdk-go/v2"
 	"github.com/terraform-providers/terraform-provider-outscale/utils"
 )
@@ -108,7 +109,9 @@ func dataSourceOutscaleOAPISnapshotRead(d *schema.ResourceData, meta interface{}
 		params.SetFilters(filter)
 	}
 	if filtersOk {
-		buildOutscaleOapiSnapshootDataSourceFilters(filters.(*schema.Set), params.Filters)
+		if err := buildOutscaleOapiSnapshootDataSourceFilters(filters.(*schema.Set), params.Filters); err != nil {
+			return err
+		}
 	}
 	if ownersOk {
 		filter.SetAccountIds([]string{owners.(string)})
@@ -188,7 +191,7 @@ func snapshotOAPIDescriptionAttributes(d *schema.ResourceData, snapshot *oscgo.S
 	return d.Set("tags", tagsOSCAPIToMap(snapshot.GetTags()))
 }
 
-func buildOutscaleOapiSnapshootDataSourceFilters(set *schema.Set, filter *oscgo.FiltersSnapshot) *oscgo.FiltersSnapshot {
+func buildOutscaleOapiSnapshootDataSourceFilters(set *schema.Set, filter *oscgo.FiltersSnapshot) error {
 
 	for _, v := range set.List() {
 		m := v.(map[string]interface{})
@@ -207,12 +210,28 @@ func buildOutscaleOapiSnapshootDataSourceFilters(set *schema.Set, filter *oscgo.
 
 		case "descriptions":
 			filter.SetDescriptions(values)
+		case "to_creation_date":
+			valDate, err := parsingfilterDateFormat("to_creation_date", values[0])
+			if err != nil {
+				return err
+			}
+			filter.SetToCreationDate(valDate)
+
+		case "from_creation_date":
+			valDate, err := parsingfilterDateFormat("from_creation_date", values[0])
+			if err != nil {
+				return err
+			}
+			filter.SetFromCreationDate(valDate)
 
 		case "permissions_to_create_volume_account_ids":
 			filter.SetPermissionsToCreateVolumeAccountIds(values)
 
 		case "permissions_to_create_volume_global_permission":
-			boolean, _ := strconv.ParseBool(values[0])
+			boolean, err := strconv.ParseBool(values[0])
+			if err != nil {
+				return err
+			}
 			filter.SetPermissionsToCreateVolumeGlobalPermission(boolean)
 
 		case "progresses":
@@ -243,5 +262,14 @@ func buildOutscaleOapiSnapshootDataSourceFilters(set *schema.Set, filter *oscgo.
 			log.Printf("[Debug] Unknown Filter Name: %s.", name)
 		}
 	}
-	return filter
+	return nil
+}
+func parsingfilterDateFormat(filterName, value string) (time.Time, error) {
+	var err error
+	var filterDate time.Time
+
+	if filterDate, err = datetime.Parse(value, time.UTC); err != nil {
+		return filterDate, fmt.Errorf("%s value should be 'ISO 8601' format ('2017-06-14' or '2017-06-14T00:00:00Z, ...) %s", filterName, err)
+	}
+	return filterDate, nil
 }
diff --git a/outscale/data_source_outscale_snapshot_test.go b/outscale/data_source_outscale_snapshot_test.go
@@ -94,6 +94,10 @@ func testAccCheckOutscaleOAPISnapshotDataSourceConfigWithMultipleFilters(region
 				name   = "volume_sizes"
 				values = ["10"]
 			}
+			filter {
+				name   = "from_creation_date"
+				values = ["2023"]
+			}
 		}
 	`, region)
 }
diff --git a/outscale/data_source_outscale_snapshots.go b/outscale/data_source_outscale_snapshots.go
@@ -125,9 +125,13 @@ func dataSourceOutscaleOAPISnapshotsRead(d *schema.ResourceData, meta interface{
 		filter.SetPermissionsToCreateVolumeAccountIds(utils.InterfaceSliceToStringSlice(restorableUsers.([]interface{})))
 		params.SetFilters(filter)
 	}
+
 	if filtersOk {
-		buildOutscaleOapiSnapshootDataSourceFilters(filters.(*schema.Set), params.Filters)
+		if err := buildOutscaleOapiSnapshootDataSourceFilters(filters.(*schema.Set), params.Filters); err != nil {
+			return err
+		}
 	}
+
 	if ownersOk {
 		filter.SetAccountIds(utils.InterfaceSliceToStringSlice(owners.([]interface{})))
 		params.SetFilters(filter)

diff --git a/...pshot/TF-130_snapshot_datasource_attributes_ok/step1.snapshot_datasource_attributes_ok.tf b/...pshot/TF-130_snapshot_datasource_attributes_ok/step1.snapshot_datasource_attributes_ok.tf
@@ -20,4 +20,8 @@ data "outscale_snapshot" "outscale_snapshot" {
         name   = "snapshot_ids"
         values = [outscale_snapshot.outscale_snapshot.snapshot_id]
     }
+  filter {
+    name   = "from_creation_date"
+    values = ["2023"]
+  }
 }
diff --git a/...ata/volume/TF-154_volume_resource_attributes_ok2/step1.volume_resource_attributes_ok2.ref b/...ata/volume/TF-154_volume_resource_attributes_ok2/step1.volume_resource_attributes_ok2.ref
@@ -29,6 +29,7 @@
                                 "value": "volume-io1"
                             }
                         ],
+                        "termination_snapshot_name": null,
                         "volume_id": "##id-0##",
                         "volume_type": "io1"
                     },