Merge pull request #71 from anuraaga/reformat-code

cmd/check.go

@@ -4,11 +4,11 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/fzipi/go-ftw/test"
-	"github.com/rs/zerolog/log"
-
 	"github.com/kyokomi/emoji"
+	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
+
+	"github.com/fzipi/go-ftw/test"
 )
 
 // checkCmd represents the check command

cmd/root.go

@@ -4,10 +4,10 @@ import (
 	"log"
 	"os"
 
-	"github.com/fzipi/go-ftw/config"
-
 	"github.com/rs/zerolog"
 	"github.com/spf13/cobra"
+
+	"github.com/fzipi/go-ftw/config"
 )
 
 var (

ftwhttp/client_test.go

@@ -1,152 +1,152 @@
 package ftwhttp
 
 import (
-    "testing"
+	"testing"
 )
 
 func TestNewClient(t *testing.T) {
-    c := NewClient(NewClientConfig())
+	c := NewClient(NewClientConfig())
 
-    if c.Jar == nil {
-        t.Logf("Error creating Client")
-    }
+	if c.Jar == nil {
+		t.Logf("Error creating Client")
+	}
 }
 
 func TestConnectDestinationHTTPS(t *testing.T) {
-    d := &Destination{
-        DestAddr: "example.com",
-        Port:     443,
-        Protocol: "https",
-    }
-
-    c := NewClient(NewClientConfig())
-
-    err := c.NewConnection(*d)
-    if err != nil {
-        t.Logf("This should not error")
-    }
-
-    if c.Transport.protocol != "https" {
-        t.Logf("Error connecting to example.com using https")
-    }
+	d := &Destination{
+		DestAddr: "example.com",
+		Port:     443,
+		Protocol: "https",
+	}
+
+	c := NewClient(NewClientConfig())
+
+	err := c.NewConnection(*d)
+	if err != nil {
+		t.Logf("This should not error")
+	}
+
+	if c.Transport.protocol != "https" {
+		t.Logf("Error connecting to example.com using https")
+	}
 }
 
 func TestDoRequest(t *testing.T) {
-    d := &Destination{
-        DestAddr: "httpbin.org",
-        Port:     443,
-        Protocol: "https",
-    }
+	d := &Destination{
+		DestAddr: "httpbin.org",
+		Port:     443,
+		Protocol: "https",
+	}
 
-    c := NewClient(NewClientConfig())
+	c := NewClient(NewClientConfig())
 
-    req := generateBaseRequestForTesting()
+	req := generateBaseRequestForTesting()
 
-    err := c.NewConnection(*d)
-    if err != nil {
-        t.Logf("This should not error")
-    }
+	err := c.NewConnection(*d)
+	if err != nil {
+		t.Logf("This should not error")
+	}
 
-    _, err = c.Do(*req)
+	_, err = c.Do(*req)
 
-    if err == nil {
-        t.Logf("This should return error")
-    }
+	if err == nil {
+		t.Logf("This should return error")
+	}
 }
 
 func TestGetTrackedTime(t *testing.T) {
-    d := &Destination{
-        DestAddr: "httpbin.org",
-        Port:     443,
-        Protocol: "https",
-    }
+	d := &Destination{
+		DestAddr: "httpbin.org",
+		Port:     443,
+		Protocol: "https",
+	}
 
-    c := NewClient(NewClientConfig())
+	c := NewClient(NewClientConfig())
 
-    rl := &RequestLine{
-        Method:  "POST",
-        URI:     "/post",
-        Version: "HTTP/1.1",
-    }
+	rl := &RequestLine{
+		Method:  "POST",
+		URI:     "/post",
+		Version: "HTTP/1.1",
+	}
 
-    h := Header{"Accept": "*/*", "User-Agent": "go-ftw test agent", "Host": "localhost"}
+	h := Header{"Accept": "*/*", "User-Agent": "go-ftw test agent", "Host": "localhost"}
 
-    data := []byte(`test=me&one=two&one=twice`)
-    req := NewRequest(rl, h, data, true)
+	data := []byte(`test=me&one=two&one=twice`)
+	req := NewRequest(rl, h, data, true)
 
-    err := c.NewConnection(*d)
-    if err != nil {
-        t.Logf("This should not error")
-    }
+	err := c.NewConnection(*d)
+	if err != nil {
+		t.Logf("This should not error")
+	}
 
-    c.StartTrackingTime()
+	c.StartTrackingTime()
 
-    resp, err := c.Do(*req)
+	resp, err := c.Do(*req)
 
-    c.StopTrackingTime()
+	c.StopTrackingTime()
 
-    if err != nil {
-        t.Logf("This should not error")
-    }
+	if err != nil {
+		t.Logf("This should not error")
+	}
 
-    if resp.Parsed.StatusCode != 200 {
-        t.Logf("Error in calling website")
-    }
+	if resp.Parsed.StatusCode != 200 {
+		t.Logf("Error in calling website")
+	}
 
-    rtt := c.GetRoundTripTime()
+	rtt := c.GetRoundTripTime()
 
-    if rtt.RoundTripDuration() < 0 {
-        t.Logf("Error getting RTT")
-    }
+	if rtt.RoundTripDuration() < 0 {
+		t.Logf("Error getting RTT")
+	}
 }
 
 func TestClientMultipartFormDataRequest(t *testing.T) {
-    d := &Destination{
-        DestAddr: "httpbin.org",
-        Port:     443,
-        Protocol: "https",
-    }
-
-    c := NewClient(NewClientConfig())
-
-    rl := &RequestLine{
-        Method:  "POST",
-        URI:     "/post",
-        Version: "HTTP/1.1",
-    }
-
-    h := Header{
-        "Accept": "*/*", "User-Agent": "go-ftw test agent", "Host": "localhost",
-        "Content-Type": "multipart/form-data; boundary=--------397236876",
-    }
-
-    data := []byte(`----------397236876
+	d := &Destination{
+		DestAddr: "httpbin.org",
+		Port:     443,
+		Protocol: "https",
+	}
+
+	c := NewClient(NewClientConfig())
+
+	rl := &RequestLine{
+		Method:  "POST",
+		URI:     "/post",
+		Version: "HTTP/1.1",
+	}
+
+	h := Header{
+		"Accept": "*/*", "User-Agent": "go-ftw test agent", "Host": "localhost",
+		"Content-Type": "multipart/form-data; boundary=--------397236876",
+	}
+
+	data := []byte(`----------397236876
 Content-Disposition: form-data; name="fileRap"; filename="test.txt"
 Content-Type: text/plain
 
 Some-file-test-here
 ----------397236876--`)
 
-    req := NewRequest(rl, h, data, true)
+	req := NewRequest(rl, h, data, true)
 
-    err := c.NewConnection(*d)
+	err := c.NewConnection(*d)
 
-    if err != nil {
-        t.Logf("This should not error")
-    }
+	if err != nil {
+		t.Logf("This should not error")
+	}
 
-    c.StartTrackingTime()
+	c.StartTrackingTime()
 
-    resp, err := c.Do(*req)
+	resp, err := c.Do(*req)
 
-    c.StopTrackingTime()
+	c.StopTrackingTime()
 
-    if err != nil {
-        t.Logf("This should not error")
-    }
+	if err != nil {
+		t.Logf("This should not error")
+	}
 
-    if resp.Parsed.StatusCode != 200 {
-        t.Logf("Error in calling website")
+	if resp.Parsed.StatusCode != 200 {
+		t.Logf("Error in calling website")
 	}
 
 }

ftwhttp/request.go

@@ -7,9 +7,9 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/fzipi/go-ftw/utils"
-
 	"github.com/rs/zerolog/log"
+
+	"github.com/fzipi/go-ftw/utils"
 )
 
 // ToString converts the request line to string for sending it in the wire

main.go

@@ -8,9 +8,10 @@ import (
 	"time"
 	_ "time/tzdata"
 
-	"github.com/fzipi/go-ftw/cmd"
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
+
+	"github.com/fzipi/go-ftw/cmd"
 )
 
 // nolint: gochecknoglobals

runner/run.go

@@ -5,16 +5,16 @@ import (
 	"regexp"
 	"time"
 
+	"github.com/google/uuid"
+	"github.com/kyokomi/emoji"
+	"github.com/rs/zerolog/log"
+
 	"github.com/fzipi/go-ftw/check"
 	"github.com/fzipi/go-ftw/config"
 	"github.com/fzipi/go-ftw/ftwhttp"
 	"github.com/fzipi/go-ftw/test"
 	"github.com/fzipi/go-ftw/utils"
 	"github.com/fzipi/go-ftw/waflog"
-	"github.com/google/uuid"
-
-	"github.com/kyokomi/emoji"
-	"github.com/rs/zerolog/log"
 )
 
 // Run runs your tests with the specified Config. Returns error if some test failed

test/data.go

@@ -2,7 +2,6 @@ package test
 
 import (
 	"bytes"
-
 	"text/template"
 
 	"github.com/Masterminds/sprig"

waflog/read.go

@@ -6,9 +6,10 @@ import (
 	"os"
 	"regexp"
 
-	"github.com/fzipi/go-ftw/config"
 	"github.com/icza/backscanner"
 	"github.com/rs/zerolog/log"
+
+	"github.com/fzipi/go-ftw/config"
 )
 
 // Contains looks in logfile for regex

waflog/waflog.go

@@ -3,8 +3,9 @@ package waflog
 import (
 	"os"
 
-	"github.com/fzipi/go-ftw/config"
 	"github.com/rs/zerolog/log"
+
+	"github.com/fzipi/go-ftw/config"
 )
 
 // NewFTWLogLines is the base struct for reading the log file