Merge pull request #390 from vmware/rnarenpujari/dp-auth

Refresh auth context while polling for data protection resources

Author: rnarenpujari

internal/resources/backupschedule/resource_backup_schedule.go

@@ -463,6 +463,11 @@ func readResourceWait(ctx context.Context, config *authctx.TanzuContext, resourc
 		resp, err = config.TMCConnection.BackupScheduleService.BackupScheduleResourceServiceGet(resourceFullName)
 
 		if err != nil || resp == nil || resp.Schedule == nil {
+			if clienterrors.IsUnauthorizedError(err) {
+				authctx.RefreshUserAuthContext(config, clienterrors.IsUnauthorizedError, err)
+				continue
+			}
+
 			return nil, err
 		}
 

internal/resources/dataprotection/resource_enable_data_protection.go

@@ -66,6 +66,23 @@ func resourceEnableDataProtectionRead(ctx context.Context, data *schema.Resource
 	config := m.(authctx.TanzuContext)
 
 	err := populateDataFromServer(ctx, config, scopedFullnameData, data)
+	if err != nil {
+		if clienterrors.IsNotFoundError(err) {
+			if !helper.IsContextCallerSet(ctx) {
+				*data = schema.ResourceData{}
+
+				return diags
+			} else if helper.IsDeleteState(ctx) {
+				// d.SetId("") is automatically called assuming delete returns no errors, but
+				// it is added here for explicitness.
+				_ = schema.RemoveFromState(data, m)
+
+				return diags
+			}
+		}
+
+		return diag.FromErr(err)
+	}
 
 	// remove the existing cluster level resource from state if it is now
 	// managed at the cluster group level.
@@ -83,22 +100,6 @@ func resourceEnableDataProtectionRead(ctx context.Context, data *schema.Resource
 		}
 	}
 
-	if err != nil {
-		if clienterrors.IsNotFoundError(err) {
-			if !helper.IsContextCallerSet(ctx) {
-				*data = schema.ResourceData{}
-
-				return diags
-			} else if helper.IsDeleteState(ctx) {
-				// d.SetId("") is automatically called assuming delete returns no errors, but
-				// it is added here for explicitness.
-				_ = schema.RemoveFromState(data, m)
-
-				return diags
-			}
-		}
-	}
-
 	return diags
 }
 
@@ -228,6 +229,11 @@ func populateDataFromServer(ctx context.Context, config authctx.TanzuContext, sc
 
 				resp, err := config.TMCConnection.DataProtectionService.DataProtectionResourceServiceList(scopedFullnameData.FullnameCluster)
 				if err != nil || resp == nil {
+					if clienterrors.IsUnauthorizedError(err) {
+						authctx.RefreshUserAuthContext(&config, clienterrors.IsUnauthorizedError, err)
+						continue
+					}
+
 					return errors.Wrap(err, "list data protections")
 				}
 

internal/resources/targetlocation/resource_target_location.go

@@ -266,6 +266,11 @@ func readResourceWait(ctx context.Context, config *authctx.TanzuContext, resourc
 		resp, err = config.TMCConnection.TargetLocationService.TargetLocationResourceServiceGet(resourceFullName)
 
 		if err != nil || resp == nil || resp.BackupLocation == nil {
+			if clienterrors.IsUnauthorizedError(err) {
+				authctx.RefreshUserAuthContext(config, clienterrors.IsUnauthorizedError, err)
+				continue
+			}
+
 			return nil, err
 		}