Merge branch 'master' into mzochowski-201717-add-supression-diff-rule-for-time-formats

Author: MZochowskiSUMO

CHANGELOG.md

@@ -1,10 +1,14 @@
-## 2.19.1 (Unreleased)
+## 2.19.2 (Unreleased)
+ENHANCEMENTS:
+* Suppress diffs for equivalent values of some time attributes. This should reduce output of `terraform plan` that didn't disappear after running `terraform apply`. (GH-442)
+
+## 2.19.1 (October 6, 2022)
 FEATURES:
 * Add new optional `resolution_window` field to resource/sumologic_monitor (GH-418)
+
 BUG FIXES:
-* cse rules hard failing if passing tags with empty strings. (GH-445)
-ENHANCEMENTS:
-* Suppress diffs for equivalent values of some time attributes. This should reduce output of `terraform plan` that didn't disappear after running `terraform apply`. (GH-442)
+* CSE rules hard failing if passing tags with empty strings. (GH-445)
+* Return error when unable to read collectors. (GH-446)
 
 ## 2.19.0 (September 20, 2022)
 FEATURES:
@@ -46,7 +50,7 @@ BUG FIXES:
 ## 2.16.2 (June 12, 2022)
 
 BUG FIXES:
-* Monitor Folder provider now handles more error codes: "api_not_enabled", in addition to: "not_implemented_yet" (GH-389) 
+* Monitor Folder provider now handles more error codes: "api_not_enabled", in addition to: "not_implemented_yet" (GH-389)
 
 ## 2.16.1 (June 6, 2022)
 
@@ -55,7 +59,7 @@ BUG FIXES:
 
 ## 2.16.0 (May 20, 2022)
 
-FEATURES: 
+FEATURES:
 * Add new optional `obj_permission` set to resource/sumologic_monitor_folder for Fine Grain Permission (FGP) support (GH-373)
 
 BUG FIXES:

sumologic/resource_sumologic_collector.go

@@ -61,6 +61,7 @@ func resourceSumologicCollectorRead(d *schema.ResourceData, meta interface{}) er
 		collector, err = c.GetCollectorName(d.Id())
 		if err != nil {
 			log.Printf("[WARN] Collector not found when looking by name: %s, err: %v", d.Id(), err)
+			return err
 		} else if collector == nil {
 			log.Printf("[WARN] Got a nil Collector when looking by name: %s", d.Id())
 		} else {