Add retry on GET for resource group and trusted profile (IBM-Cloud#6277)

* Add retry for get resource group

* Add retry for get trusted profile

Author: hkantare

ibm/service/iamidentity/resource_ibm_iam_trusted_profile.go

@@ -11,14 +11,15 @@ import (
 	"context"
 	"fmt"
 	"log"
-
-	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"time"
 
 	"github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns"
 	"github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex"
 	"github.com/IBM/go-sdk-core/v5/core"
 	"github.com/IBM/platform-services-go-sdk/iamidentityv1"
+	"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"
 )
 
 func ResourceIBMIAMTrustedProfile() *schema.Resource {
@@ -185,8 +186,23 @@ func resourceIBMIamTrustedProfileRead(context context.Context, d *schema.Resourc
 	getProfileOptions := &iamidentityv1.GetProfileOptions{}
 
 	getProfileOptions.SetProfileID(d.Id())
+	var trustedProfile *iamidentityv1.TrustedProfile
+	var response *core.DetailedResponse
+
+	err = retry.RetryContext(context, 5*time.Minute, func() *retry.RetryError {
+		trustedProfile, response, err = iamIdentityClient.GetProfileWithContext(context, getProfileOptions)
+		if err != nil || trustedProfile == nil {
+			if response != nil && response.StatusCode == 404 {
+				return retry.RetryableError(err)
+			}
+			return retry.NonRetryableError(err)
+		}
+		return nil
+	})
 
-	trustedProfile, response, err := iamIdentityClient.GetProfileWithContext(context, getProfileOptions)
+	if conns.IsResourceTimeoutError(err) {
+		trustedProfile, response, err = iamIdentityClient.GetProfileWithContext(context, getProfileOptions)
+	}
 	if err != nil {
 		if response != nil && response.StatusCode == 404 {
 			d.SetId("")

ibm/service/resourcemanager/resource_ibm_resource_group.go

@@ -4,25 +4,28 @@
 package resourcemanager
 
 import (
+	"context"
 	"fmt"
 	"log"
 	"time"
 
 	"github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns"
+	"github.com/IBM/go-sdk-core/v5/core"
 	rg "github.com/IBM/platform-services-go-sdk/resourcemanagerv2"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 func ResourceIBMResourceGroup() *schema.Resource {
 	return &schema.Resource{
-		Create:   resourceIBMResourceGroupCreate,
-		Read:     resourceIBMResourceGroupRead,
-		Update:   resourceIBMResourceGroupUpdate,
-		Delete:   resourceIBMResourceGroupDelete,
-		Exists:   resourceIBMResourceGroupExists,
-		Importer: &schema.ResourceImporter{},
+		CreateContext: resourceIBMResourceGroupCreate,
+		ReadContext:   resourceIBMResourceGroupRead,
+		UpdateContext: resourceIBMResourceGroupUpdate,
+		DeleteContext: resourceIBMResourceGroupDelete,
+		Exists:        resourceIBMResourceGroupExists,
+		Importer:      &schema.ResourceImporter{},
 
 		Timeouts: &schema.ResourceTimeout{
 			Delete: schema.DefaultTimeout(20 * time.Minute),
@@ -97,16 +100,16 @@ func ResourceIBMResourceGroup() *schema.Resource {
 	}
 }
 
-func resourceIBMResourceGroupCreate(d *schema.ResourceData, meta interface{}) error {
+func resourceIBMResourceGroupCreate(context context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	rMgtClient, err := meta.(conns.ClientSession).ResourceManagerV2API()
 	if err != nil {
-		return err
+		return diag.FromErr(err)
 	}
 	name := d.Get("name").(string)
 
 	userDetails, err := meta.(conns.ClientSession).BluemixUserDetails()
 	if err != nil {
-		return err
+		return diag.FromErr(err)
 	}
 	accountID := userDetails.UserAccount
 
@@ -117,34 +120,48 @@ func resourceIBMResourceGroupCreate(d *schema.ResourceData, meta interface{}) er
 
 	resourceGroup, resp, err := rMgtClient.CreateResourceGroup(&resourceGroupCreate)
 	if err != nil {
-		return fmt.Errorf("[ERROR] Error creating resource group: %s with response code  %s", err, resp)
+		return diag.FromErr(fmt.Errorf("[ERROR] Error creating resource group: %s with response code  %s", err, resp))
 	}
 
 	d.SetId(*resourceGroup.ID)
 
-	return resourceIBMResourceGroupRead(d, meta)
+	return resourceIBMResourceGroupRead(context, d, meta)
 }
 
-func resourceIBMResourceGroupRead(d *schema.ResourceData, meta interface{}) error {
+func resourceIBMResourceGroupRead(context context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	rMgtClient, err := meta.(conns.ClientSession).ResourceManagerV2API()
 	if err != nil {
-		return err
+		return diag.FromErr(err)
 	}
 	resourceGroupID := d.Id()
 	resourceGroupGet := rg.GetResourceGroupOptions{
 		ID: &resourceGroupID,
 	}
 
-	resourceGroup, resp, err := rMgtClient.GetResourceGroup(&resourceGroupGet)
-	if err != nil {
+	var resp *core.DetailedResponse
+	var resourceGroup *rg.ResourceGroup
+
+	err = retry.RetryContext(context, 5*time.Minute, func() *retry.RetryError {
+		resourceGroup, resp, err = rMgtClient.GetResourceGroup(&resourceGroupGet)
+		if err != nil || resourceGroup == nil {
+			if resp != nil && resp.StatusCode == 404 {
+				return retry.RetryableError(err)
+			}
+			return retry.NonRetryableError(err)
+		}
+		return nil
+	})
+
+	if conns.IsResourceTimeoutError(err) {
+		resourceGroup, resp, err = rMgtClient.GetResourceGroup(&resourceGroupGet)
+	}
+	if err != nil || resourceGroup == nil {
 		if resp != nil && resp.StatusCode == 404 {
-			log.Printf("[WARN] Resource Group is not found")
 			d.SetId("")
 			return nil
 		}
-		return fmt.Errorf("[ERROR] Error retrieving resource group: %s with response code  %s", err, resp)
+		return diag.FromErr(fmt.Errorf("[ERROR] Error retrieving resource group: %s. API Response: %s", err, resp))
 	}
-
 	d.Set("name", *resourceGroup.Name)
 	if resourceGroup.State != nil {
 		d.Set("state", *resourceGroup.State)
@@ -185,10 +202,10 @@ func resourceIBMResourceGroupRead(d *schema.ResourceData, meta interface{}) erro
 	return nil
 }
 
-func resourceIBMResourceGroupUpdate(d *schema.ResourceData, meta interface{}) error {
+func resourceIBMResourceGroupUpdate(context context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	rMgtClient, err := meta.(conns.ClientSession).ResourceManagerV2API()
 	if err != nil {
-		return err
+		return diag.FromErr(err)
 	}
 
 	resourceGroupID := d.Id()
@@ -205,17 +222,17 @@ func resourceIBMResourceGroupUpdate(d *schema.ResourceData, meta interface{}) er
 	if hasChange {
 		_, resp, err := rMgtClient.UpdateResourceGroup(&resourceGroupUpdate)
 		if err != nil {
-			return fmt.Errorf("[ERROR] Error updating resource group: %s with response code  %s", err, resp)
+			return diag.FromErr(fmt.Errorf("[ERROR] Error updating resource group: %s with response code  %s", err, resp))
 		}
 
 	}
-	return resourceIBMResourceGroupRead(d, meta)
+	return resourceIBMResourceGroupRead(context, d, meta)
 }
 
-func resourceIBMResourceGroupDelete(d *schema.ResourceData, meta interface{}) error {
+func resourceIBMResourceGroupDelete(context context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	rMgtClient, err := meta.(conns.ClientSession).ResourceManagerV2API()
 	if err != nil {
-		return err
+		return diag.FromErr(err)
 	}
 
 	resourceGroupID := d.Id()
@@ -252,11 +269,11 @@ func resourceIBMResourceGroupDelete(d *schema.ResourceData, meta interface{}) er
 					log.Printf("[WARN] Resource Group is not found")
 					return nil
 				}
-				return fmt.Errorf("[ERROR] Error Deleting resource group: %s with response code  %s", err, resp)
+				return diag.FromErr(fmt.Errorf("[ERROR] Error Deleting resource group: %s with response code  %s", err, resp))
 			}
 		} else {
 
-			return fmt.Errorf("[ERROR] Error Deleting resource group: %s with response code  %s", err, resp)
+			return diag.FromErr(fmt.Errorf("[ERROR] Error Deleting resource group: %s with response code  %s", err, resp))
 		}
 	}