Added - Update error message for work request error

Author: jotruon

oci/crud_helpers.go

@@ -270,7 +270,7 @@ func waitForStateRefreshForHybridPolling(workRequestClient *oci_work_requests.Wo
 			retryPolicy := GetRetryPolicy(disableFoundRetries, "work_request")
 			retryPolicy.ShouldRetryOperation = workRequestShouldRetryFunc(timeout)
 			e = getWorkRequestErrors(workRequestClient, workRequestIds, retryPolicy, entityType, action)
-			return handleError(sync, e)
+			return e
 		}
 
 		if _, ok := e.(*resource.TimeoutError); ok {
@@ -527,7 +527,7 @@ func waitForStateRefresh(sync StatefulResource, timeout time.Duration, operation
 			} else {
 				e = fmt.Errorf("During %s, service reported unexpected state: %s.", operationName, sync.State())
 			}
-			return handleError(sync, e)
+			return e
 		}
 
 		if _, ok := e.(*resource.TimeoutError); ok {

oci/errors.go

@@ -38,6 +38,7 @@ type customError struct {
 // Create new error format for Terraform output
 func newCustomError(sync interface{}, err error) error {
 	var tfError customError
+	errorMessage := err.Error()
 
 	// Service error
 	if failure, isServiceError := oci_common.IsServiceError(err); isServiceError {
@@ -49,20 +50,28 @@ func newCustomError(sync interface{}, err error) error {
 			OpcRequestID:  failure.GetOpcRequestID(),
 			Service:       getServiceName(sync),
 		}
-	} else if strings.Contains(err.Error(), "timeout while waiting for state") {
+	} else if strings.Contains(errorMessage, "timeout while waiting for state") {
 		// Timeout error
 		tfError = customError{
 			TypeOfError:   TimeoutError,
 			ErrorCodeName: "Operation Timeout",
-			Message:       err.Error(),
+			Message:       errorMessage,
 			Service:       getServiceName(sync),
 		}
 		// Unexpected state error
-	} else if strings.Contains(err.Error(), "unexpected state") {
+	} else if strings.Contains(errorMessage, "unexpected state") {
 		tfError = customError{
 			TypeOfError:   UnexpectedStateError,
 			ErrorCodeName: "Unexpected LifeCycle state",
-			Message:       err.Error(),
+			Message:       errorMessage,
+			Service:       getServiceName(sync),
+			ResourceOCID:  getResourceOCID(sync),
+		}
+	} else if strings.Contains(errorMessage, "work request") {
+		tfError = customError{
+			TypeOfError:   WorkRequestError,
+			ErrorCodeName: "Work Request error",
+			Message:       errorMessage,
 			Service:       getServiceName(sync),
 			ResourceOCID:  getResourceOCID(sync),
 		}
@@ -101,6 +110,14 @@ func (tfE customError) Error() error {
 			"Resource OCID: %s \n"+
 			"Suggestion: %s\n",
 			tfE.ErrorCodeName, tfE.VersionError, tfE.Service, tfE.Message, tfE.ResourceOCID, tfE.Suggestion)
+	case WorkRequestError:
+		return fmt.Errorf("%s \n"+
+			"%s \n"+
+			"Service: %s \n"+
+			"Error Message: %s \n"+
+			"Resource OCID: %s \n"+
+			"Suggestion: %s\n",
+			tfE.ErrorCodeName, tfE.VersionError, tfE.Service, tfE.Message, tfE.ResourceOCID, tfE.Suggestion)
 	default:
 		return fmt.Errorf(tfE.Message)
 	}