fix cac error handling

harness · May 11, 2022 · 899e82d · 899e82d
1 parent 25a344c
commit 899e82d
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/harness/cd/cac.go b/harness/cd/cac.go
@@ -201,17 +201,18 @@ func (c *ConfigAsCodeClient) ExecuteRequest(request *retryablehttp.Request) (*ca
 
 	if responseObj.Resource != nil {
 
-		if responseObj.Resource.Status != "" && responseObj.Resource.Status != statusSuccess {
-			return nil, fmt.Errorf("%s: %s", responseObj.Resource.Status, responseObj.Resource.ErrorMessage)
-		}
-
 		if responseObj.Resource.ErrorMessage != "" {
 			return nil, fmt.Errorf("%s", responseObj.Resource.ErrorMessage)
 		}
 
 		if responseObj.Resource.ErrorMssg != "" {
 			return nil, fmt.Errorf("%s", responseObj.Resource.ErrorMssg)
 		}
+
+		if responseObj.Resource.Status != "" && responseObj.Resource.Status != statusSuccess {
+			return nil, fmt.Errorf("%s: %s", responseObj.Resource.Status, strings.Join([]string{responseObj.Resource.ErrorMessage, responseObj.Resource.ErrorMssg}, " "))
+		}
+
 	}
 
 	return responseObj.Resource, nil