[datadog_logs_archive] Add partitioning_attributes and lookup_attributes to Log Archives resource

Author: mateo-villa

datadog/resource_datadog_logs_archive.go

@@ -116,6 +116,18 @@ func resourceDatadogLogsArchive() *schema.Resource {
 					Default:          string(datadogV2.LOGSARCHIVEATTRIBUTESCOMPRESSIONMETHOD_GZIP),
 					ValidateDiagFunc: validators.ValidateEnumValue(datadogV2.NewLogsArchiveAttributesCompressionMethodFromValue),
 				},
+				"partitioning_attributes": {
+					Description: "An array of attributes to use as partition keys for the archive. The attribute used most frequently for querying should be first.",
+					Type:        schema.TypeList,
+					Optional:    true,
+					Elem:        &schema.Schema{Type: schema.TypeString},
+				},
+				"lookup_attributes": {
+					Description: "An array of attributes to use as lookup keys for the archive.",
+					Type:        schema.TypeList,
+					Optional:    true,
+					Elem:        &schema.Schema{Type: schema.TypeString},
+				},
 			}
 		},
 	}
@@ -180,6 +192,14 @@ func updateLogsArchiveState(d *schema.ResourceData, ddArchive *datadogV2.LogsArc
 		}
 	}
 
+	if err = d.Set("partitioning_attributes", ddArchive.Data.Attributes.GetPartitioningAttributes()); err != nil {
+		return diag.FromErr(err)
+	}
+
+	if err = d.Set("lookup_attributes", ddArchive.Data.Attributes.GetLookupAttributes()); err != nil {
+		return diag.FromErr(err)
+	}
+
 	return nil
 }
 
@@ -321,6 +341,14 @@ func buildDatadogArchiveCreateReq(d *schema.ResourceData) (*datadogV2.LogsArchiv
 	compressionMethod := d.Get("compression_method").(string)
 	attributes.SetCompressionMethod(datadogV2.LogsArchiveAttributesCompressionMethod(compressionMethod))
 
+	if v, ok := d.GetOk("partitioning_attributes"); ok {
+		attributes.SetPartitioningAttributes(expandStringList(v.([]interface{})))
+	}
+
+	if v, ok := d.GetOk("lookup_attributes"); ok {
+		attributes.SetLookupAttributes(expandStringList(v.([]interface{})))
+	}
+
 	definition := datadogV2.NewLogsArchiveCreateRequestDefinitionWithDefaults()
 	definition.SetAttributes(*attributes)
 	archive.SetData(*definition)

datadog/tests/cassettes/TestAccDatadogLogsArchiveAzure_basic.freeze

@@ -185,6 +185,8 @@ resource "datadog_logs_archive" "my_s3_archive" {
   include_tags = true
 	rehydration_max_scan_size_in_gb = 123
   compression_method = "ZSTD"
+  partitioning_attributes = ["host", "service"]
+  lookup_attributes = ["trace_id"]
 }`, uniq, uniq, encryption)
 }
 
@@ -231,6 +233,12 @@ func TestAccDatadogLogsArchiveS3_basic(t *testing.T) {
 						"datadog_logs_archive.my_s3_archive", "rehydration_max_scan_size_in_gb", "123"),
 					resource.TestCheckResourceAttr(
 						"datadog_logs_archive.my_s3_archive", "compression_method", "ZSTD"),
+					resource.TestCheckResourceAttr(
+						"datadog_logs_archive.my_s3_archive", "partitioning_attributes.0", "host"),
+					resource.TestCheckResourceAttr(
+						"datadog_logs_archive.my_s3_archive", "partitioning_attributes.1", "service"),
+					resource.TestCheckResourceAttr(
+						"datadog_logs_archive.my_s3_archive", "lookup_attributes.0", "trace_id"),
 				),
 			},
 		},

datadog/tests/cassettes/TestAccDatadogLogsArchiveAzure_basic.yaml

@@ -39,6 +39,8 @@ resource "datadog_logs_archive" "my_s3_archive" {
 - `compression_method` (String) The compression method for the archive. Valid values are `GZIP`, `ZSTD`. Defaults to `"GZIP"`.
 - `gcs_archive` (Block List, Max: 1) Definition of a GCS archive. (see [below for nested schema](#nestedblock--gcs_archive))
 - `include_tags` (Boolean) To store the tags in the archive, set the value `true`. If it is set to `false`, the tags will be dropped when the logs are sent to the archive. Defaults to `false`.
+- `lookup_attributes` (List of String) An array of attributes to use as lookup keys for the archive.
+- `partitioning_attributes` (List of String) An array of attributes to use as partition keys for the archive. The attribute used most frequently for querying should be first.
 - `rehydration_max_scan_size_in_gb` (Number) To limit the rehydration scan size for the archive, set a value in GB.
 - `rehydration_tags` (List of String) An array of tags to add to rehydrated logs from an archive.
 - `s3_archive` (Block List, Max: 1) Definition of an s3 archive. (see [below for nested schema](#nestedblock--s3_archive))

datadog/tests/resource_datadog_logs_archive_test.go

@@ -1,7 +1,7 @@
 module github.com/terraform-providers/terraform-provider-datadog
 
 require (
-	github.com/DataDog/datadog-api-client-go/v2 v2.60.1-0.20260529072814-6fdb70862f77
+	github.com/DataDog/datadog-api-client-go/v2 v2.60.1-0.20260603114614-30670a13d419
 	github.com/DataDog/dd-sdk-go-testing v0.0.0-20211116174033-1cd082e322ad
 	github.com/Masterminds/semver/v3 v3.3.1
 	github.com/google/go-cmp v0.7.0

docs/resources/logs_archive.md

@@ -4,8 +4,8 @@ dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/toml v1.2.1 h1:9F2/+DoOYIOksmaJFPw1tGFy1eDnIJXg+UHjuD8lTak=
 github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
-github.com/DataDog/datadog-api-client-go/v2 v2.60.1-0.20260529072814-6fdb70862f77 h1:Kevvk3qWhQV83KL4CeO5w27qe2mO9oZyGELyjmnD+AA=
-github.com/DataDog/datadog-api-client-go/v2 v2.60.1-0.20260529072814-6fdb70862f77/go.mod h1:d3tOEgUd2kfsr9uuHQdY+nXrWp4uikgTgVCPdKNK30U=
+github.com/DataDog/datadog-api-client-go/v2 v2.60.1-0.20260603114614-30670a13d419 h1:ISgA/ny2jYXAiLih3pxkGQkMJ3Fl15M+tgcesGGjLMA=
+github.com/DataDog/datadog-api-client-go/v2 v2.60.1-0.20260603114614-30670a13d419/go.mod h1:d3tOEgUd2kfsr9uuHQdY+nXrWp4uikgTgVCPdKNK30U=
 github.com/DataDog/datadog-go v4.4.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
 github.com/DataDog/datadog-go v4.8.3+incompatible h1:fNGaYSuObuQb5nzeTQqowRAd9bpDIRRV4/gUtIBjh8Q=
 github.com/DataDog/datadog-go v4.8.3+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=