Merge pull request #835 from SumoLogic/rk-ot-collector-update

rishabhkhatri09 · web-flow · commit eb087b65b763 · 2026-01-14T13:34:58.000+05:30
SUMO-253272: Added update support for sumologic_ot_collector and enable/disable sumologic_source_template resource
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 ## X.Y.Z (Unreleased)
- * Fix for failing content test case for scheduled searches
+ENHANCEMENTS:
+* Added update support for `sumologic_ot_collector` resource.
+* Suppressed system-managed `sumo.disco.*` tags so they no longer appear in Terraform plans or state when reading OT Collectors.
+* Added IsEnabled field in `sumologic_source_template` resource.
+* Added enable/disable support to the `sumologic_source_template` resource.
+* Updated endpoint for `sumologic_source_template` resource to use the open API standard.
+* Fix for failing content test case for scheduled searches
 
 ## 3.2.2 (January 6, 2026)
 DOCS:
diff --git a/sumologic/resource_sumologic_ot_collector.go b/sumologic/resource_sumologic_ot_collector.go
@@ -1,10 +1,10 @@
 package sumologic
 
 import (
-	"errors"
 	"fmt"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"log"
+	"strings"
 )
 
 func resourceSumologicOTCollector() *schema.Resource {
@@ -78,6 +78,9 @@ func resourceSumologicOTCollector() *schema.Resource {
 					Type: schema.TypeString,
 				},
 				Optional: true,
+				DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
+					return strings.HasPrefix(strings.ToLower(k), "tags.sumo.disco")
+				},
 			},
 		},
 	}
@@ -98,7 +101,7 @@ func resourceSumologicOTCollectorRead(d *schema.ResourceData, meta interface{})
 		return nil
 	}
 
-	if err := d.Set("tags", otCollector.Tags); err != nil {
+	if err := d.Set("tags", filterUpdatableTags(otCollector.Tags)); err != nil {
 		return fmt.Errorf("error setting fields for resource %s: %s", d.Id(), err)
 	}
 
@@ -124,7 +127,49 @@ func resourceSumologicOTCollectorDelete(d *schema.ResourceData, meta interface{}
 }
 
 func resourceSumologicOTCollectorUpdate(d *schema.ResourceData, meta interface{}) error {
-	return errors.New("Terraform does not support OTel collector updates")
+	c := meta.(*Client)
+	id := d.Id()
+	req := make(map[string]interface{})
+	if d.HasChange("time_zone") {
+		req["timezone"] = d.Get("time_zone")
+	}
+
+	if d.HasChange("name") {
+		req["name"] = d.Get("name")
+	}
+
+	if d.HasChange("tags") {
+		newTags := d.Get("tags").(map[string]interface{})
+		filtered := filterUpdatableTags(newTags)
+
+		if len(filtered) > 0 {
+			req["tags"] = filtered
+		}
+	}
+
+	if len(req) == 0 {
+		return resourceSumologicOTCollectorRead(d, meta)
+	}
+	if err := c.UpdateOTCollector(id, req); err != nil {
+		return fmt.Errorf("failed to update OTel collector %s: %w", id, err)
+	}
+
+	return resourceSumologicOTCollectorRead(d, meta)
+}
+
+func filterUpdatableTags(tags map[string]interface{}) map[string]interface{} {
+	if tags == nil {
+		return nil
+	}
+
+	updatable := make(map[string]interface{})
+	for k, v := range tags {
+		if strings.HasPrefix(k, "sumo.disco") {
+			continue
+		}
+		updatable[k] = v
+	}
+	return updatable
 }
 
 func resourceToOTCollector(d *schema.ResourceData) OTCollector {
@@ -142,6 +187,6 @@ func resourceToOTCollector(d *schema.ResourceData) OTCollector {
 		TimeZone:          d.Get("time_zone").(string),
 		ID:                d.Id(),
 		Name:              d.Get("name").(string),
-		Tags:              d.Get("fields").(map[string]interface{}),
+		Tags:              d.Get("tags").(map[string]interface{}),
 	}
 }
diff --git a/sumologic/resource_sumologic_source_template.go b/sumologic/resource_sumologic_source_template.go
@@ -122,6 +122,13 @@ func resourceSumologicSourceTemplate() *schema.Resource {
 				Computed: true,
 			},
 
+			"is_enabled": {
+				Type:        schema.TypeBool,
+				Optional:    true,
+				Computed:    true,
+				Description: "Enable or disable the source template",
+			},
+
 			"input_json": {
 				Type:             schema.TypeString,
 				Description:      "inputJson of source template",
@@ -143,7 +150,15 @@ func resourceSumologicSourceTemplateRead(d *schema.ResourceData, meta interface{
 	}
 
 	if sourceTemplate == nil {
-		log.Printf("[WARN] SourceTemplate not found, removing from state: %v - %v", id, err)
+		// API returns 404 for both disabled and deleted source templates
+		// Check if we expect this to be disabled - if so, keep it in state
+		// If we expect it to be enabled, then it was actually deleted - remove from state
+		isEnabledInState := d.Get("is_enabled").(bool)
+		if !isEnabledInState {
+			log.Printf("[INFO] SourceTemplate not found (likely disabled): %v - keeping in state", id)
+			return nil
+		}
+		log.Printf("[WARN] SourceTemplate not found (actually deleted): %v - removing from state", id)
 		d.SetId("")
 		return nil
 	}
@@ -160,6 +175,10 @@ func resourceSumologicSourceTemplateRead(d *schema.ResourceData, meta interface{
 		return fmt.Errorf("Error setting input_json for resource %s: %s", d.Id(), err)
 	}
 
+	if sourceTemplate.IsEnabled != nil {
+		d.Set("is_enabled", sourceTemplate.IsEnabled)
+	}
+
 	d.Set("created_by", sourceTemplate.CreatedBy)
 	d.Set("modified_by", sourceTemplate.ModifiedBy)
 	d.Set("created_at", sourceTemplate.CreatedAt)
@@ -216,6 +235,11 @@ func resourceToSourceTemplate(d *schema.ResourceData) SourceTemplate {
 		log.Println("Unable to unmarshal the input json configuration")
 		return SourceTemplate{}
 	}
+	var isEnabled *bool
+	if v, ok := d.GetOkExists("is_enabled"); ok {
+		val := v.(bool)
+		isEnabled = &val
+	}
 
 	return SourceTemplate{
 		Config:               d.Get("config").(string),
@@ -224,6 +248,7 @@ func resourceToSourceTemplate(d *schema.ResourceData) SourceTemplate {
 		TotalCollectorLinked: d.Get("total_collector_linked").(int),
 		Selector:             selector,
 		InputJson:            jsonRawConf,
+		IsEnabled:            isEnabled,
 		CreatedBy:            d.Get("created_by").(string),
 		ModifiedBy:           d.Get("modified_by").(string),
 		ModifiedAt:           d.Get("modified_at").(string),
diff --git a/sumologic/resource_sumologic_source_template_test.go b/sumologic/resource_sumologic_source_template_test.go
@@ -97,6 +97,87 @@ func TestAccSumologicSourceTemplate_update(t *testing.T) {
 	})
 }
 
+func TestAccSumologicSourceTemplate_enableDisable(t *testing.T) {
+	var sourceTemplate SourceTemplate
+
+	testSchemaRef := `type = "Mac"`
+	testSelector := `tags = [
+	[
+	{
+	  key = "tag"
+	  values = ["Value"]
+	}
+	]
+	]`
+
+	testInputJson := `jsonencode({
+	  "name": "hostmetrics_test_source_template_enable_disable",
+	  "description": "Host metric source",
+	  "receivers": {
+		"hostmetrics": {
+		  "receiverType": "hostmetrics",
+		  "collection_interval": "5m"
+		}
+	  }
+	})`
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckSourceTemplateDestroy(sourceTemplate),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccSumologicSourceTemplateWithEnabled(
+					testSchemaRef,
+					testSelector,
+					testInputJson,
+					true,
+				),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckSourceTemplateExists("sumologic_source_template.test", &sourceTemplate, t),
+					resource.TestCheckResourceAttr(
+						"sumologic_source_template.test",
+						"is_enabled",
+						"true",
+					),
+				),
+			},
+			// Step 2: Disable via update
+			{
+				Config: testAccSumologicSourceTemplateWithEnabled(
+					testSchemaRef,
+					testSelector,
+					testInputJson,
+					false,
+				),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(
+						"sumologic_source_template.test",
+						"is_enabled",
+						"false",
+					),
+				),
+			},
+			// Step 3: Re-enable via update
+			{
+				Config: testAccSumologicSourceTemplateWithEnabled(
+					testSchemaRef,
+					testSelector,
+					testInputJson,
+					true,
+				),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(
+						"sumologic_source_template.test",
+						"is_enabled",
+						"true",
+					),
+				),
+			},
+		},
+	})
+}
+
 func testAccCheckSourceTemplateDestroy(sourceTemplate SourceTemplate) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		client := testAccProvider.Meta().(*Client)
@@ -196,3 +277,25 @@ func testAccCheckSourceTemplateAttributes(name string) resource.TestCheckFunc {
 		return f(s)
 	}
 }
+
+func testAccSumologicSourceTemplateWithEnabled(
+	schemaRef string,
+	selector string,
+	inputJson string,
+	isEnabled bool,
+) string {
+	return fmt.Sprintf(`
+resource "sumologic_source_template" "test" {
+  schema_ref {
+    %s
+  }
+
+  selector {
+    %s
+  }
+
+  is_enabled = %t
+  input_json = %s
+}
+`, schemaRef, selector, isEnabled, inputJson)
+}
diff --git a/sumologic/sumologic_ot_collector.go b/sumologic/sumologic_ot_collector.go
@@ -43,13 +43,39 @@ func (s *Client) DeleteOTCollector(id string) error {
 	return err
 }
 
+func (s *Client) UpdateOTCollector(id string, req map[string]interface{}) error {
+	url := fmt.Sprintf("v1/otCollectors?id=%s", id)
+
+	data, err := s.Put(url, req)
+	if err != nil {
+		return err
+	}
+
+	if len(data) == 0 {
+		return nil
+	}
+	var resp UpdateOTCollectorResponse
+	if err := json.Unmarshal(data, &resp); err != nil {
+		return err
+	}
+	if len(resp.Errors) > 0 {
+		return fmt.Errorf("update ot collector failed: %v", resp.Errors)
+	}
+	return nil
+}
+
+type UpdateOTCollectorResponse struct {
+	ID     string                   `json:"id"`
+	Errors []map[string]interface{} `json:"errors,omitempty"`
+}
+
 type OTCollector struct {
 	Category          string                 `json:"category"`
 	CreatedAt         string                 `json:"createdAt"`
 	CreatedBy         string                 `json:"createdBy"`
 	ModifiedBy        string                 `json:"modifiedBy"`
 	ModifiedAt        string                 `json:"modifiedAt"`
-	TimeZone          string                 `json:"timeZone"`
+	TimeZone          string                 `json:"timezone"`
 	IsAlive           bool                   `json:"alive"`
 	IsRemotelyManaged bool                   `json:"isRemotelyManaged"`
 	ID                string                 `json:"id,omitempty"`
diff --git a/sumologic/sumologic_source_template.go b/sumologic/sumologic_source_template.go
@@ -6,7 +6,7 @@ import (
 )
 
 func (s *Client) GetSourceTemplate(id string) (*SourceTemplate, error) {
-	urlWithoutParams := "v1/sourceTemplate/%s"
+	urlWithoutParams := "v1/sourceTemplates/%s"
 	paramString := ""
 	sprintfArgs := []interface{}{}
 	sprintfArgs = append(sprintfArgs, id)
@@ -32,7 +32,7 @@ func (s *Client) GetSourceTemplate(id string) (*SourceTemplate, error) {
 }
 
 func (s *Client) UpdateSourceTemplate(sourceTemplate SourceTemplate) error {
-	urlWithoutParams := "v1/sourceTemplate/%s"
+	urlWithoutParams := "v1/sourceTemplates/%s"
 	paramString := ""
 	sprintfArgs := []interface{}{}
 	sprintfArgs = append(sprintfArgs, sourceTemplate.ID)
@@ -44,7 +44,7 @@ func (s *Client) UpdateSourceTemplate(sourceTemplate SourceTemplate) error {
 }
 
 func (s *Client) DeleteSourceTemplate(id string) error {
-	urlWithoutParams := "v1/sourceTemplate/%s"
+	urlWithoutParams := "v1/sourceTemplates/%s"
 	paramString := ""
 	sprintfArgs := []interface{}{}
 	sprintfArgs = append(sprintfArgs, id)
@@ -57,7 +57,7 @@ func (s *Client) DeleteSourceTemplate(id string) error {
 }
 
 func (s *Client) CreateSourceTemplate(sourceTemplate SourceTemplate) (string, error) {
-	urlWithoutParams := "v1/sourceTemplate"
+	urlWithoutParams := "v1/sourceTemplates"
 
 	data, err := s.Post(urlWithoutParams, sourceTemplate)
 	if err != nil {
@@ -81,6 +81,7 @@ type SourceTemplate struct {
 	Selector             Selector        `json:"selector,omitempty"`
 	Config               string          `json:"config"`
 	InputJson            json.RawMessage `json:"inputJson"`
+	IsEnabled            *bool           `json:"isEnabled,omitempty"`
 	CreatedAt            string          `json:"createdAt"`
 	CreatedBy            string          `json:"createdBy"`
 	ModifiedBy           string          `json:"modifiedBy"`
diff --git a/website/docs/r/ot_collector.html.markdown b/website/docs/r/ot_collector.html.markdown
@@ -7,8 +7,10 @@ description: |-
 
 # sumologic_OT_Collector
 Provides a [Sumologic OT Collector][1]
-**NOTE**: This resource can only be imported and deleted by terraform. Creation/Updation of this resource via terrform is not supported.
-Tag Edit functionality will be supported in future.
+
+**NOTE**: 
+- This resource can only be imported and deleted by terraform. Creation of this resource via terraform is not supported.
+- Editing of supported fields (such as name, timezone, and tags) is now supported via Terraform.
 
 ## Example Usage
 ```hcl
diff --git a/website/docs/r/source_template.html.markdown b/website/docs/r/source_template.html.markdown
