grafana_oncall_team: Add retry

Follow-up to #540
Most of the time the datasource finds a team that was just created, but sometimes it takes a short time for the API to sync
With a retry, it shouldn't be flaky anymore

Author: julienduchesne

internal/resources/oncall/data_source_team.go

@@ -2,9 +2,12 @@ package oncall
 
 import (
 	"context"
+	"fmt"
+	"time"
 
 	onCallAPI "github.com/grafana/amixr-api-go-client"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
@@ -30,24 +33,33 @@ func dataSourceTeam() *schema.Resource {
 }
 
 func dataSourceTeamRead(ctx context.Context, d *schema.ResourceData, client *onCallAPI.Client) diag.Diagnostics {
-	options := &onCallAPI.ListTeamOptions{}
-	nameData := d.Get("name").(string)
+	var team *onCallAPI.Team
 
-	options.Name = nameData
+	// Retry because the team might not be immediately available
+	err := retry.RetryContext(ctx, 1*time.Minute, func() *retry.RetryError {
+		options := &onCallAPI.ListTeamOptions{}
+		nameData := d.Get("name").(string)
 
-	teamsResponse, _, err := client.Teams.ListTeams(options)
+		options.Name = nameData
+
+		teamsResponse, _, err := client.Teams.ListTeams(options)
+		if err != nil {
+			return retry.NonRetryableError(err)
+		}
+
+		if len(teamsResponse.Teams) == 0 {
+			return retry.RetryableError(fmt.Errorf("couldn't find a team matching: %s", options.Name))
+		} else if len(teamsResponse.Teams) != 1 {
+			return retry.RetryableError(fmt.Errorf("more than one team found matching: %s", options.Name))
+		}
+
+		team = teamsResponse.Teams[0]
+		return nil
+	})
 	if err != nil {
 		return diag.FromErr(err)
 	}
 
-	if len(teamsResponse.Teams) == 0 {
-		return diag.Errorf("couldn't find a team matching: %s", options.Name)
-	} else if len(teamsResponse.Teams) != 1 {
-		return diag.Errorf("more than one team found matching: %s", options.Name)
-	}
-
-	team := teamsResponse.Teams[0]
-
 	d.Set("name", team.Name)
 	d.Set("email", team.Email)
 	d.Set("avatar_url", team.AvatarUrl)

internal/resources/oncall/data_source_team_test.go

@@ -2,7 +2,6 @@ package oncall_test
 
 import (
 	"fmt"
-	"regexp"
 	"testing"
 
 	"github.com/grafana/terraform-provider-grafana/v2/internal/testutils"
@@ -19,17 +18,25 @@ func TestAccDataSourceTeam_Basic(t *testing.T) {
 		ProtoV5ProviderFactories: testutils.ProtoV5ProviderFactories,
 		Steps: []resource.TestStep{
 			{
-				Config:      testAccDataSourceTeamConfig(teamName),
-				ExpectError: regexp.MustCompile(`couldn't find a team`),
+				Config: testAccDataSourceTeamConfig(teamName),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttrSet("data.grafana_oncall_team.test-acc-team", "id"),
+					resource.TestCheckResourceAttr("data.grafana_oncall_team.test-acc-team", "name", teamName),
+				),
 			},
 		},
 	})
 }
 
 func testAccDataSourceTeamConfig(teamName string) string {
 	return fmt.Sprintf(`
+resource "grafana_team" "test-acc-team" {
+	name = "%[1]s"
+}
+
 data "grafana_oncall_team" "test-acc-team" {
-	name = "%s"
+	depends_on = [grafana_team.test-acc-team]
+	name = "%[1]s"
 }
 `, teamName)
 }