Merge pull request #224 from SumoLogic/vishal-set-error-message-on-failure

Author: sumovishal

CHANGELOG.md

@@ -1,5 +1,13 @@
 ## 2.9.5 (Unreleased)
 
+ENHANCEMENTS:
+
+* Add validation for monitor resource (GH-223)
+
+BUG FIXES:
+
+* Set error message on failure for content resource (GH-224)
+
 ## 2.9.4 (June 24, 2021)
 
 FEATURES:
@@ -9,7 +17,7 @@ FEATURES:
 
 ENHANCEMENTS:
 
-* Remove requirement of placeholder values for `path` and `authentication` for `sumologic_gcp_source` resource (GH-205) 
+* Remove requirement of placeholder values for `path` and `authentication` for `sumologic_gcp_source` resource (GH-205)
 * Add assertion consumer url to terraform saml configuration (GH-200)
 
 ## 2.9.3 (April 26, 2021)

sumologic/sumologic_content.go

@@ -105,7 +105,7 @@ func (s *Client) CreateOrUpdateContent(content Content, timeout time.Duration, o
 	return contentId, nil
 }
 
-func waitForJob(url string, timeout time.Duration, s *Client) (Status, error) {
+func waitForJob(url string, timeout time.Duration, s *Client) (*Status, error) {
 	conf := &resource.StateChangeConf{
 		Pending: []string{
 			"InProgress",
@@ -125,8 +125,8 @@ func waitForJob(url string, timeout time.Duration, s *Client) (Status, error) {
 				return nil, "", err
 			}
 
-			if status.Status == "failed" {
-				return status, status.Status, fmt.Errorf("job failed: %s", status.StatusMessage)
+			if status.Status == "Failed" {
+				return status, status.Status, fmt.Errorf("Failed - %s", status.Error)
 			}
 
 			return status, status.Status, nil
@@ -137,6 +137,10 @@ func waitForJob(url string, timeout time.Duration, s *Client) (Status, error) {
 	}
 
 	result, err := conf.WaitForState()
-	log.Printf("[DEBUG] job result: %v", result)
-	return result.(Status), err
+	log.Printf("[DEBUG] Done waiting for job; err: %s, result: %v", err, result)
+	if status, ok := result.(Status); ok {
+		return &status, err
+	} else {
+		return nil, err
+	}
 }