fix(instance): fix datasource name queries (#585)

Signed-off-by: Patrik Cyvoct <[email protected]>

Author: Sh4d1

scaleway/data_source_instance_image.go

@@ -107,24 +107,30 @@ func dataSourceScalewayInstanceImageRead(d *schema.ResourceData, m interface{})
 		if err != nil {
 			return err
 		}
-		if len(res.Images) == 0 {
+		var matchingImages []*instance.Image
+		for _, image := range res.Images {
+			if image.Name == d.Get("name").(string) {
+				matchingImages = append(matchingImages, image)
+			}
+		}
+
+		if len(matchingImages) == 0 {
 			return fmt.Errorf("no image found with the name %s and architecture %s in zone %s", d.Get("name"), d.Get("architecture"), zone)
 		}
-		if len(res.Images) > 1 && !d.Get("latest").(bool) {
-			return fmt.Errorf("%d images found with the same name %s and architecture %s in zone %s", len(res.Images), d.Get("name"), d.Get("architecture"), zone)
+		if len(matchingImages) > 1 && !d.Get("latest").(bool) {
+			return fmt.Errorf("%d images found with the same name %s and architecture %s in zone %s", len(matchingImages), d.Get("name"), d.Get("architecture"), zone)
 		}
-		sort.Slice(res.Images, func(i, j int) bool {
-			return res.Images[i].ModificationDate.After(*res.Images[j].ModificationDate)
+
+		sort.Slice(matchingImages, func(i, j int) bool {
+			return matchingImages[i].ModificationDate.After(*matchingImages[j].ModificationDate)
 		})
-		for _, image := range res.Images {
+		for _, image := range matchingImages {
 			if image.Name == d.Get("name").(string) {
 				imageID = image.ID
 				break
 			}
 		}
-		if imageID == "" {
-			return fmt.Errorf("no image found with the name %s and architecture %s in zone %s", d.Get("name"), d.Get("architecture"), zone)
-		}
+		// imageID will always be set here
 	}
 
 	zonedID := datasourceNewZonedID(imageID, zone)

scaleway/data_source_instance_security_group.go

@@ -47,13 +47,17 @@ func dataSourceScalewayInstanceSecurityGroupRead(d *schema.ResourceData, m inter
 		if err != nil {
 			return err
 		}
-		if len(res.SecurityGroups) == 0 {
-			return fmt.Errorf("no security group found with the name %s", d.Get("name"))
+		for _, sg := range res.SecurityGroups {
+			if sg.Name == d.Get("name").(string) {
+				if securityGroupID != "" {
+					return fmt.Errorf("more than 1 security group found with the same name %s", d.Get("name"))
+				}
+				securityGroupID = sg.ID
+			}
 		}
-		if len(res.SecurityGroups) > 1 {
-			return fmt.Errorf("%d security groups found with the same name %s", len(res.SecurityGroups), d.Get("name"))
+		if securityGroupID == "" {
+			return fmt.Errorf("no security group found with the name %s", d.Get("name"))
 		}
-		securityGroupID = res.SecurityGroups[0].ID
 	}
 
 	zonedID := datasourceNewZonedID(securityGroupID, zone)

scaleway/data_source_instance_server.go

@@ -46,13 +46,17 @@ func dataSourceScalewayInstanceServerRead(d *schema.ResourceData, m interface{})
 		if err != nil {
 			return err
 		}
-		if len(res.Servers) == 0 {
-			return fmt.Errorf("no server found with the name %s", d.Get("name"))
+		for _, instance := range res.Servers {
+			if instance.Name == d.Get("name").(string) {
+				if serverID != "" {
+					return fmt.Errorf("more than 1 server found with the same name %s", d.Get("name"))
+				}
+				serverID = instance.ID
+			}
 		}
-		if len(res.Servers) > 1 {
-			return fmt.Errorf("%d servers found with the same name %s", len(res.Servers), d.Get("name"))
+		if serverID == "" {
+			return fmt.Errorf("no server found with the name %s", d.Get("name"))
 		}
-		serverID = res.Servers[0].ID
 	}
 
 	zonedID := datasourceNewZonedID(serverID, zone)

scaleway/data_source_instance_volume.go

@@ -45,13 +45,17 @@ func dataSourceScalewayInstanceVolumeRead(d *schema.ResourceData, m interface{})
 		if err != nil {
 			return err
 		}
-		if len(res.Volumes) == 0 {
-			return fmt.Errorf("no volume found with the name %s", d.Get("name"))
+		for _, volume := range res.Volumes {
+			if volume.Name == d.Get("name").(string) {
+				if volumeID != "" {
+					return fmt.Errorf("more than 1 volume found with the same name %s", d.Get("name"))
+				}
+				volumeID = volume.ID
+			}
 		}
-		if len(res.Volumes) > 1 {
-			return fmt.Errorf("%d volumes found with the same name %s", len(res.Volumes), d.Get("name"))
+		if volumeID == "" {
+			return fmt.Errorf("no volume found with the name %s", d.Get("name"))
 		}
-		volumeID = res.Volumes[0].ID
 	}
 
 	zonedID := datasourceNewZonedID(volumeID, zone)