Updated Tests for Anycast , Network List and Services

Author: unasra

internal/acctest/acctest.go

@@ -55,6 +55,15 @@ func RandomName() string {
 	return string(b)
 }
 
+func RandomAlphaNumeric(length int) string {
+	const charset = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
+	b := make([]byte, length)
+	for i := range b {
+		b[i] = charset[rand.Intn(len(charset))]
+	}
+	return string(b)
+}
+
 func PreCheck(t *testing.T) {
 	cspURL := os.Getenv("BLOXONE_CSP_URL")
 	if cspURL == "" {

internal/service/anycast/api_anycast_config_data_source_test.go

@@ -12,6 +12,7 @@ import (
 )
 
 func TestAccAnycastConfigDataSource_Services(t *testing.T) {
+	t.Skip("Extended Filter Support to be added to Anycast in future")
 	dataSourceName := "data.bloxone_anycast_configs.test"
 	resourceName := "bloxone_anycast_config.test"
 	var v anycast.AnycastConfig
@@ -36,6 +37,7 @@ func TestAccAnycastConfigDataSource_Services(t *testing.T) {
 }
 
 func TestAccAnycastConfigDataSource_IsConfigured(t *testing.T) {
+	t.Skip("Extended Filter Support to be added to Anycast in future")
 	dataSourceName := "data.bloxone_anycast_configs.test"
 	resourceName := "bloxone_anycast_config.test"
 	var v anycast.AnycastConfig
@@ -115,7 +117,6 @@ resource "bloxone_anycast_config" "test" {
 }
 data "bloxone_anycast_configs" "test" {
 	service = %q
-	name = bloxone_anycast_config.test.name
 	depends_on = [bloxone_anycast_config.test]
 }
 `, anycastIpAddress, name, service, service)

internal/service/fw/api_network_list_resource.go

@@ -4,14 +4,23 @@ import (
 	"context"
 	"fmt"
 	"net/http"
+	"strings"
+	"time"
 
 	"github.com/hashicorp/terraform-plugin-framework/path"
 	"github.com/hashicorp/terraform-plugin-framework/resource"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema"
+	"github.com/hashicorp/terraform-plugin-log/tflog"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
 
 	bloxoneclient "github.com/infobloxopen/bloxone-go-client/client"
 )
 
+const (
+	// NetworkListOperationTimeout is the maximum amount of time to wait for eventual consistency
+	NetworkListOperationTimeout = 2 * time.Minute
+)
+
 // Ensure provider defined types fully satisfy framework interfaces.
 var _ resource.Resource = &NetworkListResource{}
 var _ resource.ResourceWithImportState = &NetworkListResource{}
@@ -66,19 +75,29 @@ func (r *NetworkListResource) Create(ctx context.Context, req resource.CreateReq
 		return
 	}
 
-	apiRes, _, err := r.client.FWAPI.
-		NetworkListsAPI.
-		CreateNetworkList(ctx).
-		Body(*data.Expand(ctx, &resp.Diagnostics)).
-		Execute()
+	err := retry.RetryContext(ctx, NetworkListOperationTimeout, func() *retry.RetryError {
+		apiRes, _, err := r.client.FWAPI.
+			NetworkListsAPI.
+			CreateNetworkList(ctx).
+			Body(*data.Expand(ctx, &resp.Diagnostics)).
+			Execute()
+		if err != nil {
+			if strings.Contains(err.Error(), "Internal Server Error") {
+				tflog.Debug(ctx, "Waiting for related objects to be present, will retry", map[string]interface{}{"error": err.Error()})
+				return retry.RetryableError(err)
+			}
+			resp.Diagnostics.AddError("Client Error", fmt.Sprintf("Unable to create NetworkList, got error: %s", err))
+			return retry.NonRetryableError(err)
+		}
+		res := apiRes.GetResults()
+		data.Flatten(ctx, &res, &resp.Diagnostics)
+
+		return nil
+	})
 	if err != nil {
-		resp.Diagnostics.AddError("Client Error", fmt.Sprintf("Unable to create NetworkLists, got error: %s", err))
 		return
 	}
 
-	res := apiRes.GetResults()
-	data.Flatten(ctx, &res, &resp.Diagnostics)
-
 	// Save data into Terraform state
 	resp.Diagnostics.Append(resp.State.Set(ctx, &data)...)
 }

internal/service/infra_mgmt/api_services_resource_test.go

@@ -2,8 +2,6 @@ package infra_mgmt_test
 
 import (
 	"context"
-	"crypto/sha256"
-	"encoding/hex"
 	"errors"
 	"fmt"
 	"net/http"
@@ -282,7 +280,7 @@ func testAccCheckServicesDisappears(ctx context.Context, v *inframgmt.Service) r
 	}
 }
 func testAccServicesBaseWithHost(hostName string) string {
-	sn := hex.EncodeToString(sha256.New().Sum([]byte(hostName)))
+	sn := acctest.RandomAlphaNumeric(10)
 	return fmt.Sprintf(`
 resource "bloxone_infra_host" "test" {
   display_name = %q