Add Period attribute to logging https endpoint. (#1097)

* Add Period attribute to logging https endpoint.

* Change the logging HTTPS endpoint `Period` default to 5.

* Changes based on review feedback.

* Update tests.

* Remove duplicate code.

* Adding more variety to Period Values in Tests and Removed state updates

---------

Co-authored-by: Richard Carillo <[email protected]>
Co-authored-by: Richard Carillo <[email protected]>

Author: bowrocker

CHANGELOG.md

@@ -3,6 +3,7 @@
 ### BREAKING:
 
 ### ENHANCEMENTS:
+- feat(logging/https): add support for Period HTTPS logging endpoint ([#1097](https://github.com/fastly/terraform-provider-fastly/pull/1097))
 
 - feat(product_enablement): Add enable/disable support for API Discovery ([#1111](https://github.com/fastly/terraform-provider-fastly/pull/1111))
 - feat(domainsv1/data source): add support for the v1 domains data source ([#1112](https://github.com/fastly/terraform-provider-fastly/pull/1112))

docs/resources/service_compute.md

@@ -513,6 +513,7 @@ Optional:
 - `json_format` (String) Formats log entries as JSON. Can be either disabled (`0`), array of json (`1`), or newline delimited json (`2`)
 - `message_type` (String) How the message should be formatted. Can be either `classic`, `loggly`, `logplex` or `blank`. Default is `classic`
 - `method` (String) HTTP method used for request. Can be either `POST` or `PUT`. Default `POST`
+- `period` (Number) How frequently, in seconds, batches of log data are sent to the HTTPS endpoint. A value of 0 sends logs at the same interval as the default, which is 5 seconds.
 - `processing_region` (String) Region where logs will be processed before streaming to BigQuery. Valid values are 'none', 'us' and 'eu'.
 - `request_max_bytes` (Number) The maximum number of bytes sent in one request
 - `request_max_entries` (Number) The maximum number of logs sent in one request

docs/resources/service_vcl.md

@@ -814,6 +814,7 @@ Optional:
 - `json_format` (String) Formats log entries as JSON. Can be either disabled (`0`), array of json (`1`), or newline delimited json (`2`)
 - `message_type` (String) How the message should be formatted. Can be either `classic`, `loggly`, `logplex` or `blank`. Default is `classic`
 - `method` (String) HTTP method used for request. Can be either `POST` or `PUT`. Default `POST`
+- `period` (Number) How frequently, in seconds, batches of log data are sent to the HTTPS endpoint. A value of 0 sends logs at the same interval as the default, which is 5 seconds.
 - `placement` (String) Where in the generated VCL the logging call should be placed
 - `processing_region` (String) Region where logs will be processed before streaming to BigQuery. Valid values are 'none', 'us' and 'eu'.
 - `request_max_bytes` (Number) The maximum number of bytes sent in one request

fastly/block_fastly_service_logging_https.go

@@ -92,6 +92,13 @@ func (h *HTTPSLoggingServiceAttributeHandler) GetSchema() *schema.Schema {
 			Required:    true,
 			Description: "The unique name of the HTTPS logging endpoint. It is important to note that changing this attribute will delete and recreate the resource",
 		},
+		"period": {
+			Type:         schema.TypeInt,
+			Optional:     true,
+			Default:      5,
+			Description:  "How frequently, in seconds, batches of log data are sent to the HTTPS endpoint. A value of 0 sends logs at the same interval as the default, which is 5 seconds.",
+			ValidateFunc: validation.IntAtLeast(1),
+		},
 		"processing_region": {
 			Type:         schema.TypeString,
 			Optional:     true,
@@ -261,6 +268,9 @@ func (h *HTTPSLoggingServiceAttributeHandler) Update(ctx context.Context, d *sch
 	if v, ok := modified["json_format"]; ok {
 		opts.JSONFormat = gofastly.ToPointer(v.(string))
 	}
+	if v, ok := modified["period"]; ok {
+		opts.Period = gofastly.ToPointer(v.(int))
+	}
 	if v, ok := modified["placement"]; ok {
 		opts.Placement = gofastly.ToPointer(v.(string))
 	}
@@ -294,6 +304,18 @@ func (h *HTTPSLoggingServiceAttributeHandler) Update(ctx context.Context, d *sch
 	return nil
 }
 
+// pruneVCLLoggingAttributes removes VCL-only attributes from Compute service data.
+// For HTTPS logging, period is not VCL-only, so we preserve it.
+func (h *HTTPSLoggingServiceAttributeHandler) pruneVCLLoggingAttributes(data map[string]any) {
+	if h.GetServiceMetadata().serviceType == ServiceTypeCompute {
+		delete(data, "format")
+		delete(data, "format_version")
+		delete(data, "placement")
+		delete(data, "response_condition")
+		// Note: period is NOT deleted for HTTPS logging as it's available for both VCL and Compute
+	}
+}
+
 // Delete deletes the resource.
 func (h *HTTPSLoggingServiceAttributeHandler) Delete(ctx context.Context, d *schema.ResourceData, resource map[string]any, serviceVersion int, conn *gofastly.Client) error {
 	opts := h.buildDelete(resource, d.Id(), serviceVersion)
@@ -357,6 +379,9 @@ func flattenHTTPS(remoteState []*gofastly.HTTPS, localState []any) []map[string]
 		if resource.RequestMaxEntries != nil {
 			data["request_max_entries"] = *resource.RequestMaxEntries
 		}
+		if resource.Period != nil {
+			data["period"] = *resource.Period
+		}
 		if resource.RequestMaxBytes != nil {
 			data["request_max_bytes"] = *resource.RequestMaxBytes
 		}
@@ -434,6 +459,7 @@ func (h *HTTPSLoggingServiceAttributeHandler) buildCreate(httpsMap any, serviceI
 		MessageType:       gofastly.ToPointer(resource["message_type"].(string)),
 		Method:            gofastly.ToPointer(resource["method"].(string)),
 		Name:              gofastly.ToPointer(resource["name"].(string)),
+		Period:            gofastly.ToPointer(resource["period"].(int)),
 		RequestMaxBytes:   gofastly.ToPointer(resource["request_max_bytes"].(int)),
 		RequestMaxEntries: gofastly.ToPointer(resource["request_max_entries"].(int)),
 		ServiceID:         serviceID,

fastly/block_fastly_service_logging_https_test.go

@@ -31,6 +31,7 @@ func TestAccFastlyServiceVCL_httpslogging_basic(t *testing.T) {
 		MessageType:       gofastly.ToPointer("blank"),
 		Method:            gofastly.ToPointer("PUT"),
 		Name:              gofastly.ToPointer("httpslogger"),
+		Period:            gofastly.ToPointer(10),
 		RequestMaxBytes:   gofastly.ToPointer(0),
 		RequestMaxEntries: gofastly.ToPointer(0),
 		ResponseCondition: gofastly.ToPointer(""),
@@ -52,6 +53,7 @@ func TestAccFastlyServiceVCL_httpslogging_basic(t *testing.T) {
 		MessageType:       gofastly.ToPointer("blank"),
 		Method:            gofastly.ToPointer("POST"),
 		Name:              gofastly.ToPointer("httpslogger"),
+		Period:            gofastly.ToPointer(30),
 		RequestMaxBytes:   gofastly.ToPointer(0),
 		RequestMaxEntries: gofastly.ToPointer(0),
 		ResponseCondition: gofastly.ToPointer(""),
@@ -72,6 +74,7 @@ func TestAccFastlyServiceVCL_httpslogging_basic(t *testing.T) {
 		MessageType:       gofastly.ToPointer("blank"),
 		Method:            gofastly.ToPointer("POST"),
 		Name:              gofastly.ToPointer("httpslogger2"),
+		Period:            gofastly.ToPointer(60),
 		RequestMaxBytes:   gofastly.ToPointer(1000),
 		RequestMaxEntries: gofastly.ToPointer(0),
 		ResponseCondition: gofastly.ToPointer(""),
@@ -92,6 +95,7 @@ func TestAccFastlyServiceVCL_httpslogging_basic(t *testing.T) {
 		MessageType:       gofastly.ToPointer("blank"),
 		Method:            gofastly.ToPointer("PUT"),
 		Name:              gofastly.ToPointer("httpslogger3"),
+		Period:            gofastly.ToPointer(120),
 		RequestMaxBytes:   gofastly.ToPointer(0),
 		RequestMaxEntries: gofastly.ToPointer(0),
 		ResponseCondition: gofastly.ToPointer(""),
@@ -156,6 +160,7 @@ func TestAccFastlyServiceVCL_httpslogging_basic_compute(t *testing.T) {
 		MessageType:       gofastly.ToPointer("blank"),
 		Method:            gofastly.ToPointer("PUT"),
 		Name:              gofastly.ToPointer("httpslogger"),
+		Period:            gofastly.ToPointer(300),
 		RequestMaxBytes:   gofastly.ToPointer(0),
 		RequestMaxEntries: gofastly.ToPointer(0),
 		ServiceVersion:    gofastly.ToPointer(1),
@@ -281,6 +286,7 @@ resource "fastly_service_vcl" "foo" {
 		name               = "httpslogger3"
 		method             = "PUT"
 		format             = %q
+		period             = 120
 		url                = "https://example.com/logs/3"
 	}
 
@@ -306,6 +312,7 @@ resource "fastly_service_vcl" "foo" {
 	logging_https {
 		name               = "httpslogger"
 		method             = "PUT"
+		period			   = 10
 		url                = "https://example.com/logs/1"
 		compression_codec = "zstd"
     processing_region = "us"
@@ -339,7 +346,8 @@ resource "fastly_service_compute" "foo" {
 		method             = "PUT"
 		url                = "https://example.com/logs/1"
 		compression_codec = "zstd"
-    processing_region = "us"
+		period  		  = 300
+        processing_region = "us"
 	}
 
   package {
@@ -370,6 +378,7 @@ resource "fastly_service_vcl" "foo" {
 		name               = "httpslogger"
 		format             = %q
 		method             = "POST"
+		period			   = 30
 		url                = "https://example.com/logs/1"
 		compression_codec = "snappy"
 	}
@@ -379,6 +388,7 @@ resource "fastly_service_vcl" "foo" {
 		format             = %q
 		method             = "POST"
 		url                = "https://example.com/logs/2"
+		period			   = 60
 		request_max_bytes  = 1000
 		gzip_level				 = 5
 	}
@@ -405,6 +415,7 @@ func TestResourceFastlyFlattenHTTPS(t *testing.T) {
 					GzipLevel:         gofastly.ToPointer(0),
 					Format:            gofastly.ToPointer(LoggingHTTPSDefaultFormat),
 					FormatVersion:     gofastly.ToPointer(2),
+					Period:            gofastly.ToPointer(5),
 					ProcessingRegion:  gofastly.ToPointer("eu"),
 				},
 			},
@@ -420,6 +431,7 @@ func TestResourceFastlyFlattenHTTPS(t *testing.T) {
 					"format":              LoggingHTTPSDefaultFormat,
 					"format_version":      2,
 					"gzip_level":          0,
+					"period":              5,
 					"processing_region":   "eu",
 				},
 			},

fastly/service_attribute_definition.go

@@ -65,13 +65,15 @@ func (h *DefaultServiceAttributeHandler) MustProcess(d *schema.ResourceData, _ b
 type VCLLoggingAttributes struct {
 	format            string
 	formatVersion     *int
+	period            *int
 	placement         string
 	responseCondition string
 }
 
 // getVCLLoggingAttributes provides default values to Compute services for VCL only logging attributes.
 func (h *DefaultServiceAttributeHandler) getVCLLoggingAttributes(data map[string]any) VCLLoggingAttributes {
 	vla := VCLLoggingAttributes{
+		period:    gofastly.ToPointer(3600),
 		placement: "none",
 	}
 	if h.GetServiceMetadata().serviceType == ServiceTypeVCL {
@@ -81,6 +83,9 @@ func (h *DefaultServiceAttributeHandler) getVCLLoggingAttributes(data map[string
 		if val, ok := data["format_version"]; ok {
 			vla.formatVersion = gofastly.ToPointer(val.(int))
 		}
+		if val, ok := data["period"]; ok {
+			vla.period = gofastly.ToPointer(val.(int))
+		}
 		if val, ok := data["placement"]; ok {
 			vla.placement = val.(string)
 		}
@@ -97,6 +102,7 @@ func (h *DefaultServiceAttributeHandler) pruneVCLLoggingAttributes(data map[stri
 	if h.GetServiceMetadata().serviceType == ServiceTypeCompute {
 		delete(data, "format")
 		delete(data, "format_version")
+		delete(data, "period")
 		delete(data, "placement")
 		delete(data, "response_condition")
 	}