Merge branch 'master' into INVS-175_cse_entity_group_configuration

Author: pmontiel-git

.github/CODEOWNERS

@@ -12,6 +12,7 @@
 /sumologic/*_source_test.go   @maimaisie @vsinghal13
 /sumologic/*_ingest_budget*   @maimaisie @vsinghal13
 /sumologic/*_collector*       @maimaisie @vsinghal13
+/sumologic/*_cse*             @josh-williams @pmontiel-sumo
 /website/docs/r/collector*    @maimaisie @vsinghal13
 /website/docs/r/ingest_*      @maimaisie @vsinghal13
 /website/docs/r/*_source*     @maimaisie @vsinghal13

CHANGELOG.md

@@ -1,8 +1,26 @@
-## 2.16.0 (Unreleased)
+## 2.17.0 (Unreleased)
 FEATURES:
 * **New Resource:** sumologic_cse_entity_entity_group_configuration (GH-376)
 * **New Resource:** sumologic_cse_inventory_entity_group_configuration (GH-376)
 
+## 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) 
+
+## 2.16.1 (June 6, 2022)
+
+BUG FIXES:
+* Allow locator field in DefaultDateFormat to be empty (GH-384)
+
+## 2.16.0 (May 20, 2022)
+
+FEATURES: 
+* Add new optional `obj_permission` set to resource/sumologic_monitor_folder for Fine Grain Permission (FGP) support (GH-373)
+
+BUG FIXES:
+* Fix bug in cse match list items creation (was timing out due to StateChangeConf on an infinite loop) (GH-377)
+
 ## 2.15.0 (May 13, 2022)
 
 FEATURES:

sumologic/resource_sumologic_monitors_library_folder.go

@@ -159,13 +159,14 @@ func resourceSumologicMonitorsLibraryFolderRead(d *schema.ResourceData, meta int
 		return nil
 	}
 
-	fgpResponse, fgpErr := c.GetCmfFgp(fgpTargetType, folder.ID)
-	if fgpErr != nil {
+	fgpResponse, fgpGetErr := c.GetCmfFgp(fgpTargetType, folder.ID)
+	if fgpGetErr != nil {
 		// if FGP endpoint is not enabled (not implemented), we should suppress this error
-		if !HasErrorCode(fgpErr.Error(), "not_implemented_yet") {
-			return fgpErr
+		suppressedErrorCode := HasErrorCode(fgpGetErr.Error(), []string{"not_implemented_yet", "api_not_enabled"})
+		if suppressedErrorCode == "" {
+			return fgpGetErr
 		} else {
-			log.Printf("[WARN] FGP Feature has not been enabled yet. Suppressing \"not_implemented_yet\" error under GetCmfFgp operation.")
+			log.Printf("[WARN] FGP Feature has not been enabled yet. Suppressing \"%s\" error under GetCmfFgp operation.", suppressedErrorCode)
 		}
 	} else {
 		CmfFgpPermStmtsSetToResource(d, fgpResponse.PermissionStatements)
@@ -203,15 +204,16 @@ func resourceSumologicMonitorsLibraryFolderUpdate(d *schema.ResourceData, meta i
 		return convErr
 	}
 
-	// reading FGP from Backend to reconcille
+	// reading FGP from Backend to reconcile
 	fgpGetResponse, fgpGetErr := c.GetCmfFgp(fgpTargetType, monitorFolder.ID)
 	if fgpGetErr != nil {
 		// if FGP endpoint is not enabled (not implemented) and FGP feature is not used,
 		// we should suppress this error
-		if !HasErrorCode(fgpGetErr.Error(), "not_implemented_yet") && len(permStmts) == 0 {
+		suppressedErrorCode := HasErrorCode(fgpGetErr.Error(), []string{"not_implemented_yet", "api_not_enabled"})
+		if suppressedErrorCode == "" && len(permStmts) == 0 {
 			return fgpGetErr
 		} else {
-			log.Printf("[WARN] FGP Feature has not been enabled yet. Suppressing \"not_implemented_yet\" error under GetCmfFgp operation.")
+			log.Printf("[WARN] FGP Feature has not been enabled yet. Suppressing \"%s\" error under GetCmfFgp operation.", suppressedErrorCode)
 		}
 	}
 

sumologic/resource_sumologic_slo.go

@@ -211,6 +211,7 @@ func resourceSumologicSLO() *schema.Resource {
 							Type:     schema.TypeString,
 							Required: true,
 							ValidateFunc: validation.StringInSlice([]string{
+								"Week", "Month", "Quarter",
 								"1d", "2d", "3d", "4d", "5d", "6d", "7d", "8d", "9d", "10d", "11d", "12d", "13d", "14d",
 							}, false),
 						},
@@ -519,15 +520,25 @@ func getSLOCompliance(d *schema.ResourceData) *SLOCompliance {
 	complianceType := complianceDict["compliance_type"].(string)
 
 	startFrom := ""
-	if complianceType == "Calendar" && complianceDict["start_from"] != nil {
-		startFrom = complianceDict["start_from"].(string)
+	windowType := ""
+	size := complianceDict["size"].(string)
+
+	if complianceType == "Calendar" {
+		// field windowType needs to be specified instead of `size` for calendar compliance
+		windowType = size
+		size = ""
+
+		if complianceDict["start_from"] != nil {
+			startFrom = complianceDict["start_from"].(string)
+		}
 	}
 
 	return &SLOCompliance{
 		ComplianceType: complianceType,
 		Target:         complianceDict["target"].(float64),
 		Timezone:       complianceDict["timezone"].(string),
-		Size:           complianceDict["size"].(string),
+		Size:           size,
+		WindowType:     windowType,
 		StartFrom:      startFrom,
 	}
 }

sumologic/sumologic_client.go

@@ -235,6 +235,10 @@ func (s *Client) Put(urlPath string, payload interface{}) ([]byte, error) {
 }
 
 func (s *Client) Get(urlPath string) ([]byte, string, error) {
+	return s.GetWithErrOpt(urlPath, false)
+}
+
+func (s *Client) GetWithErrOpt(urlPath string, return404Err bool) ([]byte, string, error) {
 	relativeURL, _ := url.Parse(urlPath)
 	sumoURL := s.BaseURL.ResolveReference(relativeURL)
 
@@ -260,7 +264,11 @@ func (s *Client) Get(urlPath string) ([]byte, string, error) {
 	}
 
 	if resp.StatusCode == 404 {
-		return nil, "", nil
+		if return404Err {
+			return nil, "", errors.New(string(d))
+		} else {
+			return nil, "", nil
+		}
 	} else if resp.StatusCode >= 400 {
 		return nil, "", errors.New(string(d))
 	}
@@ -341,19 +349,21 @@ func NewClient(accessID, accessKey, authJwt, environment, base_url string, admin
 	return &client, nil
 }
 
-func HasErrorCode(errorJsonStr string, errorCode string) bool {
+func HasErrorCode(errorJsonStr string, errorCodeChoices []string) string {
 	var apiError ApiError
 	jsonErr := json.Unmarshal([]byte(errorJsonStr), &apiError)
 	if jsonErr != nil {
 		// when fail to unmarshal JSON, we should consider the errorCode is not found
-		return false
+		return ""
 	}
 	for i := range apiError.Errors {
-		if apiError.Errors[i].Code == errorCode {
-			return true
+		for j := range errorCodeChoices {
+			if apiError.Errors[i].Code == errorCodeChoices[j] {
+				return errorCodeChoices[j]
+			}
 		}
 	}
-	return false
+	return ""
 }
 
 type Error struct {
@@ -362,7 +372,9 @@ type Error struct {
 	Detail  string `json:"detail"`
 }
 
-// e.g. {"id":"8UQOI-82VTR-YBQ8G","errors":[{"code":"not_implemented_yet","message":"Not implemented yet"}]}
+// e.g.:
+// {"id":"8UQOI-82VTR-YBQ8G","errors":[{"code":"not_implemented_yet","message":"Not implemented yet"}]}
+// {"id":"RO4X1-BZW7P-Q8KJF","errors":[{"code":"api_not_enabled","message":"This API is not enabled for your organization."}]}
 type ApiError struct {
 	Id     string  `json:"id"`
 	Errors []Error `json:"errors"`

sumologic/sumologic_cmffgp.go

@@ -10,7 +10,7 @@ func (s *Client) GetCmfFgp(targetType string, targetId string) (*CmfFgpResponse,
 
 	// e.g. "v1/monitors/0000000000000003/permissions"
 	url := fmt.Sprintf("v1/%s/%s/permissions", targetType, targetId)
-	data, _, err := s.Get(url)
+	data, _, err := s.GetWithErrOpt(url, true)
 	if err != nil {
 		return nil, err
 	}

sumologic/sumologic_cse_match_list_item.go

@@ -25,8 +25,7 @@ func (s *Client) GetCSEMatchListItem(id string) (*CSEMatchListItemGet, error) {
 }
 
 func (s *Client) GetCSEMatchListItemsInMatchList(MatchListId string) (*CSEMatchListItemsInMatchListGet, error) {
-
-	data, _, err := s.Get(fmt.Sprintf("sec/v1/match-list-items?listIds[%s]", MatchListId))
+	data, _, err := s.Get(fmt.Sprintf("sec/v1/match-list-items?listIds=%s", MatchListId))
 	if err != nil {
 		return nil, err
 	}

sumologic/sumologic_sources.go

@@ -34,7 +34,7 @@ type Source struct {
 
 type DefaultDateFormat struct {
 	Format  string `json:"format"`
-	Locator string `json:"locator"`
+	Locator string `json:"locator,omitempty"`
 }
 
 type Filter struct {
@@ -74,7 +74,7 @@ func resourceSumologicSource() *schema.Resource {
 			"timezone": {
 				Type:     schema.TypeString,
 				Optional: true,
-				Default:  "Etc/UTC",
+				Default:  "",
 			},
 			"automatic_date_parsing": {
 				Type:     schema.TypeBool,

website/docs/index.html.markdown

@@ -124,12 +124,48 @@ The following properties are common to ALL sources and can be used to configure
 - `use_autoline_matching` - (Optional) Type true to enable if you'd like message boundaries to be inferred automatically; type false to prevent message boundaries from being automatically inferred (equivalent to the Infer Boundaries option in the UI). The default setting is true.
 - `manual_prefix_regexp` - (Optional) When using useAutolineMatching=false, type a regular expression that matches the first line of the message to manually create the boundary. Note that any special characters in the regex, such as backslashes or double quotes, must be escaped.
 - `force_timezone` - (Optional) Type true to force the source to use a specific time zone, otherwise type false to use the time zone found in the logs. The default setting is false.
-- `default_date_formats` - (Optional) Define formats for the dates present in your log messages. You can specify a locator regex to identify where timestamps appear in log lines. 
-- `filters` - (Optional) If you'd like to add a filter to the source, type the name of the filter (Exclude, Include, Mask, Hash, or Forward. 
+- `default_date_formats` - (Optional) Define the format for the timestamps present in your log messages. You can specify a locator regex to identify where timestamps appear in log lines. Requires 'automatic_date_parsing' set to True. 
+  + `format` - (Required) The timestamp format supplied as a Java SimpleDateFormat, or "epoch" if the timestamp is in epoch format.
+  + `locator` - (Optional) Regular expression to locate the timestamp within the messages.  
+
+  Usage:
+  ```hcl
+     default_date_formats {
+       format = "MM-dd-yyyy HH:mm:ss"
+       locator = "timestamp:(.*)\\s"
+     }
+  ```
+- `filters` - (Optional) If you'd like to add a filter to the source.
+  + `filter_type` - (Required) The type of filter to apply. (Exclude, Include, Mask, or Hash)
+  + `name` - (Required) The Name for the filter. 
+  + `regexp` - (Required) Regular expression to match within the messages. When used with Incude/Exclude the expression must match the entire message. When used with Mask/Hash rules the expression must contain an unnamed capture group to hash/mask. 
+  + `mask` - (Optional) When applying a Mask rule, replaces the detected expression with this string.
+
+  Usage:
+  ```hcl
+     filters {
+       filter_type = "Include"
+       name = "Sample Include"
+       regexp = ".*\\d{16}.*"
+     }
+     filters {
+       filter_type = "Mask"
+       name = "Sample Mask"
+       regexp = "(\\d{16})"
+       mask = "MaskedID"
+     }
+    ```  
 - `cutoff_timestamp` - (Optional) Only collect data more recent than this timestamp, specified as milliseconds since epoch (13 digit). 
 - `cutoff_relative_time` - (Optional) Can be specified instead of cutoffTimestamp to provide a relative offset with respect to the current time. Example: use -1h, -1d, or -1w to collect data that's less than one hour, one day, or one week old, respectively.
 - `fields` - (Optional) Map containing key/value pairs.
-
+ 
+   Usage:
+   ```hcl
+     fields = {
+       environment = "production"
+       service = "apache"
+     }
+   ```
 ## Configuring SNS Subscription
 This is supported in the following resources.
  - `sumologic_cloudfront_source`