Fix retry panic (#48)

* Consolidate code files into internal package

* Set default backoff strategy

* Disable retries by default

Author: Sophia Castellarin

.gitignore

@@ -14,3 +14,5 @@ httptest
 
 # macOS
 .DS_Store
+
+*.vscode/

config.go internal/config.goconfig.go renamed to 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"))

coordinator.go internal/coordinator.gocoordinator.go renamed to 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"

dynamic.go internal/dynamic.godynamic.go renamed to 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"

http.go internal/http.gohttp.go renamed to 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 }

output.go internal/output.gooutput.go renamed to 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"

parser.go internal/parser.goparser.go renamed to 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"

tester.go internal/tester.gotester.go renamed to 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"

utils.go internal/utils.goutils.go renamed to 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"

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)
 	}