feat(scalyr): add project_id (#822)

* build: bump go-fastly to 9.2.0

* refactor(scalyr): remove code comment

* feat(scalyr): add project_id

* doc(scalyr): regenerate

Author: Integralist

docs/resources/service_compute.md

@@ -567,6 +567,7 @@ Required:
 
 Optional:
 
+- `project_id` (String) The name of the logfile field sent to Scalyr
 - `region` (String) The region that log data will be sent to. One of `US` or `EU`. Defaults to `US` if undefined
 
 

docs/resources/service_vcl.md

@@ -1009,6 +1009,7 @@ Optional:
 - `format` (String) Apache style log formatting.
 - `format_version` (Number) The version of the custom logging format used for the configured endpoint. Can be either 1 or 2. (default: 2).
 - `placement` (String) Where in the generated VCL the logging call should be placed.
+- `project_id` (String) The name of the logfile field sent to Scalyr
 - `region` (String) The region that log data will be sent to. One of `US` or `EU`. Defaults to `US` if undefined
 - `response_condition` (String) The name of an existing condition in the configured endpoint, or leave blank to always execute.
 

fastly/block_fastly_service_logging_scalyr.go

@@ -37,6 +37,11 @@ func (h *ScalyrServiceAttributeHandler) GetSchema() *schema.Schema {
 			Required:    true,
 			Description: "The unique name of the Scalyr logging endpoint. It is important to note that changing this attribute will delete and recreate the resource",
 		},
+		"project_id": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "The name of the logfile field sent to Scalyr",
+		},
 		"region": {
 			Type:        schema.TypeString,
 			Optional:    true,
@@ -151,6 +156,9 @@ func (h *ScalyrServiceAttributeHandler) Update(_ context.Context, d *schema.Reso
 	if v, ok := modified["placement"]; ok {
 		opts.Placement = gofastly.ToPointer(v.(string))
 	}
+	if v, ok := modified["project_id"]; ok {
+		opts.ProjectID = gofastly.ToPointer(v.(string))
+	}
 
 	log.Printf("[DEBUG] Update Scalyr Opts: %#v", opts)
 	_, err := conn.UpdateScalyr(&opts)
@@ -216,6 +224,9 @@ func flattenScalyr(remoteState []*gofastly.Scalyr) []map[string]any {
 		if resource.FormatVersion != nil {
 			data["format_version"] = *resource.FormatVersion
 		}
+		if resource.ProjectID != nil {
+			data["project_id"] = *resource.ProjectID
+		}
 
 		// Prune any empty values that come from the default string value in structs.
 		for k, v := range data {
@@ -244,12 +255,13 @@ func (h *ScalyrServiceAttributeHandler) buildCreate(scalyrMap any, serviceID str
 		Token:          gofastly.ToPointer(resource["token"].(string)),
 	}
 
+	if v := resource["project_id"].(string); v != "" {
+		opts.ProjectID = gofastly.ToPointer(v)
+	}
+
 	// WARNING: The following fields shouldn't have an empty string passed.
 	// As it will cause the Fastly API to return an error.
 	// This is because go-fastly v7+ will not 'omitempty' due to pointer type.
-	// if vla.placement != "" {
-	// 	opts.Placement = gofastly.ToPointer(vla.placement)
-	// }
 	if vla.placement != "" {
 		opts.Placement = gofastly.ToPointer(vla.placement)
 	}

fastly/block_fastly_service_logging_scalyr_test.go

@@ -28,6 +28,7 @@ func TestResourceFastlyFlattenScalyr(t *testing.T) {
 					Format:            gofastly.ToPointer(`%a %l %u %t %m %U%q %H %>s %b %T`),
 					FormatVersion:     gofastly.ToPointer(2),
 					Placement:         gofastly.ToPointer("none"),
+					ProjectID:         gofastly.ToPointer("example-project"),
 				},
 			},
 			local: []map[string]any{
@@ -39,6 +40,7 @@ func TestResourceFastlyFlattenScalyr(t *testing.T) {
 					"format":             `%a %l %u %t %m %U%q %H %>s %b %T`,
 					"placement":          "none",
 					"format_version":     2,
+					"project_id":         "example-project",
 				},
 			},
 		},
@@ -77,6 +79,7 @@ func TestAccFastlyServiceVCL_scalyrlogging_basic(t *testing.T) {
 		ResponseCondition: gofastly.ToPointer("response_condition_test"),
 		ServiceVersion:    gofastly.ToPointer(1),
 		Token:             gofastly.ToPointer("newtkn"),
+		ProjectID:         gofastly.ToPointer("example-project"),
 	}
 
 	log2 := gofastly.Scalyr{
@@ -307,6 +310,7 @@ resource "fastly_service_vcl" "foo" {
 		format_version 		 = 2
 		response_condition = "response_condition_test"
 		placement 				 = "waf_debug"
+    project_id         = "example-project"
 	}
 
 	logging_scalyr {

go.mod

@@ -4,7 +4,7 @@ go 1.20
 
 require (
 	github.com/bflad/tfproviderlint v0.29.0
-	github.com/fastly/go-fastly/v9 v9.0.0
+	github.com/fastly/go-fastly/v9 v9.2.0
 	github.com/google/go-cmp v0.6.0
 	github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320
 	github.com/hashicorp/terraform-plugin-docs v0.16.0

go.sum

@@ -33,8 +33,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI=
 github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
-github.com/fastly/go-fastly/v9 v9.0.0 h1:KQIqimmw0SJikXCEE+0kDzvYgCIaO8+upl7y9Sfo2fc=
-github.com/fastly/go-fastly/v9 v9.0.0/go.mod h1:iGGitrzwWXtwFVkESHsTNENc/BZTY9z2IfyFxN2FJjw=
+github.com/fastly/go-fastly/v9 v9.2.0 h1:+tCE/5LV0fa9bMuIBKx5Xtc4N/dTlRjB02b3bSddRv4=
+github.com/fastly/go-fastly/v9 v9.2.0/go.mod h1:5w2jgJBZqQEebOwM/rRg7wutAcpDTziiMYWb/6qdM7U=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
 github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs=