Merge pull request #56 from sjauld/bugfix/data_source_404

Check for data source 404 in the correct place

Author: paultyng

grafana/resource_data_source.go

@@ -167,17 +167,16 @@ func ReadDataSource(d *schema.ResourceData, meta interface{}) error {
 	idStr := d.Id()
 	id, err := strconv.ParseInt(idStr, 10, 64)
 	if err != nil {
-		if err.Error() == "404 Not Found" {
-			log.Printf("[WARN] removing datasource %s from state because it no longer exists in grafana", d.Get("name").(string))
-			d.SetId("")
-			return nil
-		}
 		return fmt.Errorf("Invalid id: %#v", idStr)
 	}
 
 	dataSource, err := client.DataSource(id)
 	if err != nil {
-
+		if err.Error() == "404 Not Found" {
+			log.Printf("[WARN] removing datasource %s from state because it no longer exists in grafana", d.Get("name").(string))
+			d.SetId("")
+			return nil
+		}
 		return err
 	}