Merge branch 'master' of https://github.com/SumoLogic/terraform-provider-sumologic into chirag-BE-468

Author: chirag-sumologic

.github/CODEOWNERS

@@ -2,17 +2,16 @@
 # Each line is a file pattern followed by one or more owners.
 
 # These owners will be the default owners for everything in
-# the repo. Unless a later match takes precedence,
-# @sumovishal, @dagould will be requested for
-# review when someone opens a pull request.
-*       @sumovishal @dagould
+# the repo. Unless a later match takes precedence, they will
+# be requested for review when someone opens a pull request.
+*       @SumoLogic/tf-platform-team
 
 # Code owners for collection sources
 /sumologic/*_source.go        @maimaisie @vsinghal13
 /sumologic/*_source_test.go   @maimaisie @vsinghal13
 /sumologic/*_ingest_budget*   @maimaisie @vsinghal13
 /sumologic/*_collector*       @maimaisie @vsinghal13
-/sumologic/*_cse*             @josh-williams @pmontiel-sumo
+/sumologic/*_cse*             @pmontiel-sumo
 /website/docs/r/collector*    @maimaisie @vsinghal13
 /website/docs/r/ingest_*      @maimaisie @vsinghal13
 /website/docs/r/*_source*     @maimaisie @vsinghal13

.github/workflows/test.yml

@@ -98,6 +98,9 @@ jobs:
         SUMOLOGIC_TEST_ROLE_ARN:  ${{ secrets.SUMOLOGIC_TEST_ROLE_ARN }}
         SUMOLOGIC_TEST_SAS_KEY:  ${{ secrets.SUMOLOGIC_TEST_SAS_KEY }}
         SUMOLOGIC_TEST_SAS_KEY_NAME:  ${{ secrets.SUMOLOGIC_TEST_SAS_KEY_NAME }}
+        SUMOLOGIC_DATA_FORWARDING_BUCKET:  ${{ secrets.SUMOLOGIC_DATA_FORWARDING_BUCKET }}
+        SUMOLOGIC_DATA_FORWARDING_ROLE_ARN:  ${{ secrets.SUMOLOGIC_DATA_FORWARDING_ROLE_ARN }}
+        SUMOLOGIC_DATA_FORWARDING_AWS_REGION:  ${{ secrets.SUMOLOGIC_DATA_FORWARDING_AWS_REGION }}
 
       # disable go test timeout. We rely on GitHub action timeout.
       run: |

CHANGELOG.md

@@ -1,6 +1,28 @@
-## 3.0.0 (Unreleased)
-DEPRECATIONS:
-* resource_sumologic_ingest_budget : Deprecated in favour of `resource_sumologic_ingest_budget_v2`.
+## X.Y.Z (Unreleased)
+* Add new change notes here
+
+## 3.0.1 (January 17, 2025)
+**ENHANCEMENTS:**
+* Add support for update method to change state of the fields resource
+
+## 3.0.0 (December 09, 2024)
+**REMOVALS:**
+* resource_sumologic_ingest_budget : remove deprecated resource.
+* resource_sumologic_collector_ingest_budget_assignment: remove deprecated resource. 
+
+**ENHANCEMENTS:**
+* Add support for MetricsAnomalyCondition to Monitor resource (GH-698)
+
+**BUG FIXES:**
+* Fixed typo in connection.html.markdown documentation
+
+## 2.31.5 (October 04, 2024)
+ENHANCEMENTS:
+* Added *index_id* attribute to sumologic_scheduled_view. (GH-691)
+* Added support for configuring sumologic_data_forwarding_rule for sumologic_scheduled_view. (GH-691)
+BUG FIXES:
+* Fix analytics_tier case sensitivity in resource_sumologic_partition (GH-692)
+* Remove regex match in resource_sumologic_log_search (GH-693) 
 
 ## 2.31.4 (September 19, 2024)
 * **New Resource:** sumologic_data_forwarding_destination (GH-678)
@@ -15,7 +37,7 @@ ENHANCEMENTS:
 * Add IsIncludedInDefaultSearch field to partition resource (GH-674)
 
 BUG FIXES:
-* Fix cse_log_mappings resource conversion affecting import  (GH-675)
+* Fix cse_log_mappings resource conversion affecting import (GH-675)
 
 ## 2.31.1 (July 2, 2024)
 BUG FIXES:

sumologic/provider.go

@@ -87,8 +87,6 @@ func Provider() terraform.ResourceProvider {
 			"sumologic_cloudsyslog_source":                       resourceSumologicCloudsyslogSource(),
 			"sumologic_role":                                     resourceSumologicRole(),
 			"sumologic_user":                                     resourceSumologicUser(),
-			"sumologic_ingest_budget":                            resourceSumologicIngestBudget(),
-			"sumologic_collector_ingest_budget_assignment":       resourceSumologicCollectorIngestBudgetAssignment(),
 			"sumologic_folder":                                   resourceSumologicFolder(),
 			"sumologic_content":                                  resourceSumologicContent(),
 			"sumologic_scheduled_view":                           resourceSumologicScheduledView(),

sumologic/resource_sumologic_collector_ingest_budget_assignment.go

@@ -61,7 +61,6 @@ func resourceSumologicDataForwardingDestination() *schema.Resource {
 			"enabled": {
 				Type:     schema.TypeBool,
 				Optional: true,
-				Default:  false,
 			},
 			"s3_region": {
 				Type:     schema.TypeString,

sumologic/resource_sumologic_data_forwarding_destination.go

@@ -33,12 +33,10 @@ func resourceSumologicDataForwardingRule() *schema.Resource {
 			"enabled": {
 				Type:     schema.TypeBool,
 				Optional: true,
-				Default:  true,
 			},
 			"file_format": {
 				Type:     schema.TypeString,
 				Optional: true,
-				Default:  "{index}_{day}_{hour}_{minute}_{second}",
 			},
 			"payload_schema": {
 				Type:         schema.TypeString,

sumologic/resource_sumologic_data_forwarding_rule.go

@@ -60,7 +60,7 @@ func TestAccSumologicDataForwardingRule_basic(t *testing.T) {
 					testAccCheckDataForwardingRuleExists(),
 					resource.TestCheckResourceAttr(dataForwardingRuleResourceName, "index_id", indexId),
 					resource.TestCheckResourceAttr(dataForwardingRuleResourceName, "destination_id", destinationId),
-					resource.TestCheckResourceAttr(dataForwardingRuleResourceName, "enabled", "true"),
+					resource.TestCheckResourceAttr(dataForwardingRuleResourceName, "enabled", "false"),
 					resource.TestCheckResourceAttr(dataForwardingRuleResourceName, "file_format", "test/"),
 					resource.TestCheckResourceAttr(dataForwardingRuleResourceName, "payload_schema", "builtInFields"),
 					resource.TestCheckResourceAttr(dataForwardingRuleResourceName, "format", "json"),
@@ -227,7 +227,7 @@ func testAccSumologicDataForwardingRuleUpdateConfig() string {
 		resource "sumologic_data_forwarding_rule" "test" {
 			index_id = "%s"
 			destination_id = "%s"
-			enabled = true
+			enabled = false
 			file_format = "test/"
 			payload_schema = "builtInFields"
 			format = "json"

sumologic/resource_sumologic_data_forwarding_rule_test.go

@@ -1,6 +1,7 @@
 package sumologic
 
 import (
+	"errors"
 	"fmt"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
@@ -10,6 +11,7 @@ func resourceSumologicField() *schema.Resource {
 	return &schema.Resource{
 		Create: resourceSumologicFieldCreate,
 		Read:   resourceSumologicFieldRead,
+		Update: resourceSumologicFieldUpdate,
 		Delete: resourceSumologicFieldDelete,
 		Importer: &schema.ResourceImporter{
 			State: resourceSumologicFieldImport,
@@ -38,7 +40,6 @@ func resourceSumologicField() *schema.Resource {
 			"state": {
 				Type:     schema.TypeString,
 				Optional: true,
-				ForceNew: true,
 			},
 		},
 	}
@@ -116,6 +117,43 @@ func resourceSumologicFieldImport(d *schema.ResourceData, meta interface{}) ([]*
 	return []*schema.ResourceData{d}, nil
 }
 
+func resourceSumologicFieldUpdate(d *schema.ResourceData, meta interface{}) error {
+	c := meta.(*Client)
+
+	id := d.Get("field_id").(string)
+	name := d.Get("field_name").(string)
+	state := d.Get("state").(string)
+	if id == "" {
+		newId, err := c.FindFieldId(name)
+		if err != nil {
+			return err
+		}
+		id = newId
+	}
+	_, err := c.GetField(id)
+
+	if err != nil {
+		return err
+	}
+
+	if state == "Enabled" {
+		err := c.EnableField(id)
+		if err != nil {
+			return err
+		}
+	} else if state == "Disabled" {
+		err := c.DisableField(id)
+		if err != nil {
+			return err
+		}
+	} else {
+		return errors.New("Invalid value of state field. Only Enabled or Disabled values are accepted")
+	}
+
+	return resourceSumologicFieldRead(d, meta)
+
+}
+
 func resourceToField(d *schema.ResourceData) Field {
 	return Field{
 		DataType:  d.Get("data_type").(string),

sumologic/resource_sumologic_field.go

@@ -56,6 +56,41 @@ func TestAccSumologicField_create(t *testing.T) {
 	})
 }
 
+func TestAccSumologicField_update(t *testing.T) {
+	var field Field
+	testFieldName := "fields_provider_test"
+	testDataType := "String"
+	testState := "Enabled"
+	updatedState := "Disabled"
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckFieldDestroy(field),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccSumologicField(testFieldName, testDataType, testState),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckFieldExists("sumologic_field.test", &field, t),
+					testAccCheckFieldAttributes("sumologic_field.test"),
+					resource.TestCheckResourceAttr("sumologic_field.test", "field_name", testFieldName),
+					resource.TestCheckResourceAttr("sumologic_field.test", "data_type", testDataType),
+					resource.TestCheckResourceAttr("sumologic_field.test", "state", testState),
+				),
+			},
+			{
+				Config: testAccSumologicFieldUpdate(testFieldName, testDataType, updatedState),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckFieldExists("sumologic_field.test", &field, t),
+					testAccCheckFieldAttributes("sumologic_field.test"),
+					resource.TestCheckResourceAttr("sumologic_field.test", "field_name", testFieldName),
+					resource.TestCheckResourceAttr("sumologic_field.test", "data_type", testDataType),
+					resource.TestCheckResourceAttr("sumologic_field.test", "state", updatedState),
+				),
+			},
+		},
+	})
+}
+
 func testAccCheckFieldDestroy(field Field) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		client := testAccProvider.Meta().(*Client)
@@ -116,6 +151,16 @@ resource "sumologic_field" "test" {
 `, fieldName, dataType, state)
 }
 
+func testAccSumologicFieldUpdate(fieldName string, dataType string, state string) string {
+	return fmt.Sprintf(`
+resource "sumologic_field" "test" {
+    field_name = "%s"
+    data_type = "%s"
+    state = "%s"
+}
+`, fieldName, dataType, state)
+}
+
 func testAccCheckFieldAttributes(name string) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		f := resource.ComposeTestCheckFunc(