Merge branch 'master' into rohit-connection-type-fixes

Author: rsanbhad

CHANGELOG.md

@@ -1,3 +1,14 @@
+## 2.3.1 (October 15, 2020)
+
+ENHANCEMENTS:
+
+* Added `in` and `fed` to `environment` section (GH-96)
+
+BUG FIXES:
+
+* Fix a bug where `parse_expression` would present a diff without any changes (GH-95)
+* Check for erros when getting collector from client (GF-92)
+
 ## 2.3.0 (September 29, 2020)
 
 FEATURES:

sumologic/resource_sumologic_extraction_rule.go

@@ -13,6 +13,7 @@ package sumologic
 
 import (
 	"log"
+	"strings"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
@@ -39,6 +40,12 @@ func resourceSumologicFieldExtractionRule() *schema.Resource {
 			"parse_expression": {
 				Type:     schema.TypeString,
 				Required: true,
+				DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
+					if strings.Trim(old, "\n ") == strings.Trim(new, "\n ") {
+						return true
+					}
+					return false
+				},
 			},
 			"enabled": {
 				Type:     schema.TypeBool,

sumologic/sumologic_client.go

@@ -27,11 +27,13 @@ type Client struct {
 var endpoints = map[string]string{
 	"us1": "https://api.sumologic.com/api/",
 	"us2": "https://api.us2.sumologic.com/api/",
+	"fed": "https://api.fed.sumologic.com/api/",
 	"eu":  "https://api.eu.sumologic.com/api/",
 	"au":  "https://api.au.sumologic.com/api/",
 	"de":  "https://api.de.sumologic.com/api/",
 	"jp":  "https://api.jp.sumologic.com/api/",
 	"ca":  "https://api.ca.sumologic.com/api/",
+	"in":  "https://api.in.sumologic.com/api/",
 }
 
 var rateLimiter = time.NewTicker(time.Minute / 240)