Revert "fix(backend): remove redundant error_threshold attribute (#731)" (#736)

* Revert "fix(backend): remove redundant error_threshold attribute (#731)"

This reverts commit 81629f5.

* build: bump go-fastly to latest 5.8.9 release

Author: Integralist

docs/index.md

@@ -25,7 +25,7 @@ terraform {
   required_providers {
     fastly = {
       source  = "fastly/fastly"
-      version = ">= 5.3.0"
+      version = ">= 5.3.1"
     }
   }
 }

docs/resources/service_compute.md

@@ -140,6 +140,7 @@ Optional:
 
 - `between_bytes_timeout` (Number) How long to wait between bytes in milliseconds. Default `10000`
 - `connect_timeout` (Number) How long to wait for a timeout in milliseconds. Default `1000`
+- `error_threshold` (Number) Number of errors to allow before the Backend is marked as down. Default `0`
 - `first_byte_timeout` (Number) How long to wait for the first bytes in milliseconds. Default `15000`
 - `healthcheck` (String) Name of a defined `healthcheck` to assign to this backend
 - `keepalive_time` (Number) How long in seconds to keep a persistent connection to the backend between requests.

docs/resources/service_vcl.md

@@ -342,6 +342,7 @@ Optional:
 - `auto_loadbalance` (Boolean) Denotes if this Backend should be included in the pool of backends that requests are load balanced against. Default `false`
 - `between_bytes_timeout` (Number) How long to wait between bytes in milliseconds. Default `10000`
 - `connect_timeout` (Number) How long to wait for a timeout in milliseconds. Default `1000`
+- `error_threshold` (Number) Number of errors to allow before the Backend is marked as down. Default `0`
 - `first_byte_timeout` (Number) How long to wait for the first bytes in milliseconds. Default `15000`
 - `healthcheck` (String) Name of a defined `healthcheck` to assign to this backend
 - `keepalive_time` (Number) How long in seconds to keep a persistent connection to the backend between requests.

fastly/block_fastly_service_backend.go

@@ -49,6 +49,12 @@ func (h *BackendServiceAttributeHandler) GetSchema() *schema.Schema {
 			Default:     1000,
 			Description: "How long to wait for a timeout in milliseconds. Default `1000`",
 		},
+		"error_threshold": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Default:     0,
+			Description: "Number of errors to allow before the Backend is marked as down. Default `0`",
+		},
 		"first_byte_timeout": {
 			Type:        schema.TypeInt,
 			Optional:    true,
@@ -271,6 +277,7 @@ func (h *BackendServiceAttributeHandler) buildCreateBackendInput(service string,
 		Address:             gofastly.String(resource["address"].(string)),
 		BetweenBytesTimeout: gofastly.Int(resource["between_bytes_timeout"].(int)),
 		ConnectTimeout:      gofastly.Int(resource["connect_timeout"].(int)),
+		ErrorThreshold:      gofastly.Int(resource["error_threshold"].(int)),
 		FirstByteTimeout:    gofastly.Int(resource["first_byte_timeout"].(int)),
 		HealthCheck:         gofastly.String(resource["healthcheck"].(string)),
 		MaxConn:             gofastly.Int(resource["max_conn"].(int)),
@@ -353,6 +360,9 @@ func (h *BackendServiceAttributeHandler) buildUpdateBackendInput(serviceID strin
 	if v, ok := modified["max_conn"]; ok {
 		opts.MaxConn = gofastly.Int(v.(int))
 	}
+	if v, ok := modified["error_threshold"]; ok {
+		opts.ErrorThreshold = gofastly.Int(v.(int))
+	}
 	if v, ok := modified["first_byte_timeout"]; ok {
 		opts.FirstByteTimeout = gofastly.Int(v.(int))
 	}
@@ -421,6 +431,7 @@ func flattenBackend(remoteState []*gofastly.Backend, sa ServiceMetadata) []map[s
 			"address":               resource.Address,
 			"between_bytes_timeout": int(resource.BetweenBytesTimeout),
 			"connect_timeout":       int(resource.ConnectTimeout),
+			"error_threshold":       int(resource.ErrorThreshold),
 			"first_byte_timeout":    int(resource.FirstByteTimeout),
 			"healthcheck":           resource.HealthCheck,
 			"keepalive_time":        int(resource.KeepAliveTime),

fastly/block_fastly_service_backend_test.go

@@ -30,6 +30,7 @@ func TestResourceFastlyFlattenBackend(t *testing.T) {
 					AutoLoadbalance:     false,
 					BetweenBytesTimeout: 10000,
 					ConnectTimeout:      1000,
+					ErrorThreshold:      0,
 					FirstByteTimeout:    15000,
 					KeepAliveTime:       1500,
 					MaxConn:             200,
@@ -58,6 +59,7 @@ func TestResourceFastlyFlattenBackend(t *testing.T) {
 					"auto_loadbalance":      false,
 					"between_bytes_timeout": 10000,
 					"connect_timeout":       1000,
+					"error_threshold":       0,
 					"first_byte_timeout":    15000,
 					"keepalive_time":        1500,
 					"max_conn":              200,
@@ -106,6 +108,7 @@ func TestResourceFastlyFlattenBackendCompute(t *testing.T) {
 					Port:                80,
 					BetweenBytesTimeout: 10000,
 					ConnectTimeout:      1000,
+					ErrorThreshold:      0,
 					FirstByteTimeout:    15000,
 					KeepAliveTime:       1500,
 					MaxConn:             200,
@@ -133,6 +136,7 @@ func TestResourceFastlyFlattenBackendCompute(t *testing.T) {
 					"port":                  80,
 					"between_bytes_timeout": 10000,
 					"connect_timeout":       1000,
+					"error_threshold":       0,
 					"first_byte_timeout":    15000,
 					"keepalive_time":        1500,
 					"max_conn":              200,

go.mod

@@ -4,7 +4,7 @@ go 1.18
 
 require (
 	github.com/bflad/tfproviderlint v0.29.0
-	github.com/fastly/go-fastly/v8 v8.5.8
+	github.com/fastly/go-fastly/v8 v8.5.9
 	github.com/google/go-cmp v0.5.9
 	github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320
 	github.com/hashicorp/terraform-plugin-docs v0.16.0

go.sum

@@ -32,8 +32,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/v8 v8.5.8 h1:BgHcPmCp7mXgqpbdDWU+m3/tE6CBAvJPygZaaJsExIM=
-github.com/fastly/go-fastly/v8 v8.5.8/go.mod h1:jmjaUGq1RUdP05XOuD1ICvuuzo0EdCexShviy2sFfHU=
+github.com/fastly/go-fastly/v8 v8.5.9 h1:DAebgYDu60MF9BO2cqKFSfvMfgn85L6ycMSy3PYfFNU=
+github.com/fastly/go-fastly/v8 v8.5.9/go.mod h1:jmjaUGq1RUdP05XOuD1ICvuuzo0EdCexShviy2sFfHU=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
 github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=

vendor/github.com/fastly/go-fastly/v8/fastly/backend.go

@@ -211,7 +211,7 @@ github.com/cloudflare/circl/sign/ed448
 # github.com/davecgh/go-spew v1.1.1
 ## explicit
 github.com/davecgh/go-spew/spew
-# github.com/fastly/go-fastly/v8 v8.5.8
+# github.com/fastly/go-fastly/v8 v8.5.9
 ## explicit; go 1.18
 github.com/fastly/go-fastly/v8/fastly
 # github.com/fatih/color v1.13.0