Fix retry panic (nytimes#48)

* Consolidate code files into internal package * Set default backoff strategy * Disable retries by default
Montana · Dec 4, 2023 · 802bed0 · 802bed0
1 parent 8846e65
commit 802bed0
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,3 +14,5 @@ httptest
 
 # macOS
 .DS_Store
+
+*.vscode/
diff --git a/config.go → internal/config.go b/config.go → internal/config.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package main
+package internal
 
 import (
 	"fmt"
@@ -56,9 +56,9 @@ func FromEnv() (*Config, error) {
 		printFailedOnly = true
 	}
 
-	enableRetries := true
-	if getEnv("ENABLE_RETRIES", "true") == "false" {
-		enableRetries = false
+	enableRetries := false
+	if getEnv("ENABLE_RETRIES", "false") == "true" {
+		enableRetries = true
 	}
 
 	retryCount, err := strconv.Atoi(getEnv("DEFAULT_RETRY_COUNT", "2"))

diff --git a/coordinator.go → internal/coordinator.go b/coordinator.go → internal/coordinator.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package main
+package internal
 
 import (
 	"sync"

diff --git a/dynamic.go → internal/dynamic.go b/dynamic.go → internal/dynamic.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package main
+package internal
 
 import (
 	"fmt"

diff --git a/http.go → internal/http.go b/http.go → internal/http.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package main
+package internal
 
 import (
 	"bytes"
@@ -112,6 +112,7 @@ func SendHTTPRequest(config *HTTPRequestConfig) (*http.Response, []byte, error)
 	if config.MaxRetries > 0 {
 		client.RetryMax = config.MaxRetries
 		client.CheckRetry = config.RetryCallback
+		client.Backoff = retryablehttp.DefaultBackoff
 	} else {
 		// Don't retry requests
 		client.CheckRetry = func(ctx context.Context, resp *http.Response, inErr error) (bool, error) { return false, nil }

diff --git a/output.go → internal/output.go b/output.go → internal/output.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package main
+package internal
 
 import (
 	"fmt"

diff --git a/parser.go → internal/parser.go b/parser.go → internal/parser.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package main
+package internal
 
 import (
 	"fmt"

diff --git a/tester.go → internal/tester.go b/tester.go → internal/tester.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package main
+package internal
 
 import (
 	"context"

diff --git a/utils.go → internal/utils.go b/utils.go → internal/utils.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package main
+package internal
 
 import (
 	"fmt"

diff --git a/main.go b/main.go
@@ -21,6 +21,8 @@ import (
 
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
+
+	ht "github.com/nytimes/httptest/internal"
 )
 
 var (
@@ -78,12 +80,12 @@ func main() {
 	fmt.Printf("httptest: %s %s %s\n", BuildCommit, BuildBranch, BuildTime)
 
 	// Get and apply config
-	config, err := FromEnv()
+	config, err := ht.FromEnv()
 	if err != nil {
 		log.Fatalf("error: failed to parse config: %s", err)
 	}
 
-	if err := ApplyConfig(config); err != nil {
+	if err := ht.ApplyConfig(config); err != nil {
 		log.Fatalf("error: failed to apply config: %s", err)
 	}
 
@@ -92,12 +94,12 @@ func main() {
 	zap.ReplaceGlobals(logger)
 
 	// Parse and run tests
-	tests, err := ParseAllTestsInDirectory(config.TestDirectory)
+	tests, err := ht.ParseAllTestsInDirectory(config.TestDirectory)
 	if err != nil {
 		log.Fatalf("error: failed to parse tests: %s", err)
 	}
 
-	if !RunTests(tests, config) {
+	if !ht.RunTests(tests, config) {
 		os.Exit(1)
 	}