diff --git a/cmd/loadtester/main.go b/cmd/loadtester/main.go index a7b6a923..db01eef8 100644 --- a/cmd/loadtester/main.go +++ b/cmd/loadtester/main.go @@ -2,12 +2,13 @@ package main import ( "flag" + "log" + "time" + "github.com/weaveworks/flagger/pkg/loadtester" "github.com/weaveworks/flagger/pkg/logger" "github.com/weaveworks/flagger/pkg/signals" "go.uber.org/zap" - "log" - "time" ) var VERSION = "0.12.1" diff --git a/pkg/controller/events.go b/pkg/controller/events.go index afa5175d..fb29915a 100644 --- a/pkg/controller/events.go +++ b/pkg/controller/events.go @@ -2,6 +2,7 @@ package controller import ( "fmt" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" corev1 "k8s.io/api/core/v1" diff --git a/pkg/controller/scheduler_common_test.go b/pkg/controller/scheduler_common_test.go index f0c50e07..01f06865 100644 --- a/pkg/controller/scheduler_common_test.go +++ b/pkg/controller/scheduler_common_test.go @@ -2,6 +2,7 @@ package controller import ( "fmt" + flaggerv1 "github.com/weaveworks/flagger/pkg/apis/flagger/v1beta1" clientset "github.com/weaveworks/flagger/pkg/client/clientset/versioned" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/webhook.go b/pkg/controller/webhook.go index ed5316c7..c07bd657 100644 --- a/pkg/controller/webhook.go +++ b/pkg/controller/webhook.go @@ -7,12 +7,13 @@ import ( "errors" "fmt" "io/ioutil" - "k8s.io/utils/clock" "net/http" "net/url" "strconv" "time" + "k8s.io/utils/clock" + flaggerv1 "github.com/weaveworks/flagger/pkg/apis/flagger/v1beta1" ) diff --git a/pkg/loadtester/runner.go b/pkg/loadtester/runner.go index 2cba9050..0a9ea90a 100644 --- a/pkg/loadtester/runner.go +++ b/pkg/loadtester/runner.go @@ -2,10 +2,11 @@ package loadtester import ( "context" - "go.uber.org/zap" "sync" "sync/atomic" "time" + + "go.uber.org/zap" ) type TaskRunner struct { diff --git a/pkg/loadtester/runner_test.go b/pkg/loadtester/runner_test.go index 1c7ab9c7..1ab72487 100644 --- a/pkg/loadtester/runner_test.go +++ b/pkg/loadtester/runner_test.go @@ -1,9 +1,10 @@ package loadtester import ( - "github.com/weaveworks/flagger/pkg/logger" "testing" "time" + + "github.com/weaveworks/flagger/pkg/logger" ) func TestTaskRunner_Start(t *testing.T) { diff --git a/pkg/loadtester/server.go b/pkg/loadtester/server.go index a8817a4b..f6dc79da 100644 --- a/pkg/loadtester/server.go +++ b/pkg/loadtester/server.go @@ -179,7 +179,6 @@ func ListenAndServe(port string, timeout time.Duration, logger *zap.SugaredLogge return } - canaryName := fmt.Sprintf("rollback.%s.%s", canary.Name, canary.Namespace) gate.close(canaryName) diff --git a/pkg/loadtester/task.go b/pkg/loadtester/task.go index 395b34a9..1ad8056a 100644 --- a/pkg/loadtester/task.go +++ b/pkg/loadtester/task.go @@ -3,9 +3,10 @@ package loadtester import ( "context" "encoding/hex" - "go.uber.org/zap" "hash/fnv" "sync" + + "go.uber.org/zap" ) // Modeling a loadtester task diff --git a/pkg/loadtester/task_ngrinder.go b/pkg/loadtester/task_ngrinder.go index 4a4dca15..9d7e8b86 100644 --- a/pkg/loadtester/task_ngrinder.go +++ b/pkg/loadtester/task_ngrinder.go @@ -6,12 +6,13 @@ import ( "encoding/json" "errors" "fmt" - "go.uber.org/zap" "io/ioutil" "net/http" "net/url" "strconv" "time" + + "go.uber.org/zap" ) const TaskTypeNGrinder = "ngrinder" diff --git a/pkg/loadtester/task_ngrinder_test.go b/pkg/loadtester/task_ngrinder_test.go index 699aea72..b7917763 100644 --- a/pkg/loadtester/task_ngrinder_test.go +++ b/pkg/loadtester/task_ngrinder_test.go @@ -3,10 +3,11 @@ package loadtester import ( "context" "fmt" - "github.com/weaveworks/flagger/pkg/logger" - "gopkg.in/h2non/gock.v1" "testing" "time" + + "github.com/weaveworks/flagger/pkg/logger" + "gopkg.in/h2non/gock.v1" ) func TestTaskNGrinder(t *testing.T) { diff --git a/pkg/loadtester/task_shell.go b/pkg/loadtester/task_shell.go index 4f79b505..c8fcf496 100644 --- a/pkg/loadtester/task_shell.go +++ b/pkg/loadtester/task_shell.go @@ -4,9 +4,10 @@ import ( "context" "errors" "fmt" - "go.uber.org/zap" "os/exec" "strconv" + + "go.uber.org/zap" ) const TaskTypeShell = "cmd" diff --git a/pkg/metrics/observers/observer.go b/pkg/metrics/observers/observer.go index a2e90658..496f2dd4 100644 --- a/pkg/metrics/observers/observer.go +++ b/pkg/metrics/observers/observer.go @@ -1,8 +1,9 @@ package observers import ( - flaggerv1 "github.com/weaveworks/flagger/pkg/apis/flagger/v1beta1" "time" + + flaggerv1 "github.com/weaveworks/flagger/pkg/apis/flagger/v1beta1" ) type Interface interface {