diff --git a/fwprovider/cluster/sdn/zone/datasource_generic.go b/fwprovider/cluster/sdn/zone/datasource_generic.go index 3547ed87..0406030f 100644 --- a/fwprovider/cluster/sdn/zone/datasource_generic.go +++ b/fwprovider/cluster/sdn/zone/datasource_generic.go @@ -131,6 +131,7 @@ func (d *genericZoneDataSource) Read(ctx context.Context, req datasource.ReadReq "SDN Zone Not Found", fmt.Sprintf("SDN zone with ID '%s' was not found", state.getID()), ) + return } @@ -153,6 +154,7 @@ func (d *genericZoneDataSource) Read(ctx context.Context, req datasource.ReadReq zone.ID, ), ) + return } diff --git a/fwprovider/cluster/sdn/zone/datasource_zones.go b/fwprovider/cluster/sdn/zone/datasource_zones.go index c82707c1..f412c50f 100644 --- a/fwprovider/cluster/sdn/zone/datasource_zones.go +++ b/fwprovider/cluster/sdn/zone/datasource_zones.go @@ -154,13 +154,16 @@ func (d *zonesDataSource) Read(ctx context.Context, req datasource.ReadRequest, "Unable to Read SDN Zones", err.Error(), ) + return } filteredZones := zonesList + if !data.Type.IsNull() && !data.Type.IsUnknown() { filterType := data.Type.ValueString() filteredZones = make([]zones.ZoneData, 0) + for _, zone := range zonesList { if zone.Type != nil && *zone.Type == filterType { filteredZones = append(filteredZones, zone)